mixdog 0.7.4 → 0.7.5

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "mixdog",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Claude Code all-in-one agent plugin — autonomous agents, continuous memory, cost-aware sub-agents, and syntax-aware code editing.",
   "hooks": "./hooks/hooks.json",
   "mcpServers": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixdog",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Claude Code all-in-one bridge plugin: role-based bridge workers, continuous memory, and syntax-aware code editing.",
   "author": "mixdog contributors <dev@tribgames.com>",
   "license": "MIT",

package/setup/wizard.mjs

@@ -13,7 +13,9 @@ import {
   mergeAgentConfig,
   mergeMemoryConfig,
   mergeConfig,
+  mergeSearchConfig,
 } from './config-merge.mjs';
+import { DEFAULT_MODELS } from '../src/search/lib/config.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const REPO_ROOT = join(__dirname, '..');
@@ -32,6 +34,22 @@ const AG_API_PROVIDERS = [
 
 const WORKFLOW_ROLES = ['worker', 'reviewer', 'debugger', 'tester'];
 
+/** Raw SERP API keys (setup.html SR_KEY_PROVIDERS) — independent of active provider. */
+const SEARCH_RAW_KEY_PROVIDERS = [
+  { id: 'firecrawl', name: 'Firecrawl' },
+  { id: 'tavily', name: 'Tavily' },
+  { id: 'exa', name: 'Exa' },
+];
+const SEARCH_OAUTH_PROVIDERS = new Set(['anthropic-oauth', 'openai-oauth', 'grok-oauth']);
+const OPENAI_SEARCH_EFFORT_VALUES = new Set(['low', 'medium', 'high']);
+const SEARCH_OAUTH_ALIASES = Object.freeze({
+  'anthropic-oauth': 'anthropic-oauth',
+  anthropic: 'anthropic-oauth',
+  'openai-oauth': 'openai-oauth',
+  openai: 'openai-oauth',
+  'grok-oauth': 'grok-oauth',
+  grok: 'grok-oauth',
+});
 function pluginDataDir() {
   const dir = process.env.CLAUDE_PLUGIN_DATA;
   if (!dir || typeof dir !== 'string' || !String(dir).trim()) {
@@ -121,11 +139,11 @@ function readHiddenLine(prompt) {
 async function loadConfigModules() {
   const { ensureDataSeeds } = await import('../src/shared/seed.mjs');
   const { readSection, updateSection } = await import('../src/shared/config.mjs');
-  const { DEFAULT_PRESETS } = await import('../src/agent/orchestrator/config.mjs');
+  const { DEFAULT_PRESETS, DEFAULT_MAINTENANCE } = await import('../src/agent/orchestrator/config.mjs');
   const dataDir = pluginDataDir();
   mkdirSync(dataDir, { recursive: true });
   ensureDataSeeds(dataDir);
-  return { readSection, updateSection, DEFAULT_PRESETS, dataDir };
+  return { readSection, updateSection, DEFAULT_PRESETS, DEFAULT_MAINTENANCE, dataDir };
 }
 
 function readUserWorkflow(dataDir) {
@@ -175,18 +193,59 @@ function presetIdsFromAgent(agentSection) {
   return presets.map((p) => p.id || p.name).filter(Boolean);
 }
 
-async function stepDiscordToken(io, { updateSection }) {
-  io.say('\n── Step 2/7: Discord bot token ──');
-  io.say('Paste your Discord bot token (hidden). Enter to skip.');
-  const token = (await io.askSecret('Discord bot token: ')).trim();
-  if (isSkippableAnswer(token)) {
-    io.say('• Skipped Discord token.');
+export async function stepDiscordToken(io, { updateSection, readSection }) {
+  const { hasStoredSecret, SECRET_ACCOUNTS, getDiscordToken } = await import('../src/shared/config.mjs');
+  io.say('\n── Step 2/9: Discord ──');
+  io.say('Bot token (keychain), application ID, and optional main channel.');
+
+  const hadStoredToken = hasStoredSecret(SECRET_ACCOUNTS.discordToken);
+  const tokenPrompt = hadStoredToken
+    ? 'Discord bot token (stored, Enter=keep): '
+    : 'Discord bot token [hidden] (Enter=skip whole step): ';
+  const token = (await io.askSecret(tokenPrompt)).trim();
+  const enteredToken = !isSkippableAnswer(token);
+  if (!enteredToken && !hadStoredToken) {
+    io.say('• Skipped Discord setup.');
     return false;
   }
+
+  const channels = readSection('channels') || {};
+  const curDiscord = channels.discord && typeof channels.discord === 'object' ? channels.discord : {};
+  const curAppId = String(curDiscord.applicationId || '').trim();
+  const appIdBase = 'Application ID';
+  const appIdPrompt = curAppId
+    ? `${appIdBase} (current: ${curAppId}, Enter=keep): `
+    : `${appIdBase}: `;
+  const appIdRaw = await io.ask(appIdPrompt);
+  const appIdToSet = isSkippableAnswer(appIdRaw) ? '' : String(appIdRaw).trim();
+  // The main channel is conventionally named "main" with interactive mode;
+  // only the channel ID varies, so we ask just that. Extra channels and
+  // monitor mode are configured later in the UI.
+  const chIdRaw = await io.ask('Main channel ID (Enter=skip channel): ');
+  const channelId = isSkippableAnswer(chIdRaw) ? '' : String(chIdRaw).trim();
+  const channelName = 'main';
+  const mode = 'interactive';
   const secrets = {};
-  updateSection('channels', (current) => mergeConfig(current, { discord: { token } }, secrets));
-  io.say('• Discord token saved to keychain.');
-  return true;
+  updateSection('channels', (current) => {
+    const payload = {};
+    const discord = {};
+    if (enteredToken) discord.token = token;
+    if (appIdToSet) discord.applicationId = appIdToSet;
+    if (Object.keys(discord).length > 0) payload.discord = discord;
+    if (channelId) {
+      const existingCfg = current.channelsConfig && typeof current.channelsConfig === 'object'
+        ? { ...current.channelsConfig }
+        : {};
+      existingCfg[channelName] = { channelId, mode };
+      payload.channelsConfig = existingCfg;
+      payload.mainChannel = channelName;
+    }
+    return mergeConfig(current, payload, secrets);
+  });
+  if (enteredToken) io.say('• Discord token saved to keychain.');
+  if (appIdToSet) io.say('• Application ID saved.');
+  if (channelId) io.say(`• Main channel "${channelName}" configured (${mode}).`);
+  return enteredToken || hadStoredToken || !!getDiscordToken();
 }
 
 function formatVoiceProgress(p) {
@@ -221,7 +280,7 @@ async function installVoiceRuntime(dataDir, io) {
 /** Mirrors setup.html channels save: `voice` via POST /config → mergeConfig. */
 async function stepVoiceTranscription(io, ctx, discordTokenSaved) {
   if (!discordTokenSaved) return;
-  io.say('\n── Step 2a/7: Voice transcription (음성 전사) ──');
+  io.say('\n── Step 2a/9: Voice transcription (음성 전사) ──');
   io.say('Install local Speech-to-text (whisper.cpp) for Discord voice messages.');
   const raw = await io.ask('Enable voice transcription? [y/N] (Enter=skip): ');
   if (isSkippableAnswer(raw)) {
@@ -247,7 +306,7 @@ async function stepVoiceTranscription(io, ctx, discordTokenSaved) {
 }
 
 async function stepAddressForm(io, { updateSection, readSection }) {
-  io.say('\n── Step 1/7: Address form (호칭) ──');
+  io.say('\n── Step 1/9: Address form (호칭) ──');
   const memory = readSection('memory');
   const curTitle = memory?.user?.title || '';
   const curName = memory?.user?.name || '';
@@ -268,7 +327,7 @@ async function stepAddressForm(io, { updateSection, readSection }) {
 }
 
 export async function stepWebhookReceiver(io, { updateSection, readSection }) {
-  io.say('\n── Step 3/7: Inbound webhooks (ngrok receiver) ──');
+  io.say('\n── Step 3/9: Inbound webhooks (ngrok receiver) ──');
   io.say('Global webhook tunnel for inbound HTTP (channels.webhook). Per-endpoint registration is configured later in the UI.');
   const enableRaw = await io.ask('Enable inbound webhooks? [y/N]: ');
   if (isSkippableAnswer(enableRaw)) {
@@ -304,7 +363,7 @@ export async function stepWebhookReceiver(io, { updateSection, readSection }) {
 }
 
 async function stepProviderKeys(io, { updateSection }) {
-  io.say('\n── Step 4/7: Provider API keys ──');
+  io.say('\n── Step 4/9: Provider API keys ──');
   io.say('Optional API keys (hidden). Enter to skip a provider.');
   const providers = {};
   for (const p of AG_API_PROVIDERS) {
@@ -323,7 +382,7 @@ async function stepProviderKeys(io, { updateSection }) {
 }
 
 async function stepPresets(io, { readSection, updateSection, DEFAULT_PRESETS }) {
-  io.say('\n── Step 5/7: Agent presets ──');
+  io.say('\n── Step 5/9: Agent presets ──');
   const agent = readSection('agent');
   const existing = presetIdsFromAgent(agent);
   if (existing.length > 0) {
@@ -350,11 +409,11 @@ async function stepPresets(io, { readSection, updateSection, DEFAULT_PRESETS })
 }
 
 async function stepRolePresetMapping(io, { readSection, dataDir }) {
-  io.say('\n── Step 6/7: Role → preset mapping ──');
+  io.say('\n── Step 6/9: Role → preset mapping ──');
   const agent = readSection('agent');
   const presetIds = presetIdsFromAgent(agent);
   if (presetIds.length === 0) {
-    io.say('No presets on disk — run step 4 first or configure presets in the Mixdog UI later.');
+    io.say('No presets on disk — run step 5 first or configure presets in the Mixdog UI later.');
     return;
   }
   io.say(`Available presets: ${presetIds.join(', ')}`);
@@ -384,6 +443,154 @@ async function stepRolePresetMapping(io, { readSection, dataDir }) {
   io.say('• Role → preset mapping saved to user-workflow.json.');
 }
 
+function resolveSearchBackendInput(raw) {
+  if (isSkippableAnswer(raw)) return null;
+  const key = String(raw).trim().toLowerCase();
+  return SEARCH_OAUTH_ALIASES[key] || null;
+}
+
+function parseYesNo(raw) {
+  if (isSkippableAnswer(raw)) return null;
+  const v = String(raw).trim().toLowerCase();
+  if (v === 'y' || v === 'yes' || v === 'true' || v === '1') return true;
+  if (v === 'n' || v === 'no' || v === 'false' || v === '0') return false;
+  return undefined;
+}
+
+/** Mirrors POST /search/config → mergeSearchConfig. */
+export async function stepSearchBackend(io, { updateSection, readSection }) {
+  io.say('\n── Step 7/9: Search backend ──');
+  io.say('Active provider: anthropic-oauth | openai-oauth | grok-oauth (OAuth — uses Agent credentials).');
+  const { hasStoredSecret, SECRET_ACCOUNTS, getSearchApiKey } = await import('../src/shared/config.mjs');
+  const search = readSection('search') || {};
+  const curProvider = String(search.provider || 'anthropic-oauth').trim() || 'anthropic-oauth';
+  const backendRaw = await io.ask(`Search provider [${curProvider}]: `);
+  let provider = curProvider;
+  if (!isSkippableAnswer(backendRaw)) {
+    const resolved = resolveSearchBackendInput(backendRaw);
+    if (!resolved) {
+      io.say(`  ! Unknown provider "${String(backendRaw).trim()}" — keeping ${curProvider}.`);
+    } else if (!SEARCH_OAUTH_PROVIDERS.has(resolved)) {
+      io.say(`  ! Provider "${resolved}" is not a supported OAuth backend — keeping ${curProvider}.`);
+    } else {
+      provider = resolved;
+    }
+  }
+
+  const payload = {};
+  if (provider !== curProvider) payload.provider = provider;
+
+  const searchProviders = {};
+  for (const p of SEARCH_RAW_KEY_PROVIDERS) {
+    const hadKey = hasStoredSecret(SECRET_ACCOUNTS.searchApiKey(p.id));
+    const keyPrompt = hadKey
+      ? `${p.name} API key (stored, Enter=keep): `
+      : `${p.name} API key [hidden] (Enter=skip): `;
+    const key = (await io.askSecret(keyPrompt)).trim();
+    if (!isSkippableAnswer(key)) {
+      searchProviders[p.id] = key;
+    }
+  }
+  if (Object.keys(searchProviders).length) payload.searchProviders = searchProviders;
+
+  if (provider === 'openai-oauth') {
+    const curModel = (search.models && search.models.openai)
+      || DEFAULT_MODELS.openai
+      || '';
+    const modelRaw = await io.ask(`OpenAI model [${curModel}] (Enter=keep): `);
+    if (!isSkippableAnswer(modelRaw)) {
+      const model = String(modelRaw).trim();
+      if (model) payload.models = { ...(payload.models || {}), openai: model };
+    }
+    const curEffort = String(search.modelOptions?.openai?.effort || 'medium').trim() || 'medium';
+    const effortRaw = await io.ask(`OpenAI effort (low/medium/high) [${curEffort}] (Enter=keep): `);
+    if (!isSkippableAnswer(effortRaw)) {
+      const effort = String(effortRaw).trim().toLowerCase();
+      if (!OPENAI_SEARCH_EFFORT_VALUES.has(effort)) {
+        io.say(`  ! Unknown effort "${effortRaw.trim()}" — keeping ${curEffort}.`);
+      } else {
+        const openaiOpts = { ...(search.modelOptions?.openai || {}), effort };
+        payload.modelOptions = { ...(payload.modelOptions || {}), openai: openaiOpts };
+      }
+    }
+    const curFast = !!search.modelOptions?.openai?.fast;
+    const fastRaw = await io.ask(`OpenAI Fast mode [${curFast ? 'y' : 'N'}] (y/N, Enter=keep): `);
+    const fastParsed = parseYesNo(fastRaw);
+    if (fastParsed === undefined && !isSkippableAnswer(fastRaw)) {
+      io.say('  ! Fast mode: answer y or n — keeping current.');
+    } else if (fastParsed !== null) {
+      const base = payload.modelOptions?.openai || search.modelOptions?.openai || {};
+      const openaiOpts = { ...base };
+      if (fastParsed) openaiOpts.fast = true;
+      else delete openaiOpts.fast;
+      // Write even an empty object: mergeSearchConfig treats an empty per-family
+      // entry as "clear this family", which is how an explicit Fast=n drops a
+      // lone fast flag (no effort left to keep the object non-empty).
+      payload.modelOptions = { ...(payload.modelOptions || {}), openai: openaiOpts };
+    }
+  } else if (provider === 'grok-oauth') {
+    const curModel = (search.models && search.models.xai)
+      || DEFAULT_MODELS.xai
+      || '';
+    const modelRaw = await io.ask(`xAI model [${curModel}] (Enter=keep): `);
+    if (!isSkippableAnswer(modelRaw)) {
+      const model = String(modelRaw).trim();
+      if (model) payload.models = { ...(payload.models || {}), xai: model };
+    }
+  }
+
+  const secrets = {};
+  updateSection('search', (current) => mergeSearchConfig(current, payload, secrets));
+  const after = readSection('search') || {};
+  const savedProvider = after.provider || curProvider;
+  io.say(`• Search provider: ${savedProvider}.`);
+  for (const p of SEARCH_RAW_KEY_PROVIDERS) {
+    io.say(`• ${p.name} API key: ${getSearchApiKey(p.id) ? 'stored' : 'not set'}.`);
+  }
+  if (savedProvider === 'openai-oauth' && after.models?.openai) {
+    io.say(`• OpenAI model: ${after.models.openai}.`);
+  }
+  if (savedProvider === 'grok-oauth' && after.models?.xai) {
+    io.say(`• xAI model: ${after.models.xai}.`);
+  }
+  if (savedProvider === 'openai-oauth' && after.modelOptions?.openai?.effort) {
+    io.say(`• OpenAI effort: ${after.modelOptions.openai.effort}.`);
+  }
+  if (savedProvider === 'openai-oauth' && after.modelOptions?.openai?.fast) {
+    io.say('• OpenAI Fast mode: on.');
+  }
+}
+
+/** Mirrors POST /agent/maintenance for the explore slot. */
+export async function stepExplorerPreset(io, { readSection, updateSection, DEFAULT_PRESETS, DEFAULT_MAINTENANCE }) {
+  io.say('\n── Step 8/9: Explorer model (explore tool) ──');
+  const agent = readSection('agent') || {};
+  const presetIds = presetIdsFromAgent(agent);
+  const validIds = new Set([
+    ...presetIds,
+    ...DEFAULT_PRESETS.map((p) => p.id).filter(Boolean),
+  ]);
+  const curExplore = String(agent.maintenance?.explore || DEFAULT_MAINTENANCE.explore || 'haiku').trim() || 'haiku';
+  if (validIds.size > 0) {
+    io.say(`Available presets: ${[...validIds].join(', ')}`);
+  }
+  const raw = await io.ask(`Preset for explorer (explore tool) [${curExplore}]: `);
+  if (isSkippableAnswer(raw)) {
+    io.say(`• Explorer preset unchanged (${curExplore}).`);
+    return;
+  }
+  const preset = String(raw).trim();
+  if (!validIds.has(preset)) {
+    io.say(`  ! Unknown preset "${preset}" — keeping ${curExplore}.`);
+    return;
+  }
+  updateSection('agent', (current) => ({
+    ...current,
+    maintenance: { ...(current.maintenance || {}), explore: preset },
+  }));
+  io.say(`• Explorer maintenance preset: ${preset}.`);
+}
+
 /**
  * @param {object} [ioOverride]
  * @param {boolean} [ioOverride.interactive]
@@ -407,6 +614,8 @@ export async function runSetupWizard(ioOverride = null) {
     await stepProviderKeys(io, ctx);
     await stepPresets(io, ctx);
     await stepRolePresetMapping(io, ctx);
+    await stepSearchBackend(io, ctx);
+    await stepExplorerPreset(io, ctx);
     io.say('\n✓ Wizard complete. Restart Claude Code (or /reload-plugins) to load mixdog.');
   } catch (err) {
     io.say(`\n✗ Wizard error: ${err?.message || err}`);