oh-my-opencode-slim 2.0.5 → 2.1.1

package/dist/tui.js

@@ -131,7 +131,12 @@ var POLL_INTERVAL_BACKGROUND_MS = 2000;
 var MAX_POLL_TIME_MS = 5 * 60 * 1000;
 var DEFAULT_MAX_SUBAGENT_DEPTH = 3;
 var PHASE_REMINDER_TEXT = `!IMPORTANT! Scheduler workflow: plan lanes/dependencies → dispatch background specialists → track task IDs → wait for hook-driven completion → reconcile terminal results → verify. Do not poll running jobs, consume running-job output, or advance dependent work. !END!`;
-var PHASE_REMINDER = `<internal_reminder>${PHASE_REMINDER_TEXT}</internal_reminder>`;
+function formatSystemReminder(text) {
+  return `<system-reminder>
+${text}
+</system-reminder>`;
+}
+var PHASE_REMINDER = formatSystemReminder(PHASE_REMINDER_TEXT);
 var WRITABLE_FILE_OPERATIONS_RULES = `**File Operations Rules**:
 - Prefer dedicated file tools for normal code work: glob/grep/ast_grep_search for discovery, read for file contents, and edit/write/apply_patch for targeted source changes.
 - Use bash for execution and automation: git, package managers, tests, builds, scripts, diagnostics, and shell-native filesystem operations.
@@ -188,11 +193,35 @@ function getOpenCodeConfigPaths() {
 }
 // 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")');
+
+// 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: ModelIdSchema.describe('Model ID in provider/model format (e.g. "openai/gpt-5.4-mini")'),
+  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 = {};
@@ -232,7 +261,7 @@ var CouncilConfigSchema = z.object({
   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: z.unknown().optional().describe("DEPRECATED - ignored. Council agent synthesizes directly.")
 }).transform((data) => {
   const deprecated = [];
   if (data.master !== undefined)
@@ -298,7 +327,13 @@ var AgentOverrideConfigSchema = z2.object({
   options: z2.record(z2.string(), z2.unknown()).optional(),
   displayName: z2.string().min(1).optional()
 }).strict();
-var MultiplexerTypeSchema = z2.enum(["auto", "tmux", "zellij", "none"]);
+var MultiplexerTypeSchema = z2.enum([
+  "auto",
+  "tmux",
+  "zellij",
+  "herdr",
+  "none"
+]);
 var MultiplexerLayoutSchema = z2.enum([
   "main-horizontal",
   "main-vertical",
@@ -340,7 +375,9 @@ var FailoverConfigSchema = z2.object({
   enabled: z2.boolean().default(true),
   timeoutMs: z2.number().min(0).default(15000),
   retryDelayMs: z2.number().min(0).default(500),
-  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.")
+  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().default(true).describe("When true (default), a runtime model selected via /model that is " + "outside the configured fallback chain will still trigger the chain " + "on rate-limit errors. When false, out-of-chain runtime picks are " + "respected and the error surfaces instead of silently falling back " + "to the chain. Models that are members of the chain always fall back " + "regardless of this setting.")
 }).strict();
 var CompanionConfigSchema = z2.object({
   enabled: z2.boolean().optional(),
@@ -367,24 +404,13 @@ var AcpAgentConfigSchema = z2.object({
   permissionMode: AcpAgentPermissionModeSchema.default("ask")
 }).strict();
 var AcpAgentsConfigSchema = z2.record(z2.string(), AcpAgentConfigSchema);
-function validateCustomOnlyPromptFields(overrides, ctx, pathPrefix) {
+function rejectOrchestratorPromptOnOrchestrator(overrides, ctx, pathPrefix) {
   for (const [name, override] of Object.entries(overrides)) {
-    const isBuiltInOrAlias = ALL_AGENT_NAMES.includes(name) || AGENT_ALIASES[name] !== undefined;
-    if (!isBuiltInOrAlias) {
-      continue;
-    }
-    if (override.prompt !== undefined) {
-      ctx.addIssue({
-        code: z2.ZodIssueCode.custom,
-        path: [...pathPrefix, name, "prompt"],
-        message: "prompt is only supported for custom agents"
-      });
-    }
-    if (override.orchestratorPrompt !== undefined) {
+    if (name === "orchestrator" && override.orchestratorPrompt !== undefined) {
       ctx.addIssue({
         code: z2.ZodIssueCode.custom,
         path: [...pathPrefix, name, "orchestratorPrompt"],
-        message: "orchestratorPrompt is only supported for custom agents"
+        message: "orchestratorPrompt is not supported for the orchestrator agent"
       });
     }
   }
@@ -392,6 +418,7 @@ function validateCustomOnlyPromptFields(overrides, ctx, pathPrefix) {
 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."),
   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(),
@@ -410,11 +437,14 @@ var PluginConfigSchema = z2.object({
   acpAgents: AcpAgentsConfigSchema.optional()
 }).superRefine((value, ctx) => {
   if (value.agents) {
-    validateCustomOnlyPromptFields(value.agents, ctx, ["agents"]);
+    rejectOrchestratorPromptOnOrchestrator(value.agents, ctx, ["agents"]);
   }
   if (value.presets) {
     for (const [presetName, preset] of Object.entries(value.presets)) {
-      validateCustomOnlyPromptFields(preset, ctx, ["presets", presetName]);
+      rejectOrchestratorPromptOnOrchestrator(preset, ctx, [
+        "presets",
+        presetName
+      ]);
     }
   }
 });
@@ -470,7 +500,7 @@ function getAgentMcpList(agentName, config) {
   return defaultMcps ?? [];
 }
 
-// src/cli/custom-skills.ts
+// src/cli/custom-skills-registry.ts
 var CUSTOM_SKILLS = [
   {
     name: "simplify",
@@ -508,6 +538,12 @@ var CUSTOM_SKILLS = [
     allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/oh-my-opencode-slim"
   },
+  {
+    name: "release-smoke-test",
+    description: "Validate packed release candidates and bugfixes before public publish",
+    allowedAgents: ["orchestrator"],
+    sourcePath: "src/skills/release-smoke-test"
+  },
   {
     name: "worktrees",
     description: "Manage Git worktrees as OMO safe isolated coding lanes for complex/risky/parallel work",
@@ -605,6 +641,7 @@ function mergePluginConfigs(base, override) {
     ...base,
     ...override,
     agents: deepMerge(base.agents, override.agents),
+    presets: deepMerge(base.presets, override.presets),
     tmux: deepMerge(base.tmux, override.tmux),
     multiplexer: deepMerge(base.multiplexer, override.multiplexer),
     interview: deepMerge(base.interview, override.interview),
@@ -676,15 +713,33 @@ function loadPluginConfig(directory, options) {
   }
   return config;
 }
-function loadAgentPrompt(agentName, preset) {
+function loadAgentPrompt(agentName, optionsOrPreset) {
+  let preset;
+  let projectDirectory;
+  if (typeof optionsOrPreset === "string") {
+    preset = optionsOrPreset;
+  } else if (optionsOrPreset && typeof optionsOrPreset === "object") {
+    preset = optionsOrPreset.preset;
+    projectDirectory = optionsOrPreset.projectDirectory;
+  }
   const presetDirName = preset && /^[a-zA-Z0-9_-]+$/.test(preset) ? preset : undefined;
-  const promptSearchDirs = getConfigSearchDirs().flatMap((configDir) => {
-    const promptsDir = path.join(configDir, PROMPTS_DIR_NAME);
-    return presetDirName ? [path.join(promptsDir, presetDirName), promptsDir] : [promptsDir];
-  });
-  const result = {};
+  const searchDirs = [];
+  if (projectDirectory && presetDirName) {
+    searchDirs.push(path.join(projectDirectory, ".opencode", PROMPTS_DIR_NAME, presetDirName));
+  }
+  if (projectDirectory) {
+    searchDirs.push(path.join(projectDirectory, ".opencode", PROMPTS_DIR_NAME));
+  }
+  if (presetDirName) {
+    for (const userDir of getConfigSearchDirs()) {
+      searchDirs.push(path.join(userDir, PROMPTS_DIR_NAME, presetDirName));
+    }
+  }
+  for (const userDir of getConfigSearchDirs()) {
+    searchDirs.push(path.join(userDir, PROMPTS_DIR_NAME));
+  }
   const readFirstPrompt = (fileName, errorPrefix) => {
-    for (const dir of promptSearchDirs) {
+    for (const dir of searchDirs) {
       const promptPath = path.join(dir, fileName);
       if (!fs.existsSync(promptPath)) {
         continue;
@@ -697,6 +752,7 @@ function loadAgentPrompt(agentName, preset) {
     }
     return;
   };
+  const result = {};
   result.prompt = readFirstPrompt(`${agentName}.md`, "Error reading prompt file");
   result.appendPrompt = readFirstPrompt(`${agentName}_append.md`, "Error reading append prompt file");
   return result;
@@ -859,25 +915,36 @@ function getSidebarAgentNames(snapshot) {
 function agentRow(label, model, variant, theme) {
   const modelParts = splitSidebarModelId(model);
   const detailRows = [];
+  function detailRow(fieldLabel, value) {
+    return box({ width: "100%", flexDirection: "row", paddingLeft: 2 }, [
+      text({ fg: theme.textMuted, width: 9 }, [fieldLabel]),
+      text({ fg: theme.textMuted }, [value])
+    ]);
+  }
   if (modelParts.provider) {
-    detailRows.push(agentDetailRow("provider", modelParts.provider, theme));
+    detailRows.push(detailRow("provider", modelParts.provider));
   }
-  detailRows.push(agentDetailRow("model", modelParts.model, theme));
+  detailRows.push(detailRow("model", modelParts.model));
   if (variant) {
-    detailRows.push(agentDetailRow("variant", variant, theme));
+    detailRows.push(detailRow("variant", variant));
   }
   return box({ width: "100%", flexDirection: "column", marginBottom: 1 }, [
     text({ fg: theme.textMuted }, [label]),
     ...detailRows
   ]);
 }
-function agentDetailRow(label, value, theme) {
-  return box({ width: "100%", flexDirection: "row", paddingLeft: 2 }, [
-    text({ fg: theme.textMuted, width: 9 }, [label]),
-    text({ fg: theme.textMuted }, [value])
+function compactAgentRow(label, model, _variant, theme) {
+  const modelName = splitSidebarModelId(model).model;
+  return box({
+    width: "100%",
+    flexDirection: "row",
+    justifyContent: "space-between"
+  }, [
+    text({ fg: theme.textMuted, width: 14 }, [label]),
+    text({ fg: theme.textMuted }, [modelName])
   ]);
 }
-function renderSidebar(snapshot, version, theme, configInvalid) {
+function renderSidebar(snapshot, version, theme, configInvalid, compactSidebar) {
   const configStatusRow = buildConfigStatusRow(configInvalid, theme);
   return box({
     width: "100%",
@@ -895,7 +962,7 @@ function renderSidebar(snapshot, version, theme, configInvalid) {
       justifyContent: "space-between",
       alignItems: "center"
     }, [
-      box({ paddingLeft: 1, paddingRight: 1, backgroundColor: theme.accent }, [text({ fg: theme.background }, ["OMO-Slim"])]),
+      box({ paddingLeft: 1, paddingRight: 1, backgroundColor: theme.accent }, [text({ fg: theme.text }, ["OMO-Slim"])]),
       text({ fg: theme.textMuted }, [`v${version}`])
     ]),
     configStatusRow,
@@ -905,6 +972,9 @@ function renderSidebar(snapshot, version, theme, configInvalid) {
     ...getSidebarAgentNames(snapshot).map((agentName) => {
       const model = snapshot.agentModels[agentName] ?? "pending";
       const variant = snapshot.agentVariants[agentName];
+      if (compactSidebar) {
+        return compactAgentRow(agentName, model, variant, theme);
+      }
       return agentRow(agentName, model, variant, theme);
     })
   ]);
@@ -922,15 +992,22 @@ function buildConfigStatusRow(configInvalid, theme) {
     text({ fg: theme.textMuted }, ["Run doctor for details"])
   ]);
 }
-function readConfigInvalid(directory) {
+function readConfigState(directory) {
   let configInvalid = false;
-  loadPluginConfig(directory, {
+  const config = loadPluginConfig(directory, {
     silent: true,
     onWarning: () => {
       configInvalid = true;
     }
   });
-  return configInvalid;
+  const compactSidebar = config.compactSidebar ?? true;
+  return { configInvalid, compactSidebar };
+}
+function readConfigInvalid(directory) {
+  return readConfigState(directory).configInvalid;
+}
+function readCompactSidebar(directory) {
+  return readConfigState(directory).compactSidebar;
 }
 var plugin = {
   id: `${PLUGIN_NAME}:tui`,
@@ -939,7 +1016,7 @@ var plugin = {
       return;
     const version = meta.version ?? await readPackageVersion() ?? "dev";
     let configDirectory = getTuiDirectory(api);
-    let configInvalid = readConfigInvalid(configDirectory);
+    let { configInvalid, compactSidebar } = readConfigState(configDirectory);
     let snapshot = readTuiSnapshot();
     const renderTimer = setInterval(async () => {
       try {
@@ -947,7 +1024,7 @@ var plugin = {
         const currentDirectory = getTuiDirectory(api);
         if (currentDirectory !== configDirectory) {
           configDirectory = currentDirectory;
-          configInvalid = readConfigInvalid(configDirectory);
+          ({ configInvalid, compactSidebar } = readConfigState(configDirectory));
         }
         api.renderer.requestRender();
       } catch {}
@@ -959,7 +1036,7 @@ var plugin = {
       order: 900,
       slots: {
         sidebar_content() {
-          return renderSidebar(snapshot, version, api.theme.current, configInvalid);
+          return renderSidebar(snapshot, version, api.theme.current, configInvalid, compactSidebar);
         }
       }
     });
@@ -969,6 +1046,7 @@ var tui_default = plugin;
 export {
   splitSidebarModelId,
   readConfigInvalid,
+  readCompactSidebar,
   getSidebarAgentNames,
   tui_default as default
 };

package/dist/utils/background-job-board.d.ts

@@ -1,3 +1,4 @@
+import type { BackgroundJobStore } from './background-job-store';
 import { type TaskOutputState } from './task';
 export interface ContextFile {
     path: string;
@@ -14,6 +15,7 @@ export interface BackgroundJobRecord {
     objective?: string;
     state: BackgroundJobState;
     timedOut: boolean;
+    recoverableAfterLiveBusy: boolean;
     statusUncertain: boolean;
     cancellationRequested: boolean;
     terminalUnreconciled: boolean;
@@ -28,6 +30,9 @@ export interface BackgroundJobRecord {
     lastUsedAt: number;
     terminalState?: TaskOutputState;
     contextFiles: ContextFile[];
+    totalErrors?: number;
+    timeoutCount?: number;
+    lastErrorAt?: number;
 }
 export interface BackgroundJobBoardOptions {
     maxReusablePerAgent?: number;
@@ -52,15 +57,18 @@ export interface BackgroundJobStatusInput {
     now?: number;
 }
 type TerminalStateListener = (taskID: string) => void;
-export declare class BackgroundJobBoard {
+export declare class BackgroundJobBoard implements BackgroundJobStore {
     private readonly jobs;
     private readonly counters;
-    private terminalStateListener?;
+    private terminalStateListeners;
     private readonly maxReusablePerAgent;
     private readonly readContextMinLines;
     private readonly readContextMaxFiles;
     constructor(options?: BackgroundJobBoardOptions);
+    addTerminalStateListener(listener: TerminalStateListener): void;
+    removeTerminalStateListener(listener: TerminalStateListener): void;
     setTerminalStateListener(listener?: TerminalStateListener): void;
+    private notifyTerminalStateListeners;
     registerLaunch(input: BackgroundJobLaunchInput): BackgroundJobRecord;
     updateStatus(input: BackgroundJobStatusInput): BackgroundJobRecord | undefined;
     updateFromStatusOutput(output: string): BackgroundJobRecord | undefined;
@@ -70,17 +78,29 @@ export declare class BackgroundJobBoard {
         force?: boolean;
     }): BackgroundJobRecord | undefined;
     get(taskID: string): BackgroundJobRecord | undefined;
+    field<K extends keyof BackgroundJobRecord>(taskID: string, key: K): BackgroundJobRecord[K] | undefined;
+    isRunning(taskID: string): boolean;
+    isTerminalUnreconciled(taskID: string): boolean;
+    getResultSummary(taskID: string): string | undefined;
+    getLastLiveBusyAt(taskID: string): number | undefined;
+    getParentSessionID(taskID: string): string | undefined;
+    getState(taskID: string): BackgroundJobState | undefined;
     resolve(parentSessionID: string, taskIDOrAlias: string): BackgroundJobRecord | undefined;
     resolveReusable(parentSessionID: string, taskIDOrAlias: string, agent?: string): BackgroundJobRecord | undefined;
+    resolveRecoverable(parentSessionID: string, taskIDOrAlias: string, agent?: string): BackgroundJobRecord | undefined;
     markUsed(parentSessionID: string, key: string, now?: number): void;
     taskIDs(): Set<string>;
     addContext(taskID: string, files: ContextFile[]): void;
     list(parentSessionID?: string): BackgroundJobRecord[];
     hasRunning(parentSessionID: string): boolean;
     hasTerminalUnreconciled(parentSessionID: string): boolean;
+    hasConvergenceSignals(taskID: string, threshold?: number): boolean;
     formatForPrompt(parentSessionID: string, now?: number): string | undefined;
     clearParent(parentSessionID: string): void;
     drop(taskID: string): void;
+    deferIfRunning(_sessionId: string): boolean;
+    retryDeferredClose(_sessionId: string): boolean;
+    clearDeferredClose(_sessionId: string): void;
     private trimReusable;
     private formatReusableJob;
     private nextAlias;

package/dist/utils/background-job-coordinator.d.ts

@@ -0,0 +1,72 @@
+import type { BackgroundJobBoard, BackgroundJobLaunchInput, BackgroundJobRecord, BackgroundJobStatusInput, ContextFile } from './background-job-board';
+import type { BackgroundJobStore } from './background-job-store';
+import type { TaskOutputState } from './task';
+type TerminalStateListener = (taskID: string) => void;
+/**
+ * BackgroundJobCoordinator owns the lifecycle policy for background jobs.
+ * It sits between the board and its consumers, providing:
+ * - Subscription interface for terminal state notifications (replaces fire-and-forget)
+ * - Lifecycle policy: determines when jobs are terminal, when closes should be deferred
+ * - Single-writer contract: coordinator is the sole writer to the board
+ *
+ * The board's guards prevent silent overwrites. The coordinator adds:
+ * - Centralized notification with guaranteed delivery
+ * - Re-checks board state before notifying (handles races)
+ */
+export declare class BackgroundJobCoordinator implements BackgroundJobStore {
+    private readonly board;
+    private terminalStateListeners;
+    private readonly deferredIdleCloses;
+    constructor(board: BackgroundJobBoard);
+    addTerminalStateListener(listener: TerminalStateListener): void;
+    removeTerminalStateListener(listener: TerminalStateListener): void;
+    /**
+     * Handle terminal state from board. Re-checks board state to handle races.
+     * This is the centralized lifecycle policy.
+     */
+    private handleTerminalState;
+    /**
+     * Evaluate close policy. Returns true if session should close now.
+     * Mutates deferred state: adds to deferred set if running, removes if not.
+     */
+    deferIfRunning(sessionId: string): boolean;
+    /**
+     * Retry closing a deferred session. Called when a background job completes.
+     * Returns true if the session should now close.
+     */
+    retryDeferredClose(sessionId: string): boolean;
+    /**
+     * Clear deferred close state for a session being deleted.
+     */
+    clearDeferredClose(sessionId: string): void;
+    registerLaunch(input: BackgroundJobLaunchInput): BackgroundJobRecord;
+    updateStatus(input: BackgroundJobStatusInput): BackgroundJobRecord | undefined;
+    updateFromStatusOutput(output: string): BackgroundJobRecord | undefined;
+    markRunningFromLiveSession(taskID: string, now?: number): BackgroundJobRecord | undefined;
+    markReconciled(taskID: string, now?: number): BackgroundJobRecord | undefined;
+    markCancelled(taskID: string, reason?: string, now?: number, options?: {
+        force?: boolean;
+    }): BackgroundJobRecord | undefined;
+    get(taskID: string): BackgroundJobRecord | undefined;
+    field<K extends keyof BackgroundJobRecord>(taskID: string, key: K): BackgroundJobRecord[K] | undefined;
+    isRunning(taskID: string): boolean;
+    isTerminalUnreconciled(taskID: string): boolean;
+    getResultSummary(taskID: string): string | undefined;
+    getLastLiveBusyAt(taskID: string): number | undefined;
+    getParentSessionID(taskID: string): string | undefined;
+    getState(taskID: string): TaskOutputState | 'reconciled' | undefined;
+    resolve(parentSessionID: string, taskIDOrAlias: string): BackgroundJobRecord | undefined;
+    resolveReusable(parentSessionID: string, taskIDOrAlias: string, agent?: string): BackgroundJobRecord | undefined;
+    resolveRecoverable(parentSessionID: string, taskIDOrAlias: string, agent?: string): BackgroundJobRecord | undefined;
+    markUsed(parentSessionID: string, key: string, now?: number): void;
+    taskIDs(): Set<string>;
+    addContext(taskID: string, files: ContextFile[]): void;
+    list(parentSessionID?: string): BackgroundJobRecord[];
+    hasRunning(parentSessionID: string): boolean;
+    hasTerminalUnreconciled(parentSessionID: string): boolean;
+    hasConvergenceSignals(taskID: string, threshold?: number): boolean;
+    formatForPrompt(parentSessionID: string, now?: number): string | undefined;
+    clearParent(parentSessionID: string): void;
+    drop(taskID: string): void;
+}
+export {};

package/dist/utils/background-job-store.d.ts

@@ -0,0 +1,46 @@
+import type { BackgroundJobLaunchInput, BackgroundJobRecord, BackgroundJobStatusInput, ContextFile } from './background-job-board';
+import type { TaskOutputState } from './task';
+/**
+ * Unified interface for background job operations.
+ * Both BackgroundJobBoard and BackgroundJobCoordinator satisfy this.
+ *
+ * ponytail: single interface, both board and coordinator implement it.
+ */
+export interface BackgroundJobStore {
+    registerLaunch(input: BackgroundJobLaunchInput): BackgroundJobRecord;
+    updateStatus(input: BackgroundJobStatusInput): BackgroundJobRecord | undefined;
+    updateFromStatusOutput(output: string): BackgroundJobRecord | undefined;
+    markRunningFromLiveSession(taskID: string, now?: number): BackgroundJobRecord | undefined;
+    markReconciled(taskID: string, now?: number): BackgroundJobRecord | undefined;
+    markCancelled(taskID: string, reason?: string, now?: number, options?: {
+        force?: boolean;
+    }): BackgroundJobRecord | undefined;
+    clearParent(parentSessionID: string): void;
+    drop(taskID: string): void;
+    addContext(taskID: string, files: ContextFile[]): void;
+    markUsed(parentSessionID: string, key: string, now?: number): void;
+    get(taskID: string): BackgroundJobRecord | undefined;
+    field<K extends keyof BackgroundJobRecord>(taskID: string, key: K): BackgroundJobRecord[K] | undefined;
+    isRunning(taskID: string): boolean;
+    isTerminalUnreconciled(taskID: string): boolean;
+    getResultSummary(taskID: string): string | undefined;
+    getLastLiveBusyAt(taskID: string): number | undefined;
+    getParentSessionID(taskID: string): string | undefined;
+    getState(taskID: string): TaskOutputState | 'reconciled' | undefined;
+    resolve(parentSessionID: string, taskIDOrAlias: string): BackgroundJobRecord | undefined;
+    resolveReusable(parentSessionID: string, taskIDOrAlias: string, agent?: string): BackgroundJobRecord | undefined;
+    resolveRecoverable(parentSessionID: string, taskIDOrAlias: string, agent?: string): BackgroundJobRecord | undefined;
+    taskIDs(): Set<string>;
+    list(parentSessionID?: string): BackgroundJobRecord[];
+    hasRunning(parentSessionID: string): boolean;
+    hasTerminalUnreconciled(parentSessionID: string): boolean;
+    hasConvergenceSignals(taskID: string, threshold?: number): boolean;
+    formatForPrompt(parentSessionID: string, now?: number): string | undefined;
+    /** Evaluate close policy. Returns true if session should close now.
+     *  Mutates deferred state: adds to deferred set if running, removes if not. */
+    deferIfRunning(sessionId: string): boolean;
+    /** Retry closing a deferred session. Returns true if session should now close. */
+    retryDeferredClose(sessionId: string): boolean;
+    /** Clear deferred close state for a session being deleted. */
+    clearDeferredClose(sessionId: string): void;
+}

package/dist/utils/councillor-models.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Pure helpers for councillor model fallback chains.
+ *
+ * Kept free of any schema/validation library import so that runtime consumers
+ * (e.g. `CouncilManager`) can resolve a councillor's ordered model chain
+ * without pulling in zod or the config schema module.
+ */
+/** A single model in a councillor fallback chain, with optional variant. */
+export type CouncillorModelEntry = {
+    id: string;
+    variant?: string;
+};
+/**
+ * Flatten a councillor model config into an ordered list of model entries.
+ *
+ * Accepts either a single "provider/model" string or an ordered fallback
+ * chain (array of strings and/or `{ id, variant }` entries). Entries that
+ * don't carry their own variant fall back to the shared `fallbackVariant`.
+ */
+export declare function normalizeCouncillorModels(model: string | Array<string | CouncillorModelEntry>, fallbackVariant?: string): CouncillorModelEntry[];

package/dist/utils/index.d.ts

@@ -1,5 +1,7 @@
 export * from './agent-variant';
 export * from './background-job-board';
+export * from './background-job-coordinator';
+export * from './background-job-store';
 export * from './internal-initiator';
 export { getLogDir, initLogger, log } from './logger';
 export * from './polling';

package/dist/utils/internal-initiator.d.ts

@@ -1,6 +1,11 @@
 export declare const SLIM_INTERNAL_INITIATOR_MARKER = "<!-- SLIM_INTERNAL_INITIATOR -->";
+export declare const INTERNAL_INITIATOR_METADATA_KEY = "oh-my-opencode-slim.internalInitiator";
 export declare function createInternalAgentTextPart(text: string): {
     type: 'text';
     text: string;
+    synthetic: true;
+    metadata: {
+        'oh-my-opencode-slim.internalInitiator': true;
+    };
 };
-export declare function hasInternalInitiatorMarker(part: unknown): boolean;
+export declare function isInternalInitiatorPart(part: unknown): boolean;

package/dist/utils/session.d.ts

@@ -11,7 +11,7 @@ export declare function withTimeout<T>(operation: Promise<T>, timeoutMs: number,
 export declare function abortSessionWithTimeout(client: OpencodeClient, sessionId: string, timeoutMs?: number): Promise<void>;
 /**
  * Extract the short model label from a "provider/model" string.
- * E.g. "openai/gpt-5.4-mini" → "gpt-5.4-mini"
+ * E.g. "openai/gpt-5.6-luna" → "gpt-5.6-luna"
  */
 export declare function shortModelLabel(model: string): string;
 export type PromptBody = {
@@ -52,7 +52,7 @@ export declare function parseModelReference(model: string): {
 export declare function promptWithTimeout(client: OpencodeClient, args: Parameters<OpencodeClient['session']['prompt']>[0], timeoutMs: number, signal?: AbortSignal): Promise<void>;
 /**
  * Result of extracting session content.
- * `empty` is true when the assistant produced zero text content —
+ * `empty` is true when the assistant produced zero text content -
  * the provider returned an empty response (e.g. rate-limited silently).
  */
 export interface SessionExtractionResult {

package/oh-my-opencode-slim.schema.json

@@ -8,6 +8,10 @@
     "setDefaultAgent": {
       "type": "boolean"
     },
+    "compactSidebar": {
+      "description": "Use the compact TUI sidebar layout. Defaults to true; set false to use the expanded layout.",
+      "type": "boolean"
+    },
     "autoUpdate": {
       "description": "Disable automatic installation of plugin updates when false. Defaults to true.",
       "type": "boolean"
@@ -221,6 +225,7 @@
             "auto",
             "tmux",
             "zellij",
+            "herdr",
             "none"
           ]
         },
@@ -361,10 +366,22 @@
           "type": "number",
           "minimum": 0
         },
+        "maxRetries": {
+          "default": 3,
+          "description": "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).",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
         "retry_on_empty": {
           "default": true,
           "description": "When true (default), empty provider responses are treated as failures, triggering fallback/retry. Set to false to treat them as successes.",
           "type": "boolean"
+        },
+        "runtimeOverride": {
+          "default": true,
+          "description": "When true (default), a runtime model selected via /model that is outside the configured fallback chain will still trigger the chain on rate-limit errors. When false, out-of-chain runtime picks are respected and the error surfaces instead of silently falling back to the chain. Models that are members of the chain always fall back regardless of this setting.",
+          "type": "boolean"
         }
       },
       "additionalProperties": false
@@ -417,7 +434,7 @@
           "maximum": 5
         },
         "master": {
-          "description": "DEPRECATED — ignored. Council agent synthesizes directly."
+          "description": "DEPRECATED - ignored. Council agent synthesizes directly."
         }
       },
       "required": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode-slim",
-  "version": "2.0.5",
+  "version": "2.1.1",
   "description": "Lightweight agent orchestration plugin for OpenCode - a slimmed-down fork of oh-my-opencode",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",