@zcy2nn/agent-forge 1.1.3 → 1.1.4

package/dist/index.js

@@ -18190,7 +18190,7 @@ var CUSTOM_SKILLS = [
   {
     name: "simplify",
     description: "Code simplification and readability-focused refactoring",
-    allowedAgents: ["reviewer"],
+    allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/simplify"
   },
   {
@@ -18229,12 +18229,6 @@ var CUSTOM_SKILLS = [
     allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/dispatching-parallel-agents"
   },
-  {
-    name: "using-git-worktrees",
-    description: "Create isolated git worktrees before executing implementation plans",
-    allowedAgents: ["orchestrator"],
-    sourcePath: "src/skills/using-git-worktrees"
-  },
   {
     name: "finishing-a-development-branch",
     description: "Guide completion of development work with structured merge/PR options",
@@ -18250,25 +18244,25 @@ var CUSTOM_SKILLS = [
   {
     name: "test-driven-development",
     description: "Write failing tests first, then minimal code to pass, before any implementation",
-    allowedAgents: ["implementer"],
+    allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/test-driven-development"
   },
   {
     name: "verification-before-completion",
     description: "Run verification commands and confirm output before claiming work is complete",
-    allowedAgents: ["implementer"],
+    allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/verification-before-completion"
   },
   {
     name: "systematic-debugging",
     description: "Find root cause before attempting fixes for any bug or test failure",
-    allowedAgents: ["reviewer"],
+    allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/systematic-debugging"
   },
   {
     name: "receiving-code-review",
     description: "Evaluate code review feedback with technical rigor before implementing suggestions",
-    allowedAgents: ["reviewer"],
+    allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/receiving-code-review"
   },
   {
@@ -18285,7 +18279,7 @@ var RECOMMENDED_SKILLS = [
     name: "agent-browser",
     repo: "https://github.com/vercel-labs/agent-browser",
     skillName: "agent-browser",
-    allowedAgents: ["implementer"],
+    allowedAgents: ["orchestrator"],
     description: "High-performance browser automation",
     postInstallCommands: [
       "npm install -g agent-browser",
@@ -18334,28 +18328,17 @@ function getSkillPermissionsForAgent(agentName, skillList) {
 
 // src/config/constants.ts
 var SUBAGENT_NAMES = [
-  "researcher",
-  "reviewer",
-  "implementer",
-  "council",
-  "councillor"
+  "researcher"
 ];
 var ORCHESTRATOR_NAME = "orchestrator";
 var ALL_AGENT_NAMES = [ORCHESTRATOR_NAME, ...SUBAGENT_NAMES];
 var PROTECTED_AGENTS = new Set([
   "orchestrator",
-  "researcher",
-  "reviewer",
-  "implementer",
-  "councillor"
+  "researcher"
 ]);
 var DEFAULT_MODELS = {
   orchestrator: undefined,
-  reviewer: "openai/gpt-5.5",
-  researcher: "openai/gpt-5.4-mini",
-  implementer: "openai/gpt-5.4-mini",
-  council: "openai/gpt-5.4-mini",
-  councillor: "openai/gpt-5.4-mini"
+  researcher: "openai/gpt-5.4-mini"
 };
 var POLL_INTERVAL_BACKGROUND_MS = 2000;
 var DEFAULT_TIMEOUT_MS = 2 * 60 * 1000;
@@ -18364,77 +18347,7 @@ var DEFAULT_MAX_SUBAGENT_DEPTH = 3;
 var PHASE_REMINDER_TEXT = `!IMPORTANT! Recall the workflow rules:
 Understand → choose the best parallelized path based on your capabilities and agents delegation rules → recall session reuse rules → execute → verify.
 If delegating, launch the specialist in the same turn you mention it !END!`;
-var TMUX_SPAWN_DELAY_MS = 500;
-var COUNCILLOR_STAGGER_MS = 250;
-var DEFAULT_DISABLED_AGENTS = ["council"];
-// src/config/council-schema.ts
-import { z } from "zod";
-var ModelIdSchema = z.string().regex(/^[^/\s]+\/[^\s]+$/, 'Expected provider/model format (e.g. "openai/gpt-5.4-mini")');
-var CouncillorConfigSchema = z.object({
-  model: ModelIdSchema.describe('Model ID in provider/model format (e.g. "openai/gpt-5.4-mini")'),
-  variant: z.string().optional(),
-  prompt: z.string().optional().describe("Optional role/guidance injected into the councillor user prompt")
-});
-var CouncilPresetSchema = z.record(z.string(), z.record(z.string(), z.unknown())).transform((entries, ctx) => {
-  const councillors = {};
-  for (const [key, raw] of Object.entries(entries)) {
-    if (key === "master")
-      continue;
-    if (key === "councillors" && typeof raw === "object" && raw !== null) {
-      for (const [innerKey, innerRaw] of Object.entries(raw)) {
-        const innerParsed = CouncillorConfigSchema.safeParse(innerRaw);
-        if (!innerParsed.success) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Invalid councillor "${innerKey}" (nested under legacy "councillors" key): ${innerParsed.error.issues.map((i) => i.message).join(", ")}`
-          });
-          return z.NEVER;
-        }
-        councillors[innerKey] = innerParsed.data;
-      }
-      continue;
-    }
-    const parsed = CouncillorConfigSchema.safeParse(raw);
-    if (!parsed.success) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: `Invalid councillor "${key}": ${parsed.error.issues.map((i) => i.message).join(", ")}`
-      });
-      return z.NEVER;
-    }
-    councillors[key] = parsed.data;
-  }
-  return councillors;
-});
-var CouncillorExecutionModeSchema = z.enum(["parallel", "serial"]).default("parallel").describe('Execution mode for councillors. Use "serial" for single-model systems to avoid conflicts. ' + 'Use "parallel" for multi-model systems for faster execution.');
-var CouncilConfigSchema = z.object({
-  presets: z.record(z.string(), CouncilPresetSchema),
-  timeout: z.number().min(0).default(180000),
-  default_preset: z.string().default("default"),
-  councillor_execution_mode: CouncillorExecutionModeSchema.describe('Execution mode for councillors. "serial" runs them one at a time (required for single-model systems). "parallel" runs them concurrently (default, faster for multi-model systems).'),
-  councillor_retries: z.number().int().min(0).max(5).default(3).describe("Number of retry attempts for councillors that return empty responses " + "(e.g. due to provider rate limiting). Default: 3 retries."),
-  master: z.unknown().optional().describe("DEPRECATED — ignored. Council agent synthesizes directly."),
-  master_timeout: z.unknown().optional().describe('DEPRECATED — ignored. Use "timeout" instead.'),
-  master_fallback: z.unknown().optional().describe("DEPRECATED — ignored. No separate master session.")
-}).transform((data) => {
-  const deprecated = [];
-  if (data.master !== undefined)
-    deprecated.push("master");
-  if (data.master_timeout !== undefined)
-    deprecated.push("master_timeout");
-  if (data.master_fallback !== undefined)
-    deprecated.push("master_fallback");
-  const legacyMasterModel = typeof data.master === "object" && data.master !== null && "model" in data.master && typeof data.master.model === "string" ? data.master.model : undefined;
-  return {
-    presets: data.presets,
-    timeout: data.timeout,
-    default_preset: data.default_preset,
-    councillor_execution_mode: data.councillor_execution_mode,
-    councillor_retries: data.councillor_retries,
-    _deprecated: deprecated.length > 0 ? deprecated : undefined,
-    _legacyMasterModel: legacyMasterModel
-  };
-});
+var DEFAULT_DISABLED_AGENTS = [];
 // src/config/loader.ts
 import * as fs from "node:fs";
 import * as path from "node:path";
@@ -18464,11 +18377,7 @@ function getOpenCodeConfigPaths() {
 // src/config/agent-mcps.ts
 var DEFAULT_AGENT_MCPS = {
   orchestrator: ["*", "!context7"],
-  researcher: ["websearch", "context7", "grep_app"],
-  reviewer: [],
-  implementer: [],
-  council: [],
-  councillor: []
+  researcher: ["websearch", "context7", "grep_app"]
 };
 function parseList(items, allAvailable) {
   if (!items || items.length === 0) {
@@ -18501,9 +18410,9 @@ function stripJsonComments(json) {
 }
 
 // src/config/schema.ts
-import { z as z2 } from "zod";
-var ProviderModelIdSchema = z2.string().regex(/^[^/\s]+\/[^\s]+$/, "Expected provider/model format (provider/.../model)");
-var ManualAgentPlanSchema = z2.object({
+import { z } from "zod";
+var ProviderModelIdSchema = z.string().regex(/^[^/\s]+\/[^\s]+$/, "Expected provider/model format (provider/.../model)");
+var ManualAgentPlanSchema = z.object({
   primary: ProviderModelIdSchema,
   fallback1: ProviderModelIdSchema,
   fallback2: ProviderModelIdSchema,
@@ -18517,46 +18426,42 @@ var ManualAgentPlanSchema = z2.object({
   ]);
   if (unique.size !== 4) {
     ctx.addIssue({
-      code: z2.ZodIssueCode.custom,
+      code: z.ZodIssueCode.custom,
       message: "primary and fallbacks must be unique per agent"
     });
   }
 });
-var ManualPlanSchema = z2.object({
+var ManualPlanSchema = z.object({
   orchestrator: ManualAgentPlanSchema,
-  researcher: ManualAgentPlanSchema,
-  reviewer: ManualAgentPlanSchema,
-  implementer: ManualAgentPlanSchema
+  researcher: ManualAgentPlanSchema
 }).strict();
-var AgentModelChainSchema = z2.array(z2.string()).min(1);
-var FallbackChainsSchema = z2.object({
+var AgentModelChainSchema = z.array(z.string()).min(1);
+var FallbackChainsSchema = z.object({
   orchestrator: AgentModelChainSchema.optional(),
-  researcher: AgentModelChainSchema.optional(),
-  reviewer: AgentModelChainSchema.optional(),
-  implementer: AgentModelChainSchema.optional()
+  researcher: AgentModelChainSchema.optional()
 }).catchall(AgentModelChainSchema);
-var AgentOverrideConfigSchema = z2.object({
-  model: z2.union([
-    z2.string(),
-    z2.array(z2.union([
-      z2.string(),
-      z2.object({
-        id: z2.string(),
-        variant: z2.string().optional()
+var AgentOverrideConfigSchema = z.object({
+  model: z.union([
+    z.string(),
+    z.array(z.union([
+      z.string(),
+      z.object({
+        id: z.string(),
+        variant: z.string().optional()
       })
     ])).min(1)
   ]).optional(),
-  temperature: z2.number().min(0).max(2).optional(),
-  variant: z2.string().optional().catch(undefined),
-  skills: z2.array(z2.string()).optional(),
-  mcps: z2.array(z2.string()).optional(),
-  prompt: z2.string().min(1).optional(),
-  orchestratorPrompt: z2.string().min(1).optional(),
-  options: z2.record(z2.string(), z2.unknown()).optional(),
-  displayName: z2.string().min(1).optional()
+  temperature: z.number().min(0).max(2).optional(),
+  variant: z.string().optional().catch(undefined),
+  skills: z.array(z.string()).optional(),
+  mcps: z.array(z.string()).optional(),
+  prompt: z.string().min(1).optional(),
+  orchestratorPrompt: z.string().min(1).optional(),
+  options: z.record(z.string(), z.unknown()).optional(),
+  displayName: z.string().min(1).optional()
 }).strict();
-var MultiplexerTypeSchema = z2.enum(["auto", "tmux", "zellij", "none"]);
-var MultiplexerLayoutSchema = z2.enum([
+var MultiplexerTypeSchema = z.enum(["auto", "tmux", "zellij", "none"]);
+var MultiplexerLayoutSchema = z.enum([
   "main-horizontal",
   "main-vertical",
   "tiled",
@@ -18564,56 +18469,56 @@ var MultiplexerLayoutSchema = z2.enum([
   "even-vertical"
 ]);
 var TmuxLayoutSchema = MultiplexerLayoutSchema;
-var MultiplexerConfigSchema = z2.object({
+var MultiplexerConfigSchema = z.object({
   type: MultiplexerTypeSchema.default("none"),
   layout: MultiplexerLayoutSchema.default("main-vertical"),
-  main_pane_size: z2.number().min(20).max(80).default(60)
+  main_pane_size: z.number().min(20).max(80).default(60)
 });
-var TmuxConfigSchema = z2.object({
-  enabled: z2.boolean().default(false),
+var TmuxConfigSchema = z.object({
+  enabled: z.boolean().default(false),
   layout: TmuxLayoutSchema.default("main-vertical"),
-  main_pane_size: z2.number().min(20).max(80).default(60)
+  main_pane_size: z.number().min(20).max(80).default(60)
 });
-var PresetSchema = z2.record(z2.string(), AgentOverrideConfigSchema);
-var WebsearchConfigSchema = z2.object({
-  provider: z2.enum(["exa", "tavily"]).default("exa")
+var PresetSchema = z.record(z.string(), AgentOverrideConfigSchema);
+var WebsearchConfigSchema = z.object({
+  provider: z.enum(["exa", "tavily"]).default("exa")
 });
-var McpNameSchema = z2.enum(["websearch", "context7", "grep_app"]);
-var InterviewConfigSchema = z2.object({
-  maxQuestions: z2.number().int().min(1).max(10).default(2),
-  outputFolder: z2.string().min(1).default("interview"),
-  autoOpenBrowser: z2.boolean().default(true).describe("Automatically open the interview UI in your default browser during interactive runs. Disabled automatically in tests and CI."),
-  port: z2.number().int().min(0).max(65535).default(0),
-  dashboard: z2.boolean().default(false)
+var McpNameSchema = z.enum(["websearch", "context7", "grep_app"]);
+var InterviewConfigSchema = z.object({
+  maxQuestions: z.number().int().min(1).max(10).default(2),
+  outputFolder: z.string().min(1).default("interview"),
+  autoOpenBrowser: z.boolean().default(true).describe("Automatically open the interview UI in your default browser during interactive runs. Disabled automatically in tests and CI."),
+  port: z.number().int().min(0).max(65535).default(0),
+  dashboard: z.boolean().default(false)
 });
-var SessionManagerConfigSchema = z2.object({
-  maxSessionsPerAgent: z2.number().int().min(1).max(10).default(2),
-  readContextMinLines: z2.number().int().min(0).max(1000).default(10),
-  readContextMaxFiles: z2.number().int().min(0).max(50).default(8)
+var SessionManagerConfigSchema = z.object({
+  maxSessionsPerAgent: z.number().int().min(1).max(10).default(2),
+  readContextMinLines: z.number().int().min(0).max(1000).default(10),
+  readContextMaxFiles: z.number().int().min(0).max(50).default(8)
 });
-var DivoomConfigSchema = z2.object({
-  enabled: z2.boolean().default(false),
-  python: z2.string().min(1).default("/Applications/Divoom MiniToo.app/Contents/Resources/.venv/bin/python"),
-  script: z2.string().min(1).default("/Applications/Divoom MiniToo.app/Contents/Resources/tools/divoom_send.py"),
-  size: z2.number().int().min(1).max(1024).default(128),
-  fps: z2.number().int().min(1).max(60).default(8),
-  speed: z2.number().int().min(1).max(1e4).default(125),
-  maxFrames: z2.number().int().min(1).max(500).default(24),
-  posterizeBits: z2.number().int().min(1).max(8).default(3),
-  gifs: z2.record(z2.string(), z2.string().min(1)).optional()
+var DivoomConfigSchema = z.object({
+  enabled: z.boolean().default(false),
+  python: z.string().min(1).default("/Applications/Divoom MiniToo.app/Contents/Resources/.venv/bin/python"),
+  script: z.string().min(1).default("/Applications/Divoom MiniToo.app/Contents/Resources/tools/divoom_send.py"),
+  size: z.number().int().min(1).max(1024).default(128),
+  fps: z.number().int().min(1).max(60).default(8),
+  speed: z.number().int().min(1).max(1e4).default(125),
+  maxFrames: z.number().int().min(1).max(500).default(24),
+  posterizeBits: z.number().int().min(1).max(8).default(3),
+  gifs: z.record(z.string(), z.string().min(1)).optional()
 });
-var TodoContinuationConfigSchema = z2.object({
-  maxContinuations: z2.number().int().min(1).max(50).default(5).describe("Maximum consecutive auto-continuations before stopping to ask user"),
-  cooldownMs: z2.number().int().min(0).max(30000).default(3000).describe("Delay in ms before auto-continuing (gives user time to abort)"),
-  autoEnable: z2.boolean().default(false).describe("Automatically enable auto-continue when the orchestrator session has enough todos"),
-  autoEnableThreshold: z2.number().int().min(1).max(50).default(4).describe("Number of todos that triggers auto-enable (only used when autoEnable is true)")
+var TodoContinuationConfigSchema = z.object({
+  maxContinuations: z.number().int().min(1).max(50).default(5).describe("Maximum consecutive auto-continuations before stopping to ask user"),
+  cooldownMs: z.number().int().min(0).max(30000).default(3000).describe("Delay in ms before auto-continuing (gives user time to abort)"),
+  autoEnable: z.boolean().default(false).describe("Automatically enable auto-continue when the orchestrator session has enough todos"),
+  autoEnableThreshold: z.number().int().min(1).max(50).default(4).describe("Number of todos that triggers auto-enable (only used when autoEnable is true)")
 });
-var FailoverConfigSchema = z2.object({
-  enabled: z2.boolean().default(true),
-  timeoutMs: z2.number().min(0).default(15000),
-  retryDelayMs: z2.number().min(0).default(500),
+var FailoverConfigSchema = z.object({
+  enabled: z.boolean().default(true),
+  timeoutMs: z.number().min(0).default(15000),
+  retryDelayMs: z.number().min(0).default(500),
   chains: FallbackChainsSchema.default({}),
-  retry_on_empty: z2.boolean().default(true).describe("When true (default), empty provider responses are treated as failures, " + "triggering fallback/retry. Set to false to treat them as successes.")
+  retry_on_empty: z.boolean().default(true).describe("When true (default), empty provider responses are treated as failures, " + "triggering fallback/retry. Set to false to treat them as successes.")
 });
 function validateCustomOnlyPromptFields(overrides, ctx, pathPrefix) {
   for (const [name, override] of Object.entries(overrides)) {
@@ -18623,31 +18528,31 @@ function validateCustomOnlyPromptFields(overrides, ctx, pathPrefix) {
     }
     if (override.prompt !== undefined) {
       ctx.addIssue({
-        code: z2.ZodIssueCode.custom,
+        code: z.ZodIssueCode.custom,
         path: [...pathPrefix, name, "prompt"],
         message: "prompt is only supported for custom agents"
       });
     }
     if (override.orchestratorPrompt !== undefined) {
       ctx.addIssue({
-        code: z2.ZodIssueCode.custom,
+        code: z.ZodIssueCode.custom,
         path: [...pathPrefix, name, "orchestratorPrompt"],
         message: "orchestratorPrompt is only supported for custom agents"
       });
     }
   }
 }
-var PluginConfigSchema = z2.object({
-  preset: z2.string().optional(),
-  setDefaultAgent: z2.boolean().optional(),
-  scoringEngineVersion: z2.enum(["v1", "v2-shadow", "v2"]).optional(),
-  balanceProviderUsage: z2.boolean().optional(),
-  autoUpdate: z2.boolean().optional().describe("Disable automatic installation of plugin updates when false. Defaults to true."),
+var PluginConfigSchema = z.object({
+  preset: z.string().optional(),
+  setDefaultAgent: z.boolean().optional(),
+  scoringEngineVersion: z.enum(["v1", "v2-shadow", "v2"]).optional(),
+  balanceProviderUsage: z.boolean().optional(),
+  autoUpdate: z.boolean().optional().describe("Disable automatic installation of plugin updates when false. Defaults to true."),
   manualPlan: ManualPlanSchema.optional(),
-  presets: z2.record(z2.string(), PresetSchema).optional(),
-  agents: z2.record(z2.string(), AgentOverrideConfigSchema).optional(),
-  disabled_agents: z2.array(z2.string()).optional().describe("Agent names to disable completely. " + "Disabled agents are not instantiated and cannot be delegated to. " + "Orchestrator, researcher, reviewer, implementer and council internal agents (councillor) cannot be disabled. " + "By default, only council is disabled."),
-  disabled_mcps: z2.array(z2.string()).optional(),
+  presets: z.record(z.string(), PresetSchema).optional(),
+  agents: z.record(z.string(), AgentOverrideConfigSchema).optional(),
+  disabled_agents: z.array(z.string()).optional().describe("Agent names to disable completely. " + "Disabled agents are not instantiated and cannot be delegated to. " + "Orchestrator and researcher cannot be disabled."),
+  disabled_mcps: z.array(z.string()).optional(),
   multiplexer: MultiplexerConfigSchema.optional(),
   tmux: TmuxConfigSchema.optional(),
   websearch: WebsearchConfigSchema.optional(),
@@ -18655,8 +18560,7 @@ var PluginConfigSchema = z2.object({
   sessionManager: SessionManagerConfigSchema.optional(),
   divoom: DivoomConfigSchema.optional(),
   todoContinuation: TodoContinuationConfigSchema.optional(),
-  fallback: FailoverConfigSchema.optional(),
-  council: CouncilConfigSchema.optional()
+  fallback: FailoverConfigSchema.optional()
 }).superRefine((value, ctx) => {
   if (value.agents) {
     validateCustomOnlyPromptFields(value.agents, ctx, ["agents"]);
@@ -18724,8 +18628,7 @@ function mergePluginConfigs(base, override) {
     interview: deepMerge(base.interview, override.interview),
     sessionManager: deepMerge(base.sessionManager, override.sessionManager),
     divoom: deepMerge(base.divoom, override.divoom),
-    fallback: deepMerge(base.fallback, override.fallback),
-    council: deepMerge(base.council, override.council)
+    fallback: deepMerge(base.fallback, override.fallback)
   };
 }
 function deepMerge(base, override) {
@@ -18821,99 +18724,6 @@ function getCustomAgentNames(config) {
     return !ALL_AGENT_NAMES.includes(name);
   });
 }
-// src/utils/session.ts
-var SESSION_ABORT_TIMEOUT_MS = 1000;
-
-class OperationTimeoutError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "OperationTimeoutError";
-  }
-}
-async function withTimeout(operation, timeoutMs, message) {
-  if (timeoutMs <= 0)
-    return operation;
-  let timer;
-  try {
-    return await Promise.race([
-      operation,
-      new Promise((_, reject) => {
-        timer = setTimeout(() => {
-          reject(new OperationTimeoutError(message));
-        }, timeoutMs);
-      })
-    ]);
-  } finally {
-    clearTimeout(timer);
-  }
-}
-async function abortSessionWithTimeout(client, sessionId, timeoutMs = SESSION_ABORT_TIMEOUT_MS) {
-  await withTimeout(client.session.abort({ path: { id: sessionId } }), timeoutMs, `Session abort timed out after ${timeoutMs}ms`);
-}
-function shortModelLabel(model) {
-  return model.split("/").pop() ?? model;
-}
-function parseModelReference(model) {
-  const slashIndex = model.indexOf("/");
-  if (slashIndex <= 0 || slashIndex >= model.length - 1) {
-    return null;
-  }
-  return {
-    providerID: model.slice(0, slashIndex),
-    modelID: model.slice(slashIndex + 1)
-  };
-}
-async function promptWithTimeout(client, args, timeoutMs) {
-  if (timeoutMs <= 0) {
-    await client.session.prompt(args);
-    return;
-  }
-  const sessionId = args.path.id;
-  let timer;
-  try {
-    const promptPromise = client.session.prompt(args);
-    promptPromise.catch(() => {});
-    await Promise.race([
-      promptPromise,
-      new Promise((_, reject) => {
-        timer = setTimeout(() => {
-          reject(new OperationTimeoutError(`Prompt timed out after ${timeoutMs}ms`));
-        }, timeoutMs);
-      })
-    ]);
-  } catch (error) {
-    if (error instanceof OperationTimeoutError) {
-      try {
-        await abortSessionWithTimeout(client, sessionId);
-      } catch {}
-    }
-    throw error;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-async function extractSessionResult(client, sessionId, options) {
-  const includeReasoning = options?.includeReasoning ?? true;
-  const messagesResult = await client.session.messages({
-    path: { id: sessionId }
-  });
-  const messages = messagesResult.data ?? [];
-  const assistantMessages = messages.filter((m) => m.info?.role === "assistant");
-  const extractedContent = [];
-  for (const message of assistantMessages) {
-    for (const part of message.parts ?? []) {
-      const allowed = includeReasoning ? part.type === "text" || part.type === "reasoning" : part.type === "text";
-      if (allowed && part.text) {
-        extractedContent.push(part.text);
-      }
-    }
-  }
-  const text = extractedContent.filter((t) => t.length > 0).join(`
-
-`);
-  return { text, empty: text.length === 0 };
-}
-
 // src/agents/orchestrator.ts
 function resolvePrompt(base, customPrompt, customAppendPrompt) {
   if (customPrompt)
@@ -18930,33 +18740,13 @@ var AGENT_DESCRIPTIONS = {
 - 权限：只读
 - 能力：本地代码搜索（glob/grep/ast）+ 外部文档检索（websearch/context7/grep_app）
 - 委派给它当：需要发现代码库中有什么 • 需要查外部库文档 • 并行搜索加速发现
-- 不委派当：知道路径需要实际内容 • 单次特定查找 • 即将编辑该文件`,
-  reviewer: `@reviewer
-- 角色：战略顾问、代码审查者、调试专家
-- 权限：只读（分析），写操作由 Orchestrator 协调 @implementer 执行
-- 能力：深度推理、架构分析、根因追踪、代码审查
-- 委派给它当：重大架构决策 • 复杂调试分析（Phase 1-3）• 代码审查 • 简化/YAGNI 审查
-- 不委派当：常规决策 • 首次 bug 修复 • 简单权衡
-- 协调模式：Reviewer 输出 <fix_plan> 时，委派 @implementer 执行修复`,
-  implementer: `@implementer
-- 角色：快速执行专家
-- 权限：读写
-- 能力：代码实现、测试编写、UI/UX 实现
-- 委派给它当：非平凡的实现任务 • 测试编写/更新 • 多文件修改
-- 不委派当：需要研究/决策 • 单个小变更（<20 行）• 需求不清楚`,
-  council: `@council（可选，默认禁用）
-- 角色：多 LLM 共识引擎`
+- 不委派当：知道路径需要实际内容 • 单次特定查找 • 即将编辑该文件`
 };
 var DELEGATION_RULES = [
   "- 需要搜索代码库或外部文档 → @researcher",
-  "- 需要代码审查、架构决策、调试分析 → @reviewer（只读，修复方案由 @implementer 执行）",
-  "- 非平凡的实现任务 → @implementer（UI 任务注明 [设计模式]）",
-  "- Reviewer 输出 fix_plan 时 → 委派 @implementer 执行修复",
-  "- 知道路径需要内容 → 自己读",
-  "- 单个小变更（<20 行）→ 自己做",
-  "- 需求不清楚 → 问用户，不委派",
-  "- 跳过委派如果开销 ≥ 自己做（Skill 定义的审查流程除外）",
-  "- brainstorming HARD-GATE：设计未批准前，委派任务必须标注 [只读-搜索]，禁止委派写入任务"
+  "- 其他所有工作 → 加载对应 Skill，按 Skill 定义的流程执行",
+  "- 单个小变更（<20行）且不涉及设计决策 → 可直接执行",
+  "- 需求不清楚 → 问用户，不委派"
 ];
 function buildOrchestratorPrompt(disabledAgents) {
   const enabledAgents = Object.entries(AGENT_DESCRIPTIONS).filter(([name]) => !disabledAgents?.has(name)).map(([, desc]) => desc).join(`
@@ -18997,13 +18787,10 @@ ${enabledAgents}
 <Workflow>
 1. 理解需求 → 加载 brainstorming skill（如需要）
 2. 制定计划 → 加载 writing-plans skill（如需要）
-3. 委派执行 → 加载 subagent-driven-development skill
-   ├─ 实现任务 → 委派 @implementer
-   ├─ 代码审查 → 委派 @reviewer（只读分析）
-   │   └─ 需要修复 → 委派 @implementer（执行修复）
+3. 执行实现 → 加载 subagent-driven-development skill
+   ├─ 实现任务 → 委派 implementer subagent
    ├─ 代码搜索 → 委派 @researcher
-   └─ 调试分析 → 委派 @reviewer（Phase 1-3）
-       └─ 需要修复 → 委派 @implementer（Phase 4 执行）
+   └─ 审查 → 委派 spec/code quality reviewer subagent
 4. 验证完成 → 加载 verification-before-completion skill
 5. 收尾 → 加载 finishing-a-development-branch skill
 </Workflow>
@@ -19064,236 +18851,6 @@ function createOrchestratorAgent(model, customPrompt, customAppendPrompt, disabl
   return definition;
 }
 
-// src/agents/council.ts
-var COUNCIL_AGENT_PROMPT = `You are the Council agent — a multi-LLM orchestration system that runs consensus across multiple models.
-
-**Tool**: You have access to the \`council_session\` tool.
-
-**When to use**:
-- When invoked by a user with a request
-- When you want multiple expert opinions on a complex problem
-- When higher confidence is needed through model consensus
-
-**Usage**:
-1. Call the \`council_session\` tool with the user's prompt
-2. Optionally specify a preset (default: "default")
-3. Receive the councillor responses formatted for synthesis
-4. Follow the Synthesis Process below
-5. Present the result to the user
-
-**Synthesis Process** (MANDATORY — follow in order):
-1. Read the original user prompt
-2. Review each councillor's response individually — note each councillor's key insight and unique contribution by name
-3. Identify agreements and contradictions between councillors
-4. Resolve contradictions with explicit reasoning
-5. Synthesize the optimal final answer
-6. Format output per the Required Output Format below
-
-**Behavior**:
-- Delegate requests directly to council_session
-- Don't pre-analyze or filter the prompt before calling council_session
-- Credit specific insights from individual councillors using their names
-- If councillors disagree, explain why you chose one approach over another
-- Do not omit per-councillor details from the final response
-- Do not collapse the output into only a final summary
-- Be transparent about trade-offs when different approaches have valid pros/cons
-- Don't just average responses — choose the best approach and improve upon it
-
-**Required Output Format**:
-Always include these sections in your final response:
-
-## Council Response
-Provide the best synthesized answer. Integrate the strongest points from the councillors, resolve disagreements, and give the user a clear final recommendation or answer. Include relevant code examples and concrete details.
-
-## Councillor Details
-Include each councillor's response separately.
-
-Use each councillor name exactly as provided in the tool result.
-
-Format each councillor like:
-
-### <councillor name>
-<that councillor's response>
-
-If a councillor failed or timed out, include that status briefly.
-
-## Council Summary
-Summarize where councillors agreed, where they disagreed, why you chose the final answer, and any remaining uncertainty. Include a consensus confidence rating: unanimous, majority, or split.`;
-function createCouncilAgent(model, customPrompt, customAppendPrompt) {
-  const prompt = resolvePrompt(COUNCIL_AGENT_PROMPT, customPrompt, customAppendPrompt);
-  const definition = {
-    name: "council",
-    description: "Multi-LLM council agent that synthesizes responses from multiple models for higher-quality outputs",
-    config: {
-      temperature: 0.1,
-      prompt
-    }
-  };
-  if (model) {
-    definition.config.model = model;
-  }
-  return definition;
-}
-function formatCouncillorPrompt(userPrompt, councillorPrompt) {
-  if (!councillorPrompt)
-    return userPrompt;
-  return `${councillorPrompt}
-
----
-
-${userPrompt}`;
-}
-function formatCouncillorResults(originalPrompt, councillorResults) {
-  const completedWithResults = councillorResults.filter((cr) => cr.status === "completed" && cr.result);
-  const councillorSection = completedWithResults.map((cr) => {
-    const shortModel = shortModelLabel(cr.model);
-    return `**${cr.name}** (${shortModel}):
-${cr.result}`;
-  }).join(`
-
-`);
-  const failedSection = councillorResults.filter((cr) => cr.status !== "completed").map((cr) => `**${cr.name}**: ${cr.status} — ${cr.error ?? "Unknown"}`).join(`
-`);
-  if (completedWithResults.length === 0) {
-    const errorDetails = councillorResults.map((cr) => `**${cr.name}** (${shortModelLabel(cr.model)}): ${cr.status} — ${cr.error ?? "Unknown"}`).join(`
-`);
-    return `---
-
-**Original Prompt**:
-${originalPrompt}
-
----
-
-**Councillor Responses**:
-All councillors failed to produce output:
-${errorDetails}
-
-Please generate a response based on the original prompt alone.`;
-  }
-  let prompt = `---
-
-**Original Prompt**:
-${originalPrompt}
-
----
-
-**Councillor Responses**:
-${councillorSection}`;
-  if (failedSection) {
-    prompt += `
-
----
-
-**Failed/Timed-out Councillors**:
-${failedSection}`;
-  }
-  prompt += `
-
----
-
-You MUST follow the Synthesis Process steps before producing output: review each councillor response individually, then produce the required output with a synthesized Council Response, per-councillor details using their exact names, and a Council Summary with consensus confidence rating (unanimous, majority, or split).`;
-  return prompt;
-}
-
-// src/agents/councillor.ts
-var COUNCILLOR_PROMPT = `You are a councillor in a multi-model council.
-
-**Role**: Provide your best independent analysis and solution to the given problem.
-
-**Capabilities**: You have read-only access to the codebase. You can:
-- Read files (read)
-- Search by name patterns (glob)
-- Search by content (grep)
-- Search code patterns (ast_grep_search)
-- Use OpenCode's built-in \`lsp\` tool when available
-- Search external docs (if MCPs are configured for this agent)
-
-You CANNOT edit files, write files, run shell commands, or delegate to other agents. You are an advisor, not an implementer.
-
-**Behavior**:
-- **Examine the codebase** before answering — your read access is what makes   council valuable. Don't guess at code you can see.
-- Analyze the problem thoroughly
-- Provide a complete, well-reasoned response
-- Focus on the quality and correctness of your solution
-- Be direct and concise
-- Don't be influenced by what other councillors might say — you won't see   their responses
-
-**Output**:
-- Give your honest assessment
-- Reference specific files and line numbers when relevant
-- Include relevant reasoning
-- State any assumptions clearly
-- Note any uncertainties`;
-function createCouncillorAgent(model, customPrompt, customAppendPrompt) {
-  const prompt = resolvePrompt(COUNCILLOR_PROMPT, customPrompt, customAppendPrompt);
-  return {
-    name: "councillor",
-    description: "Read-only council advisor. Examines codebase and provides independent analysis. Spawned internally by the council system.",
-    config: {
-      model,
-      temperature: 0.2,
-      prompt,
-      permission: {
-        "*": "deny",
-        question: "deny",
-        read: "allow",
-        glob: "allow",
-        grep: "allow",
-        lsp: "allow",
-        list: "allow",
-        codesearch: "allow",
-        ast_grep_search: "allow"
-      }
-    }
-  };
-}
-
-// src/agents/implementer.ts
-var IMPLEMENTER_PROMPT = `You are Implementer — a fast execution specialist. Execute directly with complete context provided.
-
-**Role**: Receive complete task specs from the Orchestrator and implement efficiently.
-
-## Modes
-- **Execution Mode (default)**: Low-temperature precise execution. No divergence, no research. Implement the task directly.
-- **Design Mode**: When Orchestrator marks [设计模式] in the prompt, switch to creative design thinking:
-  - Focus on aesthetics, layout, interaction details
-  - Follow design principles: typography, color themes, motion, spatial composition, visual depth
-  - Use Tailwind for responsive design
-
-## Constraints
-- NO external research (no websearch, context7, grep_app)
-- NO delegation or spawning subagents
-- No multi-step planning; direct execution
-- When a loaded Skill indicates user input is needed, pause and request clarification
-- When TDD Skill is loaded, follow red-green-refactor cycle
-
-## Loadable Skills
-You can load behavioral guides via the skill tool:
-- test-driven-development: Load when implementing features or fixing bugs
-- verification-before-completion: Load when verifying work before completion
-
-## Output Format
-<summary>Brief summary of what was implemented</summary>
-<changes>
-<file>file1.ts: Changed X to Y</file>
-<file>file2.ts: Added Z function</file>
-</changes>
-<verification>
-Tests passed: [yes/no/skip reason]
-Validation: [passed/failed/skip reason]
-</verification>`;
-function createImplementerAgent(model, customPrompt, customAppendPrompt) {
-  return {
-    name: "implementer",
-    description: "Fast implementation specialist. Receives complete context and task spec, executes code changes efficiently. Supports execution and design modes.",
-    config: {
-      model,
-      temperature: 0.2,
-      prompt: resolvePrompt(IMPLEMENTER_PROMPT, customPrompt, customAppendPrompt)
-    }
-  };
-}
-
 // src/agents/researcher.ts
 var RESEARCHER_PROMPT = `You are Researcher — a codebase and external documentation search specialist.
 
@@ -19336,62 +18893,7 @@ function createResearcherAgent(model, customPrompt, customAppendPrompt) {
   };
 }
 
-// src/agents/reviewer.ts
-var REVIEWER_PROMPT = `You are Reviewer — a strategic advisor and code review expert. Analysis only, no execution.
-
-**Role**: High-IQ debugging, architecture decisions, code review, simplification, and engineering guidance.
-
-## Responsibilities
-- Architecture decisions and solution evaluation
-- Code review (review diffs, not self-review)
-- Root cause analysis for complex debugging (Phase 1-3)
-- Simplification and YAGNI review
-
-## Execution Boundary
-You only analyze, never execute. When a Skill workflow requires writing code or running commands:
-- Complete the analysis phase, output structured analysis results and fix plans
-- Orchestrator coordinates Implementer to execute fixes
-- Specific rules:
-  - systematic-debugging: You complete Phase 1-3, output fix plan for Phase 4
-  - receiving-code-review: You complete READ → VERIFY → EVALUATE, output fix plan for IMPLEMENT
-  - simplify: You analyze simplification opportunities, output plan for execution
-
-## Principles
-- Hold dissenting opinions until convinced by technical arguments
-- Verify before agreeing — no performative agreement
-- 3+ fix failures → question the architecture, don't keep patching
-- receiving-code-review: explicitly forbidden from expressions of gratitude (e.g., "You're absolutely right!", "Great point!") — avoid performative agreement, go straight to technical verification
-
-## Loadable Skills
-You can load behavioral guides via the skill tool:
-- systematic-debugging: Load when debugging complex bugs (Phase 1-3 analysis)
-- receiving-code-review: Load when evaluating external feedback (READ → VERIFY → EVALUATE)
-- simplify: Load when reviewing code for simplification (analyze opportunities, output plan)
-
-## Output Format
-<assessment>Overall assessment</assessment>
-<strengths>What was done well</strengths>
-<issues>
-<issue severity="critical">Must-fix issues</issue>
-<issue severity="important">Should-fix issues</issue>
-<issue severity="minor">Nice-to-have improvements</issue>
-</issues>
-<fix_plan>Fix plan for Orchestrator to coordinate Implementer execution</fix_plan>
-<recommendation>Recommended next steps</recommendation>`;
-function createReviewerAgent(model, customPrompt, customAppendPrompt) {
-  return {
-    name: "reviewer",
-    description: "Strategic technical advisor. Use for architecture decisions, complex debugging, code review, simplification, and engineering guidance.",
-    config: {
-      model,
-      temperature: 0.1,
-      prompt: resolvePrompt(REVIEWER_PROMPT, customPrompt, customAppendPrompt)
-    }
-  };
-}
-
 // src/agents/index.ts
-var COUNCIL_TOOL_ALLOWED_AGENTS = new Set(["council"]);
 var SAFE_AGENT_ALIAS_RE = /^[a-z][a-z0-9_-]*$/i;
 function normalizeDisplayName(displayName) {
   const trimmed = displayName.trim();
@@ -19446,7 +18948,7 @@ function buildCustomAgentDefinition(name, override, filePrompt, fileAppendPrompt
   return {
     name,
     config: {
-      model: typeof override.model === "string" ? override.model : DEFAULT_MODELS.orchestrator ?? DEFAULT_MODELS.reviewer,
+      model: typeof override.model === "string" ? override.model : DEFAULT_MODELS.orchestrator ?? DEFAULT_MODELS.researcher,
       temperature: 0.2,
       prompt: resolvePrompt(basePrompt, filePrompt, fileAppendPrompt)
     }
@@ -19467,11 +18969,9 @@ function applyDefaultPermissions(agent, configuredSkills) {
   const existing = agent.config.permission ?? {};
   const skillPermissions = getSkillPermissionsForAgent(agent.name, configuredSkills);
   const questionPerm = existing.question === "deny" ? "deny" : "allow";
-  const councilSessionPerm = COUNCIL_TOOL_ALLOWED_AGENTS.has(agent.name) ? existing.council_session ?? "allow" : "deny";
   agent.config.permission = {
     ...existing,
     question: questionPerm,
-    council_session: councilSessionPerm,
     skill: {
       ...typeof existing.skill === "object" ? existing.skill : {},
       ...skillPermissions
@@ -19482,17 +18982,10 @@ function isSubagent(name) {
   return SUBAGENT_NAMES.includes(name);
 }
 var SUBAGENT_FACTORIES = {
-  researcher: createResearcherAgent,
-  reviewer: createReviewerAgent,
-  implementer: createImplementerAgent,
-  council: createCouncilAgent,
-  councillor: createCouncillorAgent
+  researcher: createResearcherAgent
 };
 function createAgents(config) {
   const disabled = getDisabledAgents(config);
-  if (!config?.council) {
-    disabled.add("council");
-  }
   const protoSubAgents = Object.entries(SUBAGENT_FACTORIES).filter(([name]) => !disabled.has(name)).map(([name, factory]) => {
     const customPrompts = loadAgentPrompt(name, config?.preset);
     const model = DEFAULT_MODELS[name];
@@ -19526,13 +19019,6 @@ function createAgents(config) {
     applyDefaultPermissions(agent, override?.skills);
     return agent;
   });
-  const legacyMasterModel = config?.council?._legacyMasterModel;
-  if (legacyMasterModel) {
-    const councilAgent = builtInSubAgents.find((a) => a.name === "council");
-    if (councilAgent && !getAgentOverride(config, "council")?.model && councilAgent.config.model === DEFAULT_MODELS.council) {
-      councilAgent.config.model = legacyMasterModel;
-    }
-  }
   const customSubAgents = protoCustomAgents.map((agent) => {
     const override = getAgentOverride(config, agent.name);
     if (override) {
@@ -19599,12 +19085,7 @@ ${rewrittenPrompts.join(`
 function getAgentConfigs(config) {
   const agents = createAgents(config);
   const applyClassification = (name, sdkConfig) => {
-    if (name === "council") {
-      sdkConfig.mode = "all";
-    } else if (name === "councillor") {
-      sdkConfig.mode = "subagent";
-      sdkConfig.hidden = true;
-    } else if (isSubagent(name)) {
+    if (isSubagent(name)) {
       sdkConfig.mode = "subagent";
     } else if (name === "orchestrator") {
       sdkConfig.mode = "primary";
@@ -19612,7 +19093,6 @@ function getAgentConfigs(config) {
       sdkConfig.mode = "subagent";
     }
   };
-  const isInternalOnly = (name) => name === "councillor";
   const entries = [];
   for (const a of agents) {
     const sdkConfig = {
@@ -19625,7 +19105,7 @@ function getAgentConfigs(config) {
     }
     applyClassification(a.name, sdkConfig);
     const normalizedDisplayName = a.displayName ? normalizeDisplayName(a.displayName) : undefined;
-    if (normalizedDisplayName && !isInternalOnly(a.name)) {
+    if (normalizedDisplayName) {
       entries.push([normalizedDisplayName, sdkConfig]);
       entries.push([a.name, { ...sdkConfig, hidden: true }]);
       continue;
@@ -19667,6 +19147,13 @@ function rollbackRuntimePreset(previous) {
   previousRuntimePreset = null;
 }
 
+// src/divoom/manager.ts
+import { spawn } from "node:child_process";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "node:fs";
+import * as os2 from "node:os";
+import path3 from "node:path";
+import { fileURLToPath } from "node:url";
+
 // src/utils/logger.ts
 import * as fs2 from "node:fs";
 import { appendFile } from "node:fs/promises";
@@ -19744,263 +19231,7 @@ function log(message, data) {
   } catch {}
 }
 
-// src/council/council-manager.ts
-class CouncilManager {
-  client;
-  directory;
-  config;
-  depthTracker;
-  tmuxEnabled;
-  deprecatedFields;
-  legacyMasterModel;
-  constructor(ctx, config, depthTracker, tmuxEnabled = false) {
-    this.client = ctx.client;
-    this.directory = ctx.directory;
-    this.config = config;
-    this.deprecatedFields = config?.council?._deprecated;
-    this.legacyMasterModel = config?.council?._legacyMasterModel;
-    this.depthTracker = depthTracker;
-    this.tmuxEnabled = tmuxEnabled;
-  }
-  getDeprecatedFields() {
-    return this.deprecatedFields;
-  }
-  getLegacyMasterModel() {
-    return this.legacyMasterModel;
-  }
-  async runCouncil(prompt, presetName, parentSessionId) {
-    if (this.depthTracker) {
-      const parentDepth = this.depthTracker.getDepth(parentSessionId);
-      if (parentDepth + 1 > this.depthTracker.maxDepth) {
-        log("[council-manager] spawn blocked: max depth exceeded", {
-          parentSessionId,
-          parentDepth,
-          maxDepth: this.depthTracker.maxDepth
-        });
-        return {
-          success: false,
-          error: "Subagent depth exceeded",
-          councillorResults: []
-        };
-      }
-    }
-    const councilConfig = this.config?.council;
-    if (!councilConfig) {
-      log("[council-manager] Council configuration not found");
-      return {
-        success: false,
-        error: "Council not configured",
-        councillorResults: []
-      };
-    }
-    const resolvedPreset = presetName ?? councilConfig.default_preset ?? "default";
-    const preset = councilConfig.presets[resolvedPreset];
-    if (!preset) {
-      const available = Object.keys(councilConfig.presets).join(", ");
-      log(`[council-manager] Preset "${resolvedPreset}" not found`);
-      return {
-        success: false,
-        error: `Preset "${resolvedPreset}" does not exist. Omit the preset parameter to use the default, or call again with one of: ${available}`,
-        councillorResults: []
-      };
-    }
-    if (Object.keys(preset).length === 0) {
-      log(`[council-manager] Preset "${resolvedPreset}" has no councillors`);
-      return {
-        success: false,
-        error: `Preset "${resolvedPreset}" has no councillors configured. Note: the reserved key "master" is ignored — use councillor names as keys`,
-        councillorResults: []
-      };
-    }
-    const timeout = councilConfig.timeout ?? 180000;
-    const executionMode = councilConfig.councillor_execution_mode ?? "parallel";
-    const maxRetries = councilConfig.councillor_retries ?? 3;
-    const councillorCount = Object.keys(preset).length;
-    log(`[council-manager] Starting council with preset "${resolvedPreset}"`, {
-      councillors: Object.keys(preset)
-    });
-    this.sendStartNotification(parentSessionId, councillorCount).catch((err) => {
-      log("[council-manager] Failed to send start notification", {
-        error: err instanceof Error ? err.message : String(err)
-      });
-    });
-    const councillorResults = await this.runCouncillors(prompt, preset, parentSessionId, timeout, executionMode, maxRetries);
-    const completedCount = councillorResults.filter((r) => r.status === "completed").length;
-    log(`[council-manager] Councillors completed: ${completedCount}/${councillorResults.length}`);
-    if (completedCount === 0) {
-      return {
-        success: false,
-        error: "All councillors failed or timed out",
-        councillorResults
-      };
-    }
-    const formattedCouncillorResults = formatCouncillorResults(prompt, councillorResults);
-    log("[council-manager] Council completed successfully");
-    return {
-      success: true,
-      result: formattedCouncillorResults,
-      councillorResults
-    };
-  }
-  async sendStartNotification(parentSessionId, councillorCount) {
-    const message = [
-      `⎔ Council starting — ${councillorCount} councillors launching — ctrl+x ↓ to watch`,
-      "",
-      "[system status: continue without acknowledging this notification]"
-    ].join(`
-`);
-    await this.client.session.prompt({
-      path: { id: parentSessionId },
-      body: {
-        noReply: true,
-        parts: [{ type: "text", text: message }]
-      }
-    });
-  }
-  async runAgentSession(options) {
-    const modelRef = parseModelReference(options.model);
-    if (!modelRef) {
-      throw new Error(`Invalid model format: ${options.model}`);
-    }
-    let sessionId;
-    try {
-      const session = await this.client.session.create({
-        body: {
-          parentID: options.parentSessionId,
-          title: options.title
-        },
-        query: { directory: this.directory }
-      });
-      if (!session.data?.id) {
-        throw new Error("Failed to create session");
-      }
-      sessionId = session.data.id;
-      if (this.depthTracker) {
-        const registered = this.depthTracker.registerChild(options.parentSessionId, sessionId);
-        if (!registered) {
-          throw new Error("Subagent depth exceeded");
-        }
-      }
-      if (this.tmuxEnabled) {
-        await new Promise((r) => setTimeout(r, TMUX_SPAWN_DELAY_MS));
-      }
-      const body = {
-        agent: options.agent,
-        model: modelRef,
-        tools: { task: false },
-        parts: [{ type: "text", text: options.promptText }]
-      };
-      if (options.variant) {
-        body.variant = options.variant;
-      }
-      await promptWithTimeout(this.client, {
-        path: { id: sessionId },
-        body,
-        query: { directory: this.directory }
-      }, options.timeout);
-      const extraction = await extractSessionResult(this.client, sessionId, {
-        includeReasoning: options.includeReasoning
-      });
-      if (extraction.empty) {
-        const retryOnEmpty = this.config?.fallback?.retry_on_empty ?? true;
-        if (retryOnEmpty) {
-          throw new Error("Empty response from provider");
-        }
-      }
-      return extraction.text;
-    } finally {
-      if (sessionId) {
-        this.client.session.abort({ path: { id: sessionId } }).catch(() => {});
-        if (this.depthTracker) {
-          this.depthTracker.cleanup(sessionId);
-        }
-      }
-    }
-  }
-  async runCouncillors(prompt, councillors, parentSessionId, timeout, executionMode = "parallel", maxRetries) {
-    const entries = Object.entries(councillors);
-    const results = [];
-    if (executionMode === "serial") {
-      for (const [name, config] of entries) {
-        results.push(await this.runCouncillorWithRetry(name, config, prompt, parentSessionId, timeout, maxRetries));
-      }
-    } else {
-      const promises = entries.map(([name, config], index) => (async () => {
-        if (this.tmuxEnabled && index > 0) {
-          await new Promise((r) => setTimeout(r, index * COUNCILLOR_STAGGER_MS));
-        }
-        return this.runCouncillorWithRetry(name, config, prompt, parentSessionId, timeout, maxRetries);
-      })());
-      const settled = await Promise.allSettled(promises);
-      for (let index = 0;index < settled.length; index++) {
-        const result = settled[index];
-        const [name, cfg] = entries[index];
-        if (result.status === "fulfilled") {
-          results.push(result.value);
-        } else {
-          results.push({
-            name,
-            model: cfg.model,
-            status: "failed",
-            error: result.reason instanceof Error ? result.reason.message : String(result.reason)
-          });
-        }
-      }
-    }
-    return results;
-  }
-  async runCouncillorWithRetry(name, config, prompt, parentSessionId, timeout, maxRetries) {
-    const modelLabel = shortModelLabel(config.model);
-    const totalAttempts = 1 + maxRetries;
-    for (let attempt = 1;attempt <= totalAttempts; attempt++) {
-      if (attempt > 1) {
-        log(`[council-manager] Retrying councillor "${name}" (${modelLabel}), attempt ${attempt}/${totalAttempts}`);
-      }
-      try {
-        const result = await this.runAgentSession({
-          parentSessionId,
-          title: `Council ${name} (${modelLabel})`,
-          agent: "councillor",
-          model: config.model,
-          promptText: formatCouncillorPrompt(prompt, config.prompt),
-          variant: config.variant,
-          timeout,
-          includeReasoning: false
-        });
-        return {
-          name,
-          model: config.model,
-          status: "completed",
-          result
-        };
-      } catch (error) {
-        const msg = error instanceof Error ? error.message : String(error);
-        const isEmptyResponse = msg.includes("Empty response from provider");
-        const canRetry = attempt < totalAttempts && isEmptyResponse;
-        if (!canRetry) {
-          return {
-            name,
-            model: config.model,
-            status: msg.includes("timed out") ? "timed_out" : "failed",
-            error: `Councillor "${name}": ${msg}`
-          };
-        }
-      }
-    }
-    return {
-      name,
-      model: config.model,
-      status: "failed",
-      error: `Councillor "${name}": max retries exhausted`
-    };
-  }
-}
 // src/divoom/manager.ts
-import { spawn } from "node:child_process";
-import { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "node:fs";
-import * as os2 from "node:os";
-import path3 from "node:path";
-import { fileURLToPath } from "node:url";
 var AGENT_GIFS = {
   council: "council.gif",
   councillor: "council.gif",
@@ -22319,6 +21550,45 @@ function hasInternalInitiatorMarker(part) {
   }
   return part.text.includes(SLIM_INTERNAL_INITIATOR_MARKER);
 }
+// src/utils/session.ts
+var SESSION_ABORT_TIMEOUT_MS = 1000;
+
+class OperationTimeoutError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "OperationTimeoutError";
+  }
+}
+async function withTimeout(operation, timeoutMs, message) {
+  if (timeoutMs <= 0)
+    return operation;
+  let timer;
+  try {
+    return await Promise.race([
+      operation,
+      new Promise((_, reject) => {
+        timer = setTimeout(() => {
+          reject(new OperationTimeoutError(message));
+        }, timeoutMs);
+      })
+    ]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function abortSessionWithTimeout(client, sessionId, timeoutMs = SESSION_ABORT_TIMEOUT_MS) {
+  await withTimeout(client.session.abort({ path: { id: sessionId } }), timeoutMs, `Session abort timed out after ${timeoutMs}ms`);
+}
+function parseModelReference(model) {
+  const slashIndex = model.indexOf("/");
+  if (slashIndex <= 0 || slashIndex >= model.length - 1) {
+    return null;
+  }
+  return {
+    providerID: model.slice(0, slashIndex),
+    modelID: model.slice(slashIndex + 1)
+  };
+}
 // src/utils/session-manager.ts
 var MIN_CONTEXT_FILE_LINES = 10;
 var MAX_CONTEXT_FILES_PER_SESSION = 8;
@@ -22326,14 +21596,6 @@ function aliasPrefix(agentType) {
   switch (agentType) {
     case "researcher":
       return "res";
-    case "reviewer":
-      return "rev";
-    case "implementer":
-      return "imp";
-    case "council":
-      return "cnc";
-    case "councillor":
-      return "clr";
     case "orchestrator":
       return "orc";
   }
@@ -23493,11 +22755,7 @@ ${originalText}`;
 import path9 from "node:path";
 var AGENT_NAME_SET = new Set([
   "orchestrator",
-  "researcher",
-  "reviewer",
-  "implementer",
-  "council",
-  "councillor"
+  "researcher"
 ]);
 var MAX_PENDING_TASK_CALLS = 100;
 var RESUMABLE_SESSIONS_START = "<resumable_sessions>";
@@ -27264,17 +26522,17 @@ import * as fs8 from "node:fs/promises";
 import * as path12 from "node:path";
 
 // src/interview/types.ts
-import { z as z3 } from "zod";
-var RawQuestionSchema = z3.object({
-  id: z3.string().optional(),
-  question: z3.string().optional(),
-  options: z3.array(z3.unknown()).optional(),
-  suggested: z3.unknown().optional()
+import { z as z2 } from "zod";
+var RawQuestionSchema = z2.object({
+  id: z2.string().optional(),
+  question: z2.string().optional(),
+  options: z2.array(z2.unknown()).optional(),
+  suggested: z2.unknown().optional()
 });
-var RawInterviewStateSchema = z3.object({
-  summary: z3.unknown().optional(),
-  title: z3.unknown().optional(),
-  questions: z3.array(z3.unknown()).optional()
+var RawInterviewStateSchema = z2.object({
+  summary: z2.unknown().optional(),
+  title: z2.unknown().optional(),
+  questions: z2.array(z2.unknown()).optional()
 });
 
 // src/interview/parser.ts
@@ -29763,72 +29021,6 @@ var ast_grep_replace = tool2({
     }
   }
 });
-// src/tools/council.ts
-import {
-  tool as tool3
-} from "@opencode-ai/plugin";
-var z4 = tool3.schema;
-function formatModelComposition(councillorResults) {
-  return councillorResults.map((cr) => {
-    const shortModel = shortModelLabel(cr.model);
-    return `${cr.name}: ${shortModel}`;
-  }).join(", ");
-}
-function createCouncilTool(_ctx, councilManager) {
-  const council_session = tool3({
-    description: `Launch a multi-LLM council session for consensus-based analysis.
-
-Sends the prompt to multiple models (councillors) in parallel and returns their formatted responses for you to synthesize.
-
-Returns the councillor responses with a summary footer.`,
-    args: {
-      prompt: z4.string().describe("The prompt to send to all councillors"),
-      preset: z4.string().optional().describe('Council preset to use (default: "default"). Must match a preset in the council config.')
-    },
-    async execute(args, toolContext) {
-      if (!toolContext || typeof toolContext !== "object" || !("sessionID" in toolContext)) {
-        throw new Error("Invalid toolContext: missing sessionID");
-      }
-      const allowedAgents = ["council"];
-      const callingAgent = toolContext.agent;
-      if (callingAgent && !allowedAgents.includes(callingAgent)) {
-        throw new Error(`Council sessions can only be invoked by the council agent. Current agent: ${callingAgent}`);
-      }
-      const prompt = String(args.prompt);
-      const preset = typeof args.preset === "string" ? args.preset : undefined;
-      const parentSessionId = toolContext.sessionID;
-      const result = await councilManager.runCouncil(prompt, preset, parentSessionId);
-      if (!result.success) {
-        return `Council session failed: ${result.error}`;
-      }
-      let output = result.result ?? "(No output)";
-      const completed = result.councillorResults.filter((cr) => cr.status === "completed").length;
-      const total = result.councillorResults.length;
-      const composition = formatModelComposition(result.councillorResults);
-      output += `
-
----
-*Council: ${completed}/${total} councillors responded (${composition})*`;
-      const deprecated = councilManager.getDeprecatedFields();
-      if (deprecated && deprecated.length > 0) {
-        const legacyMasterModel = councilManager.getLegacyMasterModel();
-        const hasMaster = deprecated.includes("master");
-        const trulyIgnored = hasMaster && !legacyMasterModel ? deprecated : deprecated.filter((f) => f !== "master");
-        const parts = [];
-        if (hasMaster && legacyMasterModel) {
-          parts.push(`\`council.master\` is deprecated and will be removed in a future version. Its \`model\` is currently used as a fallback for the council agent — add a \`council\` entry to your preset to make this explicit.`);
-        }
-        if (trulyIgnored.length > 0) {
-          parts.push(`${trulyIgnored.map((f) => `\`council.${f}\``).join(", ")} ${trulyIgnored.length === 1 ? "is" : "are"} deprecated and ignored — remove ${trulyIgnored.length === 1 ? "it" : "them"} from your config.`);
-        }
-        output += `
-⚠ Config warning: ${parts.join(" ")}`;
-      }
-      return output;
-    }
-  });
-  return { council_session };
-}
 // src/tui-state.ts
 import * as fs9 from "node:fs";
 import * as os5 from "node:os";
@@ -30064,13 +29256,19 @@ Usage: /preset <name> to switch.`);
 // src/tools/skill.ts
 import { existsSync as existsSync10, readFileSync as readFileSync5 } from "node:fs";
 import { join as join13 } from "node:path";
-import { tool as tool4 } from "@opencode-ai/plugin/tool";
-var z5 = tool4.schema;
+import { tool as tool3 } from "@opencode-ai/plugin/tool";
+var z3 = tool3.schema;
 function resolveSkillPath(skillName) {
-  const packageRoot = join13(import.meta.dirname, "..", "..");
-  const bundledPath = join13(packageRoot, "src", "skills", skillName, "SKILL.md");
-  if (existsSync10(bundledPath)) {
-    return bundledPath;
+  let dir = import.meta.dirname;
+  for (let i = 0;i < 5; i++) {
+    const candidate = join13(dir, "src", "skills", skillName, "SKILL.md");
+    if (existsSync10(candidate)) {
+      return candidate;
+    }
+    const parent = join13(dir, "..");
+    if (parent === dir)
+      break;
+    dir = parent;
   }
   return;
 }
@@ -30084,14 +29282,14 @@ function isSkillAllowedForAgent(agentName, skillName, config) {
   return permissions["*"] === "allow";
 }
 function createSkillTool(config) {
-  const skill = tool4({
+  const skill = tool3({
     description: `Load a Skill behavior guide by name.
 
 Returns the full SKILL.md content so you can follow its workflow.
 Skills are temporary behavior overlays — they apply to the current turn only
 and do not permanently modify your system prompt.`,
     args: {
-      name: z5.string().describe('Skill name (e.g. "brainstorming", "simplify", "codemap").')
+      name: z3.string().describe('Skill name (e.g. "brainstorming", "simplify", "codemap").')
     },
     execute: async (args, toolContext) => {
       const skillName = args.name.trim();
@@ -30147,7 +29345,7 @@ var WEBFETCH_DESCRIPTION = "Fetch a URL with better extraction for static/docs p
 import os6 from "node:os";
 import path18 from "node:path";
 import {
-  tool as tool5
+  tool as tool4
 } from "@opencode-ai/plugin";
 
 // src/tools/smartfetch/binary.ts
@@ -30315,7 +29513,7 @@ var M = class u2 {
     return this.#S;
   }
   constructor(e) {
-    let { max: t = 0, ttl: i, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: o, updateAgeOnHas: r, allowStale: h, dispose: l, onInsert: c, disposeAfter: f, noDisposeOnSet: g, noUpdateTTL: p, maxSize: T = 0, maxEntrySize: w = 0, sizeCalculation: y, fetchMethod: a, memoMethod: m, noDeleteOnFetchRejection: _, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: d, allowStaleOnFetchAbort: A, ignoreFetchAbort: z6, perf: x } = e;
+    let { max: t = 0, ttl: i, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: o, updateAgeOnHas: r, allowStale: h, dispose: l, onInsert: c, disposeAfter: f, noDisposeOnSet: g, noUpdateTTL: p, maxSize: T = 0, maxEntrySize: w = 0, sizeCalculation: y, fetchMethod: a, memoMethod: m, noDeleteOnFetchRejection: _, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: d, allowStaleOnFetchAbort: A, ignoreFetchAbort: z4, perf: x } = e;
     if (x !== undefined && typeof x?.now != "function")
       throw new TypeError("perf option must have a now() method if specified");
     if (this.#m = x ?? C, t !== 0 && !F(t))
@@ -30333,7 +29531,7 @@ var M = class u2 {
       throw new TypeError("memoMethod must be a function if defined");
     if (this.#U = m, a !== undefined && typeof a != "function")
       throw new TypeError("fetchMethod must be a function if specified");
-    if (this.#M = a, this.#W = !!a, this.#s = new Map, this.#i = Array.from({ length: t }).fill(undefined), this.#t = Array.from({ length: t }).fill(undefined), this.#a = new v(t), this.#c = new v(t), this.#l = 0, this.#h = 0, this.#y = R.create(t), this.#n = 0, this.#b = 0, typeof l == "function" && (this.#w = l), typeof c == "function" && (this.#x = c), typeof f == "function" ? (this.#S = f, this.#r = []) : (this.#S = undefined, this.#r = undefined), this.#T = !!this.#w, this.#j = !!this.#x, this.#f = !!this.#S, this.noDisposeOnSet = !!g, this.noUpdateTTL = !!p, this.noDeleteOnFetchRejection = !!_, this.allowStaleOnFetchRejection = !!d, this.allowStaleOnFetchAbort = !!A, this.ignoreFetchAbort = !!z6, this.maxEntrySize !== 0) {
+    if (this.#M = a, this.#W = !!a, this.#s = new Map, this.#i = Array.from({ length: t }).fill(undefined), this.#t = Array.from({ length: t }).fill(undefined), this.#a = new v(t), this.#c = new v(t), this.#l = 0, this.#h = 0, this.#y = R.create(t), this.#n = 0, this.#b = 0, typeof l == "function" && (this.#w = l), typeof c == "function" && (this.#x = c), typeof f == "function" ? (this.#S = f, this.#r = []) : (this.#S = undefined, this.#r = undefined), this.#T = !!this.#w, this.#j = !!this.#x, this.#f = !!this.#S, this.noDisposeOnSet = !!g, this.noUpdateTTL = !!p, this.noDeleteOnFetchRejection = !!_, this.allowStaleOnFetchRejection = !!d, this.allowStaleOnFetchAbort = !!A, this.ignoreFetchAbort = !!z4, this.maxEntrySize !== 0) {
       if (this.#u !== 0 && !F(this.#u))
         throw new TypeError("maxSize must be a positive integer if specified");
       if (!F(this.maxEntrySize))
@@ -30713,8 +29911,8 @@ var M = class u2 {
       let A = this.#p(b);
       if (!y && !A)
         return a && (a.fetch = "hit"), this.#L(b), s && this.#D(b), a && this.#E(a, b), d;
-      let z6 = this.#P(e, b, _, w), v = z6.__staleWhileFetching !== undefined && i;
-      return a && (a.fetch = A ? "stale" : "refresh", v && A && (a.returnedStale = true)), v ? z6.__staleWhileFetching : z6.__returned = z6;
+      let z4 = this.#P(e, b, _, w), v = z4.__staleWhileFetching !== undefined && i;
+      return a && (a.fetch = A ? "stale" : "refresh", v && A && (a.returnedStale = true)), v ? z4.__staleWhileFetching : z4.__returned = z4;
     }
   }
   forceFetch(e, t = {}) {
@@ -31929,20 +31127,20 @@ async function runSecondaryModelWithFallback(client, directory, models, prompt,
 }
 
 // src/tools/smartfetch/tool.ts
-var z6 = tool5.schema;
+var z4 = tool4.schema;
 function createWebfetchTool(pluginCtx, options = {}) {
   const binaryDir = options.binaryDir || path18.join(os6.tmpdir(), "opencode-smartfetch");
-  return tool5({
+  return tool4({
     description: WEBFETCH_DESCRIPTION,
     args: {
-      url: z6.httpUrl(),
-      format: z6.enum(["text", "markdown", "html"]).default("markdown"),
-      timeout: z6.number().positive().max(MAX_TIMEOUT_SECONDS).optional().describe("Timeout in seconds, max 120."),
-      prompt: z6.string().optional().describe("Optional extraction task to run on the fetched content using a cheap secondary model."),
-      extract_main: z6.boolean().default(true),
-      prefer_llms_txt: z6.enum(["auto", "always", "never"]).default("auto"),
-      include_metadata: z6.boolean().default(true),
-      save_binary: z6.boolean().default(false).describe("Save binary payload to disk when it fits within the active download limit.")
+      url: z4.httpUrl(),
+      format: z4.enum(["text", "markdown", "html"]).default("markdown"),
+      timeout: z4.number().positive().max(MAX_TIMEOUT_SECONDS).optional().describe("Timeout in seconds, max 120."),
+      prompt: z4.string().optional().describe("Optional extraction task to run on the fetched content using a cheap secondary model."),
+      extract_main: z4.boolean().default(true),
+      prefer_llms_txt: z4.enum(["auto", "always", "never"]).default("auto"),
+      include_metadata: z4.boolean().default(true),
+      save_binary: z4.boolean().default(false).describe("Save binary payload to disk when it fits within the active download limit.")
     },
     async execute(args, ctx) {
       const secondaryModels = await readSecondaryModelFromConfig(ctx.directory || pluginCtx.directory);
@@ -32486,7 +31684,7 @@ async function appLog(ctx, level, message) {
   }
 }
 var HEALTH_CHECK = {
-  minAgents: 5,
+  minAgents: 2,
   minTools: 5,
   minMcps: 1
 };
@@ -32592,7 +31790,7 @@ var OhMyOpenCodeLite = async (ctx) => {
       startAvailabilityCheck(multiplexerConfig);
     }
     depthTracker = new SubagentDepthTracker;
-    councilTools = config.council ? createCouncilTool(ctx, new CouncilManager(ctx, config, depthTracker, multiplexerEnabled)) : {};
+    councilTools = {};
     mcps = createBuiltinMcps(config.disabled_mcps, config.websearch);
     webfetch = createWebfetchTool(ctx);
     skillTools = createSkillTool(config);
@@ -32627,7 +31825,7 @@ var OhMyOpenCodeLite = async (ctx) => {
     interviewManager = createInterviewManager(ctx, config);
     presetManager = createPresetManager(ctx, config);
     divoomManager = createDivoomManager(config.divoom);
-    toolCount = Object.keys(councilTools).length + Object.keys(todoContinuationHook.tool).length + 1 + 1 + 2;
+    toolCount = Object.keys(todoContinuationHook.tool).length + 1 + 1 + 2;
   } catch (err) {
     log("[plugin] FATAL: init failed", String(err));
     await appLog(ctx, "error", `INIT FAILED: ${String(err)}. Report at cnb.cool/zcyoop/ai-assistant/agent-forge/issues/310`);
@@ -32821,8 +32019,6 @@ var OhMyOpenCodeLite = async (ctx) => {
       }
       const tuiAgentModels = {};
       for (const agentDef of agentDefs) {
-        if (agentDef.name === "councillor")
-          continue;
         const entry = configAgent[agentDef.name];
         const resolvedModel = typeof entry?.model === "string" ? entry.model : runtimeChains[agentDef.name]?.[0] ? runtimeChains[agentDef.name][0] : typeof agentDef.config.model === "string" ? agentDef.config.model : undefined;
         tuiAgentModels[agentDef.name] = resolvedModel ?? "default";