Compare commits

...

3 Commits

Author SHA1 Message Date
Keysat 2bae2f3571 Add capture mode: /capture + per-room capture threads → cross-project inbox
A capture-thread message (or /capture <text> in any room) logs to standards/
INBOX.md via capture-note.sh — deterministic, no claude call — and confirms
in-thread; /triage stays the gate into each repo (D13). Thread roots seeded by
seed-capture-threads.py.
2026-06-16 14:59:38 -05:00
Keysat 4204b82c6b Prune Current state to a lean post-Phase-3 snapshot 2026-06-15 23:21:32 -05:00
Keysat 28c974fe1d Mark Phase 3 (Spark Control) done; trim spec to live command contract
Shipped in Spark Control v0.21.0: status badge + Update/Restart/Stop-Start/Logs
tile. All three exit criteria confirmed. matrix-bridge needed no code change.

- AGENTS.md: Current state + ROADMAP Phase 3 -> DONE; Deploy switched scp -> git
  pull (Update button); D10 stamped; new Infra fact for the Spark->Gitea path and
  the load-bearing IdentitiesOnly ssh-config pin the Update button depends on.
- spark-control-integration.md: trimmed from dev spec to live contract (dropped
  sudo -iu fallback and dev-side scaffolding; folded in direct-as-modelo, the
  Gitea key gotcha, restart cadence, and the LAN-only HTTP API).
- README: dropped stale "pre-Phase 0" status; Setup reframed for a fresh install.

Deferred follow-up: badge reflects container liveness only, not Matrix
connectivity; HEALTHCHECK + {{.State.Health.Status}} is the matrix-bridge-side fix.
2026-06-15 23:19:30 -05:00
8 changed files with 422 additions and 162 deletions
+79 -26
View File
@@ -23,8 +23,10 @@ Matrix message in a project room
``` ```
Room determines the repo; the message text becomes the initial prompt — the v1 trigger surface. Room determines the repo; the message text becomes the initial prompt — the v1 trigger surface.
*Variant:* a `?`-prefixed message instead runs `ask-claude.sh` (headless `claude -p`) and posts *Variants:* a `?`-prefixed message instead runs `ask-claude.sh` (headless `claude -p`) and posts
the full answer back into the room (ask mode, D12). the full answer back into the room (ask mode, D12). A message in a room's **capture thread** (or a
`/capture <text>` message in any room) is logged to the cross-project inbox instead of launching —
deterministic, no Claude call (capture mode, D13).
## Stack ## Stack
@@ -61,20 +63,27 @@ the full answer back into the room (ask mode, D12).
- **Bot — venv (dev/fallback):** `python3 -m venv .venv && .venv/bin/pip install -r requirements.txt`, - **Bot — venv (dev/fallback):** `python3 -m venv .venv && .venv/bin/pip install -r requirements.txt`,
then `.venv/bin/python src/bot.py` — uses modelo's host `~/.ssh/config` for the alias. then `.venv/bin/python src/bot.py` — uses modelo's host `~/.ssh/config` for the alias.
`MB_SSH_ALIAS` overrides the SSH target for testing. `MB_SSH_ALIAS` overrides the SSH target for testing.
- **Deploy:** pull the bot files from the Mac (no Gitea needed) — - **Seed capture threads:** `python3 scripts/seed-capture-threads.py` (reads `.env` + `config.toml`,
needs only Python stdlib; run anywhere the homeserver is reachable). Posts each room's capture-thread
root and prints the `capture_thread` event IDs to paste into `config.toml`. Skips rooms already set;
pass labels or `--force` to reseed, `--dry-run` to preview.
- **Deploy:** the Spark's `~/matrix-bridge` is a Gitea clone tracking `master`, so deploy =
`git fetch origin && git reset --hard origin/master && docker compose up -d --build` (run as
`modelo` from `~/matrix-bridge`). You normally don't run this by hand — the **Update** button on
the Spark Control dashboard (Phase 3) runs exactly this and streams the output: push to Gitea,
then click Update. *(Fallback if Gitea is ever unreachable: scp the files from the Mac —
`scp mac-bridge:/Users/macpro/Projects/matrix-bridge/{Dockerfile,docker-compose.yml,docker-entrypoint.sh,requirements.txt,config.toml,.env} .` `scp mac-bridge:/Users/macpro/Projects/matrix-bridge/{Dockerfile,docker-compose.yml,docker-entrypoint.sh,requirements.txt,config.toml,.env} .`
and `scp -r mac-bridge:/Users/macpro/Projects/matrix-bridge/src .`, then rebuild. and `scp -r mac-bridge:/Users/macpro/Projects/matrix-bridge/src .`, then rebuild.)*
*(Phase 3 switches this to `git pull` once the Spark's `~/matrix-bridge` becomes a Gitea clone —
see `docs/spark-control-integration.md`; not done yet, so scp-from-Mac is still the live path.)*
## Layout ## Layout
- `AGENTS.md` — this file (canonical; `CLAUDE.md` is a relative symlink to it). - `AGENTS.md` — this file (canonical; `CLAUDE.md` is a relative symlink to it).
- `ROADMAP.md` — Phases 14+ with falsifiable exits, plus deferred/future directions. - `ROADMAP.md` — Phases 14+ with falsifiable exits, plus deferred/future directions.
- `README.md` — human-facing intro. - `README.md` — human-facing intro.
- `docs/spark-control-integration.md`Phase 3 spec for the Spark Control dev: the SSH - `docs/spark-control-integration.md`the live Phase 3 command contract: the SSH commands
command contract (status / restart / git-pull update) the dashboard drives, plus the one-time (status / restart / git-pull update / logs) behind the Spark Control tile, plus the now-done
conversion of the Spark's `~/matrix-bridge` to a Gitea clone. matrix-bridge needs no code change. one-time conversion of the Spark's `~/matrix-bridge` to a Gitea clone. matrix-bridge needs no
code change. (Shipped in Spark Control v0.21.0; see Current state.)
- `scripts/launch-claude.sh` — the Mac-side launch wrapper (the only seam that knows the - `scripts/launch-claude.sh` — the Mac-side launch wrapper (the only seam that knows the
Mac's environment). Mac's environment).
- `config.example.toml` — room→repo mapping template; the real `config.toml` is gitignored. - `config.example.toml` — room→repo mapping template; the real `config.toml` is gitignored.
@@ -83,9 +92,17 @@ the full answer back into the room (ask mode, D12).
- `scripts/ask-claude.sh` — headless `?`-ask wrapper (`#!/bin/zsh -l`): runs `claude -p` in the repo - `scripts/ask-claude.sh` — headless `?`-ask wrapper (`#!/bin/zsh -l`): runs `claude -p` in the repo
and prints the answer to stdout for the bot to capture and post back. Uses `CLAUDE_CODE_OAUTH_TOKEN` and prints the answer to stdout for the bot to capture and post back. Uses `CLAUDE_CODE_OAUTH_TOKEN`
(Mac-side `.env`) because a non-GUI SSH session can't reach the login Keychain (D12). (Mac-side `.env`) because a non-GUI SSH session can't reach the login Keychain (D12).
- `scripts/capture-note.sh` — capture wrapper (`#!/bin/zsh -l`): appends one `/capture`-format line
to `~/Projects/standards/INBOX.md`, commits, best-effort pushes, and echoes the line back.
Deterministic — no `claude`, no token, no frontier call (D13).
- `scripts/seed-capture-threads.py` — one-time (re-runnable) helper that posts each room's
capture-thread root message and prints the resulting `capture_thread` event IDs to paste into
`config.toml`. Skips rooms already configured; run after adding a project.
- `src/bot.py` — the matrix-nio bot (Phase 1): listens in mapped rooms; a plain message runs - `src/bot.py` — the matrix-nio bot (Phase 1): listens in mapped rooms; a plain message runs
`ssh mac-bridge gui-launch.sh` (interactive, to the phone), a `?`-prefixed message runs `ssh mac-bridge gui-launch.sh` (interactive, to the phone), a `?`-prefixed message runs
`ask-claude.sh` (headless, answer posted back); fans out for all-projects; reports failures back. `ask-claude.sh` (headless, answer posted back), and a `/capture`/capture-thread message runs
`capture-note.sh` (logs to the inbox, confirms in-thread); fans out for all-projects; reports
failures back.
- `requirements.txt` (matrix-nio) · `.env.example` (credential schema; real `.env` gitignored). - `requirements.txt` (matrix-nio) · `.env.example` (credential schema; real `.env` gitignored).
- `.claude/` — Claude wiring (dir only for now). - `.claude/` — Claude wiring (dir only for now).
- `Dockerfile` · `docker-compose.yml` · `docker-entrypoint.sh` · `.dockerignore` — the Phase 1 - `Dockerfile` · `docker-compose.yml` · `docker-entrypoint.sh` · `.dockerignore` — the Phase 1
@@ -125,8 +142,11 @@ Condensed from the scoping workshop. Each: the call, why, what it beat.
- **D9 — E2EE deferred (documented tradeoff).** Single-user bot over WireGuard on a private - **D9 — E2EE deferred (documented tradeoff).** Single-user bot over WireGuard on a private
LAN; transport is already private and matrix-nio E2EE adds libolm overhead. *Revisit when:* LAN; transport is already private and matrix-nio E2EE adds libolm overhead. *Revisit when:*
the bot ever handles sensitive content over untrusted transport. the bot ever handles sensitive content over untrusted transport.
- **D10 — Spark Control manages the bot (Phase 3).** Status on the dashboard + one-click - **D10 — Spark Control manages the bot (Phase 3, DONE 2026-06-16).** Status badge + Update /
update/restart, the same SSH-behind-buttons pattern Spark Control uses for the Sparks today. Restart / Stop-Start / Logs buttons on the dashboard, the same SSH-behind-buttons pattern Spark
Control uses for the Sparks. Shipped in Spark Control v0.21.0; connects directly as `modelo` (no
`sudo` wrap — this Spark has no passwordless sudo, so the spec's different-user branch never
applies). Badge reflects container liveness, not Matrix connectivity (see Current state / spec).
- **D11 — Launch into a desktop Terminal, not a headless token (Phase 0).** The SSH session - **D11 — Launch into a desktop Terminal, not a headless token (Phase 0).** The SSH session
can't reach the GUI login Keychain, so a plain `ssh … claude` reports "Not logged in." Rather can't reach the GUI login Keychain, so a plain `ssh … claude` reports "Not logged in." Rather
than mint a long-lived `claude setup-token`, the launcher (`scripts/gui-launch.sh`) uses than mint a long-lived `claude setup-token`, the launcher (`scripts/gui-launch.sh`) uses
@@ -142,6 +162,18 @@ Condensed from the scoping workshop. Each: the call, why, what it beat.
`claude setup-token` (`CLAUDE_CODE_OAUTH_TOKEN`) that D11 deferred — kept **Mac-side only** (in `claude setup-token` (`CLAUDE_CODE_OAUTH_TOKEN`) that D11 deferred — kept **Mac-side only** (in
`.env`; the Spark never runs claude). Interactive launches keep the token-free GUI-Terminal path. `.env`; the Spark never runs claude). Interactive launches keep the token-free GUI-Terminal path.
*Sovereignty unchanged:* `claude -p` uses the subscription, no frontier API touches message payloads. *Sovereignty unchanged:* `claude -p` uses the subscription, no frontier API touches message payloads.
- **D13 — Capture mode → central inbox + `/triage` gate, via a deterministic script (2026-06-16).**
A message in a room's **capture thread** (detected by its `m.relates_to` thread root, configured
per room as `capture_thread`), or a `/capture <text>` message in any room, is logged to
`~/Projects/standards/INBOX.md` tagged for that room's project — then the existing `/triage`
lands it in the repo. *Beat (deliberately rejected):* writing straight into a repo's
`AGENTS.md`/`ROADMAP.md` unattended — keeps the human approval gate, and the Current-state-vs-
ROADMAP call, where they belong (and AGENTS.md is load-bearing — "propose, don't silently
rewrite"). *Beat:* `claude -p /capture` for the write — a one-line append needs no model, so
`capture-note.sh` does it deterministically: no token, nothing leaves the Mac but the git push,
and message text never reaches a frontier model (upholds the sovereignty constraint / D8). The
bot confirms in-thread with the exact inbox line; `/capture` is the zero-config path, the thread
just drops the prefix. Thread roots are minted by `seed-capture-threads.py`.
## Sovereignty constraint ## Sovereignty constraint
@@ -176,6 +208,11 @@ once" is not done.
- **Spark → Mac:** SSH alias `mac-bridge` → the Mac as user `macpro`, dedicated key - **Spark → Mac:** SSH alias `mac-bridge` → the Mac as user `macpro`, dedicated key
(`~/.ssh/id_ed25519` on the Spark, in the Mac's `authorized_keys`). The Spark host's `~/.ssh/config` needs `IdentitiesOnly yes` because a (`~/.ssh/id_ed25519` on the Spark, in the Mac's `authorized_keys`). The Spark host's `~/.ssh/config` needs `IdentitiesOnly yes` because a
`Host *` rule shadows the default key; the container regenerates a clean config from `config.toml [mac]`. `Host *` rule shadows the default key; the container regenerates a clean config from `config.toml [mac]`.
- **Spark → Gitea (deploy/update path):** `~/matrix-bridge` is a git clone tracking `origin/master`
(`ssh://git@immense-voyage.local:59916/grant/matrix-bridge.git`). modelo's `~/.ssh/config` pins the
deploy key for the Gitea host with `IdentitiesOnly yes` — without it git offered the wrong key first
and Gitea returned `Permission denied (publickey)`. **The Spark Control Update button depends on that
ssh-config block; flag it if modelo's account is ever rebuilt.**
- **Mac → Spark:** no authorized key — direct Mac-initiated Spark ops stay owner-run. (This is *not* - **Mac → Spark:** no authorized key — direct Mac-initiated Spark ops stay owner-run. (This is *not*
what Phase 3 closes: Spark Control already has its own SSH channel into `spark-32d0`, so its what Phase 3 closes: Spark Control already has its own SSH channel into `spark-32d0`, so its
status/update/restart buttons ride that, not a Mac→Spark key.) status/update/restart buttons ride that, not a Mac→Spark key.)
@@ -191,18 +228,34 @@ once" is not done.
## Current state ## Current state
- **Live on the Spark (Phases 02 + ask mode).** matrix-nio bot in a Docker container - **Live on the Spark; Phases 03 + ask mode all DONE.** matrix-nio bot in a Docker container
(`~/matrix-bridge`, `docker compose up -d --build`): host networking, `restart: unless-stopped`, (`~/matrix-bridge`, a Gitea clone tracking `master`): host networking, `restart: unless-stopped`,
read-only mounts of `.env`/`config.toml`/SSH key. Runs as `@agent` in 11 project rooms + an read-only mounts of `.env`/`config.toml`/SSH key. Runs as `@agent` in 11 project rooms + an
all-projects fan-out room. Both modes proven — interactive (plain msg → phone via Remote Control) all-projects fan-out room. Interactive (plain msg → phone) and ask (`?`-prefix → answer posted
and ask (`?`-prefix → full answer posted back; D12). back; D12) both proven. Phase 2: owner-confirmed N=3 routing.
- **Phase 2 — DONE** (owner-confirmed N=3: routes by `room_id`, correct repo, zero wrong-dir launches). - **Phase 3 (Spark Control) shipped 2026-06-16 in v0.21.0:** status badge + Update / Restart /
- **Phase 3 (Spark Control) — IN PROGRESS, awaiting the Spark Control dev.** The contract is Stop-Start / Logs tile; the Spark's dir is now a Gitea clone and deploy = the Update button.
`docs/spark-control-integration.md`: status/restart/git-pull-update SSH commands + a one-time Detail in ROADMAP + `docs/spark-control-integration.md`; no matrix-bridge code change.
conversion of the Spark's `~/matrix-bridge` to a Gitea clone. matrix-bridge needs no code change; - **Capture mode (D13) built 2026-06-16 — pending deploy, not yet N=3.** `/capture <text>` in any
remaining work is Spark Control-side (tile + buttons) + the one-time migration. **When live:** trim room and per-room capture threads both log to `standards/INBOX.md` via `capture-note.sh`; bot
the spec to the lean command contract, update the Commands "Deploy" entry (scp → git pull), flip confirms in-thread. All 11 rooms + all-projects already have their `capture_thread` roots seeded
Phase 3 → DONE. and their IDs are in the Mac's `config.toml`. **To go live:** (1) push code + `git`-deploy on the
- **Open / risks:** a `?`-ask in a repo `claude` has never opened may stall on the folder-trust gate Spark (Update button); (2) refresh the Spark's `config.toml` — it's gitignored, so the Update
— add a trust flag to `ask-claude.sh` if/when hit, not preemptively. button does *not* carry it: on the Spark run
- **Repo:** `master` == `phase-1`, clean, pushed to Gitea. No test suite (pre-existing). `scp mac-bridge:/Users/macpro/Projects/matrix-bridge/config.toml ~/matrix-bridge/config.toml`
(or hand-add `capture_launcher` + the `capture_thread` lines), then Restart. Until the Spark has
both the new code *and* config, **don't reply in the capture threads** (the old bot would treat a
thread reply as a launch).
- **Optional / triggered next moves:**
- Badge reflects container liveness only, not Synapse connectivity — add a Docker `HEALTHCHECK`
(bot-side liveness signal → read `{{.State.Health.Status}}`) when "running but silent" bites.
- A `?`-ask in a repo `claude` has never opened may stall on the folder-trust gate — add a trust
flag to `ask-claude.sh` if/when hit, not preemptively.
- Capture defaults every line to `[idea][P2]`; add inline `[type]`/`[Pn]` parsing to
`capture-note.sh` if reclassifying at `/triage` gets tedious.
- Phase 4+ (intent-routing brain D8, thread continuity) — see ROADMAP; not scoped.
- **Watch:** the Update button depends on modelo's Gitea ssh-config pin (`IdentitiesOnly yes`, see
Infra facts) — flag it if that account is ever rebuilt.
- **Repo:** `master` == `phase-1`. Uncommitted: capture mode (`src/bot.py`, `scripts/capture-note.sh`,
`scripts/seed-capture-threads.py`, `config.example.toml`, `AGENTS.md`) + gitignored `config.toml`.
No test suite (pre-existing).
+8 -7
View File
@@ -9,8 +9,9 @@ Runs as a small **matrix-nio** bot in a Docker container on a DGX Spark; a zsh w
Mac (`scripts/launch-claude.sh`) is the only piece that knows the Mac's environment. Routing Mac (`scripts/launch-claude.sh`) is the only piece that knows the Mac's environment. Routing
is deterministic in v1 — the room you message in decides the repo (an explicit config map). is deterministic in v1 — the room you message in decides the repo (an explicit config map).
> Status: **scaffolded, prePhase 0.** No bot code yet. See `AGENTS.md` → `## Current state` > Status: **live on the Spark — Phases 03 + headless "ask" mode shipped.** The bot runs in
> for the active milestone and `ROADMAP.md` for the phase plan. > 11 project rooms + an all-projects room, and is managed from the Spark Control dashboard. See
> `AGENTS.md` → `## Current state` for details and `ROADMAP.md` for the phase plan.
## How it works (v1) ## How it works (v1)
@@ -24,8 +25,8 @@ Matrix message in a project room
## Setup ## Setup
_TODO — filled in as Phase 0 is proven:_ Matrix onboarding (Element + the existing Synapse The bot is live; this is the shape of a fresh install: Matrix onboarding (Element + the existing
homeserver, a bot user), the Mac wrapper, passwordless SSH from the Spark to the Mac, and the Synapse homeserver, a bot user), the Mac wrapper, passwordless SSH from the Spark to the Mac, and
first room→repo mapping. Copy `config.example.toml` to `config.toml` (gitignored) and fill in the room→repo mapping. Copy `config.example.toml` to `config.toml` (gitignored) and fill in real
real room IDs and repo paths. The original scoping docs (SPEC / DECISIONS / KICKOFF) hold the room IDs and repo paths. Deploy and day-2 ops (status / update / restart) run from the Spark
full background. Control dashboard — see `docs/spark-control-integration.md` for the command contract.
+10 -6
View File
@@ -32,17 +32,21 @@ after it.
- **Exit (falsifiable):** 3 real uses across ≥2 rooms, correct repo every time, zero - **Exit (falsifiable):** 3 real uses across ≥2 rooms, correct repo every time, zero
wrong-directory launches. *Met — owner-confirmed N=3 pass.* wrong-directory launches. *Met — owner-confirmed N=3 pass.*
## Phase 3 — Spark Control integration — SPEC DRAFTED (2026-06-15), awaiting Spark Control dev ## Phase 3 — Spark Control integration — DONE (2026-06-16)
- Bot container status surfaced on the Spark Control dashboard. - Bot container status surfaced on the Spark Control dashboard.
- One-click update (pull + restart) wired the same way Spark Control drives the Sparks today - One-click update (pull + restart) wired the same way Spark Control drives the Sparks today
(SSH/commands behind a button). (SSH/commands behind a button).
- **Exit (falsifiable):** bot status is visible and the bot can be updated/restarted from the - **Exit (falsifiable):** bot status is visible and the bot can be updated/restarted from the
panel. panel. *Met — shipped in Spark Control v0.21.0; all three controls confirmed working.*
- **Spec:** `docs/spark-control-integration.md` — the SSH command contract + one-time Spark - **Shipped:** matrix-bridge tile (status badge + Update / Restart / Stop-Start / Logs) running
migration to a Gitea clone. Decided: update = git-pull-from-Gitea; Spark Control's existing the spec's SSH commands; the Spark's `~/matrix-bridge` is now a Gitea clone tracking `master`.
SSH into `spark-32d0` carries the buttons (no new key). matrix-bridge needs no code change; matrix-bridge needed no code change. Deviation: Spark Control connects directly as `modelo` (no
remaining work is Spark Control-side + the one-time migration. `sudo` wrap — no passwordless sudo on this Spark). Live command contract + the Gitea key pin the
Update button depends on: `docs/spark-control-integration.md`.
- **Deferred follow-up:** badge reflects container liveness only, not Matrix connectivity — a
Docker `HEALTHCHECK` (bot-side liveness signal) would let the tile read `{{.State.Health.Status}}`.
matrix-bridge-side change; do it if/when "running but silent" bites.
## Phase 4+ — Future direction (documented, not yet scoped to build) ## Phase 4+ — Future direction (documented, not yet scoped to build)
+10 -3
View File
@@ -16,19 +16,26 @@ user = "@matrix-bridge-bot:<your-domain>" # a dedicated bot Matrix account (not
ssh_alias = "mac-bridge" ssh_alias = "mac-bridge"
launcher = "/Users/macpro/Projects/<your-repo>/scripts/gui-launch.sh" launcher = "/Users/macpro/Projects/<your-repo>/scripts/gui-launch.sh"
ask_launcher = "/Users/macpro/Projects/<your-repo>/scripts/ask-claude.sh" # headless `?`-prefix ask mode ask_launcher = "/Users/macpro/Projects/<your-repo>/scripts/ask-claude.sh" # headless `?`-prefix ask mode
capture_launcher = "/Users/macpro/Projects/<your-repo>/scripts/capture-note.sh" # `/capture` + capture-thread → standards/INBOX.md
# Container only: docker-entrypoint.sh generates ~/.ssh/config for `ssh_alias` from these. # Container only: docker-entrypoint.sh generates ~/.ssh/config for `ssh_alias` from these.
# (On a host with `ssh_alias` already in ~/.ssh/config these are ignored.) # (On a host with `ssh_alias` already in ~/.ssh/config these are ignored.)
hostname = "10.0.0.0" # the Mac's address reachable from the Spark (e.g. WireGuard IP) hostname = "10.0.0.0" # the Mac's address reachable from the Spark (e.g. WireGuard IP)
user = "<mac-username>" user = "<mac-username>"
# One [[room]] block per project. # One [[room]] block per project.
# room_id — the internal Matrix room ID (starts with '!'), NOT the human alias (#name:domain) # room_id — the internal Matrix room ID (starts with '!'), NOT the alias (#name:domain)
# repo_dir — an absolute path on the Mac (note: ~/Projects uses a capital P) # repo_dir — an absolute path on the Mac (note: ~/Projects uses a capital P)
# label — human-readable name, for logs and error messages # label — human-readable name, for logs and error messages
# capture_thread — (optional) root event ID ('$...') of this room's capture thread; a message
# in that thread is logged to standards/INBOX.md (tagged by `label`) instead of
# launching Claude. Seed these with: python3 scripts/seed-capture-threads.py
# capture_project — (optional) inbox tag for captures from this room; defaults to `label`.
# `/capture <text>` works in any room with no config; the thread just lets you skip the prefix.
[[room]] [[room]]
room_id = "!exampleRoomId:your-domain" room_id = "!exampleRoomId:your-domain"
repo_dir = "/Users/macpro/Projects/<your-repo>" repo_dir = "/Users/macpro/Projects/<your-repo>"
label = "<project-name>" label = "<project-name>"
capture_thread = "$exampleThreadRootEventId"
[[room]] [[room]]
room_id = "!anotherRoomId:your-domain" room_id = "!anotherRoomId:your-domain"
+60 -107
View File
@@ -1,16 +1,14 @@
# Phase 3 — Spark Control integration (spec for the Spark Control dev) # Phase 3 — Spark Control integration (live command contract)
**Goal (ROADMAP Phase 3):** surface the matrix-bridge bot's container status on the Spark **Status: DONE (2026-06-16), shipped in Spark Control v0.21.0.** The matrix-bridge bot has a
Control dashboard, and add one-click **update** (pull + rebuild + restart) and **restart**, tile on the Spark Control dashboard under "Always-on services" — a live status badge plus
wired the same SSH-behind-buttons way Spark Control already drives the Sparks. **Update**, **Restart**, **Stop/Start**, and **View logs** buttons. All three ROADMAP Phase 3
exit criteria are met (status visible + reflects the container; update works; restart works).
matrix-bridge needed no code change.
**Exit (falsifiable):** bot status is visible on the panel, and the bot can be This document is the **contract**: what each control runs on the Spark, and what the output
updated/restarted from the panel. means. Kept as the reference for what the buttons actually do — and to reproduce by hand if the
dashboard is ever unavailable.
This document is the **contract**: what to run, where, and what the output means. The
matrix-bridge side is fixed below; map the buttons onto Spark Control's existing
managed-service pattern however that codebase already models a Spark/service. No changes to
matrix-bridge are required for this.
--- ---
@@ -21,41 +19,39 @@ A single Docker container on the DGX Spark.
| Fact | Value | | Fact | Value |
|---|---| |---|---|
| Host | `spark-32d0` (`10.59.211.6` on WireGuard), user **`modelo`** | | Host | `spark-32d0` (`10.59.211.6` on WireGuard), user **`modelo`** |
| Project dir | `/home/modelo/matrix-bridge` (`~/matrix-bridge` for modelo) | | Project dir | `/home/modelo/matrix-bridge` — a **Gitea clone tracking `master`** |
| Compose service | `bot` | | Compose service | `bot` |
| Container name | `matrix-bridge` (fixed via `container_name:`) | | Container name | `matrix-bridge` (fixed via `container_name:`) |
| Image | `matrix-bridge-bot` | | Image | `matrix-bridge-bot` |
| Lifecycle | host networking, `restart: unless-stopped` (survives Spark reboot) | | Lifecycle | host networking, `restart: unless-stopped` (survives Spark reboot) |
| Secrets | `.env`, `config.toml`**gitignored**, live only on the Spark, never in git | | Secrets | `.env`, `config.toml`**gitignored**, live only on the Spark, never in git |
Spark Control already SSHes into `spark-32d0`, so these ride the existing channel — **no new Spark Control SSHes into `spark-32d0` as **`modelo`** (the same login it already uses for Spark 2),
key needed.** All commands below assume they run **as `modelo`** (owner of the dir, member of so these ride the existing channel — no new key, and **no `sudo` wrap**: this Spark has no
the `docker` group). If Spark Control's channel connects as a different user, wrap each command passwordless sudo, and since the channel is already `modelo` (owner of the dir, member of the
in `sudo -iu modelo bash -lc '<command>'` — running `git` in modelo's repo as root trips git's `docker` group) every command runs as the right user directly. (The original spec's
"dubious ownership" guard, so don't skip this. `sudo -iu modelo` different-user fallback therefore never applies here.)
Registration on the Spark Control side: the bot's SSH user is a config field (set to `modelo`),
the host reuses the existing Spark 2 connection, and container / dir / branch use the defaults
(`matrix-bridge` / `~/matrix-bridge` / `master`). The tile auto-hides when that user is blank or
the container is absent, so it stays out of the way on installs that don't run the bot.
--- ---
## One-time prerequisites (owner, not Spark Control dev) ## One-time prerequisites — DONE
The bot dir on the Spark was originally populated by `scp` of loose files. To make `~/matrix-bridge` was originally loose files from `scp`; it's now a git clone of the Gitea repo,
git-pull-based updates work it must become a git clone of the Gitea repo **without disturbing converted in place (the gitignored `.env`/`config.toml` were untouched, because `git reset --hard`
the gitignored secrets** (`.env`, `config.toml`). Because those two files are gitignored, ignores them).
`git reset --hard` never touches them — so we can convert the existing dir in place.
**0a. Confirm the Spark can reach + authenticate to Gitea (fail loud here, not at first button press):** **Load-bearing gotcha that's now fixed:** on the Spark, git offered the wrong SSH key first and
Gitea rejected it (`Permission denied (publickey)`) even though the deploy key was correctly
registered. Fixed by pinning it in modelo's `~/.ssh/config` with `IdentitiesOnly yes` for the
Gitea host. **The Update button depends on that block staying in place — flag it if modelo's
account is ever rebuilt.**
```sh The conversion, for reference:
git ls-remote ssh://git@immense-voyage.local:59916/grant/matrix-bridge.git >/dev/null \
&& echo "gitea reachable" || echo "FIX gitea access first"
```
The Spark is on the same LAN as the Start9 host running Gitea, so `immense-voyage.local`
resolves directly — this should just work. If it doesn't, the only likely gap is a key
authorized for read on the Gitea repo available to `modelo` (deploy key or existing key).
Don't proceed until `git ls-remote` succeeds.
**0b. Convert `~/matrix-bridge` to a clone tracking `master` (run as `modelo`):**
```sh ```sh
cd /home/modelo/matrix-bridge cd /home/modelo/matrix-bridge
@@ -66,23 +62,12 @@ git reset --hard origin/master # secrets are gitignored → untouched
git branch --set-upstream-to=origin/master master git branch --set-upstream-to=origin/master master
``` ```
Verify the secrets survived and the container still comes up clean:
```sh
ls -la /home/modelo/matrix-bridge/.env /home/modelo/matrix-bridge/config.toml # both present
git -C /home/modelo/matrix-bridge status # .env/config.toml show as ignored, tree clean
docker compose up -d --build && docker ps --filter name=^/matrix-bridge$
```
`master` is the release branch (today `master == phase-1`). Track whatever you treat as the
release line; the commands below assume `origin/master`.
--- ---
## The contract — commands behind each control ## The contract — commands behind each control
Run from `/home/modelo/matrix-bridge` as `modelo`. Each is idempotent and fail-loud Run from `/home/modelo/matrix-bridge` as `modelo`. Each is idempotent and fail-loud: non-zero
(non-zero exit ⇒ surface it on the panel; don't swallow). exit + stderr is surfaced on the panel, not swallowed.
### Status (poll for the badge) ### Status (poll for the badge)
@@ -90,33 +75,28 @@ Run from `/home/modelo/matrix-bridge` as `modelo`. Each is idempotent and fail-l
docker inspect -f '{{.State.Status}}|{{.State.StartedAt}}|{{.RestartCount}}' matrix-bridge docker inspect -f '{{.State.Status}}|{{.State.StartedAt}}|{{.RestartCount}}' matrix-bridge
``` ```
- Output e.g. `running|2026-06-15T18:02:11.4Z|0`. Parse field 1 for the badge: - `running` → up · `exited` → stopped/crashed · `restarting` → unhealthy/boot-looping ·
- `running`green/up. Field 3 (`RestartCount`) climbing while status flips to non-zero exit (`No such object: matrix-bridge`)**not deployed** (tile hides). A climbing
`restarting`**crash loop** — show it; that's the most useful signal a dashboard gives here. `RestartCount` while status flips to `restarting` is the crash-loop tell.
- `exited` → stopped/crashed. - **Badge = container liveness only, not Matrix connectivity** — a bot that's `running` but
- `restarting` → unhealthy / boot-looping. disconnected from Synapse still shows Healthy. See the HEALTHCHECK note below.
- **Non-zero exit** (`No such object: matrix-bridge`) ⇒ **not deployed** — distinct from - *Cadence note:* a fast `docker restart` won't visibly flip the badge red — the panel re-checks
"stopped". Show that state rather than erroring out. status only after the command returns, by which point the container is already back up. A full
`docker stop` turns it red within ~5s. Polling cadence, not a bug.
Friendlier one-liner for a human-readable badge (empty string when not running): ### Logs
```sh
docker ps --filter name=^/matrix-bridge$ --format '{{.Status}}' # e.g. "Up 2 hours"
```
### Logs (optional "view logs" action — handy for diagnosing a red badge)
```sh ```sh
docker logs --tail 100 matrix-bridge docker logs --tail 100 matrix-bridge
``` ```
### Restart (no code change) ### Restart
```sh ```sh
docker restart matrix-bridge docker restart matrix-bridge
``` ```
### Update (pull latest code + rebuild + recreate) — the headline button ### Update (pull + rebuild + recreate) — the headline button
```sh ```sh
cd /home/modelo/matrix-bridge \ cd /home/modelo/matrix-bridge \
@@ -125,15 +105,11 @@ cd /home/modelo/matrix-bridge \
&& docker compose up -d --build && docker compose up -d --build
``` ```
- `git reset --hard origin/master` is the deploy-box "always match remote" semantic: never gets `git reset --hard origin/master` is the deploy-box "always match remote" semantic: never stuck on
stuck on divergence, and gitignored secrets are preserved. (If you'd rather detect divergence, divergence, and gitignored secrets are preserved. Streamed live on the panel with a ~25-min
`git pull --ff-only` is the gentler alternative — but then a wedged tree needs manual help.) ceiling; non-zero exit + stderr surfaced. **Workflow: push to Gitea, then click Update.**
- `docker compose up -d --build` rebuilds the image and recreates the container only if the
build changed. First build after a base-image bump is slow (minutes); subsequent builds hit
the layer cache. **Treat update as long-running**: stream/await output, set a generous
timeout (≥10 min), and don't block the dashboard on it.
### Stop / Start (optional) ### Stop / Start
```sh ```sh
docker stop matrix-bridge # stop docker stop matrix-bridge # stop
@@ -142,45 +118,22 @@ cd /home/modelo/matrix-bridge && docker compose up -d # start (recreates
--- ---
## Spark Control-side wiring (for the dev) ## Programmatic interface (LAN-only)
Map the above onto however Spark Control already registers a managed Spark/service: The same controls are reachable over HTTP if scripting is ever wanted:
1. **Register `matrix-bridge`** as a managed service (a tile), targeting `spark-32d0` over the - `POST /api/matrix-bridge/update` → returns an id; `GET .../update/{id}` and
existing SSH channel, commands run as `modelo`. `.../update/{id}/stream` (SSE) for progress.
2. **Status badge** ← poll the *Status* command on the panel's normal refresh cadence; map the - `GET /api/matrix-bridge/logs?tail=N`
four states above (running / exited / restarting / not-deployed) to your existing badge - status via `GET /api/services`
vocabulary. Surface `RestartCount` if your tile can show a secondary metric — a climbing
count is the crash-loop tell.
3. **Buttons:** `Update`, `Restart` (required for the exit criterion); `Logs`, `Stop`/`Start`
(optional, nice-to-have).
4. **Fail-loud, surfaced.** Every command's non-zero exit + stderr must reach the panel, not a
silent failure — this mirrors matrix-bridge's own discipline (a bad launch reports back into
the room rather than hanging). Especially: a failed `git fetch` (Gitea unreachable) or a
failed build should show the error, not a stuck spinner.
5. **`Update` is long-running** — see the timeout/streaming note above.
What I deliberately left generic: the tile's exact place in Spark Control's code, its UI, and
its config schema — that's yours to fit to the existing pattern. If a precise drop-in matters,
share how a Spark is currently registered (config entry + the command-runner seam) and I'll
tailor steps 15 to it.
--- ---
## Acceptance (maps to the ROADMAP exit) ## Future enhancement — truer status (not required; matrix-bridge-side)
- [ ] Status tile shows the bot's live state and flips correctly across a manual Status reports container liveness, not Matrix connectivity — the bot can be `running` yet
`docker stop` / `docker start` on the Spark. disconnected from Synapse. A truer signal needs a Docker `HEALTHCHECK` backed by a bot-side
- [ ] `Restart` from the panel cycles the container (status returns to `running`). liveness signal (e.g. the bot touches a file or exposes a tiny endpoint on each successful sync
- [ ] `Update` from the panel pulls a new commit, rebuilds, and recreates the container — and loop), after which Status could read `{{.State.Health.Status}}`. That's a matrix-bridge-side
surfaces a clear error if Gitea is unreachable or the build fails. change — do it if/when "running but silent" actually bites, then tell the Spark Control dev to
read the health field.
---
## Note — optional future enhancement (not required for Phase 3)
The *Status* command reports container liveness (process up), not Matrix connectivity — the bot
can be `running` yet disconnected from Synapse. A truer signal would need a Docker `HEALTHCHECK`
backed by a bot-side liveness signal (e.g. the bot touches a file or exposes a tiny endpoint on
each successful sync loop), after which Status could read `{{.State.Health.Status}}`. That's a
matrix-bridge-side change, out of scope here — flag it if/when "running but silent" actually bites.
+45
View File
@@ -0,0 +1,45 @@
#!/bin/zsh -l
# capture-note.sh — matrix-bridge capture wrapper.
#
# Invoked over SSH by the bot: capture-note.sh <project> <text...>
# Appends ONE line to the cross-project inbox (standards/INBOX.md) in the exact format the
# /capture skill uses, commits it, and best-effort pushes — so /triage (run later inside the
# target repo) drains it like any other captured item.
#
# Deterministic on purpose: no LLM, no token, nothing leaves the Mac except the git push to
# Gitea. The "smarts" (real type/priority, repo-routing, phrasing) stay at /triage, where the
# human is — and routing message text through a frontier model would break the sovereignty
# boundary (D13/D8). Defaults every capture to a raw [idea][P2]; /triage reclassifies.
#
# Why a login shell (-l): git config / PATH live in ~/.zprofile, which a non-login SSH shell
# skips — the same seam as launch-claude.sh / ask-claude.sh.
set -e
standards="$HOME/Projects/standards"
inbox="$standards/INBOX.md"
project="$1"
shift || true
note="$*"
if [[ -z "$project" || -z "$note" ]]; then
print -u2 "usage: capture-note.sh <project> <text>"
exit 2
fi
if [[ ! -f "$inbox" ]]; then
print -u2 "capture-note: inbox not found: $inbox"
exit 1
fi
line="- [ ] ($project) [idea][P2] $note — via matrix, $(date +%F)"
print -r -- "$line" >> "$inbox"
git -C "$standards" add INBOX.md
git -C "$standards" commit -q -m "Capture: ${note[1,60]} (via matrix)" -- INBOX.md
# Push is best-effort — a captured line committed locally is not lost if Gitea is unreachable.
git -C "$standards" push -q 2>/dev/null || print -u2 "capture-note: push skipped/failed (committed locally)"
# Echo the exact line so the bot can post it back into the thread as confirmation.
print -r -- "$line"
+116
View File
@@ -0,0 +1,116 @@
#!/usr/bin/env python3
"""seed-capture-threads.py — create each room's capture-thread root, print the event IDs.
Posts one "capture thread" root message into every room in config.toml and prints the resulting
event_id per room. Paste each into its [[room]] block as `capture_thread = "$..."` — the bot then
treats any reply in that thread as a capture (no /capture prefix needed in-thread).
Idempotent-ish: by default it skips rooms that already have `capture_thread` set in config, so a
re-run after adding a project only seeds the new room. Use --force to reseed everything, pass room
labels to seed only those, or --dry-run to preview without posting.
Reads ../.env (MATRIX_ACCESS_TOKEN) and ../config.toml (homeserver URL + rooms). Talks to the
homeserver over plain HTTPS, so run it anywhere the homeserver is reachable (Mac or Spark).
python3 scripts/seed-capture-threads.py [--force] [--dry-run] [label ...]
"""
import json
import os
import sys
import tomllib
import urllib.request
import urllib.error
import uuid
HERE = os.path.dirname(os.path.abspath(__file__))
ROOT = os.path.dirname(HERE)
def load_env(path):
env = {}
with open(path) as f:
for line in f:
line = line.strip()
if line and not line.startswith("#") and "=" in line:
k, v = line.split("=", 1)
env[k] = v.strip().strip('"')
return env
def root_body(project):
who = "any project" if project == "?" else f"({project})"
tag = "?" if project == "?" else project
return (
f"📥 Capture thread — reply in this thread to log an idea, feature, or bug for {who}. "
f"It goes straight to the cross-project inbox tagged ({tag}) (no /capture prefix needed "
f"in-thread); run /triage in the repo to land it."
)
def send_root(url, token, room_id, project):
txn = uuid.uuid4().hex
endpoint = (
f"{url.rstrip('/')}/_matrix/client/v3/rooms/"
f"{urllib.parse.quote(room_id, safe='')}/send/m.room.message/{txn}"
)
body = json.dumps({"msgtype": "m.text", "body": root_body(project)}).encode()
req = urllib.request.Request(
endpoint, data=body, method="PUT",
headers={"Authorization": f"Bearer {token}", "Content-Type": "application/json"},
)
with urllib.request.urlopen(req, timeout=30) as resp:
return json.load(resp)["event_id"]
def main():
args = [a for a in sys.argv[1:]]
force = "--force" in args
dry_run = "--dry-run" in args
only = [a for a in args if not a.startswith("--")]
env = load_env(os.path.join(ROOT, ".env"))
with open(os.path.join(ROOT, "config.toml"), "rb") as f:
cfg = tomllib.load(f)
url = cfg["homeserver"]["url"]
token = env.get("MATRIX_ACCESS_TOKEN") or env.get("MATRIX_ACCESS_TOKEN".lower())
if not token:
sys.exit("no MATRIX_ACCESS_TOKEN in .env")
# Build the seed list: every project room, plus the all-projects fan-out room as a `?` catch-all.
targets = []
for r in cfg.get("room", []):
targets.append((r["label"], r["room_id"], r.get("capture_project", r["label"]),
r.get("capture_thread")))
ap = cfg.get("all_projects", {})
if ap.get("room_id"):
targets.append(("all-projects", ap["room_id"], ap.get("capture_project", "?"),
ap.get("capture_thread")))
if only:
targets = [t for t in targets if t[0] in only]
seeded = []
for label, room_id, project, existing in targets:
if existing and not force:
print(f"SKIP {label:<20} already has capture_thread={existing}")
continue
if dry_run:
print(f"DRYRUN {label:<20} {room_id} (project {project})")
continue
try:
event_id = send_root(url, token, room_id, project)
seeded.append((label, room_id, project, event_id))
print(f"SEEDED {label:<20} {room_id} -> {event_id}")
except urllib.error.HTTPError as e:
print(f"ERROR {label:<20} {room_id} HTTP {e.code}: {e.read().decode()[:200]}")
except Exception as e: # noqa: BLE001 — surface any transport failure per room, keep going
print(f"ERROR {label:<20} {room_id} {e}")
if seeded:
print("\n# Paste each line into the matching [[room]] block (or [all_projects]):")
for label, _room_id, _project, event_id in seeded:
print(f'{label}: capture_thread = "{event_id}"')
if __name__ == "__main__":
main()
+94 -13
View File
@@ -24,7 +24,9 @@ REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Headless "ask" mode tunables. # Headless "ask" mode tunables.
ASK_TIMEOUT = 300 # seconds to wait for `claude -p` before giving up ASK_TIMEOUT = 300 # seconds to wait for `claude -p` before giving up
CAPTURE_TIMEOUT = 60 # seconds to wait for capture-note.sh (inbox append + git push)
MAX_MSG_CHARS = 30000 # split answers into chunks well under Matrix's ~64KB event cap MAX_MSG_CHARS = 30000 # split answers into chunks well under Matrix's ~64KB event cap
CAPTURE_PREFIX = "/capture" # zero-config capture trigger, valid in any mapped room
def load_env(path): def load_env(path):
@@ -64,6 +66,14 @@ def split_message(text, limit=MAX_MSG_CHARS):
return chunks return chunks
def thread_root_of(event):
"""Return the thread root event_id if this message is a threaded reply, else None."""
relates = (event.source or {}).get("content", {}).get("m.relates_to") or {}
if relates.get("rel_type") == "m.thread":
return relates.get("event_id")
return None
async def main(): async def main():
env = load_env(os.path.join(REPO_ROOT, ".env")) env = load_env(os.path.join(REPO_ROOT, ".env"))
cfg = load_config(os.path.join(REPO_ROOT, "config.toml")) cfg = load_config(os.path.join(REPO_ROOT, "config.toml"))
@@ -74,10 +84,12 @@ async def main():
device_id = env.get("MATRIX_DEVICE_ID", "matrix-bridge-bot") device_id = env.get("MATRIX_DEVICE_ID", "matrix-bridge-bot")
rooms = {r["room_id"]: r for r in cfg.get("room", [])} rooms = {r["room_id"]: r for r in cfg.get("room", [])}
all_projects_room = cfg.get("all_projects", {}).get("room_id") all_projects_cfg = cfg.get("all_projects", {})
all_projects_room = all_projects_cfg.get("room_id")
ssh_alias = os.environ.get("MB_SSH_ALIAS") or cfg["mac"]["ssh_alias"] ssh_alias = os.environ.get("MB_SSH_ALIAS") or cfg["mac"]["ssh_alias"]
launcher = cfg["mac"]["launcher"] launcher = cfg["mac"]["launcher"]
ask_launcher = cfg["mac"].get("ask_launcher") ask_launcher = cfg["mac"].get("ask_launcher")
capture_launcher = cfg["mac"].get("capture_launcher")
client = AsyncClient(homeserver, user_id) client = AsyncClient(homeserver, user_id)
client.restore_login(user_id=user_id, device_id=device_id, access_token=token) client.restore_login(user_id=user_id, device_id=device_id, access_token=token)
@@ -121,10 +133,16 @@ async def main():
out.decode(errors="replace").strip(), out.decode(errors="replace").strip(),
err.decode(errors="replace").strip()) err.decode(errors="replace").strip())
async def say(room_id, text): async def say(room_id, text, thread_root=None):
await client.room_send( content = {"msgtype": "m.text", "body": text}
room_id, "m.room.message", {"msgtype": "m.text", "body": text} if thread_root: # keep confirmations inside the capture thread
) content["m.relates_to"] = {
"rel_type": "m.thread",
"event_id": thread_root,
"is_falling_back": True,
"m.in_reply_to": {"event_id": thread_root},
}
await client.room_send(room_id, "m.room.message", content)
async def launch_one(report_room, repo, prompt, session_name=None): async def launch_one(report_room, repo, prompt, session_name=None):
rc, out = await launch(repo["repo_dir"], prompt, session_name) rc, out = await launch(repo["repo_dir"], prompt, session_name)
@@ -154,6 +172,46 @@ async def main():
await say(report_room, f"⚠️ matrix-bridge: ask failed in {repo['label']} " await say(report_room, f"⚠️ matrix-bridge: ask failed in {repo['label']} "
f"(rc={rc}): {detail[:500]}") f"(rc={rc}): {detail[:500]}")
async def run_capture(project, text):
"""Run capture-note.sh on the Mac over SSH; return (rc, stdout, stderr).
Deterministic: appends one line to standards/INBOX.md and commits/pushes. stdout is the
exact inbox line written, echoed back into the thread as confirmation.
"""
remote = (f"{shlex.quote(capture_launcher)} "
f"{shlex.quote(project)} {shlex.quote(text)}")
proc = await asyncio.create_subprocess_exec(
"ssh", ssh_alias, remote,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE,
)
try:
out, err = await asyncio.wait_for(proc.communicate(), timeout=CAPTURE_TIMEOUT)
except asyncio.TimeoutError:
proc.kill()
await proc.wait() # reap the killed ssh client (no zombie)
return None, "", f"timed out after {CAPTURE_TIMEOUT}s"
return (proc.returncode,
out.decode(errors="replace").strip(),
err.decode(errors="replace").strip())
async def capture(report_room, project, text, thread_root=None):
"""Log a message to the cross-project inbox (standards/INBOX.md) tagged for `project`."""
if not capture_launcher:
await say(report_room,
"⚠️ matrix-bridge: capture mode not configured ([mac].capture_launcher missing).",
thread_root)
return
rc, out, err = await run_capture(project, text)
if rc == 0:
print(f"capture ({project}): {out}", flush=True)
await say(report_room, f"📥 captured → {out}", thread_root)
return
detail = err or out or "no output"
print(f"CAPTURE FAILED ({project}): rc={rc} {detail[:300]}", flush=True)
await say(report_room, f"⚠️ matrix-bridge: capture failed (rc={rc}): {detail[:500]}",
thread_root)
async def on_message(room: MatrixRoom, event: RoomMessageText): async def on_message(room: MatrixRoom, event: RoomMessageText):
if event.sender == user_id: if event.sender == user_id:
return # never react to our own messages return # never react to our own messages
@@ -161,23 +219,46 @@ async def main():
if not prompt: if not prompt:
return return
if room.room_id == all_projects_room: # fan-out room always launches, never asks rid = room.room_id
if rid == all_projects_room:
cap_thread = all_projects_cfg.get("capture_thread")
cap_project = all_projects_cfg.get("capture_project", "?")
elif rid in rooms:
cap_thread = rooms[rid].get("capture_thread")
cap_project = rooms[rid].get("capture_project", rooms[rid]["label"])
else:
return # message in an unmapped room
# Capture is checked first: an explicit `/capture <text>` in any mapped room, or any
# message in this room's configured capture thread → logged to the inbox, not launched.
thread_root = thread_root_of(event)
head, _, rest = prompt.partition(" ")
if head == CAPTURE_PREFIX:
note = rest.strip()
if note:
await capture(rid, cap_project, note, thread_root)
return
if cap_thread and thread_root == cap_thread:
await capture(rid, cap_project, prompt, thread_root)
return
if rid == all_projects_room: # fan-out room: launch everywhere, never asks
date = datetime.date.today().isoformat() date = datetime.date.today().isoformat()
print(f"[all-projects] fan-out to {len(rooms)} repos: {prompt!r}", flush=True) print(f"[all-projects] fan-out to {len(rooms)} repos: {prompt!r}", flush=True)
results = await asyncio.gather(*[ results = await asyncio.gather(*[
launch_one(room.room_id, r, prompt, f"{r['label']} - {date}") launch_one(rid, r, prompt, f"{r['label']} - {date}")
for r in rooms.values() for r in rooms.values()
]) ])
await say(room.room_id, await say(rid,
f"matrix-bridge: launched {sum(results)}/{len(rooms)} sessions ({date}).") f"matrix-bridge: launched {sum(results)}/{len(rooms)} sessions ({date}).")
elif room.room_id in rooms: else: # a mapped project room
r = rooms[room.room_id] r = rooms[rid]
if prompt.startswith("?"): # headless ask mode if prompt.startswith("?"): # headless ask mode
ask_prompt = prompt[1:].strip() ask_prompt = prompt[1:].strip()
if ask_prompt: if ask_prompt:
await ask(room.room_id, r, ask_prompt) await ask(rid, r, ask_prompt)
elif await launch_one(room.room_id, r, prompt): elif await launch_one(rid, r, prompt):
await say(room.room_id, await say(rid,
f"matrix-bridge: launched {r['label']} — drive it on your phone.") f"matrix-bridge: launched {r['label']} — drive it on your phone.")
# Prime the sync token past existing history, THEN register the callback, so the bot # Prime the sync token past existing history, THEN register the callback, so the bot