@happycastle/oh-my-openclaw 0.13.3 → 0.13.4

package/dist/cli/setup.d.ts

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

package/dist/cli/setup.js

@@ -4,7 +4,6 @@ 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',
@@ -149,7 +148,8 @@ function printPreview(logger, provider) {
 }
 async function runCustomProviderFlow(rl, logger) {
     logger.info('');
-    logger.info('Step 1/3: Select your AI provider');
+    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('');
     const tierModels = {};
     for (const tier of MODEL_TIERS) {
@@ -211,29 +211,17 @@ export async function runInteractiveSetup(logger) {
         logger.info('');
         logger.info(`  ✓ Selected: ${PROVIDER_LABELS[provider] ?? 'Custom'}`);
         logger.info('');
-        logger.info('Step 2/3: Model configuration preview');
+        logger.info('Step 2/2: 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: '', setupMcporter: false };
+            return { provider: '' };
         }
         logger.info('');
-        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 };
+        return { provider };
     }
     finally {
         rl.close();
@@ -293,17 +281,6 @@ 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) {
@@ -322,13 +299,11 @@ 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,
@@ -336,7 +311,6 @@ export function registerSetupCli(ctx) {
                 force: provider ? true : opts.force,
                 dryRun: opts.dryRun,
                 provider,
-                setupMcporter,
                 logger: ctx.logger,
             });
             ctx.logger.info('');

package/dist/hooks/persona-injector.d.ts

@@ -1,2 +1,10 @@
 import { OmocPluginApi } from '../types.js';
+/**
+ * Check whether persona content is already present in session history.
+ *
+ * OpenClaw's `prependContext` is merged into the user prompt and persisted
+ * in session history. Without this check the persona text accumulates —
+ * appearing once per historical user message sent to the model.
+ */
+export declare function isPersonaAlreadyInHistory(messages: unknown[] | undefined, personaContent: string): boolean;
 export declare function registerPersonaInjector(api: OmocPluginApi): void;

package/dist/hooks/persona-injector.js

@@ -24,6 +24,33 @@ async function resolveEffectivePersona(ctx) {
         return null;
     return { personaId: resolved, source: 'auto' };
 }
+const FINGERPRINT_LENGTH = 200;
+/**
+ * Check whether persona content is already present in session history.
+ *
+ * OpenClaw's `prependContext` is merged into the user prompt and persisted
+ * in session history. Without this check the persona text accumulates —
+ * appearing once per historical user message sent to the model.
+ */
+export function isPersonaAlreadyInHistory(messages, personaContent) {
+    if (!messages || messages.length === 0)
+        return false;
+    const fingerprint = personaContent.slice(0, FINGERPRINT_LENGTH).trim();
+    if (!fingerprint)
+        return false;
+    for (const msg of messages) {
+        if (!msg || typeof msg !== 'object')
+            continue;
+        const record = msg;
+        if (record['role'] !== 'user')
+            continue;
+        const content = record['content'];
+        if (typeof content === 'string' && content.includes(fingerprint)) {
+            return true;
+        }
+    }
+    return false;
+}
 export function registerPersonaInjector(api) {
     // Use the typed hook system (api.on) for before_prompt_build.
     // This directly injects into the system prompt via prependContext,
@@ -32,7 +59,7 @@ export function registerPersonaInjector(api) {
     // api.registerHook('before_prompt_build', ...) registers into the internal
     // hook system which does NOT trigger before_prompt_build — only hookRunner
     // (typed hooks via api.on) does.
-    api.on('before_prompt_build', async (_event, ctx) => {
+    api.on('before_prompt_build', async (event, ctx) => {
         const result = await resolveEffectivePersona(ctx);
         if (!result) {
             const manual = await getActivePersona();
@@ -42,6 +69,10 @@ export function registerPersonaInjector(api) {
         const { personaId, source } = result;
         try {
             const content = readPersonaPromptSync(personaId);
+            if (isPersonaAlreadyInHistory(event.messages, content)) {
+                api.logger.info(`${LOG_PREFIX} Persona already in history, skipping injection: ${personaId} (${source})`);
+                return;
+            }
             api.logger.info(`${LOG_PREFIX} Persona injected via before_prompt_build: ${personaId} (${source}, agentId=${ctx.agentId ?? 'none'})`);
             return {
                 prependContext: content,

package/package.json

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

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

@@ -1,41 +0,0 @@
-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

@@ -1,102 +0,0 @@
-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;
-}