* feat(web,core): edit STDIO cwd/env in Server Settings (#1515) Persist and edit a STDIO server's working directory and environment variables through the Server Settings modal. - Add `env` (pair-array, mirrors headers) and `cwd?` to `InspectorServerSettings`. - `storedFieldsToInspectorSettings` lifts the stdio config's `env`/`cwd` into settings so the modal can show them; they stay on `config` for the transport. Add `envRecordToPairs` / `envPairsToRecord` helpers. - `env`/`cwd` remain config-owned on disk (the standard mcp.json location): the `/api/servers` PUT route writes an edited settings.env/cwd back onto the stored stdio config on a settings-only patch (supporting clear), and a config-providing PUT keeps config authoritative. `validateSettings` accepts `env`/`cwd`. - Server Settings modal: Working Directory field in Options and a dedicated collapsible Environment Variables section — both STDIO-only. - Registry server.json import sets no `cwd` (the schema has no working-directory concept); documented in serverJson.ts. Tests: serverList converter round-trip, route write-through (set/clear, config-precedence, non-stdio no-leak, validation), import preservation (client-config cwd, registry cwd skip), and form/modal component coverage. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(web): preserve config env/cwd when a settings PUT omits them (#1515 review) Address Claude's review of #1518. - `/api/servers` PUT now distinguishes an *absent* `env`/`cwd` (preserve the stored value) from an explicit empty list / blank string (clear). Previously `validateSettings` coerced a missing `env` to `[]`, so an env-unaware caller patching only a timeout would silently wipe the server's env/cwd. The integrated web client always resends the full GET-rehydrated env, so it was unaffected — this protects the raw HTTP contract. - `validateSettings` reports `envProvided`/`cwdProvided`; the write-through only touches `config.env`/`cwd` for fields the caller actually sent. - On the omit path, rehydrate the untouched env's keychain values onto the rebuilt entry so the secret reconcile re-persists them rather than sweeping the blanked-on-disk keys out of the keychain. - Minor: guard the stdio cast in `mcpConfigToServerEntries` on the transport type instead of casting unconditionally. - Test: settings-only PUT omitting env/cwd preserves config keys + cwd + the keychain secret. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
c60a128df3
commit
5ee347571f
2 changed files with 1116 additions and 18 deletions
|
|
@ -22,13 +22,14 @@ describe("parseMcpServersConfig", () => {
|
|||
expect(config.mcpServers.sse.type).toBe("sse");
|
||||
});
|
||||
|
||||
it("preserves extension fields (env, headers) on entries", () => {
|
||||
it("preserves extension fields (env, cwd, headers) on entries", () => {
|
||||
const raw = JSON.stringify({
|
||||
mcpServers: {
|
||||
s: {
|
||||
command: "node",
|
||||
args: ["server.js"],
|
||||
env: { API_KEY: "abc" },
|
||||
cwd: "/srv/app",
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
@ -37,6 +38,7 @@ describe("parseMcpServersConfig", () => {
|
|||
expect(entry.type).toBe("stdio");
|
||||
if (entry.type === "stdio") {
|
||||
expect(entry.env).toEqual({ API_KEY: "abc" });
|
||||
expect(entry.cwd).toBe("/srv/app");
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -64,6 +64,9 @@ describe("parseServerJson — packages", () => {
|
|||
// surfaced for the user to fill.
|
||||
if (opt.baseConfig.type === "stdio") {
|
||||
expect(opt.baseConfig.env).toEqual({ LOG_LEVEL: "info" });
|
||||
// The registry server.json schema carries no working-directory concept,
|
||||
// so a parsed package never sets cwd (documented in serverJson.ts).
|
||||
expect(opt.baseConfig.cwd).toBeUndefined();
|
||||
}
|
||||
expect(opt.envVars).toEqual([
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue