alissa-tools-github-devloop 0.8.59__py3-none-any.whl → 0.8.61__py3-none-any.whl

alissa/tools/github/devloop/loop.py

@@ -547,11 +547,16 @@ _CRITERIA_RULE = (
 )
 
 # The adopt half: a resumed or fix-round session inherits a task some other
-# session typed, possibly before this rule existed.
+# session typed, possibly before this rule existed. No worker surface can
+# edit, retype or add a criterion on an existing task (the REST API only
+# creates tasks with criteria and satisfies them; the CLI has neither), so
+# the clause asks for the one thing a worker can do: put each breach in front
+# of the validator, who reads the delivery note.
 _CRITERIA_ADOPT = (
-    " On a task you ADOPT, retype any criterion that breaks this rule (a fact "
-    "typed `human` becomes `evidence`), and type any criterion you add the "
-    "same way."
+    " On a task you ADOPT, leave its criteria as they are — no tool you have "
+    "can edit, retype or add one — and list every criterion that breaks this "
+    "rule, with the type it should carry (a fact typed `human` should be "
+    "`evidence`), under the delivery note's Judgment calls."
 )
 
 # The origin-task instruction is split in two because the downstream rule is
@@ -2269,7 +2274,9 @@ ESCALATION_LIVE_STALLED = "live-stalled"
 # assignment. Once-ever like ESCALATION_ASSIGNMENT -- the remedy (unassign,
 # or leave it to whoever is working it by hand) does not change per poll.
 # ASSIGNED_OUTSIDE_SEEN is the episode's durable first-seen clock, kept in the
-# activity_log ledger so a daemon restart does not restart the wait.
+# activity_log ledger so a daemon restart does not restart the wait, and
+# dropped by the first issue pass that no longer reaches the skip (issue
+# #204), so the next episode on the same issue starts a clock of its own.
 ESCALATION_ASSIGNED_OUTSIDE = "assigned-outside"
 ASSIGNED_OUTSIDE_SEEN = "assigned-outside-seen"
 
@@ -4732,6 +4739,10 @@ class DevWatcher:
         self._shell_streaks: "dict[str, tuple[int, int]]" = {}
         # The process reaper's own clock (janitor cadence, issue #186).
         self._orphans_at: "float | None" = None
+        # The issues whose assigned-outside episode this issue pass saw
+        # still running (issue #204): `_assigned_outside` adds to it, and the
+        # end of `_poll_issues` ends every other episode's first-seen clock.
+        self._outside_seen: "set[tuple[str, int]]" = set()
 
     # -- per-issue decision ------------------------------------------------
 
@@ -4851,6 +4862,13 @@ class DevWatcher:
         if claim is not None:
             return self._claim_deferral(claim, attempts)
 
+        # What adoption put on the ledger, carried by hand for the reads below
+        # that would otherwise go back to the ledger for it: a dry run writes
+        # no row, so without these the dry pass judged the attempt cap
+        # against 0 billed attempts and liveness against no session name at
+        # all, and could SPAWN where the real pass ESCALATES (issue #204).
+        adopted = 0
+        adopted_session: "str | None" = None
         if login in issue.assignees and age is None:
             # Self-assigned but the ledger never spawned. Issue #200: when the
             # issue's own activity comment carries an EXPIRED spawn line by
@@ -4862,6 +4880,7 @@ class DevWatcher:
             orphans = self._orphaned_spawns(issue, session_name(issue, 1))
             if orphans:
                 attempts, age = self._adopt_orphaned_spawns(issue, orphans)
+                adopted, adopted_session = attempts, orphans[-1].session
             else:
                 # No spawn line at all: assigned outside this daemon (by
                 # hand, or under another workspace's ledger). Not ours to
@@ -4926,8 +4945,9 @@ class DevWatcher:
             )
             linked = [url for url, state in links if state == PR_OPEN]
             if linked:
-                row_session = self.state.newest_spawn_session(
-                    issue.full_name, number
+                row_session = (
+                    self.state.newest_spawn_session(issue.full_name, number)
+                    or adopted_session
                 )
                 liveness = self.session_liveness(row_session, roster)
                 if liveness is Liveness.ALIVE and row_session:
@@ -5062,9 +5082,11 @@ class DevWatcher:
                 # rows resolve INDETERMINATE otherwise, and since they respawn
                 # unconditionally TODAY, deferring them forever would be a
                 # regression dressed as caution.
-                live_session = self.state.newest_spawn_session(
-                    issue.full_name, number
-                ) or session_name(issue, attempts)
+                live_session = (
+                    self.state.newest_spawn_session(issue.full_name, number)
+                    or adopted_session
+                    or session_name(issue, attempts)
+                )
                 liveness = self.session_liveness(live_session, roster)
                 # Falling through means DEAD, and DEAD here is CONFIRMED (a
                 # successful listing without this name) -- so the retry below
@@ -5176,7 +5198,13 @@ class DevWatcher:
         # Billable attempts only (issue #142): an attempt refunded by a
         # usage limit never counts toward the cap; the numbering below still
         # counts it, so session names stay monotonic.
-        billed = self.state.attempt_count(issue.full_name, number, billable=True)
+        # An adopted orphan is billable by construction (its row never carries
+        # a limit stamp), and on a dry run it has no row to count: `max` lets
+        # the dry pass reach the cap decision the real one does (issue #204).
+        billed = max(
+            self.state.attempt_count(issue.full_name, number, billable=True),
+            adopted,
+        )
         if billed >= self.config.attempt_cap:
             if self.state.escalated(issue.full_name, number, ESCALATION_CAP):
                 return Decision(Action.CAPPED, "already escalated", attempts)
@@ -10258,8 +10286,10 @@ class DevWatcher:
         Rows are numbered 1..k in line order (the ledger has none for this
         issue), keeping the session name the line carries; numbering by the
         name's own suffix could REPLACE a row when a line is missing. Not
-        written on a dry run (no ledger write is), but the returned values
-        let the dry pass reach the same decision."""
+        written on a dry run (no ledger write is); `evaluate` carries the
+        returned count and the newest line's session name into the reads
+        that would otherwise look for these rows (the attempt cap, the
+        lane's liveness), so the dry pass reaches the same decision."""
         for attempt, orphan in enumerate(orphans, start=1):
             log.warning(
                 "%s: adopted orphaned attempt %d from activity log (`%s`, "
@@ -10289,8 +10319,15 @@ class DevWatcher:
         Not silent forever (issue #200): once the skip has persisted for
         STALLED_DEFER_MULTIPLE stale windows (clock: the episode's durable
         first-seen row) it posts ONE operator comment, recorded only after
-        it lands so a failed post retries next poll."""
+        it lands so a failed post retries next poll.
+
+        The clock is per EPISODE (issue #204): the issue pass ends it the
+        first time it does not reach this skip for the issue -- unassigned,
+        adopted, spawned, closed or unlabeled -- so a hand assignment weeks
+        later waits its own full window instead of paging on its first
+        poll. The page itself stays once-ever."""
         full_name, number = issue.full_name, issue.number
+        self._outside_seen.add((full_name, number))
         reason = (
             f"assigned to {login} outside this daemon (no spawn on the "
             f"ledger) — unassign the issue to let the loop take it"
@@ -13798,6 +13835,7 @@ class DevWatcher:
         )
 
         results = []
+        self._outside_seen = set()
         for owner, repo, number, assignees in _oldest_first(found):
             slug = f"{owner}/{repo}#{number}"
             # Defense in depth: the search is already repo-scoped, but nothing
@@ -13832,10 +13870,21 @@ class DevWatcher:
                     log.error("%s: %s", slug, exc)
                     # Owed: an evaluation that failed is unknown, never settled.
                     decision = Decision(Action.SKIPPED, str(exc), owed=True)
+                    # Unknown is not ended either: a transient failure must
+                    # not restart an assigned-outside wait.
+                    self._outside_seen.add((f"{owner}/{repo}", number))
 
             level = logging.INFO if decision.action != Action.SKIPPED else logging.DEBUG
             log.log(level, "%s → %s (%s)", slug, decision.action.value, decision.reason)
             results.append((slug, decision))
+        # Issue #204: an assigned-outside episode lasts exactly as long as
+        # the skip keeps answering. Every first-seen clock this pass did not
+        # reach the skip for has ended; drop it, or a later hand assignment
+        # of the same issue inherits a wait that is weeks old and pages on
+        # its first poll. Not reached when the pass raised (RateLimited), and
+        # never on a dry run, which writes nothing.
+        if not self.config.dry_run:
+            self.state.prune_activity(ASSIGNED_OUTSIDE_SEEN, self._outside_seen)
         return results
 
     def _poll_prs(

alissa/tools/github/devloop/state.py

@@ -1289,6 +1289,54 @@ class State:
                 f"record_activity({repo_slug}#{number}, {kind})", write),
         )
 
+    def prune_activity(
+        self, kind: str, keep: "set[tuple[str, int]]"
+    ) -> int:
+        """Drop every activity_log row of exactly this KIND whose
+        (repo_slug, number) is not in `keep`. Returns how many rows were
+        dropped (0 when the store refused the write).
+
+        For a kind whose row is an EPISODE's first-seen clock rather than a
+        posted line's dedupe (issue #204: `assigned-outside-seen`): the
+        caller passes the subjects whose episode it saw still running this
+        pass, and every other clock of the kind ends, so a later episode on
+        the same item starts its own wait instead of inheriting this one's.
+
+        BEST-EFFORT with the SELECT inside the closure, and a pass with
+        nothing to drop reports `False`, for the reasons `prune_escalations`
+        gives. A held (unwritten) row of the kind is released alongside."""
+        dropped: "list[tuple[str, int]]" = []
+
+        def write() -> "bool | None":
+            del dropped[:]
+            rows = self._db.execute(
+                "SELECT repo_slug, number FROM activity_log WHERE kind=?",
+                (kind,),
+            ).fetchall()
+            dropped.extend(
+                (row["repo_slug"], int(row["number"])) for row in rows
+                if (row["repo_slug"], int(row["number"])) not in keep
+            )
+            if not dropped:
+                return False
+            for repo_slug, number in dropped:
+                self._db.execute(
+                    "DELETE FROM activity_log WHERE repo_slug=? AND number=? "
+                    "AND kind=?",
+                    (repo_slug, number, kind),
+                )
+            self._db.commit()
+            return True
+
+        wrote = self._best_effort(f"prune_activity({kind})", write)
+        for key in [
+            key for key in self._pending_gates
+            if key[0] == "activity_log" and key[3] == kind
+            and (key[1], key[2]) not in keep
+        ]:
+            self._pending_gates.pop(key, None)
+        return len(dropped) if wrote else 0
+
     # -- janitor holdouts (issue #99) ---------------------------------------
     #
     # The workspace janitor's once-per-episode memory. Every method here is

alissa/tools/github/devloop/version

@@ -1 +1 @@
-0.8.59
+0.8.61

{alissa_tools_github_devloop-0.8.59.dist-info → alissa_tools_github_devloop-0.8.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alissa-tools-github-devloop
-Version: 0.8.59
+Version: 0.8.61
 Summary: ALISSA-TOOLS-GITHUB-DEVLOOP
 Home-page: https://alissa.app
 Author: Fahera

{alissa_tools_github_devloop-0.8.59.dist-info → alissa_tools_github_devloop-0.8.61.dist-info}/RECORD

@@ -10,13 +10,13 @@ alissa/tools/github/devloop/hubs.py,sha256=yjnsnSHLG7GNNP8X2hILeAMV6P5n4JGc_IaAx
 alissa/tools/github/devloop/hungtests.py,sha256=TozIDydUe_Kn1m5EtGeGtYt_BrLqGznrNjikLYhxH-Q,24621
 alissa/tools/github/devloop/integration_check.py,sha256=JkFwz3JqOQBIvzszmiql-IMVGSH3lDers6mJUHh9zMM,17928
 alissa/tools/github/devloop/janitor.py,sha256=R8REoHBeY2cfW7fYJVhKr-F5z9Mjlc-vmv-z4KtvBZc,27360
-alissa/tools/github/devloop/loop.py,sha256=JxG-XCa3Ass2g2ZPqChTT6AwuTU__g8r3kL3o6IMDo4,704072
+alissa/tools/github/devloop/loop.py,sha256=0GhXYt-Ou6b4hCaVlW3MwBZojRpvtxgA7uTkXKMnknU,707186
 alissa/tools/github/devloop/loop_events.py,sha256=B8wq4_MMXbf1-od3pk9OHVo6F6W2lzzUZmU6GsKcCkM,38113
 alissa/tools/github/devloop/parking.py,sha256=7h3Gg2XQ0eqlvn0M6K6NeEg9xbqnlUPrZNs9gRofzxc,12410
 alissa/tools/github/devloop/proc.py,sha256=nzfsxJSHFWRQcrXmfv588KazFysv8dVQrhMPH1q5eRk,3134
 alissa/tools/github/devloop/prompts.py,sha256=VzN6ec5eF2wwg7QSCRg52WLcxo-tGbGRgQbc4HSahUc,55169
-alissa/tools/github/devloop/state.py,sha256=MIlE3siJjUs5YEv1-Xm-Gmur6B-Okq3M_Lu6d_zxtmA,89534
-alissa/tools/github/devloop/version,sha256=RUiBcvvmDXs3StQliqk4xZ9OHwNcLZhYv6BP72Tgq48,7
+alissa/tools/github/devloop/state.py,sha256=mZcKMtWKdwjRk4up74WVI_QZaOJF4JLjGWFMhx1k2FA,91591
+alissa/tools/github/devloop/version,sha256=G3rr6PpxmjA80IOCaXyiYP6ce9bJP9MLMtfPh8hyo00,7
 alissa/tools/github/devloop/version.py,sha256=znuuOaitXGrBpbskNy78_rlVpFdtmKmk_3k1ACxZrl0,1418
 alissa/tools/github/devloop/webui/__init__.py,sha256=vdXYoyGYzD7BrJ5lV6XdH8Bpw_pej8-RK0hjfxop7-8,1513
 alissa/tools/github/devloop/webui/__main__.py,sha256=wORyW5AkgsniK0TZcrOrvm_P7Q4Mr-fH-4S6qj9XcgA,6137
@@ -25,10 +25,10 @@ alissa/tools/github/devloop/webui/page.py,sha256=4OD3e01ByvVM4Wo04AZyFuyOYTFEMT2
 alissa/tools/github/devloop/webui/server.py,sha256=3aGYGesjUSrPrgcpfy-oYDefBNKnAj3lGfRzwsRkv_I,27031
 alissa/tools/github/devloop/webui/sources.py,sha256=Uw_2B5QGSmW6f66WfVbQb6yLLYmSv6uuF7HNJ5OSr_I,39314
 alissa/tools/github/devloop/webui/sysinfo.py,sha256=ptlogH9alFv0vZ-pQfyUaA3w-K7LQS3tQHGv0d8Tdlk,9649
-alissa_tools_github_devloop-0.8.59.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-alissa_tools_github_devloop-0.8.59.dist-info/licenses/NOTICE,sha256=FKstNs3uw_tQod4_1XcFLD1FUTJQXf4FC0oXJAOA_HE,260
-alissa_tools_github_devloop-0.8.59.dist-info/METADATA,sha256=DJWWCbT9oCvjlvPArIt3qbJuS-PjP9VKsue_c17-PYw,15973
-alissa_tools_github_devloop-0.8.59.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-alissa_tools_github_devloop-0.8.59.dist-info/entry_points.txt,sha256=8aC7Ajzx4bu9ZRR37a40IDfuStacvZP5KsAxY1dbFKU,145
-alissa_tools_github_devloop-0.8.59.dist-info/top_level.txt,sha256=DodjDg-l-TWQnlxG-Vuc3G5sB4O7cWGQwe6XrVx3u-A,7
-alissa_tools_github_devloop-0.8.59.dist-info/RECORD,,
+alissa_tools_github_devloop-0.8.61.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+alissa_tools_github_devloop-0.8.61.dist-info/licenses/NOTICE,sha256=FKstNs3uw_tQod4_1XcFLD1FUTJQXf4FC0oXJAOA_HE,260
+alissa_tools_github_devloop-0.8.61.dist-info/METADATA,sha256=0xoJnkXt8Xv4qVsf_C7lFVHdGVm05j410cO-eRY29-Q,15973
+alissa_tools_github_devloop-0.8.61.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+alissa_tools_github_devloop-0.8.61.dist-info/entry_points.txt,sha256=8aC7Ajzx4bu9ZRR37a40IDfuStacvZP5KsAxY1dbFKU,145
+alissa_tools_github_devloop-0.8.61.dist-info/top_level.txt,sha256=DodjDg-l-TWQnlxG-Vuc3G5sB4O7cWGQwe6XrVx3u-A,7
+alissa_tools_github_devloop-0.8.61.dist-info/RECORD,,