oh-my-opencode-serverlocal 0.1.2 → 0.1.4

package/dist/tools/index.d.ts

@@ -1,7 +1,6 @@
 export { createAcpRunTool } from './acp-run';
 export { ast_grep_replace, ast_grep_search } from './ast-grep';
 export { createCancelTaskTool } from './cancel-task';
-export { createCouncilTool } from './council';
 export type { PresetManager } from './preset-manager';
 export { createPresetManager } from './preset-manager';
 export { createWebfetchTool } from './smartfetch';

package/dist/tui.js

@@ -110,12 +110,10 @@ var SUBAGENT_NAMES = [
   "oracle",
   "designer",
   "fixer",
-  "observer",
-  "council",
-  "councillor"
+  "observer"
 ];
 var ALL_AGENT_NAMES = ["orchestrator", ...SUBAGENT_NAMES];
-var PROTECTED_AGENTS = new Set(["orchestrator", "councillor"]);
+var PROTECTED_AGENTS = new Set(["orchestrator"]);
 var DEFAULT_MODELS = {
   orchestrator: undefined,
   oracle: undefined,
@@ -123,9 +121,7 @@ var DEFAULT_MODELS = {
   explorer: undefined,
   designer: undefined,
   fixer: undefined,
-  observer: undefined,
-  council: undefined,
-  councillor: undefined
+  observer: undefined
 };
 var POLL_INTERVAL_BACKGROUND_MS = 2000;
 var MAX_POLL_TIME_MS = 5 * 60 * 1000;
@@ -148,12 +144,6 @@ var READONLY_FILE_OPERATIONS_RULES = `**File Operations Rules**:
 - Prefer dedicated file tools for codebase inspection: glob/grep/ast_grep_search for discovery and read for file contents.
 - Bash is allowed for non-mutating diagnostics and shell-native inspection when it is the clearest tool, but not for modifying files.
 - Do not use cat/head/tail/sed/awk only to read code into context; use read/grep unless a shell pipeline is genuinely the better diagnostic.`;
-var NO_SHELL_READONLY_FILE_OPERATIONS_RULES = `**File Operations Rules**:
-- READ-ONLY: inspect and report; do not modify files.
-- Use glob/grep/ast_grep_search for discovery and read for file contents.
-- Do not use bash or shell commands.`;
-var TMUX_SPAWN_DELAY_MS = 500;
-var COUNCILLOR_STAGGER_MS = 250;
 var DEFAULT_DISABLED_AGENTS = ["observer"];
 var DEFAULT_MAX_SESSIONS_PER_AGENT = 2;
 var DEFAULT_READ_CONTEXT_MIN_LINES = 10;
@@ -198,96 +188,10 @@ function getOpenCodeConfigPaths() {
   const configDir = getConfigDir();
   return [join(configDir, "opencode.json"), join(configDir, "opencode.jsonc")];
 }
-// src/config/council-schema.ts
-import { z } from "zod";
-
-// src/utils/councillor-models.ts
-function normalizeCouncillorModels(model, fallbackVariant) {
-  const raw = Array.isArray(model) ? model : [model];
-  return raw.map((entry) => typeof entry === "string" ? { id: entry, variant: fallbackVariant } : { id: entry.id, variant: entry.variant ?? fallbackVariant });
-}
-
-// src/config/council-schema.ts
-var ModelIdSchema = z.string().regex(/^[^/\s]+\/[^\s]+$/, 'Expected provider/model format (e.g. "openai/gpt-5.6-luna")');
-var CouncillorModelEntrySchema = z.object({
-  id: ModelIdSchema,
-  variant: z.string().optional()
-});
-var CouncillorModelSchema = z.union([
-  ModelIdSchema,
-  z.array(z.union([ModelIdSchema, CouncillorModelEntrySchema])).min(1)
-]).describe('Model ID in provider/model format (e.g. "openai/gpt-5.6-luna"), or an ' + "ordered fallback chain (array of model IDs or { id, variant } entries) " + "tried in order until one responds.");
-var CouncillorConfigSchema = z.object({
-  model: CouncillorModelSchema,
-  variant: z.string().optional(),
-  prompt: z.string().optional().describe("Optional role/guidance injected into the councillor user prompt")
-}).transform((c) => {
-  const models = normalizeCouncillorModels(c.model, c.variant);
-  return {
-    model: models[0].id,
-    variant: c.variant,
-    prompt: c.prompt,
-    models
-  };
-});
-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.")
-}).transform((data) => {
-  const deprecated = [];
-  if (data.master !== undefined)
-    deprecated.push("master");
-  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
-  };
-});
 // 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,
@@ -301,12 +205,12 @@ 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,
   oracle: ManualAgentPlanSchema,
   designer: ManualAgentPlanSchema,
@@ -314,12 +218,12 @@ var ManualPlanSchema = z2.object({
   librarian: ManualAgentPlanSchema,
   fixer: ManualAgentPlanSchema
 }).strict();
-var PermissionActionSchema = z2.enum(["ask", "allow", "deny"]);
-var PermissionRuleSchema = z2.union([
+var PermissionActionSchema = z.enum(["ask", "allow", "deny"]);
+var PermissionRuleSchema = z.union([
   PermissionActionSchema,
-  z2.record(z2.string(), PermissionActionSchema)
+  z.record(z.string(), PermissionActionSchema)
 ]);
-var PermissionObjectSchema = z2.object({
+var PermissionObjectSchema = z.object({
   read: PermissionRuleSchema.optional(),
   edit: PermissionRuleSchema.optional(),
   glob: PermissionRuleSchema.optional(),
@@ -337,32 +241,32 @@ var PermissionObjectSchema = z2.object({
   codesearch: PermissionActionSchema.optional(),
   doom_loop: PermissionActionSchema.optional()
 }).catchall(PermissionRuleSchema);
-var PermissionConfigSchema = z2.union([
+var PermissionConfigSchema = z.union([
   PermissionActionSchema,
   PermissionObjectSchema
 ]);
-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(),
   permission: PermissionConfigSchema.optional()
 }).strict();
-var MultiplexerTypeSchema = z2.enum([
+var MultiplexerTypeSchema = z.enum([
   "auto",
   "tmux",
   "zellij",
@@ -370,107 +274,106 @@ var MultiplexerTypeSchema = z2.enum([
   "cmux",
   "none"
 ]);
-var MultiplexerLayoutSchema = z2.enum([
+var MultiplexerLayoutSchema = z.enum([
   "main-horizontal",
   "main-vertical",
   "tiled",
   "even-horizontal",
   "even-vertical"
 ]);
-var ZellijPaneModeSchema = z2.enum(["agent-tab", "current-tab"]);
+var ZellijPaneModeSchema = z.enum(["agent-tab", "current-tab"]);
 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),
   zellij_pane_mode: ZellijPaneModeSchema.default("agent-tab")
 });
-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", "gh_grep"]);
-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", "gh_grep"]);
+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 BackgroundJobsConfigSchema = 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 BackgroundJobsConfigSchema = 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 FailoverConfigSchema = z2.object({
-  enabled: z2.boolean().default(true),
-  timeoutMs: z2.number().min(0).default(15000),
-  retryDelayMs: z2.number().min(0).default(500),
-  maxRetries: z2.number().int().min(0).default(3).describe("Number of consecutive 429/rate-limit responses tolerated on the " + "same model before aborting (or swapping to the next fallback " + "model when a chain is configured)."),
-  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."),
-  runtimeOverride: z2.boolean().optional().describe("DEPRECATED: no longer used. Previously controlled whether out-of-chain " + "runtime model picks triggered fallback. Fallback is now always " + "disabled when a user explicitly selects a model via /model.")
+var FailoverConfigSchema = z.object({
+  enabled: z.boolean().default(true),
+  timeoutMs: z.number().min(0).default(15000),
+  retryDelayMs: z.number().min(0).default(500),
+  maxRetries: z.number().int().min(0).default(3).describe("Number of consecutive 429/rate-limit responses tolerated on the " + "same model before aborting (or swapping to the next fallback " + "model when a chain is configured)."),
+  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."),
+  runtimeOverride: z.boolean().optional().describe("DEPRECATED: no longer used. Previously controlled whether out-of-chain " + "runtime model picks triggered fallback. Fallback is now always " + "disabled when a user explicitly selects a model via /model.")
 }).strict();
-var CompanionConfigSchema = z2.object({
-  enabled: z2.boolean().optional(),
-  binaryPath: z2.string().min(1).optional().describe("Path to a custom companion binary to launch."),
-  position: z2.enum(["bottom-right", "bottom-left", "top-right", "top-left"]).optional(),
-  size: z2.enum(["small", "medium", "large"]).optional(),
-  gifPack: z2.enum(["default"]).optional().describe("Bundled companion animation pack to use."),
-  loopStyle: z2.enum(["classic", "smooth"]).optional().describe("Companion animation playback style: classic loops or smooth ping-pong playback."),
-  speed: z2.number().min(0.25).max(4).optional().describe("Companion animation playback speed multiplier. Defaults to 1."),
-  debug: z2.boolean().optional().describe("Enable verbose native companion debug logs.")
+var CompanionConfigSchema = z.object({
+  enabled: z.boolean().optional(),
+  binaryPath: z.string().min(1).optional().describe("Path to a custom companion binary to launch."),
+  position: z.enum(["bottom-right", "bottom-left", "top-right", "top-left"]).optional(),
+  size: z.enum(["small", "medium", "large"]).optional(),
+  gifPack: z.enum(["default"]).optional().describe("Bundled companion animation pack to use."),
+  loopStyle: z.enum(["classic", "smooth"]).optional().describe("Companion animation playback style: classic loops or smooth ping-pong playback."),
+  speed: z.number().min(0.25).max(4).optional().describe("Companion animation playback speed multiplier. Defaults to 1."),
+  debug: z.boolean().optional().describe("Enable verbose native companion debug logs.")
 });
-var AcpAgentPermissionModeSchema = z2.enum(["ask", "allow", "reject"]);
+var AcpAgentPermissionModeSchema = z.enum(["ask", "allow", "reject"]);
 var MAX_ACP_TIMEOUT_MS = 2147483647;
-var AcpAgentConfigSchema = z2.object({
-  command: z2.string().min(1),
-  args: z2.array(z2.string()).default([]),
-  env: z2.record(z2.string(), z2.string()).default({}),
-  cwd: z2.string().min(1).optional(),
-  description: z2.string().min(1).optional(),
-  prompt: z2.string().min(1).optional(),
-  orchestratorPrompt: z2.string().min(1).optional(),
+var AcpAgentConfigSchema = z.object({
+  command: z.string().min(1),
+  args: z.array(z.string()).default([]),
+  env: z.record(z.string(), z.string()).default({}),
+  cwd: z.string().min(1).optional(),
+  description: z.string().min(1).optional(),
+  prompt: z.string().min(1).optional(),
+  orchestratorPrompt: z.string().min(1).optional(),
   wrapperModel: ProviderModelIdSchema.optional(),
-  timeoutMs: z2.number().int().min(0).max(MAX_ACP_TIMEOUT_MS).default(0).describe("Timeout for a single ACP run in milliseconds. Set to 0 to disable the timeout."),
+  timeoutMs: z.number().int().min(0).max(MAX_ACP_TIMEOUT_MS).default(0).describe("Timeout for a single ACP run in milliseconds. Set to 0 to disable the timeout."),
   permissionMode: AcpAgentPermissionModeSchema.default("ask")
 }).strict();
-var AcpAgentsConfigSchema = z2.record(z2.string(), AcpAgentConfigSchema);
+var AcpAgentsConfigSchema = z.record(z.string(), AcpAgentConfigSchema);
 function rejectOrchestratorPromptOnOrchestrator(overrides, ctx, pathPrefix) {
   for (const [name, override] of Object.entries(overrides)) {
     if (name === "orchestrator" && override.orchestratorPrompt !== undefined) {
       ctx.addIssue({
-        code: z2.ZodIssueCode.custom,
+        code: z.ZodIssueCode.custom,
         path: [...pathPrefix, name, "orchestratorPrompt"],
         message: "orchestratorPrompt is not supported for the orchestrator agent"
       });
     }
   }
 }
-var PluginConfigSchema = z2.object({
-  preset: z2.string().optional(),
-  setDefaultAgent: z2.boolean().optional(),
-  compactSidebar: z2.boolean().optional().describe("Use the compact TUI sidebar layout. Defaults to true; set false to use the expanded layout."),
-  stripOrchestratorModel: z2.boolean().optional().describe("When true, omit orchestrator.model and orchestrator.variant from the SDK config so OpenCode uses the session model selected with /model after subagent dispatch. An explicitly selected preset that sets orchestrator.model is preserved. Defaults to false."),
-  autoUpdate: z2.boolean().optional().describe("Disable automatic installation of plugin updates when false. Defaults to true."),
-  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 and council internal agents (councillor) cannot be disabled. " + "By default, 'observer' is disabled. Remove it from this list and configure a vision-capable model to enable."),
-  image_routing: z2.enum(["auto", "direct"]).optional().describe("How image attachments are handled. " + "When omitted, preserves legacy conditional behavior: intercept " + 'attachments only when observer is enabled. "auto": requires ' + "observer to be enabled and saves attachments to disk before " + 'nudging delegation to @observer. "direct": always passes ' + "attachments to the orchestrator untouched."),
-  disabled_mcps: z2.array(z2.string()).optional().describe("MCP server names to disable completely. Disabled servers are not " + "started and cannot be used by agents."),
-  disabled_tools: z2.array(z2.string()).optional().describe("Tool names to disable completely. Disabled tools are not registered with OpenCode and cannot be used by agents."),
-  disabled_skills: z2.array(z2.string()).optional().describe("Skill names to disable completely. Disabled skills are not granted to agents, even when referenced by presets or agent overrides."),
+var PluginConfigSchema = z.object({
+  preset: z.string().optional(),
+  setDefaultAgent: z.boolean().optional(),
+  compactSidebar: z.boolean().optional().describe("Use the compact TUI sidebar layout. Defaults to true; set false to use the expanded layout."),
+  stripOrchestratorModel: z.boolean().optional().describe("When true, omit orchestrator.model and orchestrator.variant from the SDK config so OpenCode uses the session model selected with /model after subagent dispatch. An explicitly selected preset that sets orchestrator.model is preserved. Defaults to false."),
+  autoUpdate: z.boolean().optional().describe("Disable automatic installation of plugin updates when false. Defaults to true."),
+  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 cannot be disabled. " + "By default, 'observer' is disabled. Remove it from this list and configure a vision-capable model to enable."),
+  image_routing: z.enum(["auto", "direct"]).optional().describe("How image attachments are handled. " + "When omitted, preserves legacy conditional behavior: intercept " + 'attachments only when observer is enabled. "auto": requires ' + "observer to be enabled and saves attachments to disk before " + 'nudging delegation to @observer. "direct": always passes ' + "attachments to the orchestrator untouched."),
+  disabled_mcps: z.array(z.string()).optional().describe("MCP server names to disable completely. Disabled servers are not " + "started and cannot be used by agents."),
+  disabled_tools: z.array(z.string()).optional().describe("Tool names to disable completely. Disabled tools are not registered with OpenCode and cannot be used by agents."),
+  disabled_skills: z.array(z.string()).optional().describe("Skill names to disable completely. Disabled skills are not granted to agents, even when referenced by presets or agent overrides."),
   multiplexer: MultiplexerConfigSchema.optional(),
   tmux: TmuxConfigSchema.optional(),
   websearch: WebsearchConfigSchema.optional(),
   interview: InterviewConfigSchema.optional(),
   backgroundJobs: BackgroundJobsConfigSchema.optional(),
   fallback: FailoverConfigSchema.optional(),
-  council: CouncilConfigSchema.optional(),
   companion: CompanionConfigSchema.optional(),
   acpAgents: AcpAgentsConfigSchema.optional()
 }).superRefine((value, ctx) => {
@@ -511,9 +414,7 @@ var DEFAULT_AGENT_MCPS = {
   librarian: ["websearch", "context7", "gh_grep"],
   explorer: [],
   fixer: [],
-  observer: [],
-  council: [],
-  councillor: []
+  observer: []
 };
 function parseList(items, allAvailable) {
   if (!items || items.length === 0) {
@@ -702,7 +603,6 @@ function mergePluginConfigs(base, override) {
     interview: deepMerge(base.interview, override.interview),
     backgroundJobs: deepMerge(base.backgroundJobs, override.backgroundJobs),
     fallback: deepMerge(base.fallback, override.fallback),
-    council: deepMerge(base.council, override.council),
     acpAgents: deepMerge(base.acpAgents, override.acpAgents),
     companion: deepMerge(base.companion, override.companion)
   };
@@ -926,7 +826,7 @@ function isPluginDisabledByEnv(env = process.env) {
 // src/tui.ts
 var PLUGIN_NAME = "oh-my-opencode-serverlocal";
 var CONFIG_WARNING_COLOR = "orange";
-var FALLBACK_SIDEBAR_AGENTS = SUBAGENT_NAMES.filter((agent) => agent !== "councillor" && agent !== "council" && !DEFAULT_DISABLED_AGENTS.includes(agent));
+var FALLBACK_SIDEBAR_AGENTS = SUBAGENT_NAMES.filter((agent) => !DEFAULT_DISABLED_AGENTS.includes(agent));
 var BORDER = { type: "single" };
 async function readPackageVersion() {
   try {

package/dist/utils/session.d.ts

@@ -1,5 +1,5 @@
 /**
- * Shared session utilities for council and background managers.
+ * Shared session utilities for background managers.
  */
 import type { PluginInput } from '@opencode-ai/plugin';
 type OpencodeClient = PluginInput['client'];

package/dist/utils/subagent-depth.d.ts

@@ -2,8 +2,8 @@
  * Tracks subagent spawn depth to prevent excessive nesting.
  *
  * Depth 0 = root session (user's main conversation)
- * Depth 1 = agent spawned by root (e.g., explorer, council)
- * Depth 2 = agent spawned by depth-1 agent (e.g., councillor spawned by council)
+ * Depth 1 = agent spawned by root (e.g., explorer, librarian)
+ * Depth 2 = agent spawned by depth-1 agent (e.g., explorer spawning another subagent)
  * Depth 3 = agent spawned by depth-2 agent (max depth by default)
  *
  * When max depth is exceeded, the spawn is blocked.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode-serverlocal",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Custom serverlocal fork of oh-my-opencode-slim — fully owned, custom prompts + commands, dist synced via opencode-dotfiles",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/agents/council.d.ts

@@ -1,27 +0,0 @@
-import { type AgentDefinition } from './orchestrator';
-export declare function createCouncilAgent(model: string, customPrompt?: string, customAppendPrompt?: string): AgentDefinition;
-/**
- * Build the prompt for a specific councillor session.
- *
- * Returns the raw user prompt - the agent factory (councillor.ts) provides
- * the system prompt with tool-aware instructions. No duplication.
- *
- * If a per-councillor prompt override is provided, it is prepended as
- * role/guidance context before the user's question.
- */
-export declare function formatCouncillorPrompt(userPrompt: string, councillorPrompt?: string): string;
-/**
- * Format councillor results for the council agent to synthesize.
- *
- * Formats councillor results as structured data that the council agent
- * (which called the tool) will receive as the tool response. The council
- * agent's system prompt contains synthesis instructions.
- * Returns a special message when all councillors failed to produce output.
- */
-export declare function formatCouncillorResults(originalPrompt: string, councillorResults: Array<{
-    name: string;
-    model: string;
-    status: string;
-    result?: string;
-    error?: string;
-}>): string;

package/dist/agents/councillor.d.ts

@@ -1,2 +0,0 @@
-import { type AgentDefinition } from './orchestrator';
-export declare function createCouncillorAgent(model: string, customPrompt?: string, customAppendPrompt?: string): AgentDefinition;

package/dist/config/council-schema.d.ts

@@ -1,137 +0,0 @@
-import { z } from 'zod';
-import { type CouncillorModelEntry } from '../utils/councillor-models';
-export type { CouncillorModelEntry };
-/**
- * Configuration for a single councillor within a preset.
- * Each councillor is an independent LLM that processes the same prompt.
- *
- * Councillors run as agent sessions with read-only codebase access
- * (read, glob, grep, lsp, list). They can examine the codebase but
- * cannot modify files or spawn subagents.
- *
- * `model` accepts a single ID or an ordered fallback chain. The parsed config
- * exposes `models` (the normalized chain) plus `model` (the primary, for
- * backward compatibility).
- */
-export declare const CouncillorConfigSchema: z.ZodPipe<z.ZodObject<{
-    model: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
-        id: z.ZodString;
-        variant: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>]>>]>;
-    variant: z.ZodOptional<z.ZodString>;
-    prompt: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>, z.ZodTransform<{
-    model: string;
-    variant: string | undefined;
-    prompt: string | undefined;
-    models: CouncillorModelEntry[];
-}, {
-    model: string | (string | {
-        id: string;
-        variant?: string | undefined;
-    })[];
-    variant?: string | undefined;
-    prompt?: string | undefined;
-}>>;
-export type CouncillorConfig = z.infer<typeof CouncillorConfigSchema>;
-/**
- * A named preset grouping several councillors.
- *
- * All keys are treated as councillor names mapping to councillor configs.
- * The reserved key `"master"` is silently ignored (legacy from when
- * council-master was a separate agent).
- */
-export declare const CouncilPresetSchema: z.ZodPipe<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnknown>>, z.ZodTransform<Record<string, {
-    model: string;
-    variant: string | undefined;
-    prompt: string | undefined;
-    models: CouncillorModelEntry[];
-}>, Record<string, Record<string, unknown>>>>;
-export type CouncilPreset = z.infer<typeof CouncilPresetSchema>;
-/**
- * Execution mode for councillors.
- * - parallel: Run all councillors concurrently (default, fastest for multi-model systems)
- * - serial: Run councillors one at a time (required for single-model systems to avoid conflicts)
- */
-export declare const CouncillorExecutionModeSchema: z.ZodDefault<z.ZodEnum<{
-    parallel: "parallel";
-    serial: "serial";
-}>>;
-/**
- * Top-level council configuration.
- *
- * Example JSONC:
- * ```jsonc
- * {
- *   "council": {
- *     "presets": {
- *       "default": {
- *         "alpha": { "model": "openai/gpt-5.6-luna" },
- *         "beta":  { "model": "openai/gpt-5.3-codex" },
- *         "gamma": { "model": "google/gemini-3-pro" }
- *       }
- *     },
- *     "timeout": 180000,
- *     "councillor_execution_mode": "serial"
- *   }
- * }
- * ```
- */
-export declare const CouncilConfigSchema: z.ZodPipe<z.ZodObject<{
-    presets: z.ZodRecord<z.ZodString, z.ZodPipe<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnknown>>, z.ZodTransform<Record<string, {
-        model: string;
-        variant: string | undefined;
-        prompt: string | undefined;
-        models: CouncillorModelEntry[];
-    }>, Record<string, Record<string, unknown>>>>>;
-    timeout: z.ZodDefault<z.ZodNumber>;
-    default_preset: z.ZodDefault<z.ZodString>;
-    councillor_execution_mode: z.ZodDefault<z.ZodEnum<{
-        parallel: "parallel";
-        serial: "serial";
-    }>>;
-    councillor_retries: z.ZodDefault<z.ZodNumber>;
-    master: z.ZodOptional<z.ZodUnknown>;
-}, z.core.$strip>, z.ZodTransform<{
-    presets: Record<string, Record<string, {
-        model: string;
-        variant: string | undefined;
-        prompt: string | undefined;
-        models: CouncillorModelEntry[];
-    }>>;
-    timeout: number;
-    default_preset: string;
-    councillor_execution_mode: "parallel" | "serial";
-    councillor_retries: number;
-    _deprecated: string[] | undefined;
-    _legacyMasterModel: string | undefined;
-}, {
-    presets: Record<string, Record<string, {
-        model: string;
-        variant: string | undefined;
-        prompt: string | undefined;
-        models: CouncillorModelEntry[];
-    }>>;
-    timeout: number;
-    default_preset: string;
-    councillor_execution_mode: "parallel" | "serial";
-    councillor_retries: number;
-    master?: unknown;
-}>>;
-export type CouncilConfig = z.infer<typeof CouncilConfigSchema>;
-export type CouncillorExecutionMode = z.infer<typeof CouncillorExecutionModeSchema>;
-/**
- * Result of a council session.
- */
-export interface CouncilResult {
-    success: boolean;
-    result?: string;
-    error?: string;
-    councillorResults: Array<{
-        name: string;
-        model: string;
-        status: 'completed' | 'failed' | 'timed_out';
-        result?: string;
-        error?: string;
-    }>;
-}