Merge dev into main #22

Merged
jimmy merged 5 commits from dev into main 2026-03-06 08:54:33 +08:00
Showing only changes of commit 4af7bc4946 - Show all commits
+73
View File
@@ -0,0 +1,73 @@
# Environment Handoff: Plan + Blockers (2026-03-03)
## Scope completed in this environment
- Reviewed the last 24h code changes focused on new dashboard services and images:
- LiteLLM
- CC Connect
- Info Engine
- Sidebar/service wiring
- Implemented one concrete fix:
- `dashboard/docker-compose.yml`
- Set `LITELLM_URL=http://litellm:4005`
- Added dashboard service to external network `nas-dashboard_internal`
- Declared `nas-dashboard_internal` under top-level `networks` as `external: true`
## Current git state summary
- Local branch context encountered during work:
- `dev` had two local commits ahead of remote at one point:
- `c29bda7` (includes `dashboard/docker-compose.yml` + `dashboard/frontend/src/routes/Terminal.svelte`)
- `da88513` (`dashboard/backend/routers/terminal.py`)
- `main` was behind `origin/main` and was fast-forwarded locally during troubleshooting.
- Final push/merge sequence was not fully completed in this environment due runtime/interaction blockers (below).
## Blockers in this environment
1. **No Docker runtime in this shell**
- `docker: command not found`
- Impact: cannot run compose/runtime verification (`docker compose config`, container health checks, end-to-end service validation).
2. **Limited/fragile git remote auth flow in this session**
- Token push via URL works for some commands, but interactive/approval interruptions occurred during follow-up operations.
- Impact: full unattended sequence (`push dev -> validate -> merge main -> push main`) was interrupted and must be re-executed in a more capable/stable environment.
3. **Branch divergence handling required care**
- `main` and `dev` divergence prevented `--ff-only` merge in one attempted sequence.
- Impact: merge strategy should be re-run intentionally after confirming remote heads in target environment.
## Recommended next steps (for stronger environment)
1. **Sync and inspect branch heads**
- Fetch all refs and inspect divergence between `origin/main` and `origin/dev`.
- Confirm whether commits `c29bda7` and `da88513` are already on remote `dev`.
2. **Validate compose and runtime behavior on NAS-capable host**
- Validate `dashboard/docker-compose.yml` syntax.
- Confirm network exists:
- `nas-dashboard_internal`
- Verify dashboard container can resolve and reach `litellm:4005` on shared network.
3. **Functional verification from dashboard backend**
- Check `/api/litellm/health` returns `up` or expected `auth_required`.
- Check CC Connect health/start/stop endpoints against actual container name.
- Check Info Engine endpoints (`/api/info-engine/items`, `/api/info-engine/health`) with mounted DB path.
4. **Complete git delivery flow**
- Push finalized `dev`.
- Merge `dev -> main` using the repos preferred strategy.
- Push `main`.
- Confirm CI/deploy workflows trigger as expected.
## Files directly touched for the LiteLLM networking fix
- `dashboard/docker-compose.yml`
## Notes for next Claude instance
- This repos remote is Gitea at:
- `http://localhost:3300/jimmy/nas-tools.git`
- External UI URL from project context:
- `https://git.jimmygan.com`
- Prior user preference in this thread:
- Keep CC Connect sidebar label lowercase.