mervexai 0.0.97 → 0.0.99

package/test/config/config.test.ts

@@ -1,2047 +0,0 @@
-import { test, expect, describe, afterEach, beforeEach, spyOn } from "bun:test"
-import { ConfigV1 } from "@msrfteam/core/v1/config/config"
-import { LayerNode } from "@msrfteam/core/effect/layer-node"
-import { httpClient } from "@msrfteam/core/effect/app-node-platform"
-import { Cause, Effect, Exit, Layer, Option } from "effect"
-import { NamedError } from "@msrfteam/core/util/error"
-import { FetchHttpClient, HttpClient, HttpClientResponse } from "effect/unstable/http"
-import { Config } from "@/config/config"
-import { ConfigManaged } from "@/config/managed"
-import { ConfigParse } from "../../src/config/parse"
-import { Npm } from "@msrfteam/core/npm"
-
-import { InstanceRef } from "../../src/effect/instance-ref"
-import type { InstanceContext } from "../../src/project/instance-context"
-import { Auth } from "../../src/auth"
-import { Account } from "../../src/account/account"
-import { AccessToken, AccountID, OrgID } from "../../src/account/schema"
-import { FSUtil } from "@msrfteam/core/fs-util"
-import { Env } from "../../src/env"
-import {
-  provideTmpdirInstance,
-  TestInstance,
-  tmpdir,
-  tmpdirScoped,
-  withTestInstance,
-  provideInstanceEffect,
-  testInstanceStoreLayer,
-} from "../fixture/fixture"
-import { InstanceRuntime } from "@/project/instance-runtime"
-import { CrossSpawnSpawner } from "@msrfteam/core/cross-spawn-spawner"
-import { testEffect } from "../lib/effect"
-import path from "path"
-import fs from "fs/promises"
-import os from "os"
-import { pathToFileURL } from "url"
-import { Global } from "@msrfteam/core/global"
-import { ProjectV2 } from "@msrfteam/core/project"
-import { Filesystem } from "@/util/filesystem"
-import { ConfigPlugin } from "@/config/plugin"
-import { ConfigPluginV1 } from "@msrfteam/core/v1/config/plugin"
-import { AccountTest } from "../fake/account"
-import { AuthTest } from "../fake/auth"
-import { NpmTest } from "../fake/npm"
-
-const unexpectedHttp = HttpClient.make((request) =>
-  Effect.die(`unexpected http request: ${request.method} ${request.url}`),
-)
-
-const json = (request: Parameters<typeof HttpClientResponse.fromWeb>[0], body: unknown, status = 200) =>
-  HttpClientResponse.fromWeb(
-    request,
-    new Response(JSON.stringify(body), {
-      status,
-      headers: { "content-type": "application/json" },
-    }),
-  )
-
-const wellKnownAuth = (url: string) =>
-  Layer.mock(Auth.Service)({
-    all: () =>
-      Effect.succeed({
-        [url]: new Auth.WellKnown({ type: "wellknown", key: "TEST_TOKEN", token: "test-token" }),
-      }),
-  })
-
-function remoteConfigClient(input: {
-  wellKnown: unknown
-  remote?: unknown
-  remoteHtml?: string
-  seen: { wellKnown?: string; remote?: string; authorization?: string }
-}) {
-  return HttpClient.make((request) => {
-    if (request.url.includes(".well-known/mervex")) {
-      input.seen.wellKnown = request.url
-      return Effect.succeed(json(request, input.wellKnown))
-    }
-    if (request.url.includes("config.example.com") && (input.remote !== undefined || input.remoteHtml !== undefined)) {
-      input.seen.remote = request.url
-      input.seen.authorization = request.headers.authorization
-      if (input.remoteHtml !== undefined) {
-        return Effect.succeed(
-          HttpClientResponse.fromWeb(
-            request,
-            new Response(input.remoteHtml, { status: 200, headers: { "content-type": "text/html; charset=utf-8" } }),
-          ),
-        )
-      }
-      return Effect.succeed(json(request, input.remote))
-    }
-    return Effect.succeed(json(request, {}, 404))
-  })
-}
-
-const configLayer = (
-  options: {
-    auth?: Layer.Layer<Auth.Service>
-    account?: Layer.Layer<Account.Service>
-    client?: HttpClient.HttpClient
-  } = {},
-) =>
-  LayerNode.compile(LayerNode.group([Config.node, FSUtil.node, Env.node, CrossSpawnSpawner.node]), [
-    [Auth.node, options.auth ?? AuthTest.empty],
-    [Account.node, options.account ?? AccountTest.empty],
-    [Npm.node, NpmTest.noop],
-    [httpClient, Layer.succeed(HttpClient.HttpClient, options.client ?? unexpectedHttp)],
-  ])
-
-const layer = configLayer()
-
-const it = testEffect(layer)
-const configIt = (options?: Parameters<typeof configLayer>[0]) => testEffect(configLayer(options))
-
-const schemaConfig = (config: object) => ({ $schema: "https://mervex.ai/config.json", ...config })
-
-const provideCurrentInstance = <A, E, R>(effect: Effect.Effect<A, E, R>, ctx: InstanceContext) =>
-  effect.pipe(Effect.provideService(InstanceRef, ctx))
-
-const load = (ctx: InstanceContext) =>
-  Effect.runPromise(
-    Config.Service.use((svc) => provideCurrentInstance(svc.get(), ctx)).pipe(Effect.scoped, Effect.provide(layer)),
-  )
-const clearEffect = (wait = false) =>
-  Config.use
-    .invalidate()
-    .pipe(
-      Effect.scoped,
-      Effect.provide(layer),
-      Effect.andThen(wait ? Effect.promise(() => InstanceRuntime.disposeAllInstances()) : Effect.void),
-    )
-const clear = (wait = false) => Effect.runPromise(clearEffect(wait))
-// Get managed config directory from environment (set in preload.ts)
-const managedConfigDir = process.env.MERVEX_TEST_MANAGED_CONFIG_DIR!
-const originalTestToken = process.env.TEST_TOKEN
-const originalConsoleToken = process.env.MERVEX_CONSOLE_TOKEN
-
-beforeEach(async () => {
-  await clear(true)
-})
-
-afterEach(async () => {
-  await fs.rm(managedConfigDir, { force: true, recursive: true }).catch(() => {})
-  if (originalTestToken === undefined) delete process.env.TEST_TOKEN
-  else process.env.TEST_TOKEN = originalTestToken
-  if (originalConsoleToken === undefined) delete process.env.MERVEX_CONSOLE_TOKEN
-  else process.env.MERVEX_CONSOLE_TOKEN = originalConsoleToken
-  await clear(true)
-})
-
-const writeManagedSettingsEffect = (settings: object, filename?: string) =>
-  FSUtil.use.writeWithDirs(path.join(managedConfigDir, filename ?? "mervex.json"), JSON.stringify(settings))
-
-async function writeConfig(dir: string, config: object, name = "mervex.json") {
-  await Filesystem.write(path.join(dir, name), JSON.stringify(config))
-}
-
-const writeConfigEffect = (dir: string, config: object, name = "mervex.json") =>
-  FSUtil.use.writeWithDirs(path.join(dir, name), JSON.stringify(config))
-
-const withInstanceDir = <A, E, R>(dir: string, effect: Effect.Effect<A, E, R>) =>
-  effect.pipe(
-    Effect.provideService(TestInstance, { directory: dir }),
-    provideInstanceEffect(dir),
-    Effect.provide(testInstanceStoreLayer),
-    Effect.provide(LayerNode.compile(CrossSpawnSpawner.node)),
-  )
-
-const withGlobalConfigDir = <A, E, R>(dir: string, effect: Effect.Effect<A, E, R>) =>
-  Effect.acquireUseRelease(
-    Effect.gen(function* () {
-      const previous = Global.Path.config
-      ;(Global.Path as { config: string }).config = dir
-      yield* clearEffect(true)
-      return previous
-    }),
-    () => effect,
-    (previous) =>
-      Effect.gen(function* () {
-        ;(Global.Path as { config: string }).config = previous
-        yield* clearEffect(true)
-      }),
-  )
-
-const withGlobalConfig = <A, E, R>(
-  input: { config?: object; name?: string },
-  fn: (input: { dir: string }) => Effect.Effect<A, E, R>,
-) =>
-  Effect.gen(function* () {
-    const dir = yield* tmpdirScoped()
-    if (input.config) yield* writeConfigEffect(dir, schemaConfig(input.config), input.name)
-    return yield* withGlobalConfigDir(dir, fn({ dir }))
-  })
-
-const withConfigTree = <A, E, R>(
-  input: { global?: object; project?: object; local?: object },
-  effect: Effect.Effect<A, E, R>,
-) =>
-  Effect.gen(function* () {
-    const root = yield* tmpdirScoped()
-    const global = yield* tmpdirScoped()
-    const directory = path.join(root, "project")
-    yield* Effect.all(
-      [
-        input.global ? writeConfigEffect(global, schemaConfig(input.global)) : undefined,
-        input.project ? writeConfigEffect(directory, schemaConfig(input.project)) : undefined,
-        input.local ? writeConfigEffect(path.join(directory, ".mervex"), schemaConfig(input.local)) : undefined,
-      ].filter((effect): effect is Effect.Effect<void, FSUtil.Error, FSUtil.Service> => effect !== undefined),
-      { concurrency: "unbounded" },
-    )
-    return yield* withGlobalConfigDir(global, withInstanceDir(directory, effect))
-  })
-
-const wellKnown = (input: {
-  authUrl?: string
-  config?: unknown
-  remoteConfig?: { url: string; headers?: Record<string, string> }
-  remote?: unknown
-  remoteHtml?: string
-  wellKnown?: unknown
-}) => {
-  const seen: { wellKnown?: string; remote?: string; authorization?: string } = {}
-  const client = remoteConfigClient({
-    seen,
-    wellKnown: input.wellKnown ?? {
-      ...(input.config !== undefined ? { config: input.config } : {}),
-      ...(input.remoteConfig !== undefined ? { remote_config: input.remoteConfig } : {}),
-    },
-    remote: input.remote,
-    remoteHtml: input.remoteHtml,
-  })
-  return {
-    seen,
-    it: configIt({ auth: wellKnownAuth(input.authUrl ?? "https://example.com"), client }),
-  }
-}
-
-function withProcessEnv<A, E, R>(key: string, value: string | undefined, effect: Effect.Effect<A, E, R>) {
-  return withProcessEnvs({ [key]: value }, effect)
-}
-
-function withProcessEnvs<A, E, R>(entries: Record<string, string | undefined>, effect: Effect.Effect<A, E, R>) {
-  return Effect.acquireUseRelease(
-    Effect.sync(() => {
-      const originals: Record<string, string | undefined> = {}
-      for (const [key, value] of Object.entries(entries)) {
-        originals[key] = process.env[key]
-        if (value === undefined) delete process.env[key]
-        else process.env[key] = value
-      }
-      return originals
-    }),
-    () => effect,
-    (originals) =>
-      Effect.sync(() => {
-        for (const [key, original] of Object.entries(originals)) {
-          if (original !== undefined) process.env[key] = original
-          else delete process.env[key]
-        }
-      }),
-  )
-}
-
-async function check(map: (dir: string) => string) {
-  if (process.platform !== "win32") return
-  await using globalTmp = await tmpdir()
-  await using tmp = await tmpdir({ git: true, config: { snapshot: true } })
-  const prev = Global.Path.config
-  ;(Global.Path as { config: string }).config = globalTmp.path
-  await clear()
-  try {
-    await writeConfig(globalTmp.path, {
-      $schema: "https://mervex.ai/config.json",
-      snapshot: false,
-    })
-    await withTestInstance({
-      directory: map(tmp.path),
-      fn: async (ctx) => {
-        const cfg = await load(ctx)
-        expect(cfg.snapshot).toBe(true)
-        expect(ctx.directory).toBe(Filesystem.resolve(tmp.path))
-        expect(ctx.project.id).not.toBe(ProjectV2.ID.global)
-      },
-    })
-  } finally {
-    await InstanceRuntime.disposeAllInstances()
-    ;(Global.Path as { config: string }).config = prev
-    await clear()
-  }
-}
-
-it.instance("loads config with defaults when no files exist", () =>
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(config.username).toBeDefined()
-  }),
-)
-
-it.instance("falls back to generic username when system user info is unavailable", () =>
-  Effect.gen(function* () {
-    const userInfo = spyOn(os, "userInfo").mockImplementation(() => {
-      throw Object.assign(new Error("missing passwd entry"), { code: "ENOENT" })
-    })
-    try {
-      const config = yield* Config.use.get()
-      expect(config.username).toBe("user")
-    } finally {
-      userInfo.mockRestore()
-    }
-  }),
-)
-
-it.effect("creates global jsonc config with schema when no global configs exist", () =>
-  withGlobalConfig({}, ({ dir }) =>
-    Effect.gen(function* () {
-      yield* Config.use.get().pipe(provideInstanceEffect(dir))
-
-      const content = yield* FSUtil.use.readFileString(path.join(dir, "mervex.jsonc"))
-      expect(content).toContain('"$schema": "https://mervex.ai/config.json"')
-    }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
-  ),
-)
-
-it.effect("does not create global config when MERVEX_CONFIG_DIR is set", () =>
-  Effect.gen(function* () {
-    const custom = yield* tmpdirScoped()
-    yield* withGlobalConfig({}, ({ dir }) =>
-      withProcessEnv(
-        "MERVEX_CONFIG_DIR",
-        custom,
-        Effect.gen(function* () {
-          yield* Config.use.get().pipe(provideInstanceEffect(dir))
-
-          expect(yield* FSUtil.use.existsSafe(path.join(dir, "mervex.jsonc"))).toBe(false)
-        }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
-      ),
-    )
-  }),
-)
-
-it.instance(
-  "loads JSON config file",
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(config.model).toBe("test/model")
-    expect(config.username).toBe("testuser")
-  }),
-  { config: { model: "test/model", username: "testuser" } },
-)
-
-it.instance(
-  "loads shell config field",
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(config.shell).toBe("bash")
-  }),
-  { config: { shell: "bash" } },
-)
-
-it.instance("updates config and preserves empty shell sentinel", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(
-      test.directory,
-      { $schema: "https://mervex.ai/config.json", shell: "bash" },
-      "config.json",
-    )
-
-    yield* Config.Service.use((svc) => svc.update(ConfigParse.schema(ConfigV1.Info, { shell: "" }, "test:config")))
-
-    const writtenConfig = yield* FSUtil.use.readJson(path.join(test.directory, "config.json"))
-    expect(writtenConfig).toMatchObject({ shell: "" })
-  }),
-)
-
-it.effect("updates global config and omits empty shell key in json", () =>
-  withGlobalConfig({ config: { shell: "bash" } }, ({ dir }) =>
-    Effect.gen(function* () {
-      yield* Config.use.updateGlobal({ shell: "" })
-
-      const writtenConfig = yield* FSUtil.use.readJson(path.join(dir, "mervex.json"))
-      expect(writtenConfig).not.toHaveProperty("shell")
-    }),
-  ),
-)
-
-it.effect("updates global config and omits empty shell key in jsonc", () =>
-  withGlobalConfig({ config: { shell: "bash", model: "test/model" }, name: "mervex.jsonc" }, ({ dir }) =>
-    Effect.gen(function* () {
-      yield* Config.use.updateGlobal({ shell: "" })
-
-      const file = path.join(dir, "mervex.jsonc")
-      const writtenConfig = yield* FSUtil.use.readFileString(file)
-      const parsed = ConfigParse.schema(ConfigV1.Info, ConfigParse.jsonc(writtenConfig, file), file)
-      expect(writtenConfig).not.toContain('"shell"')
-      expect(parsed.shell).toBeUndefined()
-      expect(parsed.model).toBe("test/model")
-    }),
-  ),
-)
-
-it.instance(
-  "loads formatter boolean config",
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(config.formatter).toBe(true)
-  }),
-  { config: { formatter: true } },
-)
-
-it.instance(
-  "loads lsp boolean config",
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(config.lsp).toBe(true)
-  }),
-  { config: { lsp: true } },
-)
-
-test("loads project config from Git Bash and MSYS2 paths on Windows", async () => {
-  // Git Bash and MSYS2 both use /<drive>/... paths on Windows.
-  await check((dir) => {
-    const drive = dir[0].toLowerCase()
-    const rest = dir.slice(2).replaceAll("\\", "/")
-    return `/${drive}${rest}`
-  })
-})
-
-test("loads project config from Cygwin paths on Windows", async () => {
-  await check((dir) => {
-    const drive = dir[0].toLowerCase()
-    const rest = dir.slice(2).replaceAll("\\", "/")
-    return `/cygdrive/${drive}${rest}`
-  })
-})
-
-it.instance("ignores legacy tui keys in mervex config", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      model: "test/model",
-      theme: "legacy",
-      tui: { scroll_speed: 4 },
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.model).toBe("test/model")
-    expect((config as Record<string, unknown>).theme).toBeUndefined()
-    expect((config as Record<string, unknown>).tui).toBeUndefined()
-  }),
-)
-
-it.instance("loads JSONC config file", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, "mervex.jsonc"),
-      `{
-        // This is a comment
-        "$schema": "https://mervex.ai/config.json",
-        "model": "test/model",
-        "username": "testuser"
-      }`,
-    )
-    const config = yield* Config.use.get()
-    expect(config.model).toBe("test/model")
-    expect(config.username).toBe("testuser")
-  }),
-)
-
-it.instance("jsonc overrides json in the same directory", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(
-      test.directory,
-      {
-        $schema: "https://mervex.ai/config.json",
-        model: "base",
-        username: "base",
-      },
-      "mervex.jsonc",
-    )
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      model: "override",
-    })
-    const config = yield* Config.use.get()
-    expect(config.model).toBe("base")
-    expect(config.username).toBe("base")
-  }),
-)
-
-it.instance("handles environment variable substitution", () =>
-  withProcessEnv(
-    "TEST_VAR",
-    "test-user",
-    Effect.gen(function* () {
-      const test = yield* TestInstance
-      yield* writeConfigEffect(test.directory, {
-        $schema: "https://mervex.ai/config.json",
-        username: "{env:TEST_VAR}",
-      })
-      const config = yield* Config.use.get()
-      expect(config.username).toBe("test-user")
-    }),
-  ),
-)
-
-it.instance("preserves env variables when adding $schema to config", () =>
-  withProcessEnv(
-    "PRESERVE_VAR",
-    "secret_value",
-    Effect.gen(function* () {
-      const test = yield* TestInstance
-      // Config without $schema - should trigger auto-add
-      yield* FSUtil.use.writeWithDirs(
-        path.join(test.directory, "mervex.json"),
-        JSON.stringify({ username: "{env:PRESERVE_VAR}" }),
-      )
-      const config = yield* Config.use.get()
-      expect(config.username).toBe("secret_value")
-
-      // Read the file to verify the env variable was preserved
-      const content = yield* FSUtil.use.readFileString(path.join(test.directory, "mervex.json"))
-      expect(content).toContain("{env:PRESERVE_VAR}")
-      expect(content).not.toContain("secret_value")
-      expect(content).toContain("$schema")
-    }),
-  ),
-)
-
-it.instance("handles file inclusion substitution", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(path.join(test.directory, "included.txt"), "test-user")
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      username: "{file:included.txt}",
-    })
-    const config = yield* Config.use.get()
-    expect(config.username).toBe("test-user")
-  }),
-)
-
-it.instance("handles file inclusion with replacement tokens", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(path.join(test.directory, "included.md"), "const out = await Bun.$`echo hi`")
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      username: "{file:included.md}",
-    })
-    const config = yield* Config.use.get()
-    expect(config.username).toBe("const out = await Bun.$`echo hi`")
-  }),
-)
-
-const accountTokenIt = configIt({
-  account: Layer.mock(Account.Service)({
-    active: () =>
-      Effect.succeed(
-        Option.some({
-          id: AccountID.make("account-1"),
-          email: "user@example.com",
-          url: "https://control.example.com",
-          active_org_id: OrgID.make("org-1"),
-        }),
-      ),
-    activeOrg: () =>
-      Effect.succeed(
-        Option.some({
-          account: {
-            id: AccountID.make("account-1"),
-            email: "user@example.com",
-            url: "https://control.example.com",
-            active_org_id: OrgID.make("org-1"),
-          },
-          org: {
-            id: OrgID.make("org-1"),
-            name: "Example Org",
-          },
-        }),
-      ),
-    config: () =>
-      Effect.succeed(
-        Option.some({
-          provider: { mervex: { options: { apiKey: "{env:MERVEX_CONSOLE_TOKEN}" } } },
-        }),
-      ),
-    token: () => Effect.succeed(Option.some(AccessToken.make("st_test_token"))),
-  }),
-})
-
-accountTokenIt.instance("resolves env templates in account config with account token", () =>
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(config.provider?.["mervex"]?.options?.apiKey).toBe("st_test_token")
-  }),
-)
-
-it.instance("validates config schema and throws on invalid values", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      model: 42,
-    })
-    const exit = yield* Config.use.get().pipe(Effect.exit)
-    expect(Exit.isFailure(exit)).toBe(true)
-  }),
-)
-
-it.instance("throws error for invalid JSON", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(path.join(test.directory, "mervex.json"), "{ invalid json }")
-    const exit = yield* Config.use.get().pipe(Effect.exit)
-    expect(Exit.isFailure(exit)).toBe(true)
-  }),
-)
-
-it.instance("handles agent configuration", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: {
-        test_agent: {
-          model: "test/model",
-          temperature: 0.7,
-          description: "test agent",
-        },
-      },
-    })
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test_agent"]).toEqual(
-      expect.objectContaining({
-        model: "test/model",
-        temperature: 0.7,
-        description: "test agent",
-      }),
-    )
-  }),
-)
-
-it.instance("treats agent variant as model-scoped setting (not provider option)", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: {
-        test_agent: {
-          model: "openai/gpt-5.2",
-          variant: "xhigh",
-          max_tokens: 123,
-        },
-      },
-    })
-    const config = yield* Config.use.get()
-    const agent = config.agent?.["test_agent"]
-
-    expect(agent?.variant).toBe("xhigh")
-    expect(agent?.options).toMatchObject({
-      max_tokens: 123,
-    })
-    expect(agent?.options).not.toHaveProperty("variant")
-  }),
-)
-
-it.instance("handles command configuration", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      command: {
-        test_command: {
-          template: "test template",
-          description: "test command",
-          agent: "test_agent",
-        },
-      },
-    })
-    const config = yield* Config.use.get()
-    expect(config.command?.["test_command"]).toEqual({
-      template: "test template",
-      description: "test command",
-      agent: "test_agent",
-    })
-  }),
-)
-
-it.instance("migrates autoshare to share field", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      autoshare: true,
-    })
-    const config = yield* Config.use.get()
-    expect(config.share).toBe("auto")
-    expect(config.autoshare).toBe(true)
-  }),
-)
-
-it.instance("migrates mode field to agent field", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      mode: {
-        test_mode: {
-          model: "test/model",
-          temperature: 0.5,
-        },
-      },
-    })
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test_mode"]).toEqual({
-      model: "test/model",
-      temperature: 0.5,
-      mode: "primary",
-      options: {},
-      permission: {},
-    })
-  }),
-)
-
-it.instance("accepts the deprecated reference field", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      reference: {
-        local: { path: "../library" },
-        sdk: { repository: "github.com/example/sdk", branch: "main" },
-        shorthand: "github.com/example/docs",
-      },
-    })
-    const config = yield* Config.use.get()
-    expect(config.reference).toEqual({
-      local: { path: "../library" },
-      sdk: { repository: "github.com/example/sdk", branch: "main" },
-      shorthand: "github.com/example/docs",
-    })
-  }),
-)
-
-it.instance("loads config from .mervex directory", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "agent", "test.md"),
-      `---
-model: test/model
----
-Test agent prompt`,
-    )
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test"]).toEqual(
-      expect.objectContaining({
-        name: "test",
-        model: "test/model",
-        prompt: "Test agent prompt",
-      }),
-    )
-  }),
-)
-
-it.instance("agent markdown permission config preserves user key order", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "agent", "ordered.md"),
-      `---
-permission:
-  bash: allow
-  "*": deny
-  edit: ask
----
-Ordered permissions`,
-    )
-
-    const config = yield* Config.use.get()
-    expect(Object.keys(config.agent?.ordered?.permission ?? {})).toEqual(["bash", "*", "edit"])
-  }),
-)
-
-it.instance("loads agents from .mervex/agents (plural)", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "agents", "helper.md"),
-      `---
-model: test/model
-mode: subagent
----
-Helper agent prompt`,
-    )
-
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "agents", "nested", "child.md"),
-      `---
-model: test/model
-mode: subagent
----
-Nested agent prompt`,
-    )
-
-    const config = yield* Config.use.get()
-
-    expect(config.agent?.["helper"]).toMatchObject({
-      name: "helper",
-      model: "test/model",
-      mode: "subagent",
-      prompt: "Helper agent prompt",
-    })
-
-    expect(config.agent?.["nested/child"]).toMatchObject({
-      name: "nested/child",
-      model: "test/model",
-      mode: "subagent",
-      prompt: "Nested agent prompt",
-    })
-  }),
-)
-
-it.instance("loads commands from .mervex/command (singular)", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "command", "hello.md"),
-      `---
-description: Test command
----
-Hello from singular command`,
-    )
-
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "command", "nested", "child.md"),
-      `---
-description: Nested command
----
-Nested command template`,
-    )
-
-    const config = yield* Config.use.get()
-
-    expect(config.command?.["hello"]).toEqual({
-      description: "Test command",
-      template: "Hello from singular command",
-    })
-
-    expect(config.command?.["nested/child"]).toEqual({
-      description: "Nested command",
-      template: "Nested command template",
-    })
-  }),
-)
-
-it.instance("loads commands from .mervex/commands (plural)", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "commands", "hello.md"),
-      `---
-description: Test command
----
-Hello from plural commands`,
-    )
-
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "commands", "nested", "child.md"),
-      `---
-description: Nested command
----
-Nested command template`,
-    )
-
-    const config = yield* Config.use.get()
-
-    expect(config.command?.["hello"]).toEqual({
-      description: "Test command",
-      template: "Hello from plural commands",
-    })
-
-    expect(config.command?.["nested/child"]).toEqual({
-      description: "Nested command",
-      template: "Nested command template",
-    })
-  }),
-)
-
-it.instance("updates config and writes to file", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* Config.Service.use((svc) =>
-      svc.update(ConfigParse.schema(ConfigV1.Info, { model: "updated/model" }, "test:config")),
-    )
-
-    const writtenConfig = yield* FSUtil.use.readJson(path.join(test.directory, "config.json"))
-    expect(writtenConfig).toMatchObject({ model: "updated/model" })
-  }),
-)
-
-it.instance("gets config directories", () =>
-  Effect.gen(function* () {
-    const dirs = yield* Config.use.directories()
-    expect(dirs.length).toBeGreaterThanOrEqual(1)
-  }),
-)
-
-it.effect("does not try to install dependencies in read-only MERVEX_CONFIG_DIR", () =>
-  Effect.gen(function* () {
-    if (process.platform === "win32") return
-
-    const dir = yield* tmpdirScoped()
-    const readonly = path.join(dir, "readonly")
-    yield* FSUtil.use.ensureDir(readonly)
-    yield* FSUtil.use.chmod(readonly, 0o555)
-    yield* Effect.addFinalizer(() => FSUtil.use.chmod(readonly, 0o755).pipe(Effect.ignore))
-
-    yield* withProcessEnv("MERVEX_CONFIG_DIR", readonly, Config.use.get().pipe(provideInstanceEffect(dir)))
-  }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
-)
-
-it.effect("ignores an inaccessible MERVEX_CONFIG_DIR", () =>
-  Effect.gen(function* () {
-    if (process.platform === "win32") return
-
-    const dir = yield* tmpdirScoped()
-    const configDir = path.join(dir, "inaccessible")
-    yield* FSUtil.use.ensureDir(configDir)
-    yield* FSUtil.use.chmod(configDir, 0o000)
-    yield* Effect.addFinalizer(() => FSUtil.use.chmod(configDir, 0o755).pipe(Effect.ignore))
-
-    yield* withProcessEnv("MERVEX_CONFIG_DIR", configDir, Config.use.get().pipe(provideInstanceEffect(dir)))
-  }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
-)
-
-it.effect("creates a missing MERVEX_CONFIG_DIR", () =>
-  Effect.gen(function* () {
-    const dir = yield* tmpdirScoped()
-    const configDir = path.join(dir, "configdir")
-
-    yield* withProcessEnv("MERVEX_CONFIG_DIR", configDir, Config.use.get().pipe(provideInstanceEffect(dir)))
-
-    expect(yield* FSUtil.use.readFileString(path.join(configDir, ".gitignore"))).toContain("node_modules")
-  }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
-)
-
-it.effect("installs dependencies in writable MERVEX_CONFIG_DIR", () =>
-  Effect.gen(function* () {
-    const dir = yield* tmpdirScoped()
-    const configDir = path.join(dir, "configdir")
-    yield* FSUtil.use.ensureDir(configDir)
-
-    yield* withProcessEnv(
-      "MERVEX_CONFIG_DIR",
-      configDir,
-      Config.Service.use((svc) => svc.get().pipe(Effect.andThen(svc.waitForDependencies()))).pipe(
-        provideInstanceEffect(dir),
-      ),
-    )
-
-    expect(yield* FSUtil.use.readFileString(path.join(configDir, ".gitignore"))).toContain("package-lock.json")
-  }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
-)
-
-// Note: deduplication and serialization of npm installs is now handled by the
-// core Npm.Service (via EffectFlock). Those behaviors are tested in the core
-// package's npm tests, not here.
-
-it.instance("resolves scoped npm plugins in config", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    const pluginDir = path.join(test.directory, "node_modules", "@scope", "plugin")
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, "package.json"),
-      JSON.stringify({ name: "config-fixture", version: "1.0.0", type: "module" }, null, 2),
-    )
-    yield* FSUtil.use.writeWithDirs(
-      path.join(pluginDir, "package.json"),
-      JSON.stringify(
-        {
-          name: "@scope/plugin",
-          version: "1.0.0",
-          type: "module",
-          main: "./index.js",
-        },
-        null,
-        2,
-      ),
-    )
-    yield* FSUtil.use.writeWithDirs(path.join(pluginDir, "index.js"), "export default {}\n")
-    yield* writeConfigEffect(test.directory, { plugin: ["@scope/plugin"] })
-
-    const config = yield* Config.use.get()
-    expect(config.plugin ?? []).toContain("@scope/plugin")
-  }),
-)
-
-it.effect("merges plugin arrays from global and local configs", () =>
-  withConfigTree(
-    {
-      global: { plugin: ["global-plugin-1", "global-plugin-2"] },
-      local: { plugin: ["local-plugin-1"] },
-    },
-    Effect.gen(function* () {
-      const plugins = (yield* Config.use.get()).plugin ?? []
-
-      expect(plugins.some((p) => p.includes("global-plugin-1"))).toBe(true)
-      expect(plugins.some((p) => p.includes("global-plugin-2"))).toBe(true)
-      expect(plugins.some((p) => p.includes("local-plugin-1"))).toBe(true)
-      expect(
-        plugins.filter((p) => p.includes("global-plugin") || p.includes("local-plugin")).length,
-      ).toBeGreaterThanOrEqual(3)
-    }),
-  ),
-)
-
-it.effect("global config remains global when project config is disabled", () =>
-  withConfigTree(
-    {
-      global: { model: "global/model", plugin: ["global-plugin"] },
-      project: { model: "project/model" },
-      local: { model: "local/model" },
-    },
-    withProcessEnv(
-      "MERVEX_DISABLE_PROJECT_CONFIG",
-      "true",
-      Effect.gen(function* () {
-        const config = yield* Config.use.get()
-        expect(config.model).toBe("global/model")
-        expect(config.plugin_origins?.find((item) => item.spec === "global-plugin")?.scope).toBe("global")
-      }),
-    ),
-  ),
-)
-
-it.instance("does not error when only custom agent is a subagent", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* FSUtil.use.writeWithDirs(
-      path.join(test.directory, ".mervex", "agent", "helper.md"),
-      `---
-model: test/model
-mode: subagent
----
-Helper subagent prompt`,
-    )
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["helper"]).toMatchObject({
-      name: "helper",
-      model: "test/model",
-      mode: "subagent",
-      prompt: "Helper subagent prompt",
-    })
-  }),
-)
-
-it.effect("merges instructions arrays from global and local configs", () =>
-  withConfigTree(
-    {
-      global: { instructions: ["global-instructions.md", "shared-rules.md"] },
-      local: { instructions: ["local-instructions.md"] },
-    },
-    Effect.gen(function* () {
-      expect((yield* Config.use.get()).instructions).toEqual([
-        "global-instructions.md",
-        "shared-rules.md",
-        "local-instructions.md",
-      ])
-    }),
-  ),
-)
-
-it.effect("deduplicates duplicate instructions from global and local configs", () =>
-  withConfigTree(
-    {
-      global: { instructions: ["duplicate.md", "global-only.md"] },
-      local: { instructions: ["duplicate.md", "local-only.md"] },
-    },
-    Effect.gen(function* () {
-      expect((yield* Config.use.get()).instructions).toEqual(["duplicate.md", "global-only.md", "local-only.md"])
-    }),
-  ),
-)
-
-it.effect("deduplicates duplicate plugins from global and local configs", () =>
-  withConfigTree(
-    {
-      global: { plugin: ["duplicate-plugin", "global-plugin-1"] },
-      local: { plugin: ["duplicate-plugin", "local-plugin-1"] },
-    },
-    Effect.gen(function* () {
-      const plugins = (yield* Config.use.get()).plugin ?? []
-
-      expect(plugins.some((p) => p.includes("global-plugin-1"))).toBe(true)
-      expect(plugins.some((p) => p.includes("local-plugin-1"))).toBe(true)
-      expect(plugins.filter((p) => p.includes("duplicate-plugin")).length).toBe(1)
-      expect(
-        plugins.filter(
-          (p) => p.includes("global-plugin") || p.includes("local-plugin") || p.includes("duplicate-plugin"),
-        ).length,
-      ).toBe(3)
-    }),
-  ),
-)
-
-it.effect("keeps plugin origins aligned with merged plugin list", () =>
-  withConfigTree(
-    {
-      global: { plugin: [["shared-plugin@1.0.0", { source: "global" }], "global-only@1.0.0"] },
-      local: { plugin: [["shared-plugin@2.0.0", { source: "local" }], "local-only@1.0.0"] },
-    },
-    Effect.gen(function* () {
-      const config = yield* Config.use.get()
-      const plugins = config.plugin ?? []
-      const origins = config.plugin_origins ?? []
-      const names = plugins.map((item) => ConfigPlugin.pluginSpecifier(item))
-
-      expect(names).toContain("shared-plugin@2.0.0")
-      expect(names).not.toContain("shared-plugin@1.0.0")
-      expect(names).toContain("global-only@1.0.0")
-      expect(names).toContain("local-only@1.0.0")
-      expect(origins.map((item) => item.spec)).toEqual(plugins)
-      expect(origins.find((item) => ConfigPlugin.pluginSpecifier(item.spec) === "shared-plugin@2.0.0")?.scope).toBe(
-        "local",
-      )
-    }),
-  ),
-)
-
-// Legacy tools migration tests
-
-it.instance("migrates legacy tools config to permissions - allow", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: { test: { tools: { bash: true, read: true } } },
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test"]?.permission).toEqual({
-      bash: "allow",
-      read: "allow",
-    })
-  }),
-)
-
-it.instance("migrates legacy tools config to permissions - deny", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: { test: { tools: { bash: false, webfetch: false } } },
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test"]?.permission).toEqual({
-      bash: "deny",
-      webfetch: "deny",
-    })
-  }),
-)
-
-it.instance("migrates legacy write tool to edit permission", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: { test: { tools: { write: true } } },
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test"]?.permission).toEqual({ edit: "allow" })
-  }),
-)
-
-// Managed settings tests
-// Note: preload.ts sets MERVEX_TEST_MANAGED_CONFIG which Global.Path.managedConfig uses
-
-it.instance(
-  "managed settings override user settings",
-  Effect.gen(function* () {
-    yield* writeManagedSettingsEffect({
-      $schema: "https://mervex.ai/config.json",
-      model: "managed/model",
-      share: "disabled",
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.model).toBe("managed/model")
-    expect(config.share).toBe("disabled")
-    expect(config.username).toBe("testuser")
-  }),
-  { config: { model: "user/model", share: "auto", username: "testuser" } },
-)
-
-it.instance(
-  "managed settings override project settings",
-  Effect.gen(function* () {
-    yield* writeManagedSettingsEffect({
-      $schema: "https://mervex.ai/config.json",
-      autoupdate: false,
-      disabled_providers: ["openai"],
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.autoupdate).toBe(false)
-    expect(config.disabled_providers).toEqual(["openai"])
-  }),
-  { config: { autoupdate: true, disabled_providers: [] } },
-)
-
-it.instance("managed jsonc settings override managed json settings", () =>
-  Effect.gen(function* () {
-    yield* writeManagedSettingsEffect({ model: "managed/json" })
-    yield* writeManagedSettingsEffect({ model: "managed/jsonc" }, "mervex.jsonc")
-
-    const config = yield* Config.use.get()
-    expect(config.model).toBe("managed/jsonc")
-  }),
-)
-
-it.instance(
-  "missing managed settings file is not an error",
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(config.model).toBe("user/model")
-  }),
-  { config: { model: "user/model" } },
-)
-
-it.instance("migrates legacy edit tool to edit permission", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: { test: { tools: { edit: false } } },
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test"]?.permission).toEqual({ edit: "deny" })
-  }),
-)
-
-it.instance("migrates legacy patch tool to edit permission", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: { test: { tools: { patch: true } } },
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test"]?.permission).toEqual({ edit: "allow" })
-  }),
-)
-
-it.instance("migrates mixed legacy tools config", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: { test: { tools: { bash: true, write: true, read: false, webfetch: true } } },
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test"]?.permission).toEqual({
-      bash: "allow",
-      edit: "allow",
-      read: "deny",
-      webfetch: "allow",
-    })
-  }),
-)
-
-it.instance("merges legacy tools with existing permission config", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      agent: { test: { permission: { glob: "allow" }, tools: { bash: true } } },
-    })
-
-    const config = yield* Config.use.get()
-    expect(config.agent?.["test"]?.permission).toEqual({
-      glob: "allow",
-      bash: "allow",
-    })
-  }),
-)
-
-it.instance("permission config preserves user key order", () =>
-  // Permission precedence follows the order users write in config, so parsing
-  // must not canonicalise known keys ahead of wildcard or custom keys.
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      permission: {
-        "*": "deny",
-        edit: "ask",
-        write: "ask",
-        external_directory: "ask",
-        read: "allow",
-        todowrite: "allow",
-        "thoughts_*": "allow",
-        "reasoning_model_*": "allow",
-        "tools_*": "allow",
-        "pr_comments_*": "allow",
-      },
-    })
-
-    const config = yield* Config.use.get()
-    expect(Object.keys(config.permission!)).toEqual([
-      "*",
-      "edit",
-      "write",
-      "external_directory",
-      "read",
-      "todowrite",
-      "thoughts_*",
-      "reasoning_model_*",
-      "tools_*",
-      "pr_comments_*",
-    ])
-  }),
-)
-
-test("config parser preserves permission order while ignoring unknown top-level keys", () => {
-  const config = ConfigParse.schema(
-    ConfigV1.Info,
-    {
-      permission: {
-        bash: "allow",
-        "*": "deny",
-        edit: "ask",
-      },
-      plugins: ["example"],
-    },
-    "test",
-  )
-
-  expect(Object.keys(config.permission!)).toEqual(["bash", "*", "edit"])
-  expect(config).not.toHaveProperty("plugins")
-})
-
-// MCP config merging tests
-
-it.instance("project config can override MCP server enabled status", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    // Simulates a base config (like from remote .well-known) with disabled MCP.
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      mcp: {
-        jira: {
-          type: "remote",
-          url: "https://jira.example.com/mcp",
-          enabled: false,
-        },
-        wiki: {
-          type: "remote",
-          url: "https://wiki.example.com/mcp",
-          enabled: false,
-        },
-      },
-    })
-    // Project config enables just jira.
-    yield* writeConfigEffect(
-      test.directory,
-      {
-        $schema: "https://mervex.ai/config.json",
-        mcp: {
-          jira: {
-            type: "remote",
-            url: "https://jira.example.com/mcp",
-            enabled: true,
-          },
-        },
-      },
-      "mervex.jsonc",
-    )
-
-    const config = yield* Config.use.get()
-    expect(config.mcp?.jira).toEqual({
-      type: "remote",
-      url: "https://jira.example.com/mcp",
-      enabled: true,
-    })
-    expect(config.mcp?.wiki).toEqual({
-      type: "remote",
-      url: "https://wiki.example.com/mcp",
-      enabled: false,
-    })
-  }),
-)
-
-it.instance("MCP config deep merges preserving base config properties", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      mcp: {
-        myserver: {
-          type: "remote",
-          url: "https://myserver.example.com/mcp",
-          enabled: false,
-          headers: {
-            "X-Custom-Header": "value",
-          },
-        },
-      },
-    })
-    yield* writeConfigEffect(
-      test.directory,
-      {
-        $schema: "https://mervex.ai/config.json",
-        mcp: {
-          myserver: {
-            type: "remote",
-            url: "https://myserver.example.com/mcp",
-            enabled: true,
-          },
-        },
-      },
-      "mervex.jsonc",
-    )
-
-    const config = yield* Config.use.get()
-    expect(config.mcp?.myserver).toEqual({
-      type: "remote",
-      url: "https://myserver.example.com/mcp",
-      enabled: true,
-      headers: {
-        "X-Custom-Header": "value",
-      },
-    })
-  }),
-)
-
-it.instance("local .mervex config can override MCP from project config", () =>
-  Effect.gen(function* () {
-    const test = yield* TestInstance
-    yield* writeConfigEffect(test.directory, {
-      $schema: "https://mervex.ai/config.json",
-      mcp: {
-        docs: {
-          type: "remote",
-          url: "https://docs.example.com/mcp",
-          enabled: false,
-        },
-      },
-    })
-    yield* FSUtil.use.ensureDir(path.join(test.directory, ".mervex"))
-    yield* writeConfigEffect(
-      path.join(test.directory, ".mervex"),
-      {
-        $schema: "https://mervex.ai/config.json",
-        mcp: {
-          docs: {
-            type: "remote",
-            url: "https://docs.example.com/mcp",
-            enabled: true,
-          },
-        },
-      },
-      "mervex.json",
-    )
-
-    const config = yield* Config.use.get()
-    expect(config.mcp?.docs?.enabled).toBe(true)
-  }),
-)
-
-const remoteProjectOverride = wellKnown({
-  config: {
-    mcp: { jira: { type: "remote", url: "https://jira.example.com/mcp", enabled: false } },
-  },
-})
-
-remoteProjectOverride.it.instance(
-  "project config overrides remote well-known config",
-  () =>
-    Effect.gen(function* () {
-      const config = yield* Config.use.get()
-      expect(remoteProjectOverride.seen.wellKnown).toBe("https://example.com/.well-known/mervex")
-      expect(config.mcp?.jira?.enabled).toBe(true)
-    }),
-  {
-    git: true,
-    config: { mcp: { jira: { type: "remote", url: "https://jira.example.com/mcp", enabled: true } } },
-  },
-)
-
-const trailingSlashWellKnown = wellKnown({
-  authUrl: "https://example.com/",
-  config: {
-    mcp: { slack: { type: "remote", url: "https://slack.example.com/mcp", enabled: true } },
-  },
-})
-
-trailingSlashWellKnown.it.instance("wellknown URL with trailing slash is normalized", () =>
-  Effect.gen(function* () {
-    yield* Config.use.get()
-    expect(trailingSlashWellKnown.seen.wellKnown).toBe("https://example.com/.well-known/mervex")
-  }),
-)
-
-test("remote well-known config can use FetchHttpClient layer", async () => {
-  let fetchedUrl: string | undefined
-  const server = Bun.serve({
-    port: 0,
-    fetch: (request) => {
-      fetchedUrl = request.url
-      return new Response(
-        JSON.stringify({
-          config: {
-            mcp: { jira: { type: "remote", url: "https://jira.example.com/mcp", enabled: true } },
-          },
-        }),
-        { status: 200, headers: { "content-type": "application/json" } },
-      )
-    },
-  })
-
-  try {
-    await provideTmpdirInstance(
-      () =>
-        Config.Service.use((svc) =>
-          Effect.gen(function* () {
-            const config = yield* svc.get()
-            expect(fetchedUrl).toBe(`${server.url.origin}/.well-known/mervex`)
-            expect(config.mcp?.jira?.enabled).toBe(true)
-          }),
-        ),
-      { git: true },
-    ).pipe(
-      Effect.scoped,
-      Effect.provide(
-        Layer.mergeAll(
-          LayerNode.compile(LayerNode.group([Config.node, FSUtil.node, Env.node, CrossSpawnSpawner.node]), [
-            [Auth.node, wellKnownAuth(server.url.origin)],
-            [Account.node, AccountTest.empty],
-            [Npm.node, NpmTest.noop],
-            [httpClient, FetchHttpClient.layer],
-          ]),
-          testInstanceStoreLayer,
-        ),
-      ),
-      Effect.runPromise,
-    )
-  } finally {
-    await server.stop(true)
-  }
-})
-
-const templatedHeaderWellKnown = wellKnown({
-  remoteConfig: {
-    url: "https://config.example.com/mervex.json",
-    headers: { Authorization: "Bearer {env:TEST_TOKEN}" },
-  },
-  remote: {
-    mcp: { confluence: { type: "remote", url: "https://confluence.example.com/mcp", enabled: true } },
-  },
-})
-
-templatedHeaderWellKnown.it.instance("wellknown remote_config supports templated env vars in headers", () =>
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(templatedHeaderWellKnown.seen.wellKnown).toBe("https://example.com/.well-known/mervex")
-    expect(templatedHeaderWellKnown.seen.remote).toBe("https://config.example.com/mervex.json")
-    expect(templatedHeaderWellKnown.seen.authorization).toBe("Bearer test-token")
-    expect(config.mcp?.confluence?.enabled).toBe(true)
-  }),
-)
-
-const remotePrecedenceWellKnown = wellKnown({
-  config: {
-    mcp: { confluence: { type: "remote", url: "https://confluence.example.com/mcp", enabled: false } },
-  },
-  remoteConfig: { url: "https://config.example.com/{env:TEST_TOKEN}/mervex.json" },
-  remote: {
-    config: { mcp: { confluence: { type: "remote", url: "https://confluence.example.com/mcp", enabled: true } } },
-  },
-})
-
-remotePrecedenceWellKnown.it.instance(
-  "wellknown remote_config url tokens and nested config override embedded config",
-  () =>
-    Effect.gen(function* () {
-      const config = yield* Config.use.get()
-      expect(remotePrecedenceWellKnown.seen.remote).toBe("https://config.example.com/test-token/mervex.json")
-      expect(config.mcp?.confluence?.enabled).toBe(true)
-    }),
-)
-
-const envIsolationWellKnown = wellKnown({
-  remoteConfig: {
-    url: "https://config.example.com/mervex.json",
-    headers: { Authorization: "Bearer {env:TEST_TOKEN}" },
-  },
-  remote: {
-    mcp: { confluence: { type: "remote", url: "https://confluence.example.com/mcp", enabled: true } },
-  },
-})
-
-envIsolationWellKnown.it.instance(
-  "wellknown token env substitution does not mutate process env",
-  () =>
-    Effect.gen(function* () {
-      process.env.TEST_TOKEN = "preexisting-token"
-      const config = yield* Config.use.get()
-      expect(envIsolationWellKnown.seen.authorization).toBe("Bearer test-token")
-      expect(config.username).toBe("test-token")
-      expect(process.env.TEST_TOKEN).toBe("preexisting-token")
-    }),
-  { git: true, config: { username: "{env:TEST_TOKEN}" } },
-)
-
-const nullConfigWellKnown = wellKnown({
-  wellKnown: {
-    config: null,
-    remote_config: { url: "https://config.example.com/mervex.json" },
-  },
-  remote: {
-    mcp: { confluence: { type: "remote", url: "https://confluence.example.com/mcp", enabled: true } },
-  },
-})
-
-nullConfigWellKnown.it.instance("wellknown config null is treated as absent", () =>
-  Effect.gen(function* () {
-    const config = yield* Config.use.get()
-    expect(nullConfigWellKnown.seen.remote).toBe("https://config.example.com/mervex.json")
-    expect(config.mcp?.confluence?.enabled).toBe(true)
-  }),
-)
-
-const invalidRemoteWellKnown = wellKnown({
-  remoteConfig: { url: "https://config.example.com/mervex.json" },
-  remote: "not an object",
-})
-
-invalidRemoteWellKnown.it.instance("wellknown remote_config rejects non-object config responses", () =>
-  Effect.gen(function* () {
-    const exit = yield* Config.use.get().pipe(Effect.exit)
-    expect(invalidRemoteWellKnown.seen.remote).toBe("https://config.example.com/mervex.json")
-    expect(Exit.isFailure(exit)).toBe(true)
-  }),
-)
-
-const loginPageWellKnown = wellKnown({
-  remoteConfig: { url: "https://config.example.com/mervex.json" },
-  remoteHtml: "<!DOCTYPE html><html><head><title>Sign in</title></head><body>Login required</body></html>",
-})
-
-loginPageWellKnown.it.instance(
-  "wellknown remote_config surfaces an actionable auth error when the gateway returns an HTML login page",
-  () =>
-    Effect.gen(function* () {
-      const exit = yield* Config.use.get().pipe(Effect.exit)
-      expect(loginPageWellKnown.seen.remote).toBe("https://config.example.com/mervex.json")
-      expect(Exit.isFailure(exit)).toBe(true)
-      const error = Exit.isFailure(exit) ? Cause.squash(exit.cause) : undefined
-      expect(NamedError.hasName(error, "ConfigRemoteAuthError")).toBe(true)
-      expect((error as { data?: { url?: string } }).data?.url).toBe("https://example.com")
-    }),
-)
-
-describe("resolvePluginSpec", () => {
-  test("keeps package specs unchanged", async () => {
-    await using tmp = await tmpdir()
-    const file = path.join(tmp.path, "mervex.json")
-    expect(await ConfigPlugin.resolvePluginSpec("oh-my-mervex@2.4.3", file)).toBe("oh-my-mervex@2.4.3")
-    expect(await ConfigPlugin.resolvePluginSpec("@scope/pkg", file)).toBe("@scope/pkg")
-  })
-
-  test("resolves windows-style relative plugin directory specs", async () => {
-    if (process.platform !== "win32") return
-
-    await using tmp = await tmpdir({
-      init: async (dir) => {
-        const plugin = path.join(dir, "plugin")
-        await fs.mkdir(plugin, { recursive: true })
-        await Filesystem.write(path.join(plugin, "index.ts"), "export default {}")
-      },
-    })
-
-    const file = path.join(tmp.path, "mervex.json")
-    const hit = await ConfigPlugin.resolvePluginSpec(".\\plugin", file)
-    expect(ConfigPlugin.pluginSpecifier(hit)).toBe(pathToFileURL(path.join(tmp.path, "plugin", "index.ts")).href)
-  })
-
-  test("resolves relative file plugin paths to file urls", async () => {
-    await using tmp = await tmpdir({
-      init: async (dir) => {
-        await Filesystem.write(path.join(dir, "plugin.ts"), "export default {}")
-      },
-    })
-
-    const file = path.join(tmp.path, "mervex.json")
-    const hit = await ConfigPlugin.resolvePluginSpec("./plugin.ts", file)
-    expect(ConfigPlugin.pluginSpecifier(hit)).toBe(pathToFileURL(path.join(tmp.path, "plugin.ts")).href)
-  })
-
-  test("resolves plugin directory paths to directory urls", async () => {
-    await using tmp = await tmpdir({
-      init: async (dir) => {
-        const plugin = path.join(dir, "plugin")
-        await fs.mkdir(plugin, { recursive: true })
-        await Filesystem.writeJson(path.join(plugin, "package.json"), {
-          name: "demo-plugin",
-          type: "module",
-          main: "./index.ts",
-        })
-        await Filesystem.write(path.join(plugin, "index.ts"), "export default {}")
-      },
-    })
-
-    const file = path.join(tmp.path, "mervex.json")
-    const hit = await ConfigPlugin.resolvePluginSpec("./plugin", file)
-    expect(ConfigPlugin.pluginSpecifier(hit)).toBe(pathToFileURL(path.join(tmp.path, "plugin")).href)
-  })
-
-  test("resolves plugin directories without package.json to index.ts", async () => {
-    await using tmp = await tmpdir({
-      init: async (dir) => {
-        const plugin = path.join(dir, "plugin")
-        await fs.mkdir(plugin, { recursive: true })
-        await Filesystem.write(path.join(plugin, "index.ts"), "export default {}")
-      },
-    })
-
-    const file = path.join(tmp.path, "mervex.json")
-    const hit = await ConfigPlugin.resolvePluginSpec("./plugin", file)
-    expect(ConfigPlugin.pluginSpecifier(hit)).toBe(pathToFileURL(path.join(tmp.path, "plugin", "index.ts")).href)
-  })
-})
-
-describe("deduplicatePluginOrigins", () => {
-  const dedupe = (plugins: ConfigPluginV1.Spec[]) =>
-    ConfigPlugin.deduplicatePluginOrigins(
-      plugins.map((spec) => ({
-        spec,
-        source: "",
-        scope: "global" as const,
-      })),
-    ).map((item) => item.spec)
-
-  test("removes duplicates keeping higher priority (later entries)", () => {
-    const plugins = ["global-plugin@1.0.0", "shared-plugin@1.0.0", "local-plugin@2.0.0", "shared-plugin@2.0.0"]
-
-    const result = dedupe(plugins)
-
-    expect(result).toContain("global-plugin@1.0.0")
-    expect(result).toContain("local-plugin@2.0.0")
-    expect(result).toContain("shared-plugin@2.0.0")
-    expect(result).not.toContain("shared-plugin@1.0.0")
-    expect(result.length).toBe(3)
-  })
-
-  test("keeps path plugins separate from package plugins", () => {
-    const plugins = ["oh-my-mervex@2.4.3", "file:///project/.mervex/plugin/oh-my-mervex.js"]
-
-    const result = dedupe(plugins)
-
-    expect(result).toEqual(plugins)
-  })
-
-  test("deduplicates direct path plugins by exact spec", () => {
-    const plugins = ["file:///project/.mervex/plugin/demo.ts", "file:///project/.mervex/plugin/demo.ts"]
-
-    const result = dedupe(plugins)
-
-    expect(result).toEqual(["file:///project/.mervex/plugin/demo.ts"])
-  })
-
-  test("preserves order of remaining plugins", () => {
-    const plugins = ["a-plugin@1.0.0", "b-plugin@1.0.0", "c-plugin@1.0.0"]
-
-    const result = dedupe(plugins)
-
-    expect(result).toEqual(["a-plugin@1.0.0", "b-plugin@1.0.0", "c-plugin@1.0.0"])
-  })
-
-  it.effect("loads auto-discovered local plugins as file urls", () =>
-    withConfigTree(
-      { global: { plugin: ["my-plugin@1.0.0"] } },
-      Effect.gen(function* () {
-        const test = yield* TestInstance
-        yield* FSUtil.use.writeWithDirs(
-          path.join(test.directory, ".mervex", "plugin", "my-plugin.js"),
-          "export default {}",
-        )
-
-        const plugins = (yield* Config.use.get()).plugin ?? []
-        expect(plugins.some((p) => ConfigPlugin.pluginSpecifier(p) === "my-plugin@1.0.0")).toBe(true)
-        expect(plugins.some((p) => ConfigPlugin.pluginSpecifier(p).startsWith("file://"))).toBe(true)
-      }),
-    ),
-  )
-})
-
-describe("MERVEX_DISABLE_PROJECT_CONFIG", () => {
-  it.instance(
-    "skips project config files when flag is set",
-    () =>
-      withProcessEnv(
-        "MERVEX_DISABLE_PROJECT_CONFIG",
-        "true",
-        Effect.gen(function* () {
-          const config = yield* Config.use.get()
-          expect(config.model).not.toBe("project/model")
-          expect(config.username).not.toBe("project-user")
-        }),
-      ),
-    { config: { model: "project/model", username: "project-user" } },
-  )
-
-  it.instance("skips project .mervex/ directories when flag is set", () =>
-    withProcessEnv(
-      "MERVEX_DISABLE_PROJECT_CONFIG",
-      "true",
-      Effect.gen(function* () {
-        const test = yield* TestInstance
-        yield* FSUtil.use.writeWithDirs(
-          path.join(test.directory, ".mervex", "command", "test-cmd.md"),
-          "# Test Command\nThis is a test command.",
-        )
-        const directories = yield* Config.use.directories()
-        expect(directories.some((d) => d.startsWith(test.directory))).toBe(false)
-      }),
-    ),
-  )
-
-  it.instance("still loads global config when flag is set", () =>
-    withProcessEnv(
-      "MERVEX_DISABLE_PROJECT_CONFIG",
-      "true",
-      Effect.gen(function* () {
-        const config = yield* Config.use.get()
-        expect(config).toBeDefined()
-        expect(config.username).toBeDefined()
-      }),
-    ),
-  )
-
-  it.instance(
-    "skips relative instructions with warning when flag is set but no config dir",
-    () =>
-      withProcessEnvs(
-        { MERVEX_CONFIG_DIR: undefined, MERVEX_DISABLE_PROJECT_CONFIG: "true" },
-        Effect.gen(function* () {
-          const test = yield* TestInstance
-          yield* FSUtil.use.writeWithDirs(path.join(test.directory, "CUSTOM.md"), "# Custom Instructions")
-          // The relative instruction should be skipped without error
-          const config = yield* Config.use.get()
-          expect(config).toBeDefined()
-        }),
-      ),
-    { config: { instructions: ["./CUSTOM.md"] } },
-  )
-
-  it.instance(
-    "MERVEX_CONFIG_DIR still works when flag is set",
-    () =>
-      Effect.gen(function* () {
-        const configDir = yield* tmpdirScoped({ config: { model: "configdir/model" } })
-        yield* withProcessEnvs(
-          { MERVEX_DISABLE_PROJECT_CONFIG: "true", MERVEX_CONFIG_DIR: configDir },
-          Effect.gen(function* () {
-            const config = yield* Config.use.get()
-            expect(config.model).toBe("configdir/model")
-          }),
-        )
-      }),
-    { config: { model: "project/model" } },
-  )
-})
-
-// Regression for #28206: malformed MERVEX_PERMISSION JSON used to crash
-// the app on startup with an unhandled SyntaxError. Loading the config with
-// an invalid JSON value in this env var should not throw.
-describe("MERVEX_PERMISSION env var", () => {
-  it.instance("does not crash when MERVEX_PERMISSION contains invalid JSON", () =>
-    withProcessEnv(
-      "MERVEX_PERMISSION",
-      "{invalid",
-      Effect.gen(function* () {
-        const config = yield* Config.use.get()
-        // Regression: load() used to throw before returning anything.
-        expect(config).toBeDefined()
-      }),
-    ),
-  )
-})
-
-describe("MERVEX_CONFIG_CONTENT token substitution", () => {
-  it.instance("substitutes {env:} tokens in MERVEX_CONFIG_CONTENT", () =>
-    withProcessEnv(
-      "TEST_CONFIG_VAR",
-      "test_api_key_12345",
-      withProcessEnv(
-        "MERVEX_CONFIG_CONTENT",
-        JSON.stringify({
-          $schema: "https://mervex.ai/config.json",
-          username: "{env:TEST_CONFIG_VAR}",
-        }),
-        Effect.gen(function* () {
-          const config = yield* Config.use.get()
-          expect(config.username).toBe("test_api_key_12345")
-        }),
-      ),
-    ),
-  )
-
-  it.instance("substitutes {file:} tokens in MERVEX_CONFIG_CONTENT", () =>
-    Effect.gen(function* () {
-      const test = yield* TestInstance
-      yield* FSUtil.use.writeWithDirs(path.join(test.directory, "api_key.txt"), "secret_key_from_file")
-      yield* withProcessEnv(
-        "MERVEX_CONFIG_CONTENT",
-        JSON.stringify({
-          $schema: "https://mervex.ai/config.json",
-          username: "{file:./api_key.txt}",
-        }),
-        Effect.gen(function* () {
-          const config = yield* Config.use.get()
-          expect(config.username).toBe("secret_key_from_file")
-        }),
-      )
-    }),
-  )
-})
-
-// parseManagedPlist unit tests — pure function, no OS interaction
-
-test("parseManagedPlist strips MDM metadata keys", async () => {
-  const config = ConfigParse.schema(
-    ConfigV1.Info,
-    ConfigParse.jsonc(
-      await ConfigManaged.parseManagedPlist(
-        JSON.stringify({
-          PayloadDisplayName: "Mervex Managed",
-          PayloadIdentifier: "ai.mervex.managed.test",
-          PayloadType: "ai.mervex.managed",
-          PayloadUUID: "AAAA-BBBB-CCCC",
-          PayloadVersion: 1,
-          _manualProfile: true,
-          share: "disabled",
-          model: "mdm/model",
-        }),
-      ),
-      "test:mobileconfig",
-    ),
-    "test:mobileconfig",
-  )
-  expect(config.share).toBe("disabled")
-  expect(config.model).toBe("mdm/model")
-  // MDM keys must not leak into the parsed config
-  expect((config as any).PayloadUUID).toBeUndefined()
-  expect((config as any).PayloadType).toBeUndefined()
-  expect((config as any)._manualProfile).toBeUndefined()
-})
-
-test("parseManagedPlist parses server settings", async () => {
-  const config = ConfigParse.schema(
-    ConfigV1.Info,
-    ConfigParse.jsonc(
-      await ConfigManaged.parseManagedPlist(
-        JSON.stringify({
-          $schema: "https://mervex.ai/config.json",
-          server: { hostname: "127.0.0.1", mdns: false },
-          autoupdate: true,
-        }),
-      ),
-      "test:mobileconfig",
-    ),
-    "test:mobileconfig",
-  )
-  expect(config.server?.hostname).toBe("127.0.0.1")
-  expect(config.server?.mdns).toBe(false)
-  expect(config.autoupdate).toBe(true)
-})
-
-test("parseManagedPlist parses permission rules", async () => {
-  const config = ConfigParse.schema(
-    ConfigV1.Info,
-    ConfigParse.jsonc(
-      await ConfigManaged.parseManagedPlist(
-        JSON.stringify({
-          $schema: "https://mervex.ai/config.json",
-          permission: {
-            "*": "ask",
-            bash: { "*": "ask", "rm -rf *": "deny", "curl *": "deny" },
-            grep: "allow",
-            glob: "allow",
-            webfetch: "ask",
-            "~/.ssh/*": "deny",
-          },
-        }),
-      ),
-      "test:mobileconfig",
-    ),
-    "test:mobileconfig",
-  )
-  expect(config.permission?.["*"]).toBe("ask")
-  expect(config.permission?.grep).toBe("allow")
-  expect(config.permission?.webfetch).toBe("ask")
-  expect(config.permission?.["~/.ssh/*"]).toBe("deny")
-  const bash = config.permission?.bash as Record<string, string>
-  expect(bash?.["rm -rf *"]).toBe("deny")
-  expect(bash?.["curl *"]).toBe("deny")
-})
-
-test("parseManagedPlist parses enabled_providers", async () => {
-  const config = ConfigParse.schema(
-    ConfigV1.Info,
-    ConfigParse.jsonc(
-      await ConfigManaged.parseManagedPlist(
-        JSON.stringify({
-          $schema: "https://mervex.ai/config.json",
-          enabled_providers: ["anthropic", "google"],
-        }),
-      ),
-      "test:mobileconfig",
-    ),
-    "test:mobileconfig",
-  )
-  expect(config.enabled_providers).toEqual(["anthropic", "google"])
-})
-
-test("parseManagedPlist handles empty config", async () => {
-  const config = ConfigParse.schema(
-    ConfigV1.Info,
-    ConfigParse.jsonc(
-      await ConfigManaged.parseManagedPlist(JSON.stringify({ $schema: "https://mervex.ai/config.json" })),
-      "test:mobileconfig",
-    ),
-    "test:mobileconfig",
-  )
-  expect(config.$schema).toBe("https://mervex.ai/config.json")
-})