mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-03 05:59:43 +02:00
Custom Model Endpoint Profiles (#393) let a session point its CLI at a custom OpenAI-compatible endpoint by injecting env vars or a config file and restarting the CLI in place. Review of the apply path found four things, two of them destructive. This lands all four plus the smaller items from the same review. 1. Clearing a selection did not clear it. The injected vars reach the CLI via `tmux setenv`, which persists at the tmux-session level and is inherited by `respawn-pane` (measured: `setenv FOO bar` survived two successive `respawn-pane -k`), so deleting the keys from the session's envOverrides relaunched the CLI still pointed at the old endpoint, and for the configDir kinds at a HOME/CODEX_HOME/GROK_HOME that had just been deleted. `Session.setCustomModel()` now reports the removed keys, queues them (`_pendingEnvUnsets`), and `RespawnPaneOptions.unsetEnvKeys` carries them into `applyEnvOverrides()`, which `setenv -u`s them before re-applying the live overrides, on the same path that already unsets the legacy CLAUDE_CODE_EFFORT_LEVEL. Verified on a private tmux socket that `setenv -u HOME` hands the next respawn the global HOME back. 2. Applying a model to a local claude session killed the pane. The relaunch was `claude --session-id <id>` and Claude refuses an id that already has a transcript, and unlike the dead-pane respawn this one kills a working pane first. `restartCli()` now pins the live conversation id as the resume id for that respawn when the CLI's launch declares a `fallback` chain, which renders the same `--resume <id> || --session-id <id>` shape the docker and remote pane commands use. Gated on the registry shape, not the CLI id: an entry whose resume id is minted by the CLI itself never declares that chain. 3. pi, omp and grok wrote their config file and then launched without the `--model` that selects it, so the file was ignored. The registry entry now declares `customModelInjection.launchModel` (`custom/{modelId}` for pi and omp, grok's `[model.codeman-custom]` block name), the builder renders it, and `_withCustomModelLaunchModel()` applies it onto the respawn options through `legacyConfigField`, leaving the stored <Mode>Config untouched so a clear falls back to the user's own model. A model id the CLI's `model` token pattern cannot carry is refused with a 400 rather than silently dropped by the argv engine. 4. Remote (SSH) and Docker sessions reported `restarted: true` and changed nothing: their `restartCli()` reattaches the durable tmux rather than relaunching the agent, and the env lands on the local pane. Both are refused with a 400 until those paths are plumbed. Smaller items from the same review: - The selection survives a Codeman restart as the disk-only `__customModel` bookkeeping (endpoint, model, injected key NAMES, config dir, launch model; never the values, which carry the API key). Recovery re-derives the values from the endpoint store through the same apply path the route uses and keeps the bookkeeping even when the endpoint is gone, so a later clear still has keys to unset. - Discovery goes through `webviewFetch()`, so the RESOLVED address is judged by the same egress guard the web-tab proxy uses, and `baseUrl` reuses `webviewUrlSchema` (http(s) only, no embedded credentials, link-local and cloud-metadata addresses refused). undici's `fetch failed` wrapper is unwrapped so the user sees the ECONNREFUSED underneath. - `custom-model-hosts.json` is written 0600 via tmp+rename, the per-session config dir 0700/0600 (pi and omp embed the key literally), and that dir is removed with the session. - `PR.md` is gone from the repo root and the design doc moved to `docs/custom-model-endpoints-plan.md` with the LAN address and the personal name scrubbed; every reference follows. The guide's `authStyle` text matches the shipped schema (`bearer | api-key`, default `bearer`) and says that `customModelEndpointsEnabled` is read by nothing until the picker lands. - `config/tsconfig.scripts.json` typechecks `scripts/test-local-llm-harnesses.ts` (four real type errors fixed). It is not yet wired into `npm run typecheck` because that line differs on master; adding `&& tsc -p config/tsconfig.scripts.json` there is the one-line follow-up. Tests: `test/session-custom-model-restart.test.ts` drives a real Session and fails on the unfixed code for items 1 to 3; the route suite covers item 4 and the pattern refusal; `test/tmux-manager.test.ts` pins that the unsets run before the overrides and that a shell-metachar key never reaches tmux. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
66 lines
2.8 KiB
TypeScript
66 lines
2.8 KiB
TypeScript
/**
|
||
* @fileoverview Read/write-array store for user-configured custom OpenAI-compatible
|
||
* model endpoints (local or cloud — docs/custom-model-endpoints-plan.md). Same
|
||
* shape as `remote-hosts.ts` / `webview-store.ts`: `~/.codeman/custom-model-hosts.json`
|
||
* holding a plain array, read/written whole. The file can hold API keys, so it is
|
||
* written 0600 via tmp+rename like `intents.json` (`mode` on `writeFile` applies only
|
||
* to a file being created; the rename is what keeps an existing file's bytes and
|
||
* mode from ever being observable half-written or world-readable).
|
||
*/
|
||
|
||
import { existsSync, mkdirSync } from 'node:fs';
|
||
import fs from 'node:fs/promises';
|
||
import { join } from 'node:path';
|
||
|
||
const CUSTOM_MODEL_HOSTS_FILE = 'custom-model-hosts.json';
|
||
|
||
export type CustomModelAuthStyle = 'bearer' | 'api-key';
|
||
|
||
export interface CustomModelHost {
|
||
id: string;
|
||
label: string;
|
||
/** Root URL, local or cloud — e.g. "http://192.168.1.50:8080" or an Azure AI Foundry URL. */
|
||
baseUrl: string;
|
||
apiKey?: string;
|
||
/**
|
||
* Defaults to 'bearer' (the common `Authorization: Bearer` convention — matches
|
||
* llama.cpp, OpenAI-compatible servers, and most gateways). Pick 'api-key' for
|
||
* endpoints that specifically want the `api-key` header, e.g. Azure AI Foundry.
|
||
*
|
||
* ⚠️ There is deliberately NO 'both' option. An earlier design sent BOTH headers
|
||
* on every discovery request on the theory that an unused header is harmless —
|
||
* live-tested against a real llama-swap server, sending both reliably HUNG the
|
||
* request indefinitely (reproduced 3× — Bearer alone: ~500ms, api-key alone:
|
||
* ~600ms, both together: no response inside a 15s timeout). Whatever auth
|
||
* middleware some servers run apparently does not handle two simultaneous
|
||
* credential conventions gracefully, so "send everything and let the server
|
||
* ignore what it doesn't need" is not a safe default — it can silently turn a
|
||
* working endpoint into one that always times out.
|
||
*/
|
||
authStyle?: CustomModelAuthStyle;
|
||
models?: string[];
|
||
lastDiscoveredAt?: string;
|
||
}
|
||
|
||
export function customModelHostsPath(configDir: string): string {
|
||
return join(configDir, CUSTOM_MODEL_HOSTS_FILE);
|
||
}
|
||
|
||
export async function readCustomModelHosts(configDir: string): Promise<CustomModelHost[]> {
|
||
try {
|
||
const raw = await fs.readFile(customModelHostsPath(configDir), 'utf-8');
|
||
const parsed = JSON.parse(raw);
|
||
return Array.isArray(parsed) ? (parsed as CustomModelHost[]) : [];
|
||
} catch {
|
||
return [];
|
||
}
|
||
}
|
||
|
||
export async function writeCustomModelHosts(configDir: string, hosts: CustomModelHost[]): Promise<void> {
|
||
if (!existsSync(configDir)) mkdirSync(configDir, { recursive: true });
|
||
const target = customModelHostsPath(configDir);
|
||
const tmp = `${target}.${process.pid}.tmp`;
|
||
await fs.writeFile(tmp, JSON.stringify(hosts, null, 2), { mode: 0o600 });
|
||
await fs.rename(tmp, target);
|
||
}
|