threadkeeper 0.11.0__tar.gz → 0.13.0__tar.gz

{threadkeeper-0.11.0 → threadkeeper-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: threadkeeper
-Version: 0.11.0
+Version: 0.13.0
 Summary: Multi-agent shared brain across Claude Code/Desktop, Codex, Antigravity CLI, Gemini, Copilot, VS Code. Cross-session memory, self-improving skill loops, inter-agent signaling — one local MCP server.
 Author: thread-keeper contributors
 License: MIT
@@ -221,7 +221,7 @@ tk-agent-status --cleanup-memory
 ```
 
 `apps/macos-agent-status/` contains a small macOS menu-bar app that polls this
-command every 5 seconds and shows every autonomous learning loop: enabled/off,
+command every 15 seconds and shows every autonomous learning loop: enabled/off,
 running/idle/ready, last pass, backlog, and active child RSS when that loop has
 spawned a worker. PyPI wheels and sdists also bundle the same Swift source under
 `threadkeeper/assets/macos-agent-status/`, so a normal `pipx`/`uv tool` install
@@ -239,12 +239,16 @@ memory button, self-restarts when its own RSS crosses
 notification permission, and sends a notification when a newly completed
 autonomous child task produces a useful result in `recent_results`; the first
 poll only marks existing results as seen, so old completions do not spam
-notifications. The header gear opens a separate Settings window for
+notifications. Status polling and cleanup commands run off the main actor, so
+opening the popover does not wait for `tk-agent-status --json`. The header gear
+opens a separate Settings window for
 `~/.threadkeeper/.env`: common knobs are grouped into guided controls, the raw
 `.env` remains editable for advanced values, three local presets can be saved
 and loaded, and Save & Restart writes the file then asks existing
 `threadkeeper.server` processes to exit so MCP hosts reconnect with the new
-configuration. Probe backlog is due objective
+configuration. Spawn CLI selectors collapse `agy` into canonical `antigravity`
+while keeping `gemini` as legacy, and model selectors use dropdowns with exact
+CLI model ids/labels instead of free-text fields. Probe backlog is due objective
 probes only, not every registered probe, so a healthy cooldown shows `0 due
 probes` instead of looking stuck. On macOS, `python -m threadkeeper.server`
 automatically installs and launches it on MCP startup, and restarts the app when
@@ -633,11 +637,15 @@ keys are lowercased:
 # default agent for roles with no explicit pin ("" / unset = use the active CLI)
 THREADKEEPER_SPAWN__DEFAULT=claude
 # per-role CLI:  THREADKEEPER_SPAWN__LOOP__<ROLE>=<cli>
+# supported CLI keys: claude, codex, antigravity (agy executable), gemini (legacy), copilot
 THREADKEEPER_SPAWN__LOOP__SHADOW_OBSERVER=claude   # heaviest reasoning → keep on Claude
 THREADKEEPER_SPAWN__LOOP__CURATOR=codex            # weekly audit → Codex is fine
 THREADKEEPER_SPAWN__LOOP__CANDIDATE_REVIEWER=auto  # "auto" = follow active CLI
 # model pin per CLI or per role:  THREADKEEPER_SPAWN__MODEL__<KEY>=<model>
 THREADKEEPER_SPAWN__MODEL__CLAUDE=opus
+THREADKEEPER_SPAWN__MODEL__CODEX=gpt-5.5
+THREADKEEPER_SPAWN__MODEL__AGY="Gemini 3.1 Pro (High)"
+THREADKEEPER_SPAWN__MODEL__GEMINI=gemini-3.1-pro-preview
 THREADKEEPER_SPAWN__MODEL__DIALECTIC_VALIDATOR=opus
 ```
 
@@ -645,7 +653,9 @@ Resolution per role: `SPAWN__LOOP__<role>` → `SPAWN__DEFAULT` → active CLI
 `claude`; `"auto"` (or unset) defers to the active CLI. Real environment
 variables override the `.env`. Force host detection with
 `THREADKEEPER_ACTIVE_CLI=claude` (or `codex`, `antigravity`/`agy`,
-`gemini`, `copilot`). See `.env.example` for the full knob list.
+`gemini`, `copilot`). `agy` is normalized to `antigravity`; `gemini` remains a
+legacy Gemini CLI adapter for old installs/enterprise paths. See `.env.example`
+for the full knob list.
 
 Adapters without headless support (Claude Desktop, VS Code) can't be
 spawn targets — `spawn_status()` reports them as "no adapter" and any
@@ -745,12 +755,34 @@ unchanged.
 ## Verifying ingest across CLIs
 
 ```bash
-python scripts/tk_verify_ingest.py
+python scripts/tk_verify_ingest.py            # both checks below
+python scripts/tk_verify_ingest.py --contract # parse/ingest contract only
+python scripts/tk_verify_ingest.py --live      # production verdict only
+python scripts/tk_verify_ingest.py --live --json   # machine-readable
 ```
 
-Walks every installed CLI adapter, parses recent transcripts in an
-isolated tempdir DB, reports per-source message counts and any silent
-parse failures. Read-only with respect to live state.
+Two read-only checks:
+
+- **Contract test** (`--contract`) — walks every installed CLI adapter,
+  parses recent transcripts into an isolated tempdir DB, reports
+  per-source message counts and flags any adapter that parsed messages
+  but silently failed to persist them. Answers *"does the pipeline
+  work?"*
+- **Production verification** (`--live`) — reads the **live**
+  `dialog_messages` table read-only and scores the three acceptance
+  criteria from [roadmap issue #1](https://github.com/po4erk91/thread-keeper/issues/1):
+  (1) every targeted CLI *slot* has production rows, (2) shadow-review
+  sees more than one adapter in the same recent window, (3) the learning
+  loop has fired on non-Claude sessions. Emits a `PASS` / `PARTIAL` /
+  `FAIL` verdict. The four slots are `claude-code`, `codex`, `copilot`,
+  and `google` — where the Google slot is satisfied by *either* the
+  legacy `gemini` adapter or its successor Antigravity (`agy`), since
+  both live under `~/.gemini`.
+
+`--strict` makes the process exit non-zero unless the live verdict is
+`PASS`, so it can gate CI; `PARTIAL` (e.g. a box that doesn't run all
+four CLIs) is a valid real-world state and exits 0 by default. The
+reusable verdict logic lives in `threadkeeper/verify_ingest.py`.
 
 ---
 
@@ -776,6 +808,7 @@ threadkeeper/
 ├── db.py                 # SQLite schema + sqlite-vec loader
 ├── identity.py           # session, self-cid, daemon launchers
 ├── ingest.py             # adapter-driven transcript ingest
+├── verify_ingest.py      # cross-CLI production verification verdict
 ├── brief.py              # render_brief / render_context
 ├── shadow_review.py      # autonomous learning observer
 ├── i18n.py               # 10 locales of regex + prompt bundles
@@ -814,3 +847,5 @@ locale. Look for the `good-first-issue` label.
 ## License
 
 MIT — see [LICENSE](LICENSE).
+
+<!-- mcp-name: io.github.po4erk91/thread-keeper -->

{threadkeeper-0.11.0 → threadkeeper-0.13.0}/README.md

@@ -180,7 +180,7 @@ tk-agent-status --cleanup-memory
 ```
 
 `apps/macos-agent-status/` contains a small macOS menu-bar app that polls this
-command every 5 seconds and shows every autonomous learning loop: enabled/off,
+command every 15 seconds and shows every autonomous learning loop: enabled/off,
 running/idle/ready, last pass, backlog, and active child RSS when that loop has
 spawned a worker. PyPI wheels and sdists also bundle the same Swift source under
 `threadkeeper/assets/macos-agent-status/`, so a normal `pipx`/`uv tool` install
@@ -198,12 +198,16 @@ memory button, self-restarts when its own RSS crosses
 notification permission, and sends a notification when a newly completed
 autonomous child task produces a useful result in `recent_results`; the first
 poll only marks existing results as seen, so old completions do not spam
-notifications. The header gear opens a separate Settings window for
+notifications. Status polling and cleanup commands run off the main actor, so
+opening the popover does not wait for `tk-agent-status --json`. The header gear
+opens a separate Settings window for
 `~/.threadkeeper/.env`: common knobs are grouped into guided controls, the raw
 `.env` remains editable for advanced values, three local presets can be saved
 and loaded, and Save & Restart writes the file then asks existing
 `threadkeeper.server` processes to exit so MCP hosts reconnect with the new
-configuration. Probe backlog is due objective
+configuration. Spawn CLI selectors collapse `agy` into canonical `antigravity`
+while keeping `gemini` as legacy, and model selectors use dropdowns with exact
+CLI model ids/labels instead of free-text fields. Probe backlog is due objective
 probes only, not every registered probe, so a healthy cooldown shows `0 due
 probes` instead of looking stuck. On macOS, `python -m threadkeeper.server`
 automatically installs and launches it on MCP startup, and restarts the app when
@@ -592,11 +596,15 @@ keys are lowercased:
 # default agent for roles with no explicit pin ("" / unset = use the active CLI)
 THREADKEEPER_SPAWN__DEFAULT=claude
 # per-role CLI:  THREADKEEPER_SPAWN__LOOP__<ROLE>=<cli>
+# supported CLI keys: claude, codex, antigravity (agy executable), gemini (legacy), copilot
 THREADKEEPER_SPAWN__LOOP__SHADOW_OBSERVER=claude   # heaviest reasoning → keep on Claude
 THREADKEEPER_SPAWN__LOOP__CURATOR=codex            # weekly audit → Codex is fine
 THREADKEEPER_SPAWN__LOOP__CANDIDATE_REVIEWER=auto  # "auto" = follow active CLI
 # model pin per CLI or per role:  THREADKEEPER_SPAWN__MODEL__<KEY>=<model>
 THREADKEEPER_SPAWN__MODEL__CLAUDE=opus
+THREADKEEPER_SPAWN__MODEL__CODEX=gpt-5.5
+THREADKEEPER_SPAWN__MODEL__AGY="Gemini 3.1 Pro (High)"
+THREADKEEPER_SPAWN__MODEL__GEMINI=gemini-3.1-pro-preview
 THREADKEEPER_SPAWN__MODEL__DIALECTIC_VALIDATOR=opus
 ```
 
@@ -604,7 +612,9 @@ Resolution per role: `SPAWN__LOOP__<role>` → `SPAWN__DEFAULT` → active CLI
 `claude`; `"auto"` (or unset) defers to the active CLI. Real environment
 variables override the `.env`. Force host detection with
 `THREADKEEPER_ACTIVE_CLI=claude` (or `codex`, `antigravity`/`agy`,
-`gemini`, `copilot`). See `.env.example` for the full knob list.
+`gemini`, `copilot`). `agy` is normalized to `antigravity`; `gemini` remains a
+legacy Gemini CLI adapter for old installs/enterprise paths. See `.env.example`
+for the full knob list.
 
 Adapters without headless support (Claude Desktop, VS Code) can't be
 spawn targets — `spawn_status()` reports them as "no adapter" and any
@@ -704,12 +714,34 @@ unchanged.
 ## Verifying ingest across CLIs
 
 ```bash
-python scripts/tk_verify_ingest.py
+python scripts/tk_verify_ingest.py            # both checks below
+python scripts/tk_verify_ingest.py --contract # parse/ingest contract only
+python scripts/tk_verify_ingest.py --live      # production verdict only
+python scripts/tk_verify_ingest.py --live --json   # machine-readable
 ```
 
-Walks every installed CLI adapter, parses recent transcripts in an
-isolated tempdir DB, reports per-source message counts and any silent
-parse failures. Read-only with respect to live state.
+Two read-only checks:
+
+- **Contract test** (`--contract`) — walks every installed CLI adapter,
+  parses recent transcripts into an isolated tempdir DB, reports
+  per-source message counts and flags any adapter that parsed messages
+  but silently failed to persist them. Answers *"does the pipeline
+  work?"*
+- **Production verification** (`--live`) — reads the **live**
+  `dialog_messages` table read-only and scores the three acceptance
+  criteria from [roadmap issue #1](https://github.com/po4erk91/thread-keeper/issues/1):
+  (1) every targeted CLI *slot* has production rows, (2) shadow-review
+  sees more than one adapter in the same recent window, (3) the learning
+  loop has fired on non-Claude sessions. Emits a `PASS` / `PARTIAL` /
+  `FAIL` verdict. The four slots are `claude-code`, `codex`, `copilot`,
+  and `google` — where the Google slot is satisfied by *either* the
+  legacy `gemini` adapter or its successor Antigravity (`agy`), since
+  both live under `~/.gemini`.
+
+`--strict` makes the process exit non-zero unless the live verdict is
+`PASS`, so it can gate CI; `PARTIAL` (e.g. a box that doesn't run all
+four CLIs) is a valid real-world state and exits 0 by default. The
+reusable verdict logic lives in `threadkeeper/verify_ingest.py`.
 
 ---
 
@@ -735,6 +767,7 @@ threadkeeper/
 ├── db.py                 # SQLite schema + sqlite-vec loader
 ├── identity.py           # session, self-cid, daemon launchers
 ├── ingest.py             # adapter-driven transcript ingest
+├── verify_ingest.py      # cross-CLI production verification verdict
 ├── brief.py              # render_brief / render_context
 ├── shadow_review.py      # autonomous learning observer
 ├── i18n.py               # 10 locales of regex + prompt bundles
@@ -773,3 +806,5 @@ locale. Look for the `good-first-issue` label.
 ## License
 
 MIT — see [LICENSE](LICENSE).
+
+<!-- mcp-name: io.github.po4erk91/thread-keeper -->

{threadkeeper-0.11.0 → threadkeeper-0.13.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "threadkeeper"
-version = "0.11.0"
+version = "0.13.0"
 description = "Multi-agent shared brain across Claude Code/Desktop, Codex, Antigravity CLI, Gemini, Copilot, VS Code. Cross-session memory, self-improving skill loops, inter-agent signaling — one local MCP server."
 requires-python = ">=3.11"
 authors = [{ name = "thread-keeper contributors" }]

{threadkeeper-0.11.0 → threadkeeper-0.13.0}/tests/test_evolve_applier.py

@@ -57,8 +57,26 @@ def _bootstrap(tmp_path, monkeypatch, interval="0"):
     )
     monkeypatch.setattr(
         evolve_applier, "_comment_issue_claim",
-        lambda issue, repo_root=None: "",
+        lambda issue, repo_root=None: ("https://x/issues/0#issuecomment-1", ""),
     )
+    monkeypatch.setattr(
+        evolve_applier, "_open_prs_for_issue",
+        lambda issue_number, repo_root=None: ([], ""),
+    )
+    # Note: _resolve_claim_race is NOT monkeypatched here so the new
+    # multi-host tests can exercise the real implementation. With the default
+    # _fetch_issue_comments returning [], the race resolver sees ≤1 active
+    # claim and returns (True, "") — existing tests behave the same.
+    monkeypatch.setattr(
+        evolve_applier, "_delete_issue_comment",
+        lambda comment_url, repo_root=None: "",
+    )
+    # Skip the real-time race-detection sleep in unit tests so the suite stays
+    # snappy. The bootstrap defaults already make the race resolver return True
+    # in the "no competing claim" common path.
+    import threadkeeper.config as _cfg
+    monkeypatch.setattr(_cfg, "ROADMAP_CLAIM_RACE_WINDOW_S", 0.0)
+    monkeypatch.setattr(evolve_applier, "ROADMAP_CLAIM_RACE_WINDOW_S", 0.0)
     return {"mcp": _mcp.mcp, "db": db, "ea": evolve_applier, "identity": identity}
 
 
@@ -415,7 +433,10 @@ def test_apply_roadmap_issue_comments_before_spawn(
 
     def _claim(issue, repo_root=None):
         order.append(f"claim#{int(issue['number'])}")
-        return ""
+        return (
+            f"https://x/issues/{int(issue['number'])}#issuecomment-99",
+            "",
+        )
 
     def _spawn(**kw):
         order.append("spawn")
@@ -441,7 +462,7 @@ def test_apply_roadmap_issue_queue_reports_no_startable_when_claim_fails(
     )
     monkeypatch.setattr(
         pkg["ea"], "_comment_issue_claim",
-        lambda issue, repo_root=None: "gh_issue_comment_failed: denied",
+        lambda issue, repo_root=None: ("", "gh_issue_comment_failed: denied"),
     )
 
     def _boom(**kw):
@@ -473,8 +494,8 @@ def test_apply_roadmap_issue_queue_tries_next_when_claim_fails(
         num = int(issue["number"])
         claimed.append(num)
         if num == 1:
-            return "gh_issue_comment_failed: locked"
-        return ""
+            return "", "gh_issue_comment_failed: locked"
+        return f"https://x/issues/{num}#issuecomment-{num}", ""
 
     monkeypatch.setattr(pkg["ea"], "_comment_issue_claim", _claim)
     calls = {}
@@ -501,7 +522,7 @@ def test_apply_roadmap_issue_exact_issue_does_not_switch_tasks(
     )
     monkeypatch.setattr(
         pkg["ea"], "_comment_issue_claim",
-        lambda issue, repo_root=None: "gh_issue_comment_failed: locked",
+        lambda issue, repo_root=None: ("", "gh_issue_comment_failed: locked"),
     )
 
     def _boom(**kw):
@@ -557,6 +578,263 @@ def test_mark_roadmap_issue_applied_tool_requires_pr_url(
     assert row["summary"] == "https://github.com/o/r/pull/6"
 
 
+# ── multi-host: cross-machine conflict guards ──────────────────────────────
+
+def test_apply_roadmap_issue_skips_when_open_pr_already_closes_it(
+    tmp_path, monkeypatch,
+):
+    """If another host (or a prior crashed applier) already opened a PR for
+    this issue, do NOT spawn or claim — fall through to the next candidate."""
+    pkg = _bootstrap(tmp_path, monkeypatch)
+    monkeypatch.setattr(
+        pkg["ea"], "_fetch_open_issues",
+        lambda repo_root=None: (
+            [_issue(6, "Telemetry dashboard"), _issue(7, "Free issue")],
+            "",
+        ),
+    )
+    monkeypatch.setattr(
+        pkg["ea"], "_open_prs_for_issue",
+        lambda issue_number, repo_root=None: (
+            [{"url": "https://github.com/o/r/pull/42",
+              "number": 42}] if int(issue_number) == 6 else [],
+            "",
+        ),
+    )
+    claimed = []
+
+    def _claim(issue, repo_root=None):
+        num = int(issue["number"])
+        claimed.append(num)
+        return f"https://x/issues/{num}#issuecomment-{num}", ""
+
+    monkeypatch.setattr(pkg["ea"], "_comment_issue_claim", _claim)
+    calls = {}
+    _mock_spawn(monkeypatch, calls)
+
+    out = pkg["ea"].apply_roadmap_issue()
+
+    # advanced past #6 (open PR) to #7
+    assert out.startswith("spawned roadmap_issue=#7"), out
+    # claim was NOT posted for #6 — the open-PR check ran before claim
+    assert claimed == [7]
+
+
+def test_apply_roadmap_issue_exact_mode_returns_open_pr_error(
+    tmp_path, monkeypatch,
+):
+    pkg = _bootstrap(tmp_path, monkeypatch)
+    monkeypatch.setattr(
+        pkg["ea"], "_fetch_open_issues",
+        lambda repo_root=None: ([_issue(6, "Telemetry dashboard")], ""),
+    )
+    monkeypatch.setattr(
+        pkg["ea"], "_open_prs_for_issue",
+        lambda issue_number, repo_root=None: (
+            [{"url": "https://github.com/o/r/pull/42"}], "",
+        ),
+    )
+
+    def _claim(issue, repo_root=None):
+        raise AssertionError("must not claim when an open PR already exists")
+
+    monkeypatch.setattr(pkg["ea"], "_comment_issue_claim", _claim)
+
+    def _boom(**kw):
+        raise AssertionError("must not spawn when an open PR already exists")
+
+    import threadkeeper.tools.spawn as spawn_mod
+    monkeypatch.setattr(spawn_mod, "spawn", _boom)
+
+    out = pkg["ea"].apply_roadmap_issue(issue_number=6)
+
+    assert out.startswith("ERR roadmap_issue_open_pr=#6"), out
+    assert "pull/42" in out
+
+
+def test_apply_roadmap_issue_retracts_claim_on_lost_race(
+    tmp_path, monkeypatch,
+):
+    """TOCTOU: after we post our claim, a competing host's earlier claim is
+    visible. We retract our own claim and let the queue advance."""
+    pkg = _bootstrap(tmp_path, monkeypatch)
+    monkeypatch.setattr(
+        pkg["ea"], "_fetch_open_issues",
+        lambda repo_root=None: (
+            [_issue(6, "Telemetry dashboard"), _issue(7, "Other issue")],
+            "",
+        ),
+    )
+
+    def _claim(issue, repo_root=None):
+        return (
+            f"https://x/issues/{int(issue['number'])}#issuecomment-mine",
+            "",
+        )
+
+    monkeypatch.setattr(pkg["ea"], "_comment_issue_claim", _claim)
+
+    def _race(issue_number, my_comment_url, repo_root=None):
+        if int(issue_number) == 6:
+            return False, ""  # lost
+        return True, ""
+
+    monkeypatch.setattr(pkg["ea"], "_resolve_claim_race", _race)
+    calls = {}
+    _mock_spawn(monkeypatch, calls)
+
+    out = pkg["ea"].apply_roadmap_issue()
+
+    assert out.startswith("spawned roadmap_issue=#7"), out
+    assert "ISSUE #7: Other issue" in calls["prompt"]
+
+
+def test_apply_roadmap_issue_retracts_claim_on_spawn_failure(
+    tmp_path, monkeypatch,
+):
+    """If spawn() raises after we posted our claim, retract the claim so the
+    next pass can retry the issue immediately instead of waiting 24h TTL."""
+    pkg = _bootstrap(tmp_path, monkeypatch)
+    monkeypatch.setattr(
+        pkg["ea"], "_fetch_open_issues",
+        lambda repo_root=None: ([_issue(6, "Telemetry dashboard")], ""),
+    )
+    monkeypatch.setattr(
+        pkg["ea"], "_comment_issue_claim",
+        lambda issue, repo_root=None: (
+            "https://x/issues/6#issuecomment-mine", "",
+        ),
+    )
+
+    deleted = []
+    monkeypatch.setattr(
+        pkg["ea"], "_delete_issue_comment",
+        lambda comment_url, repo_root=None: (
+            deleted.append(comment_url) or ""
+        ),
+    )
+
+    import threadkeeper.tools.spawn as spawn_mod
+    monkeypatch.setattr(
+        spawn_mod, "spawn",
+        lambda **kw: (_ for _ in ()).throw(RuntimeError("spawn rejected")),
+    )
+
+    out = pkg["ea"].apply_roadmap_issue(issue_number=6)
+
+    assert out.startswith("spawn_error issue=#6"), out
+    assert "spawn rejected" in out
+    assert deleted == ["https://x/issues/6#issuecomment-mine"]
+
+
+def test_resolve_claim_race_wins_when_oldest_active_claim_is_ours(
+    tmp_path, monkeypatch,
+):
+    pkg = _bootstrap(tmp_path, monkeypatch)
+    monkeypatch.setattr(
+        pkg["ea"], "_fetch_issue_comments",
+        lambda issue_number, repo_root=None: (
+            [
+                {
+                    "body": "<!-- thread-keeper:evolve-applier-claim -->\nmine",
+                    "url": "https://x/issues/6#issuecomment-100",
+                    "createdAt": "2026-06-14T12:00:00Z",
+                },
+                {
+                    "body": "<!-- thread-keeper:evolve-applier-claim -->\nthem",
+                    "url": "https://x/issues/6#issuecomment-200",
+                    "createdAt": "2026-06-14T12:00:03Z",
+                },
+            ],
+            "",
+        ),
+    )
+    monkeypatch.setattr(pkg["ea"].time, "time", lambda: 1781438400.0)
+    monkeypatch.setattr(pkg["ea"].time, "sleep", lambda _s: None)
+
+    won, err = pkg["ea"]._resolve_claim_race(
+        6, "https://x/issues/6#issuecomment-100",
+    )
+    assert err == ""
+    assert won is True
+
+
+def test_resolve_claim_race_loses_and_deletes_own_claim(
+    tmp_path, monkeypatch,
+):
+    pkg = _bootstrap(tmp_path, monkeypatch)
+    monkeypatch.setattr(
+        pkg["ea"], "_fetch_issue_comments",
+        lambda issue_number, repo_root=None: (
+            [
+                {
+                    "body": "<!-- thread-keeper:evolve-applier-claim -->\nthem",
+                    "url": "https://x/issues/6#issuecomment-100",
+                    "createdAt": "2026-06-14T12:00:00Z",
+                },
+                {
+                    "body": "<!-- thread-keeper:evolve-applier-claim -->\nmine",
+                    "url": "https://x/issues/6#issuecomment-200",
+                    "createdAt": "2026-06-14T12:00:03Z",
+                },
+            ],
+            "",
+        ),
+    )
+    monkeypatch.setattr(pkg["ea"].time, "time", lambda: 1781438400.0)
+    monkeypatch.setattr(pkg["ea"].time, "sleep", lambda _s: None)
+
+    deleted = []
+    monkeypatch.setattr(
+        pkg["ea"], "_delete_issue_comment",
+        lambda url, repo_root=None: (deleted.append(url) or ""),
+    )
+
+    won, err = pkg["ea"]._resolve_claim_race(
+        6, "https://x/issues/6#issuecomment-200",
+    )
+    assert err == ""
+    assert won is False
+    assert deleted == ["https://x/issues/6#issuecomment-200"]
+
+
+def test_claim_body_includes_host_pid_git_rev(tmp_path, monkeypatch):
+    pkg = _bootstrap(tmp_path, monkeypatch)
+    issue = _issue(42, "Cross-host check")
+    body = pkg["ea"]._roadmap_issue_claim_body(issue, now_t=1781438400.0)
+    assert pkg["ea"].ROADMAP_ISSUE_CLAIM_MARKER in body
+    # The new identity block fields must be present so multi-host triage works.
+    assert "- Host:" in body
+    assert "- PID:" in body
+    assert "- Git rev:" in body
+    assert "- Started:" in body
+    assert "Claim TTL:" in body
+
+
+def test_roadmap_branch_name_carries_host_suffix(tmp_path, monkeypatch):
+    pkg = _bootstrap(tmp_path, monkeypatch)
+    branch = pkg["ea"].roadmap_issue_branch_name(7, "Hot config reload")
+    assert branch.startswith("roadmap/issue-7-hot-config-reload-")
+    suffix = branch.rsplit("-", 1)[-1]
+    # 6 hex chars from the hostname sha1
+    assert len(suffix) == 6
+    assert all(c in "0123456789abcdef" for c in suffix)
+
+
+def test_comment_url_to_id_parses_github_url_shape():
+    """The race resolver relies on this to match our own posted claim back to
+    the comments list."""
+    from threadkeeper.evolve_applier import _comment_url_to_id
+    assert _comment_url_to_id(
+        "https://github.com/o/r/issues/6#issuecomment-12345"
+    ) == "12345"
+    assert _comment_url_to_id(
+        "https://github.com/o/r/issues/6#issuecomment_67890"
+    ) == "67890"
+    assert _comment_url_to_id("https://github.com/o/r/issues/6") == ""
+    assert _comment_url_to_id("") == ""
+
+
 # ── single-flight: refuse while an applier child runs ──────────────────────
 
 def test_apply_evolve_single_flight(tmp_path, monkeypatch):
@@ -777,9 +1055,10 @@ def test_run_apply_pass_skips_unstartable_issue_and_spawns_next(
     )
 
     def _claim(issue, repo_root=None):
-        if int(issue["number"]) == 1:
-            return "gh_issue_comment_failed: locked"
-        return ""
+        num = int(issue["number"])
+        if num == 1:
+            return "", "gh_issue_comment_failed: locked"
+        return f"https://x/issues/{num}#issuecomment-{num}", ""
 
     monkeypatch.setattr(pkg["ea"], "_comment_issue_claim", _claim)
     calls = {}
@@ -803,7 +1082,7 @@ def test_run_apply_pass_falls_back_to_curator_when_no_issue_startable(
     )
     monkeypatch.setattr(
         pkg["ea"], "_comment_issue_claim",
-        lambda issue, repo_root=None: "gh_issue_comment_failed: locked",
+        lambda issue, repo_root=None: ("", "gh_issue_comment_failed: locked"),
     )
     calls = {}
     _mock_spawn(monkeypatch, calls)

{threadkeeper-0.11.0 → threadkeeper-0.13.0}/tests/test_menubar_app.py

@@ -46,6 +46,8 @@ def test_menubar_status_item_uses_idle_chip_and_running_gears():
     assert 'button.title = ""' in swift
     assert 'button.title = " TK' not in swift
     assert 'return "TK ' not in swift
+    assert "statusPollInterval: TimeInterval = 15.0" in swift
+    assert "Timer.scheduledTimer(withTimeInterval: statusPollInterval" in swift
     assert "Timer(timeInterval: gearSpinInterval" in swift
     assert "gearFrameStepDegrees = 17.0" in swift
     assert "largeGearDiameter: CGFloat = 12.0" in swift
@@ -59,6 +61,9 @@ def test_menubar_status_item_uses_idle_chip_and_running_gears():
     assert "store.snapshot.runningCount > 0" not in swift
     assert "button.image = gearFrames" in swift
     assert "TimelineView" not in swift
+    assert "refreshInFlight" in swift
+    assert "Task.detached(priority: .utility)" in swift
+    assert "nonisolated private static func runStatusCommand" in swift
     assert "store.openEnvSettings()" in swift
     assert '.help("Settings")' in swift
     assert '.help("Refresh")' not in swift
@@ -67,6 +72,19 @@ def test_menubar_status_item_uses_idle_chip_and_running_gears():
     assert '.help("Clean memory")' in swift
 
 
+def test_menubar_popover_shows_before_status_refresh():
+    repo = Path(__file__).resolve().parents[1]
+    swift = (
+        repo / "apps" / "macos-agent-status" / "ThreadKeeperAgentStatus.swift"
+    ).read_text(encoding="utf-8")
+
+    start = swift.index("@objc private func togglePopover")
+    end = swift.index("    private func updateStatusButton", start)
+    body = swift[start:end]
+
+    assert body.index("popover.show(") < body.index("store.refresh()")
+
+
 def test_menubar_env_settings_window_edits_env_and_presets():
     repo = Path(__file__).resolve().parents[1]
     swift = (
@@ -81,6 +99,22 @@ def test_menubar_env_settings_window_edits_env_and_presets():
     assert "(1...3).map" in swift
     assert "EnvPresetCard" in swift
     assert "mergeEnvText(raw:" in swift
+    assert "EnvSettingsTab" in swift
+    assert "case .raw:" in swift
+    assert "saveRaw(restart:" in swift
+    assert ".onChange(of: envStore.rawEnvText)" not in swift
+    assert "syncRawEditsIntoForm" not in swift
+    assert 'ChoiceOption("antigravity", label: "antigravity (agy)")' in swift
+    assert 'ChoiceOption("agy")' not in swift
+    assert 'ChoiceOption("gemini", label: "gemini (legacy)")' in swift
+    assert "antigravityModelChoices" in swift
+    assert "geminiLegacyModelChoices" in swift
+    assert '"Gemini 3.1 Pro (High)"' in swift
+    assert '"Gemini 3.5 Flash (Medium)"' in swift
+    assert '"gemini-3.1-pro-preview"' in swift
+    assert '"gemini-3.1-pro"' not in swift
+    assert "THREADKEEPER_SPAWN__MODEL__CODEX" in swift
+    assert "THREADKEEPER_SPAWN__MODEL__GEMINI" in swift
     assert "THREADKEEPER_DISABLE_BG_DAEMONS" in swift
     assert "THREADKEEPER_EVOLVE_APPLY_INTERVAL_S" in swift
     assert "THREADKEEPER_SPAWN__MODEL__EVOLVE_APPLIER" in swift