# 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 `~/src/koopa/_backups/koopa-admin-log-backups-20260717/` (moved out of workspace):

- `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 (canonical layout)

**No** `~/koopa-admin-log` or `~/koopa-admin-secrets` on `$HOME` root.

| Path | Role |
|------|------|
| **`~/src/koopa/koopa-admin-log`** | **Canonical** admin-log (newest / `origin/main`) |
| **`~/src/koopa/koopa-admin-secrets`** | **Canonical** secrets (sibling of admin-log) |
| `~/taler/src/koopa-admin-log` | optional symlink → `~/src/koopa/…` (workspace convenience only) |
| `~/taler/src/koopa-admin-secrets` | optional symlink → `~/src/koopa/…` |

Work and push from **`~/src/koopa/koopa-admin-log`**.

## 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) |
