queue-watch 0.1.0__tar.gz → 0.3.0__tar.gz

{queue_watch-0.1.0 → queue_watch-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: queue-watch
-Version: 0.1.0
+Version: 0.3.0
 Summary: Read-only terminal dashboard for CI runs and merge queues, with mouse support
 Project-URL: Homepage, https://github.com/wolfiesch/queue-watch
 Project-URL: Issues, https://github.com/wolfiesch/queue-watch/issues
@@ -29,7 +29,19 @@ Description-Content-Type: text/markdown
 
 Read-only terminal dashboard for CI runs and merge queues. It joins records from every source into one row per change, so a branch's CI runs and its merge-queue entry read together, and draws each merge queue as a chain of chips in queue order. queue-watch never reruns, cancels, merges or takes a lock.
 
-![queue-watch showing a merge queue of four changes, the Changes table grouped by state, and the inspector for a failed change](https://raw.githubusercontent.com/wolfiesch/queue-watch/main/docs/screenshot.png)
+![queue-watch --demo: a merge queue landing changes one after another while CI runs finish, one fails and a fix goes through](https://raw.githubusercontent.com/wolfiesch/queue-watch/main/docs/demo.gif)
+
+Try it without a GitHub login:
+
+```sh
+uvx queue-watch --demo
+```
+
+## Why
+
+`gh run watch` follows one run, and GitHub's web UI shows Actions and the merge queue on separate pages. When several pull requests are queued at once, the questions are about the whole set: which one is merging now, which are waiting on checks, which failure is holding the queue up, and when the last one should land.
+
+queue-watch answers them on one screen for a whole repository and keeps refreshing on its own. It joins each change's CI runs and queue entry into one row, puts the attention cases first, and shows the queue in merge order with GitHub's estimates. It also watches queues GitHub never sees: a merge lock on a build host, or anything a short script can describe as JSON.
 
 ## Install
 
@@ -38,7 +50,7 @@ uv tool install queue-watch     # or: pipx install queue-watch
 uvx queue-watch                 # run once without installing
 ```
 
-Requires Python 3.11+. The GitHub adapters use an authenticated [GitHub CLI](https://cli.github.com/) (`gh auth login`).
+Requires Python 3.11+. The GitHub adapters use an authenticated [GitHub CLI](https://cli.github.com/) (`gh auth login`); `--demo` needs neither.
 
 ## Use
 
@@ -46,20 +58,39 @@ Requires Python 3.11+. The GitHub adapters use an authenticated [GitHub CLI](htt
 queue-watch                              # inside a GitHub checkout
 queue-watch --repo owner/repo            # Actions plus the merge queue, if any
 queue-watch --profile work               # ~/.config/queue-watch/work.toml
+queue-watch profile add work --repo acme/api --repo acme/web
 queue-watch --config sources.toml        # any combination of sources
 queue-watch --repo owner/repo --once     # one JSON snapshot, no TUI
-queue-watch --theme nord --ascii         # any Textual theme; ASCII glyphs only
+queue-watch --demo                       # a simulated repository
+queue-watch --theme nord --ascii         # another Textual theme; ASCII glyphs only
 queue-watch --density comfortable        # title, owner and PR on a second line
 ```
 
-With no flags, queue-watch looks for a `.queue-watch.toml` at the root of the current Git checkout. Without one, it watches the checkout's GitHub repository: Actions runs, plus the merge queue when the default branch has one. `--profile NAME` reads `$XDG_CONFIG_HOME/queue-watch/NAME.toml` (default `~/.config`).
+With no flags, queue-watch looks for a `.queue-watch.toml` at the root of the current Git checkout. Without one, it watches the checkout's GitHub repository: Actions runs, plus the merge queue when the default branch has one. Outside a GitHub checkout it opens the profile named `default`.
 
 The Changes tab groups changes into Needs attention, Running, Queued and Done; every view a source reports also gets its own tab. Done starts folded while any other group has changes; press enter on a group row, or click it, to fold or unfold it. Select a change or a queue chip to see its CI checks, the jobs of the most notable one, its queue position and ETA, and recent history in the inspector.
 
+![queue-watch showing a merge queue of four changes, the Changes table grouped by state, and the inspector for a failed change](https://raw.githubusercontent.com/wolfiesch/queue-watch/main/docs/screenshot.png)
+
 Each merge queue gets a strip above the tabs: its entries in merge order, when it should clear, merges in the last hour, and how long recent attempts took. Queue depth over the session appears as a sparkline once two fetches have answered; sources report only the current queue, so the history starts when queue-watch does. On terminals under 30 rows the entries shrink to one line each.
 
 Keyboard: arrows to move, `1` to `9` for tabs, `/` to search (esc to clear), `o` to open the selection in a browser, `c` to copy its SHA, `d` to switch row density, `r` to refresh, `p` to pause, `q` to quit. The mouse works too: click tabs, rows, chips and the inspector buttons, and scroll with the wheel. When a source fails, its last good data stays on screen and its status pill turns stale.
 
+The default `queue-watch` theme draws on a black background and gives each region its own coloured box. Pass `--theme` with any Textual theme name, or pick one live from the command palette (ctrl+p).
+
+### Profiles
+
+A profile is a named list of sources in `$XDG_CONFIG_HOME/queue-watch/NAME.toml` (default `~/.config`), so one dashboard can watch a group of repositories:
+
+```sh
+queue-watch profile add work --repo acme/api --repo acme/web   # creates or extends work.toml
+queue-watch profile list                                       # every profile and its sources
+queue-watch --profile work
+queue-watch profile add default --repo acme/api                # opens outside any checkout
+```
+
+`profile add` writes Actions for each repository, plus its merge queue when the default branch has one, with the repository's name in each label. Repositories already in the profile are left alone, and anything written by hand stays. A profile is ordinary [source config](#sources), so you can add `command` and `flock-queue` sources too. When a dashboard spans several repositories, a branch name such as `main` in two of them is two rows, each labelled with its repository.
+
 ### Repository configs need trust
 
 A config can run commands and open SSH connections, so a `.queue-watch.toml` that arrives with a clone does nothing until you review it and run:
@@ -124,7 +155,7 @@ The program must exit zero and print one snapshot (below) on stdout within `time
 
 ## Snapshot contract
 
-Every adapter emits the same versioned snapshot (`queue-watch.snapshot/1`): a list of records with `id`, `kind`, `state` and `title`, plus optional `ref`, `sha`, `owner`, `position`, timestamps, `url`, `fields` and `children`. `state` is one of `queued`, `running`, `blocked`, `success`, `failure`, `cancelled`, `neutral` or `unknown`; the adapter's own term is kept in `raw_state`. Records that share a `ref` or `sha` describe the same change across sources. [`model.py`](https://github.com/wolfiesch/queue-watch/blob/main/src/queue_watch/model.py) defines and validates the contract, and `--once` prints it.
+Every adapter emits the same versioned snapshot (`queue-watch.snapshot/1`): a list of records with `id`, `kind`, `state` and `title`, plus optional `ref`, `sha`, `repo`, `owner`, `position`, timestamps, `url`, `fields` and `children`. `state` is one of `queued`, `running`, `blocked`, `success`, `failure`, `cancelled`, `neutral` or `unknown`; the adapter's own term is kept in `raw_state`. Records that share a `ref` or `sha` describe the same change across sources. Once records name more than one `repo` (`owner/name`, set by the GitHub adapters), a change also needs the same `repo`, and records without one join only each other; a `command` source watching several repositories should set it. [`model.py`](https://github.com/wolfiesch/queue-watch/blob/main/src/queue_watch/model.py) defines and validates the contract, and `--once` prints it.
 
 ## Development
 
@@ -134,7 +165,7 @@ uv run pytest -q                        # includes SVG snapshot tests
 uv run pytest -q --snapshot-update      # after an intended layout change
 ```
 
-`docs/screenshot.png` is the wide layout snapshot rendered in a browser. To release, bump `__version__` in `src/queue_watch/__init__.py`, merge, and push a matching `vX.Y.Z` tag; the release workflow tests, builds, publishes to PyPI with trusted publishing, and creates the GitHub release.
+`docs/screenshot.png` is the wide layout snapshot rendered in a browser; `uv run python docs/record_demo.py` re-records `docs/demo.gif` (needs Chrome and ffmpeg). To release, bump `__version__` in `src/queue_watch/__init__.py`, merge, and push a matching `vX.Y.Z` tag; the release workflow tests, builds, publishes to PyPI with trusted publishing, and creates the GitHub release.
 
 ## License
 

{queue_watch-0.1.0 → queue_watch-0.3.0}/README.md

@@ -2,7 +2,19 @@
 
 Read-only terminal dashboard for CI runs and merge queues. It joins records from every source into one row per change, so a branch's CI runs and its merge-queue entry read together, and draws each merge queue as a chain of chips in queue order. queue-watch never reruns, cancels, merges or takes a lock.
 
-![queue-watch showing a merge queue of four changes, the Changes table grouped by state, and the inspector for a failed change](https://raw.githubusercontent.com/wolfiesch/queue-watch/main/docs/screenshot.png)
+![queue-watch --demo: a merge queue landing changes one after another while CI runs finish, one fails and a fix goes through](https://raw.githubusercontent.com/wolfiesch/queue-watch/main/docs/demo.gif)
+
+Try it without a GitHub login:
+
+```sh
+uvx queue-watch --demo
+```
+
+## Why
+
+`gh run watch` follows one run, and GitHub's web UI shows Actions and the merge queue on separate pages. When several pull requests are queued at once, the questions are about the whole set: which one is merging now, which are waiting on checks, which failure is holding the queue up, and when the last one should land.
+
+queue-watch answers them on one screen for a whole repository and keeps refreshing on its own. It joins each change's CI runs and queue entry into one row, puts the attention cases first, and shows the queue in merge order with GitHub's estimates. It also watches queues GitHub never sees: a merge lock on a build host, or anything a short script can describe as JSON.
 
 ## Install
 
@@ -11,7 +23,7 @@ uv tool install queue-watch     # or: pipx install queue-watch
 uvx queue-watch                 # run once without installing
 ```
 
-Requires Python 3.11+. The GitHub adapters use an authenticated [GitHub CLI](https://cli.github.com/) (`gh auth login`).
+Requires Python 3.11+. The GitHub adapters use an authenticated [GitHub CLI](https://cli.github.com/) (`gh auth login`); `--demo` needs neither.
 
 ## Use
 
@@ -19,20 +31,39 @@ Requires Python 3.11+. The GitHub adapters use an authenticated [GitHub CLI](htt
 queue-watch                              # inside a GitHub checkout
 queue-watch --repo owner/repo            # Actions plus the merge queue, if any
 queue-watch --profile work               # ~/.config/queue-watch/work.toml
+queue-watch profile add work --repo acme/api --repo acme/web
 queue-watch --config sources.toml        # any combination of sources
 queue-watch --repo owner/repo --once     # one JSON snapshot, no TUI
-queue-watch --theme nord --ascii         # any Textual theme; ASCII glyphs only
+queue-watch --demo                       # a simulated repository
+queue-watch --theme nord --ascii         # another Textual theme; ASCII glyphs only
 queue-watch --density comfortable        # title, owner and PR on a second line
 ```
 
-With no flags, queue-watch looks for a `.queue-watch.toml` at the root of the current Git checkout. Without one, it watches the checkout's GitHub repository: Actions runs, plus the merge queue when the default branch has one. `--profile NAME` reads `$XDG_CONFIG_HOME/queue-watch/NAME.toml` (default `~/.config`).
+With no flags, queue-watch looks for a `.queue-watch.toml` at the root of the current Git checkout. Without one, it watches the checkout's GitHub repository: Actions runs, plus the merge queue when the default branch has one. Outside a GitHub checkout it opens the profile named `default`.
 
 The Changes tab groups changes into Needs attention, Running, Queued and Done; every view a source reports also gets its own tab. Done starts folded while any other group has changes; press enter on a group row, or click it, to fold or unfold it. Select a change or a queue chip to see its CI checks, the jobs of the most notable one, its queue position and ETA, and recent history in the inspector.
 
+![queue-watch showing a merge queue of four changes, the Changes table grouped by state, and the inspector for a failed change](https://raw.githubusercontent.com/wolfiesch/queue-watch/main/docs/screenshot.png)
+
 Each merge queue gets a strip above the tabs: its entries in merge order, when it should clear, merges in the last hour, and how long recent attempts took. Queue depth over the session appears as a sparkline once two fetches have answered; sources report only the current queue, so the history starts when queue-watch does. On terminals under 30 rows the entries shrink to one line each.
 
 Keyboard: arrows to move, `1` to `9` for tabs, `/` to search (esc to clear), `o` to open the selection in a browser, `c` to copy its SHA, `d` to switch row density, `r` to refresh, `p` to pause, `q` to quit. The mouse works too: click tabs, rows, chips and the inspector buttons, and scroll with the wheel. When a source fails, its last good data stays on screen and its status pill turns stale.
 
+The default `queue-watch` theme draws on a black background and gives each region its own coloured box. Pass `--theme` with any Textual theme name, or pick one live from the command palette (ctrl+p).
+
+### Profiles
+
+A profile is a named list of sources in `$XDG_CONFIG_HOME/queue-watch/NAME.toml` (default `~/.config`), so one dashboard can watch a group of repositories:
+
+```sh
+queue-watch profile add work --repo acme/api --repo acme/web   # creates or extends work.toml
+queue-watch profile list                                       # every profile and its sources
+queue-watch --profile work
+queue-watch profile add default --repo acme/api                # opens outside any checkout
+```
+
+`profile add` writes Actions for each repository, plus its merge queue when the default branch has one, with the repository's name in each label. Repositories already in the profile are left alone, and anything written by hand stays. A profile is ordinary [source config](#sources), so you can add `command` and `flock-queue` sources too. When a dashboard spans several repositories, a branch name such as `main` in two of them is two rows, each labelled with its repository.
+
 ### Repository configs need trust
 
 A config can run commands and open SSH connections, so a `.queue-watch.toml` that arrives with a clone does nothing until you review it and run:
@@ -97,7 +128,7 @@ The program must exit zero and print one snapshot (below) on stdout within `time
 
 ## Snapshot contract
 
-Every adapter emits the same versioned snapshot (`queue-watch.snapshot/1`): a list of records with `id`, `kind`, `state` and `title`, plus optional `ref`, `sha`, `owner`, `position`, timestamps, `url`, `fields` and `children`. `state` is one of `queued`, `running`, `blocked`, `success`, `failure`, `cancelled`, `neutral` or `unknown`; the adapter's own term is kept in `raw_state`. Records that share a `ref` or `sha` describe the same change across sources. [`model.py`](https://github.com/wolfiesch/queue-watch/blob/main/src/queue_watch/model.py) defines and validates the contract, and `--once` prints it.
+Every adapter emits the same versioned snapshot (`queue-watch.snapshot/1`): a list of records with `id`, `kind`, `state` and `title`, plus optional `ref`, `sha`, `repo`, `owner`, `position`, timestamps, `url`, `fields` and `children`. `state` is one of `queued`, `running`, `blocked`, `success`, `failure`, `cancelled`, `neutral` or `unknown`; the adapter's own term is kept in `raw_state`. Records that share a `ref` or `sha` describe the same change across sources. Once records name more than one `repo` (`owner/name`, set by the GitHub adapters), a change also needs the same `repo`, and records without one join only each other; a `command` source watching several repositories should set it. [`model.py`](https://github.com/wolfiesch/queue-watch/blob/main/src/queue_watch/model.py) defines and validates the contract, and `--once` prints it.
 
 ## Development
 
@@ -107,7 +138,7 @@ uv run pytest -q                        # includes SVG snapshot tests
 uv run pytest -q --snapshot-update      # after an intended layout change
 ```
 
-`docs/screenshot.png` is the wide layout snapshot rendered in a browser. To release, bump `__version__` in `src/queue_watch/__init__.py`, merge, and push a matching `vX.Y.Z` tag; the release workflow tests, builds, publishes to PyPI with trusted publishing, and creates the GitHub release.
+`docs/screenshot.png` is the wide layout snapshot rendered in a browser; `uv run python docs/record_demo.py` re-records `docs/demo.gif` (needs Chrome and ffmpeg). To release, bump `__version__` in `src/queue_watch/__init__.py`, merge, and push a matching `vX.Y.Z` tag; the release workflow tests, builds, publishes to PyPI with trusted publishing, and creates the GitHub release.
 
 ## License
 

{queue_watch-0.1.0 → queue_watch-0.3.0}/src/queue_watch/__init__.py

@@ -1,3 +1,3 @@
 """Read-only terminal dashboard for CI runs and merge queues."""
 
-__version__ = "0.1.0"
+__version__ = "0.3.0"

{queue_watch-0.1.0 → queue_watch-0.3.0}/src/queue_watch/adapters/github_actions.py

@@ -76,7 +76,7 @@ class GitHubActions(Adapter):
         return {
             "schema": SCHEMA,
             "observed_at": datetime.now(UTC).isoformat(),
-            "records": [self.record(run) for run in ordered],
+            "records": [{**self.record(run), "repo": self.repo} for run in ordered],
             "views": [
                 {
                     "kind": "run",

{queue_watch-0.1.0 → queue_watch-0.3.0}/src/queue_watch/adapters/github_merge_queue.py

@@ -82,7 +82,7 @@ class GitHubMergeQueue(Adapter):
                 warnings.append(
                     f"showing first {len(entries['nodes'])} of {entries['totalCount']} entries"
                 )
-            records = [self.record(entry) for entry in entries["nodes"]]
+            records = [{**self.record(entry), "repo": self.repo} for entry in entries["nodes"]]
         return {
             "schema": SCHEMA,
             "observed_at": datetime.now(UTC).isoformat(),

{queue_watch-0.1.0 → queue_watch-0.3.0}/src/queue_watch/app.py

@@ -22,6 +22,7 @@ from textual.binding import Binding
 from textual.containers import Horizontal, Vertical
 from textual.content import Content
 from textual.events import Resize
+from textual.theme import Theme
 from textual.widgets import Button, DataTable, Footer, Input, Static, TabbedContent, TabPane
 
 from . import widgets
@@ -65,10 +66,40 @@ CHANGES = "changes-tab"
 CHILD_TTL = 15
 BAR = 8  # job duration bar cells; a job line fits the narrowest inspector
 
+# The default theme: a black backdrop like most terminals, with one hue per box (queue
+# strips use accent, the tabs primary, the inspector secondary) to give the screen structure.
+THEME = Theme(
+    name="queue-watch",
+    primary="#5FAFFF",
+    secondary="#AF87FF",
+    accent="#FF875F",
+    warning="#FFD75F",
+    error="#FF5F6D",
+    success="#5FD787",
+    foreground="#D4D4D4",
+    background="#000000",
+    surface="#000000",
+    panel="#000000",
+    dark=True,
+    variables={
+        "footer-background": "#000000",
+        "footer-key-foreground": "#FF875F",
+        "footer-description-foreground": "#9E9E9E",
+        "scrollbar": "#3A3A3A",
+        "scrollbar-hover": "#5A5A5A",
+        "scrollbar-active": "#5FAFFF",
+        "scrollbar-background": "#000000",
+        "scrollbar-background-hover": "#000000",
+        "scrollbar-background-active": "#000000",
+        "scrollbar-corner-color": "#000000",
+        "button-color-foreground": "#D4D4D4",
+    },
+)
+
 CSS = """
 Screen { background: $surface; }
 #status { height: 1; padding: 0 1; background: $panel; color: $foreground; }
-#status #brand { width: auto; margin-right: 2; color: $primary; }
+#status #brand { width: auto; margin-right: 2; color: $accent; }
 #status .pill { width: auto; padding: 0 1; margin-right: 1; }
 #status .pill.live { background: $success 25%; color: $text-success; }
 #status .pill.paused { background: $primary 20%; color: $text-primary; }
@@ -80,8 +111,18 @@ Screen { background: $surface; }
 .-narrow #status #counts-long { display: none; }
 .-narrow #status #counts-short { display: block; }
 
+/* One coloured, rounded box per region, titled in its top border. */
+.queue, #tabs, #inspector { border-title-style: bold; border-title-align: left; }
+.queue { border: round $accent 70%; border-title-color: $accent; }
+#tabs { border: round $primary 70%; border-title-color: $primary; }
+#inspector { border: round $secondary 70%; border-title-color: $secondary; }
+.-ascii .queue { border: ascii $accent 70%; }
+.-ascii #tabs { border: ascii $primary 70%; }
+.-ascii #inspector { border: ascii $secondary 70%; }
+.-short .queue { border: none; border-top: solid $accent 70%; }
+
 #queues { height: auto; }
-.queue { height: auto; padding: 0 1; border-bottom: solid $foreground 20%; }
+.queue { height: auto; padding: 0 1; }
 .queue-head { height: 1; }
 .queue-head .queue-title { width: auto; }
 .queue-head .queue-eta { width: 1fr; min-width: 18; padding-left: 2; }
@@ -121,7 +162,8 @@ Tabs { height: 2; }
 OptionList {
     height: 1fr; background: $surface; border: none; padding: 0; scrollbar-size-vertical: 1;
 }
-OptionList:focus { border: none; }
+OptionList:focus { border: none; background-tint: $foreground 0%; }
+DataTable:focus { background-tint: $foreground 0%; }
 OptionList > .option-list--option { padding: 0 1; }
 OptionList > .option-list--option-highlighted { background: $primary 28%; color: $foreground; text-style: none; }
 OptionList:focus > .option-list--option-highlighted { background: $primary 40%; color: $foreground; text-style: none; }
@@ -132,14 +174,14 @@ DataTable > .datatable--header { background: $panel; color: $text-muted; text-st
 DataTable > .datatable--cursor { background: $primary 30%; color: $foreground; }
 
 #inspector {
-    width: 32%; min-width: 40; max-width: 64; height: 1fr; padding: 0 1;
-    border-left: solid $foreground 20%; background: $surface; scrollbar-size-vertical: 1;
+    width: 32%; min-width: 42; max-width: 66; height: 1fr; padding: 0 1;
+    background: $surface; scrollbar-size-vertical: 1;
 }
 #insp-head { height: auto; padding-bottom: 1; }
 #insp-actions { height: auto; padding-bottom: 1; }
 #insp-actions Button { margin-right: 1; background: $primary 30%; color: $foreground; }
 #sections { height: auto; }
-.section-title { background: $panel; padding: 0 1; margin-top: 1; height: 1; }
+.section-title { background: $panel; color: $secondary; text-style: bold; padding: 0 1; margin-top: 1; height: 1; }
 .section-body { height: auto; padding: 0 1; }
 
 #notices { display: none; height: auto; max-height: 4; padding: 0 1; color: $text-warning; background: $panel; }
@@ -249,11 +291,12 @@ class QueueWatch(App):
         self,
         sources: list[Source],
         *,
-        theme: str = "tokyo-night",
+        theme: str = THEME.name,
         ascii: bool = False,
         density: str = "compact",
     ):
         super().__init__()
+        self.register_theme(THEME)
         self.sources = {source.id: source for source in sources}
         self.order = list(self.sources)
         self.initial_theme = theme
@@ -593,7 +636,8 @@ class QueueWatch(App):
         return bool(record.get("children")) or type(adapter).children is not Adapter.children
 
     def change_view(self, change: Change):
-        meta = [clean(change.ref or change.key)]
+        meta = [clean(change.repo)] if change.repo else []
+        meta.append(clean(change.ref or change.sha or change.key))
         if change.sha:
             meta.append(clean(change.sha)[:7])
         if change.pr:

{queue_watch-0.1.0 → queue_watch-0.3.0}/src/queue_watch/changes.py

@@ -1,7 +1,9 @@
 """Changes: records from every source that describe the same branch or commit.
 
 Records correlate by ``ref`` and fall back to ``sha``; records with neither stay
-in their source's own tab. Kinds with a role in a change: ``run`` (CI),
+in their source's own tab. When records name more than one ``repo``, the same ref
+in two repositories is two changes, and records without a ``repo`` form changes of
+their own. Kinds with a role in a change: ``run`` (CI),
 ``queue_entry`` (live merge queue position) and ``attempt`` (a finished merge
 attempt). Other kinds are only shown per source.
 """
@@ -51,6 +53,7 @@ class Change:
     key: str
     ref: str | None = None
     sha: str | None = None
+    repo: str | None = None  # set only when the snapshots span several repositories
     runs: list[Hit] = field(default_factory=list)  # newest first
     entries: list[Hit] = field(default_factory=list)  # queue order
     attempts: list[Hit] = field(default_factory=list)  # newest first
@@ -133,24 +136,36 @@ class Change:
 
 
 def correlate(snapshots: dict[str, dict]) -> list[Change]:
-    """One Change per ref (falling back to sha), in merge order, then most recent."""
-    by_ref: dict[str, Change] = {}
-    by_sha: dict[str, Change] = {}
+    """One Change per repository and ref (falling back to sha), in merge order, then
+    most recent. Repositories only separate changes when more than one appears."""
+    # GitHub repository names are case-insensitive.
+    repos = {
+        record["repo"].casefold()
+        for snapshot in snapshots.values()
+        for record in snapshot.get("records", [])
+        if record.get("repo")
+    }
+    several = len(repos) > 1
+    by_ref: dict[tuple[str | None, str], Change] = {}
+    by_sha: dict[tuple[str | None, str], Change] = {}
     changes: list[Change] = []
     for source, snapshot in snapshots.items():
         for record in snapshot.get("records", []):
             ref, sha = record.get("ref"), record.get("sha")
             if record["kind"] not in ROLES or not (ref or sha):
                 continue
-            change = (ref and by_ref.get(ref)) or (sha and by_sha.get(sha))
+            repo = (record.get("repo") or None) if several else None
+            scope = repo and repo.casefold()
+            change = (ref and by_ref.get((scope, ref))) or (sha and by_sha.get((scope, sha)))
             if not change:
-                change = Change(key=ref or sha)
+                name = ref or sha
+                change = Change(key=f"{scope}:{name}" if scope else name, repo=repo)
                 changes.append(change)
             if ref:
-                by_ref.setdefault(ref, change)
+                by_ref.setdefault((scope, ref), change)
                 change.ref = change.ref or ref
             if sha:
-                by_sha.setdefault(sha, change)
+                by_sha.setdefault((scope, sha), change)
                 change.sha = change.sha or sha
             hit = Hit(source, record)
             match record["kind"]:

{queue_watch-0.1.0 → queue_watch-0.3.0}/src/queue_watch/cli.py

@@ -5,11 +5,11 @@ with the wheel. Keyboard: tab/arrows, / search, r refresh, p pause, o open the
 selected record, q quit. Times are shown in America/Los_Angeles.
 
 With no source flags, queue-watch uses the repository's .queue-watch.toml once
-you have trusted it, and otherwise the current checkout's GitHub repository:
-Actions, plus the merge queue when the default branch has one. Nothing is ever
-changed: no reruns, cancellations, merges, lock acquisition or remote installs.
-Last good data stays visible on failure and is labelled stale. --once prints one
-JSON snapshot per source and exits nonzero when any source fails.
+you have trusted it, then the current checkout's GitHub repository (Actions, plus
+the merge queue when the default branch has one), then the profile named default.
+Nothing is ever changed: no reruns, cancellations, merges, lock acquisition or
+remote installs. Last good data stays visible on failure and is labelled stale.
+--once prints one JSON snapshot per source and exits nonzero when any source fails.
 
 Examples:
   queue-watch                               # inside a GitHub checkout
@@ -17,6 +17,9 @@ Examples:
   queue-watch --profile work                # ~/.config/queue-watch/work.toml
   queue-watch --config sources.toml --once
   queue-watch trust                         # after reviewing .queue-watch.toml
+  queue-watch --demo                        # simulated repository, no login needed
+  queue-watch profile add work --repo acme/api --repo acme/web
+  queue-watch profile list
 """
 
 from __future__ import annotations
@@ -30,7 +33,18 @@ from pathlib import Path
 
 from . import __version__
 from .config import ConfigError, Source, load
-from .discovery import CONFIG_NAME, detect, github_sources, profile_path, repo_config, trust
+from .discovery import (
+    CONFIG_NAME,
+    DEFAULT_PROFILE,
+    add_to_profile,
+    describe_profile,
+    detect,
+    github_sources,
+    profile_path,
+    profiles,
+    repo_config,
+    trust,
+)
 
 
 async def once(sources: list[Source]) -> int:
@@ -72,10 +86,53 @@ def trust_command(argv: list[str]) -> int:
     return 0
 
 
+def profile_command(argv: list[str]) -> int:
+    parser = argparse.ArgumentParser(
+        prog="queue-watch profile",
+        description="Manage profiles: named source lists under ~/.config/queue-watch. "
+        f"The {DEFAULT_PROFILE!r} profile is used outside a GitHub checkout.",
+    )
+    commands = parser.add_subparsers(dest="command", required=True)
+    add = commands.add_parser(
+        "add",
+        help="add GitHub repositories to a profile, creating it if needed",
+        description="Append Actions, plus the merge queue when the default branch has "
+        "one, for each repository. Repositories already in the profile are kept as they are.",
+    )
+    add.add_argument("name", help=f"profile name; {DEFAULT_PROFILE!r} is used outside a checkout")
+    add.add_argument(
+        "--repo", action="append", required=True, metavar="OWNER/REPO", help="repeatable"
+    )
+    commands.add_parser("list", help="list profiles and their sources")
+    args = parser.parse_args(argv)
+    if args.command == "list":
+        found = profiles()
+        if not found:
+            print(f"No profiles in {profile_path(DEFAULT_PROFILE).parent}.")
+            print("Create one: queue-watch profile add NAME --repo owner/repo")
+        for path in found:
+            note = "  (used outside a GitHub checkout)" if path.stem == DEFAULT_PROFILE else ""
+            print(f"{path.stem}{note}")
+            for line in describe_profile(path):
+                print(f"  {line}")
+        return 0
+    try:
+        path, added, skipped = asyncio.run(add_to_profile(args.name, args.repo))
+    except (ConfigError, OSError, UnicodeDecodeError) as error:
+        parser.error(str(error))
+    for repo in added:
+        print(f"Added {repo} to {path}")
+    for repo in skipped:
+        print(f"{repo} is already in {path}")
+    return 0
+
+
 def main(argv: list[str] | None = None) -> int:
     argv = sys.argv[1:] if argv is None else argv
     if argv[:1] == ["trust"]:
         return trust_command(argv[1:])
+    if argv[:1] == ["profile"]:
+        return profile_command(argv[1:])
     parser = argparse.ArgumentParser(
         prog="queue-watch",
         description=__doc__,
@@ -86,9 +143,12 @@ def main(argv: list[str] | None = None) -> int:
     group.add_argument("--repo", help="GitHub owner/repo: Actions plus any merge queue")
     group.add_argument("--config", type=Path, help="TOML file with [[source]] tables")
     group.add_argument("--profile", help="NAME for ~/.config/queue-watch/NAME.toml")
+    group.add_argument(
+        "--demo", action="store_true", help="simulated repository; no network or login"
+    )
     parser.add_argument("--once", action="store_true", help="print JSON once; no TUI")
     parser.add_argument(
-        "--theme", default="tokyo-night", help="Textual theme (default tokyo-night)"
+        "--theme", default="queue-watch", help="Textual theme (default queue-watch: black)"
     )
     parser.add_argument("--ascii", action="store_true", help="ASCII glyphs and borders only")
     parser.add_argument(
@@ -100,7 +160,13 @@ def main(argv: list[str] | None = None) -> int:
     )
     args = parser.parse_args(argv)
     try:
-        if args.config:
+        if args.demo:
+            from . import demo, widgets
+
+            clock = demo.Clock()
+            widgets.now = clock.now  # ages and estimates follow the simulated clock
+            sources = demo.sources(clock)
+        elif args.config:
             sources = load(args.config.expanduser())
         elif args.profile:
             sources = load(profile_path(args.profile))