@happycastle/oh-my-openclaw 0.13.2 → 0.13.3

package/dist/cli/mcporter-setup.d.ts

@@ -0,0 +1,41 @@
+type McpServerEntry = {
+    url: string;
+    description: string;
+};
+export declare const OMOC_MCP_SERVERS: Record<string, McpServerEntry>;
+type McporterConfig = {
+    mcpServers: Record<string, {
+        url?: string;
+        baseUrl?: string;
+        type?: string;
+        [key: string]: unknown;
+    }>;
+    [key: string]: unknown;
+};
+/**
+ * Resolve mcporter config path.
+ * Priority: ~/.openclaw/workspace/config/mcporter.json > ~/.config/mcporter/mcporter.json
+ */
+export declare function resolveMcporterConfigPath(): string;
+export declare function readMcporterConfig(configPath: string): McporterConfig;
+export declare function writeMcporterConfig(configPath: string, config: McporterConfig): void;
+export interface McporterMergeResult {
+    added: string[];
+    skipped: string[];
+}
+export declare function mergeMcpServers(existing: McporterConfig, servers: Record<string, McpServerEntry>): {
+    config: McporterConfig;
+    result: McporterMergeResult;
+};
+type Logger = {
+    info: (msg: string) => void;
+    warn: (msg: string) => void;
+    error: (msg: string) => void;
+};
+export interface McporterSetupOptions {
+    configPath?: string;
+    dryRun?: boolean;
+    logger: Logger;
+}
+export declare function runMcporterSetup(options: McporterSetupOptions): McporterMergeResult;
+export {};

package/dist/cli/mcporter-setup.js

@@ -0,0 +1,102 @@
+import fs from 'node:fs';
+import path from 'node:path';
+export const OMOC_MCP_SERVERS = {
+    'web-search-prime': {
+        url: 'https://api.z.ai/api/mcp/web_search_prime/mcp',
+        description: 'Keyword-based web search (news, blogs, general)',
+    },
+    'web-reader': {
+        url: 'https://api.z.ai/api/mcp/web_reader/mcp',
+        description: 'Clean full-page content extraction',
+    },
+    exa: {
+        url: 'https://mcp.exa.ai/mcp?tools=web_search_exa',
+        description: 'Semantic web search (Exa)',
+    },
+    context7: {
+        url: 'https://mcp.context7.com/mcp',
+        description: 'Library/framework documentation search',
+    },
+    grep_app: {
+        url: 'https://mcp.grep.app',
+        description: 'Open-source code search on GitHub',
+    },
+    zread: {
+        url: 'https://api.z.ai/api/mcp/zread/mcp',
+        description: 'Direct GitHub repository exploration',
+    },
+};
+/**
+ * Resolve mcporter config path.
+ * Priority: ~/.openclaw/workspace/config/mcporter.json > ~/.config/mcporter/mcporter.json
+ */
+export function resolveMcporterConfigPath() {
+    const homeDir = process.env['HOME'] ?? process.env['USERPROFILE'] ?? '';
+    const openclawPath = path.join(homeDir, '.openclaw', 'workspace', 'config', 'mcporter.json');
+    if (fs.existsSync(openclawPath)) {
+        return openclawPath;
+    }
+    const mcporterHomePath = path.join(homeDir, '.config', 'mcporter', 'mcporter.json');
+    if (fs.existsSync(mcporterHomePath)) {
+        return mcporterHomePath;
+    }
+    return openclawPath;
+}
+export function readMcporterConfig(configPath) {
+    if (!fs.existsSync(configPath)) {
+        return { mcpServers: {} };
+    }
+    const raw = fs.readFileSync(configPath, 'utf-8');
+    const parsed = JSON.parse(raw);
+    if (!parsed.mcpServers || typeof parsed.mcpServers !== 'object') {
+        parsed.mcpServers = {};
+    }
+    return parsed;
+}
+export function writeMcporterConfig(configPath, config) {
+    const dir = path.dirname(configPath);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+}
+export function mergeMcpServers(existing, servers) {
+    const result = { added: [], skipped: [] };
+    const merged = { ...existing, mcpServers: { ...existing.mcpServers } };
+    for (const [name, entry] of Object.entries(servers)) {
+        if (merged.mcpServers[name]) {
+            result.skipped.push(name);
+        }
+        else {
+            merged.mcpServers[name] = { url: entry.url };
+            result.added.push(name);
+        }
+    }
+    return { config: merged, result };
+}
+export function runMcporterSetup(options) {
+    const { logger, dryRun = false } = options;
+    const configPath = options.configPath ?? resolveMcporterConfigPath();
+    logger.info(`mcporter config: ${configPath}`);
+    const existing = readMcporterConfig(configPath);
+    const { config: merged, result } = mergeMcpServers(existing, OMOC_MCP_SERVERS);
+    if (result.added.length === 0) {
+        logger.info('No changes needed — all MCP servers already configured.');
+        return result;
+    }
+    if (dryRun) {
+        logger.info(`[dry-run] Would add ${result.added.length} MCP server(s): ${result.added.join(', ')}`);
+        return result;
+    }
+    if (fs.existsSync(configPath)) {
+        const backupPath = configPath + '.bak';
+        fs.copyFileSync(configPath, backupPath);
+        logger.info(`Backup created: ${backupPath}`);
+    }
+    writeMcporterConfig(configPath, merged);
+    logger.info(`Added ${result.added.length} MCP server(s): ${result.added.join(', ')}`);
+    if (result.skipped.length > 0) {
+        logger.info(`Skipped ${result.skipped.length} existing server(s): ${result.skipped.join(', ')}`);
+    }
+    return result;
+}

package/dist/cli/setup.d.ts

@@ -27,6 +27,8 @@ export interface MergeResult {
     added: string[];
     skipped: string[];
     updated: string[];
+    mcporterAdded?: string[];
+    mcporterSkipped?: string[];
 }
 export declare function mergeAgentConfigs(existing: Array<{
     id: string;
@@ -41,6 +43,7 @@ export declare function mergeAgentConfigs(existing: Array<{
 export declare function applyProviderToConfigs(configs: OmocAgentConfig[], provider: string): OmocAgentConfig[];
 export declare function runInteractiveSetup(logger: Logger): Promise<{
     provider: string;
+    setupMcporter: boolean;
 }>;
 export interface SetupOptions {
     configPath?: string;
@@ -48,6 +51,8 @@ export interface SetupOptions {
     force?: boolean;
     dryRun?: boolean;
     provider?: string;
+    setupMcporter?: boolean;
+    mcporterConfigPath?: string;
     interactive?: boolean;
     logger: Logger;
 }

package/dist/cli/setup.js

@@ -4,6 +4,7 @@ import * as readline from 'node:readline';
 import JSON5 from 'json5';
 import { OMOC_AGENT_CONFIGS } from '../agents/agent-configs.js';
 import { PROVIDER_PRESETS, PROVIDER_LABELS, AGENT_TIER_MAP, MODEL_TIERS, applyProviderPreset, getProviderNames, buildCustomPreset, registerCustomPreset, } from './model-presets.js';
+import { OMOC_MCP_SERVERS, runMcporterSetup } from './mcporter-setup.js';
 const CONFIG_FILENAMES = [
     'openclaw.json5',
     'openclaw.json',
@@ -148,8 +149,7 @@ function printPreview(logger, provider) {
 }
 async function runCustomProviderFlow(rl, logger) {
     logger.info('');
-    logger.info('  Enter model IDs for each tier.');
-    logger.info('  Format: provider/model (e.g., cliproxy/claude-opus-4-6, z.ai/gpt-5.3-codex)');
+    logger.info('Step 1/3: Select your AI provider');
     logger.info('');
     const tierModels = {};
     for (const tier of MODEL_TIERS) {
@@ -211,17 +211,29 @@ export async function runInteractiveSetup(logger) {
         logger.info('');
         logger.info(`  ✓ Selected: ${PROVIDER_LABELS[provider] ?? 'Custom'}`);
         logger.info('');
-        logger.info('Step 2/2: Model configuration preview');
+        logger.info('Step 2/3: Model configuration preview');
         logger.info('');
         printPreview(logger, provider);
         logger.info('');
         const confirm = await askQuestion(rl, '  Apply this configuration? (Y/n): ');
         if (confirm.toLowerCase() === 'n' || confirm.toLowerCase() === 'no') {
             logger.info('  Setup cancelled.');
-            return { provider: '' };
+            return { provider: '', setupMcporter: false };
         }
         logger.info('');
-        return { provider };
+        logger.info('Step 3/3: Web search MCP servers');
+        logger.info('');
+        logger.info('  OmOC agents use mcporter MCP servers for web search,');
+        logger.info('  documentation lookup, and code search:');
+        logger.info('');
+        for (const [name, entry] of Object.entries(OMOC_MCP_SERVERS)) {
+            logger.info(`    ${name}: ${entry.description}`);
+        }
+        logger.info('');
+        const mcpConfirm = await askQuestion(rl, '  Set up these MCP servers? (Y/n): ');
+        const setupMcporter = mcpConfirm.toLowerCase() !== 'n' && mcpConfirm.toLowerCase() !== 'no';
+        logger.info('');
+        return { provider, setupMcporter };
     }
     finally {
         rl.close();
@@ -281,6 +293,17 @@ export function runSetup(options) {
     if (result.added.length === 0 && result.updated.length === 0) {
         logger.info('No changes needed — all OmOC agents already present.');
     }
+    if (options.setupMcporter) {
+        logger.info('');
+        logger.info('Setting up mcporter MCP servers...');
+        const mcpResult = runMcporterSetup({
+            configPath: options.mcporterConfigPath,
+            dryRun,
+            logger,
+        });
+        result.mcporterAdded = mcpResult.added;
+        result.mcporterSkipped = mcpResult.skipped;
+    }
     return result;
 }
 export function registerSetupCli(ctx) {
@@ -299,11 +322,13 @@ export function registerSetupCli(ctx) {
                 const valid = getProviderNames().join(', ');
                 throw new Error(`Unknown provider "${provider}". Valid: ${valid}`);
             }
+            let setupMcporter = false;
             if (!provider && process.stdin.isTTY) {
                 const result = await runInteractiveSetup(ctx.logger);
                 if (!result.provider)
                     return;
                 provider = result.provider;
+                setupMcporter = result.setupMcporter;
             }
             runSetup({
                 configPath: opts.config,
@@ -311,6 +336,7 @@ export function registerSetupCli(ctx) {
                 force: provider ? true : opts.force,
                 dryRun: opts.dryRun,
                 provider,
+                setupMcporter,
                 logger: ctx.logger,
             });
             ctx.logger.info('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happycastle/oh-my-openclaw",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Oh-My-OpenClaw plugin — multi-agent orchestration, todo enforcer, ralph loop, and custom tools for OpenClaw",
   "type": "module",
   "main": "dist/index.js",