PRD 0014: cred-proxy block remediation #20

2026-05-25T03:40:57-04:00

didericis commented

2026-05-25 03:40:57 -04:00

Summary

Adds PRD 0014, the first end-to-end remediation engine in the stuck-agent recovery flow (overview in PRD 0012, foundation in PRD 0013). Wires the cred-proxy block path: SIGHUP-based hot reload of routes.json on cred-proxy, supervisor writes the new file and SIGHUPs on operator approval, plus a proactive routes edit <bottle> TUI verb for operator-initiated edits unrelated to a tool call.

Depends on PRD 0013 landing first (the MCP sidecar and approval-handler plumbing live there).

## Summary Adds PRD 0014, the first end-to-end remediation engine in the stuck-agent recovery flow (overview in PRD 0012, foundation in PRD 0013). Wires the cred-proxy block path: SIGHUP-based hot reload of `routes.json` on cred-proxy, supervisor writes the new file and SIGHUPs on operator approval, plus a proactive `routes edit <bottle>` TUI verb for operator-initiated edits unrelated to a tool call. Depends on PRD 0013 landing first (the MCP sidecar and approval-handler plumbing live there).

didericis added 1 commit 2026-05-25 04:37:30 -04:00

docs(prd-0014): cred-proxy block remediation

test / unit (pull_request) Successful in 17s

Details

test / integration (pull_request) Successful in 45s

Details

76a9bd2586

Adds PRD 0014, the first end-to-end remediation engine in the
stuck-agent recovery flow (overview in PRD 0012, foundation in PRD
0013). Wires the cred-proxy block path: SIGHUP-based hot reload of
routes.json on cred-proxy, supervisor write-on-approval, proactive
routes edit TUI verb, cred-proxy audit log filled in.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

didericis force-pushed prd-0014-cred-proxy-block from 124e2fe1ea to 76a9bd2586

2026-05-25 04:37:30 -04:00

Compare

didericis added 5 commits 2026-05-25 04:50:31 -04:00

feat(cred-proxy): SIGHUP reload of routes.json (PRD 0014) ee60b09816

Phase 1 of PRD 0014. Adds the in-sidecar SIGHUP signal handler that
re-reads routes.json + re-resolves tokens from env without dropping
in-flight connections:

- reload_routes(server, path, environ=...) does the atomic swap.
  Returns (ok, message) so the caller can log/surface failures.
  On failure (bad JSON, missing file) the server keeps serving the
  old routes rather than dying — typos shouldn't crash the sidecar.
- install_sighup_handler wires SIGHUP → reload_routes. No-op on
  platforms without SIGHUP (Windows).
- serve() now installs the handler at startup.

Atomicity: Python attribute reassignment is atomic, and the request
handler reads server.routes/tokens once at the top of _proxy() so
an in-flight request keeps the version it captured.

Tests cover successful reload, JSON-parse failure, and missing-file
failure (both verify the old routes survive).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

feat(cred-proxy): host-side apply_routes_change helper (PRD 0014) f7f1a7d5da

Phase 2 of PRD 0014. New module
claude_bottle/backend/docker/cred_proxy_apply.py:

- fetch_current_routes(slug): docker exec cat of the live
  routes.json from the running cred-proxy sidecar.
- validate_routes_json(content): syntactic check before SIGHUP so
  failures keep the old routes live and surface a clearer error
  than 'reload failed' in the sidecar logs.
- apply_routes_change(slug, new): fetch current → validate new →
  write to temp → docker cp into sidecar → docker kill --signal HUP.
  Returns (before, after) so the caller can render a real audit diff.
- CredProxyApplyError: caller surfaces to operator without crashing
  the dashboard.

docker exec / cp / kill paths are covered by the integration test
in Phase 5; unit tests here cover the validator.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

feat(dashboard): wire cred-proxy-block approval to real apply (PRD 0014) f3a1b4d667

Phase 3 of PRD 0014. dashboard.approve() now does the real
remediation for cred-proxy-block proposals:

- Calls apply_routes_change(slug, file_to_apply) which fetches the
  current routes.json from the running sidecar, validates the new
  JSON, docker cp's it in, and SIGHUPs the sidecar.
- Audit entry's diff is now the real before→after from the apply
  return — not the empty-string placeholder 0013 wrote.
- On apply failure (CredProxyApplyError): no response file, no
  audit entry. Proposal stays pending so the operator can fix the
  input and retry. The TUI's key handlers catch the exception and
  surface the message in the status line.
- pipelock-block + capability-block remain no-op approvals; their
  remediation lands in PRDs 0015 + 0016 and the audit diff stays
  empty until then.
- reject path unchanged: no apply, audit entry with empty diff.

Tests stub apply_routes_change at the dashboard module level so the
unit suite doesn't need a running sidecar; integration test in
Phase 5 covers the real docker exec/cp/SIGHUP plumbing.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

feat(dashboard): routes edit TUI verb for operator-initiated changes (PRD 0014) 81277e9d81

Phase 4 of PRD 0014. Adds the proactive routes-edit path that
doesn't require a pending proposal:

- discover_cred_proxy_slugs() lists running cred-proxy sidecars by
  parsing docker ps output. Returns [] when docker is unreachable
  or not installed (no exception escapes).
- operator_edit_routes(slug, new_content) wraps apply_routes_change
  and writes an audit entry tagged ACTION_OPERATOR_EDIT (so a
  future reader can distinguish operator-initiated changes from
  agent-proposal approvals in the log).
- New 'e' keybinding in the main TUI: discover slugs, prompt if
  multiple (or use the only one directly), fetch current routes,
  open in $EDITOR, apply on save. CredProxyApplyError lands in the
  status line; the operator can retry.

Tests cover audit-entry shape, failure path, and docker-missing
recovery for slug discovery.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

test(cred-proxy): integration test for SIGHUP + apply round-trip (PRD 0014)

test / unit (pull_request) Successful in 17s

Details

test / integration (pull_request) Successful in 1m12s

Details

70f43d8c4f

Phase 5 of PRD 0014. End-to-end test against real Docker:

- Brings up a cred-proxy sidecar with route /a/ → unreachable
  upstream (so 502 = route matched, 404 = no route).
- Calls apply_routes_change to swap to /b/ only.
- Polls until the route table flips: /a/ now 404s, /b/ now 502s.
- Separately verifies fetch_current_routes returns the live file,
  apply with invalid JSON raises, and apply against a non-existent
  sidecar raises.

No fake-upstream container needed: unreachable hostnames give the
502 signal directly. apply_routes_change uses docker exec / cp / kill
(not bind mounts), so this should work in docker-in-docker too —
no DinD skip needed.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

didericis merged commit 31ceac0436 into main

2026-05-25 04:54:05 -04:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: didericis/bot-bottle#20