adopt-cli 0.4.2__tar.gz → 0.4.4__tar.gz

{adopt_cli-0.4.2 → adopt_cli-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: adopt-cli
-Version: 0.4.2
+Version: 0.4.4
 Summary: The adopt command surface: config resolution, JSON mode, exit codes.
 Project-URL: Homepage, https://github.com/onboardux/onboard-core
 Project-URL: Source, https://github.com/onboardux/onboard-core

{adopt_cli-0.4.2 → adopt_cli-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adopt-cli"
-version = "0.4.2"
+version = "0.4.4"
 description = "The adopt command surface: config resolution, JSON mode, exit codes."
 requires-python = ">=3.12"
 license = "Apache-2.0"

adopt_cli-0.4.4/src/adopt_cli/_build_info.py

@@ -0,0 +1,6 @@
+"""Generated by scripts/embed_build_info.py; do not edit in a release build."""
+
+from typing import Final
+
+SBOM_SHA256: Final[str | None] = '7ac34a2179a12abe098bc85d0bb92f3bfaf3b739137331be994bd2e5cdd9ffe9'
+BUILD_ID: Final[str | None] = 'github:onboardux/onboard-core:37424931824:1:4e9cd060543afa8eed40b405d4f8c8d73379ffd4'

{adopt_cli-0.4.2 → adopt_cli-0.4.4}/src/adopt_cli/commands/_handover_support.py

@@ -447,9 +447,14 @@ def opening_position(handle: Any, *, system: ResolvedSystem, now: _dt.datetime)
     accumulated before it (v6.1 §6's sales-motion note), and a closure that
     cannot say where it started cannot say what it added.
     """
+    from adopt_knowledge import is_live
+
     coverage = _coverage(handle, system)
-    identities = len(coverage.identities)
-    covered = sum(1 for row in coverage.identities if row.covered)
+    # Live referents only, as `adopt gaps` counts them: a retired identity is
+    # not part of the system being handed over.
+    live = [row for row in coverage.identities if is_live(row)]
+    identities = len(live)
+    covered = sum(1 for row in live if row.covered)
 
     confirmed = 0
     unverified = 0

{adopt_cli-0.4.2 → adopt_cli-0.4.4}/src/adopt_cli/commands/_knowledge_support.py

@@ -50,6 +50,7 @@ __all__ = [
     "identity_views",
     "pending_items",
     "presented_revisions",
+    "presented_texts",
     "rebind_target",
     "refresh_population",
     "resolve_identity",
@@ -327,6 +328,33 @@ def presented_revisions(handle: KnowledgeStoreView) -> frozenset[str]:
     )
 
 
+def presented_texts(handle: KnowledgeStoreView) -> frozenset[tuple[str, str]]:
+    """`(item_id, document digest)` for every text an ingest suggestion batch carried.
+
+    `presented_revisions`' own rule -- "new text means a new revision" -- stated
+    the other way round, because one writer breaks it: `confirm-current`
+    appends a revision with the same text and the same digest, and the next
+    ingest used to re-propose every suggestion the reviewer had rejected for
+    that text. Suggestion batches only: a verification batch asked whether the
+    text is true, not what it is about.
+    """
+    suggestion_batches = {
+        row.id
+        for row in _rows(handle, "review_batch", ReviewBatch)
+        if source_of(row.batch_key) == SOURCE_INGEST
+    }
+    carried = {
+        row.proposed_revision_id
+        for row in _rows(handle, "review_item", ReviewItem)
+        if row.review_batch_id in suggestion_batches and row.proposed_revision_id is not None
+    }
+    return frozenset(
+        (row.item_id, row.source_version)
+        for row in _rows(handle, "knowledge_revision", KnowledgeRevision)
+        if row.id in carried and row.source_version is not None
+    )
+
+
 def resolve_identity(handle: KnowledgeStoreView, uri: str) -> Identity | None:
     """An identity by URI, following an alias to the identity that replaced it.
 

{adopt_cli-0.4.2 → adopt_cli-0.4.4}/src/adopt_cli/commands/_pack_support.py

@@ -130,19 +130,28 @@ def build_drafts(handle: Any, *, system_id: str, environment_id: str | None) ->
 
 
 def build_identities(
-    handle: Any, *, system_id: str, environment_id: str | None, covered: frozenset[str]
+    handle: Any,
+    *,
+    system_id: str,
+    environment_id: str | None,
+    covered: frozenset[str],
+    live: frozenset[str],
 ) -> _Reader:
     """The inventory, with coverage taken from the recompute rather than the cache.
 
     `identity.covered_cache` is a cache that alarms rather than self-heals, and
     a pack must not be the thing that reads it: the recompute result the caller
-    already holds is the authority (Build 0's rule, unchanged).
+    already holds is the authority (Build 0's rule, unchanged). Only `live`
+    referents are listed: a pack describes the system as it is, and a retired
+    identity counted into "covered N of M" makes the handover read worse with
+    every rename (`adopt_knowledge.is_live`).
     """
     rows = [
         PackIdentity(uri=str(row.uri), kind=str(row.identity_kind), covered=str(row.id) in covered)
         for row in handle.pack_records().identities_in_scope(
             system_id=system_id, environment_id=environment_id
         )
+        if str(row.id) in live
     ]
     return _Reader(tuple(rows))
 
@@ -238,23 +247,24 @@ def assemble_pack(handle: Any, *, audience: str, system_id: str, environment_id:
     rendering it is a pure function and the caller may close the store first.
     """
     from adopt_handover import assemble
-    from adopt_knowledge import rank_gaps
+    from adopt_knowledge import is_live, rank_gaps
 
     from adopt_coverage import recompute_coverage
 
     coverage = recompute_coverage(handle.coverage_records(), system_id, environment_id)
     covered = frozenset(row.identity_id for row in coverage.identities if row.covered)
+    live = frozenset(row.identity_id for row in coverage.identities if is_live(row))
     ranked = rank_gaps(coverage.identities)
-    # Every identity the recompute evaluated, by URI. The conflict join needs
-    # it, and it is the same population the inventory renders -- so a conflict
-    # can never name an identity this pack does not list.
-    uris = {row.identity_id: row.uri for row in coverage.identities}
+    # Every live identity the recompute evaluated, by URI. The conflict join
+    # needs it, and it is the same population the inventory renders -- so a
+    # conflict can never name an identity this pack does not list.
+    uris = {row.identity_id: row.uri for row in coverage.identities if row.identity_id in live}
 
     return assemble(
         audience=audience,
         knowledge=build_knowledge(handle, system_id=system_id, environment_id=environment_id),
         identities=build_identities(
-            handle, system_id=system_id, environment_id=environment_id, covered=covered
+            handle, system_id=system_id, environment_id=environment_id, covered=covered, live=live
         ),
         freshness=FreshnessCache(handle),
         boundary=build_boundary(handle, system_id=system_id, environment_id=environment_id),

{adopt_cli-0.4.2 → adopt_cli-0.4.4}/src/adopt_cli/commands/knowledge.py

@@ -45,6 +45,19 @@ ActorOption = Annotated[
     str | None,
     typer.Option("--actor", help="Who is running this. Recorded on every revision written."),
 ]
+UnverifiedOption = Annotated[
+    bool,
+    typer.Option(
+        "--unverified",
+        help=(
+            "Land these documents unverified, each queued for a person to confirm in "
+            "`adopt review`. Use it for text nobody has vouched for -- anything an agent "
+            "wrote or helped write. Until confirmed it counts toward no coverage, serves "
+            "no answer and reaches no pack. Its name-match suggestions are held back "
+            "(`suggestions_deferred`) and queued by the next ingest of the confirmed text."
+        ),
+    ),
+]
 StoreOption = Annotated[Path | None, typer.Option("--store", help="Store path override.")]
 JsonOption = Annotated[bool, typer.Option("--json", help="Emit the strict JSON envelope only.")]
 
@@ -54,6 +67,7 @@ def ingest(
     scope: ScopeOption = None,
     audience: AudienceOption = None,
     actor: ActorOption = None,
+    unverified: UnverifiedOption = False,
     store: StoreOption = None,
     json_output: JsonOption = False,
 ) -> None:
@@ -66,6 +80,7 @@ def ingest(
         bound_pairs,
         identity_views,
         presented_revisions,
+        presented_texts,
         stored_documents,
     )
     from adopt_cli.commands._map_support import resolve_scope
@@ -87,7 +102,9 @@ def ingest(
                 unit=StoreUnitOfWork(handle),
                 bound_pairs=bound_pairs(handle),
                 presented_revisions=presented_revisions(handle),
+                presented_texts=presented_texts(handle),
                 actor_id=actor,
+                unverified=unverified,
             )
         payload = _ingest_payload(report)
     finally:
@@ -107,6 +124,13 @@ def _ingest_payload(report: Any) -> dict[str, Any]:
         "suggestions": report.suggestions,
         "review_batch": report.review_batch_id,
         "review_items": list(report.review_item_ids),
+        # Additive (`--unverified`): what this run wrote unverified, and the
+        # batch a person confirms it in. Present on every run so the envelope
+        # is one shape whichever way the flag was set.
+        "unverified": report.unverified,
+        "verification_batch": report.verification_batch_id,
+        "verification_items": list(report.verification_item_ids),
+        "suggestions_deferred": report.suggestions_deferred,
         "unknown_audiences": list(report.unknown_audiences),
         "ingested": [
             {
@@ -286,10 +310,17 @@ def bind(
 
     For the links no heuristic finds. A binding made here is human-justified by
     construction, which is the same standing a confirmed suggestion has.
+
+    **A pair bound before is revived, not refused.** One item and one identity
+    have one binding for ever, so a link a `rebind` superseded or a retirement
+    withdrew cannot be created again -- and until this path existed, nothing
+    could restore it. Binding such a pair appends an `active` revision to its
+    chain and restarts its freshness, and the payload says `reactivated`. A pair
+    that is live already is still refused.
     """
     from adopt_knowledge.ingest import EXTRACTOR_MANUAL, INGEST_EXTRACTOR_VERSION
 
-    from adopt_cli.commands._knowledge_support import resolve_identity
+    from adopt_cli.commands._knowledge_support import StoreUnitOfWork, resolve_identity
     from adopt_obs import AdoptError, ErrorCode
 
     handle = open_configured_store(store, read_only=False, verb="bind")
@@ -312,22 +343,50 @@ def bind(
             )
         from adopt_cli.commands._coverage_support import coverage_cache_kept_current
 
+        bindings = handle.bindings()
+        earlier = next(
+            (row for row in bindings.for_identity(identity.id) if row.item_id == knowledge_id),
+            None,
+        )
+        head_status = (
+            None
+            if earlier is None
+            else handle.freshness_records().head_binding_statuses([earlier.id]).get(earlier.id)
+        )
         with coverage_cache_kept_current(handle, identity.system_id):
-            binding_id, revision_id = handle.bindings().bind(
-                item_id=knowledge_id,
-                identity_id=identity.id,
-                is_load_bearing=not not_load_bearing,
-                extractor=EXTRACTOR_MANUAL,
-                extractor_version=INGEST_EXTRACTOR_VERSION,
-                actor_id=actor,
-            )
+            if earlier is not None and head_status in _REVIVABLE_BINDING_STATUSES:
+                with StoreUnitOfWork(handle).transaction():
+                    revision_id = bindings.reactivate(
+                        binding_id=earlier.id,
+                        expected_head_id=earlier.current_revision_id,
+                        extractor=EXTRACTOR_MANUAL,
+                        extractor_version=INGEST_EXTRACTOR_VERSION,
+                        actor_id=actor,
+                    )
+                    handle.changes().restart_bindings([earlier.id])
+                binding_id = earlier.id
+                # The pair's row keeps the load-bearing flag it was created with;
+                # report what is true of it rather than what was asked for.
+                is_load_bearing = bool(earlier.is_load_bearing)
+            else:
+                # A new pair, or the facade's refusal of one that is live already.
+                binding_id, revision_id = bindings.bind(
+                    item_id=knowledge_id,
+                    identity_id=identity.id,
+                    is_load_bearing=not not_load_bearing,
+                    extractor=EXTRACTOR_MANUAL,
+                    extractor_version=INGEST_EXTRACTOR_VERSION,
+                    actor_id=actor,
+                )
+                is_load_bearing = not not_load_bearing
         payload = {
             "binding": binding_id,
             "revision": revision_id,
             "item": knowledge_id,
             "identity": identity.id,
             "uri": identity.uri,
-            "is_load_bearing": not not_load_bearing,
+            "is_load_bearing": is_load_bearing,
+            "reactivated": earlier is not None and head_status in _REVIVABLE_BINDING_STATUSES,
             # Stated because the alias is silent otherwise: binding to a moved
             # identity's old address is correct and surprising, and the operator
             # should see which referent they actually bound.
@@ -339,6 +398,11 @@ def bind(
     emit(payload, as_json=json_output, title="adopt bind")
 
 
+#: A binding head a person may take up again: replaced by a `rebind`, or
+#: withdrawn. `active` is absent on purpose -- that pair is bound already.
+_REVIVABLE_BINDING_STATUSES: Final[frozenset[str]] = frozenset({"moved", "retired"})
+
+
 AckOption = Annotated[
     str | None,
     typer.Option("--ack", help="Acknowledge one gap by its gap-key: someone owns closing it."),
@@ -550,10 +614,19 @@ def _parse_until(value: str | None) -> _dt.datetime | None:
 def _gaps_payload(
     result: Any, ranked: tuple[Any, ...], dispositions: dict[str, Any]
 ) -> dict[str, Any]:
+    from adopt_knowledge import is_live
+
+    # Counted over live referents, the population the gap list is drawn from,
+    # so `uncovered` is the length of `gaps`. `not_active` is what was set
+    # aside, so the numbers still reconcile with `adopt coverage recompute`.
+    evaluated = () if result is None else tuple(result.identities)
+    live = [row for row in evaluated if is_live(row)]
+    covered = sum(1 for row in live if row.covered)
     return {
-        "identities": 0 if result is None else len(result.identities),
-        "covered": 0 if result is None else result.covered,
-        "uncovered": 0 if result is None else result.uncovered,
+        "identities": len(live),
+        "covered": covered,
+        "uncovered": len(live) - covered,
+        "not_active": len(evaluated) - len(live),
         "gaps": [
             {
                 "kind": gap.kind,
@@ -959,6 +1032,7 @@ def _resolve_change(
             target_identity_id=target_id,
             target_uri=target_uri,
             actor_id=actor,
+            freshener=handle.changes(),
         )
     else:
         outcome = confirm_current_item(

{adopt_cli-0.4.2 → adopt_cli-0.4.4}/src/adopt_cli/store_option.py

@@ -101,6 +101,17 @@ def open_configured_store(
             **capture** paths are refused separately, where they write canon.
     """
     path = configured_store_path(override)
+    if not path.exists():
+        # The library's own hint names `migrate=True`, an argument no operator can
+        # pass. Missing here means `init` has not run, or the command ran from
+        # somewhere other than the repository -- say which, and how to tell.
+        raise AdoptError(
+            ErrorCode.SCHEMA_MIGRATION_PENDING,
+            message=f"no store exists at {path}",
+            hint="Run `adopt init` in the repository first, or run this from the directory "
+            "that holds `.adopt/`, or name the store with --store or ADOPT_STORE_PATH. "
+            "`adopt doctor` shows which store path resolved and where it came from.",
+        )
     if not read_only and non_canon_reason is None:
         refuse_write_to_replica(path, verb=verb)
     return open_store(path, read_only=read_only)

adopt_cli-0.4.2/src/adopt_cli/_build_info.py

@@ -1,6 +0,0 @@
-"""Generated by scripts/embed_build_info.py; do not edit in a release build."""
-
-from typing import Final
-
-SBOM_SHA256: Final[str | None] = 'd9c82e3f0197e2d81b8ef92be4bdbb2f9f38710ee54d8db9ca3baa099047fda8'
-BUILD_ID: Final[str | None] = 'github:onboardux/onboard-core:37286165801:1:b50f2ec2a85b4271c0d445d8432b105574a8978a'