mirror of
https://github.com/dtzp555-max/ocp.git
synced 2026-07-22 05:25:08 +00:00
Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 
|
ab03c13332 | ||
|
|
55c576bbb1 | ||
|
|
750b25ba77 | ||
|
|
fd6e875bd7 | ||
|
|
8c0b97f3ae | ||
|
|
68acf15373 | ||
|
|
a71c939bf8 | ||
|
|
d245c62df7 | ||
|
|
047750e642 | ||
|
|
3bdeb50ed5 | ||
|
|
fbbf3b6c7c | ||
|
|
d760d7fcce | ||
|
|
5e2effd05b | ||
|
|
fb2d1d3feb | ||
|
|
12b09c236e | ||
|
|
c0f2d3ab20 | ||
|
|
0d61da5153 |
@@ -1,5 +1,64 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v3.15.0 — 2026-XX-XX (release date filled at tag time)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- **`ocp doctor`** — health & upgrade-readiness check; primary entry for AI-driven debugging.
|
||||||
|
`--json` mode emits a `next_action` with `ai_executable[]` for agents to run verbatim
|
||||||
|
and `human_required[]` for steps requiring the user (typically only OAuth).
|
||||||
|
- **`ocp update` cross-version path** — for cross-minor jumps (e.g. v3.10 → v3.14),
|
||||||
|
`ocp update` now runs doctor → snapshot → `setup.mjs` (with the plist env-merge from
|
||||||
|
PR #90) → service restart → post-flight `/health` + `/v1/models` verification.
|
||||||
|
Same-patch updates retain the existing light path; users see no change for routine
|
||||||
|
patch bumps.
|
||||||
|
- **`ocp update --rollback`** — restore the most recent (or specified) upgrade snapshot.
|
||||||
|
Snapshots are saved to `~/.ocp/upgrade-snapshot-<ISO-ts>/` and never auto-deleted.
|
||||||
|
- **Fresh-install routing** — `ocp update` on installations < v3.4.0 routes to a fresh-install
|
||||||
|
flow (with `--yes` to skip confirmation; AI agents pass this). OAuth survives via Claude
|
||||||
|
Code's credential store; users do not re-OAuth unless their token was independently broken.
|
||||||
|
- **AI prompt blocks in README** — §Installation, §Upgrading, and §Troubleshooting each
|
||||||
|
start with a copy-paste prompt for Claude Code / Cursor / Copilot, so users can drive
|
||||||
|
install / setup / upgrade through their existing AI assistant.
|
||||||
|
|
||||||
|
### Behavior changes
|
||||||
|
|
||||||
|
- `ocp update` may take 10–30s longer when a cross-minor jump triggers the full path
|
||||||
|
(snapshot + post-flight). Patch bumps are unchanged.
|
||||||
|
- Pre-v3.4.0 installs are routed to fresh-install rather than failing silently or
|
||||||
|
half-migrating.
|
||||||
|
|
||||||
|
### Governance
|
||||||
|
|
||||||
|
- No `cli.js` citation needed (no `server.mjs` change). ALIGNMENT.md Rule 2 not engaged.
|
||||||
|
- Depends on PR #90 (plist env merge bug fix; merged before this release).
|
||||||
|
|
||||||
|
## v3.14.0 — 2026-05-10
|
||||||
|
|
||||||
|
### Features (security hardening)
|
||||||
|
|
||||||
|
- **Per-key session isolation** (PR #86, S1) — the `sessions` Map in `server.mjs` is now keyed by `${keyName}|${conversationId}` instead of bare `conversationId`. Before this fix, two clients using distinct API keys but the same `session_id` value (e.g. both defaulting to `"default"`) would share the same `cli.js` subprocess and conversation history, creating a cross-tenant leak path. Post-fix each (key, session) pair is isolated end-to-end, extending the per-key cache isolation shipped in v3.13.0 D1 to the session layer.
|
||||||
|
- **On-disk credential file modes 0700/0600** (PR #87, S2) — `setup.mjs` now creates `~/.ocp` at mode 0700 and both `admin-key` and `ocp.db` at mode 0600. An idempotent `reconcileFileModes()` call in `server.mjs` startup tightens any existing installation to these modes automatically on every launch, so existing prod boxes fix themselves without manual `chmod`. Before this fix, all three files were created at the process's default umask (typically world-readable 0644 / 0755), leaving plaintext credentials readable by other local users.
|
||||||
|
- **`/api/usage` default scope = self; admin all-keys requires `?all=true`** (PR #88, S3) — the usage endpoint now applies a least-privilege default: anonymous callers receive only their own rows, non-admin authenticated callers receive only their own rows, and admin callers receive only their own rows unless they explicitly pass `?all=true`. When `?all=true` is used, an audit log line is emitted. Before this fix, any admin-token holder could silently enumerate usage data for every key on the server.
|
||||||
|
|
||||||
|
### Behavior changes
|
||||||
|
|
||||||
|
- **Breaking change for admin tooling**: `/api/usage` no longer returns all-keys data by default. Existing cron jobs, dashboards, or scripts that rely on the admin token seeing all-keys output must add `?all=true` to their request URL after upgrading to v3.14.0.
|
||||||
|
- **File mode reconcile at server startup** logs a one-line notice per path when mode is tightened (e.g. `[security] tightened ~/.ocp/ocp.db → 0600`). No action is required from the operator; the reconcile is idempotent and silent when modes are already correct.
|
||||||
|
- **`sessions` Map key is now `${keyName}|${conversationId}` internally.** No client-visible wire change — the `session_id` field in request/response is unchanged.
|
||||||
|
|
||||||
|
### Verification
|
||||||
|
|
||||||
|
- Stress-test pass: 11/11 phases including S1/S2/S3 security regression checks (Phase E, I, J). 35-minute sustained run, 60 calls, 0 errors, 0 timeouts. RSS dropped 51→47 MB across the window. Per-key cache isolation, singleflight, cache_control bypass, quota enforcement, file-mode reconcile, and scope guard against escalation all verified against running code.
|
||||||
|
|
||||||
|
### Governance
|
||||||
|
|
||||||
|
- All three PRs (#86, #87, #88) include the explicit `cli.js`-citation-not-applicable disclaimer (per PR #75 pattern) since they are OCP-internal access-control, session-state, and file-permission changes with no corresponding `cli.js` operation to cite.
|
||||||
|
|
||||||
|
### No new env vars / no public API surface change beyond the documented breaking change
|
||||||
|
|
||||||
|
This release adds no new env vars or endpoints. The only externally visible change is the `/api/usage` scope guard (breaking for admin all-keys consumers; see Behavior changes above).
|
||||||
|
|
||||||
## v3.13.0 — 2026-05-07
|
## v3.13.0 — 2026-05-07
|
||||||
|
|
||||||
### Features (cache layer hardening)
|
### Features (cache layer hardening)
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
|
|
||||||
*Open source from day one, used daily by my family, maintained on nights and weekends. If OCP saves you money too, you can [☕ buy me a coffee](https://buymeacoffee.com/dtzp555) — [full story below](#support-ocp).*
|
*Open source from day one, used daily by my family, maintained on nights and weekends. If OCP saves you money too, you can [☕ buy me a coffee](https://buymeacoffee.com/dtzp555) — [full story below](#support-ocp).*
|
||||||
|
|
||||||
|
*If OCP saves you a setup, a ⭐ helps other folks discover it. Issue reports are even more useful — that's the highest-quality feedback this project gets.*
|
||||||
|
|
||||||
OCP turns your Claude Pro/Max subscription into a standard OpenAI-compatible API on localhost. Any tool that speaks the OpenAI protocol can use it — no separate API key, no extra billing.
|
OCP turns your Claude Pro/Max subscription into a standard OpenAI-compatible API on localhost. Any tool that speaks the OpenAI protocol can use it — no separate API key, no extra billing.
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -67,6 +69,20 @@ Any tool that accepts `OPENAI_BASE_URL` works with OCP:
|
|||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
The simplest path: ask your AI.
|
||||||
|
|
||||||
|
Paste this prompt to Claude Code / Cursor / Copilot:
|
||||||
|
|
||||||
|
```
|
||||||
|
Install OCP for me. Read README §Manual Installation and follow it.
|
||||||
|
Tell me when I need to run `claude auth login`.
|
||||||
|
```
|
||||||
|
|
||||||
|
The AI will run `git clone`, `npm install`, `node setup.mjs`, and tell you
|
||||||
|
when to OAuth.
|
||||||
|
|
||||||
|
### Manual Installation
|
||||||
|
|
||||||
OCP has two roles: **Server** (runs the proxy, needs Claude CLI) and **Client** (connects to a server, zero dependencies).
|
OCP has two roles: **Server** (runs the proxy, needs Claude CLI) and **Client** (connects to a server, zero dependencies).
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -185,7 +201,8 @@ The setup script will:
|
|||||||
1. Verify Claude CLI is installed and authenticated
|
1. Verify Claude CLI is installed and authenticated
|
||||||
2. Start the proxy on port 3456
|
2. Start the proxy on port 3456
|
||||||
3. Install auto-start (launchd on macOS, systemd on Linux)
|
3. Install auto-start (launchd on macOS, systemd on Linux)
|
||||||
4. Symlink `ocp` to `/usr/local/bin` for CLI access
|
|
||||||
|
After install the `ocp` CLI lives at `~/ocp/ocp`. To put it on your PATH, either symlink it manually (`ln -sf ~/ocp/ocp ~/.local/bin/ocp` if `~/.local/bin` is on your PATH, or `sudo ln -sf ~/ocp/ocp /usr/local/bin/ocp` for a system-wide symlink) or add an alias (`alias ocp=~/ocp/ocp`). Otherwise invoke it as `~/ocp/ocp <subcommand>`. The rest of this README assumes `ocp` is on your PATH.
|
||||||
|
|
||||||
**Single-machine use** — just set your IDE to use the proxy:
|
**Single-machine use** — just set your IDE to use the proxy:
|
||||||
```bash
|
```bash
|
||||||
@@ -389,17 +406,23 @@ ocp keys revoke son-ipad # Revoke a key
|
|||||||
| `shared` | `CLAUDE_AUTH_MODE=shared` + `PROXY_API_KEY=xxx` | Everyone shares one key |
|
| `shared` | `CLAUDE_AUTH_MODE=shared` + `PROXY_API_KEY=xxx` | Everyone shares one key |
|
||||||
| `multi` | `CLAUDE_AUTH_MODE=multi` + `OCP_ADMIN_KEY=xxx` | Per-person keys with usage tracking (recommended) |
|
| `multi` | `CLAUDE_AUTH_MODE=multi` + `OCP_ADMIN_KEY=xxx` | Per-person keys with usage tracking (recommended) |
|
||||||
|
|
||||||
|
> **Usage scope (v3.14.0+):** `/api/usage` returns the caller's own rows by default. Admin callers must pass `?all=true` to retrieve data for all keys; doing so emits an audit log line.
|
||||||
|
|
||||||
### Anonymous Access (optional)
|
### Anonymous Access (optional)
|
||||||
|
|
||||||
In `multi` mode, the admin can designate a single well-known "anonymous" key that bypasses `validateKey()` and grants public read/write access. This is useful for letting LAN users (or clients like OpenClaw multi-agent setups) connect without individual per-user keys.
|
In `multi` mode, the admin can designate a single well-known "anonymous" key that bypasses `validateKey()` and grants public read/write access. This is useful for letting LAN users (or clients like OpenClaw multi-agent setups) connect without individual per-user keys.
|
||||||
|
|
||||||
**Enable**:
|
**Enable**:
|
||||||
|
|
||||||
|
The anonymous key is wired into the service unit (launchd plist on macOS, systemd unit on Linux) at install time. Export `PROXY_ANONYMOUS_KEY` in your shell before running `setup.mjs`, and `setup.mjs` will write it into the service unit env so the auto-started proxy picks it up:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
export PROXY_ANONYMOUS_KEY=ocp_public_anon # or any string of your choice
|
export PROXY_ANONYMOUS_KEY=ocp_public_anon # or any string of your choice
|
||||||
ocp start # or however you start the server
|
node setup.mjs --bind 0.0.0.0 --auth-mode multi
|
||||||
```
|
```
|
||||||
|
|
||||||
|
If OCP is already installed without it, re-export the env var and re-run `node setup.mjs` (the installer is idempotent — it refreshes the service unit). Then `ocp restart` so the running proxy picks up the new env. Setting `PROXY_ANONYMOUS_KEY` only in your interactive shell **does not** affect the auto-started proxy — the service unit is the source of truth for its environment.
|
||||||
|
|
||||||
**Client side**: the anonymous key value is exposed via `GET /health` as the field `anonymousKey` (null when not set). Clients like `ocp-connect` can auto-discover and use it, so the end user doesn't need to get a personal key from the admin.
|
**Client side**: the anonymous key value is exposed via `GET /health` as the field `anonymousKey` (null when not set). Clients like `ocp-connect` can auto-discover and use it, so the end user doesn't need to get a personal key from the admin.
|
||||||
|
|
||||||
**Security note**: setting this env var is an **opt-in** to public access — anyone who can reach your OCP endpoint can use it, up to any rate limits you configure. Don't enable this on internet-exposed OCP instances without additional protection.
|
**Security note**: setting this env var is an **opt-in** to public access — anyone who can reach your OCP endpoint can use it, up to any rate limits you configure. Don't enable this on internet-exposed OCP instances without additional protection.
|
||||||
@@ -453,6 +476,7 @@ When a key exceeds its quota, OCP returns HTTP 429 with a structured error:
|
|||||||
- Keys are stored in `~/.ocp/ocp.db` (SQLite, zero external dependencies)
|
- Keys are stored in `~/.ocp/ocp.db` (SQLite, zero external dependencies)
|
||||||
- Admin key is required for key management API endpoints
|
- Admin key is required for key management API endpoints
|
||||||
- The dashboard (`/dashboard`) and health check (`/health`) are always public
|
- The dashboard (`/dashboard`) and health check (`/health`) are always public
|
||||||
|
- File modes for `~/.ocp` (0700), `admin-key` + `ocp.db` (0600) are auto-tightened at server startup as of v3.14.0
|
||||||
|
|
||||||
## Built-in Usage Monitoring
|
## Built-in Usage Monitoring
|
||||||
|
|
||||||
@@ -491,6 +515,7 @@ ocp keys List all API keys (multi mode)
|
|||||||
ocp keys add <name> Create a new API key
|
ocp keys add <name> Create a new API key
|
||||||
ocp keys revoke <name> Revoke an API key
|
ocp keys revoke <name> Revoke an API key
|
||||||
ocp connect <ip> One-command LAN client setup
|
ocp connect <ip> One-command LAN client setup
|
||||||
|
ocp doctor Health & upgrade-readiness check; primary entry for AI-driven debugging. --json produces a next_action for AI agents.
|
||||||
ocp lan Show LAN connection info & IP
|
ocp lan Show LAN connection info & IP
|
||||||
ocp settings View tunable settings
|
ocp settings View tunable settings
|
||||||
ocp settings <k> <v> Update a setting at runtime
|
ocp settings <k> <v> Update a setting at runtime
|
||||||
@@ -517,17 +542,57 @@ ocp --help
|
|||||||
|
|
||||||
> **Cloud/Linux servers:** If `ocp: command not found`, the binary isn't in PATH. Full path: `~/.openclaw/projects/ocp/ocp`
|
> **Cloud/Linux servers:** If `ocp: command not found`, the binary isn't in PATH. Full path: `~/.openclaw/projects/ocp/ocp`
|
||||||
|
|
||||||
### Self-Update
|
## Upgrading
|
||||||
|
|
||||||
|
The simplest path: ask your AI.
|
||||||
|
|
||||||
|
Paste this prompt:
|
||||||
|
|
||||||
|
```
|
||||||
|
Upgrade my OCP. Run `ocp update` and follow whatever it says.
|
||||||
|
If it tells me to run `claude auth login`, I'll do that.
|
||||||
|
```
|
||||||
|
|
||||||
|
What `ocp update` does:
|
||||||
|
|
||||||
|
- **Patch bump** (e.g. `v3.14.0 → v3.14.1`):
|
||||||
|
light path (git pull + npm install + restart).
|
||||||
|
- **Cross-minor** (e.g. `v3.10 → v3.14`):
|
||||||
|
full path: pre-flight check, snapshot, `setup.mjs` (with plist env-merge),
|
||||||
|
service restart, post-flight `/health` and `/v1/models` verification.
|
||||||
|
- **Old version** (< v3.4.0):
|
||||||
|
fresh-install. Pre-v3.4 lacked admin-key/usage-db, so there is nothing to
|
||||||
|
migrate. Your OAuth token (managed by the Claude Code CLI, not OCP) is
|
||||||
|
preserved; you do not need to re-OAuth unless your token expired
|
||||||
|
separately.
|
||||||
|
|
||||||
|
Snapshots are saved to `~/.ocp/upgrade-snapshot-<ISO-ts>/` and never
|
||||||
|
auto-deleted. Clean old ones with `rm -rf ~/.ocp/upgrade-snapshot-*` once
|
||||||
|
you're confident the upgrade is stable.
|
||||||
|
|
||||||
|
### Manual upgrade — same command, no AI
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check if a new version is available
|
ocp update # smart-pick path
|
||||||
ocp update --check
|
ocp update --check # show available updates, don't apply
|
||||||
|
ocp update --dry-run # preview plan
|
||||||
# Pull latest, sync plugin, restart proxy — one command
|
ocp update --target v3.13.0 # pin a specific version
|
||||||
ocp update
|
ocp update --rollback --yes # restore most recent snapshot (--yes confirms)
|
||||||
|
ocp update --rollback --list # list snapshots, no mutation
|
||||||
|
ocp update --rollback --dry-run # preview rollback plan
|
||||||
```
|
```
|
||||||
|
|
||||||
`ocp update` runs (in order): `git pull` → `npm install` → plugin sync → **OpenClaw model registry sync** (v3.11.0+) → proxy restart → health check.
|
### When upgrade fails
|
||||||
|
|
||||||
|
`ocp update` prints a recovery line on failure. To restore from the snapshot:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ocp update --rollback --yes # --yes confirms the destructive restore
|
||||||
|
ocp doctor
|
||||||
|
```
|
||||||
|
|
||||||
|
If `ocp doctor` still reports problems after rollback, open a GitHub issue
|
||||||
|
with the snapshot path and the doctor JSON output (`ocp doctor --json`).
|
||||||
|
|
||||||
### OpenClaw Auto-Sync (v3.11.0+)
|
### OpenClaw Auto-Sync (v3.11.0+)
|
||||||
|
|
||||||
@@ -650,7 +715,7 @@ The canonical list lives in [`models.json`](./models.json) — the single source
|
|||||||
| `/api/keys` | GET/POST | List or create API keys (admin only) |
|
| `/api/keys` | GET/POST | List or create API keys (admin only) |
|
||||||
| `/api/keys/:id` | DELETE | Revoke an API key (admin only) |
|
| `/api/keys/:id` | DELETE | Revoke an API key (admin only) |
|
||||||
| `/api/keys/:id/quota` | GET/PATCH | View or set per-key quota (admin only) |
|
| `/api/keys/:id/quota` | GET/PATCH | View or set per-key quota (admin only) |
|
||||||
| `/api/usage` | GET | Per-key usage stats (`?since=&until=&hours=&limit=`) |
|
| `/api/usage` | GET | Per-key usage stats (`?since=&until=&hours=&limit=`); returns self only by default — pass `?all=true` (admin only) for all-keys data |
|
||||||
| `/cache/stats` | GET | Cache statistics (admin only) |
|
| `/cache/stats` | GET | Cache statistics (admin only) |
|
||||||
| `/cache` | DELETE | Clear response cache (admin only) |
|
| `/cache` | DELETE | Clear response cache (admin only) |
|
||||||
|
|
||||||
@@ -700,6 +765,21 @@ After installing the gateway plugin, use `/ocp` slash commands in your chat:
|
|||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|
||||||
|
The simplest path: ask your AI.
|
||||||
|
|
||||||
|
Paste this prompt:
|
||||||
|
|
||||||
|
```
|
||||||
|
Run `ocp doctor` and follow its `next_action`. Tell me if you hit
|
||||||
|
anything that needs human input.
|
||||||
|
```
|
||||||
|
|
||||||
|
The doctor produces a JSON `next_action` with `ai_executable[]` (commands
|
||||||
|
the agent runs verbatim) and `human_required[]` (steps that need you,
|
||||||
|
typically just OAuth).
|
||||||
|
|
||||||
|
### Manual debugging
|
||||||
|
|
||||||
### Setup fails with "claude: command not found"
|
### Setup fails with "claude: command not found"
|
||||||
|
|
||||||
`setup.mjs` requires the Claude CLI to be on `PATH`. Install it via the [official guide](https://docs.anthropic.com/en/docs/claude-cli), confirm with `which claude`, then run `claude auth login` before re-running `node setup.mjs`.
|
`setup.mjs` requires the Claude CLI to be on `PATH`. Install it via the [official guide](https://docs.anthropic.com/en/docs/claude-cli), confirm with `which claude`, then run `claude auth login` before re-running `node setup.mjs`.
|
||||||
|
|||||||
+21
-2
@@ -55,7 +55,13 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="section">
|
<div class="section">
|
||||||
<h2>Usage by Key</h2>
|
<div class="flex" style="justify-content: space-between; align-items: center;">
|
||||||
|
<h2 style="margin: 0;">Usage by Key</h2>
|
||||||
|
<label id="usage-scope-toggle" class="flex" style="display:none; gap: 0.4rem; font-size: 0.8rem; color: #94a3b8; cursor: pointer;">
|
||||||
|
<input type="checkbox" id="usage-show-all" style="cursor: pointer;">
|
||||||
|
<span>Show all keys</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
<table id="key-usage-table">
|
<table id="key-usage-table">
|
||||||
<thead><tr><th>Key</th><th>Requests</th><th>OK</th><th>Err</th><th>Avg Time</th><th>Last Request</th></tr></thead>
|
<thead><tr><th>Key</th><th>Requests</th><th>OK</th><th>Err</th><th>Avg Time</th><th>Last Request</th></tr></thead>
|
||||||
<tbody></tbody>
|
<tbody></tbody>
|
||||||
@@ -170,7 +176,8 @@ async function refreshStatus() {
|
|||||||
|
|
||||||
async function refreshUsage() {
|
async function refreshUsage() {
|
||||||
try {
|
try {
|
||||||
const data = await api("/api/usage");
|
const showAll = localStorage.getItem("ocp_usage_show_all") === "1";
|
||||||
|
const data = await api(showAll ? "/api/usage?all=true" : "/api/usage");
|
||||||
const tbody = document.querySelector("#key-usage-table tbody");
|
const tbody = document.querySelector("#key-usage-table tbody");
|
||||||
tbody.innerHTML = (data.byKey || []).map(k => `
|
tbody.innerHTML = (data.byKey || []).map(k => `
|
||||||
<tr>
|
<tr>
|
||||||
@@ -204,6 +211,8 @@ async function refreshKeys() {
|
|||||||
try {
|
try {
|
||||||
const data = await api("/api/keys");
|
const data = await api("/api/keys");
|
||||||
document.getElementById("key-mgmt-section").style.display = "";
|
document.getElementById("key-mgmt-section").style.display = "";
|
||||||
|
// Admin-only "Show all keys" toggle for /api/usage scope.
|
||||||
|
document.getElementById("usage-scope-toggle").style.display = "flex";
|
||||||
const tbody = document.querySelector("#keys-table tbody");
|
const tbody = document.querySelector("#keys-table tbody");
|
||||||
tbody.innerHTML = (data.keys || []).map(k => `
|
tbody.innerHTML = (data.keys || []).map(k => `
|
||||||
<tr>
|
<tr>
|
||||||
@@ -240,6 +249,16 @@ async function refreshAll() {
|
|||||||
document.getElementById("refresh-indicator").textContent = `Updated ${new Date().toLocaleTimeString()}`;
|
document.getElementById("refresh-indicator").textContent = `Updated ${new Date().toLocaleTimeString()}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Wire "Show all keys" toggle (visibility gated to admin via refreshKeys()).
|
||||||
|
(function setupUsageScopeToggle() {
|
||||||
|
const cb = document.getElementById("usage-show-all");
|
||||||
|
cb.checked = localStorage.getItem("ocp_usage_show_all") === "1";
|
||||||
|
cb.addEventListener("change", () => {
|
||||||
|
localStorage.setItem("ocp_usage_show_all", cb.checked ? "1" : "0");
|
||||||
|
refreshUsage();
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
|
||||||
refreshAll();
|
refreshAll();
|
||||||
setInterval(refreshAll, 30000);
|
setInterval(refreshAll, 30000);
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 222 KiB After Width: | Height: | Size: 366 KiB |
@@ -3,11 +3,13 @@
|
|||||||
import { DatabaseSync } from "node:sqlite";
|
import { DatabaseSync } from "node:sqlite";
|
||||||
import { randomBytes, createHash } from "node:crypto";
|
import { randomBytes, createHash } from "node:crypto";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { mkdirSync } from "node:fs";
|
import { mkdirSync, chmodSync } from "node:fs";
|
||||||
import { homedir } from "node:os";
|
import { homedir } from "node:os";
|
||||||
|
|
||||||
const OCP_DIR = join(homedir(), ".ocp");
|
const OCP_DIR = join(homedir(), ".ocp");
|
||||||
mkdirSync(OCP_DIR, { recursive: true });
|
mkdirSync(OCP_DIR, { recursive: true, mode: 0o700 });
|
||||||
|
// Tighten the directory mode in case it already existed with broader permissions.
|
||||||
|
try { chmodSync(OCP_DIR, 0o700); } catch { /* ignore EPERM on pre-existing dirs */ }
|
||||||
const DB_PATH = join(OCP_DIR, "ocp.db");
|
const DB_PATH = join(OCP_DIR, "ocp.db");
|
||||||
|
|
||||||
let db;
|
let db;
|
||||||
@@ -18,6 +20,8 @@ export function getDb() {
|
|||||||
db.exec("PRAGMA journal_mode = WAL");
|
db.exec("PRAGMA journal_mode = WAL");
|
||||||
db.exec("PRAGMA foreign_keys = ON");
|
db.exec("PRAGMA foreign_keys = ON");
|
||||||
initSchema();
|
initSchema();
|
||||||
|
// Tighten mode on the DB file (0600) after creation / first open.
|
||||||
|
try { chmodSync(DB_PATH, 0o600); } catch { /* ignore — same-user access still works */ }
|
||||||
}
|
}
|
||||||
return db;
|
return db;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,21 +8,18 @@ set -euo pipefail
|
|||||||
|
|
||||||
PROXY="http://127.0.0.1:3456"
|
PROXY="http://127.0.0.1:3456"
|
||||||
|
|
||||||
# Auth header for multi-key mode: reads from OCP_ADMIN_KEY env or ~/.ocp/admin-key file
|
# Auth args for multi-key mode: reads from OCP_ADMIN_KEY env or ~/.ocp/admin-key file
|
||||||
_AUTH_HEADER=""
|
# Using a bash array preserves word boundaries — no eval needed.
|
||||||
|
_AUTH_ARGS=()
|
||||||
if [[ -n "${OCP_ADMIN_KEY:-}" ]]; then
|
if [[ -n "${OCP_ADMIN_KEY:-}" ]]; then
|
||||||
_AUTH_HEADER="-H \"Authorization: Bearer $OCP_ADMIN_KEY\""
|
_AUTH_ARGS=(-H "Authorization: Bearer $OCP_ADMIN_KEY")
|
||||||
elif [[ -f "$HOME/.ocp/admin-key" ]]; then
|
elif [[ -f "$HOME/.ocp/admin-key" ]]; then
|
||||||
_AUTH_HEADER="-H \"Authorization: Bearer $(cat "$HOME/.ocp/admin-key")\""
|
_AUTH_ARGS=(-H "Authorization: Bearer $(cat "$HOME/.ocp/admin-key")")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Wrapper: curl with optional auth
|
# Wrapper: curl with optional auth
|
||||||
_curl() {
|
_curl() {
|
||||||
if [[ -n "$_AUTH_HEADER" ]]; then
|
curl "${_AUTH_ARGS[@]}" "$@"
|
||||||
eval curl "$_AUTH_HEADER" "$@"
|
|
||||||
else
|
|
||||||
curl "$@"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_json() { python3 -m json.tool 2>/dev/null || cat; }
|
_json() { python3 -m json.tool 2>/dev/null || cat; }
|
||||||
@@ -695,25 +692,33 @@ for e in d.get('errors', []):
|
|||||||
# ── update ──────────────────────────────────────────────────────────────
|
# ── update ──────────────────────────────────────────────────────────────
|
||||||
cmd_update_help() {
|
cmd_update_help() {
|
||||||
cat <<'EOF'
|
cat <<'EOF'
|
||||||
ocp update — Update OCP to the latest version
|
ocp update — Smart upgrade dispatcher
|
||||||
|
|
||||||
Pulls the latest code from GitHub, restarts the proxy service,
|
Runs `ocp doctor` internally to choose the right path:
|
||||||
and optionally syncs the plugin to the OpenClaw extensions directory.
|
• Patch bump (same minor): light path (git pull + npm install + restart)
|
||||||
|
• Cross-minor (e.g. v3.10→v3.14): full path with snapshot + post-flight
|
||||||
|
• Old version (< v3.4.0): fresh-install (asks first; AI passes --yes)
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
ocp update Pull latest and restart
|
ocp update Smart auto-pick path
|
||||||
ocp update --check Check for updates without applying
|
ocp update --check Show available updates, don't apply
|
||||||
|
ocp update --dry-run Preview the plan, don't mutate
|
||||||
|
ocp update --target v3.13.0 Pin a specific version
|
||||||
|
ocp update --yes Skip y/N prompts (AI agents pass this)
|
||||||
|
ocp update --rollback Restore the most recent upgrade snapshot
|
||||||
|
ocp update --rollback --list List available snapshots
|
||||||
|
ocp update --rollback <path> Restore a specific snapshot
|
||||||
|
ocp update --rollback --dry-run Preview rollback plan
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_update() {
|
cmd_update() {
|
||||||
local script_dir self
|
local script_dir self
|
||||||
self="${BASH_SOURCE[0]}"
|
self="${BASH_SOURCE[0]}"
|
||||||
# Resolve symlinks (e.g. ~/.local/bin/ocp → real location)
|
|
||||||
while [[ -L "$self" ]]; do self="$(readlink "$self")"; done
|
while [[ -L "$self" ]]; do self="$(readlink "$self")"; done
|
||||||
script_dir="$(cd "$(dirname "$self")" && pwd)"
|
script_dir="$(cd "$(dirname "$self")" && pwd)"
|
||||||
|
|
||||||
# Check-only mode
|
# Pass through --check fast path (existing behaviour)
|
||||||
if [[ "${1:-}" == "--check" ]]; then
|
if [[ "${1:-}" == "--check" ]]; then
|
||||||
cd "$script_dir"
|
cd "$script_dir"
|
||||||
git fetch origin main --quiet 2>/dev/null || true
|
git fetch origin main --quiet 2>/dev/null || true
|
||||||
@@ -730,71 +735,104 @@ cmd_update() {
|
|||||||
echo " Status: ✓ Up to date"
|
echo " Status: ✓ Up to date"
|
||||||
else
|
else
|
||||||
echo " Status: $behind commit(s) behind"
|
echo " Status: $behind commit(s) behind"
|
||||||
echo ""
|
|
||||||
echo " Run 'ocp update' to apply."
|
echo " Run 'ocp update' to apply."
|
||||||
fi
|
fi
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Updating OCP..."
|
# Rollback path
|
||||||
echo ""
|
if [[ "${1:-}" == "--rollback" ]]; then
|
||||||
|
shift
|
||||||
|
exec node "$script_dir/scripts/upgrade.mjs" --rollback "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
# 1. Pull latest
|
# Doctor-driven path selection
|
||||||
|
local kind
|
||||||
|
kind=$(node "$script_dir/scripts/doctor.mjs" --json 2>/dev/null | python3 -c "import sys,json; print(json.load(sys.stdin)['next_action']['kind'])" 2>/dev/null || echo "unknown")
|
||||||
|
|
||||||
|
case "$kind" in
|
||||||
|
noop)
|
||||||
|
echo "Already at latest. Nothing to do."
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
update)
|
||||||
|
_cmd_update_light "$script_dir"
|
||||||
|
;;
|
||||||
|
upgrade|fresh_install)
|
||||||
|
exec node "$script_dir/scripts/upgrade.mjs" "$@"
|
||||||
|
;;
|
||||||
|
fix_oauth|fix_service)
|
||||||
|
echo "Pre-upgrade check failed: $kind"
|
||||||
|
echo "Run \`ocp doctor\` for details and ai_executable steps."
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown doctor kind: $kind. Run \`ocp doctor --json\` to inspect."
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
# Existing light-path body extracted into a helper so cmd_update can call it conditionally.
|
||||||
|
_cmd_update_light() {
|
||||||
|
local script_dir="$1"
|
||||||
|
echo "Updating OCP (light path)..."
|
||||||
cd "$script_dir"
|
cd "$script_dir"
|
||||||
local old_ver
|
local old_ver new_ver
|
||||||
old_ver=$(python3 -c "import json; print(json.load(open('package.json'))['version'])" 2>/dev/null || echo "?")
|
old_ver=$(python3 -c "import json; print(json.load(open('package.json'))['version'])" 2>/dev/null || echo "?")
|
||||||
|
|
||||||
echo " Pulling latest from GitHub..."
|
echo " Pulling latest from GitHub..."
|
||||||
if ! git pull origin main --ff-only 2>&1 | sed 's/^/ /'; then
|
if ! git pull origin main --ff-only 2>&1 | sed 's/^/ /'; then
|
||||||
echo " ✗ Git pull failed. Resolve conflicts manually in: $script_dir"
|
echo " ✗ Git pull failed. Resolve conflicts manually in: $script_dir"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local new_ver
|
|
||||||
new_ver=$(python3 -c "import json; print(json.load(open('package.json'))['version'])" 2>/dev/null || echo "?")
|
new_ver=$(python3 -c "import json; print(json.load(open('package.json'))['version'])" 2>/dev/null || echo "?")
|
||||||
|
|
||||||
if [[ "$old_ver" == "$new_ver" ]]; then
|
if [[ "$old_ver" == "$new_ver" ]]; then
|
||||||
echo " ✓ Already at latest (v$new_ver)"
|
echo " ✓ Already at latest (v$new_ver)"
|
||||||
else
|
else
|
||||||
echo " ✓ Updated v$old_ver → v$new_ver"
|
echo " ✓ Updated v$old_ver → v$new_ver"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 2. Sync plugin to extensions dir
|
# Sync plugin (existing logic preserved)
|
||||||
local ext_dir="$HOME/.openclaw/extensions/ocp"
|
local ext_dir="$HOME/.openclaw/extensions/ocp"
|
||||||
if [[ -d "$ext_dir" && -d "$script_dir/ocp-plugin" ]]; then
|
if [[ -d "$ext_dir" && -d "$script_dir/ocp-plugin" ]]; then
|
||||||
echo ""
|
|
||||||
echo " Syncing OCP plugin..."
|
echo " Syncing OCP plugin..."
|
||||||
cp "$script_dir/ocp-plugin/index.js" "$ext_dir/index.js" 2>/dev/null
|
cp "$script_dir/ocp-plugin/index.js" "$ext_dir/index.js" 2>/dev/null
|
||||||
cp "$script_dir/ocp-plugin/package.json" "$ext_dir/package.json" 2>/dev/null
|
cp "$script_dir/ocp-plugin/package.json" "$ext_dir/package.json" 2>/dev/null
|
||||||
cp "$script_dir/ocp-plugin/openclaw.plugin.json" "$ext_dir/openclaw.plugin.json" 2>/dev/null
|
cp "$script_dir/ocp-plugin/openclaw.plugin.json" "$ext_dir/openclaw.plugin.json" 2>/dev/null
|
||||||
echo " ✓ Plugin synced to $ext_dir"
|
echo " ✓ Plugin synced"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 3. Sync OpenClaw registry from models.json (non-fatal)
|
|
||||||
if command -v node >/dev/null 2>&1 && [[ -f "$script_dir/scripts/sync-openclaw.mjs" ]]; then
|
if command -v node >/dev/null 2>&1 && [[ -f "$script_dir/scripts/sync-openclaw.mjs" ]]; then
|
||||||
echo ""
|
|
||||||
echo " Syncing OpenClaw registry..."
|
echo " Syncing OpenClaw registry..."
|
||||||
if ! node "$script_dir/scripts/sync-openclaw.mjs" 2>&1 | sed 's/^/ /'; then
|
node "$script_dir/scripts/sync-openclaw.mjs" 2>&1 | sed 's/^/ /' || echo " ⚠ OpenClaw sync failed (non-fatal)"
|
||||||
echo " ⚠ OpenClaw sync failed (non-fatal, continuing)"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 4. Restart proxy
|
|
||||||
echo ""
|
|
||||||
echo " Restarting proxy..."
|
echo " Restarting proxy..."
|
||||||
cmd_restart > /dev/null 2>&1
|
cmd_restart > /dev/null 2>&1
|
||||||
sleep 2
|
}
|
||||||
|
|
||||||
if curl -sf --max-time 5 "$PROXY/health" > /dev/null 2>&1; then
|
cmd_doctor_help() {
|
||||||
local running_ver
|
cat <<'EOF'
|
||||||
running_ver=$(curl -sf --max-time 5 "$PROXY/health" | python3 -c "import sys,json; print(json.loads(sys.stdin.read())['version'])" 2>/dev/null || echo "?")
|
ocp doctor — Health & upgrade-readiness check
|
||||||
echo " ✓ Proxy running (v$running_ver)"
|
|
||||||
else
|
|
||||||
echo " ⚠ Proxy not responding — check: ocp health"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
Runs a series of checks (Node version, git state, service health,
|
||||||
echo "Done."
|
OAuth token, plist customisation, OpenClaw provider) and emits either
|
||||||
|
human-readable PASS/WARN/FAIL output or a JSON next_action that
|
||||||
|
AI agents can execute.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
ocp doctor Human-readable output
|
||||||
|
ocp doctor --json JSON for AI agents and ocp update internal use
|
||||||
|
ocp doctor --check oauth Fast path: OAuth check only
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_doctor() {
|
||||||
|
local script_dir self
|
||||||
|
self="${BASH_SOURCE[0]}"
|
||||||
|
while [[ -L "$self" ]]; do self="$(readlink "$self")"; done
|
||||||
|
script_dir="$(cd "$(dirname "$self")" && pwd)"
|
||||||
|
exec node "$script_dir/scripts/doctor.mjs" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# ── help ─────────────────────────────────────────────────────────────────
|
# ── help ─────────────────────────────────────────────────────────────────
|
||||||
@@ -862,6 +900,7 @@ case "$subcmd" in
|
|||||||
lan) cmd_lan ;;
|
lan) cmd_lan ;;
|
||||||
connect) cmd_connect "$@" ;;
|
connect) cmd_connect "$@" ;;
|
||||||
restart) cmd_restart "${1:-}" ;;
|
restart) cmd_restart "${1:-}" ;;
|
||||||
update) cmd_update "${1:-}" ;;
|
doctor) cmd_doctor "$@" ;;
|
||||||
|
update) cmd_update "$@" ;;
|
||||||
*) echo "Unknown command: $subcmd"; echo ""; cmd_help; exit 1 ;;
|
*) echo "Unknown command: $subcmd"; echo ""; cmd_help; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
+13
-3
@@ -582,11 +582,19 @@ print(k if k else '')
|
|||||||
if [[ "${SHELL:-}" == */fish ]]; then
|
if [[ "${SHELL:-}" == */fish ]]; then
|
||||||
echo " Note: fish shell detected. Writing to ~/.bashrc — add to fish config manually."
|
echo " Note: fish shell detected. Writing to ~/.bashrc — add to fish config manually."
|
||||||
rc_files+=("$HOME/.bashrc")
|
rc_files+=("$HOME/.bashrc")
|
||||||
|
elif $is_mac; then
|
||||||
|
# macOS: default shell since Catalina (2019) is zsh.
|
||||||
|
# Always write ~/.zshrc (create if absent — zsh tolerates an empty file).
|
||||||
|
# Only write ~/.bashrc if it already exists (don't surprise users with new files).
|
||||||
|
[[ -f "$HOME/.bashrc" ]] && rc_files+=("$HOME/.bashrc")
|
||||||
|
# zshrc: always include on macOS; create the file if it doesn't exist yet
|
||||||
|
[[ -f "$HOME/.zshrc" ]] || touch "$HOME/.zshrc"
|
||||||
|
rc_files+=("$HOME/.zshrc")
|
||||||
else
|
else
|
||||||
# Always write both on macOS (default shell is zsh but some tools source bashrc)
|
# Linux / other: write to whichever rc files already exist or match current shell
|
||||||
[[ -f "$HOME/.bashrc" || "${SHELL:-}" == */bash ]] && rc_files+=("$HOME/.bashrc")
|
[[ -f "$HOME/.bashrc" || "${SHELL:-}" == */bash ]] && rc_files+=("$HOME/.bashrc")
|
||||||
[[ -f "$HOME/.zshrc" || "${SHELL:-}" == */zsh ]] && rc_files+=("$HOME/.zshrc")
|
[[ -f "$HOME/.zshrc" || "${SHELL:-}" == */zsh ]] && rc_files+=("$HOME/.zshrc")
|
||||||
# If neither exists, create for current shell
|
# If neither exists, fall back to creating one for the current shell
|
||||||
[[ ${#rc_files[@]} -eq 0 ]] && rc_files+=("$HOME/.${SHELL##*/}rc")
|
[[ ${#rc_files[@]} -eq 0 ]] && rc_files+=("$HOME/.${SHELL##*/}rc")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -705,7 +713,9 @@ PYEOF
|
|||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo " Done. Reload your shell to apply:"
|
echo " Done. Reload your shell to apply:"
|
||||||
echo " source $rc_file"
|
for rc_file in "${rc_files[@]}"; do
|
||||||
|
echo " source $rc_file"
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "open-claude-proxy",
|
"name": "open-claude-proxy",
|
||||||
"version": "3.13.0",
|
"version": "3.15.0",
|
||||||
"description": "OCP (Open Claude Proxy) — use your Claude Pro/Max subscription as an OpenAI-compatible API for any IDE. Works with Cline, OpenCode, Aider, Continue.dev, OpenClaw, and more.",
|
"description": "OCP (Open Claude Proxy) — use your Claude Pro/Max subscription as an OpenAI-compatible API for any IDE. Works with Cline, OpenCode, Aider, Continue.dev, OpenClaw, and more.",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
@@ -0,0 +1,203 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* scripts/doctor.mjs — OCP health & upgrade-readiness check.
|
||||||
|
*
|
||||||
|
* Usage:
|
||||||
|
* ocp doctor human-readable PASS/WARN/FAIL
|
||||||
|
* ocp doctor --json machine-readable JSON for AI agents + ocp update
|
||||||
|
* ocp doctor --check oauth fast path: only OAuth check
|
||||||
|
*
|
||||||
|
* Exit codes:
|
||||||
|
* 0 all PASS or WARN-only
|
||||||
|
* 1 any FAIL
|
||||||
|
*/
|
||||||
|
import { readFileSync, existsSync } from "node:fs";
|
||||||
|
import { join } from "node:path";
|
||||||
|
import { homedir } from "node:os";
|
||||||
|
import { execSync } from "node:child_process";
|
||||||
|
|
||||||
|
const SCHEMA_VERSION = "1";
|
||||||
|
|
||||||
|
function semverParts(v) {
|
||||||
|
const m = String(v).replace(/^v/, "").match(/^(\d+)\.(\d+)\.(\d+)/);
|
||||||
|
if (!m) return null;
|
||||||
|
return { major: +m[1], minor: +m[2], patch: +m[3] };
|
||||||
|
}
|
||||||
|
|
||||||
|
function semverCompare(a, b) {
|
||||||
|
const A = semverParts(a), B = semverParts(b);
|
||||||
|
if (!A || !B) return 0;
|
||||||
|
if (A.major !== B.major) return A.major - B.major;
|
||||||
|
if (A.minor !== B.minor) return A.minor - B.minor;
|
||||||
|
return A.patch - B.patch;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function runDoctor(opts = {}) {
|
||||||
|
const checks = [];
|
||||||
|
const push = (id, level, message, extra = {}) =>
|
||||||
|
checks.push({ id, level, message, ...extra });
|
||||||
|
|
||||||
|
// --- version detection ---
|
||||||
|
const ocpDir = opts.ocpDir || join(homedir(), "ocp");
|
||||||
|
let currentVersion = opts.mockVersion;
|
||||||
|
if (!currentVersion) {
|
||||||
|
try {
|
||||||
|
const pkg = JSON.parse(readFileSync(join(ocpDir, "package.json"), "utf8"));
|
||||||
|
currentVersion = `v${pkg.version}`;
|
||||||
|
} catch {
|
||||||
|
currentVersion = "unknown";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const latestVersion = opts.mockLatest || "v3.14.0";
|
||||||
|
push("current_version", "PASS", `current=${currentVersion}`);
|
||||||
|
|
||||||
|
// --- from-version supported? ---
|
||||||
|
const fromSupported = !!semverParts(currentVersion) && semverCompare(currentVersion, "v3.4.0") >= 0;
|
||||||
|
push("from_version_supported", fromSupported ? "PASS" : "FAIL",
|
||||||
|
fromSupported ? "≥ v3.4.0" : `${currentVersion} < v3.4.0; in-place upgrade not supported`);
|
||||||
|
|
||||||
|
// --- service health check (mockable) ---
|
||||||
|
let healthOk = true, oauthOk = true;
|
||||||
|
if (!opts.skipNetwork) {
|
||||||
|
let health;
|
||||||
|
if (opts.mockHealth !== undefined) {
|
||||||
|
health = opts.mockHealth;
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
const port = process.env.CLAUDE_PROXY_PORT || "3478";
|
||||||
|
const out = execSync(`curl -sf --max-time 3 http://127.0.0.1:${port}/health`, { stdio: ["pipe", "pipe", "pipe"] }).toString();
|
||||||
|
health = { status: 200, body: JSON.parse(out) };
|
||||||
|
} catch (e) {
|
||||||
|
health = { error: String(e.message || e) };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (health.error || health.status !== 200) {
|
||||||
|
healthOk = false;
|
||||||
|
push("service_running", "FAIL", `service unreachable: ${health.error || `status ${health.status}`}`);
|
||||||
|
} else if (!health.body || typeof health.body !== "object") {
|
||||||
|
healthOk = false;
|
||||||
|
push("service_running", "FAIL", "service /health returned 200 but empty/non-JSON body");
|
||||||
|
} else {
|
||||||
|
push("service_running", "PASS", "service responding on /health");
|
||||||
|
const authOk = health.body?.auth?.ok;
|
||||||
|
if (!authOk) {
|
||||||
|
oauthOk = false;
|
||||||
|
push("oauth_ok", "FAIL", `auth.ok=false: ${health.body?.auth?.message || "unknown"}`);
|
||||||
|
} else {
|
||||||
|
push("oauth_ok", "PASS", "OAuth token valid");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- determine next_action.kind (priority: fresh_install > fix_service > fix_oauth > noop > update > upgrade) ---
|
||||||
|
let kind;
|
||||||
|
if (!fromSupported) {
|
||||||
|
kind = "fresh_install";
|
||||||
|
} else if (!opts.skipNetwork && !healthOk) {
|
||||||
|
kind = "fix_service";
|
||||||
|
} else if (!opts.skipNetwork && !oauthOk) {
|
||||||
|
kind = "fix_oauth";
|
||||||
|
} else {
|
||||||
|
const cur = semverParts(currentVersion), lat = semverParts(latestVersion);
|
||||||
|
if (!cur) {
|
||||||
|
kind = "fresh_install";
|
||||||
|
} else if (semverCompare(currentVersion, latestVersion) === 0) {
|
||||||
|
kind = "noop";
|
||||||
|
} else if (lat && cur.major === lat.major && cur.minor === lat.minor) {
|
||||||
|
kind = "update";
|
||||||
|
} else {
|
||||||
|
kind = "upgrade";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- next_action shape ---
|
||||||
|
let next_action;
|
||||||
|
if (kind === "fresh_install") {
|
||||||
|
next_action = {
|
||||||
|
kind,
|
||||||
|
human_required: ["claude auth login (only if OAuth becomes invalid after reinstall)"],
|
||||||
|
ai_executable: [
|
||||||
|
`launchctl bootout gui/$(id -u)/ai.openclaw.proxy 2>/dev/null || true`,
|
||||||
|
`launchctl bootout gui/$(id -u)/dev.ocp.proxy 2>/dev/null || true`,
|
||||||
|
`mv ${join(homedir(), ".ocp")} ${join(homedir(), ".ocp.backup-")}$(date +%s) 2>/dev/null || true`,
|
||||||
|
`rm -rf ${ocpDir}`,
|
||||||
|
`git clone https://github.com/dtzp555-max/ocp ${ocpDir}`,
|
||||||
|
`cd ${ocpDir} && npm install --no-audit --no-fund && node setup.mjs`,
|
||||||
|
`${ocpDir}/ocp doctor`
|
||||||
|
],
|
||||||
|
verify: "ocp doctor expects PASS on all checks"
|
||||||
|
};
|
||||||
|
} else if (kind === "noop") {
|
||||||
|
next_action = { kind, human_required: [], ai_executable: [], verify: "already at latest" };
|
||||||
|
} else if (kind === "fix_oauth") {
|
||||||
|
next_action = {
|
||||||
|
kind,
|
||||||
|
human_required: [],
|
||||||
|
ai_executable: [
|
||||||
|
`cd "$(npm root -g)/@anthropic-ai/claude-code" && node install.cjs`,
|
||||||
|
`launchctl bootout gui/$(id -u)/dev.ocp.proxy 2>/dev/null || true`,
|
||||||
|
`launchctl bootstrap gui/$(id -u) ${join(homedir(), "Library", "LaunchAgents", "dev.ocp.proxy.plist")}`,
|
||||||
|
`${ocpDir}/ocp doctor`
|
||||||
|
],
|
||||||
|
verify: "ocp doctor expects oauth_ok=PASS",
|
||||||
|
reference: "~/.cc-rules/memory/learnings/ocp_claude_native_binary_postinstall.md"
|
||||||
|
};
|
||||||
|
} else if (kind === "fix_service") {
|
||||||
|
next_action = {
|
||||||
|
kind,
|
||||||
|
human_required: [],
|
||||||
|
ai_executable: [
|
||||||
|
`launchctl bootout gui/$(id -u)/dev.ocp.proxy 2>/dev/null || true`,
|
||||||
|
`launchctl bootstrap gui/$(id -u) ${join(homedir(), "Library", "LaunchAgents", "dev.ocp.proxy.plist")}`,
|
||||||
|
`${ocpDir}/ocp doctor`
|
||||||
|
],
|
||||||
|
verify: "ocp doctor expects service_running=PASS"
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
next_action = {
|
||||||
|
kind,
|
||||||
|
human_required: [],
|
||||||
|
ai_executable: [`${ocpDir}/ocp update --yes`],
|
||||||
|
verify: "ocp doctor expects PASS on all checks"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const fail_count = checks.filter(c => c.level === "FAIL").length;
|
||||||
|
const warn_count = checks.filter(c => c.level === "WARN").length;
|
||||||
|
return {
|
||||||
|
schema_version: SCHEMA_VERSION,
|
||||||
|
timestamp: new Date().toISOString(),
|
||||||
|
ready_to_upgrade: fail_count === 0,
|
||||||
|
current_version: currentVersion,
|
||||||
|
latest_version: latestVersion,
|
||||||
|
from_version_supported: fromSupported,
|
||||||
|
fail_count,
|
||||||
|
warn_count,
|
||||||
|
checks,
|
||||||
|
next_action
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// CLI entrypoint — use fileURLToPath + realpath to handle symlinked install paths
|
||||||
|
// (e.g. /tmp/ → /private/tmp/ on macOS would otherwise miss the guard).
|
||||||
|
import { fileURLToPath } from "node:url";
|
||||||
|
import { realpathSync } from "node:fs";
|
||||||
|
function _isMain() {
|
||||||
|
if (!process.argv[1]) return false;
|
||||||
|
try {
|
||||||
|
return realpathSync(fileURLToPath(import.meta.url)) === realpathSync(process.argv[1]);
|
||||||
|
} catch { return false; }
|
||||||
|
}
|
||||||
|
if (_isMain()) {
|
||||||
|
const wantJson = process.argv.includes("--json");
|
||||||
|
const result = await runDoctor();
|
||||||
|
if (wantJson) {
|
||||||
|
console.log(JSON.stringify(result, null, 2));
|
||||||
|
} else {
|
||||||
|
console.log(`OCP doctor — ${result.current_version} → ${result.latest_version}`);
|
||||||
|
for (const c of result.checks) console.log(` [${c.level}] ${c.id}: ${c.message}`);
|
||||||
|
console.log(`\nSummary: ${result.fail_count} FAIL, ${result.warn_count} WARN`);
|
||||||
|
console.log(`Next action: ${result.next_action.kind}`);
|
||||||
|
}
|
||||||
|
process.exit(result.fail_count === 0 ? 0 : 1);
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
// scripts/lib/plist-merge.mjs
|
||||||
|
//
|
||||||
|
// Preserves user-customised env vars when setup.mjs rewrites the unit file.
|
||||||
|
//
|
||||||
|
// Rule:
|
||||||
|
// - keys present in NEW template → template value wins (template is source of truth)
|
||||||
|
// - keys ONLY in EXISTING (not in template) → preserved verbatim
|
||||||
|
//
|
||||||
|
// No new dependencies — regex-based, plist <key>X</key><string>Y</string> shape
|
||||||
|
// is stable enough for our hand-written templates in setup.mjs.
|
||||||
|
|
||||||
|
const PLIST_KV_RE = /<key>([^<]+)<\/key>\s*<string>([^<]*)<\/string>/g;
|
||||||
|
|
||||||
|
export function parsePlistEnv(plistContent) {
|
||||||
|
if (!plistContent) return {};
|
||||||
|
if (Buffer.isBuffer(plistContent)) plistContent = plistContent.toString("utf8");
|
||||||
|
// Restrict to the EnvironmentVariables dict to avoid catching Label, etc.
|
||||||
|
const envBlock = plistContent.match(/<key>EnvironmentVariables<\/key>\s*<dict>([\s\S]*?)<\/dict>/);
|
||||||
|
if (!envBlock) return {};
|
||||||
|
const out = {};
|
||||||
|
let m;
|
||||||
|
PLIST_KV_RE.lastIndex = 0;
|
||||||
|
while ((m = PLIST_KV_RE.exec(envBlock[1])) !== null) {
|
||||||
|
out[m[1]] = m[2];
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function mergePlistEnv(existing, template) {
|
||||||
|
if (!existing) return template;
|
||||||
|
const existingEnv = parsePlistEnv(existing);
|
||||||
|
const templateEnv = parsePlistEnv(template);
|
||||||
|
const KNOWN = new Set(Object.keys(templateEnv));
|
||||||
|
|
||||||
|
const preserved = {};
|
||||||
|
for (const [k, v] of Object.entries(existingEnv)) {
|
||||||
|
if (!KNOWN.has(k)) preserved[k] = v;
|
||||||
|
}
|
||||||
|
if (Object.keys(preserved).length === 0) return template;
|
||||||
|
|
||||||
|
const lines = Object.entries(preserved)
|
||||||
|
.map(([k, v]) => ` <key>${k}</key>\n <string>${v}</string>`)
|
||||||
|
.join("\n");
|
||||||
|
|
||||||
|
// Inject before the closing </dict> of EnvironmentVariables
|
||||||
|
return template.replace(
|
||||||
|
/(<key>EnvironmentVariables<\/key>\s*<dict>[\s\S]*?)(\n\s*<\/dict>)/,
|
||||||
|
`$1\n${lines}$2`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const SYSTEMD_KV_RE = /^Environment=([^=]+)=(.*)$/gm;
|
||||||
|
|
||||||
|
export function parseSystemdEnv(serviceContent) {
|
||||||
|
if (!serviceContent) return {};
|
||||||
|
if (Buffer.isBuffer(serviceContent)) serviceContent = serviceContent.toString("utf8");
|
||||||
|
const out = {};
|
||||||
|
let m;
|
||||||
|
SYSTEMD_KV_RE.lastIndex = 0;
|
||||||
|
while ((m = SYSTEMD_KV_RE.exec(serviceContent)) !== null) {
|
||||||
|
out[m[1]] = m[2];
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function mergeSystemdEnv(existing, template) {
|
||||||
|
if (!existing) return template;
|
||||||
|
const existingEnv = parseSystemdEnv(existing);
|
||||||
|
const templateEnv = parseSystemdEnv(template);
|
||||||
|
const KNOWN = new Set(Object.keys(templateEnv));
|
||||||
|
|
||||||
|
const preservedLines = Object.entries(existingEnv)
|
||||||
|
.filter(([k]) => !KNOWN.has(k))
|
||||||
|
.map(([k, v]) => `Environment=${k}=${v}`);
|
||||||
|
if (preservedLines.length === 0) return template;
|
||||||
|
|
||||||
|
// Guard: if template has no Environment= anchor, cannot inject — return template as-is.
|
||||||
|
// (In practice the OCP systemd template always has Environment= lines.)
|
||||||
|
if (!/^Environment=/m.test(template)) return template;
|
||||||
|
|
||||||
|
// Inject after the last existing Environment= line in the template
|
||||||
|
return template.replace(
|
||||||
|
/(^Environment=[^\n]+\n)((?!Environment=).*$)/ms,
|
||||||
|
`$1${preservedLines.join("\n")}\n$2`
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import { mkdirSync, writeFileSync, readFileSync, copyFileSync, existsSync, readdirSync, statSync } from "node:fs";
|
||||||
|
import { join } from "node:path";
|
||||||
|
|
||||||
|
export function writeSnapshot({ homeDir, fromCommit, fromVersion, toVersion, extraFiles = [] }) {
|
||||||
|
const ts = new Date().toISOString().replace(/\.\d+Z$/, "Z");
|
||||||
|
const root = join(homeDir, ".ocp", `upgrade-snapshot-${ts}`);
|
||||||
|
mkdirSync(root, { recursive: true });
|
||||||
|
|
||||||
|
// Standard manifest files
|
||||||
|
writeFileSync(join(root, "from-commit.txt"), fromCommit + "\n");
|
||||||
|
writeFileSync(join(root, "from-version.txt"), fromVersion + "\n");
|
||||||
|
writeFileSync(join(root, "to-version.txt"), toVersion + "\n");
|
||||||
|
|
||||||
|
// Optional captures (best-effort, never fatal)
|
||||||
|
const tryCopy = (src, dst) => {
|
||||||
|
try {
|
||||||
|
if (existsSync(src)) copyFileSync(src, dst);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(`[snapshot] warn: could not copy ${src} (${err.code || err.message})`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
tryCopy(join(homeDir, "Library", "LaunchAgents", "dev.ocp.proxy.plist"), join(root, "plist"));
|
||||||
|
tryCopy(join(homeDir, ".config", "systemd", "user", "ocp-proxy.service"), join(root, "service"));
|
||||||
|
tryCopy(join(homeDir, ".ocp", "ocp.db"), join(root, "db.bak"));
|
||||||
|
tryCopy(join(homeDir, ".ocp", "admin-key"), join(root, "admin-key"));
|
||||||
|
tryCopy(join(homeDir, ".openclaw", "openclaw.json"), join(root, "openclaw.json"));
|
||||||
|
|
||||||
|
for (const { src, name } of extraFiles) tryCopy(src, join(root, name));
|
||||||
|
|
||||||
|
return root;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function readSnapshot(snapshotPath) {
|
||||||
|
const read = (n) => {
|
||||||
|
try { return readFileSync(join(snapshotPath, n), "utf8").trim(); } catch { return null; }
|
||||||
|
};
|
||||||
|
return {
|
||||||
|
path: snapshotPath,
|
||||||
|
fromCommit: read("from-commit.txt"),
|
||||||
|
fromVersion: read("from-version.txt"),
|
||||||
|
toVersion: read("to-version.txt")
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function listSnapshots(homeDir) {
|
||||||
|
const root = join(homeDir, ".ocp");
|
||||||
|
if (!existsSync(root)) return [];
|
||||||
|
return readdirSync(root)
|
||||||
|
.filter(name => name.startsWith("upgrade-snapshot-"))
|
||||||
|
.map(name => ({ name, path: join(root, name), mtime: statSync(join(root, name)).mtimeMs }))
|
||||||
|
.sort((a, b) => a.name.localeCompare(b.name));
|
||||||
|
}
|
||||||
@@ -0,0 +1,324 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* scripts/upgrade.mjs — OCP unified upgrade dispatcher.
|
||||||
|
*
|
||||||
|
* Paths:
|
||||||
|
* noop current == latest, exit 0
|
||||||
|
* light same major.minor, patch bump only (existing fast path; delegated to bash)
|
||||||
|
* full cross-minor (snapshot + setup.mjs + post-flight)
|
||||||
|
* fresh_install from-version < v3.4.0 (--yes required for non-interactive)
|
||||||
|
* rollback restore from snapshot
|
||||||
|
*/
|
||||||
|
import { runDoctor } from "./doctor.mjs";
|
||||||
|
import { execSync } from "node:child_process";
|
||||||
|
import { homedir } from "node:os";
|
||||||
|
import { join } from "node:path";
|
||||||
|
import { existsSync, copyFileSync } from "node:fs";
|
||||||
|
import { writeSnapshot, listSnapshots, readSnapshot } from "./lib/snapshot.mjs";
|
||||||
|
|
||||||
|
export async function runUpgrade(opts = {}) {
|
||||||
|
const dryRun = !!opts.dryRun;
|
||||||
|
const yes = !!opts.yes;
|
||||||
|
// yes is reserved for Bundle 3 (fresh-install / rollback interactive gate); not used in upgrade-path here.
|
||||||
|
const plan = [];
|
||||||
|
|
||||||
|
// --- rollback path (no doctor needed; snapshot is authoritative) ---
|
||||||
|
if (opts.rollback) {
|
||||||
|
return await runRollback(opts);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- doctor pre-flight ---
|
||||||
|
const doctor = opts.mockDoctor || await runDoctor();
|
||||||
|
if (!doctor.ready_to_upgrade && doctor.next_action.kind !== "fresh_install") {
|
||||||
|
throw new Error(`doctor FAIL: ${doctor.next_action.kind} (run "ocp doctor" for details)`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const kind = doctor.next_action.kind;
|
||||||
|
plan.push(`[doctor] from=${doctor.current_version} to=${doctor.latest_version} kind=${kind}`);
|
||||||
|
|
||||||
|
// --- noop ---
|
||||||
|
if (kind === "noop") {
|
||||||
|
plan.push(`[noop] already at latest (${doctor.latest_version})`);
|
||||||
|
return { path: "noop", executed: true, changed: false, plan };
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- dry-run early exit ---
|
||||||
|
if (dryRun) {
|
||||||
|
plan.push(`[plan] would proceed with ${kind} path`);
|
||||||
|
if (kind === "upgrade") {
|
||||||
|
plan.push(`[plan] phase 1: snapshot to ~/.ocp/upgrade-snapshot-<ts>/`);
|
||||||
|
plan.push(`[plan] phase 2: git checkout ${doctor.latest_version} && npm install`);
|
||||||
|
plan.push(`[plan] phase 3: node setup.mjs`);
|
||||||
|
plan.push(`[plan] phase 4: launchctl bootout/bootstrap`);
|
||||||
|
plan.push(`[plan] phase 5: post-flight /health + /v1/models`);
|
||||||
|
} else if (kind === "update") {
|
||||||
|
plan.push(`[plan] light path: git pull + npm install + restart`);
|
||||||
|
} else if (kind === "fresh_install") {
|
||||||
|
plan.push(`[plan] fresh-install ai_executable[]:`);
|
||||||
|
for (const cmd of doctor.next_action.ai_executable) plan.push(` - ${cmd}`);
|
||||||
|
}
|
||||||
|
return { path: kind, executed: false, plan };
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- non-dry-run paths ---
|
||||||
|
if (kind === "update") {
|
||||||
|
return { path: "update", executed: true, changed: true, plan: [...plan, "[light] delegated to bash cmd_update existing logic"] };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (kind === "upgrade") {
|
||||||
|
return await runFullUpgrade({ doctor, opts });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (kind === "fresh_install") {
|
||||||
|
return await runFreshInstall({ doctor, opts });
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(`path ${kind} not yet implemented`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runFullUpgrade({ doctor, opts }) {
|
||||||
|
const phases = [];
|
||||||
|
let snapshotPath = null;
|
||||||
|
const exec = (cmd, label) => {
|
||||||
|
if (opts.mockExec) {
|
||||||
|
phases.push({ name: label, cmd, status: "skipped-mock" });
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const out = execSync(cmd, { stdio: ["pipe", "pipe", "pipe"] }).toString();
|
||||||
|
phases.push({ name: label, cmd, status: "ok" });
|
||||||
|
return out;
|
||||||
|
} catch (err) {
|
||||||
|
const detail = err.stderr?.toString().trim();
|
||||||
|
phases.push({ name: label, cmd, status: "fail", stderr: detail });
|
||||||
|
throw Object.assign(
|
||||||
|
new Error(`phase ${label} failed: ${detail || err.message}`),
|
||||||
|
{ phases, cmd }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const ocpDir = opts.ocpDir || join(homedir(), "ocp");
|
||||||
|
|
||||||
|
try {
|
||||||
|
// phase 1: pre-flight (doctor already passed; just record)
|
||||||
|
phases.push({ name: "pre-flight", status: "ok", note: `kind=upgrade from=${doctor.current_version} to=${doctor.latest_version}` });
|
||||||
|
|
||||||
|
// phase 2: snapshot
|
||||||
|
const fromCommit = opts.mockExec
|
||||||
|
? "mock-commit"
|
||||||
|
: execSync(`git -C ${ocpDir} rev-parse HEAD`).toString().trim();
|
||||||
|
snapshotPath = opts.mockExec
|
||||||
|
? "/tmp/mock-snapshot"
|
||||||
|
: writeSnapshot({ homeDir: homedir(), fromCommit, fromVersion: doctor.current_version, toVersion: doctor.latest_version });
|
||||||
|
phases.push({ name: "snapshot", path: snapshotPath, status: "ok" });
|
||||||
|
|
||||||
|
// phase 3: fetch + install
|
||||||
|
exec(`git -C ${ocpDir} fetch --tags --quiet`, "fetch+install");
|
||||||
|
exec(`git -C ${ocpDir} checkout ${doctor.latest_version}`, "fetch+install");
|
||||||
|
exec(`npm --prefix ${ocpDir} install --no-audit --no-fund`, "fetch+install");
|
||||||
|
|
||||||
|
// phase 4: reconfigure
|
||||||
|
exec(`node ${ocpDir}/setup.mjs`, "reconfigure");
|
||||||
|
|
||||||
|
// phase 5: restart (heads-up note printed before invoking)
|
||||||
|
if (!opts.mockExec) {
|
||||||
|
console.error(`[heads-up] restarting OCP service in 3s — expect ~5–10s blip on requests in flight.`);
|
||||||
|
await new Promise(r => setTimeout(r, 3000));
|
||||||
|
}
|
||||||
|
if (process.platform === "darwin") {
|
||||||
|
exec(`launchctl bootout gui/$(id -u)/dev.ocp.proxy 2>/dev/null || true`, "restart");
|
||||||
|
exec(`launchctl bootstrap gui/$(id -u) ${join(homedir(), "Library", "LaunchAgents", "dev.ocp.proxy.plist")}`, "restart");
|
||||||
|
} else {
|
||||||
|
exec(`systemctl --user restart ocp-proxy.service`, "restart");
|
||||||
|
}
|
||||||
|
|
||||||
|
// phase 6: post-flight (10s budget; skipped under mockExec)
|
||||||
|
if (!opts.mockExec) {
|
||||||
|
const port = process.env.CLAUDE_PROXY_PORT || "3478";
|
||||||
|
let ok = false;
|
||||||
|
for (let i = 0; i < 10; i++) {
|
||||||
|
try {
|
||||||
|
const out = execSync(`curl -sf --max-time 2 http://127.0.0.1:${port}/health`).toString();
|
||||||
|
const body = JSON.parse(out);
|
||||||
|
if (body.auth?.ok === true) { ok = true; break; }
|
||||||
|
} catch { /* retry */ }
|
||||||
|
await new Promise(r => setTimeout(r, 1000));
|
||||||
|
}
|
||||||
|
if (!ok) {
|
||||||
|
phases.push({ name: "post-flight", status: "fail", message: "health did not return auth.ok=true within 10s" });
|
||||||
|
throw new Error("post-flight failed");
|
||||||
|
}
|
||||||
|
execSync(`curl -sf --max-time 3 http://127.0.0.1:${port}/v1/models > /dev/null`);
|
||||||
|
phases.push({ name: "post-flight", status: "ok" });
|
||||||
|
} else {
|
||||||
|
phases.push({ name: "post-flight", status: "skipped-mock" });
|
||||||
|
}
|
||||||
|
|
||||||
|
return { path: "upgrade", executed: true, changed: true, snapshotPath, phases };
|
||||||
|
} catch (err) {
|
||||||
|
if (snapshotPath && !err.snapshotPath) {
|
||||||
|
Object.assign(err, {
|
||||||
|
snapshotPath,
|
||||||
|
phases,
|
||||||
|
hint: "Working tree may be at new version. Run `ocp update --rollback` to restore from snapshot."
|
||||||
|
});
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runFreshInstall({ doctor, opts }) {
|
||||||
|
if (!opts.yes) {
|
||||||
|
throw new Error("fresh_install requires --yes for non-interactive execution (or run interactively and answer y)");
|
||||||
|
}
|
||||||
|
const steps = [];
|
||||||
|
for (const cmd of doctor.next_action.ai_executable) {
|
||||||
|
if (opts.mockExec) {
|
||||||
|
steps.push({ cmd, status: "skipped-mock" });
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
execSync(cmd, { stdio: "inherit" });
|
||||||
|
steps.push({ cmd, status: "ok" });
|
||||||
|
} catch (e) {
|
||||||
|
const detail = e.stderr?.toString().trim() || e.message;
|
||||||
|
steps.push({ cmd, status: "fail", error: String(detail) });
|
||||||
|
throw Object.assign(new Error(`fresh_install step failed: ${cmd} — ${detail}`), { steps });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { path: "fresh_install", executed: true, changed: true, steps };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runRollback(opts) {
|
||||||
|
const homeDir = opts.homeDir || homedir();
|
||||||
|
const snapshots = opts.mockSnapshots ?? listSnapshots(homeDir);
|
||||||
|
|
||||||
|
if (opts.list) {
|
||||||
|
return { path: "rollback-list", snapshots };
|
||||||
|
}
|
||||||
|
if (snapshots.length === 0) {
|
||||||
|
throw new Error("no upgrade snapshots found in ~/.ocp/upgrade-snapshot-*");
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = opts.snapshotPath
|
||||||
|
? snapshots.find(s => s.path === opts.snapshotPath)
|
||||||
|
: snapshots[snapshots.length - 1];
|
||||||
|
if (!target) throw new Error(`snapshot not found: ${opts.snapshotPath} (must be inside ~/.ocp/upgrade-snapshot-*)`);
|
||||||
|
|
||||||
|
const meta = opts.mockSnapshotMeta ?? readSnapshot(target.path);
|
||||||
|
if (!meta.fromCommit) throw new Error(`snapshot ${target.path} has no from-commit.txt`);
|
||||||
|
|
||||||
|
const phases = [];
|
||||||
|
if (opts.dryRun) {
|
||||||
|
return {
|
||||||
|
path: "rollback-dry-run",
|
||||||
|
executed: false,
|
||||||
|
target: target.path,
|
||||||
|
plan: [
|
||||||
|
`git checkout ${meta.fromCommit}`,
|
||||||
|
`cp ${target.path}/plist ~/Library/LaunchAgents/dev.ocp.proxy.plist`,
|
||||||
|
`cp ${target.path}/db.bak ~/.ocp/ocp.db`,
|
||||||
|
`launchctl bootout/bootstrap`,
|
||||||
|
`ocp doctor`
|
||||||
|
]
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!opts.yes) throw new Error("rollback requires --yes for non-interactive execution");
|
||||||
|
|
||||||
|
const exec = (cmd, label) => {
|
||||||
|
if (opts.mockExec) {
|
||||||
|
phases.push({ name: label, cmd, status: "skipped-mock" });
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
execSync(cmd, { stdio: ["pipe", "pipe", "pipe"] });
|
||||||
|
phases.push({ name: label, cmd, status: "ok" });
|
||||||
|
} catch (err) {
|
||||||
|
const detail = err.stderr?.toString().trim();
|
||||||
|
phases.push({ name: label, cmd, status: "fail", stderr: detail });
|
||||||
|
throw Object.assign(
|
||||||
|
new Error(`rollback phase ${label} failed: ${detail || err.message}`),
|
||||||
|
{ phases, target: target.path }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const ocpDir = opts.ocpDir || join(homedir(), "ocp");
|
||||||
|
exec(`git -C ${ocpDir} checkout ${meta.fromCommit}`, "git-checkout");
|
||||||
|
|
||||||
|
if (!opts.mockExec) {
|
||||||
|
const tryCopy = (src, dst) => {
|
||||||
|
try {
|
||||||
|
if (existsSync(src)) copyFileSync(src, dst);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(`[rollback] warn: could not restore ${src} → ${dst} (${err.code || err.message})`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
tryCopy(join(target.path, "plist"), join(homeDir, "Library", "LaunchAgents", "dev.ocp.proxy.plist"));
|
||||||
|
tryCopy(join(target.path, "service"), join(homeDir, ".config", "systemd", "user", "ocp-proxy.service"));
|
||||||
|
tryCopy(join(target.path, "db.bak"), join(homeDir, ".ocp", "ocp.db"));
|
||||||
|
tryCopy(join(target.path, "admin-key"), join(homeDir, ".ocp", "admin-key"));
|
||||||
|
phases.push({ name: "restore-files", status: "ok" });
|
||||||
|
} else {
|
||||||
|
phases.push({ name: "restore-files", status: "skipped-mock" });
|
||||||
|
}
|
||||||
|
|
||||||
|
exec(`npm --prefix ${ocpDir} install --no-audit --no-fund`, "npm-install");
|
||||||
|
|
||||||
|
if (!opts.mockExec) {
|
||||||
|
console.error(`[heads-up] restarting OCP service in 3s — expect ~5–10s blip on requests in flight.`);
|
||||||
|
await new Promise(r => setTimeout(r, 3000));
|
||||||
|
}
|
||||||
|
if (process.platform === "darwin") {
|
||||||
|
exec(`launchctl bootout gui/$(id -u)/dev.ocp.proxy 2>/dev/null || true`, "restart");
|
||||||
|
exec(`launchctl bootstrap gui/$(id -u) ${join(homedir(), "Library", "LaunchAgents", "dev.ocp.proxy.plist")}`, "restart");
|
||||||
|
} else {
|
||||||
|
exec(`systemctl --user restart ocp-proxy.service`, "restart");
|
||||||
|
}
|
||||||
|
|
||||||
|
return { path: "rollback", executed: true, changed: true, target: target.path, phases };
|
||||||
|
}
|
||||||
|
|
||||||
|
// CLI entrypoint — use fileURLToPath + realpath to handle symlinked install paths.
|
||||||
|
import { fileURLToPath } from "node:url";
|
||||||
|
import { realpathSync } from "node:fs";
|
||||||
|
function _isMain() {
|
||||||
|
if (!process.argv[1]) return false;
|
||||||
|
try {
|
||||||
|
return realpathSync(fileURLToPath(import.meta.url)) === realpathSync(process.argv[1]);
|
||||||
|
} catch { return false; }
|
||||||
|
}
|
||||||
|
if (_isMain()) {
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
const dryRun = args.includes("--dry-run");
|
||||||
|
const yes = args.includes("--yes");
|
||||||
|
const rollback = args.includes("--rollback");
|
||||||
|
const list = args.includes("--list");
|
||||||
|
const targetIdx = args.indexOf("--target");
|
||||||
|
const target = targetIdx !== -1 ? args[targetIdx + 1] : undefined;
|
||||||
|
// First non-flag positional after --rollback is the snapshot path
|
||||||
|
let snapshotPath;
|
||||||
|
if (rollback) {
|
||||||
|
const rb = args.indexOf("--rollback");
|
||||||
|
const cand = args[rb + 1];
|
||||||
|
if (cand && !cand.startsWith("--")) snapshotPath = cand;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const result = await runUpgrade({ dryRun, yes, rollback, list, snapshotPath, target });
|
||||||
|
if (result.plan) for (const line of result.plan) console.log(line);
|
||||||
|
if (result.phases) for (const p of result.phases) console.log(`[${p.name}] ${p.status}${p.cmd ? `: ${p.cmd}` : ""}`);
|
||||||
|
if (result.steps) for (const s of result.steps) console.log(` ${s.status === "ok" ? "✓" : s.status === "skipped-mock" ? "·" : "✗"} ${s.cmd}`);
|
||||||
|
if (result.snapshots) {
|
||||||
|
console.log(`Found ${result.snapshots.length} snapshots:`);
|
||||||
|
for (const s of result.snapshots) console.log(` ${s.name}`);
|
||||||
|
}
|
||||||
|
process.exit(0);
|
||||||
|
} catch (e) {
|
||||||
|
console.error(`✗ ${e.message}`);
|
||||||
|
if (e.snapshotPath) console.error(` snapshot: ${e.snapshotPath}`);
|
||||||
|
if (e.target) console.error(` target: ${e.target}`);
|
||||||
|
if (e.hint) console.error(` hint: ${e.hint}`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
+161
-30
@@ -30,7 +30,7 @@
|
|||||||
import { createServer } from "node:http";
|
import { createServer } from "node:http";
|
||||||
import { spawn, execFileSync } from "node:child_process";
|
import { spawn, execFileSync } from "node:child_process";
|
||||||
import { randomUUID, timingSafeEqual } from "node:crypto";
|
import { randomUUID, timingSafeEqual } from "node:crypto";
|
||||||
import { readFileSync, accessSync, existsSync, constants } from "node:fs";
|
import { readFileSync, readdirSync, accessSync, existsSync, constants, chmodSync, statSync } from "node:fs";
|
||||||
import { fileURLToPath } from "node:url";
|
import { fileURLToPath } from "node:url";
|
||||||
import { dirname, join } from "node:path";
|
import { dirname, join } from "node:path";
|
||||||
import { homedir } from "node:os";
|
import { homedir } from "node:os";
|
||||||
@@ -41,8 +41,48 @@ const _pkg = JSON.parse(readFileSync(join(__dirname, "package.json"), "utf8"));
|
|||||||
const modelsConfig = JSON.parse(readFileSync(join(__dirname, "models.json"), "utf8"));
|
const modelsConfig = JSON.parse(readFileSync(join(__dirname, "models.json"), "utf8"));
|
||||||
|
|
||||||
// ── Resolve claude binary ───────────────────────────────────────────────
|
// ── Resolve claude binary ───────────────────────────────────────────────
|
||||||
// Priority: CLAUDE_BIN env > well-known paths > which lookup
|
// Priority: CLAUDE_BIN env > well-known paths > nvm/fnm/asdf user-local
|
||||||
// Fail-fast if not found — never start with an unresolvable binary.
|
// installs > which lookup. Fail-fast if not found — never start with an
|
||||||
|
// unresolvable binary.
|
||||||
|
function _listVersionDirs(parent) {
|
||||||
|
try { return readdirSync(parent); } catch { return []; }
|
||||||
|
}
|
||||||
|
function _collectNodeManagerCandidates(home) {
|
||||||
|
if (!home) return [];
|
||||||
|
const out = [];
|
||||||
|
|
||||||
|
// nvm: $HOME/.nvm/versions/node/<version>/bin/claude
|
||||||
|
const nvmRoot = join(home, ".nvm/versions/node");
|
||||||
|
for (const v of _listVersionDirs(nvmRoot)) {
|
||||||
|
out.push(join(nvmRoot, v, "bin/claude"));
|
||||||
|
}
|
||||||
|
// nvm default alias: resolve $HOME/.nvm/aliases/default if it points to a version
|
||||||
|
try {
|
||||||
|
const aliasFile = join(home, ".nvm/aliases/default");
|
||||||
|
const aliasVer = readFileSync(aliasFile, "utf8").trim();
|
||||||
|
if (aliasVer) {
|
||||||
|
const direct = join(nvmRoot, aliasVer, "bin/claude");
|
||||||
|
if (!out.includes(direct)) out.unshift(direct);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
// fnm: $HOME/.fnm/node-versions/<version>/installation/bin/claude
|
||||||
|
const fnmRoot = join(home, ".fnm/node-versions");
|
||||||
|
for (const v of _listVersionDirs(fnmRoot)) {
|
||||||
|
out.push(join(fnmRoot, v, "installation/bin/claude"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// asdf: $HOME/.asdf/installs/nodejs/<version>/bin/claude
|
||||||
|
const asdfRoot = join(home, ".asdf/installs/nodejs");
|
||||||
|
for (const v of _listVersionDirs(asdfRoot)) {
|
||||||
|
out.push(join(asdfRoot, v, "bin/claude"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// npm prefix-relocated: $HOME/.npm-global/bin/claude
|
||||||
|
out.push(join(home, ".npm-global/bin/claude"));
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
function resolveClaude() {
|
function resolveClaude() {
|
||||||
if (process.env.CLAUDE_BIN) {
|
if (process.env.CLAUDE_BIN) {
|
||||||
try {
|
try {
|
||||||
@@ -54,11 +94,13 @@ function resolveClaude() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const home = process.env.HOME || "";
|
||||||
const candidates = [
|
const candidates = [
|
||||||
"/opt/homebrew/bin/claude",
|
"/opt/homebrew/bin/claude",
|
||||||
"/usr/local/bin/claude",
|
"/usr/local/bin/claude",
|
||||||
"/usr/bin/claude",
|
"/usr/bin/claude",
|
||||||
join(process.env.HOME || "", ".local/bin/claude"),
|
join(home, ".local/bin/claude"),
|
||||||
|
..._collectNodeManagerCandidates(home),
|
||||||
];
|
];
|
||||||
for (const p of candidates) {
|
for (const p of candidates) {
|
||||||
try { accessSync(p, constants.X_OK); console.warn(`[init] CLAUDE_BIN not set, resolved to ${p}`); return p; } catch {}
|
try { accessSync(p, constants.X_OK); console.warn(`[init] CLAUDE_BIN not set, resolved to ${p}`); return p; } catch {}
|
||||||
@@ -72,6 +114,8 @@ function resolveClaude() {
|
|||||||
console.error(
|
console.error(
|
||||||
"FATAL: claude binary not found.\n" +
|
"FATAL: claude binary not found.\n" +
|
||||||
" Set CLAUDE_BIN=/path/to/claude or ensure claude is in PATH.\n" +
|
" Set CLAUDE_BIN=/path/to/claude or ensure claude is in PATH.\n" +
|
||||||
|
" Hint: if you use nvm/fnm/asdf, set CLAUDE_BIN to the absolute path\n" +
|
||||||
|
" shown by `which claude` in your interactive shell.\n" +
|
||||||
" Checked: " + candidates.join(", ")
|
" Checked: " + candidates.join(", ")
|
||||||
);
|
);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
@@ -123,6 +167,44 @@ function logEvent(level, event, data = {}) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Startup file-mode reconciliation ───────────────────────────────────
|
||||||
|
// Idempotently tightens OCP credential-bearing files to 700/600 so that
|
||||||
|
// existing installs (created before this fix) are hardened on next restart.
|
||||||
|
// Wrapped in try/catch — chmod failure must never crash startup.
|
||||||
|
// Does NOT touch systemd units or launchd plists; those are managed by setup.mjs.
|
||||||
|
function _tightenFileModesIfPossible() {
|
||||||
|
const ocpDir = join(homedir(), ".ocp");
|
||||||
|
const targets = [
|
||||||
|
{ path: ocpDir, mode: 0o700, label: "~/.ocp (dir)" },
|
||||||
|
{ path: join(ocpDir, "admin-key"), mode: 0o600, label: "~/.ocp/admin-key" },
|
||||||
|
{ path: join(ocpDir, "ocp.db"), mode: 0o600, label: "~/.ocp/ocp.db" },
|
||||||
|
];
|
||||||
|
let tightened = 0;
|
||||||
|
let alreadyOk = 0;
|
||||||
|
for (const { path, mode, label } of targets) {
|
||||||
|
try {
|
||||||
|
const st = statSync(path);
|
||||||
|
const current = st.mode & 0o777;
|
||||||
|
if (current !== mode) {
|
||||||
|
chmodSync(path, mode);
|
||||||
|
tightened++;
|
||||||
|
} else {
|
||||||
|
alreadyOk++;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
if (e.code !== "ENOENT") {
|
||||||
|
// File exists but chmod failed (e.g. EPERM) — log and move on
|
||||||
|
logEvent("warn", "file_mode_tighten_failed", { path: label, error: e.message });
|
||||||
|
}
|
||||||
|
// ENOENT is fine — file doesn't exist yet
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (tightened > 0) {
|
||||||
|
logEvent("info", "file_modes_tightened", { tightened, alreadyOk });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_tightenFileModesIfPossible();
|
||||||
|
|
||||||
// ── Circuit breaker (DISABLED) ──────────────────────────────────────────
|
// ── Circuit breaker (DISABLED) ──────────────────────────────────────────
|
||||||
// Disabled: CLI proxy has its own retry logic, and the breaker was causing
|
// Disabled: CLI proxy has its own retry logic, and the breaker was causing
|
||||||
// cascading failures — once API got briefly slow, ALL agents lost connectivity
|
// cascading failures — once API got briefly slow, ALL agents lost connectivity
|
||||||
@@ -158,25 +240,36 @@ const MODEL_MAP = Object.fromEntries([
|
|||||||
const MODELS = modelsConfig.models.map(m => ({ id: m.id, name: m.displayName }));
|
const MODELS = modelsConfig.models.map(m => ({ id: m.id, name: m.displayName }));
|
||||||
|
|
||||||
// ── Session management ──────────────────────────────────────────────────
|
// ── Session management ──────────────────────────────────────────────────
|
||||||
// Maps conversation IDs (from caller) to Claude CLI session UUIDs.
|
// Maps namespaced session keys to Claude CLI session UUIDs.
|
||||||
|
// Key format: "${keyName}|${conversationId}" — prevents cross-key collision
|
||||||
|
// when two callers (different API keys or anon + authenticated) use the same
|
||||||
|
// session_id string. Anonymous callers use "anon"; admin uses "admin".
|
||||||
// Enables --resume for multi-turn conversations, reducing token waste.
|
// Enables --resume for multi-turn conversations, reducing token waste.
|
||||||
const sessions = new Map(); // conversationId → { uuid, messageCount, lastUsed, model }
|
const sessions = new Map(); // `${keyName}|${conversationId}` → { uuid, messageCount, lastUsed, model }
|
||||||
|
|
||||||
|
// Build the namespaced key used for all sessions Map operations.
|
||||||
|
// Returns null when conversationId is falsy (one-off requests bypass session tracking).
|
||||||
|
function _sessionKey(conversationId, keyName) {
|
||||||
|
return conversationId ? `${keyName || "anon"}|${conversationId}` : null;
|
||||||
|
}
|
||||||
|
|
||||||
const sessionCleanupInterval = setInterval(() => {
|
const sessionCleanupInterval = setInterval(() => {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
for (const [id, s] of sessions) {
|
for (const [id, s] of sessions) {
|
||||||
const idleMs = now - s.lastUsed;
|
const idleMs = now - s.lastUsed;
|
||||||
const ageMs = s.firstSeen ? now - s.firstSeen : null;
|
const ageMs = s.firstSeen ? now - s.firstSeen : null;
|
||||||
|
// id is "${keyName}|${conversationId}"; strip prefix for log output
|
||||||
|
const convIdShort = id.includes("|") ? id.slice(id.indexOf("|") + 1, id.indexOf("|") + 13) : id.slice(0, 12);
|
||||||
if (idleMs > SESSION_TTL) {
|
if (idleMs > SESSION_TTL) {
|
||||||
sessions.delete(id);
|
sessions.delete(id);
|
||||||
console.log(`[session] expired ${id.slice(0, 12)}... (idle ${Math.round(idleMs / 60000)}m)`);
|
console.log(`[session] expired ${convIdShort}... (idle ${Math.round(idleMs / 60000)}m)`);
|
||||||
logEvent("info", "session_expired", { conversationId: id.slice(0, 12) + "...", idleMs, ageMs });
|
logEvent("info", "session_expired", { conversationId: convIdShort + "...", idleMs, ageMs });
|
||||||
} else if (ageMs !== null && ageMs > 4 * SESSION_TTL) {
|
} else if (ageMs !== null && ageMs > 4 * SESSION_TTL) {
|
||||||
// #42 evidence-gathering: a session whose firstSeen is more than 4× TTL old
|
// #42 evidence-gathering: a session whose firstSeen is more than 4× TTL old
|
||||||
// but whose lastUsed keeps getting bumped (never idle long enough to expire)
|
// but whose lastUsed keeps getting bumped (never idle long enough to expire)
|
||||||
// is the suspected bug. Log without action so the pattern can be confirmed
|
// is the suspected bug. Log without action so the pattern can be confirmed
|
||||||
// in /logs. Do NOT enforce an absolute age cap here speculatively.
|
// in /logs. Do NOT enforce an absolute age cap here speculatively.
|
||||||
logEvent("warn", "session_long_lived", { conversationId: id.slice(0, 12) + "...", idleMs, ageMs });
|
logEvent("warn", "session_long_lived", { conversationId: convIdShort + "...", idleMs, ageMs });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 60000);
|
}, 60000);
|
||||||
@@ -383,7 +476,7 @@ function getModelTier(cliModel) {
|
|||||||
// ── Spawn claude CLI (shared setup) ─────────────────────────────────────
|
// ── Spawn claude CLI (shared setup) ─────────────────────────────────────
|
||||||
// Resolves session logic, builds CLI args, spawns the process, and sets up
|
// Resolves session logic, builds CLI args, spawns the process, and sets up
|
||||||
// timeouts. Returns context object or throws synchronously.
|
// timeouts. Returns context object or throws synchronously.
|
||||||
function spawnClaudeProcess(model, messages, conversationId) {
|
function spawnClaudeProcess(model, messages, conversationId, keyName) {
|
||||||
if (stats.activeRequests >= MAX_CONCURRENT) {
|
if (stats.activeRequests >= MAX_CONCURRENT) {
|
||||||
throw new Error(`concurrency limit reached (${stats.activeRequests}/${MAX_CONCURRENT})`);
|
throw new Error(`concurrency limit reached (${stats.activeRequests}/${MAX_CONCURRENT})`);
|
||||||
}
|
}
|
||||||
@@ -399,8 +492,11 @@ function spawnClaudeProcess(model, messages, conversationId) {
|
|||||||
let prompt;
|
let prompt;
|
||||||
|
|
||||||
// ── Session logic ──
|
// ── Session logic ──
|
||||||
if (conversationId && sessions.has(conversationId)) {
|
// sessionKey namespaces the Map key by keyName to prevent cross-caller collision
|
||||||
const session = sessions.get(conversationId);
|
// when two callers with different API keys share the same conversationId string.
|
||||||
|
const sessionKey = _sessionKey(conversationId, keyName);
|
||||||
|
if (sessionKey && sessions.has(sessionKey)) {
|
||||||
|
const session = sessions.get(sessionKey);
|
||||||
session.lastUsed = Date.now();
|
session.lastUsed = Date.now();
|
||||||
sessionInfo = { uuid: session.uuid, resume: true };
|
sessionInfo = { uuid: session.uuid, resume: true };
|
||||||
stats.sessionHits++;
|
stats.sessionHits++;
|
||||||
@@ -411,17 +507,17 @@ function spawnClaudeProcess(model, messages, conversationId) {
|
|||||||
: "";
|
: "";
|
||||||
session.messageCount = messages.length;
|
session.messageCount = messages.length;
|
||||||
|
|
||||||
console.log(`[session] resume conv=${conversationId.slice(0, 12)}... uuid=${session.uuid.slice(0, 8)}... msgs=${messages.length} prompt_chars=${prompt.length}`);
|
console.log(`[session] resume conv=${conversationId.slice(0, 12)}... key=${keyName || "anon"} uuid=${session.uuid.slice(0, 8)}... msgs=${messages.length} prompt_chars=${prompt.length}`);
|
||||||
|
|
||||||
} else if (conversationId) {
|
} else if (sessionKey) {
|
||||||
const uuid = randomUUID();
|
const uuid = randomUUID();
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
sessions.set(conversationId, { uuid, messageCount: messages.length, firstSeen: now, lastUsed: now, model: cliModel });
|
sessions.set(sessionKey, { uuid, messageCount: messages.length, firstSeen: now, lastUsed: now, model: cliModel });
|
||||||
sessionInfo = { uuid, resume: false };
|
sessionInfo = { uuid, resume: false };
|
||||||
stats.sessionMisses++;
|
stats.sessionMisses++;
|
||||||
prompt = messagesToPrompt(messages);
|
prompt = messagesToPrompt(messages);
|
||||||
|
|
||||||
console.log(`[session] new conv=${conversationId.slice(0, 12)}... uuid=${uuid.slice(0, 8)}... msgs=${messages.length}`);
|
console.log(`[session] new conv=${conversationId.slice(0, 12)}... key=${keyName || "anon"} uuid=${uuid.slice(0, 8)}... msgs=${messages.length}`);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
stats.oneOffRequests++;
|
stats.oneOffRequests++;
|
||||||
@@ -466,11 +562,11 @@ function spawnClaudeProcess(model, messages, conversationId) {
|
|||||||
proc.once("exit", cleanup);
|
proc.once("exit", cleanup);
|
||||||
|
|
||||||
function handleSessionFailure() {
|
function handleSessionFailure() {
|
||||||
if (sessionInfo?.resume && conversationId) {
|
if (sessionInfo?.resume && sessionKey) {
|
||||||
console.warn(`[session] resume failed for ${conversationId.slice(0, 12)}..., removing stale session`);
|
console.warn(`[session] resume failed for ${conversationId.slice(0, 12)}..., removing stale session`);
|
||||||
logEvent("warn", "session_failure", { mode: "resume", conversationId: conversationId.slice(0, 12) + "...", action: "deleted" });
|
logEvent("warn", "session_failure", { mode: "resume", conversationId: conversationId.slice(0, 12) + "...", action: "deleted" });
|
||||||
sessions.delete(conversationId);
|
sessions.delete(sessionKey);
|
||||||
} else if (sessionInfo && !sessionInfo.resume && conversationId) {
|
} else if (sessionInfo && !sessionInfo.resume && sessionKey) {
|
||||||
// #41 evidence-gathering: session-create failures currently leave a stale entry
|
// #41 evidence-gathering: session-create failures currently leave a stale entry
|
||||||
// in the sessions map. Log without action so the staleness pattern can be
|
// in the sessions map. Log without action so the staleness pattern can be
|
||||||
// confirmed in /logs before any code change. Do NOT delete here speculatively.
|
// confirmed in /logs before any code change. Do NOT delete here speculatively.
|
||||||
@@ -513,11 +609,11 @@ function spawnClaudeProcess(model, messages, conversationId) {
|
|||||||
// On-demand spawning: each request spawns a fresh `claude -p` process.
|
// On-demand spawning: each request spawns a fresh `claude -p` process.
|
||||||
// No pool = no crash loops, no stale workers, no degraded states.
|
// No pool = no crash loops, no stale workers, no degraded states.
|
||||||
// Stdin is written immediately so there's no 3s stdin timeout issue.
|
// Stdin is written immediately so there's no 3s stdin timeout issue.
|
||||||
function callClaude(model, messages, conversationId) {
|
function callClaude(model, messages, conversationId, keyName) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
let ctx;
|
let ctx;
|
||||||
try {
|
try {
|
||||||
ctx = spawnClaudeProcess(model, messages, conversationId);
|
ctx = spawnClaudeProcess(model, messages, conversationId, keyName);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return reject(err);
|
return reject(err);
|
||||||
}
|
}
|
||||||
@@ -597,7 +693,7 @@ function callClaudeStreaming(model, messages, conversationId, res, authInfo = {}
|
|||||||
|
|
||||||
let ctx;
|
let ctx;
|
||||||
try {
|
try {
|
||||||
ctx = spawnClaudeProcess(model, messages, conversationId);
|
ctx = spawnClaudeProcess(model, messages, conversationId, authInfo.keyName);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return jsonResponse(res, 500, { error: { message: err.message, type: "proxy_error" } });
|
return jsonResponse(res, 500, { error: { message: err.message, type: "proxy_error" } });
|
||||||
}
|
}
|
||||||
@@ -1280,7 +1376,7 @@ async function handleChatCompletions(req, res) {
|
|||||||
// will re-read the freshly-populated cache entry here rather than spawning.
|
// will re-read the freshly-populated cache entry here rather than spawning.
|
||||||
const recheck = getCachedResponse(req._cacheHash, CACHE_TTL);
|
const recheck = getCachedResponse(req._cacheHash, CACHE_TTL);
|
||||||
if (recheck) return recheck.response;
|
if (recheck) return recheck.response;
|
||||||
const c = await callClaude(model, messages, conversationId);
|
const c = await callClaude(model, messages, conversationId, req._authKeyName);
|
||||||
try { setCachedResponse(req._cacheHash, model, c); } catch (e) { logEvent("error", "cache_write_failed", { error: e.message }); }
|
try { setCachedResponse(req._cacheHash, model, c); } catch (e) { logEvent("error", "cache_write_failed", { error: e.message }); }
|
||||||
return c;
|
return c;
|
||||||
});
|
});
|
||||||
@@ -1302,7 +1398,7 @@ async function handleChatCompletions(req, res) {
|
|||||||
|
|
||||||
// Fallback: cache disabled (CACHE_TTL=0) or no _cacheHash — original path untouched.
|
// Fallback: cache disabled (CACHE_TTL=0) or no _cacheHash — original path untouched.
|
||||||
try {
|
try {
|
||||||
const content = await callClaude(model, messages, conversationId);
|
const content = await callClaude(model, messages, conversationId, req._authKeyName);
|
||||||
const id = `chatcmpl-${randomUUID()}`;
|
const id = `chatcmpl-${randomUUID()}`;
|
||||||
completionResponse(res, id, model, content);
|
completionResponse(res, id, model, content);
|
||||||
try { recordUsage({ keyId: req._authKeyId, keyName: req._authKeyName, model, promptChars, responseChars: content.length, elapsedMs: Date.now() - t0Usage, success: true }); } catch (e) { logEvent("error", "usage_record_failed", { error: e.message }); }
|
try { recordUsage({ keyId: req._authKeyId, keyName: req._authKeyName, model, promptChars, responseChars: content.length, elapsedMs: Date.now() - t0Usage, success: true }); } catch (e) { logEvent("error", "usage_record_failed", { error: e.message }); }
|
||||||
@@ -1436,8 +1532,10 @@ const server = createServer(async (req, res) => {
|
|||||||
const uptimeMs = Date.now() - START_TIME;
|
const uptimeMs = Date.now() - START_TIME;
|
||||||
const sessionList = [];
|
const sessionList = [];
|
||||||
for (const [id, s] of sessions) {
|
for (const [id, s] of sessions) {
|
||||||
|
// id is "${keyName}|${conversationId}"; expose only the public-facing conversationId
|
||||||
|
const convId = id.includes("|") ? id.slice(id.indexOf("|") + 1) : id;
|
||||||
sessionList.push({
|
sessionList.push({
|
||||||
id: id.slice(0, 12) + "...",
|
id: convId.slice(0, 12) + "...",
|
||||||
model: s.model,
|
model: s.model,
|
||||||
messages: s.messageCount,
|
messages: s.messageCount,
|
||||||
idleMs: Date.now() - s.lastUsed,
|
idleMs: Date.now() - s.lastUsed,
|
||||||
@@ -1482,7 +1580,9 @@ const server = createServer(async (req, res) => {
|
|||||||
if (req.url === "/sessions" && req.method === "GET") {
|
if (req.url === "/sessions" && req.method === "GET") {
|
||||||
const list = [];
|
const list = [];
|
||||||
for (const [id, s] of sessions) {
|
for (const [id, s] of sessions) {
|
||||||
list.push({ id, uuid: s.uuid, model: s.model, messages: s.messageCount, lastUsed: new Date(s.lastUsed).toISOString() });
|
// id is "${keyName}|${conversationId}"; expose only the public-facing conversationId
|
||||||
|
const convId = id.includes("|") ? id.slice(id.indexOf("|") + 1) : id;
|
||||||
|
list.push({ id: convId, uuid: s.uuid, model: s.model, messages: s.messageCount, lastUsed: new Date(s.lastUsed).toISOString() });
|
||||||
}
|
}
|
||||||
return jsonResponse(res, 200, { sessions: list });
|
return jsonResponse(res, 200, { sessions: list });
|
||||||
}
|
}
|
||||||
@@ -1572,14 +1672,45 @@ const server = createServer(async (req, res) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (req.url?.startsWith("/api/usage") && req.method === "GET") {
|
if (req.url?.startsWith("/api/usage") && req.method === "GET") {
|
||||||
if (!isAdmin) return jsonResponse(res, 403, { error: "Admin access required" });
|
// Least-privilege scope rules (security audit follow-up):
|
||||||
|
// - non-admin authenticated key → only own rows
|
||||||
|
// - anonymous (PROXY_ANONYMOUS_KEY) → only "anonymous" rows; ?all=true ignored
|
||||||
|
// - admin without ?all=true → only own ("admin") rows
|
||||||
|
// - admin with ?all=true → full byKey/recent (legacy behavior); audited
|
||||||
|
// Authenticated callers are required (anyone reaching here passed the auth gate above);
|
||||||
|
// remote+no-auth requests would have been rejected before this point.
|
||||||
const url = new URL(req.url, `http://${BIND_ADDRESS}:${PORT}`);
|
const url = new URL(req.url, `http://${BIND_ADDRESS}:${PORT}`);
|
||||||
const since = url.searchParams.get("since");
|
const since = url.searchParams.get("since");
|
||||||
const until = url.searchParams.get("until");
|
const until = url.searchParams.get("until");
|
||||||
|
const wantAll = url.searchParams.get("all") === "true";
|
||||||
|
const callerName = req._authKeyName;
|
||||||
|
|
||||||
|
// Anonymous callers may never opt into all-keys view, even if they pass ?all=true.
|
||||||
|
const isAnonCaller = callerName === "anonymous";
|
||||||
|
const fullScope = isAdmin && wantAll && !isAnonCaller;
|
||||||
|
|
||||||
|
// scopeName === null when fullScope is true (no filter); otherwise the key_name to filter by.
|
||||||
|
const scopeName = fullScope ? null : callerName;
|
||||||
|
|
||||||
|
if (fullScope) {
|
||||||
|
logEvent("info", "admin_usage_full_scope", { caller: callerName, ip: req.socket.remoteAddress || null });
|
||||||
|
}
|
||||||
|
|
||||||
|
const byKeyAll = getUsageByKey({ since, until });
|
||||||
|
const recentAll = getRecentUsage(Math.min(parseInt(url.searchParams.get("limit") || "50", 10), 500));
|
||||||
|
const timeline = getUsageTimeline({
|
||||||
|
keyName: scopeName || undefined,
|
||||||
|
hours: Math.min(parseInt(url.searchParams.get("hours") || "24", 10), 720),
|
||||||
|
});
|
||||||
|
|
||||||
|
const byKey = scopeName ? byKeyAll.filter((row) => row.key_name === scopeName) : byKeyAll;
|
||||||
|
const recent = scopeName ? recentAll.filter((row) => row.key_name === scopeName) : recentAll;
|
||||||
|
|
||||||
return jsonResponse(res, 200, {
|
return jsonResponse(res, 200, {
|
||||||
byKey: getUsageByKey({ since, until }),
|
byKey,
|
||||||
timeline: getUsageTimeline({ hours: Math.min(parseInt(url.searchParams.get("hours") || "24", 10), 720) }),
|
timeline,
|
||||||
recent: getRecentUsage(Math.min(parseInt(url.searchParams.get("limit") || "50", 10), 500)),
|
recent,
|
||||||
|
scope: { self: scopeName, all: fullScope },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,8 @@
|
|||||||
* 4. Creates start.sh for easy launch
|
* 4. Creates start.sh for easy launch
|
||||||
* 5. Optionally starts the proxy
|
* 5. Optionally starts the proxy
|
||||||
*/
|
*/
|
||||||
import { readFileSync, writeFileSync, existsSync, mkdirSync, unlinkSync, readdirSync } from "node:fs";
|
import { readFileSync, writeFileSync, existsSync, mkdirSync, unlinkSync, readdirSync, chmodSync } from "node:fs";
|
||||||
|
import { mergePlistEnv, mergeSystemdEnv } from "./scripts/lib/plist-merge.mjs";
|
||||||
import { execSync } from "node:child_process";
|
import { execSync } from "node:child_process";
|
||||||
import { join, dirname } from "node:path";
|
import { join, dirname } from "node:path";
|
||||||
import { homedir } from "node:os";
|
import { homedir } from "node:os";
|
||||||
@@ -424,8 +425,15 @@ if (!DRY_RUN) {
|
|||||||
</plist>
|
</plist>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
writeFileSync(plistPath, plistXml);
|
const existingPlist = existsSync(plistPath) ? readFileSync(plistPath, "utf8") : null;
|
||||||
log(`Plist written: ${plistPath}`);
|
const finalPlistXml = mergePlistEnv(existingPlist, plistXml);
|
||||||
|
writeFileSync(plistPath, finalPlistXml);
|
||||||
|
chmodSync(plistPath, 0o600);
|
||||||
|
if (existingPlist && finalPlistXml !== plistXml) {
|
||||||
|
log(`Plist written: ${plistPath} (mode 600, preserved user env vars)`);
|
||||||
|
} else {
|
||||||
|
log(`Plist written: ${plistPath} (mode 600)`);
|
||||||
|
}
|
||||||
|
|
||||||
// Bootout first (in case it was already loaded) then bootstrap
|
// Bootout first (in case it was already loaded) then bootstrap
|
||||||
try { execSync(`launchctl bootout gui/$(id -u) "${plistPath}" 2>/dev/null`); } catch { /* ignore */ }
|
try { execSync(`launchctl bootout gui/$(id -u) "${plistPath}" 2>/dev/null`); } catch { /* ignore */ }
|
||||||
@@ -458,8 +466,15 @@ StandardError=append:${logPath}
|
|||||||
WantedBy=default.target
|
WantedBy=default.target
|
||||||
`;
|
`;
|
||||||
|
|
||||||
writeFileSync(servicePath, serviceUnit);
|
const existingService = existsSync(servicePath) ? readFileSync(servicePath, "utf8") : null;
|
||||||
log(`Service file written: ${servicePath}`);
|
const finalServiceUnit = mergeSystemdEnv(existingService, serviceUnit);
|
||||||
|
writeFileSync(servicePath, finalServiceUnit);
|
||||||
|
chmodSync(servicePath, 0o600);
|
||||||
|
if (existingService && finalServiceUnit !== serviceUnit) {
|
||||||
|
log(`Service file written: ${servicePath} (mode 600, preserved user env vars)`);
|
||||||
|
} else {
|
||||||
|
log(`Service file written: ${servicePath} (mode 600)`);
|
||||||
|
}
|
||||||
|
|
||||||
execSync(`systemctl --user daemon-reload`);
|
execSync(`systemctl --user daemon-reload`);
|
||||||
execSync(`systemctl --user enable ocp-proxy`);
|
execSync(`systemctl --user enable ocp-proxy`);
|
||||||
|
|||||||
@@ -454,6 +454,383 @@ async function runSingleflightTests() {
|
|||||||
|
|
||||||
await runSingleflightTests();
|
await runSingleflightTests();
|
||||||
|
|
||||||
|
// ── Plist Env Merge Tests ──
|
||||||
|
import { mergePlistEnv, mergeSystemdEnv } from "./scripts/lib/plist-merge.mjs";
|
||||||
|
|
||||||
|
console.log("\nPlist env merge:");
|
||||||
|
|
||||||
|
const SAMPLE_TEMPLATE_PLIST = `<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>Label</key>
|
||||||
|
<string>dev.ocp.proxy</string>
|
||||||
|
<key>EnvironmentVariables</key>
|
||||||
|
<dict>
|
||||||
|
<key>CLAUDE_PROXY_PORT</key>
|
||||||
|
<string>3478</string>
|
||||||
|
<key>CLAUDE_BIND</key>
|
||||||
|
<string>127.0.0.1</string>
|
||||||
|
<key>CLAUDE_AUTH_MODE</key>
|
||||||
|
<string>multi</string>
|
||||||
|
</dict>
|
||||||
|
</dict>
|
||||||
|
</plist>`;
|
||||||
|
|
||||||
|
const SAMPLE_EXISTING_PLIST = `<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>Label</key>
|
||||||
|
<string>dev.ocp.proxy</string>
|
||||||
|
<key>EnvironmentVariables</key>
|
||||||
|
<dict>
|
||||||
|
<key>CLAUDE_PROXY_PORT</key>
|
||||||
|
<string>3456</string>
|
||||||
|
<key>CLAUDE_BIND</key>
|
||||||
|
<string>127.0.0.1</string>
|
||||||
|
<key>CLAUDE_AUTH_MODE</key>
|
||||||
|
<string>none</string>
|
||||||
|
<key>CLAUDE_HEARTBEAT_INTERVAL</key>
|
||||||
|
<string>2000</string>
|
||||||
|
<key>CLAUDE_CACHE_TTL</key>
|
||||||
|
<string>600</string>
|
||||||
|
</dict>
|
||||||
|
</dict>
|
||||||
|
</plist>`;
|
||||||
|
|
||||||
|
test("mergePlistEnv preserves unknown user keys", () => {
|
||||||
|
const merged = mergePlistEnv(SAMPLE_EXISTING_PLIST, SAMPLE_TEMPLATE_PLIST);
|
||||||
|
assert.match(merged, /<key>CLAUDE_HEARTBEAT_INTERVAL<\/key>\s*<string>2000<\/string>/);
|
||||||
|
assert.match(merged, /<key>CLAUDE_CACHE_TTL<\/key>\s*<string>600<\/string>/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("mergePlistEnv overrides known template keys", () => {
|
||||||
|
const merged = mergePlistEnv(SAMPLE_EXISTING_PLIST, SAMPLE_TEMPLATE_PLIST);
|
||||||
|
assert.match(merged, /<key>CLAUDE_PROXY_PORT<\/key>\s*<string>3478<\/string>/);
|
||||||
|
assert.match(merged, /<key>CLAUDE_AUTH_MODE<\/key>\s*<string>multi<\/string>/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("mergePlistEnv first-install returns template unchanged when existing is null", () => {
|
||||||
|
const merged = mergePlistEnv(null, SAMPLE_TEMPLATE_PLIST);
|
||||||
|
assert.equal(merged, SAMPLE_TEMPLATE_PLIST);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("mergePlistEnv first-install returns template unchanged when existing is empty", () => {
|
||||||
|
const merged = mergePlistEnv("", SAMPLE_TEMPLATE_PLIST);
|
||||||
|
assert.equal(merged, SAMPLE_TEMPLATE_PLIST);
|
||||||
|
});
|
||||||
|
|
||||||
|
const SAMPLE_TEMPLATE_SYSTEMD = `[Unit]
|
||||||
|
Description=OCP — Open Claude Proxy
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/usr/bin/node /home/u/ocp/server.mjs
|
||||||
|
Environment=CLAUDE_PROXY_PORT=3478
|
||||||
|
Environment=CLAUDE_BIND=127.0.0.1
|
||||||
|
Environment=CLAUDE_AUTH_MODE=multi
|
||||||
|
Restart=always
|
||||||
|
`;
|
||||||
|
|
||||||
|
const SAMPLE_EXISTING_SYSTEMD = `[Unit]
|
||||||
|
Description=OCP — Open Claude Proxy
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/usr/bin/node /home/u/ocp/server.mjs
|
||||||
|
Environment=CLAUDE_PROXY_PORT=3456
|
||||||
|
Environment=CLAUDE_BIND=127.0.0.1
|
||||||
|
Environment=CLAUDE_AUTH_MODE=none
|
||||||
|
Environment=CLAUDE_HEARTBEAT_INTERVAL=2000
|
||||||
|
Environment=CLAUDE_CACHE_TTL=600
|
||||||
|
Restart=always
|
||||||
|
`;
|
||||||
|
|
||||||
|
test("mergeSystemdEnv preserves unknown user Environment lines", () => {
|
||||||
|
const merged = mergeSystemdEnv(SAMPLE_EXISTING_SYSTEMD, SAMPLE_TEMPLATE_SYSTEMD);
|
||||||
|
assert.match(merged, /Environment=CLAUDE_HEARTBEAT_INTERVAL=2000/);
|
||||||
|
assert.match(merged, /Environment=CLAUDE_CACHE_TTL=600/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("mergeSystemdEnv overrides known template keys", () => {
|
||||||
|
const merged = mergeSystemdEnv(SAMPLE_EXISTING_SYSTEMD, SAMPLE_TEMPLATE_SYSTEMD);
|
||||||
|
assert.match(merged, /Environment=CLAUDE_PROXY_PORT=3478/);
|
||||||
|
assert.match(merged, /Environment=CLAUDE_AUTH_MODE=multi/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("mergeSystemdEnv first-install returns template unchanged", () => {
|
||||||
|
assert.equal(mergeSystemdEnv(null, SAMPLE_TEMPLATE_SYSTEMD), SAMPLE_TEMPLATE_SYSTEMD);
|
||||||
|
assert.equal(mergeSystemdEnv("", SAMPLE_TEMPLATE_SYSTEMD), SAMPLE_TEMPLATE_SYSTEMD);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("mergePlistEnv is idempotent", () => {
|
||||||
|
const r1 = mergePlistEnv(SAMPLE_EXISTING_PLIST, SAMPLE_TEMPLATE_PLIST);
|
||||||
|
assert.equal(mergePlistEnv(r1, SAMPLE_TEMPLATE_PLIST), r1);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("mergeSystemdEnv is idempotent", () => {
|
||||||
|
const r1 = mergeSystemdEnv(SAMPLE_EXISTING_SYSTEMD, SAMPLE_TEMPLATE_SYSTEMD);
|
||||||
|
assert.equal(mergeSystemdEnv(r1, SAMPLE_TEMPLATE_SYSTEMD), r1);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Doctor JSON Contract Tests ──
|
||||||
|
import { runDoctor } from "./scripts/doctor.mjs";
|
||||||
|
|
||||||
|
console.log("\nDoctor:");
|
||||||
|
|
||||||
|
test("doctor --json shape: required top-level keys", async () => {
|
||||||
|
const result = await runDoctor({ skipNetwork: true, mockVersion: "v3.10.0", mockLatest: "v3.14.0" });
|
||||||
|
for (const k of ["schema_version", "ready_to_upgrade", "current_version", "latest_version",
|
||||||
|
"from_version_supported", "fail_count", "warn_count", "checks", "next_action"]) {
|
||||||
|
assert.ok(k in result, `missing key: ${k}`);
|
||||||
|
}
|
||||||
|
assert.equal(result.schema_version, "1");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor detects from-version < v3.4.0 → fresh_install", async () => {
|
||||||
|
const result = await runDoctor({ skipNetwork: true, mockVersion: "v3.2.0", mockLatest: "v3.14.0" });
|
||||||
|
assert.equal(result.from_version_supported, false);
|
||||||
|
assert.equal(result.next_action.kind, "fresh_install");
|
||||||
|
assert.ok(Array.isArray(result.next_action.ai_executable));
|
||||||
|
assert.ok(result.next_action.ai_executable.length > 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor next_action.kind enum is one of allowed values", async () => {
|
||||||
|
const result = await runDoctor({ skipNetwork: true, mockVersion: "v3.10.0", mockLatest: "v3.14.0" });
|
||||||
|
const ALLOWED = ["noop", "update", "upgrade", "fresh_install", "fix_oauth", "fix_service"];
|
||||||
|
assert.ok(ALLOWED.includes(result.next_action.kind), `kind=${result.next_action.kind} not in enum`);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor noop when current==latest", async () => {
|
||||||
|
const result = await runDoctor({ skipNetwork: true, mockVersion: "v3.14.0", mockLatest: "v3.14.0" });
|
||||||
|
assert.equal(result.next_action.kind, "noop");
|
||||||
|
assert.equal(result.ready_to_upgrade, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor patch-bump same minor → update kind", async () => {
|
||||||
|
const result = await runDoctor({ skipNetwork: true, mockVersion: "v3.14.0", mockLatest: "v3.14.1" });
|
||||||
|
assert.equal(result.next_action.kind, "update");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor cross-minor → upgrade kind", async () => {
|
||||||
|
const result = await runDoctor({ skipNetwork: true, mockVersion: "v3.10.0", mockLatest: "v3.14.0" });
|
||||||
|
assert.equal(result.next_action.kind, "upgrade");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor OAuth FAIL → fix_oauth kind", async () => {
|
||||||
|
const result = await runDoctor({
|
||||||
|
skipNetwork: false,
|
||||||
|
mockVersion: "v3.10.0",
|
||||||
|
mockLatest: "v3.14.0",
|
||||||
|
mockHealth: { status: 200, body: { auth: { ok: false, message: "ENOEXEC" } } }
|
||||||
|
});
|
||||||
|
assert.equal(result.next_action.kind, "fix_oauth");
|
||||||
|
assert.ok(result.next_action.ai_executable.some(c => c.includes("install.cjs")));
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor service down → fix_service kind", async () => {
|
||||||
|
const result = await runDoctor({
|
||||||
|
skipNetwork: false,
|
||||||
|
mockVersion: "v3.10.0",
|
||||||
|
mockLatest: "v3.14.0",
|
||||||
|
mockHealth: { error: "ECONNREFUSED" }
|
||||||
|
});
|
||||||
|
assert.equal(result.next_action.kind, "fix_service");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor unparseable version → fresh_install", async () => {
|
||||||
|
const result = await runDoctor({ skipNetwork: true, mockVersion: "garbage", mockLatest: "v3.14.0" });
|
||||||
|
assert.equal(result.from_version_supported, false);
|
||||||
|
assert.equal(result.next_action.kind, "fresh_install");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("doctor empty health body → fix_service (not fix_oauth)", async () => {
|
||||||
|
const result = await runDoctor({
|
||||||
|
skipNetwork: false,
|
||||||
|
mockVersion: "v3.10.0",
|
||||||
|
mockLatest: "v3.14.0",
|
||||||
|
mockHealth: { status: 200, body: null }
|
||||||
|
});
|
||||||
|
assert.equal(result.next_action.kind, "fix_service");
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Upgrade Tests ──
|
||||||
|
import { runUpgrade } from "./scripts/upgrade.mjs";
|
||||||
|
|
||||||
|
console.log("\nUpgrade:");
|
||||||
|
|
||||||
|
test("upgrade --dry-run prints plan, no side effects", async () => {
|
||||||
|
const result = await runUpgrade({
|
||||||
|
dryRun: true,
|
||||||
|
yes: true,
|
||||||
|
mockDoctor: { ready_to_upgrade: true, next_action: { kind: "upgrade" }, current_version: "v3.10.0", latest_version: "v3.14.0" }
|
||||||
|
});
|
||||||
|
assert.equal(result.executed, false);
|
||||||
|
assert.ok(result.plan.length > 0);
|
||||||
|
assert.ok(result.plan.some(line => line.toLowerCase().includes("snapshot")));
|
||||||
|
});
|
||||||
|
|
||||||
|
test("upgrade noop returns early when current==latest", async () => {
|
||||||
|
const result = await runUpgrade({
|
||||||
|
yes: true,
|
||||||
|
mockDoctor: { ready_to_upgrade: true, next_action: { kind: "noop" }, current_version: "v3.14.0", latest_version: "v3.14.0" }
|
||||||
|
});
|
||||||
|
assert.equal(result.path, "noop");
|
||||||
|
assert.equal(result.executed, true);
|
||||||
|
assert.equal(result.changed, false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("upgrade aborts on doctor FAIL", async () => {
|
||||||
|
await assert.rejects(async () => {
|
||||||
|
await runUpgrade({
|
||||||
|
yes: true,
|
||||||
|
mockDoctor: { ready_to_upgrade: false, fail_count: 1, next_action: { kind: "fix_oauth" } }
|
||||||
|
});
|
||||||
|
}, /doctor FAIL/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("upgrade full path executes 5 phases", async () => {
|
||||||
|
const result = await runUpgrade({
|
||||||
|
yes: true,
|
||||||
|
dryRun: false,
|
||||||
|
mockExec: true,
|
||||||
|
mockDoctor: { ready_to_upgrade: true, next_action: { kind: "upgrade" },
|
||||||
|
current_version: "v3.10.0", latest_version: "v3.14.0" }
|
||||||
|
});
|
||||||
|
assert.equal(result.path, "upgrade");
|
||||||
|
// Plan asks for 6 phases by name; verify each appears as a phase entry
|
||||||
|
const phaseNames = result.phases.map(p => p.name);
|
||||||
|
for (const expected of ["pre-flight", "snapshot", "fetch+install", "reconfigure", "restart", "post-flight"]) {
|
||||||
|
assert.ok(phaseNames.includes(expected), `missing phase: ${expected}; got ${phaseNames.join(",")}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Snapshot Tests ──
|
||||||
|
import { writeSnapshot, readSnapshot, listSnapshots } from "./scripts/lib/snapshot.mjs";
|
||||||
|
import { mkdtempSync, rmSync, mkdirSync as tMkdirSync, writeFileSync as testWriteFile } from "node:fs";
|
||||||
|
import { tmpdir } from "node:os";
|
||||||
|
import { join as testJoin } from "node:path";
|
||||||
|
|
||||||
|
console.log("\nSnapshot:");
|
||||||
|
|
||||||
|
test("writeSnapshot creates dir + manifest files", () => {
|
||||||
|
const root = mkdtempSync(testJoin(tmpdir(), "ocp-snap-test-"));
|
||||||
|
const dotOcp = testJoin(root, ".ocp");
|
||||||
|
tMkdirSync(dotOcp, { recursive: true });
|
||||||
|
testWriteFile(testJoin(dotOcp, "ocp.db"), "fake-sqlite-bytes");
|
||||||
|
|
||||||
|
const path = writeSnapshot({
|
||||||
|
homeDir: root,
|
||||||
|
fromCommit: "abc1234",
|
||||||
|
fromVersion: "v3.10.0",
|
||||||
|
toVersion: "v3.14.0",
|
||||||
|
extraFiles: []
|
||||||
|
});
|
||||||
|
const m = readSnapshot(path);
|
||||||
|
assert.equal(m.fromCommit, "abc1234");
|
||||||
|
assert.equal(m.fromVersion, "v3.10.0");
|
||||||
|
rmSync(root, { recursive: true, force: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
test("listSnapshots returns sorted by ISO timestamp", () => {
|
||||||
|
const root = mkdtempSync(testJoin(tmpdir(), "ocp-snap-list-"));
|
||||||
|
const dotOcp = testJoin(root, ".ocp");
|
||||||
|
tMkdirSync(dotOcp, { recursive: true });
|
||||||
|
for (const ts of ["2026-05-01T10:00:00Z", "2026-05-02T10:00:00Z", "2026-05-03T10:00:00Z"]) {
|
||||||
|
tMkdirSync(testJoin(dotOcp, `upgrade-snapshot-${ts}`));
|
||||||
|
}
|
||||||
|
const list = listSnapshots(root);
|
||||||
|
assert.equal(list.length, 3);
|
||||||
|
assert.ok(list[0].path.includes("2026-05-01"));
|
||||||
|
assert.ok(list[2].path.includes("2026-05-03"));
|
||||||
|
rmSync(root, { recursive: true, force: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
test("upgrade error after snapshot carries snapshotPath + hint", async () => {
|
||||||
|
// Use mockExec=true so no real commands are run.
|
||||||
|
// Verify the success path returns a snapshotPath (Fix B regression guard).
|
||||||
|
const result = await runUpgrade({
|
||||||
|
yes: true,
|
||||||
|
dryRun: false,
|
||||||
|
mockExec: true,
|
||||||
|
mockDoctor: { ready_to_upgrade: true, next_action: { kind: "upgrade" },
|
||||||
|
current_version: "v3.10.0", latest_version: "v3.14.0" }
|
||||||
|
});
|
||||||
|
assert.ok(result.snapshotPath, "successful upgrade returns snapshotPath");
|
||||||
|
assert.equal(result.path, "upgrade");
|
||||||
|
assert.equal(result.executed, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("upgrade fresh_install requires --yes for non-interactive", async () => {
|
||||||
|
await assert.rejects(async () => {
|
||||||
|
await runUpgrade({
|
||||||
|
yes: false,
|
||||||
|
mockExec: true,
|
||||||
|
mockDoctor: { ready_to_upgrade: false, from_version_supported: false,
|
||||||
|
next_action: { kind: "fresh_install", ai_executable: ["echo would-rm-rf"] },
|
||||||
|
current_version: "v3.2.0", latest_version: "v3.14.0" }
|
||||||
|
});
|
||||||
|
}, /requires --yes/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("upgrade fresh_install with --yes runs ai_executable", async () => {
|
||||||
|
const result = await runUpgrade({
|
||||||
|
yes: true,
|
||||||
|
mockExec: true,
|
||||||
|
mockDoctor: { ready_to_upgrade: false, from_version_supported: false,
|
||||||
|
next_action: { kind: "fresh_install",
|
||||||
|
ai_executable: ["echo step-1", "echo step-2", "echo step-3"] },
|
||||||
|
current_version: "v3.2.0", latest_version: "v3.14.0" }
|
||||||
|
});
|
||||||
|
assert.equal(result.path, "fresh_install");
|
||||||
|
assert.equal(result.steps.length, 3);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("rollback --list returns snapshots", async () => {
|
||||||
|
const result = await runUpgrade({
|
||||||
|
rollback: true,
|
||||||
|
list: true,
|
||||||
|
mockSnapshots: [
|
||||||
|
{ name: "upgrade-snapshot-2026-05-01T10:00:00Z", path: "/tmp/snap-1" },
|
||||||
|
{ name: "upgrade-snapshot-2026-05-02T10:00:00Z", path: "/tmp/snap-2" }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
assert.equal(result.path, "rollback-list");
|
||||||
|
assert.equal(result.snapshots.length, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("rollback with no snapshots fails clearly", async () => {
|
||||||
|
await assert.rejects(async () => {
|
||||||
|
await runUpgrade({ rollback: true, dryRun: true, mockSnapshots: [] });
|
||||||
|
}, /no upgrade snapshots/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("rollback --dry-run produces a plan without mutation", async () => {
|
||||||
|
const result = await runUpgrade({
|
||||||
|
rollback: true,
|
||||||
|
dryRun: true,
|
||||||
|
mockSnapshots: [{ name: "upgrade-snapshot-2026-05-11T08:30:00Z", path: "/tmp/snap-x" }],
|
||||||
|
mockSnapshotMeta: { fromCommit: "abc1234", fromVersion: "v3.10.0", toVersion: "v3.14.0", path: "/tmp/snap-x" }
|
||||||
|
});
|
||||||
|
assert.equal(result.path, "rollback-dry-run");
|
||||||
|
assert.equal(result.executed, false);
|
||||||
|
assert.ok(result.plan.length > 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("rollback latest snapshot restores files (mockExec)", async () => {
|
||||||
|
const result = await runUpgrade({
|
||||||
|
rollback: true,
|
||||||
|
yes: true,
|
||||||
|
mockExec: true,
|
||||||
|
mockSnapshots: [{ name: "upgrade-snapshot-2026-05-11T08:30:00Z", path: "/tmp/snap-x" }],
|
||||||
|
mockSnapshotMeta: { fromCommit: "abc1234", fromVersion: "v3.10.0", toVersion: "v3.14.0", path: "/tmp/snap-x" }
|
||||||
|
});
|
||||||
|
assert.equal(result.path, "rollback");
|
||||||
|
assert.equal(result.executed, true);
|
||||||
|
assert.ok(result.phases.some(p => p.name === "git-checkout"));
|
||||||
|
});
|
||||||
|
|
||||||
// ── Cleanup ──
|
// ── Cleanup ──
|
||||||
closeDb();
|
closeDb();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user