palabre 0.8.0 → 0.9.0

package/dist/orchestrator.js

@@ -1,6 +1,7 @@
 import { createAgent } from "./adapters/index.js";
 import { AdapterError } from "./errors.js";
 import { createTranslator } from "./i18n.js";
+import { OllamaUrlError } from "./ollamaUrl.js";
 export const MAX_ASK_AGENTS = 4;
 /**
  * Point d'entrée de l'orchestration.
@@ -27,8 +28,8 @@ export async function runDebate(config, options, renderer, messages = createTran
         { name: options.agentB, role: agentBConfig.role, type: agentBConfig.type }
     ]);
     const agents = [
-        createAgent(options.agentA, agentAConfig),
-        createAgent(options.agentB, agentBConfig)
+        createAgent(options.agentA, agentAConfig, { ollamaUrl: options.ollamaUrl }),
+        createAgent(options.agentB, agentBConfig, { ollamaUrl: options.ollamaUrl })
     ];
     const transcript = [];
     let stopReason;
@@ -73,7 +74,7 @@ export async function runDebate(config, options, renderer, messages = createTran
                 agent: current.name,
                 role: current.role,
                 turn
-            });
+            }, messages);
             renderer?.error(failure);
             return {
                 options,
@@ -106,6 +107,7 @@ export async function runDebate(config, options, renderer, messages = createTran
             const cancellation = cancellationFailureIfAborted(options, messages, {
                 phase: "summary",
                 agent: resolveSummaryAgentName(options),
+                role: summaryRole(),
                 turn: transcript.length + 1
             });
             if (cancellation) {
@@ -123,8 +125,9 @@ export async function runDebate(config, options, renderer, messages = createTran
             failure = toDebateFailure(error, {
                 phase: "summary",
                 agent: resolveSummaryAgentName(options),
+                role: summaryRole(),
                 turn: transcript.length + 1
-            });
+            }, messages);
             renderer?.error(failure);
         }
     }
@@ -161,7 +164,7 @@ export async function runAsk(config, options, renderer, messages = createTransla
         role: agentConfig.role,
         type: agentConfig.type
     })));
-    const agents = agentEntries.map(([name, agentConfig]) => createAgent(name, agentConfig));
+    const agents = agentEntries.map(([name, agentConfig]) => createAgent(name, agentConfig, { ollamaUrl: options.ollamaUrl }));
     const transcript = [];
     for (let index = 0; index < agents.length; index += 1) {
         const current = agents[index];
@@ -210,7 +213,7 @@ export async function runAsk(config, options, renderer, messages = createTransla
                 agent: current.name,
                 role: current.role,
                 turn: response
-            });
+            }, messages);
             renderer?.error(failure);
             return {
                 options,
@@ -243,6 +246,7 @@ export async function runAsk(config, options, renderer, messages = createTransla
             const cancellation = cancellationFailureIfAborted(options, messages, {
                 phase: "summary",
                 agent: summaryAgentName,
+                role: summaryRole(),
                 turn: transcript.length + 1
             });
             if (cancellation) {
@@ -259,8 +263,9 @@ export async function runAsk(config, options, renderer, messages = createTransla
             failure = toDebateFailure(error, {
                 phase: "summary",
                 agent: resolveSummaryAgentName(options),
+                role: summaryRole(),
                 turn: transcript.length + 1
-            });
+            }, messages);
             renderer?.error(failure);
         }
     }
@@ -331,16 +336,17 @@ async function generateSummary(config, options, transcript, renderer, messages =
     if (!summaryConfig) {
         throw new Error(messages.orchestrator.unknownSummaryAgent(summaryAgentName));
     }
-    const summaryAgent = createAgent(summaryAgentName, summaryConfig);
-    renderer?.summaryStart(summaryAgent.name, summaryAgent.role);
-    renderer?.thinkingStart(summaryAgent.name, summaryAgent.role);
+    const summaryAgent = createAgent(summaryAgentName, summaryConfig, { ollamaUrl: options.ollamaUrl });
+    const role = summaryRole();
+    renderer?.summaryStart(summaryAgent.name, role);
+    renderer?.thinkingStart(summaryAgent.name, role);
     const response = await summaryAgent.generate({
         topic: options.topic,
         turn: transcript.length + 1,
         totalTurns: options.mode === "ask" ? transcript.length : options.turns,
         selfName: summaryAgent.name,
         peerName: options.mode === "ask" ? "ask-responses" : "transcript",
-        selfRole: summaryAgent.role,
+        selfRole: role,
         mode: "summary",
         language: options.language,
         session: options.session,
@@ -350,13 +356,16 @@ async function generateSummary(config, options, transcript, renderer, messages =
     }).finally(() => renderer?.thinkingEnd());
     const summary = {
         agent: summaryAgent.name,
-        role: summaryAgent.role,
+        role,
         content: response.content,
         createdAt: new Date().toISOString()
     };
     renderer?.message(summary.content);
     return summary;
 }
+function summaryRole() {
+    return "summarizer";
+}
 function cancellationFailureIfAborted(options, messages, context) {
     if (!options.signal?.aborted) {
         return undefined;
@@ -385,7 +394,7 @@ function resolveSummaryAgentName(options) {
     }
     return options.agentB;
 }
-function toDebateFailure(error, context) {
+function toDebateFailure(error, context, messages) {
     if (error instanceof AdapterError) {
         return {
             phase: context.phase,
@@ -397,6 +406,18 @@ function toDebateFailure(error, context) {
             details: error.details
         };
     }
+    if (error instanceof OllamaUrlError) {
+        const message = error.kind === "empty"
+            ? messages.common.ollamaUrlEmpty
+            : error.kind === "protocol"
+                ? messages.common.ollamaUrlProtocol(error.protocol ?? "")
+                : messages.common.ollamaUrlInvalid(error.value);
+        return {
+            ...context,
+            kind: "unknown",
+            message
+        };
+    }
     return {
         phase: context.phase,
         agent: context.agent,

package/dist/presets.js

@@ -1,4 +1,4 @@
-import { detectionForCommand } from "./agentRegistry.js";
+import { detectionForCommand, isRetiredAgentName } from "./agentRegistry.js";
 const presets = {
     "codex-claude": {
         agentA: "codex",
@@ -56,30 +56,6 @@ const presets = {
         agentA: "antigravity",
         agentB: "claude"
     },
-    "gemini-opencode": {
-        agentA: "gemini",
-        agentB: "opencode"
-    },
-    "opencode-gemini": {
-        agentA: "opencode",
-        agentB: "gemini"
-    },
-    "gemini-vibe": {
-        agentA: "gemini",
-        agentB: "vibe"
-    },
-    "vibe-gemini": {
-        agentA: "vibe",
-        agentB: "gemini"
-    },
-    "gemini-antigravity": {
-        agentA: "gemini",
-        agentB: "antigravity"
-    },
-    "antigravity-gemini": {
-        agentA: "antigravity",
-        agentB: "gemini"
-    },
     "opencode-antigravity": {
         agentA: "opencode",
         agentB: "antigravity"
@@ -136,14 +112,6 @@ const presets = {
         agentA: "ollama-local",
         agentB: "claude"
     },
-    "gemini-ollama": {
-        agentA: "gemini",
-        agentB: "ollama-local"
-    },
-    "ollama-gemini": {
-        agentA: "ollama-local",
-        agentB: "gemini"
-    },
     "antigravity-ollama": {
         agentA: "antigravity",
         agentB: "ollama-local"
@@ -151,22 +119,6 @@ const presets = {
     "ollama-antigravity": {
         agentA: "ollama-local",
         agentB: "antigravity"
-    },
-    "codex-gemini": {
-        agentA: "codex",
-        agentB: "gemini"
-    },
-    "gemini-codex": {
-        agentA: "gemini",
-        agentB: "codex"
-    },
-    "claude-gemini": {
-        agentA: "claude",
-        agentB: "gemini"
-    },
-    "gemini-claude": {
-        agentA: "gemini",
-        agentB: "claude"
     }
 };
 /** Retourne la paire d'agents pour `name`. Lève une erreur avec la liste des presets disponibles si inconnu. */
@@ -209,6 +161,26 @@ export function listPresetsWithAvailability(config, discovery, messages) {
         };
     });
 }
+/**
+ * Retourne tous les agents de la config avec la même disponibilité que celle
+ * utilisée pour les presets. Les intégrations ne doivent pas réimplémenter la
+ * découverte des commandes ou des modèles Ollama.
+ */
+export function listAgentsWithAvailability(config, discovery, messages) {
+    return Object.entries(config.agents)
+        .filter(([name]) => !isRetiredAgentName(name))
+        .sort(([left], [right]) => left.localeCompare(right))
+        .map(([name, agentConfig]) => {
+        const check = checkAgentAvailability(name, config, discovery, messages);
+        return {
+            name,
+            type: agentConfig.type,
+            role: agentConfig.role,
+            available: check.available,
+            ...(check.available ? {} : { unavailableReason: check.reason })
+        };
+    });
+}
 /** Recherche inverse : retourne le nom du preset correspondant à une paire `(agentA, agentB)`, ou `undefined`. */
 export function findPresetNameForPair(agentA, agentB) {
     return Object.entries(presets).find(([, preset]) => preset.agentA === agentA && preset.agentB === agentB)?.[0];
@@ -219,12 +191,13 @@ function checkAgentAvailability(agentName, config, discovery, messages) {
         return unavailable(agentName, messages?.presets.missingAgent(agentName) ?? `agent absent de la config: ${agentName}`);
     }
     if (agent.type === "ollama") {
-        if (!discovery.ollama.available) {
-            return unavailable(agentName, discovery.ollama.commandAvailable
+        const ollama = discovery.ollamaAgents?.[agentName] ?? discovery.ollama;
+        if (!ollama.available) {
+            return unavailable(agentName, ollama.commandAvailable
                 ? messages?.presets.ollamaUnreachable(agentName) ?? `Ollama non joignable pour ${agentName}`
                 : messages?.presets.ollamaNotDetected(agentName) ?? `Ollama non détecté pour ${agentName}`);
         }
-        if (!discovery.ollama.models.includes(agent.model)) {
+        if (!ollama.models.includes(agent.model)) {
             return unavailable(agentName, messages?.presets.missingOllamaModel(agentName, agent.model) ?? `modèle Ollama absent pour ${agentName}: ${agent.model}`);
         }
         return available(agentName);