feat: implement configurable multi-agent runtime limits with a new UI section and settings store integration

milisp · milisp · commit b27acfe72d01 · 2026-05-19T03:30:27.000-04:00
diff --git a/src-tauri/src/codex/config/mod.rs b/src-tauri/src/codex/config/mod.rs
@@ -7,10 +7,45 @@ use std::path::PathBuf;
 
 use self::mcp::McpServerConfig;
 
+/// Multi-agent runtime limits, mirrors the upstream `[agents]` TOML section.
+/// Defaults align with CodexMonitor conventions:
+///   max_threads = 6  (upstream Codex default)
+///   max_depth   = 1  (CodexMonitor product default)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct AgentsConfig {
+    /// Maximum number of concurrent sub-agent threads (UI cap: 12).
+    #[serde(default = "AgentsConfig::default_max_threads")]
+    pub max_threads: u32,
+    /// Maximum agent spawning depth (UI cap: 4).
+    #[serde(default = "AgentsConfig::default_max_depth")]
+    pub max_depth: u32,
+}
+
+impl AgentsConfig {
+    fn default_max_threads() -> u32 {
+        6
+    }
+    fn default_max_depth() -> u32 {
+        1
+    }
+}
+
+impl Default for AgentsConfig {
+    fn default() -> Self {
+        Self {
+            max_threads: Self::default_max_threads(),
+            max_depth: Self::default_max_depth(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CodexConfig {
     #[serde(default)]
     pub mcp_servers: HashMap<String, McpServerConfig>,
+    /// Multi-agent runtime configuration parsed from `[agents]`.
+    #[serde(default)]
+    pub agents: AgentsConfig,
 }
 
 pub fn get_config_path() -> Result<PathBuf, String> {
diff --git a/src/components/settings/SettingsView.tsx b/src/components/settings/SettingsView.tsx
@@ -21,7 +21,12 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/component
 import { GeneralSettings } from './GeneralSettings';
 import { ExplorerSettings } from './ExplorerSettings';
 import { useLayoutStore } from '@/stores/settings';
-import { ConfigSettings, ArchivedThreadSettings, PersonalizationSettings } from './codex';
+import {
+  ConfigSettings,
+  ArchivedThreadSettings,
+  PersonalizationSettings,
+  SettingsAgentsSection,
+} from './codex';
 import { ClaudeSettings } from './ClaudeSettings';
 import { CodexAuth } from '../codex/CodexAuth';
 import { QuoteSettings } from './QuoteSettings';
@@ -41,10 +46,11 @@ type SettingsSection =
   | 'explorer'
   | 'quote'
   | 'task'
+  | 'agents'
   | 'claude'
   | 'remote';
 
-const codexSections = ['codexauth', 'task', 'config', 'personalization', 'archived'] as const;
+const codexSections = ['codexauth', 'task', 'agents', 'config', 'personalization', 'archived'] as const;
 const topLevelSections = ['general', 'projects', 'claude', 'explorer', 'quote', 'remote'] as const;
 
 const sectionLabel: Record<SettingsSection, string> = {
@@ -57,6 +63,7 @@ const sectionLabel: Record<SettingsSection, string> = {
   explorer: 'Explorer',
   quote: 'Quote',
   task: 'Task',
+  agents: 'Multi-agent',
   claude: 'Claude',
   remote: 'Remote',
 };
@@ -78,6 +85,7 @@ export function SettingsView() {
       {activeSection === 'explorer' && <ExplorerSettings />}
       {activeSection === 'quote' && <QuoteSettings />}
       {activeSection === 'task' && <TaskSettings />}
+      {activeSection === 'agents' && <SettingsAgentsSection />}
       {activeSection === 'claude' && <ClaudeSettings />}
       {activeSection === 'remote' && <RemoteSettings />}
     </>
@@ -157,10 +165,11 @@ export function SettingsView() {
                   <button
                     type="button"
                     onClick={() => setActiveSection(section)}
-                    className={`w-full rounded-lg px-3 py-2 text-left transition-colors ${activeSection === section
-                      ? 'bg-accent text-foreground'
-                      : 'text-muted-foreground hover:bg-accent/50 hover:text-foreground'
-                      }`}
+                    className={`w-full rounded-lg px-3 py-2 text-left transition-colors ${
+                      activeSection === section
+                        ? 'bg-accent text-foreground'
+                        : 'text-muted-foreground hover:bg-accent/50 hover:text-foreground'
+                    }`}
                   >
                     {sectionLabel[section]}
                   </button>
@@ -185,10 +194,11 @@ export function SettingsView() {
                         key={section}
                         type="button"
                         onClick={() => setActiveSection(section)}
-                        className={`w-full rounded-lg px-6 py-2 text-left transition-colors ${activeSection === section
-                          ? 'bg-accent text-foreground'
-                          : 'text-muted-foreground hover:bg-accent/50 hover:text-foreground'
-                          }`}
+                        className={`w-full rounded-lg px-6 py-2 text-left transition-colors ${
+                          activeSection === section
+                            ? 'bg-accent text-foreground'
+                            : 'text-muted-foreground hover:bg-accent/50 hover:text-foreground'
+                        }`}
                       >
                         {sectionLabel[section]}
                       </button>
diff --git a/src/components/settings/codex/SettingsAgentsSection.tsx b/src/components/settings/codex/SettingsAgentsSection.tsx
@@ -0,0 +1,76 @@
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { useSettingsStore, AGENTS_MAX_THREADS_CAP, AGENTS_MAX_DEPTH_CAP } from '@/stores/settings';
+
+/**
+ * Settings panel for multi-agent runtime limits.
+ * Mirrors the `[agents]` TOML section that Codex reads from ~/.codex/config.toml.
+ * Product caps: max_threads ≤ 12, max_depth ≤ 4.
+ */
+export function SettingsAgentsSection() {
+  const {
+    agentsMaxThreads,
+    agentsMaxDepth,
+    setAgentsMaxThreads,
+    setAgentsMaxDepth,
+  } = useSettingsStore();
+
+  const handleThreadsChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const val = parseInt(e.target.value, 10);
+    if (!isNaN(val)) setAgentsMaxThreads(val);
+  };
+
+  const handleDepthChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const val = parseInt(e.target.value, 10);
+    if (!isNaN(val)) setAgentsMaxDepth(val);
+  };
+
+  return (
+    <div className="w-full px-2 sm:px-4 space-y-6">
+      <section className="space-y-3">
+        <h3 className="text-sm sm:text-base font-medium">Multi-agent</h3>
+        <div className="flex flex-col gap-3 sm:gap-4">
+
+          {/* max_threads */}
+          <div className="flex items-center justify-between gap-3 rounded-md border p-3 sm:p-4">
+            <div className="space-y-0.5 flex-1 min-w-0">
+              <Label className="text-xs sm:text-sm font-medium">Thread limit</Label>
+              <p className="text-xs text-muted-foreground">
+                Maximum number of concurrent sub-agent threads (1–{AGENTS_MAX_THREADS_CAP}).
+                Injected as <code className="text-xs">agents.max_threads</code> at thread start.
+              </p>
+            </div>
+            <Input
+              type="number"
+              min={1}
+              max={AGENTS_MAX_THREADS_CAP}
+              value={agentsMaxThreads}
+              onChange={handleThreadsChange}
+              className="w-20 text-right"
+            />
+          </div>
+
+          {/* max_depth */}
+          <div className="flex items-center justify-between gap-3 rounded-md border p-3 sm:p-4">
+            <div className="space-y-0.5 flex-1 min-w-0">
+              <Label className="text-xs sm:text-sm font-medium">Spawn depth</Label>
+              <p className="text-xs text-muted-foreground">
+                How many levels deep agents may spawn child agents (1–{AGENTS_MAX_DEPTH_CAP}).
+                Injected as <code className="text-xs">agents.max_depth</code> at thread start.
+              </p>
+            </div>
+            <Input
+              type="number"
+              min={1}
+              max={AGENTS_MAX_DEPTH_CAP}
+              value={agentsMaxDepth}
+              onChange={handleDepthChange}
+              className="w-20 text-right"
+            />
+          </div>
+
+        </div>
+      </section>
+    </div>
+  );
+}
diff --git a/src/components/settings/codex/index.tsx b/src/components/settings/codex/index.tsx
@@ -2,4 +2,5 @@ export * from './ArchivedThreadSettings';
 export * from './ConfigSettings';
 export * from './PersonalizationSettings';
 export * from './RateLimitSettings';
-export * from './TaskSettings';
+export * from './SettingsAgentsSection';
+export * from './TaskSettings';
diff --git a/src/services/codexService.ts b/src/services/codexService.ts
@@ -30,6 +30,7 @@ import type { CollaborationMode } from '@/bindings';
 import type { ThreadListItem } from '@/types/codex/ThreadListItem';
 import { useCodexStore, useConfigStore, type ModeKind } from '@/stores/codex';
 import { useWorkspaceStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings';
 import { convertThreadHistoryToEvents } from '@/utils/threadHistoryConverter';
 import { getErrorMessage } from '@/utils/errorUtils';
 
@@ -72,6 +73,16 @@ const generateWorktreeKey = (): string => {
 const isExperimentalRawEventsCapabilityError = (error: unknown): boolean =>
   getErrorMessage(error).includes('experimentalRawEvents requires experimentalApi capability');
 
+/** Build the agents config fragment to inject into thread config params. */
+const buildAgentsConfigFragment = (): Record<string, unknown> => {
+  const { agentsMaxThreads, agentsMaxDepth } = useSettingsStore.getState();
+  return {
+    'features.multi_agents': true,
+    'agents.max_threads': agentsMaxThreads,
+    'agents.max_depth': agentsMaxDepth,
+  };
+};
+
 type ThreadLike = Thread & { updatedAt?: number };
 const getThreadPreviewFromInput = (userInputs: UserInput[]): string => {
   for (const item of userInputs) {
@@ -271,7 +282,8 @@ export const codexService = {
           model_reasoning_summary: 'auto',
           web_search_request: webSearchRequest,
           view_image_tool: true,
-          'features.multi_agents': true,
+          // Inject user-configured multi-agent limits.
+          ...buildAgentsConfigFragment(),
         },
         experimentalRawEvents: true,
         persistExtendedHistory: true,
@@ -378,7 +390,8 @@ export const codexService = {
           model_reasoning_summary: 'auto',
           web_search_request: webSearchRequest,
           view_image_tool: true,
-          'features.multi_agents': true,
+          // Inject user-configured multi-agent limits.
+          ...buildAgentsConfigFragment(),
         },
         baseInstructions: null,
         developerInstructions: null,
diff --git a/src/stores/settings/useSettingsStore.ts b/src/stores/settings/useSettingsStore.ts
@@ -4,7 +4,19 @@ import { persist } from 'zustand/middleware';
 export type TaskDetail = 'steps' | 'stepsWithCommand' | 'stepsWithOutput';
 export type TaskCompleteBeepMode = 'never' | 'unfocused' | 'always';
 
-export interface SettingState {
+// --- Agents config ---
+// UI caps: max_threads ≤ 12, max_depth ≤ 4 (mirrors CodexMonitor product limits).
+export const AGENTS_MAX_THREADS_CAP = 12;
+export const AGENTS_MAX_DEPTH_CAP = 4;
+
+export interface AgentsSettings {
+  agentsMaxThreads: number;
+  agentsMaxDepth: number;
+  setAgentsMaxThreads: (value: number) => void;
+  setAgentsMaxDepth: (value: number) => void;
+}
+
+export interface SettingState extends AgentsSettings {
   hiddenNames: string[];
   taskDetail: TaskDetail;
   setTaskDetail: (taskDetail: TaskDetail) => void;
@@ -81,10 +93,17 @@ export const useSettingsStore = create<SettingState>()(
       setCustomStunServers: (servers: string[]) => set({ customStunServers: servers }),
       p2pAutoStart: false,
       setP2pAutoStart: (enabled: boolean) => set({ p2pAutoStart: enabled }),
+      // Agents defaults: max_threads=6 (upstream Codex default), max_depth=1 (product default)
+      agentsMaxThreads: 6,
+      agentsMaxDepth: 1,
+      setAgentsMaxThreads: (value: number) =>
+        set({ agentsMaxThreads: Math.min(Math.max(1, value), AGENTS_MAX_THREADS_CAP) }),
+      setAgentsMaxDepth: (value: number) =>
+        set({ agentsMaxDepth: Math.min(Math.max(1, value), AGENTS_MAX_DEPTH_CAP) }),
     }),
     {
       name: 'settings-storage',
-      version: 10
+      version: 10,
     }
   )
 );
