alissa-tools-github-devloop 0.8.34__tar.gz → 0.8.36__tar.gz

{alissa_tools_github_devloop-0.8.34/src/main/alissa_tools_github_devloop.egg-info → alissa_tools_github_devloop-0.8.36}/PKG-INFO

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

{alissa_tools_github_devloop-0.8.34 → alissa_tools_github_devloop-0.8.36}/src/main/alissa/tools/github/devloop/alissa.py

@@ -116,7 +116,49 @@ def send_keys_argv(name: str, keys: "tuple[str, ...]") -> "list[str]":
     return ["tmux", "-S", tmux_socket(), "send-keys", "-t", tmux_target(name), *keys]
 
 
+# The two spawn stamps of the Studio cost meter (loop-cost-meter.md §2.3,
+# §2.4, issue #149): `--task` names the ORIGIN task the session serves and
+# `--repo` the canonical lowercase `owner/name`, so the session row carries
+# `focusTaskId` and `repo` from its first second. Each flag is matched as a
+# whole option token in `alissa tmux queue add --help`.
+_TASK_FLAG_RE = re.compile(r"(?<![\w-])--task(?![\w-])")
+_REPO_FLAG_RE = re.compile(r"(?<![\w-])--repo(?![\w-])")
+
+
+def queue_add_accepts_stamps(help_text: str) -> bool:
+    """True when `alissa tmux queue add --help` lists BOTH `--task` and
+    `--repo`. Both or neither: a CLI with `--task` alone predates the stamp
+    (its `--task` links a queue item for shell write-back, and the session
+    row has no `repo` to fill), so it gets neither flag."""
+    text = help_text or ""
+    return bool(_TASK_FLAG_RE.search(text) and _REPO_FLAG_RE.search(text))
+
+
 class Alissa:
+    def __init__(self) -> None:
+        # The stamp probe's verdict, read once per process (one Alissa per
+        # watcher, one watcher per daemon): None until a probe has answered.
+        self._stamps_accepted: "bool | None" = None
+
+    def accepts_spawn_stamps(self) -> bool:
+        """Whether the installed CLI's `queue add` takes `--task`/`--repo`.
+        Probed once and cached; a probe that cannot run at all (a timeout,
+        a missing binary) reads as "no" for THIS spawn and is not cached, so
+        a transient failure never switches the stamps off for good."""
+        if self._stamps_accepted is None:
+            try:
+                out = run(["alissa", "tmux", "queue", "add", "--help"],
+                          timeout=30, check=False)
+            except (CommandError, OSError) as exc:
+                log.warning("could not probe `alissa tmux queue add --help` "
+                            "(%s); enqueuing without --task/--repo", exc)
+                return False
+            self._stamps_accepted = queue_add_accepts_stamps(out)
+            if not self._stamps_accepted:
+                log.info("the installed alissa CLI does not accept "
+                         "`queue add --task/--repo`; spawns go unstamped")
+        return self._stamps_accepted
+
     def enqueue_developer(
         self,
         *,
@@ -124,8 +166,14 @@ class Alissa:
         directive: str,
         cwd: Path,
         agent: str,
+        task_ref: "str | None" = None,
+        repo: "str | None" = None,
         dry_run: bool = False,
     ) -> None:
+        """Enqueue the session. `task_ref` (the ORIGIN task, `TASK-<n>`) and
+        `repo` (`owner/name`, lowercased here) are passed as `--task` /
+        `--repo` only when the installed CLI accepts both; an older CLI gets
+        neither, so the enqueue never fails for want of a stamp."""
         argv = [
             "alissa",
             "tmux",
@@ -136,13 +184,20 @@ class Alissa:
             agent,
             "--cwd",
             str(cwd),
-            directive,
         ]
+        stamps: "list[str]" = []
+        if task_ref:
+            stamps += ["--task", task_ref]
+        if repo:
+            stamps += ["--repo", repo.lower()]
 
         if dry_run:
-            log.info("[dry-run] would enqueue: %s", " ".join(argv[:-1]) + " <directive>")
+            log.info("[dry-run] would enqueue: %s", " ".join(argv + stamps) + " <directive>")
             return
 
+        if stamps and self.accepts_spawn_stamps():
+            argv += stamps
+        argv.append(directive)
         run(argv, timeout=60)
 
         # Developers are one-shot per attempt: a finished (or dead) session must

{alissa_tools_github_devloop-0.8.34 → alissa_tools_github_devloop-0.8.36}/src/main/alissa/tools/github/devloop/loop.py

@@ -2366,6 +2366,28 @@ def revert_task_number(body: str) -> int:
     return 0
 
 
+# The ORIGIN task as a PR body names it, for the spawn stamp (issue #149):
+# the `Alissa-Task:` trailer first, then the worker's own `Origin task:` /
+# `Origin Alissa task:` line (both spellings are on live bodies). Unlike
+# REVERT_TASK_KEYS there is NO `Implementation task:` fallback -- the stamp
+# claims the session serves the origin, and a downstream task is not one.
+_ORIGIN_TASK_RES = tuple(
+    re.compile(rf"{key}\**\s*:\**\s*`?TASK-(\d+)", re.IGNORECASE)
+    for key in (r"Alissa-Task", r"Origin(?:\s+Alissa)?\s+task")
+)
+
+
+def pr_origin_task_ref(body: str) -> "str | None":
+    """`TASK-<n>` for the origin task a PR body names, or None -- in which
+    case the fix, maintain and revert edges spawn unstamped."""
+    text = body or ""
+    for pattern in _ORIGIN_TASK_RES:
+        match = pattern.search(text)
+        if match:
+            return f"TASK-{match.group(1)}"
+    return None
+
+
 def revert_branch(task_number: int, pr_number: int) -> str:
     """`TASK-<n>-REVERT-PR<k>`: the revert branch's name, a `TASK-<n>-<DESC>`
     shape by construction so the fix and maintain edges spawn on it."""
@@ -4065,6 +4087,8 @@ class DevWatcher:
             directive=directive,
             cwd=hub,
             agent=self.config.agent_profile,
+            task_ref=task_ref,
+            repo=issue.full_name,
             dry_run=self.config.dry_run,
         )
 
@@ -7330,6 +7354,8 @@ class DevWatcher:
             directive=directive,
             cwd=hub,
             agent=self.config.agent_profile,
+            task_ref=pr_origin_task_ref(pr.body),
+            repo=pr.full_name,
             dry_run=self.config.dry_run,
         )
 
@@ -7595,6 +7621,8 @@ class DevWatcher:
             directive=directive,
             cwd=hub,
             agent=self.config.agent_profile,
+            task_ref=pr_origin_task_ref(pr.body),
+            repo=pr.full_name,
             dry_run=self.config.dry_run,
         )
 
@@ -7985,6 +8013,8 @@ class DevWatcher:
             directive=directive,
             cwd=hub,
             agent=self.config.agent_profile,
+            task_ref=pr_origin_task_ref(pr.body),
+            repo=pr.full_name,
             dry_run=self.config.dry_run,
         )
 

alissa_tools_github_devloop-0.8.36/src/main/alissa/tools/github/devloop/version

@@ -0,0 +1 @@
+0.8.36

{alissa_tools_github_devloop-0.8.34 → alissa_tools_github_devloop-0.8.36/src/main/alissa_tools_github_devloop.egg-info}/PKG-INFO

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

alissa_tools_github_devloop-0.8.34/src/main/alissa/tools/github/devloop/version

@@ -1 +0,0 @@
-0.8.34