@dmsdc-ai/aigentry-deliberation 0.0.32 → 0.0.34

package/index.js

@@ -516,6 +516,34 @@ function dedupeSpeakers(items = []) {
   return out;
 }
 
+function hasExplicitBrowserParticipantSelection({ speakers, participant_types } = {}) {
+  const manualSpeakers = Array.isArray(speakers) ? speakers : [];
+  const hasBrowserSpeaker = manualSpeakers.some(speaker => {
+    const normalized = normalizeSpeaker(speaker);
+    return normalized?.startsWith("web-");
+  });
+  if (hasBrowserSpeaker) return true;
+
+  const overrides = participant_types && typeof participant_types === "object"
+    ? Object.entries(participant_types)
+    : [];
+
+  return overrides.some(([speaker, type]) => {
+    const normalized = normalizeSpeaker(speaker);
+    return normalized?.startsWith("web-") || type === "browser" || type === "browser_auto";
+  });
+}
+
+function resolveIncludeBrowserSpeakers({ include_browser_speakers, config, speakers, participant_types } = {}) {
+  if (include_browser_speakers !== undefined && include_browser_speakers !== null) {
+    return include_browser_speakers;
+  }
+  if (config?.include_browser_speakers !== undefined && config?.include_browser_speakers !== null) {
+    return config.include_browser_speakers;
+  }
+  return false;
+}
+
 function resolveCliCandidates() {
   const fromEnv = (process.env.DELIBERATION_CLI_CANDIDATES || "")
     .split(/[,\s]+/)
@@ -2473,6 +2501,10 @@ server.tool(
       (v) => (typeof v === "string" ? v === "true" : v),
       z.boolean().optional()
     ).describe("Whether to auto-discover speakers when omitted (defaults to config setting)"),
+    include_browser_speakers: z.preprocess(
+      (v) => (typeof v === "string" ? v === "true" : v),
+      z.boolean().optional()
+    ).describe("Whether browser speakers are allowed to participate. Defaults to false unless explicitly enabled."),
     participant_types: z.preprocess(
       (v) => (typeof v === "string" ? JSON.parse(v) : v),
       z.record(z.string(), z.enum(["cli", "browser", "browser_auto", "manual"])).optional()
@@ -2486,7 +2518,7 @@ server.tool(
     role_preset: z.enum(["balanced", "debate", "research", "brainstorm", "review", "consensus"]).optional()
     .describe("Role preset (balanced/debate/research/brainstorm/review/consensus). Ignored if speaker_roles is specified"),
     },
-    safeToolHandler("deliberation_start", async ({ topic, session_id, rounds, first_speaker, speakers, speaker_instructions, require_manual_speakers, auto_discover_speakers, participant_types, ordering_strategy, speaker_roles, role_preset }) => {
+    safeToolHandler("deliberation_start", async ({ topic, session_id, rounds, first_speaker, speakers, speaker_instructions, require_manual_speakers, auto_discover_speakers, include_browser_speakers, participant_types, ordering_strategy, speaker_roles, role_preset }) => {
     // ── First-time onboarding guard ──
     const config = loadDeliberationConfig();
     if (!config.setup_complete) {
@@ -2495,7 +2527,7 @@ server.tool(
       return {
         content: [{
           type: "text",
-          text: `🎉 **Welcome to Deliberation!**\n\nPlease configure basic settings before starting.\n\n**Currently detected speakers:**\n${candidateText}\n\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\nYou can set all options at once:\n\n\`\`\`\ndeliberation_cli_config(\n  require_speaker_selection: true/false,\n  default_rounds: 3,\n  default_ordering: "auto"\n)\n\`\`\`\n\n**1. Speaker participation mode** (\`require_speaker_selection\`)\n   - \`true\` — Select participating speakers each time\n   - \`false\` — All detected CLI + browser LLMs auto-join\n\n**2. Default rounds** (\`default_rounds\`)\n   - \`1\` — Quick consensus\n   - \`3\` — Default (recommended)\n   - \`5\` — Deep discussion\n\n**3. Ordering strategy** (\`default_ordering\`)\n   - \`"auto"\` — cyclic for 2 speakers, weighted-random for 3+ (recommended)\n   - \`"cyclic"\` — Fixed order\n   - \`"random"\` — Random each turn\n   - \`"weighted-random"\` — Less spoken speakers first`,
+          text: `🎉 **Welcome to Deliberation!**\n\nPlease configure basic settings before starting.\n\n**Currently detected speakers:**\n${candidateText}\n\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\nYou can set all options at once:\n\n\`\`\`\ndeliberation_cli_config(\n  require_speaker_selection: true/false,\n  include_browser_speakers: false,\n  default_rounds: 3,\n  default_ordering: "auto"\n)\n\`\`\`\n\n**1. Speaker participation mode** (\`require_speaker_selection\`)\n   - \`true\` — Select participating speakers each time\n   - \`false\` — Auto-join detected speakers\n\n**2. Browser speakers** (\`include_browser_speakers\`)\n   - \`false\` — CLI only (recommended)\n   - \`true\` — Include browser LLM speakers too\n\n**3. Default rounds** (\`default_rounds\`)\n   - \`1\` — Quick consensus\n   - \`3\` — Default (recommended)\n   - \`5\` — Deep discussion\n\n**4. Ordering strategy** (\`default_ordering\`)\n   - \`"auto"\` — cyclic for 2 speakers, weighted-random for 3+ (recommended)\n   - \`"cyclic"\` — Fixed order\n   - \`"random"\` — Random each turn\n   - \`"weighted-random"\` — Less spoken speakers first`,
         }],
       };
     }
@@ -2507,7 +2539,26 @@ server.tool(
         return { content: [{ type: "text", text: `❌ Session "${session_id}" is already active. Please use a different ID or reset it first.` }] };
       }
     }
-    const candidateSnapshot = await collectSpeakerCandidates({ include_cli: true, include_browser: true });
+    const explicitBrowserSelection = hasExplicitBrowserParticipantSelection({ speakers, participant_types });
+    const includeBrowserSpeakers = resolveIncludeBrowserSpeakers({
+      include_browser_speakers,
+      config,
+      speakers,
+      participant_types,
+    });
+    if (explicitBrowserSelection && !includeBrowserSpeakers) {
+      return {
+        content: [{
+          type: "text",
+          text: `❌ Browser speakers are currently disabled.\n\nThis deliberation server now defaults to CLI-only participation to avoid browser timeouts blocking the session.\n\nTo include browser speakers, opt in explicitly:\n\`\`\`\ndeliberation_start(\n  topic: "${topic.replace(/"/g, '\\"')}",\n  speakers: ${JSON.stringify(speakers || ["claude", "codex"])},\n  include_browser_speakers: true,\n  require_manual_speakers: true\n)\n\`\`\`\n\nOr save it in config:\n\`deliberation_cli_config(include_browser_speakers: true)\``,
+        }],
+      };
+    }
+
+    const candidateSnapshot = await collectSpeakerCandidates({
+      include_cli: true,
+      include_browser: includeBrowserSpeakers,
+    });
 
     // Resolve effective settings from config
     const effectiveRequireManual = require_manual_speakers ?? config.require_speaker_selection ?? true;
@@ -2536,7 +2587,7 @@ server.tool(
       return {
         content: [{
           type: "text",
-          text: `Speakers must be manually selected to start a deliberation.${configNote}${llmSuggested}\n\n${candidateText}\n\nExample:\n\ndeliberation_start(\n  topic: "${topic.replace(/"/g, '\\"')}",\n  rounds: ${rounds},\n  speakers: ["codex", "web-claude-1", "web-chatgpt-1"],\n  require_manual_speakers: true,\n  first_speaker: "codex"\n)\n\nFirst call deliberation_speaker_candidates to check currently available speakers.`,
+          text: `Speakers must be manually selected to start a deliberation.${configNote}${llmSuggested}\n\n${candidateText}\n\nExample:\n\ndeliberation_start(\n  topic: "${topic.replace(/"/g, '\\"')}",\n  rounds: ${rounds},\n  speakers: ["claude", "codex", "gemini"],\n  require_manual_speakers: true,\n  first_speaker: "codex"\n)\n\nFirst call deliberation_speaker_candidates to check currently available speakers.`,
         }],
       };
     }
@@ -2544,7 +2595,6 @@ server.tool(
     let autoDiscoveredSpeakers = [];
     let autoParticipantTypes = {};
     if (!hasManualSpeakers && effectiveAutoDiscover) {
-      // Include ALL candidates: CLI + browser
       for (const c of candidateSnapshot.candidates) {
         autoDiscoveredSpeakers.push(c.speaker);
         if (c.type === "browser" && c.cdp_available) {
@@ -2575,12 +2625,11 @@ server.tool(
 
     // Warn if only 1 speaker — deliberation requires 2+
     if (speakerOrder.length < 2) {
-      const candidateSnapshot = await collectSpeakerCandidates({ include_cli: true, include_browser: true });
       const candidateText = formatSpeakerCandidatesReport(candidateSnapshot);
       return {
         content: [{
           type: "text",
-          text: `⚠️ Deliberation requires at least 2 speakers. Currently only ${speakerOrder.length} specified: ${speakerOrder.join(", ")}\n\nAvailable speaker candidates:\n${candidateText}\n\nExample:\ndeliberation_start(topic: "${topic.slice(0, 50)}...", speakers: ["claude", "codex", "web-gemini-1"])`,
+          text: `⚠️ Deliberation requires at least 2 speakers. Currently only ${speakerOrder.length} specified: ${speakerOrder.join(", ")}\n\nAvailable speaker candidates:\n${candidateText}\n\nExample:\ndeliberation_start(topic: "${topic.slice(0, 50)}...", speakers: ["claude", "codex", "gemini"])`,
         }],
       };
     }
@@ -3324,6 +3373,41 @@ server.tool(
   })
 );
 
+server.tool(
+  "deliberation_list_remote_sessions",
+  "List all active deliberation sessions on a remote machine (via Tailscale/IP) to find the correct session_id for context injection.",
+  {
+    remote_url: z.string().describe("The Tailscale IP or Host and port (e.g., '100.100.100.5:3847') of the remote machine."),
+  },
+  safeToolHandler("deliberation_list_remote_sessions", async ({ remote_url }) => {
+    try {
+      const baseUrl = remote_url.startsWith("http") ? remote_url : `http://${remote_url}`;
+      const cleanBaseUrl = baseUrl.replace(/\/$/, "");
+      const response = await fetch(`${cleanBaseUrl}/api/sessions`);
+      
+      if (!response.ok) {
+        return { content: [{ type: "text", text: `❌ Failed to fetch remote sessions (${response.status})` }] };
+      }
+      
+      const sessions = await response.json();
+      if (!Array.isArray(sessions) || sessions.length === 0) {
+        return { content: [{ type: "text", text: `No active deliberation sessions found on ${remote_url}.` }] };
+      }
+
+      let result = `### Active Sessions on ${remote_url}\n\n`;
+      for (const s of sessions) {
+        result += `- **ID:** \`${s.id}\`\n`;
+        result += `  **Topic:** ${s.topic}\n`;
+        result += `  **Status:** ${s.status} (Round ${s.current_round}/${s.max_rounds})\n\n`;
+      }
+
+      return { content: [{ type: "text", text: result }] };
+    } catch (e) {
+      return { content: [{ type: "text", text: `❌ Error connecting to remote machine at ${remote_url}: ${e.message}` }] };
+    }
+  })
+);
+
 server.tool(
   "deliberation_inject_context",
   "Inject additional context or instructions into a specific active session. (Useful for local or remote context injection via Tailscale)",
@@ -3631,6 +3715,10 @@ server.tool(
       (v) => (typeof v === "string" ? v === "true" : v),
       z.boolean().optional()
     ).describe("true: user selects speakers before each start, false: all detected speakers auto-join"),
+    include_browser_speakers: z.preprocess(
+      (v) => (typeof v === "string" ? v === "true" : v),
+      z.boolean().optional()
+    ).describe("true: browser LLM speakers may join when requested or auto-discovered, false: CLI-only mode"),
     default_rounds: z.coerce.number().int().min(1).max(10).optional()
       .describe("Default number of rounds (1-10, default 3)"),
     default_ordering: z.enum(["auto", "cyclic", "random", "weighted-random"]).optional()
@@ -3638,7 +3726,7 @@ server.tool(
     chrome_profile: z.string().optional()
       .describe("Chrome profile directory name for CDP (e.g., \"Default\", \"Profile 1\"). Stored for auto-launch."),
   },
-  safeToolHandler("deliberation_cli_config", async ({ enabled_clis, require_speaker_selection, default_rounds, default_ordering, chrome_profile }) => {
+  safeToolHandler("deliberation_cli_config", async ({ enabled_clis, require_speaker_selection, include_browser_speakers, default_rounds, default_ordering, chrome_profile }) => {
     const config = loadDeliberationConfig();
 
     // Handle setup config updates
@@ -3647,6 +3735,10 @@ server.tool(
       config.require_speaker_selection = require_speaker_selection;
       configChanged = true;
     }
+    if (include_browser_speakers !== undefined && include_browser_speakers !== null) {
+      config.include_browser_speakers = include_browser_speakers;
+      configChanged = true;
+    }
     if (default_rounds !== undefined && default_rounds !== null) {
       config.default_rounds = default_rounds;
       configChanged = true;
@@ -3673,7 +3765,7 @@ server.tool(
       return {
         content: [{
           type: "text",
-          text: `## Deliberation CLI Settings\n\n**Mode:** ${mode}\n**Speaker selection:** ${config.require_speaker_selection === false ? "auto (all detected speakers join)" : "manual (user selects)"}\n**Default rounds:** ${config.default_rounds || 3}\n**Ordering:** ${config.default_ordering || "auto"}\n**Chrome profile:** ${config.chrome_profile || "Default"} (env: DELIBERATION_CHROME_PROFILE)\n**Configured CLIs:** ${configured.length > 0 ? configured.join(", ") : "(none — full auto-detection)"}\n**Currently detected CLIs:** ${detected.join(", ") || "(none)"}\n**All supported CLIs:** ${DEFAULT_CLI_CANDIDATES.join(", ")}\n\nTo change:\n\`deliberation_cli_config(require_speaker_selection: false, default_rounds: 3, default_ordering: "auto")\`\n\nTo set Chrome profile for CDP:\n\`deliberation_cli_config(chrome_profile: "Profile 1")\`\n\nTo revert to full auto-detection:\n\`deliberation_cli_config(enabled_clis: [])\``,
+          text: `## Deliberation CLI Settings\n\n**Mode:** ${mode}\n**Speaker selection:** ${config.require_speaker_selection === false ? "auto (detected speakers join)" : "manual (user selects)"}\n**Browser speakers:** ${config.include_browser_speakers === true ? "enabled" : "disabled (CLI-only default)"}\n**Default rounds:** ${config.default_rounds || 3}\n**Ordering:** ${config.default_ordering || "auto"}\n**Chrome profile:** ${config.chrome_profile || "Default"} (env: DELIBERATION_CHROME_PROFILE)\n**Configured CLIs:** ${configured.length > 0 ? configured.join(", ") : "(none — full auto-detection)"}\n**Currently detected CLIs:** ${detected.join(", ") || "(none)"}\n**All supported CLIs:** ${DEFAULT_CLI_CANDIDATES.join(", ")}\n\nTo change:\n\`deliberation_cli_config(require_speaker_selection: false, include_browser_speakers: false, default_rounds: 3, default_ordering: "auto")\`\n\nTo enable browser speakers:\n\`deliberation_cli_config(include_browser_speakers: true)\`\n\nTo set Chrome profile for CDP:\n\`deliberation_cli_config(chrome_profile: "Profile 1")\`\n\nTo revert to full auto-detection:\n\`deliberation_cli_config(enabled_clis: [])\``,
         }],
       };
     }
@@ -4478,4 +4570,4 @@ if (__entryFile && path.resolve(__currentFile) === __entryFile) {
 }
 
 // ── Test exports (used by vitest) ──
-export { selectNextSpeaker, loadRolePrompt, inferSuggestedRole, parseVotes, ROLE_KEYWORDS, ROLE_HEADING_MARKERS, loadRolePresets, applyRolePreset, detectDegradationLevels, formatDegradationReport, DEGRADATION_TIERS, DECISION_STAGES, STAGE_TRANSITIONS, createDecisionSession, advanceStage, buildConflictMap, parseOpinionFromResponse, buildOpinionPrompt, generateConflictQuestions, buildSynthesis, buildActionPlan, loadTemplates, matchTemplate };
+export { selectNextSpeaker, loadRolePrompt, inferSuggestedRole, parseVotes, ROLE_KEYWORDS, ROLE_HEADING_MARKERS, loadRolePresets, applyRolePreset, detectDegradationLevels, formatDegradationReport, DEGRADATION_TIERS, DECISION_STAGES, STAGE_TRANSITIONS, createDecisionSession, advanceStage, buildConflictMap, parseOpinionFromResponse, buildOpinionPrompt, generateConflictQuestions, buildSynthesis, buildActionPlan, loadTemplates, matchTemplate, hasExplicitBrowserParticipantSelection, resolveIncludeBrowserSpeakers };

package/model-router.js

@@ -137,61 +137,50 @@ export function selectModelForProvider(provider, category, complexity) {
 
   switch (provider) {
     case 'chatgpt': {
-      if (isHighReasoning) return { model: 'o3', reason: 'High-complexity reasoning task' };
-      if (isCoding) return { model: 'o4-mini', reason: 'Coding/implementation task' };
-      if (isSimple) return { model: 'gpt-4o-mini', reason: 'Simple task, cost-efficient model' };
-      return { model: 'gpt-4o', reason: 'Creative or medium-complexity task' };
+      if (isHighReasoning || isCoding) return { model: 'gpt-5.4', reason: 'High-complexity or coding task' };
+      return { model: 'gpt-5.4', reason: 'General or simple task' };
     }
 
     case 'claude': {
-      if (isHighReasoning) return { model: 'opus', reason: 'High-complexity reasoning task' };
-      if (isSimple) return { model: 'haiku', reason: 'Simple task, fast and cost-efficient' };
-      return { model: 'sonnet', reason: 'Coding or medium-complexity task' };
+      if (isSimple) return { model: 'sonnet', reason: 'Simple task' };
+      return { model: 'opus', reason: 'Medium or High-complexity task' };
     }
 
     case 'gemini': {
-      if (isHighReasoning || complexity === 'high') return { model: '2.5 Pro', reason: 'High-complexity or reasoning task' };
-      if (isSimple) return { model: '2.0 Flash', reason: 'Simple task, fast response' };
-      return { model: '2.5 Flash', reason: 'Medium-complexity task' };
+      return { model: '3.1 Pro Preview', reason: 'Always use highest-end model' };
     }
 
     case 'deepseek': {
-      if (category === 'reasoning') return { model: 'DeepSeek-R1', reason: 'Reasoning-focused task' };
-      return { model: 'DeepSeek-V3', reason: 'General task' };
+      return { model: 'DeepSeek-R1', reason: 'High-end reasoning model' };
     }
 
     case 'grok': {
-      if (complexity === 'high' || isHighReasoning) return { model: 'grok-3', reason: 'High-complexity task' };
-      return { model: 'grok-3-mini', reason: 'Simple task' };
+      return { model: 'grok-3', reason: 'Always use highest-end model' };
     }
 
     case 'mistral': {
-      if (complexity === 'high' || isHighReasoning) return { model: 'Mistral Large', reason: 'High-complexity task' };
-      return { model: 'Mistral Small', reason: 'Simple task' };
+      return { model: 'Mistral Large', reason: 'Always use highest-end model' };
     }
 
     case 'poe': {
-      if (complexity === 'high' || isHighReasoning) return { model: 'Claude-3.5-Sonnet', reason: 'High-complexity task' };
-      if (isSimple) return { model: 'Claude-3-Haiku', reason: 'Simple task' };
-      return { model: 'GPT-4o', reason: 'Medium-complexity task' };
+      if (isSimple) return { model: 'Claude-3.5-Sonnet', reason: 'Simple task' };
+      return { model: 'Claude-3.5-Opus', reason: 'Medium or High-complexity task' };
     }
 
     case 'qwen': {
-      if (complexity === 'high' || isHighReasoning) return { model: 'Qwen-Max', reason: 'High-complexity task' };
-      return { model: 'Qwen-Plus', reason: 'Simple task' };
+      return { model: 'Qwen-Max', reason: 'Always use highest-end model' };
     }
 
     case 'huggingchat': {
-      if (complexity === 'high' || isHighReasoning) return { model: 'Qwen/QwQ-32B', reason: 'High-complexity task' };
-      return { model: 'meta-llama/Llama-3.3-70B', reason: 'Simple task' };
+      return { model: 'Qwen/QwQ-32B', reason: 'Always use highest-end model' };
     }
 
     case 'copilot': {
-      return { model: 'GPT-4o', reason: 'Copilot uses GPT-4o (no model selection)' };
+      return { model: 'GPT-4.5', reason: 'Copilot using latest high-end model' };
     }
 
     case 'perplexity': {
-      return { model: 'default', reason: 'Perplexity uses default model (no model selection)' };
+      return { model: 'sonar-pro', reason: 'Perplexity high-end model' };
     }
 
     default: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aigentry-deliberation",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "MCP Deliberation Server — Multi-session AI deliberation with smart speaker ordering and persona roles",
   "type": "module",
   "license": "MIT",