oh-my-opencode 5.1.54 → 5.1.55

package/dist/config/schema/oh-my-opencode-config.d.ts

@@ -59,6 +59,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -278,6 +282,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -497,6 +505,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -716,6 +728,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -936,6 +952,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -1155,6 +1175,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -1374,6 +1398,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -1593,6 +1621,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -1812,6 +1844,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -2031,6 +2067,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -2250,6 +2290,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -2469,6 +2513,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -2688,6 +2736,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -2907,6 +2959,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                     budgetTokens: z.ZodOptional<z.ZodNumber>;
                 }, z.core.$strip>>;
             }, z.core.$strip>]>>>;
+            models_distribution: z.ZodOptional<z.ZodEnum<{
+                round_robin: "round_robin";
+                sequential: "sequential";
+            }>>;
             fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
                 reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -3126,6 +3182,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                 budgetTokens: z.ZodOptional<z.ZodNumber>;
             }, z.core.$strip>>;
         }, z.core.$strip>]>>>;
+        models_distribution: z.ZodOptional<z.ZodEnum<{
+            round_robin: "round_robin";
+            sequential: "sequential";
+        }>>;
         fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
             model: z.ZodString;
             reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{
@@ -3346,6 +3406,10 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
                 budgetTokens: z.ZodOptional<z.ZodNumber>;
             }, z.core.$strip>>;
         }, z.core.$strip>]>>>;
+        models_distribution: z.ZodOptional<z.ZodEnum<{
+            round_robin: "round_robin";
+            sequential: "sequential";
+        }>>;
         fallback_models: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodArray<z.ZodObject<{
             model: z.ZodString;
             reasoning: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<{

package/dist/index.js

@@ -94726,6 +94726,7 @@ var OmoAgentDefInputSchema = z3.object({
   prompt: z3.string().optional(),
   model: z3.string().optional(),
   models: z3.array(OmoAgentModelEntrySchema).optional(),
+  models_distribution: z3.enum(["sequential", "round_robin"]).optional(),
   reasoning: OmoReasoningSchema.optional(),
   variant: z3.string().optional(),
   reasoningEffort: OmoReasoningEffortSchema.optional(),
@@ -94753,6 +94754,7 @@ var OmoCategoryConfigObjectSchema = z4.object({
   description: z4.string().optional(),
   model: z4.string().optional(),
   models: z4.array(z4.union([z4.string(), OmoFallbackModelObjectSchema])).optional(),
+  models_distribution: z4.enum(["sequential", "round_robin"]).optional(),
   reasoning: OmoReasoningSchema.optional(),
   temperature: z4.number().min(0).max(2).optional(),
   top_p: z4.number().min(0).max(1).optional(),
@@ -96465,6 +96467,27 @@ function resolveModelReferences(view) {
   };
 }
 
+// packages/omo-config-core/src/models/models-distribution.ts
+function createModelDistributor() {
+  const cursors = new Map;
+  return (target, models, distribution) => {
+    if (distribution !== "round_robin" || models.length === 0)
+      return models;
+    const seen = new Set;
+    const unique = models.filter((entry) => {
+      const model = typeof entry === "string" ? entry : entry.model;
+      const key = splitReasoningSuffix2(model, { allowMaxSuffix: true }).base.replace(/\([^()]+\)\s*$/, "").replace(/\s+[a-z][a-z0-9_-]*$/i, "").trim();
+      if (seen.has(key))
+        return false;
+      seen.add(key);
+      return true;
+    });
+    const start = (cursors.get(target) ?? 0) % unique.length;
+    cursors.set(target, (start + 1) % unique.length);
+    return [...unique.slice(start), ...unique.slice(0, start)];
+  };
+}
+
 // packages/omo-config-core/src/writer/types.ts
 import {
   copyFileSync,
@@ -97777,7 +97800,7 @@ init_src();
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "5.1.54",
+  version: "5.1.55",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "./dist/index.js",
   types: "dist/index.d.ts",
@@ -97801,6 +97824,7 @@ var package_default = {
     "packages/openclaw-core",
     "packages/boulder-state",
     "packages/memory-core",
+    "packages/device-service-core",
     "packages/isolation-core",
     "packages/telemetry-core",
     "packages/claude-code-compat-core",
@@ -97921,7 +97945,7 @@ var package_default = {
     "check:copy": "bun script/check-copy.ts",
     typecheck: "bun run check:copy && bun check --no-script --all -p tsconfig.json && bun run typecheck:script && bun run typecheck:packages && bun run typecheck:skill-scripts",
     "typecheck:skill-scripts": "bun check --no-script --all -p packages/shared-skills/skills/frontend/scripts/detect/tsconfig.json",
-    "typecheck:packages": "bun check --no-script --all -p packages/rules-engine/tsconfig.json && bun check --no-script --all -p packages/delegate-core/tsconfig.json && bun check --no-script --all -p packages/mcp-stdio-core/tsconfig.json && bun check --no-script --all -p packages/mcp-client-core/tsconfig.json && bun check --no-script --all -p packages/git-bash-mcp/tsconfig.json && bun check --no-script --all -p packages/ast-grep-mcp/tsconfig.json && bun check --no-script --all -p packages/lsp-core/tsconfig.json && bun check --no-script --all -p packages/utils/tsconfig.json && bun check --no-script --all -p packages/model-core/tsconfig.json && bun check --no-script --all -p packages/omo-config-core/tsconfig.json && bun check --no-script --all -p packages/prompts-core/tsconfig.json && bun check --no-script --all -p packages/comment-checker-core/tsconfig.json && bun check --no-script --all -p packages/hashline-core/tsconfig.json && bun check --no-script --all -p packages/tmux-core/tsconfig.json && bun check --no-script --all -p packages/team-core/tsconfig.json && bun check --no-script --all -p packages/openclaw-core/tsconfig.json && bun check --no-script --all -p packages/boulder-state/tsconfig.json && bun check --no-script --all -p packages/isolation-core/tsconfig.json && bun check --no-script --all -p packages/memory-core/tsconfig.json && bun check --no-script --all -p packages/telemetry-core/tsconfig.json && bun check --no-script --all -p packages/claude-code-compat-core/tsconfig.json && bun check --no-script --all -p packages/skills-loader-core/tsconfig.json && bun check --no-script --all -p packages/agents-md-core/tsconfig.json && bun check --no-script --all -p packages/omo-codex/plugin/shared/tsconfig.json && bun check --no-script --all -p packages/omo-codex/tsconfig.json && bun check --no-script --all -p packages/omo-senpi/tsconfig.json && bun check --no-script --all -p packages/senpi-task/tsconfig.json && bun check --no-script --all -p packages/omo-opencode/tsconfig.json && bun check --no-script --all -p packages/omo-native/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-protocol/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-engine/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-prelude/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-service/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-tool/tsconfig.json",
+    "typecheck:packages": "bun check --no-script --all -p packages/rules-engine/tsconfig.json && bun check --no-script --all -p packages/delegate-core/tsconfig.json && bun check --no-script --all -p packages/mcp-stdio-core/tsconfig.json && bun check --no-script --all -p packages/mcp-client-core/tsconfig.json && bun check --no-script --all -p packages/git-bash-mcp/tsconfig.json && bun check --no-script --all -p packages/ast-grep-mcp/tsconfig.json && bun check --no-script --all -p packages/lsp-core/tsconfig.json && bun check --no-script --all -p packages/utils/tsconfig.json && bun check --no-script --all -p packages/device-service-core/tsconfig.json && bun check --no-script --all -p packages/model-core/tsconfig.json && bun check --no-script --all -p packages/omo-config-core/tsconfig.json && bun check --no-script --all -p packages/prompts-core/tsconfig.json && bun check --no-script --all -p packages/comment-checker-core/tsconfig.json && bun check --no-script --all -p packages/hashline-core/tsconfig.json && bun check --no-script --all -p packages/tmux-core/tsconfig.json && bun check --no-script --all -p packages/team-core/tsconfig.json && bun check --no-script --all -p packages/openclaw-core/tsconfig.json && bun check --no-script --all -p packages/boulder-state/tsconfig.json && bun check --no-script --all -p packages/isolation-core/tsconfig.json && bun check --no-script --all -p packages/memory-core/tsconfig.json && bun check --no-script --all -p packages/telemetry-core/tsconfig.json && bun check --no-script --all -p packages/claude-code-compat-core/tsconfig.json && bun check --no-script --all -p packages/skills-loader-core/tsconfig.json && bun check --no-script --all -p packages/agents-md-core/tsconfig.json && bun check --no-script --all -p packages/omo-codex/plugin/shared/tsconfig.json && bun check --no-script --all -p packages/omo-codex/tsconfig.json && bun check --no-script --all -p packages/omo-senpi/tsconfig.json && bun check --no-script --all -p packages/senpi-task/tsconfig.json && bun check --no-script --all -p packages/omo-opencode/tsconfig.json && bun check --no-script --all -p packages/omo-native/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-protocol/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-engine/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-prelude/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-service/tsconfig.json && bun check --no-script --all -p packages/senpi-desktop-tool/tsconfig.json",
     "typecheck:script": "bun check --no-script --all -p script/tsconfig.json",
     test: "bun test --timeout 20000",
     "changelog:section": "bun script/changelog-section.ts",
@@ -97968,6 +97992,7 @@ var package_default = {
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
     "@oh-my-opencode/boulder-state": "workspace:*",
+    "@oh-my-opencode/device-service-core": "workspace:*",
     "@oh-my-opencode/claude-code-compat-core": "workspace:*",
     "@oh-my-opencode/comment-checker-core": "workspace:*",
     "@oh-my-opencode/delegate-core": "workspace:*",
@@ -98027,18 +98052,18 @@ var package_default = {
     typescript: "^7.0.2"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "5.1.54",
-    "oh-my-opencode-darwin-x64": "5.1.54",
-    "oh-my-opencode-darwin-x64-baseline": "5.1.54",
-    "oh-my-opencode-linux-arm64": "5.1.54",
-    "oh-my-opencode-linux-arm64-musl": "5.1.54",
-    "oh-my-opencode-linux-x64": "5.1.54",
-    "oh-my-opencode-linux-x64-baseline": "5.1.54",
-    "oh-my-opencode-linux-x64-musl": "5.1.54",
-    "oh-my-opencode-linux-x64-musl-baseline": "5.1.54",
-    "oh-my-opencode-windows-arm64": "5.1.54",
-    "oh-my-opencode-windows-x64": "5.1.54",
-    "oh-my-opencode-windows-x64-baseline": "5.1.54"
+    "oh-my-opencode-darwin-arm64": "5.1.55",
+    "oh-my-opencode-darwin-x64": "5.1.55",
+    "oh-my-opencode-darwin-x64-baseline": "5.1.55",
+    "oh-my-opencode-linux-arm64": "5.1.55",
+    "oh-my-opencode-linux-arm64-musl": "5.1.55",
+    "oh-my-opencode-linux-x64": "5.1.55",
+    "oh-my-opencode-linux-x64-baseline": "5.1.55",
+    "oh-my-opencode-linux-x64-musl": "5.1.55",
+    "oh-my-opencode-linux-x64-musl-baseline": "5.1.55",
+    "oh-my-opencode-windows-arm64": "5.1.55",
+    "oh-my-opencode-windows-x64": "5.1.55",
+    "oh-my-opencode-windows-x64-baseline": "5.1.55"
   },
   overrides: {
     hono: "^4.13.8",
@@ -99160,11 +99185,11 @@ function recordFields(value, fields) {
 }
 function modelInput(view) {
   const agents = isPlainRecord(view.agents) ? Object.fromEntries(Object.entries(view.agents).flatMap(([name, definition]) => {
-    const fields = recordFields(definition, ["description", "prompt", "model", "models", "variant", "reasoningEffort", "tools", "temperature", "disable"]);
+    const fields = recordFields(definition, ["description", "prompt", "model", "models", "models_distribution", "variant", "reasoningEffort", "tools", "temperature", "disable"]);
     return fields === undefined ? [] : [[name, fields]];
   })) : undefined;
   const categories = isPlainRecord(view.categories) ? Object.fromEntries(Object.entries(view.categories).flatMap(([name, definition]) => {
-    const fields = recordFields(definition, ["description", "model", "fallback_models", "variant", "temperature", "top_p", "maxTokens", "thinking", "reasoningEffort", "textVerbosity", "tools", "prompt_append", "max_prompt_tokens", "is_unstable_agent", "disable"]);
+    const fields = recordFields(definition, ["description", "model", "models", "models_distribution", "fallback_models", "variant", "temperature", "top_p", "maxTokens", "thinking", "reasoningEffort", "textVerbosity", "tools", "prompt_append", "max_prompt_tokens", "is_unstable_agent", "disable"]);
     return fields === undefined ? [] : [[name, fields]];
   })) : undefined;
   return {
@@ -99433,6 +99458,7 @@ var AgentPermissionSchema = z22.object({
 var AgentOverrideConfigSchema = z23.object({
   model: z23.string().optional(),
   models: z23.array(z23.union([z23.string(), FallbackModelObjectSchema])).optional(),
+  models_distribution: z23.enum(["sequential", "round_robin"]).optional(),
   fallback_models: FallbackModelsSchema.optional(),
   reasoning: OmoReasoningSchema.optional(),
   variant: z23.string().optional(),
@@ -99532,6 +99558,7 @@ var CategoryConfigSchema = z27.object({
   description: z27.string().optional(),
   model: z27.string().optional(),
   models: z27.array(z27.union([z27.string(), FallbackModelObjectSchema])).optional(),
+  models_distribution: z27.enum(["sequential", "round_robin"]).optional(),
   fallback_models: FallbackModelsSchema.optional(),
   reasoning: OmoReasoningSchema.optional(),
   variant: z27.string().optional(),
@@ -100101,7 +100128,8 @@ function materializeAgentModelChains(config) {
     return [name, {
       ...rest,
       ...primarySettings,
-      fallback_models: fallbacks
+      fallback_models: fallbacks,
+      ...agent.models_distribution === "round_robin" ? { models: agent.models } : {}
     }];
   }));
   return changed ? { ...config, agents } : config;
@@ -112770,17 +112798,17 @@ function isOrchestratorAgent(agentName) {
 function createAgentUsageReminderHook(_ctx) {
   const sessionStates = new Map;
   function getOrCreateState(sessionID) {
-    if (!sessionStates.has(sessionID)) {
-      const persisted = loadAgentUsageState(sessionID);
-      const state = persisted ?? {
-        sessionID,
-        agentUsed: false,
-        reminderCount: 0,
-        updatedAt: Date.now()
-      };
-      sessionStates.set(sessionID, state);
-    }
-    return sessionStates.get(sessionID);
+    const cached = sessionStates.get(sessionID);
+    if (cached !== undefined)
+      return cached;
+    const state = loadAgentUsageState(sessionID) ?? {
+      sessionID,
+      agentUsed: false,
+      reminderCount: 0,
+      updatedAt: Date.now()
+    };
+    sessionStates.set(sessionID, state);
+    return state;
   }
   function markAgentUsed(sessionID) {
     const state = getOrCreateState(sessionID);
@@ -112816,9 +112844,8 @@ function createAgentUsageReminderHook(_ctx) {
     saveAgentUsageState(state);
   };
   const eventHandler = async ({ event }) => {
-    const props = event.properties;
     if (event.type === "session.deleted") {
-      const sessionID = resolveSessionEventID(props);
+      const sessionID = resolveSessionEventID(event.properties);
       if (sessionID) {
         resetState(sessionID);
       }
@@ -122497,7 +122524,7 @@ var reviewWorkSkill = {
 // packages/skills-loader-core/src/features/builtin-skills/skills/remove-ai-slops.ts
 var removeAiSlopsSkill = {
   name: "remove-ai-slops",
-  description: "Removes AI-generated code smells from branch changes or an explicit file list behind regression tests. Use when the user asks to clean up, deslop, or remove AI-slop patterns from recent changes.",
+  description: "Removes AI-generated code smells from branch changes or an explicit file list behind regression tests, including junk tests (prose pins, source greps, copied inventories, mock echoes), each proven by its class's rule before a cut. Use when the user asks to clean up, deslop, remove AI-slop patterns, or prune tests from recent changes.",
   template: loadSharedSkillTemplate("remove-ai-slops")
 };
 // packages/skills-loader-core/src/features/builtin-skills/skills/init-deep.ts
@@ -131978,6 +132005,15 @@ function getRawFallbackModels(sessionID, agent, pluginConfig) {
 }
 function getRawFallbackModelsForSession(sessionID, agent, pluginConfig) {
   const sessionCategory = SessionCategoryRegistry.get(sessionID);
+  const categoryConfig = sessionCategory ? pluginConfig.categories?.[sessionCategory] : undefined;
+  const agentKey = agent ? getAgentConfigKey(agent) : undefined;
+  const agentConfig = agentKey ? pluginConfig.agents?.[agentKey] ?? Object.entries(pluginConfig.agents ?? {}).find(([key]) => key.toLowerCase() === agentKey)?.[1] : undefined;
+  const agentCategoryConfig = agentConfig?.category ? pluginConfig.categories?.[agentConfig.category] : undefined;
+  const distribution = categoryConfig?.models_distribution ?? (agentConfig?.models?.length ? agentConfig.models_distribution : !agentConfig?.model ? agentCategoryConfig?.models_distribution : undefined);
+  const bootstrap = distribution === "round_robin" ? getDelegatedChildSessionBootstrap(sessionID) : undefined;
+  if (bootstrap) {
+    return bootstrap.fallbackChain?.flatMap(({ providers, model, ...settings }) => providers.map((provider) => ({ ...settings, model: `${provider}/${model}` }))) ?? [];
+  }
   if (sessionCategory && pluginConfig.categories?.[sessionCategory]) {
     const categoryConfig = pluginConfig.categories[sessionCategory];
     if (categoryConfig?.fallback_models) {
@@ -150617,6 +150653,9 @@ function applyFallbackEntrySettings(input) {
   };
 }
 
+// packages/omo-opencode/src/tools/delegate-task/models-distribution.ts
+var distributeTaskModels = createModelDistributor();
+
 // packages/omo-opencode/src/tools/delegate-task/category-resolver.ts
 function getConfiguredModel(entry) {
   return typeof entry === "string" ? entry : entry?.model;
@@ -150647,7 +150686,8 @@ function categoryResolutionError(error) {
   };
 }
 async function resolveCategoryExecution(args, executorCtx, inheritedModel, systemDefaultModel) {
-  const { client, userCategories, sisyphusJuniorModel } = executorCtx;
+  const { client, sisyphusJuniorModel } = executorCtx;
+  let userCategories = executorCtx.userCategories;
   const enabledCategories = mergeCategories(userCategories);
   const requestedCategoryName = args.category;
   const categoryName = enabledCategories[requestedCategoryName] !== undefined ? requestedCategoryName : canonicalCategoryName(requestedCategoryName);
@@ -150656,6 +150696,16 @@ async function resolveCategoryExecution(args, executorCtx, inheritedModel, syste
     const allCategoryNames = Object.keys(enabledCategories).join(", ");
     return categoryResolutionError(`Unknown category: "${categoryName}". Available: ${allCategoryNames}`);
   }
+  const configuredCategory = userCategories?.[categoryName];
+  if (configuredCategory?.models_distribution === "round_robin" && configuredCategory.models?.length) {
+    userCategories = {
+      ...userCategories,
+      [categoryName]: {
+        ...configuredCategory,
+        models: [...distributeTaskModels(`category:${categoryName}`, configuredCategory.models, "round_robin")]
+      }
+    };
+  }
   const availableModels = await getAvailableModelsForDelegateTask(client);
   const resolved = resolveCategoryConfig(categoryName, {
     userCategories,
@@ -150913,15 +150963,18 @@ async function resolveSubagentModel(agentToUse, matchedAgent, executorCtx) {
   const agentOverride = findAgentOverride2(executorCtx.agentOverrides, agentConfigKey);
   const agentRequirement = AGENT_MODEL_REQUIREMENTS[agentConfigKey];
   const agentCategoryConfig = agentOverride?.category ? executorCtx.userCategories?.[agentOverride.category] : undefined;
-  const agentCategoryModel = agentCategoryConfig?.model;
-  const hasExplicitUserModel = Boolean(agentOverride?.model ?? agentCategoryModel);
-  const normalizedAgentFallbackModels = normalizeFallbackModels(agentOverride?.fallback_models ?? agentCategoryConfig?.fallback_models);
+  const chainConfig = agentOverride?.models?.length ? agentOverride : !agentOverride?.model ? agentCategoryConfig : undefined;
+  const canonicalModels = chainConfig?.models_distribution === "round_robin" && chainConfig.models?.length ? [...distributeTaskModels(chainConfig === agentOverride ? `agent:${agentConfigKey}` : `category:${agentOverride?.category}`, chainConfig.models, "round_robin")] : undefined;
+  const firstEntry = canonicalModels?.[0];
+  const explicitModel = (typeof firstEntry === "string" ? firstEntry : firstEntry?.model) ?? agentOverride?.model ?? agentCategoryConfig?.model;
+  const hasExplicitUserModel = Boolean(explicitModel);
+  const normalizedAgentFallbackModels = normalizeFallbackModels(canonicalModels?.slice(1) ?? agentOverride?.fallback_models ?? agentCategoryConfig?.fallback_models);
   const availableModels = await getAvailableModelsForDelegateTask(executorCtx.client);
   const normalizedMatchedModel = matchedAgent.model ? normalizeModelFormat(matchedAgent.model) : undefined;
   const matchedAgentModelStr = normalizedMatchedModel ? `${normalizedMatchedModel.providerID}/${normalizedMatchedModel.modelID}` : undefined;
-  if (agentOverride?.model || agentCategoryModel || agentRequirement || matchedAgent.model) {
+  if (canonicalModels || agentOverride?.model || agentCategoryConfig?.model || agentRequirement || matchedAgent.model) {
     const resolution = resolveModelForDelegateTask2({
-      userModel: agentOverride?.model ?? agentCategoryModel,
+      userModel: explicitModel,
       userFallbackModels: flattenToFallbackModelStrings(normalizedAgentFallbackModels),
       categoryDefaultModel: matchedAgentModelStr,
       fallbackChain: agentRequirement?.fallbackChain,
@@ -150936,8 +150989,7 @@ async function resolveSubagentModel(agentToUse, matchedAgent, executorCtx) {
         const resolvedModel = variantToUse ? { ...normalized, variant: variantToUse } : normalized;
         categoryModel = applyCategoryParams(resolvedModel, agentCategoryConfig);
       }
-    } else if (resolutionSkipped && (agentOverride?.model ?? agentCategoryModel)) {
-      const explicitModel = agentOverride?.model ?? agentCategoryModel;
+    } else if (resolutionSkipped && explicitModel) {
       const normalized = explicitModel ? normalizeModelFormat(explicitModel) : undefined;
       if (normalized) {
         const variantToUse = agentOverride?.variant ?? agentCategoryConfig?.variant;
@@ -150945,14 +150997,19 @@ async function resolveSubagentModel(agentToUse, matchedAgent, executorCtx) {
         categoryModel = applyCategoryParams(resolvedModel, agentCategoryConfig);
         log2("[delegate-task] Cold cache: using explicit user override for subagent", {
           agent: agentToUse,
-          model: agentOverride?.model ?? agentCategoryModel
+          model: explicitModel
         });
       }
     }
     const defaultProviderID = categoryModel?.providerID ?? normalizedMatchedModel?.providerID ?? "opencode";
     const configuredFallbackChain = buildFallbackChainFromModels(normalizedAgentFallbackModels, defaultProviderID);
+    const canonicalChain = buildFallbackChainFromModels(canonicalModels, defaultProviderID);
+    const canonicalEntry = categoryModel && canonicalChain ? findMostSpecificFallbackEntry(categoryModel.providerID, categoryModel.modelID, canonicalChain) : undefined;
     fallbackChain = configuredFallbackChain ?? (resolutionSkipped || hasExplicitUserModel ? undefined : agentRequirement?.fallbackChain);
-    const effectiveEntry = resolveEffectiveFallbackEntry({
+    if (canonicalChain && canonicalEntry) {
+      fallbackChain = canonicalChain.slice(canonicalChain.indexOf(canonicalEntry) + 1);
+    }
+    const effectiveEntry = canonicalEntry ?? resolveEffectiveFallbackEntry({
       categoryModel,
       configuredFallbackChain,
       resolution
@@ -167996,6 +168053,22 @@ async function createClient3(params) {
   return await createStdioClient(params);
 }
 
+// packages/mcp-client-core/src/skill-mcp-manager/request-options.ts
+var MAX_TIMER_DELAY_MS = 2147483647;
+function resolveRequestTimeoutMs(config) {
+  const timeout = config.timeout;
+  if (typeof timeout !== "number" || !Number.isFinite(timeout))
+    return;
+  return timeout > 0 && timeout <= MAX_TIMER_DELAY_MS ? timeout : undefined;
+}
+function buildRequestOptions(config, scope) {
+  const timeout = resolveRequestTimeoutMs(config);
+  return {
+    ...scope?.signal === undefined ? {} : { signal: scope.signal },
+    ...timeout === undefined ? {} : { timeout }
+  };
+}
+
 // packages/mcp-client-core/src/skill-mcp-manager/manager.ts
 function buildSkillMcpClientKey(info, options) {
   const baseKey = `${info.sessionID}:${info.skillName}:${info.serverName}`;
@@ -168070,21 +168143,21 @@ class SkillMcpManager {
   async listTools(info, context, options) {
     const client = await this.getOrCreateClientWithRetry(info, context.config, options);
     return this.collectPages(async (cursor) => {
-      const result = await client.listTools(cursor === undefined ? undefined : { cursor });
+      const result = await client.listTools(cursor === undefined ? undefined : { cursor }, buildRequestOptions(context.config, options));
       return { items: result.tools, nextCursor: result.nextCursor };
     });
   }
   async listResources(info, context, options) {
     const client = await this.getOrCreateClientWithRetry(info, context.config, options);
     return this.collectPages(async (cursor) => {
-      const result = await client.listResources(cursor === undefined ? undefined : { cursor });
+      const result = await client.listResources(cursor === undefined ? undefined : { cursor }, buildRequestOptions(context.config, options));
       return { items: result.resources, nextCursor: result.nextCursor };
     });
   }
   async listPrompts(info, context, options) {
     const client = await this.getOrCreateClientWithRetry(info, context.config, options);
     return this.collectPages(async (cursor) => {
-      const result = await client.listPrompts(cursor === undefined ? undefined : { cursor });
+      const result = await client.listPrompts(cursor === undefined ? undefined : { cursor }, buildRequestOptions(context.config, options));
       return { items: result.prompts, nextCursor: result.nextCursor };
     });
   }
@@ -168102,18 +168175,18 @@ class SkillMcpManager {
   }
   async callTool(info, context, name, args, options) {
     return await this.withOperationRetry(info, context.config, options, async (client) => {
-      return await client.callTool({ name, arguments: args }, undefined, { signal: options?.signal });
+      return await client.callTool({ name, arguments: args }, undefined, buildRequestOptions(context.config, options));
     });
   }
   async readResource(info, context, uri, options) {
     return await this.withOperationRetry(info, context.config, options, async (client) => {
-      const result = await client.readResource({ uri }, { signal: options?.signal });
+      const result = await client.readResource({ uri }, buildRequestOptions(context.config, options));
       return result.contents;
     });
   }
   async getPrompt(info, context, name, args, options) {
     return await this.withOperationRetry(info, context.config, options, async (client) => {
-      const result = await client.getPrompt({ name, arguments: args }, { signal: options?.signal });
+      const result = await client.getPrompt({ name, arguments: args }, buildRequestOptions(context.config, options));
       return result.messages;
     });
   }
@@ -181540,7 +181613,6 @@ function mapScopeToLocation(scope) {
 }
 function buildAvailableSkills(discoveredSkills, browserProvider, disabledSkills, teamModeEnabled, agentName) {
   const builtinSkills = createBuiltinSkills({ browserProvider, disabledSkills, teamModeEnabled });
-  const builtinSkillNames = new Set(builtinSkills.map((s) => s.name));
   const builtinAvailable = builtinSkills.map((skill) => ({
     name: skill.name,
     description: skill.description,