@rynfar/meridian 1.63.0 → 1.64.0

package/dist/cli.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   startProxyServer
-} from "./cli-hdyptm7z.js";
+} from "./cli-4ghkaajs.js";
 import"./cli-m0p2bc8v.js";
 import"./cli-sry5aqdj.js";
 import"./cli-8yp89fan.js";
 import {
   resolveClaudeExecutableAsync
-} from "./cli-xfbhn15a.js";
-import"./cli-vj9cv18n.js";
-import"./cli-pc0mtjjv.js";
+} from "./cli-0ed6j0vk.js";
 import"./cli-khhjyk04.js";
+import"./cli-vj9cv18n.js";
+import"./cli-pbvm9kc2.js";
 import {
   __require
 } from "./cli-p9swy5t3.js";
@@ -39,6 +39,11 @@ Commands:
   profile          Manage Claude account profiles (add, list, switch, remove)
   refresh-token    Refresh the Claude Code OAuth token
 
+Setup options:
+  --v1                         Install the OpenCode V1 plugin
+  --v2                         Install the pinned OpenCode V2 beta plugin
+  --opencode-bin <executable>  Probe this OpenCode executable
+
 Options:
   -v, --version   Show version
   -h, --help      Show this help
@@ -55,7 +60,7 @@ See https://github.com/rynfar/meridian for full documentation.`);
   process.exit(0);
 }
 if (args[0] === "profile") {
-  const { profileAdd, profileAddOauthToken, profileList, profileRemove, profileSwitch, profileLogin, profileHelp } = await import("./profileCli-39vshwdn.js");
+  const { profileAdd, profileAddOauthToken, profileList, profileRemove, profileSwitch, profileLogin, profileHelp } = await import("./profileCli-ap7eg985.js");
   const subcommand = args[1];
   const profileId = args[2];
   const headless = args.includes("--headless");
@@ -80,11 +85,57 @@ if (args[0] === "profile") {
   process.exit(0);
 }
 if (args[0] === "setup") {
-  const { findPluginPath, runSetup, UnparseableConfigError } = await import("./setup-0x573t61.js");
-  const pluginPath = findPluginPath(import.meta.url);
+  const {
+    detectOpenCodeGeneration,
+    DuplicateMeridianConfigError,
+    MissingV2PluginError,
+    pluginPathForGeneration,
+    runSetup,
+    SUPPORTED_OPENCODE_V2_VERSION,
+    UnparseableConfigError
+  } = await import("./setup-4v3zg3c0.js");
+  const forceV1 = args.includes("--v1");
+  const forceV2 = args.includes("--v2");
+  if (forceV1 && forceV2) {
+    console.error("Choose only one OpenCode generation: --v1 or --v2");
+    process.exit(1);
+  }
+  const binaryIndex = args.indexOf("--opencode-bin");
+  const binary = binaryIndex >= 0 ? args[binaryIndex + 1] : undefined;
+  if (binaryIndex >= 0 && (!binary || binary.startsWith("--"))) {
+    console.error("--opencode-bin requires an executable path");
+    process.exit(1);
+  }
+  const environmentBinary = process.env.OPENCODE_BIN;
+  const commands = binary ? [binary] : environmentBinary ? [environmentBinary] : forceV2 ? ["opencode2", "opencode"] : undefined;
+  const detected = forceV1 ? { generation: "v1" } : detectOpenCodeGeneration(commands);
+  if (!forceV1 && (binary || environmentBinary) && !detected.version) {
+    console.error(`Could not read a supported OpenCode version from ${binary ?? environmentBinary}.`);
+    process.exit(1);
+  }
+  if (forceV2 && detected.generation !== "v2") {
+    console.error("Could not find an OpenCode V2 beta. Install the pinned beta or pass --opencode-bin <path>.");
+    process.exit(1);
+  }
+  if (detected.generation === "v2" && detected.version !== SUPPORTED_OPENCODE_V2_VERSION) {
+    console.error(`OpenCode V2 ${detected.version ?? "unknown"} is not supported by this Meridian build.`);
+    console.error(`Install @opencode-ai/cli@${SUPPORTED_OPENCODE_V2_VERSION}, then re-run meridian setup --v2.`);
+    process.exit(1);
+  }
+  let pluginPath;
+  try {
+    pluginPath = pluginPathForGeneration(import.meta.url, detected.generation);
+  } catch (err) {
+    if (err instanceof MissingV2PluginError) {
+      console.error(`OpenCode V2 plugin bundle is missing: ${err.expectedPath}`);
+      console.error("Reinstall Meridian, then re-run meridian setup --v2.");
+      process.exit(1);
+    }
+    throw err;
+  }
   let result;
   try {
-    result = runSetup(pluginPath);
+    result = runSetup(pluginPath, undefined, detected.generation);
   } catch (err) {
     if (err instanceof UnparseableConfigError) {
       console.error(`\x1B[31m✗ Could not parse ${err.configPath}\x1B[0m`);
@@ -93,16 +144,24 @@ if (args[0] === "setup") {
       console.error(`    "plugin": ["${pluginPath}"]`);
       process.exit(1);
     }
+    if (err instanceof DuplicateMeridianConfigError) {
+      console.error("\x1B[31m✗ Meridian is already present in the other OpenCode config file\x1B[0m");
+      console.error(`  OpenCode loads both ${err.configPath} and ${err.siblingPath}.`);
+      console.error(`  Remove the Meridian entry from ${err.siblingPath}, then re-run 'meridian setup'.`);
+      console.error("  Both files were left untouched.");
+      process.exit(1);
+    }
     throw err;
   }
+  const generationLabel = detected.generation === "v2" ? "OpenCode V2" : "OpenCode V1";
   if (result.alreadyConfigured) {
-    console.log(`\x1B[32m✓ Meridian plugin already configured\x1B[0m`);
+    console.log(`\x1B[32m✓ Meridian plugin already configured for ${generationLabel}\x1B[0m`);
     console.log(`  ${result.configPath}`);
   } else {
     if (result.removedStale.length > 0) {
       console.log(`  Removed ${result.removedStale.length} stale plugin entr${result.removedStale.length === 1 ? "y" : "ies"}`);
     }
-    console.log(`\x1B[32m✓ Meridian plugin configured\x1B[0m`);
+    console.log(`\x1B[32m✓ Meridian plugin configured for ${generationLabel}\x1B[0m`);
     console.log(`  Config: ${result.configPath}`);
     console.log(`  Plugin: ${result.pluginPath}`);
     if (!result.created) {
@@ -146,7 +205,7 @@ async function runCli(start = startProxyServer, runAuthCheck = async () => {
   return execFile(claudePath, ["auth", "status"], { timeout: 5000 });
 }) {
   try {
-    const { findOpencodeConfigPath, checkPluginConfigured, findPluginPath } = await import("./setup-0x573t61.js");
+    const { findOpencodeConfigPath, checkPluginConfigured, findPluginPath } = await import("./setup-4v3zg3c0.js");
     const configPath = findOpencodeConfigPath();
     const { existsSync } = await import("fs");
     if (existsSync(configPath) && !checkPluginConfigured(configPath)) {

package/dist/meridian-v2.js

@@ -0,0 +1,139 @@
+import"./cli-p9swy5t3.js";
+
+// node_modules/@opencode-ai/plugin/dist/promise/plugin.js
+function define(plugin) {
+  return plugin;
+}
+
+// plugin/meridian-v2.ts
+var SUPPORTED_OPENCODE_V2_VERSION = "0.0.0-beta-18314";
+var MERIDIAN_PROVIDERS = new Set(["anthropic", "meridian"]);
+var PARENT_SESSION_ONE_SHOTS = new Set(["title", "summary"]);
+var ATTACHED_COMPACTION_AGENT = "compaction";
+var SESSION_AFFINITY_HEADERS = [
+  "x-opencode-session",
+  "x-session-affinity",
+  "x-session-id",
+  "x-parent-session-id"
+];
+var MERIDIAN_CONTROL_HEADERS = [
+  "x-meridian-source",
+  "x-opencode-agent-name",
+  "x-opencode-agent-mode"
+];
+var BUILTIN_AGENT_TRAITS = {
+  build: { mode: "primary", hidden: false },
+  plan: { mode: "primary", hidden: false },
+  general: { mode: "subagent", hidden: false },
+  explore: { mode: "subagent", hidden: false },
+  title: { mode: "primary", hidden: true },
+  summary: { mode: "primary", hidden: true },
+  compaction: { mode: "primary", hidden: true }
+};
+function fallbackAgentTraits(agent) {
+  return BUILTIN_AGENT_TRAITS[agent] ?? { mode: "primary", hidden: false };
+}
+function deleteHeader(headers, name) {
+  if (headers instanceof Headers) {
+    headers.delete(name);
+    return;
+  }
+  const lower = name.toLowerCase();
+  for (const key of Object.keys(headers)) {
+    if (key.toLowerCase() === lower)
+      delete headers[key];
+  }
+}
+function setHeader(headers, name, value) {
+  deleteHeader(headers, name);
+  if (headers instanceof Headers)
+    headers.set(name, value);
+  else
+    headers[name] = value;
+}
+function safeAgentName(agent) {
+  return agent.replace(/[^\x20-\x7E]/g, "").trim() || "unknown";
+}
+function shouldDetachFromParentSession(agent, _traits) {
+  return PARENT_SESSION_ONE_SHOTS.has(agent);
+}
+function applyMeridianV2Headers(headers, input) {
+  for (const name2 of SESSION_AFFINITY_HEADERS)
+    deleteHeader(headers, name2);
+  for (const name2 of MERIDIAN_CONTROL_HEADERS)
+    deleteHeader(headers, name2);
+  const name = safeAgentName(input.agent);
+  const detached = shouldDetachFromParentSession(input.agent, input.traits);
+  if (detached) {
+    setHeader(headers, "x-meridian-source", `subagent-${name}`);
+  } else {
+    setHeader(headers, "x-opencode-session", input.sessionID);
+    setHeader(headers, "x-session-affinity", input.sessionID);
+    setHeader(headers, "x-session-id", input.sessionID);
+    if (input.agent === ATTACHED_COMPACTION_AGENT) {
+      setHeader(headers, "x-meridian-source", "subagent-compaction");
+    }
+  }
+  const internalMode = PARENT_SESSION_ONE_SHOTS.has(input.agent) ? "subagent" : input.agent === ATTACHED_COMPACTION_AGENT ? "primary" : input.traits.mode;
+  setHeader(headers, "x-opencode-agent-name", name);
+  setHeader(headers, "x-opencode-agent-mode", internalMode);
+}
+var MeridianV2Plugin = define({
+  id: "meridian",
+  setup: async (context) => {
+    const traitsByAgent = new Map;
+    const registered = [];
+    const resolveAgentTraits = (agent) => {
+      const cached = traitsByAgent.get(agent);
+      if (cached && cached.expiresAt > Date.now())
+        return cached.pending;
+      const pending = Promise.resolve().then(() => context.agent.get({ agentID: agent })).then(({ data }) => ({
+        mode: data.mode === "subagent" ? "subagent" : "primary",
+        hidden: data.hidden
+      })).catch(() => {
+        if (traitsByAgent.get(agent)?.pending === pending)
+          traitsByAgent.delete(agent);
+        return fallbackAgentTraits(agent);
+      });
+      traitsByAgent.set(agent, { expiresAt: Date.now() + 5000, pending });
+      return pending;
+    };
+    const apply = async (input, headers) => {
+      if (!MERIDIAN_PROVIDERS.has(String(input.model.providerID)))
+        return;
+      const agent = String(input.agent);
+      applyMeridianV2Headers(headers, {
+        sessionID: String(input.sessionID),
+        agent,
+        traits: await resolveAgentTraits(agent)
+      });
+    };
+    try {
+      for (const providerID of MERIDIAN_PROVIDERS) {
+        registered.push(await context.session.hook("model.request", async (input) => {
+          await apply(input, input.headers);
+        }, { providerID }));
+        registered.push(await context.session.hook("http.request", async (input) => {
+          await apply(input, input.request.headers);
+        }, { providerID }));
+      }
+    } catch (error) {
+      await Promise.allSettled(registered.map(({ dispose }) => dispose()));
+      throw error;
+    }
+    return async () => {
+      const results = await Promise.allSettled(registered.map(({ dispose }) => dispose()));
+      const failures = results.flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+      if (failures.length > 0)
+        throw new AggregateError(failures, "Failed to dispose Meridian V2 hooks");
+    };
+  }
+});
+var meridian_v2_default = MeridianV2Plugin;
+export {
+  shouldDetachFromParentSession,
+  fallbackAgentTraits,
+  meridian_v2_default as default,
+  applyMeridianV2Headers,
+  SUPPORTED_OPENCODE_V2_VERSION
+};

package/dist/{profileCli-39vshwdn.js → profileCli-ap7eg985.js}

@@ -13,9 +13,9 @@ import {
   profileLogin,
   profileRemove,
   profileSwitch
-} from "./cli-xfbhn15a.js";
-import"./cli-vj9cv18n.js";
+} from "./cli-0ed6j0vk.js";
 import"./cli-khhjyk04.js";
+import"./cli-vj9cv18n.js";
 import"./cli-p9swy5t3.js";
 export {
   profileSwitch,

package/dist/proxy/passthroughTools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"passthroughTools.d.ts","sourceRoot":"","sources":["../../src/proxy/passthroughTools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,eAAO,MAAM,oBAAoB,OAAO,CAAA;AACxC,eAAO,MAAM,sBAAsB,cAAmC,CAAA;AA0CtE,wBAAgB,qBAAqB,IAAI,MAAM,CAM9C;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,GAAG,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EACjG,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE;;;;EA4DlC;AAqBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAC9E,MAAM,CASR;AAUD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAErE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKvD;AAUD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,YAAY,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,GACtF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAgCrC"}
+{"version":3,"file":"passthroughTools.d.ts","sourceRoot":"","sources":["../../src/proxy/passthroughTools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,eAAO,MAAM,oBAAoB,OAAO,CAAA;AACxC,eAAO,MAAM,sBAAsB,cAAmC,CAAA;AA0CtE,wBAAgB,qBAAqB,IAAI,MAAM,CAM9C;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,GAAG,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EACjG,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE;;;;EA8ClC;AAqBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAC9E,MAAM,CASR;AAUD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAErE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKvD;AAUD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,YAAY,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,GACtF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAgCrC"}

package/dist/proxy/setup.d.ts

@@ -18,22 +18,46 @@ export declare class UnparseableConfigError extends Error {
     readonly configPath: string;
     constructor(configPath: string);
 }
-/**
- * Resolve the OpenCode global config file path.
- * Respects OPENCODE_CONFIG_DIR and XDG_CONFIG_HOME env vars.
- */
+export declare class MissingV2PluginError extends Error {
+    readonly expectedPath: string;
+    constructor(expectedPath: string);
+}
+export declare class DuplicateMeridianConfigError extends Error {
+    readonly configPath: string;
+    readonly siblingPath: string;
+    constructor(configPath: string, siblingPath: string);
+}
 export declare function findOpencodeConfigPath(): string;
 /**
  * Resolve the absolute path to plugin/meridian.ts from any entry point.
  * Works whether called from bin/cli.ts (dev) or dist/cli.js (installed).
  */
 export declare function findPluginPath(fromUrl: string): string;
+export type OpenCodeGeneration = "v1" | "v2";
+export interface OpenCodeDetection {
+    generation: OpenCodeGeneration;
+    version?: string;
+    command?: string;
+}
+export declare const SUPPORTED_OPENCODE_V2_VERSION = "0.0.0-beta-18314";
+/** Resolve the V2 plugin without selecting stale or incomplete artifacts. */
+export declare function findV2PluginPath(fromUrl: string): string;
+/** Parse the public V1 and beta V2 version formats without guessing. */
+export declare function classifyOpenCodeVersion(output: string): OpenCodeDetection | undefined;
+type VersionProbe = (command: string) => string | undefined;
+/**
+ * Detect the installed OpenCode generation with bounded probes. `opencode`
+ * remains first so an existing V1 installation keeps its current behavior;
+ * side-by-side beta users can select `opencode2` explicitly.
+ */
+export declare function detectOpenCodeGeneration(commands?: readonly string[], probe?: VersionProbe): OpenCodeDetection;
+export declare function pluginPathForGeneration(fromUrl: string, generation: OpenCodeGeneration): string;
 /**
  * Returns true if the meridian plugin is already configured in the
  * OpenCode global config. Returns false if config doesn't exist or
  * plugin is missing.
  */
-export declare function checkPluginConfigured(configPath?: string): boolean;
+export declare function checkPluginConfigured(configPath?: string, expectedPluginPath?: string): boolean;
 /** Reset the warned-session memory. Used by tests. */
 export declare function clearPluginlessWarnings(): void;
 /**
@@ -83,12 +107,13 @@ export interface SetupResult {
     created: boolean;
 }
 /**
- * Configure the meridian plugin in ~/.config/opencode/opencode.json.
+ * Configure the Meridian plugin in ~/.config/opencode/opencode.json.
  *
- * - Creates the config file if it doesn't exist
- * - Removes stale meridian plugin entries from previous installs
+ * - Uses `plugin` for V1 and canonical `plugins` for V2
+ * - Removes Meridian entries from both fields to prevent duplicate plugin IDs
  * - Adds the current plugin path
- * - Leaves all other plugins untouched
+ * - Leaves all unrelated plugins and settings untouched
  */
-export declare function runSetup(pluginPath: string, configPath?: string): SetupResult;
+export declare function runSetup(pluginPath: string, configPath?: string, generation?: OpenCodeGeneration): SetupResult;
+export {};
 //# sourceMappingURL=setup.d.ts.map

package/dist/proxy/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/proxy/setup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;aACnB,UAAU,EAAE,MAAM;gBAAlB,UAAU,EAAE,MAAM;CAI/C;AAoBD;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAW/C;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGtD;AAkBD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAOlE;AAaD,sDAAsD;AACtD,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE;IACnD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,mEAAmE;IACnE,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,mEAAmE;IACnE,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9B,GAAG,MAAM,GAAG,SAAS,CAkBrB;AAMD,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,WAAW,CAsC7E"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/proxy/setup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAUH;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;aACnB,UAAU,EAAE,MAAM;gBAAlB,UAAU,EAAE,MAAM;CAI/C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;aACjB,YAAY,EAAE,MAAM;gBAApB,YAAY,EAAE,MAAM;CAIjD;AAED,qBAAa,4BAA6B,SAAQ,KAAK;aAEnC,UAAU,EAAE,MAAM;aAClB,WAAW,EAAE,MAAM;gBADnB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM;CAKtC;AA+BD,wBAAgB,sBAAsB,IAAI,MAAM,CAK/C;AASD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGtD;AAED,MAAM,MAAM,kBAAkB,GAAG,IAAI,GAAG,IAAI,CAAA;AAE5C,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,kBAAkB,CAAA;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,6BAA6B,qBAAqB,CAAA;AAE/D,6EAA6E;AAC7E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgBxD;AAED,wEAAwE;AACxE,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAYrF;AAED,KAAK,YAAY,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAA;AAE3D;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,GAAE,SAAS,MAAM,EAEI,EAC7B,KAAK,GAAE,YASN,GACA,iBAAiB,CAQnB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAE/F;AA4BD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAgB/F;AAaD,sDAAsD;AACtD,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE;IACnD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,mEAAmE;IACnE,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,mEAAmE;IACnE,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9B,GAAG,MAAM,GAAG,SAAS,CAkBrB;AAMD,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CACtB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,GAAE,kBAAyB,GACpC,WAAW,CA2Eb"}

package/dist/server.js

@@ -11,14 +11,14 @@ import {
   runObserveHook,
   runTransformHook,
   startProxyServer
-} from "./cli-hdyptm7z.js";
+} from "./cli-4ghkaajs.js";
 import"./cli-m0p2bc8v.js";
 import"./cli-sry5aqdj.js";
 import"./cli-8yp89fan.js";
-import"./cli-xfbhn15a.js";
-import"./cli-vj9cv18n.js";
-import"./cli-pc0mtjjv.js";
+import"./cli-0ed6j0vk.js";
 import"./cli-khhjyk04.js";
+import"./cli-vj9cv18n.js";
+import"./cli-pbvm9kc2.js";
 import"./cli-p9swy5t3.js";
 export {
   startProxyServer,

package/dist/setup-4v3zg3c0.js

@@ -0,0 +1,33 @@
+import {
+  DuplicateMeridianConfigError,
+  MissingV2PluginError,
+  SUPPORTED_OPENCODE_V2_VERSION,
+  UnparseableConfigError,
+  checkPluginConfigured,
+  classifyOpenCodeVersion,
+  clearPluginlessWarnings,
+  detectOpenCodeGeneration,
+  findOpencodeConfigPath,
+  findPluginPath,
+  findV2PluginPath,
+  notePluginlessOpenCodeRequest,
+  pluginPathForGeneration,
+  runSetup
+} from "./cli-pbvm9kc2.js";
+import"./cli-p9swy5t3.js";
+export {
+  runSetup,
+  pluginPathForGeneration,
+  notePluginlessOpenCodeRequest,
+  findV2PluginPath,
+  findPluginPath,
+  findOpencodeConfigPath,
+  detectOpenCodeGeneration,
+  clearPluginlessWarnings,
+  classifyOpenCodeVersion,
+  checkPluginConfigured,
+  UnparseableConfigError,
+  SUPPORTED_OPENCODE_V2_VERSION,
+  MissingV2PluginError,
+  DuplicateMeridianConfigError
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rynfar/meridian",
-  "version": "1.63.0",
+  "version": "1.64.0",
   "description": "Local Anthropic API powered by your Claude Max subscription. One subscription, every agent.",
   "type": "module",
   "main": "./dist/server.js",
@@ -21,8 +21,8 @@
   "scripts": {
     "start": "./bin/claude-proxy-supervisor.sh",
     "proxy": "./bin/claude-proxy-supervisor.sh",
-    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && bun build bin/cli.ts src/proxy/server.ts --outdir dist --target node --splitting --external @anthropic-ai/claude-agent-sdk --external jsonc-parser --entry-naming \"[name].js\" && tsc -p tsconfig.build.json",
-    "postbuild": "node scripts/fix-bun-exports.mjs && node --check dist/cli.js && node --check dist/server.js && node -e \"if(!require('fs').existsSync('dist/proxy/server.d.ts'))process.exit(1)\"",
+    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && bun build bin/cli.ts src/proxy/server.ts plugin/meridian-v2.ts --outdir dist --target node --splitting --external @anthropic-ai/claude-agent-sdk --external jsonc-parser --entry-naming \"[name].js\" && tsc -p tsconfig.build.json",
+    "postbuild": "node scripts/fix-bun-exports.mjs && node --check dist/cli.js && node --check dist/server.js && node --check dist/meridian-v2.js && node -e \"if(!require('fs').existsSync('dist/proxy/server.d.ts'))process.exit(1)\"",
     "postinstall": "node -e \"try{require('child_process').spawnSync(process.execPath,[require.resolve('@anthropic-ai/claude-code/install.cjs')],{stdio:'inherit'})}catch(e){console.error('[meridian] claude-code postinstall skipped:',e.message)}\"",
     "prepublishOnly": "bun run build",
     "test": "bun test --path-ignore-patterns '**/*session-store*' --path-ignore-patterns '**/*proxy-async-ops*' --path-ignore-patterns '**/*models-auth-status*' --path-ignore-patterns '**/*proxy-context-usage-store*' --path-ignore-patterns '**/*proxy-passthrough-thinking*' --path-ignore-patterns '**/*proxy-thinking-setting*' --path-ignore-patterns '**/*session-recovery*' --path-ignore-patterns '**/*models.test*' --path-ignore-patterns '**/*proxy-health-build*' && bun test src/__tests__/proxy-async-ops.test.ts && bun test src/__tests__/proxy-session-store.test.ts && bun test src/__tests__/session-store-pruning.test.ts && bun test src/__tests__/proxy-session-store-locking.test.ts && bun test src/__tests__/proxy-context-usage-store.test.ts && bun test src/__tests__/models-auth-status.test.ts && bun test src/__tests__/proxy-passthrough-thinking.test.ts && bun test src/__tests__/proxy-session-recovery.test.ts && bun test src/__tests__/proxy-thinking-setting.test.ts && bun test src/__tests__/models.test.ts && bun test src/__tests__/proxy-health-build.test.ts",
@@ -33,12 +33,16 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.117",
     "@anthropic-ai/claude-code": "^2.1.198",
+    "cross-spawn": "7.0.6",
     "jsonc-parser": "^3.3.1",
-    "libsql": "^0.5.29"
+    "libsql": "^0.5.29",
+    "zod": "4.4.3"
   },
   "devDependencies": {
     "@hono/node-server": "^1.19.11",
+    "@opencode-ai/plugin": "0.0.0-beta-18314",
     "@types/bun": "^1.3.11",
+    "@types/cross-spawn": "6.0.6",
     "@types/node": "^22.0.0",
     "bun2nix": "^2.0.8",
     "glob": "^13.0.0",

package/plugin/meridian-v2.ts

@@ -0,0 +1,190 @@
+/**
+ * Meridian OpenCode plugin for the V2 beta line.
+ *
+ * OpenCode V2 runs hidden title and summary requests in the parent session,
+ * often in parallel with the visible first turn. V2's core gives all of those
+ * requests the same session-affinity headers. Meridian must detach the hidden
+ * one-shots before they reach the proxy or they can advance the visible
+ * conversation's durable lineage.
+ *
+ * The model hook applies the identity as early as V2 permits. The HTTP hook
+ * enforces it again at the final request boundary. This removes stale or
+ * spoofed control headers regardless of header casing.
+ *
+ * NOTE: OpenCode-specific. Keep this separate from plugin/meridian.ts: V1
+ * expects a default plugin function and V2 expects a Plugin.define() object.
+ */
+
+import * as Plugin from "@opencode-ai/plugin/promise/plugin"
+
+/** Exact V2 host used to compile and validate this beta-only integration. */
+export const SUPPORTED_OPENCODE_V2_VERSION = "0.0.0-beta-18314"
+
+const MERIDIAN_PROVIDERS = new Set(["anthropic", "meridian"])
+const PARENT_SESSION_ONE_SHOTS = new Set(["title", "summary"])
+const ATTACHED_COMPACTION_AGENT = "compaction"
+
+const SESSION_AFFINITY_HEADERS = [
+  "x-opencode-session",
+  "x-session-affinity",
+  "x-session-id",
+  "x-parent-session-id",
+] as const
+
+const MERIDIAN_CONTROL_HEADERS = [
+  "x-meridian-source",
+  "x-opencode-agent-name",
+  "x-opencode-agent-mode",
+] as const
+
+export interface AgentTraits {
+  mode: "primary" | "subagent"
+  hidden: boolean
+}
+
+const BUILTIN_AGENT_TRAITS: Record<string, AgentTraits> = {
+  build: { mode: "primary", hidden: false },
+  plan: { mode: "primary", hidden: false },
+  general: { mode: "subagent", hidden: false },
+  explore: { mode: "subagent", hidden: false },
+  // Exact beta-18314 defines all three hidden internal agents as primary.
+  title: { mode: "primary", hidden: true },
+  summary: { mode: "primary", hidden: true },
+  compaction: { mode: "primary", hidden: true },
+}
+
+export function fallbackAgentTraits(agent: string): AgentTraits {
+  return BUILTIN_AGENT_TRAITS[agent] ?? { mode: "primary", hidden: false }
+}
+
+type MutableHeaders = Record<string, string> | Headers
+
+function deleteHeader(headers: MutableHeaders, name: string): void {
+  if (headers instanceof Headers) {
+    headers.delete(name)
+    return
+  }
+  const lower = name.toLowerCase()
+  for (const key of Object.keys(headers)) {
+    if (key.toLowerCase() === lower) delete headers[key]
+  }
+}
+
+function setHeader(headers: MutableHeaders, name: string, value: string): void {
+  deleteHeader(headers, name)
+  if (headers instanceof Headers) headers.set(name, value)
+  else headers[name] = value
+}
+
+function safeAgentName(agent: string): string {
+  return agent.replace(/[^\x20-\x7E]/g, "").trim() || "unknown"
+}
+
+export function shouldDetachFromParentSession(agent: string, _traits: AgentTraits): boolean {
+  // The exact built-in ID is authoritative. `hidden` is presentation config:
+  // making the built-in visible does not stop V2 from running its parent-
+  // session title/summary job concurrently with the primary turn.
+  return PARENT_SESSION_ONE_SHOTS.has(agent)
+}
+
+/**
+ * Rewrite one V2 request's identity without changing its body or model input.
+ * This pure helper is shared by model.request and http.request.
+ */
+export function applyMeridianV2Headers(
+  headers: MutableHeaders,
+  input: { sessionID: string; agent: string; traits: AgentTraits },
+): void {
+  for (const name of SESSION_AFFINITY_HEADERS) deleteHeader(headers, name)
+  for (const name of MERIDIAN_CONTROL_HEADERS) deleteHeader(headers, name)
+
+  const name = safeAgentName(input.agent)
+  const detached = shouldDetachFromParentSession(input.agent, input.traits)
+
+  if (detached) {
+    setHeader(headers, "x-meridian-source", `subagent-${name}`)
+  } else {
+    // Set every V2 affinity spelling from the trusted hook input. Do not retain
+    // provider-config values that can bind this request to another session.
+    setHeader(headers, "x-opencode-session", input.sessionID)
+    setHeader(headers, "x-session-affinity", input.sessionID)
+    setHeader(headers, "x-session-id", input.sessionID)
+    if (input.agent === ATTACHED_COMPACTION_AGENT) {
+      // Source selects the base model tier without making the adapter append
+      // `#compaction` to the primary session key.
+      setHeader(headers, "x-meridian-source", "subagent-compaction")
+    }
+  }
+
+  const internalMode = PARENT_SESSION_ONE_SHOTS.has(input.agent)
+    ? "subagent"
+    : input.agent === ATTACHED_COMPACTION_AGENT ? "primary" : input.traits.mode
+  setHeader(headers, "x-opencode-agent-name", name)
+  setHeader(headers, "x-opencode-agent-mode", internalMode)
+}
+
+const MeridianV2Plugin = Plugin.define({
+  id: "meridian",
+  setup: async (context) => {
+    const traitsByAgent = new Map<string, {
+      expiresAt: number
+      pending: Promise<AgentTraits>
+    }>()
+    const registered: Array<{ dispose: () => Promise<void> }> = []
+
+    const resolveAgentTraits = (agent: string): Promise<AgentTraits> => {
+      const cached = traitsByAgent.get(agent)
+      if (cached && cached.expiresAt > Date.now()) return cached.pending
+
+      const pending = Promise.resolve()
+        .then(() => context.agent.get({ agentID: agent }))
+        .then(({ data }) => ({
+          mode: data.mode === "subagent" ? "subagent" as const : "primary" as const,
+          hidden: data.hidden,
+        }))
+        .catch(() => {
+          // A transient lookup failure must not permanently promote a custom
+          // child to primary. Retry at the final HTTP boundary or next turn.
+          if (traitsByAgent.get(agent)?.pending === pending) traitsByAgent.delete(agent)
+          return fallbackAgentTraits(agent)
+        })
+      traitsByAgent.set(agent, { expiresAt: Date.now() + 5_000, pending })
+      return pending
+    }
+
+    const apply = async (
+      input: { sessionID: string; agent: string; model: { providerID: string } },
+      headers: MutableHeaders,
+    ): Promise<void> => {
+      if (!MERIDIAN_PROVIDERS.has(String(input.model.providerID))) return
+      const agent = String(input.agent)
+      applyMeridianV2Headers(headers, {
+        sessionID: String(input.sessionID),
+        agent,
+        traits: await resolveAgentTraits(agent),
+      })
+    }
+
+    try {
+      for (const providerID of MERIDIAN_PROVIDERS) {
+        registered.push(await context.session.hook("model.request", async (input) => {
+          await apply(input, input.headers)
+        }, { providerID }))
+        registered.push(await context.session.hook("http.request", async (input) => {
+          await apply(input, input.request.headers)
+        }, { providerID }))
+      }
+    } catch (error) {
+      await Promise.allSettled(registered.map(({ dispose }) => dispose()))
+      throw error
+    }
+
+    return async () => {
+      const results = await Promise.allSettled(registered.map(({ dispose }) => dispose()))
+      const failures = results.flatMap(result => result.status === "rejected" ? [result.reason] : [])
+      if (failures.length > 0) throw new AggregateError(failures, "Failed to dispose Meridian V2 hooks")
+    }
+  },
+})
+
+export default MeridianV2Plugin