orbi-cli 0.7.28__tar.gz → 0.7.30__tar.gz

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orbi-cli
-Version: 0.7.28
+Version: 0.7.30
 Summary: Orbi — local AI development worker: claims GitHub Issues, runs Pi in isolated worktrees, and delivers PRs (GitHub Issues + labels are the only state store).
 Author: xqliu
 License-Expression: AGPL-3.0-only OR LicenseRef-Sustainable-Use-1.0

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/pyproject.toml

@@ -44,7 +44,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "orbi-cli"
-version = "0.7.28"
+version = "0.7.30"
 description = "Orbi — local AI development worker: claims GitHub Issues, runs Pi in isolated worktrees, and delivers PRs (GitHub Issues + labels are the only state store)."
 readme = "README.md"
 requires-python = ">=3.14"

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/__init__.py

@@ -18,4 +18,4 @@ the package would shadow the installed package for every process with
 the checkout root on sys.path. The direct-execution compatibility entry
 is `python3 -m orbi.cli` (development path only).
 """
-__version__ = "0.7.28"
+__version__ = "0.7.30"

orbi_cli-0.7.28/src/orbi/criteria_command.py → orbi_cli-0.7.30/src/orbi/amend_command.py

@@ -1,7 +1,7 @@
 """`/orbi amend`: put the proposed acceptance criteria on the ticket.
 
 The clarification gate stops a thin ticket and may attach a `kind=criteria`
-proposal to its stop comment (Issue #1926). This module registers the one
+proposal to its stop comment (Issue #1926). This module defines the one
 command that acts on it: a person with write permission replies
 `/orbi amend` and the proposed conditions — **as the comment reads at
 that moment**, so editing it first changes what lands — are appended to the
@@ -30,7 +30,9 @@ still scanned on the next tick and the same command continues from what is
 already on the ticket; a ticket that already carries this command's success
 receipt only gets step 4. The success receipt uses the command layer's own
 marker keyed on the command comment, so "has this command already
-succeeded?" is a marker lookup over the raw bodies, never prose.
+succeeded?" is a marker lookup over the raw bodies, never prose — and only
+a receipt THIS runner wrote counts (`runner_receipt`): the marker is public
+text, so a copied one must never stand in for the work (Issue #1992).
 
 The two steps that change what the next tick reads — the append and the
 dispatch label — are wrapped in the shared `ticket_command.run_step`, so
@@ -53,8 +55,8 @@ from orbi.ticket_command import (
     TicketCommandError,
     command_comment_key,
     command_receipt_marker,
-    register_command,
     run_step,
+    runner_receipt,
 )
 
 # The heading the conditions land under follows the message language
@@ -189,10 +191,10 @@ def _criteria_apply(
             language.text(language_code, "criteria.reason_no_suggestion"),
         )
     receipt = (
-        f"<!-- {command_receipt_marker(ADD_CRITERIA_COMMAND)} "
+        f"<!-- {command_receipt_marker(AMEND_COMMAND)} "
         f"comment={command_comment_key(command_comment)} -->"
     )
-    if not any(receipt in str(other.get("body")) for other in comments):
+    if not runner_receipt(comments, receipt):
         current = issue.get("body") or ""
         if appended_marker() not in current:
             section = render_acceptance(suggestion.items, language_code)
@@ -229,8 +231,8 @@ def _criteria_apply(
         edit_issue(issue_number, repo=repo, remove=NEEDS_DETAIL_LABEL)
 
 
-ADD_CRITERIA_COMMAND = CommandSpec(
-    name="add_criteria",
+AMEND_COMMAND = CommandSpec(
+    name="amend",
     subcommand="amend",
     arity=0,
     permission="write",
@@ -242,5 +244,3 @@ ADD_CRITERIA_COMMAND = CommandSpec(
     ),
     context=_criteria_context,
 )
-
-register_command(ADD_CRITERIA_COMMAND)

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/base_ci_red.py

@@ -38,13 +38,14 @@ from __future__ import annotations
 import dataclasses
 import json
 import logging
-import re
 from datetime import datetime, timezone
 
 from orbi import comment_trust, failure, language, user_summary
 from orbi.comment_kind import (
     COMMENT_KIND_FAILURE, comment_kind, parse_versioned_block,
+    versioned_block_pattern,
 )
+from orbi.comment_rest_id import rest_comment_id
 from orbi.delivery_labels import (
     BLOCKED_LABEL, FIX_NEEDED_LABEL, P0_LABEL, READY_LABEL,
 )
@@ -58,7 +59,7 @@ from orbi.pi_activity import parse_iso_utc
 from orbi.progress import fenced
 from orbi.ticket_command import (
     CommandSpec, TicketCommandError, command_comment_key,
-    command_receipt_marker, process_commands, register_command,
+    command_receipt_marker, process_commands, runner_receipt,
 )
 
 SCHEMA_VERSION = 1
@@ -159,10 +160,27 @@ def _validate(record: BaseCIRed) -> None:
         )
 
 
+def _serialize(payload: dict) -> str:
+    """One block payload: compact JSON with the HTML delimiters escaped.
+
+    The block is an HTML comment and the record carries GitHub's own
+    text: a check name may hold the comment terminator (a workflow named
+    after a shell pipeline) and the base branch is a user string.
+    Unescaped, a terminator closes the comment early, the next tick's
+    `parse` reads a truncated payload as corruption, and `paused_scene`
+    abandons the recovery (Issue #1998). The JSON \\u003c / \\u003e escapes
+    decode back to the exact same value, exactly the way the progress
+    block serializes its summary (`progress_summary.serialize_summary`).
+    """
+    return json.dumps(
+        payload, separators=(",", ":"), ensure_ascii=False,
+    ).replace("<", "\\u003c").replace(">", "\\u003e")
+
+
 def render(record: BaseCIRed) -> str:
     """Render the single hidden block for one record (deterministic)."""
     _validate(record)
-    payload = json.dumps(
+    payload = _serialize(
         {
             "schema": record.schema,
             "state": record.state,
@@ -171,7 +189,6 @@ def render(record: BaseCIRed) -> str:
             "pr": record.pr,
             "failing_checks": list(record.failing_checks),
         },
-        separators=(",", ":"), ensure_ascii=False,
     )
     return BLOCK_TEMPLATE.format(payload=payload)
 
@@ -474,6 +491,12 @@ def rewrite_state(body: str, state: str, *, language_code: str) -> str:
     The state line is APPENDED above the block, so the comment keeps a
     short timeline (paused -> green again -> merged) instead of
     rewriting history; the block itself is replaced, never duplicated.
+
+    The block is located by its marker ENVELOPE, never by the exact text
+    today's `render` produces: a comment written before #1998 escaped the
+    HTML delimiters carries a raw `<`/`>` (a check name such as
+    `tests (>=3.10)`) and still parses, so a text-exact replace would
+    silently no-op and leave it `waiting` for good.
     """
     record = parse(body)
     if record is None:
@@ -500,8 +523,8 @@ def rewrite_state(body: str, state: str, *, language_code: str) -> str:
     )
     if line.strip() not in (text.strip() for text in lines[:marker_index]):
         lines[marker_index:marker_index] = [line, ""]
-    return "\n".join(lines).replace(
-        render(record), render(updated), 1,
+    return versioned_block_pattern(_MARKER).sub(
+        lambda _match: render(updated), "\n".join(lines), count=1,
     ).rstrip() + "\n"
 
 
@@ -509,19 +532,6 @@ def rewrite_state(body: str, state: str, *, language_code: str) -> str:
 # The in-place edit of the one comment
 # --------------------------------------------------------------------------
 
-_COMMENT_URL_ID_RE = re.compile(r"#issuecomment-(\d+)$")
-
-
-def _rest_comment_id(comment: dict) -> int | None:
-    """The REST id of one comment, from the id field or its permalink."""
-    comment_id = comment.get("id")
-    if isinstance(comment_id, int) and not isinstance(comment_id, bool):
-        return comment_id
-    url = comment.get("url")
-    match = _COMMENT_URL_ID_RE.search(url) if isinstance(url, str) else None
-    return int(match.group(1)) if match else None
-
-
 def _located(comments: list[dict]) -> tuple[BaseCIRed, dict] | None:
     """The newest comment carrying a valid block, and its record.
 
@@ -548,7 +558,7 @@ def _edit_state(repo: str, issue_number: int, comment: dict,
     body = comment.get("body")
     if not isinstance(body, str):
         return False
-    comment_id = _rest_comment_id(comment)
+    comment_id = rest_comment_id(comment)
     if comment_id is None:
         LOGGER.warning(
             "base CI red comment has no REST id issue=%s repo=%s",
@@ -894,7 +904,10 @@ def _fix_base_apply(
     Idempotent per COMMENT: the reply carries the command layer's own
     receipt marker, so a second tick that still sees the same command
     comment does nothing (the block stays `waiting` until the base turns
-    green, so the comment is visible for several ticks).
+    green, so the comment is visible for several ticks). Only a receipt
+    THIS runner wrote counts (`runner_receipt`): the marker is public
+    text, so a copied one must never read as "the fix Issue was opened"
+    (Issue #1992).
     """
     if not isinstance(record, BaseCIRed):
         # The layer's contract: a handler that cannot run raises its own
@@ -908,7 +921,7 @@ def _fix_base_apply(
         f"<!-- {command_receipt_marker(FIX_BASE_COMMAND)} "
         f"comment={command_comment_key(command_comment)} -->"
     )
-    if any(receipt in str(other.get("body")) for other in comments):
+    if runner_receipt(comments, receipt):
         return
     checks = failing_checks(repo, list(record.failing_checks), record.base_sha)
     if not checks:
@@ -967,5 +980,3 @@ FIX_BASE_COMMAND = CommandSpec(
     ),
     context=_fix_base_context,
 )
-
-register_command(FIX_BASE_COMMAND)

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/check_permission.py

@@ -49,6 +49,7 @@ from orbi.comment_kind import (
     COMMENT_KIND_FAILURE, comment_kind, comment_kind_marker,
     parse_versioned_block,
 )
+from orbi.comment_rest_id import rest_comment_id
 from orbi.delivery_labels import (
     BLOCKED_LABEL, FIX_NEEDED_LABEL, READY_LABEL,
 )
@@ -81,9 +82,6 @@ _MARKER = "orbi:check-permission:v1"
 BLOCK_TEMPLATE = f"<!-- {_MARKER} {{payload}} -->"
 _FIELDS = ("schema", "pr", "state")
 
-# The REST id carried by a comment's permalink (see `rest_comment_id`).
-_COMMENT_URL_ID_RE = re.compile(r"#issuecomment-(\d+)$")
-
 # One bounded page per recovered scan: `ai-blocked` Issues are few, and an
 # unbounded scan would multiply the per-tick read cost.
 _SCAN_LIMIT = 200
@@ -369,23 +367,6 @@ def _waiting_block(comments: list[dict], *,
     return record, comment
 
 
-def rest_comment_id(comment: dict) -> int | None:
-    """The REST id of one Issue comment, from its id field or its permalink.
-
-    `gh issue view --json comments` reports the GraphQL node id — an
-    `"IC_kw..."` string no REST route accepts — next to the permalink, and
-    the permalink's `#issuecomment-<digits>` suffix IS the REST id the
-    in-place edit's `PATCH /repos/{repo}/issues/comments/{id}` takes (the
-    same rule `base_ci_red` and the failure reporter follow).
-    """
-    comment_id = comment.get("id")
-    if isinstance(comment_id, int) and not isinstance(comment_id, bool):
-        return comment_id
-    url = comment.get("url")
-    match = _COMMENT_URL_ID_RE.search(url) if isinstance(url, str) else None
-    return int(match.group(1)) if match else None
-
-
 def _edit_state(repo: str, issue_number: int, comment: dict,
                 record: CheckPermission) -> None:
     """Patch the ONE comment in place to the record's next state."""

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/checks.py

@@ -12,6 +12,8 @@ stays the I/O leaf and no domain module owns a private copy.
 """
 from __future__ import annotations
 
+import json
+
 # A status a check reports once it has concluded (the rollup's CheckRun
 # `COMPLETED`, a legacy status context's `SUCCESS`/`FAILURE`/`ERROR`);
 # anything else is still running. GitHub recomputes mergeability and
@@ -21,6 +23,33 @@ _FINAL_STATUSES = ("COMPLETED", "SUCCESS", "FAILURE", "ERROR")
 _PASSING_CONCLUSIONS = ("SUCCESS", "NEUTRAL", "SKIPPED")
 
 
+def parse_paginated_check_runs(raw: str) -> list:
+    """Flatten the check-run pages emitted by ``gh api --paginate --slurp``.
+
+    The list-check-runs REST response is one object per page —
+    ``{"total_count": N, "check_runs": [...]}`` — so the slurped output is
+    an array of those objects, one per page, and the caller receives every
+    run in page order (Issue #1993: GitHub serves 30 runs per page, so an
+    unpaginated read hid the 31st). Any other shape fails fast: a body that
+    cannot be read as pages must never pass for a complete — or passing —
+    check list.
+    """
+    pages = json.loads(raw)
+    if not isinstance(pages, list):
+        raise ValueError("paginated check-runs response must be an array of pages")
+    runs: list = []
+    for page in pages:
+        if not isinstance(page, dict) or not isinstance(page.get("check_runs"), list):
+            raise ValueError(
+                "paginated check-runs page must carry a check_runs array"
+            )
+        page_runs = page["check_runs"]
+        if any(not isinstance(run, dict) for run in page_runs):
+            raise ValueError("paginated check-runs page contains a non-object item")
+        runs.extend(page_runs)
+    return runs
+
+
 def render_check(entry: dict) -> str:
     """Render one classified check entry for humans, from the data.
 

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/claim.py

@@ -15,12 +15,10 @@ import os
 from collections.abc import Sequence
 from pathlib import Path
 
-from orbi import base_ci_red, check_permission, gitops, ticket_command
-# Imported for its registration side effect: `ai-needs-detail` tickets run
-# the registered commands below, and `/orbi split` (Issue #1927) and
-# `/orbi amend` (Issue #1929, typed word renamed by #1975) must be in the
-# registry by then.
-from orbi import criteria_command, split_command  # noqa: F401
+from orbi import (
+    base_ci_red, check_permission, gitops, ticket_command,
+    ticket_command_registry,
+)
 from orbi import milestone as milestone_bookkeeping
 from orbi.config import RunnerConfig
 from orbi.delivery_labels import (
@@ -216,7 +214,7 @@ def reconcile_open_epics(repo: str, run_id: str, language_code: str) -> list[str
         comments = issue_comments(int(number), repo=repo)
         if not epic_audit_posted(comments, child_evidence):
             comment_issue(int(number), repo=repo,
-                         body=f"<!-- orbi:run={run_id} -->\n{audit}\nrun_id={run_id}")
+                         body=f"{run_marker(run_id)}\n{audit}\nrun_id={run_id}")
         close_issue(int(number), repo=repo)
         event("epic_closed", issue=number, repo=repo)
         evidence.append(f"Epic #{number} closed after verification ({'; '.join(child_evidence)})")
@@ -798,7 +796,9 @@ def pick_next_delivery(
         # recovery scans above.
         try:
             ticket_command.process_labeled_commands(
-                repo, NEEDS_DETAIL_LABEL, dispatch_label=dispatch_label,
+                repo, NEEDS_DETAIL_LABEL,
+                commands=ticket_command_registry.ticket_commands(),
+                dispatch_label=dispatch_label,
                 language_code=repo_language,
             )
         except Exception:

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/cli_commands.py

@@ -26,7 +26,7 @@ from orbi import (
     scheduler,
     status_observe,
     suggest,
-    ticket_command,
+    ticket_command_registry,
 )
 from orbi.cli_doctor import doctor_report
 from orbi.cli_ticket_command import command_ticket_command
@@ -73,7 +73,7 @@ READ_ONLY_COMMANDS = frozenset({"status", "doctor", "session", "check"})
 # actions like the maintenance ones: no model call, so the same rule
 # applies (Issue #1930).
 _TICKET_COMMANDS = frozenset(
-    spec.subcommand for spec in ticket_command.cli_specs()
+    spec.subcommand for spec in ticket_command_registry.cli_specs()
 )
 
 # A missing provider key must never block these deployment maintenance
@@ -388,6 +388,6 @@ COMMAND_HANDLERS = {
     # of `/orbi fix-base`, so the table is derived from the registry.
     **{
         spec.subcommand: command_ticket_command
-        for spec in ticket_command.cli_specs()
+        for spec in ticket_command_registry.cli_specs()
     },
 }

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/cli_source.py

@@ -46,7 +46,7 @@ import subprocess
 from pathlib import Path
 
 import orbi
-from orbi.journal import quote_value
+from orbi.journal import quote_value, run_command
 
 # The Python floor (Issue #861): the same floor as the PEP 621
 # `requires-python` — pinned together by tests/test_cli_packaging.py
@@ -70,20 +70,21 @@ PROBE_TIMEOUT_SECONDS = 10
 def system_python3_compatible(exe: str) -> bool:
     """Whether one concrete interpreter satisfies REQUIRED_PYTHON.
 
-    Runs the :data:`PYTHON_PROBE_CODE` probe on ``exe`` (with a
-    timeout — a blocking command never runs bare). Any failure
-    (missing executable, non-zero probe exit, timeout) is NOT
-    compatible: the selection fails safe to the uv-provisioned
-    interpreter, which uv resolves against system AND managed
-    interpreters either way.
+    Runs the :data:`PYTHON_PROBE_CODE` probe on ``exe`` through the
+    single subprocess seam (:func:`orbi.journal.run_command`,
+    CONSTITUTION Article 3.4), with a timeout — a blocking command
+    never runs bare. Any failure (missing executable, non-zero probe
+    exit, timeout) is NOT compatible: the selection fails safe to the
+    uv-provisioned interpreter, which uv resolves against system AND
+    managed interpreters either way.
     """
     if not exe:
         return False
     try:
-        probe = subprocess.run(
+        probe = run_command(
             [exe, "-S", "-c", PYTHON_PROBE_CODE],
-            capture_output=True,
             timeout=PROBE_TIMEOUT_SECONDS,
+            check=False,
         )
     except (OSError, subprocess.SubprocessError):
         return False
@@ -99,6 +100,11 @@ def select_python_interpreter() -> str:
     ships 3.12.3; on a fresh uv-only host there is no system python3
     at all). ``orbi setup``, the Runner pre-start refresh and the
     systemd self-heal template all apply this one rule.
+
+    The rule runs a subprocess probe, so it is decided ONLY when a
+    reinstall (or the fix string that asks for one) is actually about
+    to happen — never at import (Issue #2001: importing the Runner
+    must not spawn a probe before logging is configured).
     """
     exe = shutil.which("python3")
     if exe is not None and system_python3_compatible(exe):
@@ -106,10 +112,6 @@ def select_python_interpreter() -> str:
     return "3.14"
 
 
-# The selection result the reinstall argv (and every fix string)
-# embeds — computed once per process.
-PYTHON_INTERPRETER = select_python_interpreter()
-
 # The runtime package directory inside a checkout (the src
 # layout): the editable install maps this WHOLE directory, so a newly
 # added package module is importable without regenerating any module
@@ -127,11 +129,12 @@ def reinstall_args(repo_dir: Path) -> list[str]:
     reinstallation") and ``--python`` carries the compatible
     interpreter selection (Issue #861: the system ``python3`` when it
     satisfies the floor, otherwise the bare ``3.14`` so uv provisions
-    or selects one).
+    or selects one) — decided HERE, when the reinstall is about to
+    happen, so importing this module never runs the probe (Issue #2001).
     """
     return [
         "uv", "tool", "install", "--force", "--reinstall", "--editable",
-        "--python", PYTHON_INTERPRETER, str(Path(repo_dir)),
+        "--python", select_python_interpreter(), str(Path(repo_dir)),
     ]
 
 

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/cli_ticket_command.py

@@ -5,8 +5,8 @@ A ticket command has two spellings and ONE execution path: a
 <owner/name> --issue <N>` on the host. This module is the terminal one:
 
 - `register_cli` adds one subcommand per registered arity-0 command
-  (`ticket_command.cli_specs`), so registering a command gives both
-  spellings and there is nothing to edit here. A command that needs an
+  (`ticket_command_registry.cli_specs`), so registering a command gives
+  both spellings and there is nothing to edit here. A command that needs an
   argument (`/orbi milestone <version>`) keeps its own explicit CLI command
   (`orbi milestone set`) and is never generated;
 - `command_ticket_command` runs the SAME `ticket_command.execute_command`
@@ -24,14 +24,12 @@ from __future__ import annotations
 
 import sys
 
-# The registrants, imported for their registration side effect: a command
-# is registered at import time and both the tree below and the CLI
-# dispatch table are derived from the registry (Issue #1930). A new
-# command module is added here once, exactly like the comment scan's call
-# site imports it.
-from orbi import (  # noqa: F401
-    base_ci_red, criteria_command, split_command, ticket_command,
-)
+# Both the tree below and the CLI dispatch table derive from the ONE
+# explicit list of registrants,
+# `ticket_command_registry.ticket_commands()` (Issues #1930, #2000): this
+# module names no command module, so a command can never be missing from
+# the terminal spelling because an import somewhere else changed.
+from orbi import ticket_command, ticket_command_registry
 from orbi.claim import _repo_scan_keys
 from orbi.github import authenticated_github_login
 from orbi.repo_config import merged_repo_language
@@ -39,7 +37,7 @@ from orbi.repo_config import merged_repo_language
 
 def register_cli(subparsers, common) -> None:
     """Add one subcommand per registered arity-0 ticket command."""
-    for spec in ticket_command.cli_specs():
+    for spec in ticket_command_registry.cli_specs():
         command = subparsers.add_parser(
             spec.subcommand, parents=[common],
             help=f"run the registered `{spec.canonical}` ticket command on "
@@ -58,7 +56,7 @@ def register_cli(subparsers, common) -> None:
 
 def command_ticket_command(config, args, parser) -> int:
     """Run one registered ticket command on one Issue (Issue #1930)."""
-    spec = ticket_command.TICKET_COMMANDS[args.ticket_command]
+    spec = ticket_command_registry.command_by_name(args.ticket_command)
     repo = args.repo
     milestone, dispatch_label = _repo_scan_keys(
         config, repo, config.active_milestone,

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/comment_kind.py

@@ -33,6 +33,11 @@ import re
 from collections.abc import Callable, Sequence
 from typing import Any
 
+# The run-id format belongs to `journal.validate_run_id` (Issue #2003):
+# the anchored prefix below interpolates that pattern instead of spelling
+# the id out, so a reader can never accept an id the writer refuses.
+from orbi.journal import RUN_ID_PATTERN
+
 COMMENT_KIND_STARTED = "started"
 COMMENT_KIND_FAILURE = "failure"
 COMMENT_KIND_REVIEW_ROUND = "review-round"
@@ -49,7 +54,8 @@ COMMENT_KIND_PATTERN = re.compile(r"<!-- orbi:comment=([a-z-]+) -->")
 # the line immediately after. Anchoring means a marker-shaped string
 # quoted in prose, a raw log or a code fence is never read as metadata.
 _KIND_PREFIX_RE = re.compile(
-    r"\A<!-- orbi:run=[0-9a-f]{8} -->\r?\n<!-- orbi:comment=([a-z-]+) -->"
+    r"\A<!-- orbi:run=" + RUN_ID_PATTERN.pattern
+    + r" -->\r?\n<!-- orbi:comment=([a-z-]+) -->"
 )
 
 

orbi_cli-0.7.30/src/orbi/comment_rest_id.py

@@ -0,0 +1,29 @@
+"""The REST id of one Issue comment record (Issue #2004).
+
+`gh issue view --json comments` reports the GraphQL node id — an
+`"IC_kw..."` string no REST route accepts — next to the comment's
+permalink, and the permalink's fragment carries the REST id that the
+in-place edit's `PATCH /repos/{repo}/issues/comments/{id}` route takes. A
+numeric `id` field (an `gh api` read) is that id already.
+
+One rule, one owner: the base-CI red recovery (`base_ci_red`), the
+check-permission recovery (`check_permission`) and the failure reporter
+(`failure_report`) all read the id from here, so the pattern lives in this
+module only. `github.issue_comment_rest_id` stays the neighbouring rule
+that resolves a GraphQL node id to a REST id with an API read.
+"""
+from __future__ import annotations
+
+import re
+
+_COMMENT_URL_ID_RE = re.compile(r"#issuecomment-(\d+)$")
+
+
+def rest_comment_id(comment: dict) -> int | None:
+    """The REST id of one comment, from the id field or its permalink."""
+    comment_id = comment.get("id")
+    if isinstance(comment_id, int) and not isinstance(comment_id, bool):
+        return comment_id
+    url = comment.get("url")
+    match = _COMMENT_URL_ID_RE.search(url) if isinstance(url, str) else None
+    return int(match.group(1)) if match else None

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/config.py

@@ -190,6 +190,20 @@ class RunnerConfig:
     repositories: tuple[dict, ...] = ()
 
 
+def parse_source_repos(value: object) -> tuple[str, ...]:
+    """Validate the task-pool declaration; the one ``source_repos`` parser.
+
+    ``load_config`` parses the whole config through it, and the source pool
+    uses it on a sibling deployment's plain TOML value (Issue #2002): the
+    rule is stated once, so the two callers can never drift apart.
+    """
+    if not isinstance(value, list) or not value:
+        raise ValueError("source_repos must be a non-empty list")
+    if not all(isinstance(repo, str) and repo for repo in value):
+        raise ValueError("source_repos must contain non-empty strings")
+    return tuple(value)
+
+
 class ConfigFileMissingError(FileNotFoundError):
     """The configured ``orbi.toml`` itself does not exist."""
 
@@ -209,11 +223,7 @@ def load_config(path: Path, *, check_provider_api_keys: bool = True,
     if not path.exists():
         raise ConfigFileMissingError(path)
     data = tomllib.loads(path.read_text(encoding="utf-8"))
-    source_repos = data.get("source_repos")
-    if not isinstance(source_repos, list) or not source_repos:
-        raise ValueError("source_repos must be a non-empty list")
-    if not all(isinstance(repo, str) and repo for repo in source_repos):
-        raise ValueError("source_repos must contain non-empty strings")
+    source_repos = parse_source_repos(data.get("source_repos"))
     unit_name = data.get("unit_name")
     if unit_name is not None and (
         not isinstance(unit_name, str) or not re.fullmatch(r"[A-Za-z0-9_-]+", unit_name)
@@ -488,7 +498,7 @@ def load_config(path: Path, *, check_provider_api_keys: bool = True,
             }
     return RunnerConfig(
         config_path=path.resolve(),
-        source_repos=tuple(source_repos),
+        source_repos=source_repos,
         repo_dir=repo_dir,
         deploy_home=deploy_home,
         unit_name=unit_name,

{orbi_cli-0.7.28 → orbi_cli-0.7.30}/src/orbi/failure_report.py

@@ -34,6 +34,8 @@ from orbi.comment_kind import (
     COMMENT_KIND_FAILURE,
     comment_kind_marker,
 )
+from orbi.comment_rest_id import rest_comment_id
+from orbi.comment_trust import latest_run_marker, trusted_comments
 from orbi.delivery_labels import (
     EVENT_FIX_NEEDED, FIX_NEEDED_LABEL, IN_PROGRESS_LABEL, READY_LABEL,
 )
@@ -41,7 +43,6 @@ from orbi.failure import (
     failure_comment_body, failure_detail, failure_summary,
     redact_local_paths, terminal_action,
 )
-from orbi.comment_trust import latest_run_marker, trusted_comments
 from orbi.github import (
     pr_number, apply_label_patch, comment_issue, issue_comments,
     issue_labels, issue_priority, pr_comments, run_gh_write_command,
@@ -875,17 +876,8 @@ def report_delivery_failure(
         # The #825 dedup: `gh issue view --json comments` returns a GraphQL
         # node id, but the PATCH route requires the REST id. The comment URL
         # already carries that id, so do not make a second API request.
-        comment_id = reported_failure.get("id")
-        if isinstance(comment_id, int) and not isinstance(comment_id, bool):
-            rest_comment_id = comment_id
-        else:
-            url = reported_failure.get("url")
-            match = (
-                re.search(r"#issuecomment-(\d+)$", url)
-                if isinstance(url, str) else None
-            )
-            rest_comment_id = int(match.group(1)) if match is not None else None
-        if rest_comment_id is None:
+        comment_rest_id = rest_comment_id(reported_failure)
+        if comment_rest_id is None:
             # A malformed or missing URL is data loss in the dedup metadata,
             # not a delivery failure. Preserve the pre-#825 behavior so the
             # current failure is still recorded and the tick continues.
@@ -907,7 +899,7 @@ def report_delivery_failure(
             post_new_comment = False
             try:
                 update_issue_comment(
-                    rest_comment_id, repo=source_repo,
+                    comment_rest_id, repo=source_repo,
                     # Apply the increment to the newly assembled body, not the
                     # stale first report. This preserves scene/retry fields
                     # added by this attempt while retaining the dedup counter.