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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orbi-cli
-Version: 0.7.30
+Version: 0.7.32
 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.30 → orbi_cli-0.7.32}/pyproject.toml

@@ -44,7 +44,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "orbi-cli"
-version = "0.7.30"
+version = "0.7.32"
 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.30 → orbi_cli-0.7.32}/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.30"
+__version__ = "0.7.32"

{orbi_cli-0.7.30 → orbi_cli-0.7.32}/src/orbi/clarify.py

@@ -51,7 +51,8 @@ from pathlib import Path
 from string import Formatter
 from typing import TYPE_CHECKING
 
-from orbi import language, notify, user_summary
+from orbi import draft_marker, language, notify, user_summary
+from orbi.ticket_criteria import TICKET_CHECK_CRITERIA
 from orbi.delivery_labels import NEEDS_DETAIL_LABEL, READY_LABEL
 from orbi.github import (
     authenticated_github_login, comment_issue, edit_issue, issue_comments,
@@ -99,27 +100,8 @@ CLARIFY_SYSTEM_PROMPT = (
     "only the Issue text, and judge what it says rather than the shape "
     "it is written in: separate template headings are optional, so a "
     "missing heading is never a missing piece.\n\n"
-    "Three checks:\n"
-    "1. observable_result — the ticket states the observable result: "
-    "what a user sees or does differently once the change ships. A "
-    "concrete runtime failure — an error, a crash, a wrong returned "
-    "value, a reproduced misbehavior named with its evidence — is such "
-    "a result together with its unambiguous implied correction (\"it "
-    "should not do this\"), even when no goal is written out "
-    "explicitly.\n"
-    "2. acceptance_condition — the ticket states an acceptance "
-    "condition: a concrete way to tell a finished delivery from an "
-    "unfinished one. Historical diagnostic evidence is not one: a run "
-    "that already happened, a count from an earlier attempt or a "
-    "symptom read from a log says what the author observed, not what "
-    "the delivery must achieve. Report this check only when no "
-    "condition is stated at all, and never invent a target, a cleanup "
-    "policy or a delivery scope for it.\n"
-    "3. single_outcome — the ticket is one runtime outcome: one fix or "
-    "one change, not several unrelated things. One failing behavior, "
-    "or several symptoms of the same behavior, is one outcome no "
-    "matter how many bullets or sentences describe it; report this "
-    "check only when the text bundles independent deliverables.\n\n"
+    + TICKET_CHECK_CRITERIA
+    + "\n\n"
     "Answer by calling the clarify_verdict tool exactly once: it is "
     "the only tool in this session, and the run ends with that call. Do "
     "not answer in prose.\n\n"
@@ -936,6 +918,15 @@ def enforce(issue: dict, config: RunnerConfig, source_repo: str,
     # ticket claimable, and the next tick would judge it again — the gate
     # would repeat instead of stopping.
     ready_label = config.dispatch_label or READY_LABEL
+    if draft_marker.own_draft_unchanged(issue):
+        # Issue #2041: `orbi draft` already judged this exact body with
+        # THIS function before the person ever saw it, and nobody has
+        # edited it since (the marker's fingerprint still matches). Orbi
+        # does not bounce its own drafts: the check would repeat a
+        # judgment it already made, and a draft that failed it after the
+        # rewrite is the person's to submit — not the gate's to stop.
+        event("clarify_draft_skipped", issue=issue["number"])
+        return True
     if already_stopped(issue, source_repo):
         # Issue #1904: the automation re-added the claim label without
         # touching the text. The stop already named the missing pieces

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

@@ -11,7 +11,6 @@ loading stay in the entry module, which owns the diagnostics.
 """
 from __future__ import annotations
 
-import json
 import logging
 import re
 import sys
@@ -20,6 +19,7 @@ from pathlib import Path
 from orbi import (
     cli_status,
     config as config_domain,
+    draft_cli,
     engine_source,
     notify,
     pilot_setup,
@@ -33,11 +33,7 @@ from orbi.cli_ticket_command import command_ticket_command
 from orbi.delivery_labels import READY_LABEL
 from orbi.milestone_command import MilestoneSetError, milestone_set
 from orbi.runner import freeze_base, run_command
-from orbi.session_command import (
-    find_session_file,
-    follow_session_file,
-    format_session_line,
-)
+from orbi.session_command import command_session
 
 LOGGER = logging.getLogger("orbi.cli")
 
@@ -194,6 +190,15 @@ def command_add(config: config_domain.RunnerConfig, args, parser) -> int:
     return 0
 
 
+def command_draft(config: config_domain.RunnerConfig, args, parser) -> int:
+    """Draft one request into deliverable Issues, or create the draft."""
+    return draft_cli.run_draft(
+        config, _selected_repo(config, args, parser),
+        request=args.request, session_dir=args.session_dir,
+        create=args.create,
+    )
+
+
 def command_suggest(config: config_domain.RunnerConfig, args, parser) -> int:
     repo = _selected_repo(config, args, parser)
     return suggest.run_suggest(
@@ -202,45 +207,6 @@ def command_suggest(config: config_domain.RunnerConfig, args, parser) -> int:
     )
 
 
-def command_session(config: config_domain.RunnerConfig, args, parser) -> int:
-    path = find_session_file(config.repo_dir)
-    if path is None:
-        print(
-            f"no pi session under {config.repo_dir / '.worktrees'}: "
-            "no Pi is running",
-            file=sys.stderr,
-        )
-        return 1
-    if not args.follow:
-        if args.pretty:
-            with path.open("r", encoding="utf-8") as handle:
-                for line in handle:
-                    line = line.strip()
-                    if not line:
-                        continue
-                    try:
-                        record = json.loads(line)
-                    except json.JSONDecodeError:
-                        continue
-                    if isinstance(record, dict):
-                        print(format_session_line(record))
-        else:
-            print(path)
-        return 0
-    for line in follow_session_file(path):
-        if args.pretty:
-            try:
-                record = json.loads(line)
-            except json.JSONDecodeError:
-                continue
-            if isinstance(record, dict):
-                print(format_session_line(record))
-        else:
-            print(line)
-        sys.stdout.flush()
-    return 0
-
-
 def command_install_units(config: config_domain.RunnerConfig, args,
                           parser) -> int:
     print(install_units_command(config, args.installed_dir))
@@ -375,6 +341,7 @@ def command_status(config: config_domain.RunnerConfig, args, parser) -> int:
 COMMAND_HANDLERS = {
     "add": command_add,
     "suggest": command_suggest,
+    "draft": command_draft,
     "status": command_status,
     "session": command_session,
     "install-units": command_install_units,

{orbi_cli-0.7.30 → orbi_cli-0.7.32}/src/orbi/cli_parser.py

@@ -13,7 +13,7 @@ import argparse
 import os
 from pathlib import Path
 
-from orbi import __version__, cli_ticket_command, notify, suggest
+from orbi import __version__, cli_ticket_command, draft_cli, notify, suggest
 
 
 def build_parser(description: str) -> argparse.ArgumentParser:
@@ -24,8 +24,7 @@ def build_parser(description: str) -> argparse.ArgumentParser:
     )
     parser = argparse.ArgumentParser(description=description, parents=[common])
     parser.add_argument(
-        "--version", action="version",
-        version=f"orbi {__version__}",
+        "--version", action="version", version=f"orbi {__version__}",
     )
     # The subcommand is OPTIONAL — with no subcommand the
     # installed CLI runs one Runner tick (the systemd ExecStart is the
@@ -43,6 +42,7 @@ def build_parser(description: str) -> argparse.ArgumentParser:
         help="source repo (default: first configured source)",
     )
     suggest.register_cli(subparsers, common)
+    draft_cli.register_cli(subparsers, common)
     status_parser = subparsers.add_parser(
         "status", parents=[common],
         help="show every active delivery with attributed local activity, "