diff --git a/src/agents/dynamic-agent-prompt-types.ts b/src/agents/dynamic-agent-prompt-types.ts
index fc51b2b88..e80368eb3 100644
--- a/src/agents/dynamic-agent-prompt-types.ts
+++ b/src/agents/dynamic-agent-prompt-types.ts
@@ -1,9 +1,10 @@
-import type { AgentPromptMetadata } from "./types"
+import type { AgentPromptMetadata, AgentMode } from "./types"
 
 export interface AvailableAgent {
   name: string
   description: string
   metadata: AgentPromptMetadata
+  mode?: AgentMode
 }
 
 export interface AvailableTool {
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 7b692c3b9..82d579475 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -57,4 +57,4 @@ export { createReadImageResizerHook } from "./read-image-resizer"
 export { createTodoDescriptionOverrideHook } from "./todo-description-override"
 export { createWebFetchRedirectGuardHook } from "./webfetch-redirect-guard"
 export { createLegacyPluginToastHook } from "./legacy-plugin-toast"
-export { createAgentSwitchHook } from "./agent-switch";
+
diff --git a/src/plugin/event.ts b/src/plugin/event.ts
index 24f4fba6c..34bc730e1 100644
--- a/src/plugin/event.ts
+++ b/src/plugin/event.ts
@@ -261,7 +261,6 @@ export function createEventHandler(args: {
     await runEventHookSafely("compactionTodoPreserver", hooks.compactionTodoPreserver?.event, input);
     await runEventHookSafely("writeExistingFileGuard", hooks.writeExistingFileGuard?.event, input);
     await runEventHookSafely("atlasHook", hooks.atlasHook?.handler, input);
-    await runEventHookSafely("agentSwitchHook", hooks.agentSwitchHook?.event, input);
     await runEventHookSafely("autoSlashCommand", hooks.autoSlashCommand?.event, input);
   };
 
diff --git a/src/plugin/tool-registry.ts b/src/plugin/tool-registry.ts
index e30dd81bc..dbbb092b5 100644
--- a/src/plugin/tool-registry.ts
+++ b/src/plugin/tool-registry.ts
@@ -246,6 +246,7 @@ export function createToolRegistry(args: {
     gitMasterConfig: pluginConfig.git_master,
     browserProvider: skillContext.browserProvider,
     nativeSkills: "skills" in ctx ? (ctx as { skills: SkillLoadOptions["nativeSkills"] }).skills : undefined,
+    directory: ctx.directory,
   })
 
   const taskSystemEnabled = isTaskSystemEnabled(pluginConfig)
diff --git a/src/tools/athena-council/council-launcher.ts b/src/tools/athena-council/council-launcher.ts
index 1863a7fbd..e77e407e2 100644
--- a/src/tools/athena-council/council-launcher.ts
+++ b/src/tools/athena-council/council-launcher.ts
@@ -47,7 +47,6 @@ export async function launchCouncilMember(
       modelID: parsed.modelID,
       ...(member.variant ? { variant: member.variant } : {}),
     },
-      ttl: COUNCIL_DEFAULTS.COUNCIL_MEMBER_TTL_MS,
   })
 
   return { member, task }
diff --git a/src/tools/delegate-task/tools.ts b/src/tools/delegate-task/tools.ts
index 14cce7506..954c7442e 100644
--- a/src/tools/delegate-task/tools.ts
+++ b/src/tools/delegate-task/tools.ts
@@ -263,7 +263,7 @@ export function createDelegateTask(options: DelegateTaskToolOptions): ToolDefini
       })
 
       if (effectiveRunInBackground) {
-        return executeBackgroundTask(args, ctx, options, parentContext, agentToUse, categoryModel, systemContent, fallbackChain, isAthenaJunior)
+        return executeBackgroundTask(args, ctx, options, parentContext, agentToUse, categoryModel, systemContent, fallbackChain)
       }
 
       return executeSyncTask(args, ctx, options, parentContext, agentToUse, categoryModel, systemContent, modelInfo, fallbackChain)