@jungjaehoon/mama-os 0.32.0 → 0.32.2

package/public/viewer/src/modules/settings.ts

@@ -31,7 +31,7 @@ import {
 
 const logger = new DebugLogger('Settings');
 
-export type AgentBackend = 'claude' | 'codex';
+export type AgentBackend = 'claude' | 'codex' | 'cline';
 type SettingsFilterValue = 'loading' | 'error' | 'success' | '';
 type SettingsPayloadToolConfig = {
   gateway: string[];
@@ -118,6 +118,13 @@ const MODEL_OPTIONS: Record<AgentBackend, readonly string[]> = {
     'claude-3-7-sonnet-20250219',
     'claude-3-haiku-20240307',
   ],
+  cline: ['deepseek/deepseek-v4-flash'],
+};
+
+const DEFAULT_MODEL: Record<AgentBackend, string> = {
+  claude: 'claude-sonnet-4-6',
+  codex: 'gpt-5.4',
+  cline: 'deepseek/deepseek-v4-flash',
 };
 
 export function getSettingsModelOptions(backend: AgentBackend, currentModel?: string): string[] {
@@ -819,14 +826,31 @@ export class SettingsModule {
    * Collect form data into config update object
    */
   collectFormData(): SettingsPayload {
-    const backend = (this.getSelectValue('settings-agent-backend') || 'claude') as AgentBackend;
-    const model = this.getSelectValue('settings-agent-model');
-    const effort = (this.getSelectValue('settings-agent-effort') || 'medium') as EffortLevel;
+    const backend = (this.getSelectValue('settings-agent-backend') ||
+      this.config?.agent?.backend ||
+      'claude') as AgentBackend;
+    const model = this.getSelectValue('settings-agent-model') || this.config?.agent?.model || '';
+    const effort = (this.getSelectValue('settings-agent-effort') ||
+      this.config?.agent?.effort ||
+      'medium') as EffortLevel;
     const useClaudeCli = backend === 'claude';
-    const resolvedModel = model || (backend === 'codex' ? 'gpt-5.4' : 'claude-sonnet-4-6');
+    const resolvedModel = this.getNormalizedModelForBackend(backend, model);
     const normalizedEffort = this.supportsEffortModel(resolvedModel)
       ? this.normalizeEffortForModel(resolvedModel, effort)
       : undefined;
+    const hasToolControls =
+      document.querySelectorAll<HTMLInputElement>('.gateway-tool, .mcp-tool').length > 0;
+    const configuredTools = this.config?.agent?.tools;
+    const tools: SettingsPayloadToolConfig = hasToolControls
+      ? this.collectToolModeData()
+      : {
+          gateway: configuredTools?.gateway ?? [],
+          mcp: configuredTools?.mcp ?? [],
+          mcp_config:
+            typeof configuredTools?.mcp_config === 'string'
+              ? configuredTools.mcp_config
+              : '~/.mama/mama-mcp-config.json',
+        };
 
     // Get token values - if empty and original was masked, keep original
     const discordToken = this.getTokenValue('settings-discord-token', this.config?.discord?.token);
@@ -878,9 +902,20 @@ export class SettingsModule {
         model: resolvedModel,
         // Effort for Claude 4.6 models (adaptive thinking). 'max' is Opus-only.
         effort: normalizedEffort,
-        max_turns: this.parseIntegerInput('settings-agent-max-turns', 1, 100, 10),
-        timeout: this.parseIntegerInput('settings-agent-timeout', 1, 600, 300) * 1000,
-        tools: this.collectToolModeData(),
+        max_turns: this.parseIntegerInput(
+          'settings-agent-max-turns',
+          1,
+          100,
+          this.config?.agent?.max_turns ?? 10
+        ),
+        timeout:
+          this.parseIntegerInput(
+            'settings-agent-timeout',
+            1,
+            600,
+            Math.round((this.config?.agent?.timeout ?? 300000) / 1000)
+          ) * 1000,
+        tools,
       },
       token_budget: {
         // Keep existing integer constraint for daily limit to avoid partial values.
@@ -985,14 +1020,17 @@ export class SettingsModule {
   getNormalizedModelForBackend(backend: AgentBackend, model: string): string {
     const isCodexBackend = backend === 'codex';
     if (!model) {
-      return isCodexBackend ? 'gpt-5.4' : 'claude-sonnet-4-6';
+      return DEFAULT_MODEL[backend];
     }
     const isClaudeModel = /^claude-/i.test(model);
     if (isCodexBackend && isClaudeModel) {
-      return 'gpt-5.4';
+      return DEFAULT_MODEL.codex;
+    }
+    if (backend === 'cline' && (isClaudeModel || /^gpt-/i.test(model))) {
+      return DEFAULT_MODEL.cline;
     }
     if (backend === 'claude' && !isClaudeModel) {
-      return 'claude-sonnet-4-20250514';
+      return DEFAULT_MODEL.claude;
     }
     return model;
   }

package/public/viewer/src/utils/api.ts

@@ -155,6 +155,7 @@ export interface ApiHeartbeatConfig {
 export interface ApiAgentToolsConfig {
   gateway?: string[];
   mcp?: string[];
+  mcp_config?: string;
   [key: string]: unknown;
 }
 
@@ -162,7 +163,7 @@ export type EffortLevel = 'low' | 'medium' | 'high' | 'max';
 export type ApiValidationTriggerType = 'agent_test' | 'delegate_run' | 'system_run' | 'audit';
 
 export interface ApiAgentConfig {
-  backend?: 'claude' | 'codex' | 'gemini';
+  backend?: 'claude' | 'codex' | 'cline';
   model?: string;
   effort?: EffortLevel;
   tools?: ApiAgentToolsConfig;
@@ -220,7 +221,7 @@ export interface MultiAgentAgent {
   status?: string;
   model?: string;
   effort?: EffortLevel;
-  backend?: 'claude' | 'codex' | 'gemini';
+  backend?: 'claude' | 'codex' | 'cline';
   bot_token?: string;
   slack_bot_token?: string | null;
   slack_app_token?: string | null;

package/scripts/generate-gateway-tools.ts

@@ -7,7 +7,8 @@
 
 import { writeFileSync, mkdirSync, copyFileSync, existsSync } from 'fs';
 import { join } from 'path';
-import { ToolRegistry } from '../src/agent/tool-registry.js';
+import { buildGatewayToolCatalog } from '../src/agent/gateway-tool-catalog.js';
+import { resolvePrivateConnectorPolicy } from '../src/connectors/private-connector-policy.js';
 
 // ─── Static sections appended after tool list ────────────────────────────────
 
@@ -95,7 +96,16 @@ Call tools via JSON block:
 
 `;
 
-const toolList = ToolRegistry.generatePrompt();
+const publicCatalog = buildGatewayToolCatalog({
+  surface: 'multi-agent-generic',
+  allowedTools: ['*'],
+  privateConnectorPolicy: resolvePrivateConnectorPolicy({
+    ok: true,
+    config: {},
+    enabledNames: [],
+  }),
+});
+const toolList = publicCatalog.prompt;
 // generatePrompt() includes "# Gateway Tools" header — strip it to avoid duplication
 const toolListBody = toolList.replace(/^# Gateway Tools\n*/, '');
 
@@ -118,4 +128,4 @@ try {
   // dist may not exist yet during first build
 }
 
-console.log(`✓ gateway-tools.md generated (${ToolRegistry.count} tools)`);
+console.log(`✓ gateway-tools.md generated (${publicCatalog.toolNames.length} public tools)`);