opencode-athena 0.11.0 → 0.12.1

package/dist/index.d.ts

@@ -192,6 +192,7 @@ interface AthenaConfig {
             prd?: string | null;
             architecture?: string | null;
             epics?: string | null;
+            outputFolder?: string | null;
         };
     };
     features: {
@@ -390,12 +391,12 @@ declare const AthenaConfigSchema: z.ZodObject<{
             plan: z.ZodEnum<["free", "pro", "pro-plus", "business", "enterprise", "none"]>;
             enabledModels: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         }, "strip", z.ZodTypeAny, {
-            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabled: boolean;
+            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabledModels?: string[] | undefined;
         }, {
-            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabled: boolean;
+            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabledModels?: string[] | undefined;
         }>;
     }, "strip", z.ZodTypeAny, {
@@ -411,8 +412,8 @@ declare const AthenaConfigSchema: z.ZodObject<{
             tier: "max5x" | "max20x" | "pro" | "none";
         };
         githubCopilot: {
-            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabled: boolean;
+            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabledModels?: string[] | undefined;
         };
     }, {
@@ -428,8 +429,8 @@ declare const AthenaConfigSchema: z.ZodObject<{
             tier: "max5x" | "max20x" | "pro" | "none";
         };
         githubCopilot: {
-            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabled: boolean;
+            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabledModels?: string[] | undefined;
         };
     }>;
@@ -716,18 +717,21 @@ declare const AthenaConfigSchema: z.ZodObject<{
             prd: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             architecture: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             epics: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+            outputFolder: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         }, "strip", z.ZodTypeAny, {
             stories?: string | null | undefined;
             sprintStatus?: string | null | undefined;
             architecture?: string | null | undefined;
             prd?: string | null | undefined;
             epics?: string | null | undefined;
+            outputFolder?: string | null | undefined;
         }, {
             stories?: string | null | undefined;
             sprintStatus?: string | null | undefined;
             architecture?: string | null | undefined;
             prd?: string | null | undefined;
             epics?: string | null | undefined;
+            outputFolder?: string | null | undefined;
         }>>;
     }, "strip", z.ZodTypeAny, {
         defaultTrack: "enterprise" | "quick-flow" | "bmad-method";
@@ -739,6 +743,7 @@ declare const AthenaConfigSchema: z.ZodObject<{
             architecture?: string | null | undefined;
             prd?: string | null | undefined;
             epics?: string | null | undefined;
+            outputFolder?: string | null | undefined;
         } | undefined;
     }, {
         defaultTrack: "enterprise" | "quick-flow" | "bmad-method";
@@ -750,6 +755,7 @@ declare const AthenaConfigSchema: z.ZodObject<{
             architecture?: string | null | undefined;
             prd?: string | null | undefined;
             epics?: string | null | undefined;
+            outputFolder?: string | null | undefined;
         } | undefined;
     }>;
     features: z.ZodObject<{
@@ -1024,6 +1030,7 @@ declare const AthenaConfigSchema: z.ZodObject<{
             architecture?: string | null | undefined;
             prd?: string | null | undefined;
             epics?: string | null | undefined;
+            outputFolder?: string | null | undefined;
         } | undefined;
     };
     version: string;
@@ -1040,8 +1047,8 @@ declare const AthenaConfigSchema: z.ZodObject<{
             tier: "max5x" | "max20x" | "pro" | "none";
         };
         githubCopilot: {
-            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabled: boolean;
+            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabledModels?: string[] | undefined;
         };
     };
@@ -1161,6 +1168,7 @@ declare const AthenaConfigSchema: z.ZodObject<{
             architecture?: string | null | undefined;
             prd?: string | null | undefined;
             epics?: string | null | undefined;
+            outputFolder?: string | null | undefined;
         } | undefined;
     };
     version: string;
@@ -1177,8 +1185,8 @@ declare const AthenaConfigSchema: z.ZodObject<{
             tier: "max5x" | "max20x" | "pro" | "none";
         };
         githubCopilot: {
-            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabled: boolean;
+            plan: "pro" | "none" | "free" | "pro-plus" | "business" | "enterprise";
             enabledModels?: string[] | undefined;
         };
     };
@@ -1423,18 +1431,29 @@ declare const CONFIG_PATHS: {
 declare const PROJECT_PATHS: {
     /** Local Athena config */
     readonly localConfig: ".opencode/athena.json";
-    /** BMAD directory */
-    readonly bmadDir: "docs";
-    /** BMAD docs directory (deprecated - same as bmadDir in v6) */
-    readonly bmadDocsDir: "docs";
-    /** Sprint status file */
-    readonly sprintStatus: "docs/implementation-artifacts/sprint-status.yaml";
-    /** Stories directory */
-    readonly storiesDir: "docs/implementation-artifacts/stories";
-    /** Architecture document */
-    readonly architecture: "docs/project-planning-artifacts/architecture.md";
-    /** PRD document */
-    readonly prd: "docs/project-planning-artifacts/PRD.md";
+    /** BMAD installation directory (v6 alpha) */
+    readonly bmadDir: "_bmad";
+    /** BMAD output directory (v6 alpha) */
+    readonly bmadOutputDir: "_bmad-output";
+    /** Legacy BMAD directory */
+    readonly legacyBmadDir: "docs";
+    /** Sprint status file (v6 alpha) */
+    readonly sprintStatus: "_bmad-output/implementation-artifacts/sprint-status.yaml";
+    /** Stories directory (v6 alpha) */
+    readonly storiesDir: "_bmad-output/implementation-artifacts/stories";
+    /** Architecture document (v6 alpha) */
+    readonly architecture: "_bmad-output/planning-artifacts/architecture.md";
+    /** PRD document (v6 alpha) */
+    readonly prd: "_bmad-output/planning-artifacts/prd.md";
+    /** Epics document (v6 alpha) */
+    readonly epics: "_bmad-output/planning-artifacts/epics.md";
+    /** Legacy paths for backward compatibility */
+    readonly legacy: {
+        readonly sprintStatus: "docs/implementation-artifacts/sprint-status.yaml";
+        readonly storiesDir: "docs/implementation-artifacts/stories";
+        readonly architecture: "docs/project-planning-artifacts/architecture.md";
+        readonly prd: "docs/project-planning-artifacts/PRD.md";
+    };
 };
 /**
  * Default configuration values

package/dist/index.js

@@ -159,7 +159,7 @@ function handleSessionError(event, tracker) {
   }
 }
 var log3 = createPluginLogger("bmad-finder");
-var BMAD_DIR_NAMES = ["docs", ".bmad", "bmad"];
+var BMAD_DIR_NAMES = ["_bmad", "docs", ".bmad", "bmad"];
 var KNOWN_AGENT_DIRS = [
   "_bmad/bmm/agents",
   "src/modules/bmm/agents",
@@ -205,16 +205,26 @@ async function findBmadDir(startDir) {
   return null;
 }
 async function readBmadConfig(bmadDir) {
-  const configPath = join(bmadDir, "bmm", "config.yaml");
-  if (!existsSync(configPath)) {
-    return null;
+  let config = {};
+  const bmmConfigPath = join(bmadDir, "bmm", "config.yaml");
+  if (existsSync(bmmConfigPath)) {
+    try {
+      const content = await readFile(bmmConfigPath, "utf-8");
+      const bmmConfig = parse(content);
+      config = { ...config, ...bmmConfig };
+    } catch {
+    }
   }
-  try {
-    const content = await readFile(configPath, "utf-8");
-    return parse(content);
-  } catch {
-    return null;
+  const coreConfigPath = join(bmadDir, "core", "config.yaml");
+  if (existsSync(coreConfigPath)) {
+    try {
+      const content = await readFile(coreConfigPath, "utf-8");
+      const coreConfig = parse(content);
+      config = { ...config, ...coreConfig };
+    } catch {
+    }
   }
+  return Object.keys(config).length > 0 ? config : null;
 }
 function expandBmadPlaceholder(path2) {
   if (!path2) return void 0;
@@ -272,6 +282,53 @@ function searchForFileWithVariants(projectRoot, filename, searchPaths) {
   }
   return join(projectRoot, searchPaths[0], filename);
 }
+async function detectBmadStructure(projectRoot) {
+  const bmadDir = join(projectRoot, "_bmad");
+  const hasNewBmadDir = existsSync(bmadDir);
+  if (hasNewBmadDir) {
+    const config = await readBmadConfig(bmadDir);
+    const outputFolder = expandBmadPlaceholder(config?.output_folder) ?? "_bmad-output";
+    const outputDir = join(projectRoot, outputFolder);
+    const hasOutputDir = existsSync(outputDir);
+    if (hasOutputDir) {
+      return {
+        version: "v6-alpha",
+        bmadDir,
+        outputDir,
+        configRead: config !== null
+      };
+    }
+    return {
+      version: "none",
+      bmadDir,
+      outputDir: null,
+      configRead: config !== null,
+      suggestion: `Found _bmad/ directory but no ${outputFolder}/. Your BMAD setup may be incomplete. Run 'npx bmad-method@alpha install' to complete setup.`
+    };
+  }
+  const docsDir = join(projectRoot, "docs");
+  const hasDocsDir = existsSync(docsDir);
+  if (hasDocsDir) {
+    const hasImplementation = existsSync(join(docsDir, "implementation-artifacts")) || existsSync(join(docsDir, "sprint-artifacts"));
+    const hasPlanning = existsSync(join(docsDir, "project-planning-artifacts"));
+    if (hasImplementation || hasPlanning) {
+      return {
+        version: "legacy",
+        bmadDir: docsDir,
+        outputDir: null,
+        configRead: false,
+        suggestion: `Detected legacy BMAD folder structure (docs/). BMAD METHOD v6 alpha uses _bmad/ and _bmad-output/. To upgrade, run 'npx bmad-method@alpha install' and migrate your artifacts to the new structure.`
+      };
+    }
+  }
+  return {
+    version: "none",
+    bmadDir: null,
+    outputDir: null,
+    configRead: false,
+    suggestion: `No BMAD directory found. Run 'npx bmad-method@alpha install' to set up BMAD METHOD in this project.`
+  };
+}
 async function getBmadPaths(startDir, athenaConfig) {
   const bmadDir = await findBmadDir(startDir);
   const projectRoot = bmadDir ? dirname(bmadDir) : startDir;
@@ -279,13 +336,16 @@ async function getBmadPaths(startDir, athenaConfig) {
   if (bmadDir) {
     config = await readBmadConfig(bmadDir);
   }
+  const structure = await detectBmadStructure(projectRoot);
+  const outputFolder = athenaConfig?.bmad?.paths?.outputFolder ?? expandBmadPlaceholder(config?.output_folder) ?? "_bmad-output";
+  const outputDir = structure.outputDir ?? join(projectRoot, outputFolder);
   const planningDir = join(
     projectRoot,
-    expandBmadPlaceholder(config?.planning_artifacts) ?? BMAD_V6_DEFAULTS.planningArtifacts
+    expandBmadPlaceholder(config?.planning_artifacts) ?? (structure.version === "v6-alpha" ? join(outputFolder, "planning-artifacts") : BMAD_V6_DEFAULTS.planningArtifacts)
   );
   const implementationDir = join(
     projectRoot,
-    expandBmadPlaceholder(config?.implementation_artifacts) ?? expandBmadPlaceholder(config?.sprint_artifacts) ?? BMAD_V6_DEFAULTS.implementationArtifacts
+    expandBmadPlaceholder(config?.implementation_artifacts) ?? expandBmadPlaceholder(config?.sprint_artifacts) ?? (structure.version === "v6-alpha" ? join(outputFolder, "implementation-artifacts") : BMAD_V6_DEFAULTS.implementationArtifacts)
   );
   const storiesDir = athenaConfig?.bmad?.paths?.stories ? join(projectRoot, athenaConfig.bmad.paths.stories) : await detectStoriesDir(implementationDir, projectRoot);
   const sprintStatusSearchPaths = [
@@ -313,13 +373,16 @@ async function getBmadPaths(startDir, athenaConfig) {
   return {
     projectRoot,
     bmadDir,
+    outputDir,
     planningDir,
     implementationDir,
     storiesDir,
     sprintStatus,
     architecture,
     prd,
-    epics
+    epics,
+    structureVersion: structure.version === "none" ? "unknown" : structure.version,
+    suggestion: structure.suggestion
   };
 }
 async function findAgentFiles(projectRoot) {
@@ -712,12 +775,26 @@ async function resolveStoryIdentifier(storiesDir, identifier, projectRoot, logge
       const result2 = await loadStoryFromPath(cleaned);
       if (result2) return result2;
     }
+    if (!cleaned.endsWith(".md")) {
+      const withExt = `${cleaned}.md`;
+      if (existsSync(withExt)) {
+        const result2 = await loadStoryFromPath(withExt);
+        if (result2) return result2;
+      }
+    }
     if (projectRoot) {
       const absolutePath = resolve(projectRoot, cleaned);
       if (existsSync(absolutePath)) {
         const result2 = await loadStoryFromPath(absolutePath);
         if (result2) return result2;
       }
+      if (!cleaned.endsWith(".md")) {
+        const absoluteWithExt = resolve(projectRoot, `${cleaned}.md`);
+        if (existsSync(absoluteWithExt)) {
+          const result2 = await loadStoryFromPath(absoluteWithExt);
+          if (result2) return result2;
+        }
+      }
     }
   }
   const result = await loadStoryContent(storiesDir, cleaned, logger);
@@ -1127,7 +1204,7 @@ var GIT_WRITE_COMMANDS = [
   "git commit",
   "git push",
   "git checkout -b",
-  "git branch ",
+  "git branch",
   "git switch -c",
   "git switch --create",
   "git merge",
@@ -1184,7 +1261,7 @@ function createToolHooks(ctx, tracker, config) {
     }
   };
 }
-async function handleStoryLoaded(ctx, tracker, config, sessionID, output) {
+async function handleStoryLoaded(_ctx, tracker, config, _sessionID, output) {
   try {
     const result = JSON.parse(output.output);
     if (!result.storyId || !result.story) {
@@ -1209,7 +1286,6 @@ async function handleStoryLoaded(ctx, tracker, config, sessionID, output) {
         newTodos: newBmadTodos.length,
         totalTracked: mergedTodos.length
       });
-      await autoInjectTodos(ctx, sessionID, newBmadTodos);
     } else {
       log5.debug("No BMAD todos found in story", { storyId: result.storyId });
     }
@@ -1217,35 +1293,6 @@ async function handleStoryLoaded(ctx, tracker, config, sessionID, output) {
     log5.warn("Failed to process story for todo sync", { error: String(error) });
   }
 }
-async function autoInjectTodos(ctx, sessionID, todos) {
-  const client = ctx.client;
-  const session = client?.session;
-  const updateFn = session?.update;
-  if (!updateFn) {
-    log5.debug("OpenCode client session.update API not available");
-    return;
-  }
-  try {
-    await updateFn({
-      path: { id: sessionID },
-      body: {
-        update: {
-          sessionUpdate: "plan",
-          entries: todos.map((todo) => ({
-            priority: todo.priority || "medium",
-            status: todo.status === "cancelled" ? "completed" : todo.status,
-            content: todo.content
-          }))
-        }
-      }
-    });
-    log5.debug("Auto-injected BMAD todos via OpenCode API", { count: todos.length });
-  } catch (error) {
-    log5.debug("Could not auto-inject todos (API call failed)", {
-      error: String(error)
-    });
-  }
-}
 async function handleTodoWritten(ctx, tracker, config, output) {
   const todos = extractTodosFromOutput(output);
   if (!todos || todos.length === 0) {
@@ -1282,9 +1329,10 @@ function extractTodosFromOutput(output) {
 }
 
 // src/plugin/hooks/compaction-hook.ts
-function createCompactionHook(tracker, config) {
-  const storiesPath = config.bmad?.paths?.stories ?? "docs/stories";
+function createCompactionHook(tracker, config, projectDirectory) {
   return async (_input, output) => {
+    const paths = await getBmadPaths(projectDirectory, config);
+    const storiesPath = paths.storiesDir || "docs/stories";
     const storyContext = await tracker.getCurrentStoryContext();
     const todos = tracker.getCurrentTodos();
     const currentStory = tracker.getCurrentStory();
@@ -2177,7 +2225,7 @@ async function analyzeStoryComplexity(ctx, config, requestedStoryId) {
       filename: "",
       assessment: null,
       error: "No stories directory found",
-      suggestion: "Ensure BMAD is set up with a stories directory."
+      suggestion: paths.suggestion || "Ensure BMAD is set up with a stories directory. Athena supports both legacy (docs/) and v6-alpha (_bmad/ + _bmad-output/) structures."
     };
   }
   const identifier = stripAtPrefix(requestedStoryId);
@@ -2274,18 +2322,29 @@ var CONFIG_PATHS = {
 var PROJECT_PATHS = {
   /** Local Athena config */
   localConfig: ".opencode/athena.json",
-  /** BMAD directory */
-  bmadDir: "docs",
-  /** BMAD docs directory (deprecated - same as bmadDir in v6) */
-  bmadDocsDir: "docs",
-  /** Sprint status file */
-  sprintStatus: "docs/implementation-artifacts/sprint-status.yaml",
-  /** Stories directory */
-  storiesDir: "docs/implementation-artifacts/stories",
-  /** Architecture document */
-  architecture: "docs/project-planning-artifacts/architecture.md",
-  /** PRD document */
-  prd: "docs/project-planning-artifacts/PRD.md"
+  /** BMAD installation directory (v6 alpha) */
+  bmadDir: "_bmad",
+  /** BMAD output directory (v6 alpha) */
+  bmadOutputDir: "_bmad-output",
+  /** Legacy BMAD directory */
+  legacyBmadDir: "docs",
+  /** Sprint status file (v6 alpha) */
+  sprintStatus: "_bmad-output/implementation-artifacts/sprint-status.yaml",
+  /** Stories directory (v6 alpha) */
+  storiesDir: "_bmad-output/implementation-artifacts/stories",
+  /** Architecture document (v6 alpha) */
+  architecture: "_bmad-output/planning-artifacts/architecture.md",
+  /** PRD document (v6 alpha) */
+  prd: "_bmad-output/planning-artifacts/prd.md",
+  /** Epics document (v6 alpha) */
+  epics: "_bmad-output/planning-artifacts/epics.md",
+  /** Legacy paths for backward compatibility */
+  legacy: {
+    sprintStatus: "docs/implementation-artifacts/sprint-status.yaml",
+    storiesDir: "docs/implementation-artifacts/stories",
+    architecture: "docs/project-planning-artifacts/architecture.md",
+    prd: "docs/project-planning-artifacts/PRD.md"
+  }
 };
 var DEFAULTS = {
   /** Default BMAD track for new projects */
@@ -2744,7 +2803,7 @@ async function handleDecomposeStory(ctx, config, args) {
   if (!paths.storiesDir) {
     return createErrorResult(
       "No stories directory found",
-      "Ensure BMAD is set up with a stories directory."
+      paths.suggestion || "Ensure BMAD is set up with a stories directory. Athena supports both legacy (docs/) and v6-alpha (_bmad/ + _bmad-output/) structures."
     );
   }
   const resolved = await resolveStoryIdentifier(paths.storiesDir, rawStoryId, ctx.directory);
@@ -3251,7 +3310,7 @@ async function getStoryContext(ctx, tracker, config, requestedStoryId) {
     log11.warn("BMAD directory not found", { directory: ctx.directory });
     return {
       error: "No BMAD directory found",
-      suggestion: "Run 'npx bmad-method@alpha install' to set up BMAD in this project."
+      suggestion: paths.suggestion || "Run 'npx bmad-method@alpha install' to set up BMAD in this project. Athena supports both legacy (docs/) and v6-alpha (_bmad/ + _bmad-output/) structures."
     };
   }
   log11.debug("Reading sprint status", { sprintStatusPath: paths.sprintStatus });
@@ -4920,7 +4979,7 @@ async function executePartyReview(ctx, config, identifier, forceAdvancedModel) {
       scope: "story",
       identifier,
       error: "No BMAD directory found",
-      suggestion: "Run 'npx bmad-method@alpha install' to set up BMAD in this project."
+      suggestion: paths.suggestion || "Run 'npx bmad-method@alpha install' to set up BMAD in this project. Athena supports both legacy (docs/) and v6-alpha (_bmad/ + _bmad-output/) structures."
     };
   }
   const scope = detectReviewScope(identifier);
@@ -5379,7 +5438,7 @@ async function executePhase1Analysis(ctx, config, identifier, forceAdvancedModel
       scope: "story",
       identifier,
       error: "No BMAD directory found",
-      suggestion: "Run 'npx bmad-method@alpha install' to set up BMAD in this project."
+      suggestion: paths.suggestion || "Run 'npx bmad-method@alpha install' to set up BMAD in this project. Athena supports both legacy (docs/) and v6-alpha (_bmad/ + _bmad-output/) structures."
     };
   }
   const scope = detectReviewScope2(identifier);
@@ -6130,7 +6189,8 @@ async function handleUpdateStatus(ctx, tracker, config, args) {
   const paths = await getBmadPaths(ctx.directory, config);
   if (!paths.bmadDir) {
     log14.warn("BMAD directory not found", { directory: ctx.directory });
-    return { error: "No BMAD directory found" };
+    const suggestion = paths.suggestion || "Run 'npx bmad-method@alpha install' to set up BMAD in this project. Athena supports both legacy (docs/) and v6-alpha (_bmad/ + _bmad-output/) structures.";
+    return { error: `No BMAD directory found. ${suggestion}` };
   }
   if (!paths.sprintStatus) {
     log14.error("Sprint status file not found");
@@ -6402,7 +6462,8 @@ var BmadConfigSchema = z.object({
     sprintStatus: z.string().nullable().optional().describe("Custom path to sprint-status.yaml file (null = auto-detect)"),
     prd: z.string().nullable().optional().describe("Custom path to PRD.md file (null = auto-detect)"),
     architecture: z.string().nullable().optional().describe("Custom path to architecture.md file (null = auto-detect)"),
-    epics: z.string().nullable().optional().describe("Custom path to epics.md file (null = auto-detect)")
+    epics: z.string().nullable().optional().describe("Custom path to epics.md file (null = auto-detect)"),
+    outputFolder: z.string().nullable().optional().describe("Custom path to BMAD output folder (null = auto-detect _bmad-output)")
   }).optional()
 });
 var FeaturesSchema = z.object({
@@ -6912,7 +6973,43 @@ function mergeConfigs(...configs) {
       }
     }
     if (config.models) {
-      result.models = { ...result.models, ...config.models };
+      if (config.models.sisyphus !== void 0) result.models.sisyphus = config.models.sisyphus;
+      if (config.models.oracle !== void 0) result.models.oracle = config.models.oracle;
+      if (config.models.librarian !== void 0) result.models.librarian = config.models.librarian;
+      if (config.models.frontend !== void 0) result.models.frontend = config.models.frontend;
+      if (config.models.documentWriter !== void 0)
+        result.models.documentWriter = config.models.documentWriter;
+      if (config.models.multimodalLooker !== void 0)
+        result.models.multimodalLooker = config.models.multimodalLooker;
+      if (config.models.settings !== void 0) {
+        result.models.settings = result.models.settings || {};
+        const resultSettings = result.models.settings;
+        const configSettings = config.models.settings;
+        for (const agentKey of [
+          "sisyphus",
+          "oracle",
+          "librarian",
+          "frontend",
+          "documentWriter",
+          "multimodalLooker"
+        ]) {
+          if (configSettings[agentKey] !== void 0) {
+            resultSettings[agentKey] = {
+              ...resultSettings[agentKey] || {},
+              ...configSettings[agentKey]
+            };
+          }
+        }
+        if (configSettings.overrides !== void 0) {
+          resultSettings.overrides = {
+            ...resultSettings.overrides || {},
+            ...configSettings.overrides
+          };
+        }
+      }
+      if (config.models.custom !== void 0) {
+        result.models.custom = config.models.custom;
+      }
     }
     if (config.bmad) {
       result.bmad = { ...result.bmad, ...config.bmad };
@@ -6923,6 +7020,29 @@ function mergeConfigs(...configs) {
     if (config.mcps) {
       result.mcps = { ...result.mcps, ...config.mcps };
     }
+    if (config.routing) {
+      if (config.routing.providerPriority !== void 0) {
+        result.routing.providerPriority = config.routing.providerPriority;
+      }
+      if (config.routing.modelFamilyPriority !== void 0) {
+        result.routing.modelFamilyPriority = {
+          ...result.routing.modelFamilyPriority,
+          ...config.routing.modelFamilyPriority
+        };
+      }
+      if (config.routing.agentOverrides !== void 0) {
+        result.routing.agentOverrides = {
+          ...result.routing.agentOverrides,
+          ...config.routing.agentOverrides
+        };
+      }
+      if (config.routing.fallbackBehavior !== void 0) {
+        result.routing.fallbackBehavior = {
+          ...result.routing.fallbackBehavior,
+          ...config.routing.fallbackBehavior
+        };
+      }
+    }
   }
   return result;
 }
@@ -6941,7 +7061,7 @@ var OpenCodeAthena = async (ctx) => {
   const tools = createTools(ctx, tracker, config);
   const sessionHooks = createSessionHooks(ctx, tracker, config);
   const toolHooks = createToolHooks(ctx, tracker, config);
-  const compactionHook = createCompactionHook(tracker, config);
+  const compactionHook = createCompactionHook(tracker, config, directory);
   return {
     // Custom tools for BMAD integration
     tool: tools,