From 76bc95f9a965a30ae1e55d10cac4e793b24a7329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A2ni=20Marques?= <hernani@vecirex.net>
Date: Fri, 17 Jul 2026 18:14:48 +0200
Subject: [PATCH] docs: uncommitted work was in second koopa-admin-log clone

---
 ops/CLONE-MERGE-2026-07-17.md | 60 +++++++++++++++++++++++++++++++++++
 ops/local-branches-sync.md    |  6 ++++
 2 files changed, 66 insertions(+)
 create mode 100644 ops/CLONE-MERGE-2026-07-17.md

diff --git a/ops/CLONE-MERGE-2026-07-17.md b/ops/CLONE-MERGE-2026-07-17.md
new file mode 100644
index 0000000..01483d1
--- /dev/null
+++ b/ops/CLONE-MERGE-2026-07-17.md
@@ -0,0 +1,60 @@
+# Clone merge 2026-07-17 — uncommitted work lived in *another* directory
+
+## Problem
+
+Two **different working trees** pointed at the same remote
+`https://git.hacktivism.ch/hernani/koopa-admin-log.git`:
+
+| Path | Role | What was wrong |
+|------|------|----------------|
+| **`~/taler/src/koopa-admin-log`** | Workspace / agent edits | On `origin/main` (monitoring: badges, `www.exchange-NN`, SECRETS_ROOT fix, stage profiles, …) |
+| **`~/koopa-admin-log`** | Where e2e was run | **Older** `main` tip + **6 unpushed landing commits** + **large uncommitted** diffs under `scripts/taler-monitoring/` |
+
+That is easy to miss: same remote name, different folders. Edits and “uncommitted”
+state were **not** always in the tree being pushed from `taler/src`.
+
+## What was recovered / merged
+
+Into **canonical** `~/taler/src/koopa-admin-log` → pushed to `origin/main`:
+
+1. **6 commits only on the home clone** (landing v42 stamps, kGOA stats, …) — cherry-picked.
+2. **I-08** note from home clone’s dirty `ISSUES.md` (landing-stats → standalone).
+3. **`local/*` branches** from the home clone (local only; not pushed to origin by policy).
+4. Uncommitted monitoring WIP on the home clone was **mostly already on origin**
+   (grouped IDs `area.group-NN`, SECRETS_ROOT discovery) — not re-applied as a
+   second patch.
+
+## Backups (before deleting the home tree)
+
+Under `taler/src/koopa-admin-log-backups/`:
+
+- `home-clone-uncommitted-wip-*.patch` — dirty tree at merge time  
+- `home-clone-all.bundle` — full home clone refs  
+- `home-clone-tree-*` — moved entire old directory  
+
+## After merge
+
+| Path | Now |
+|------|-----|
+| `~/koopa-admin-log` | **symlink** → `~/taler/src/koopa-admin-log` |
+| `~/koopa-admin-secrets` | **symlink** → `~/taler/src/koopa-admin-secrets` |
+
+One tree only for day-to-day work and push.
+
+## Still not implemented (explicit gaps)
+
+These were **requested** but are **not** in the recovered WIP / current tree:
+
+- Global running test number alongside `www.exchange-01`
+- Progress bar / percent complete
+- Local `secrets.env` (+ committed **example** only) for e2e passwords
+
+Grouped IDs (`www.exchange-01`) and SECRETS_ROOT search **are** on `main`.
+
+## Remotes (this workspace)
+
+| Repo | Path | Remote |
+|------|------|--------|
+| koopa-admin-log | `taler/src/koopa-admin-log` | `git.hacktivism.ch/hernani/koopa-admin-log` |
+| francpaysan-admin-log | `taler/src/francpaysan-admin-log` | `git.gnunet.org/francpaysan-admin-log` |
+| koopa-admin-secrets | `taler/src/koopa-admin-secrets` | local secrets only (no origin push of live secrets) |
diff --git a/ops/local-branches-sync.md b/ops/local-branches-sync.md
index 0d8314b..60be734 100644
--- a/ops/local-branches-sync.md
+++ b/ops/local-branches-sync.md
@@ -17,3 +17,9 @@
 # Pull main:
 #   git fetch origin && git checkout main && git merge --ff-only origin/main
 
+
+## 2026-07-17 clone merge
+
+See **[CLONE-MERGE-2026-07-17.md](./CLONE-MERGE-2026-07-17.md)**:
+uncommitted work lived under a **second** directory `~/koopa-admin-log`
+(not under `taler/src/…`); that tree is now a symlink to the canonical clone.