diff --git a/AGENTS.md b/AGENTS.md index b9ad177..e40256c 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,4 +1,4 @@ -# cc-ci-autonomous-orchestrator — AGENTS.md +# cc-ci-orchestrator — AGENTS.md This folder is the **orchestrator** workspace for building the **cc-ci** Co-op Cloud recipe CI server. It holds the plan, the launch/supervision tooling, and the two loop prompts. The actual CI diff --git a/README.md b/README.md index 5083ad6..f4864ae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# cc-ci-autonomous-orchestrator +# cc-ci-orchestrator Orchestrator workspace for building the **cc-ci** Co-op Cloud recipe CI server. The plan, launch tooling, and loop prompts live in [`cc-ci-plan/`](cc-ci-plan/); see [`AGENTS.md`](AGENTS.md) for the diff --git a/cc-ci-plan/launch-orchestrator.sh b/cc-ci-plan/launch-orchestrator.sh index 7f927e2..fa93f30 100755 --- a/cc-ci-plan/launch-orchestrator.sh +++ b/cc-ci-plan/launch-orchestrator.sh @@ -9,8 +9,9 @@ # it). The conversation itself survives on disk across exits/reboots; remote-control only stays # connected while the process is alive, so recovery = relaunch the process and re-attach by --resume. # -# Naming: tmux session AND remote-control name are both "cc-ci-orchestrator", matching the loop -# sessions cc-ci-builder / cc-ci-adv / cc-ci-watchdog. +# Naming: tmux session AND remote-control name are both "cc-ci-orchestrator-vm" (the -vm suffix +# distinguishes it from the repo name cc-ci-orchestrator); the loop sessions are cc-ci-builder / +# cc-ci-adv / cc-ci-watchdog. # # Usage: # ./launch-orchestrator.sh start # resume the persistent orchestrator session (DEFAULT) @@ -26,7 +27,7 @@ set -euo pipefail # ----- config ------------------------------------------------------------- -SESSION="${ORCH_SESSION:-cc-ci-orchestrator}" # tmux session name == remote-control name +SESSION="${ORCH_SESSION:-cc-ci-orchestrator-vm}" # tmux session name == remote-control name WORKDIR="${ORCH_DIR:-/srv/cc-ci}" # orchestrator cwd (its claude project dir) CLAUDE_BIN="${CLAUDE_BIN:-claude}" CLAUDE_FLAGS="${CLAUDE_FLAGS:---dangerously-skip-permissions}" diff --git a/cc-ci-plan/launch.sh b/cc-ci-plan/launch.sh index 335d67d..7050d3e 100755 --- a/cc-ci-plan/launch.sh +++ b/cc-ci-plan/launch.sh @@ -60,7 +60,7 @@ BUILDER_SESSION="cc-ci-builder" ADV_SESSION="cc-ci-adv" WATCHDOG_SESSION="cc-ci-watchdog" # Orchestrator (supervisory session) — the watchdog keeps it alive too, via launch-orchestrator.sh. -ORCH_SESSION="${ORCH_SESSION:-cc-ci-orchestrator}" +ORCH_SESSION="${ORCH_SESSION:-cc-ci-orchestrator-vm}" ORCH_LAUNCHER="${ORCH_LAUNCHER:-$PLAN_DIR/launch-orchestrator.sh}" # Watchdog supervision of the orchestrator can be disabled (=0) if you run the orchestrator yourself # and don't want it auto-(re)launched. diff --git a/cc-ci-plan/plan-orchestrator-migration.md b/cc-ci-plan/plan-orchestrator-migration.md index e6a4b36..e68a204 100644 --- a/cc-ci-plan/plan-orchestrator-migration.md +++ b/cc-ci-plan/plan-orchestrator-migration.md @@ -33,7 +33,7 @@ service + claude CLI + sops secrets). Then C (stage workspace), claude auth (ope ## 0. Current footprint (what has to move) On the Pi (`raspberrypi`, aarch64), workspace `/srv/cc-ci` (itself the -`cc-ci-autonomous-orchestrator` git repo): +`cc-ci-orchestrator` git repo — formerly `cc-ci-autonomous-orchestrator`): | Item | What | Move strategy | |---|---|---| @@ -103,7 +103,7 @@ test server. Contents: supervisor **not yet started** — or started in a dry mode). ### Phase C — stage the workspace (no cutover yet) -6. On the VM: clone `cc-ci-autonomous-orchestrator` (the loop code), clone the Builder/Adversary +6. On the VM: clone `cc-ci-orchestrator` (the loop code), clone the Builder/Adversary working repos fresh from git.autonomic.zone, clone `cc-ci-secrets`, rsync `references/`. 7. Copy `.phase-idx` (resume point = phase 2) so the VM watchdog resumes the right phase. 8. **Operator step:** `claude auth login` on the VM (device code) so the loops can run diff --git a/cc-ci-plan/plan-repo-consolidation.md b/cc-ci-plan/plan-repo-consolidation.md index 5c56673..672155c 100644 --- a/cc-ci-plan/plan-repo-consolidation.md +++ b/cc-ci-plan/plan-repo-consolidation.md @@ -1,7 +1,7 @@ # Plan stub — repo consolidation + recipe-maintainer submodule -**Status:** DEFERRED — make the real plan when credits are available (operator, 2026-05-30). -Two cleanups to the orchestrator's repo layout, recorded so a future session can pick them up. +**Status:** COMPLETE (2026-05-31). +Both cleanups executed. See commit history for details. --- @@ -44,7 +44,15 @@ makes the workspace self-contained on any host. to `/srv/recipe-maintainer` on the VM (needs root — `/srv` is root-owned) so the existing symlink resolves; OR do Task 2 directly. -## When to do this -After Phase 2 settles / when credits are available. Neither is urgent for the loops *currently in -flight* (ghost/discourse were already partly ported on the Pi), but Task 2's gap will bite the next -not-yet-ported recipe. +## Operator action required — Pi clone remote update + +The Gitea rename (`cc-ci-autonomous-orchestrator` → `cc-ci-orchestrator`) breaks the `origin` remote +on any existing clone. **On the Pi** (and any other machine with a clone), run: + +``` +cd /srv/cc-ci # or wherever the workspace is cloned +git remote set-url origin https://git.autonomic.zone/recipe-maintainers/cc-ci-orchestrator.git +# (include bot credentials in the URL if needed, as before) +``` + +The VM clone's remote was updated automatically as part of this task.