mirror of
https://github.com/R0m1k3/EveFlow.git
synced 2026-10-24 07:38:14 +02:00
Compare commits
6
Commits
d5f19a9b3c
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e57340b124 | ||
|
|
992693c9cf | ||
|
|
5991410685 | ||
|
|
9f95f79943 | ||
|
|
c9b44433ac | ||
|
|
5201742f45 |
No files matched your search
@@ -67,7 +67,7 @@ jobs:
|
|||||||
out/latest.yml
|
out/latest.yml
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
- name: Publish GitHub release
|
- name: Publish GitHub release
|
||||||
if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/master' && steps.ver.outputs.released == 'false')
|
if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && steps.ver.outputs.released == 'false')
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
tag_name: v${{ steps.ver.outputs.version }}
|
tag_name: v${{ steps.ver.outputs.version }}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# EveFlow 2 — Interface vocale JARVIS pour Hermes Agent
|
# EveFlow 2 — Interface vocale JARVIS pour Hermes Agent
|
||||||
|
|
||||||
[](https://github.com/R0m1k3/EveFlow/actions)
|
[](https://github.com/R0m1k3/EveFlow/actions)
|
||||||
[](https://github.com/R0m1k3/EveFlow/releases)
|
[](https://github.com/R0m1k3/EveFlow/releases)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
|
|
||||||
**EveFlow** est un compagnon de bureau Windows qui transforme [Hermes Agent](https://hermes-agent.nousresearch.com/) en assistant vocal à la JARVIS : un noyau holographique réactif au son, une conversation en streaming, les outils, sous-agents, approbations, crons, skills et sessions d'Hermes pilotés depuis un seul HUD.
|
**EveFlow** est un compagnon de bureau Windows qui transforme [Hermes Agent](https://hermes-agent.nousresearch.com/) en assistant vocal à la JARVIS : un noyau holographique réactif au son, une conversation en streaming, les outils, sous-agents, approbations, crons, skills et sessions d'Hermes pilotés depuis un seul HUD.
|
||||||
@@ -46,7 +46,6 @@ La version 2 est une réécriture complète : plus de robot 3D, un pipeline voca
|
|||||||
1. **Runs API** (`POST /v1/runs` + `GET /v1/runs/{id}/events`) : deltas, outils, sous-agents, `approval.request`, `run.completed`, arrêt (`/stop`) et injection de consignes en cours de run (`/steer`).
|
1. **Runs API** (`POST /v1/runs` + `GET /v1/runs/{id}/events`) : deltas, outils, sous-agents, `approval.request`, `run.completed`, arrêt (`/stop`) et injection de consignes en cours de run (`/steer`).
|
||||||
2. **Sessions API** (`/api/sessions/{id}/chat/stream`) : mémoire côté serveur, fork, suppression, relecture de l'historique.
|
2. **Sessions API** (`/api/sessions/{id}/chat/stream`) : mémoire côté serveur, fork, suppression, relecture de l'historique.
|
||||||
3. **Chat completions** OpenAI (`/v1/chat/completions`) avec `hermes.tool.progress`, continuité de session (`X-Hermes-Session-Id`) et outils EveFlow côté client (état du HUD, fichiers partagés, notifications).
|
3. **Chat completions** OpenAI (`/v1/chat/completions`) avec `hermes.tool.progress`, continuité de session (`X-Hermes-Session-Id`) et outils EveFlow côté client (état du HUD, fichiers partagés, notifications).
|
||||||
* **Choix du modèle et de l'effort** : menu déroulant alimenté par `GET /api/model/options` (tous les fournisseurs authentifiés d'Hermes et leurs modèles, `/v1/models` ne renvoyant que l'alias « hermes-agent »), bouton d'actualisation, saisie libre en repli. Modèle et fournisseur sont envoyés à chaque requête, ainsi que l'effort de raisonnement (none → ultra) sur les trois transports. Modèle « mission » choisi de la même façon.
|
|
||||||
* Mémoire longue durée via `X-Hermes-Session-Key`.
|
* Mémoire longue durée via `X-Hermes-Session-Key`.
|
||||||
* **Approbations** d'outils affichées dans le HUD : une fois, pour la session, toujours, refuser.
|
* **Approbations** d'outils affichées dans le HUD : une fois, pour la session, toujours, refuser.
|
||||||
* **Crons** : création en langage naturel (`every 1h`, `weekdays at 9am`, `in 30m`, expression cron), pause/reprise, exécution immédiate, édition, historique des résultats lus à voix haute.
|
* **Crons** : création en langage naturel (`every 1h`, `weekdays at 9am`, `in 30m`, expression cron), pause/reprise, exécution immédiate, édition, historique des résultats lus à voix haute.
|
||||||
|
|||||||
@@ -84,7 +84,6 @@ Sources : [jarvis-desktop-ai](https://github.com/ccarloshenri/jarvis-desktop-ai)
|
|||||||
| Correctifs 2.4.0.1 | réponse vide en chat completions désormais expliquée (JSON non streamé ou erreur HTTP 200), la liaison ne passe plus en « dégradé » quand seule l'API des crons échoue, transcriptions parasites (« (cliquant) », « *Claire* ») ignorées, préférence de voix masculine/féminine |
|
| Correctifs 2.4.0.1 | réponse vide en chat completions désormais expliquée (JSON non streamé ou erreur HTTP 200), la liaison ne passe plus en « dégradé » quand seule l'API des crons échoue, transcriptions parasites (« (cliquant) », « *Claire* ») ignorées, préférence de voix masculine/féminine |
|
||||||
| Parakeet v3 vs Whisper base sur trois phrases Piper (fr) (2.4.1) | Parakeet : 3/3 exactes avec ponctuation, 0,4 à 0,5 s à chaud (6,7 s au premier appel) ; Whisper base : erreurs sur « Jarvis », « Peux-tu », 0,7 à 0,9 s |
|
| Parakeet v3 vs Whisper base sur trois phrases Piper (fr) (2.4.1) | Parakeet : 3/3 exactes avec ponctuation, 0,4 à 0,5 s à chaud (6,7 s au premier appel) ; Whisper base : erreurs sur « Jarvis », « Peux-tu », 0,7 à 0,9 s |
|
||||||
| Worklets audio sous CSP stricte (2.4.1) | chargement des modules statiques OK dans l'application empaquetée |
|
| Worklets audio sous CSP stricte (2.4.1) | chargement des modules statiques OK dans l'application empaquetée |
|
||||||
| Choix du modèle Hermes (2.5.1) | menu alimenté par `/api/model/options` (fournisseurs authentifiés + modèles, modèle courant du serveur marqué), fournisseur et effort de raisonnement (none → ultra) envoyés sur runs, sessions et chat completions ; `/v1/models` ne renvoie que « hermes-agent » |
|
|
||||||
| Voix françaises (2.5.0) | Edge Henri : MP3 reçu de bout en bout (32 ko pour 4 s). Supertonic 3 en français : 10 voix, RTF 0,14 sur 4 cœurs (8,7 s d'audio en 1,3 s), genres déterminés par mesure de la fréquence fondamentale (voix 0-4 : 170-210 Hz, voix 5-9 : 92-137 Hz) ; le worker compilé accepte `language` et bascule sur l'anglais pour une langue inconnue |
|
| Voix françaises (2.5.0) | Edge Henri : MP3 reçu de bout en bout (32 ko pour 4 s). Supertonic 3 en français : 10 voix, RTF 0,14 sur 4 cœurs (8,7 s d'audio en 1,3 s), genres déterminés par mesure de la fréquence fondamentale (voix 0-4 : 170-210 Hz, voix 5-9 : 92-137 Hz) ; le worker compilé accepte `language` et bascule sur l'anglais pour une langue inconnue |
|
||||||
| Reconnaissance française : Parakeet v3 vs Qwen3-ASR 0.6B int8 (2.5.0) | Six phrases Supertonic (3,8 s) : Parakeet WER 8,5 % (erreurs surtout de forme : « 14h30 »), 384 ms par phrase ; Qwen3-ASR WER 15,3 % (« mémoires vivres »), 1 477 ms, 940 Mo. Qwen3-ASR n'est pas ajouté au catalogue |
|
| Reconnaissance française : Parakeet v3 vs Qwen3-ASR 0.6B int8 (2.5.0) | Six phrases Supertonic (3,8 s) : Parakeet WER 8,5 % (erreurs surtout de forme : « 14h30 »), 384 ms par phrase ; Qwen3-ASR WER 15,3 % (« mémoires vivres »), 1 477 ms, 940 Mo. Qwen3-ASR n'est pas ajouté au catalogue |
|
||||||
| Serveur MCP (2.4.0) | initialize, tools/list (14 outils), tools/call côté principal (presse-papiers, capture image) et côté renderer (état, message dans le fil) |
|
| Serveur MCP (2.4.0) | initialize, tools/list (14 outils), tools/call côté principal (presse-papiers, capture image) et côté renderer (état, message dans le fil) |
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "eveflow",
|
"name": "eveflow",
|
||||||
"version": "2.1.0",
|
"version": "2.5.3",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "eveflow",
|
"name": "eveflow",
|
||||||
"version": "2.1.0",
|
"version": "2.5.3",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource/orbitron": "^5.3.0",
|
"@fontsource/orbitron": "^5.3.0",
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "eveflow",
|
"name": "eveflow",
|
||||||
"version": "2.5.1",
|
"version": "2.5.3",
|
||||||
"releaseVersion": "2.5.1",
|
"releaseVersion": "2.5.3",
|
||||||
"description": "JARVIS-style desktop HUD for Hermes Agent: voice, streaming runs, scheduled jobs, skills and telemetry",
|
"description": "JARVIS-style desktop HUD for Hermes Agent: voice, streaming runs, scheduled jobs, skills and telemetry",
|
||||||
"main": "dist-electron/main.js",
|
"main": "dist-electron/main.js",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -1,101 +0,0 @@
|
|||||||
/**
|
|
||||||
* Model selector fed by GET /api/model/options (every authenticated provider and its models),
|
|
||||||
* with a free-text fallback for servers that do not expose the inventory.
|
|
||||||
*/
|
|
||||||
import { useState } from 'react';
|
|
||||||
import { RefreshCw } from 'lucide-react';
|
|
||||||
import { flattenModelOptions, groupModelChoices, modelChoiceValue, parseModelChoice } from '../../lib/hermesModels';
|
|
||||||
import { useHermes } from '../../state/hermes';
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
label: string;
|
|
||||||
model: string;
|
|
||||||
provider: string;
|
|
||||||
/** Label of the "no explicit model" option (server default / same as main model). */
|
|
||||||
emptyLabel: string;
|
|
||||||
onChange: (choice: { model: string; provider: string }) => void;
|
|
||||||
/** Show the refresh button (once per settings card is enough). */
|
|
||||||
withRefresh?: boolean;
|
|
||||||
hint?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
const CUSTOM = '__custom__';
|
|
||||||
|
|
||||||
export function HermesModelPicker({ label, model, provider, emptyLabel, onChange, withRefresh, hint }: Props) {
|
|
||||||
const options = useHermes((s) => s.modelOptions);
|
|
||||||
const error = useHermes((s) => s.modelOptionsError);
|
|
||||||
const [refreshing, setRefreshing] = useState(false);
|
|
||||||
const [custom, setCustom] = useState(false);
|
|
||||||
const choices = flattenModelOptions(options);
|
|
||||||
const groups = groupModelChoices(choices);
|
|
||||||
const value = model ? modelChoiceValue(provider, model) : '';
|
|
||||||
const known = !model || choices.some((c) => modelChoiceValue(c.provider, c.model) === value);
|
|
||||||
const freeText = custom || (choices.length === 0 && !!model) || !known;
|
|
||||||
|
|
||||||
const refresh = async (full: boolean) => {
|
|
||||||
setRefreshing(true);
|
|
||||||
try {
|
|
||||||
await useHermes.getState().refreshModelOptions(full);
|
|
||||||
} finally {
|
|
||||||
setRefreshing(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="field">
|
|
||||||
<label>{label}</label>
|
|
||||||
{choices.length > 0 && !freeText ? (
|
|
||||||
<select
|
|
||||||
className="select"
|
|
||||||
value={value}
|
|
||||||
onChange={(e) => {
|
|
||||||
if (e.target.value === CUSTOM) {
|
|
||||||
setCustom(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
onChange(e.target.value ? parseModelChoice(e.target.value) : { model: '', provider: '' });
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<option value="">{emptyLabel}{options?.model ? ` · serveur : ${options.model}` : ''}</option>
|
|
||||||
{groups.map((g) => (
|
|
||||||
<optgroup key={g.provider} label={g.providerName}>
|
|
||||||
{g.models.map((c) => (
|
|
||||||
<option key={modelChoiceValue(c.provider, c.model)} value={modelChoiceValue(c.provider, c.model)}>
|
|
||||||
{c.model}{c.current ? ' (actuel sur le serveur)' : ''}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</optgroup>
|
|
||||||
))}
|
|
||||||
<option value={CUSTOM}>Autre (saisie libre)…</option>
|
|
||||||
</select>
|
|
||||||
) : (
|
|
||||||
<div className="row" style={{ gap: 6 }}>
|
|
||||||
<input
|
|
||||||
className="input"
|
|
||||||
value={model}
|
|
||||||
placeholder={emptyLabel}
|
|
||||||
onChange={(e) => onChange({ model: e.target.value, provider: '' })}
|
|
||||||
/>
|
|
||||||
{choices.length > 0 && (
|
|
||||||
<button className="btn small ghost" onClick={() => { setCustom(false); if (!known) onChange({ model: '', provider: '' }); }}>Liste</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="row" style={{ gap: 8, marginTop: 4, alignItems: 'center' }}>
|
|
||||||
{withRefresh && (
|
|
||||||
<button className="btn small ghost" disabled={refreshing} onClick={() => void refresh(choices.length > 0)}>
|
|
||||||
<RefreshCw size={12} /> {refreshing ? 'chargement…' : choices.length ? 'Actualiser les modèles' : 'Charger les modèles'}
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
<span className="hint">
|
|
||||||
{choices.length > 0
|
|
||||||
? `${choices.length} modèles chez ${groups.length} fournisseur${groups.length > 1 ? 's' : ''} (Hermes /api/model/options).`
|
|
||||||
: error
|
|
||||||
? `Liste indisponible (${error}). Hermes ancien ou clé API manquante : saisissez le nom du modèle.`
|
|
||||||
: 'Liste non chargée : testez la liaison ou cliquez sur « Charger les modèles ».'}
|
|
||||||
{hint ? ` ${hint}` : ''}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import { useId, useState } from 'react';
|
||||||
|
import type { HermesModel } from '../../services/hermes/types';
|
||||||
|
|
||||||
|
export function ModelSelect({ label, value, models, defaultLabel, onChange }: {
|
||||||
|
label: string;
|
||||||
|
value: string;
|
||||||
|
models: HermesModel[];
|
||||||
|
defaultLabel: string;
|
||||||
|
onChange: (value: string) => void;
|
||||||
|
}) {
|
||||||
|
const id = useId();
|
||||||
|
const [manual, setManual] = useState(false);
|
||||||
|
return <div className="field">
|
||||||
|
<label htmlFor={id}>{label}</label>
|
||||||
|
<select id={id} className="select" value={value} onChange={(e) => onChange(e.target.value)}>
|
||||||
|
<option value="">{defaultLabel}</option>
|
||||||
|
{value && !models.some((m) => m.id === value) && <option value={value}>{value} (configuré)</option>}
|
||||||
|
{models.map((m) => <option key={m.id} value={m.id} disabled={m.available === false}>{m.name || m.id}{m.provider || m.owned_by ? ` · ${m.provider || m.owned_by}` : ''}{m.available === false ? ' (indisponible)' : ''}</option>)}
|
||||||
|
</select>
|
||||||
|
<button type="button" className="btn small" aria-expanded={manual} onClick={() => setManual(!manual)}>
|
||||||
|
{manual ? 'Masquer la saisie manuelle' : 'Saisir un autre identifiant'}
|
||||||
|
</button>
|
||||||
|
{manual && <input className="input" aria-label={`${label} : identifiant manuel`} value={value} placeholder={defaultLabel} onChange={(e) => onChange(e.target.value)} />}
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
@@ -15,8 +15,7 @@ import { DEFAULT_SETTINGS, useSettings, type HudTheme } from '../../state/settin
|
|||||||
import { useVoice } from '../../state/voice';
|
import { useVoice } from '../../state/voice';
|
||||||
import { installedModels, useVoiceModels } from '../../state/voiceModels';
|
import { installedModels, useVoiceModels } from '../../state/voiceModels';
|
||||||
import { ModelsSection } from './ModelsSection';
|
import { ModelsSection } from './ModelsSection';
|
||||||
import { HermesModelPicker } from './HermesModelPicker';
|
import { ModelSelect } from './ModelSelect';
|
||||||
import { REASONING_EFFORTS, isReasoningEffort } from '../../lib/hermesModels';
|
|
||||||
|
|
||||||
type Section = 'general' | 'hermes' | 'voice' | 'speech' | 'models' | 'webhook' | 'notifications' | 'ui';
|
type Section = 'general' | 'hermes' | 'voice' | 'speech' | 'models' | 'webhook' | 'notifications' | 'ui';
|
||||||
|
|
||||||
@@ -80,6 +79,10 @@ export function SettingsDrawer({ onClose }: Props) {
|
|||||||
const update = useSettings((s) => s.update);
|
const update = useSettings((s) => s.update);
|
||||||
const reset = useSettings((s) => s.reset);
|
const reset = useSettings((s) => s.reset);
|
||||||
const hermesModels = useHermes((s) => s.models);
|
const hermesModels = useHermes((s) => s.models);
|
||||||
|
const modelsLoading = useHermes((s) => s.modelsLoading);
|
||||||
|
const modelsError = useHermes((s) => s.modelsError);
|
||||||
|
const modelsNotice = useHermes((s) => s.modelsNotice);
|
||||||
|
const refreshHermesModels = useHermes((s) => s.refreshModels);
|
||||||
const hermesWebhook = useHermes((s) => s.webhook);
|
const hermesWebhook = useHermes((s) => s.webhook);
|
||||||
const hermesConnect = useHermes((s) => s.connect);
|
const hermesConnect = useHermes((s) => s.connect);
|
||||||
const micDevices = useVoice((s) => s.micDevices);
|
const micDevices = useVoice((s) => s.micDevices);
|
||||||
@@ -93,6 +96,13 @@ export function SettingsDrawer({ onClose }: Props) {
|
|||||||
const [edgeVoices, setEdgeVoices] = useState<EdgeVoice[]>([]);
|
const [edgeVoices, setEdgeVoices] = useState<EdgeVoice[]>([]);
|
||||||
const [webhookSecretVisible, setWebhookSecretVisible] = useState(false);
|
const [webhookSecretVisible, setWebhookSecretVisible] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (section !== 'hermes') return;
|
||||||
|
useHermes.setState({ models: [], modelsError: null });
|
||||||
|
const timer = setTimeout(() => void refreshHermesModels(), 500);
|
||||||
|
return () => clearTimeout(timer);
|
||||||
|
}, [section, settings.hermes.url, settings.hermes.apiKey, settings.hermes.sessionKey, refreshHermesModels]);
|
||||||
|
|
||||||
const speechProvider = settings.speech.provider;
|
const speechProvider = settings.speech.provider;
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (speechProvider !== 'edge' || edgeVoices.length) return;
|
if (speechProvider !== 'edge' || edgeVoices.length) return;
|
||||||
@@ -207,18 +217,20 @@ export function SettingsDrawer({ onClose }: Props) {
|
|||||||
<label>Clé API (API_SERVER_KEY)</label>
|
<label>Clé API (API_SERVER_KEY)</label>
|
||||||
<input className="input" type="password" value={settings.hermes.apiKey} onChange={(e) => update({ hermes: { apiKey: e.target.value } })} />
|
<input className="input" type="password" value={settings.hermes.apiKey} onChange={(e) => update({ hermes: { apiKey: e.target.value } })} />
|
||||||
</div>
|
</div>
|
||||||
<HermesModelPicker
|
<div className="grid-2">
|
||||||
label="Modèle"
|
<ModelSelect label="Modèle IA" models={hermesModels} value={settings.hermes.model} defaultLabel="Défaut du serveur" onChange={(model) => update({ hermes: { model } })} />
|
||||||
model={settings.hermes.model}
|
<div className="field">
|
||||||
provider={settings.hermes.provider ?? ''}
|
<label>Clé de mémoire (X-Hermes-Session-Key)</label>
|
||||||
emptyLabel="(défaut du serveur)"
|
<input className="input" value={settings.hermes.sessionKey} onChange={(e) => update({ hermes: { sessionKey: e.target.value } })} />
|
||||||
withRefresh
|
</div>
|
||||||
onChange={(c) => update({ hermes: { model: c.model, provider: c.provider } })}
|
</div>
|
||||||
hint={hermesModels.length && !settings.hermes.model ? `Sans choix, Hermes utilise « ${hermesModels[0]?.id} » (son modèle configuré).` : undefined}
|
|
||||||
/>
|
|
||||||
<div className="field">
|
<div className="field">
|
||||||
<label>Clé de mémoire (X-Hermes-Session-Key)</label>
|
<button className="btn small" disabled={modelsLoading} onClick={() => void refreshHermesModels(true)}>
|
||||||
<input className="input" value={settings.hermes.sessionKey} onChange={(e) => update({ hermes: { sessionKey: e.target.value } })} />
|
{modelsLoading ? <Loader2 size={13} className="spin" /> : <RotateCcw size={13} />}
|
||||||
|
{modelsLoading ? 'Chargement des modèles…' : 'Actualiser les modèles'}
|
||||||
|
</button>
|
||||||
|
<span className="hint" role="status">{modelsLoading ? 'Interrogation du serveur Hermes…' : modelsError || (hermesModels.length ? `${hermesModels.length} modèle(s) disponible(s).` : 'Aucun modèle annoncé par le serveur.')}</span>
|
||||||
|
<span className={modelsNotice ? 'test-result fail' : 'hint'}>{modelsNotice || 'Modèles des fournisseurs configurés dans Hermes. Les modèles sans accès sont indiqués comme indisponibles.'}</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="grid-2">
|
<div className="grid-2">
|
||||||
<div className="field">
|
<div className="field">
|
||||||
@@ -232,20 +244,18 @@ export function SettingsDrawer({ onClose }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
<div className="field">
|
<div className="field">
|
||||||
<label>Effort de raisonnement</label>
|
<label>Effort de raisonnement</label>
|
||||||
<select className="select" value={settings.hermes.reasoningEffort} onChange={(e) => { if (isReasoningEffort(e.target.value)) update({ hermes: { reasoningEffort: e.target.value } }); }}>
|
<select className="select" value={settings.hermes.reasoningEffort} onChange={(e) => update({ hermes: { reasoningEffort: e.target.value as typeof settings.hermes.reasoningEffort } })}>
|
||||||
{REASONING_EFFORTS.map((e) => <option key={e.value} value={e.value}>{e.label}</option>)}
|
<option value="">Défaut</option>
|
||||||
|
<option value="low">Low</option>
|
||||||
|
<option value="medium">Medium</option>
|
||||||
|
<option value="high">High</option>
|
||||||
</select>
|
</select>
|
||||||
<span className="hint">Envoyé à chaque requête (runs, sessions, chat completions) dans model_options.reasoning_effort. Plus c’est haut, plus la réponse est réfléchie et lente.</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<HermesModelPicker
|
<div className="field">
|
||||||
label="Modèle « mission » (tâches longues)"
|
<ModelSelect label="Modèle mission (tâches longues)" models={hermesModels} value={settings.hermes.missionModel} defaultLabel="Même modèle que le principal" onChange={(missionModel) => update({ hermes: { missionModel } })} />
|
||||||
model={settings.hermes.missionModel}
|
<span className="hint">Utilisé quand le mode Mission est activé dans la barre de commande. Laissez vide pour garder le modèle principal.</span>
|
||||||
provider={settings.hermes.missionProvider ?? ''}
|
</div>
|
||||||
emptyLabel="(même modèle)"
|
|
||||||
onChange={(c) => update({ hermes: { missionModel: c.model, missionProvider: c.provider } })}
|
|
||||||
hint="Utilisé quand le mode Mission est activé dans la barre de commande."
|
|
||||||
/>
|
|
||||||
<div className="field">
|
<div className="field">
|
||||||
<label>Instructions EveFlow (superposées au prompt Hermes)</label>
|
<label>Instructions EveFlow (superposées au prompt Hermes)</label>
|
||||||
<textarea className="textarea" value={settings.hermes.instructions} onChange={(e) => update({ hermes: { instructions: e.target.value } })} />
|
<textarea className="textarea" value={settings.hermes.instructions} onChange={(e) => update({ hermes: { instructions: e.target.value } })} />
|
||||||
@@ -628,8 +638,9 @@ mcp_servers:
|
|||||||
<div className="card">
|
<div className="card">
|
||||||
<div className="grid-2">
|
<div className="grid-2">
|
||||||
<div className="field">
|
<div className="field">
|
||||||
<label>Nom de l’assistant</label>
|
<label htmlFor="assistant-name">Nom de l’assistant</label>
|
||||||
<input className="input" value={settings.assistantName} onChange={(e) => update({ assistantName: e.target.value.toUpperCase().slice(0, 18) || 'JARVIS' })} />
|
<input id="assistant-name" className="input" value={settings.assistantName} maxLength={60} placeholder="Jarvis, Nova, Alfred…" onChange={(e) => update({ assistantName: e.target.value })} onBlur={() => update({ assistantName: settings.assistantName.trim() || DEFAULT_SETTINGS.assistantName })} />
|
||||||
|
<span className="hint">Choisissez le nom que vous voulez. Il est sauvegardé automatiquement et utilisé par l’assistant dès votre prochain message, y compris dans la conversation en cours.</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="field">
|
<div className="field">
|
||||||
<label>Votre nom</label>
|
<label>Votre nom</label>
|
||||||
|
|||||||
@@ -1,65 +0,0 @@
|
|||||||
/** Pure helpers for the Hermes model picker (GET /api/model/options) and reasoning effort levels. */
|
|
||||||
import type { HermesModelOptions, HermesProviderRow, HermesReasoningEffort } from '../services/hermes/types';
|
|
||||||
|
|
||||||
export interface HermesModelChoice {
|
|
||||||
provider: string;
|
|
||||||
providerName: string;
|
|
||||||
model: string;
|
|
||||||
/** Selected on the Hermes server right now. */
|
|
||||||
current: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Composite value used by the <select>: "provider::model" (provider may be empty). */
|
|
||||||
export function modelChoiceValue(provider: string, model: string): string {
|
|
||||||
return `${provider}::${model}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function parseModelChoice(value: string): { provider: string; model: string } {
|
|
||||||
const at = value.indexOf('::');
|
|
||||||
if (at < 0) return { provider: '', model: value };
|
|
||||||
return { provider: value.slice(0, at), model: value.slice(at + 2) };
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Flatten the provider rows into selectable models: authenticated providers first, server-current model first inside its row. */
|
|
||||||
export function flattenModelOptions(options: HermesModelOptions | null | undefined): HermesModelChoice[] {
|
|
||||||
const rows = (options?.providers ?? []).filter((r): r is HermesProviderRow => !!r && typeof r.slug === 'string' && Array.isArray(r.models));
|
|
||||||
const usable = rows.filter((r) => r.authenticated !== false && r.models.length > 0);
|
|
||||||
const current = (options?.model ?? '').trim();
|
|
||||||
const out: HermesModelChoice[] = [];
|
|
||||||
for (const row of usable) {
|
|
||||||
const models = [...new Set(row.models.map((m) => String(m).trim()).filter(Boolean))];
|
|
||||||
const list = row.is_current && current && models.includes(current) ? [current, ...models.filter((m) => m !== current)] : models;
|
|
||||||
for (const model of list) out.push({ provider: row.slug, providerName: row.name || row.slug, model, current: !!row.is_current && model === current });
|
|
||||||
}
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Group choices by provider for <optgroup>, keeping the row order. */
|
|
||||||
export function groupModelChoices(choices: HermesModelChoice[]): Array<{ provider: string; providerName: string; models: HermesModelChoice[] }> {
|
|
||||||
const groups: Array<{ provider: string; providerName: string; models: HermesModelChoice[] }> = [];
|
|
||||||
for (const c of choices) {
|
|
||||||
let g = groups.find((x) => x.provider === c.provider);
|
|
||||||
if (!g) {
|
|
||||||
g = { provider: c.provider, providerName: c.providerName, models: [] };
|
|
||||||
groups.push(g);
|
|
||||||
}
|
|
||||||
g.models.push(c);
|
|
||||||
}
|
|
||||||
return groups;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const REASONING_EFFORTS: Array<{ value: HermesReasoningEffort; label: string }> = [
|
|
||||||
{ value: '', label: 'Défaut du serveur (medium)' },
|
|
||||||
{ value: 'none', label: 'none : pas de réflexion' },
|
|
||||||
{ value: 'minimal', label: 'minimal' },
|
|
||||||
{ value: 'low', label: 'low : rapide' },
|
|
||||||
{ value: 'medium', label: 'medium : équilibré' },
|
|
||||||
{ value: 'high', label: 'high : réponses plus fouillées' },
|
|
||||||
{ value: 'xhigh', label: 'xhigh' },
|
|
||||||
{ value: 'max', label: 'max' },
|
|
||||||
{ value: 'ultra', label: 'ultra : le plus lent' }
|
|
||||||
];
|
|
||||||
|
|
||||||
export function isReasoningEffort(value: string): value is HermesReasoningEffort {
|
|
||||||
return REASONING_EFFORTS.some((e) => e.value === value);
|
|
||||||
}
|
|
||||||
@@ -240,7 +240,7 @@ export async function sendMessage(text: string, images: string[] = [], source =
|
|||||||
const runIdRef = { id: null as string | null };
|
const runIdRef = { id: null as string | null };
|
||||||
|
|
||||||
const mission = chat.missionMode && settings.hermes.missionModel.trim();
|
const mission = chat.missionMode && settings.hermes.missionModel.trim();
|
||||||
const client = hermes.client(mission ? settings.hermes.missionModel : undefined, mission ? settings.hermes.missionProvider : undefined);
|
const client = hermes.client(mission ? settings.hermes.missionModel : undefined);
|
||||||
if (mission) Log.info('hermes', `mission mode → model ${settings.hermes.missionModel}`);
|
if (mission) Log.info('hermes', `mission mode → model ${settings.hermes.missionModel}`);
|
||||||
const handle = client.send(
|
const handle = client.send(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,8 +15,6 @@ import type {
|
|||||||
HermesJob,
|
HermesJob,
|
||||||
HermesJobDraft,
|
HermesJobDraft,
|
||||||
HermesModel,
|
HermesModel,
|
||||||
HermesModelOptions,
|
|
||||||
HermesProviderRow,
|
|
||||||
HermesRunInfo,
|
HermesRunInfo,
|
||||||
HermesSession,
|
HermesSession,
|
||||||
HermesSessionMessage,
|
HermesSessionMessage,
|
||||||
@@ -33,6 +31,13 @@ const isRec = (v: unknown): v is Rec => !!v && typeof v === 'object' && !Array.i
|
|||||||
|
|
||||||
export type ResolvedTransport = Exclude<HermesTransport, 'auto'>;
|
export type ResolvedTransport = Exclude<HermesTransport, 'auto'>;
|
||||||
|
|
||||||
|
/** Stored picker IDs include the provider so identical model names remain distinct. */
|
||||||
|
export function modelSelection(value: string): { model?: string; provider?: string } {
|
||||||
|
const id = value.trim();
|
||||||
|
const separator = id.indexOf('::');
|
||||||
|
return separator > 0 ? { provider: id.slice(0, separator), model: id.slice(separator + 2) } : id ? { model: id } : {};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A web page (login portal, dashboard, reverse-proxy error) instead of JSON means the URL does not
|
* A web page (login portal, dashboard, reverse-proxy error) instead of JSON means the URL does not
|
||||||
* point at the Hermes API. Returns a human explanation, or null when the body is not HTML.
|
* point at the Hermes API. Returns a human explanation, or null when the body is not HTML.
|
||||||
@@ -202,27 +207,44 @@ export class HermesClient {
|
|||||||
|
|
||||||
async models(): Promise<HermesModel[]> {
|
async models(): Promise<HermesModel[]> {
|
||||||
const payload = await this.request<unknown>('/v1/models');
|
const payload = await this.request<unknown>('/v1/models');
|
||||||
return extractArray<HermesModel>(payload, ['data', 'models']);
|
const readEntries = (value: unknown): unknown[] => {
|
||||||
|
if (Array.isArray(value)) return value;
|
||||||
|
if (isRec(value)) {
|
||||||
|
if (Array.isArray(value.models)) return value.models;
|
||||||
|
if (value.data !== undefined) return readEntries(value.data);
|
||||||
|
}
|
||||||
|
throw new Error('Le serveur a renvoyé une liste de modèles invalide.');
|
||||||
|
};
|
||||||
|
const entries = readEntries(payload);
|
||||||
|
const models = new Map<string, HermesModel>();
|
||||||
|
for (const entry of entries) {
|
||||||
|
const id = typeof entry === 'string' ? entry.trim() : isRec(entry) && typeof entry.id === 'string' ? entry.id.trim() : '';
|
||||||
|
if (id && !models.has(id)) models.set(id, { ...(isRec(entry) ? entry : {}), id });
|
||||||
|
}
|
||||||
|
return [...models.values()];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
async modelCatalog(refresh = false): Promise<{ models: HermesModel[]; notice: string | null }> {
|
||||||
* Provider/model inventory of the dashboard picker (/v1/models only advertises the "hermes-agent"
|
let payload: unknown;
|
||||||
* alias). `refresh` re-probes every provider and busts the server cache.
|
try {
|
||||||
*/
|
payload = await this.request<unknown>(`/api/model/options${refresh ? '?refresh=true' : ''}`, { timeoutMs: 30_000 });
|
||||||
async modelOptions(refresh = false): Promise<HermesModelOptions> {
|
} catch (err) {
|
||||||
const payload = await this.request<unknown>(`/api/model/options${refresh ? '?refresh=1' : ''}`, { timeoutMs: refresh ? 60_000 : 20_000 });
|
if (!(err instanceof HttpError) || ![404, 405].includes(err.status)) throw err;
|
||||||
if (!isRec(payload)) throw new Error('Réponse /api/model/options invalide');
|
return { models: await this.models(), notice: 'Ce serveur ne propose pas le catalogue IA (/api/model/options). Mettez Hermes à jour pour choisir le fournisseur et son modèle. La liste ci-dessous contient uniquement les alias de connexion.' };
|
||||||
const providers = extractArray<HermesProviderRow>(payload, ['providers']);
|
}
|
||||||
return { providers, model: typeof payload.model === 'string' ? payload.model : null, provider: typeof payload.provider === 'string' ? payload.provider : null };
|
if (!isRec(payload) || !Array.isArray(payload.providers)) throw new Error('Catalogue IA Hermes invalide : liste des fournisseurs absente.');
|
||||||
}
|
const models = new Map<string, HermesModel>();
|
||||||
|
for (const row of payload.providers) {
|
||||||
/** Per-request model selection fields shared by runs, sessions and chat completions. */
|
if (!isRec(row) || typeof row.slug !== 'string' || !row.slug.trim() || !Array.isArray(row.models)) continue;
|
||||||
private modelFields(): Rec {
|
const unavailable = Array.isArray(row.unavailable_models) ? row.unavailable_models : [];
|
||||||
const fields: Rec = {};
|
for (const model of row.models) {
|
||||||
if (this.config.model) fields.model = this.config.model;
|
if (typeof model !== 'string' || !model.trim()) continue;
|
||||||
if (this.config.provider) fields.provider = this.config.provider;
|
const id = `${row.slug}::${model}`;
|
||||||
if (this.config.reasoningEffort) fields.model_options = { reasoning_effort: this.config.reasoningEffort };
|
models.set(id, { id, name: model, provider: typeof row.name === 'string' ? row.name : row.slug,
|
||||||
return fields;
|
available: row.authenticated !== false && !unavailable.includes(model) });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { models: [...models.values()], notice: null };
|
||||||
}
|
}
|
||||||
|
|
||||||
async skills(): Promise<HermesSkill[]> {
|
async skills(): Promise<HermesSkill[]> {
|
||||||
@@ -312,10 +334,12 @@ export class HermesClient {
|
|||||||
|
|
||||||
// ── Runs ──────────────────────────────────────────────────────────────────
|
// ── Runs ──────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
async startRun(body: { input: string; session_id?: string; instructions?: string }): Promise<{ run_id: string; status: string }> {
|
async startRun(body: { input: string; session_id?: string; instructions?: string; model?: string; provider?: string }): Promise<{ run_id: string; status: string }> {
|
||||||
const payload: Rec = { input: body.input, ...this.modelFields() };
|
const payload: Rec = { input: body.input };
|
||||||
if (body.session_id) payload.session_id = body.session_id;
|
if (body.session_id) payload.session_id = body.session_id;
|
||||||
if (body.instructions) payload.instructions = body.instructions;
|
if (body.instructions) payload.instructions = body.instructions;
|
||||||
|
if (body.model) payload.model = body.model;
|
||||||
|
if (body.provider) payload.provider = body.provider;
|
||||||
return this.request<{ run_id: string; status: string }>('/v1/runs', { method: 'POST', body: payload, timeoutMs: 30_000 });
|
return this.request<{ run_id: string; status: string }>('/v1/runs', { method: 'POST', body: payload, timeoutMs: 30_000 });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -408,7 +432,8 @@ export class HermesClient {
|
|||||||
const run = await this.startRun({
|
const run = await this.startRun({
|
||||||
input: options.text,
|
input: options.text,
|
||||||
session_id: plainSession(options.sessionId) || undefined,
|
session_id: plainSession(options.sessionId) || undefined,
|
||||||
instructions: this.config.instructions || undefined
|
instructions: this.config.instructions || undefined,
|
||||||
|
...modelSelection(this.config.model)
|
||||||
});
|
});
|
||||||
const runId = run.run_id;
|
const runId = run.run_id;
|
||||||
if (isAborted()) {
|
if (isAborted()) {
|
||||||
@@ -470,8 +495,9 @@ export class HermesClient {
|
|||||||
}
|
}
|
||||||
if (isAborted()) return '';
|
if (isAborted()) return '';
|
||||||
const realId = sessionId.slice(3);
|
const realId = sessionId.slice(3);
|
||||||
const body: Rec = { input: options.text, ...this.modelFields() };
|
const body: Rec = { input: options.text };
|
||||||
if (this.config.instructions) body.instructions = this.config.instructions;
|
if (this.config.instructions) body.instructions = this.config.instructions;
|
||||||
|
Object.assign(body, modelSelection(this.config.model));
|
||||||
|
|
||||||
let streamed = '';
|
let streamed = '';
|
||||||
let finalText = '';
|
let finalText = '';
|
||||||
@@ -508,11 +534,12 @@ export class HermesClient {
|
|||||||
let fullText = '';
|
let fullText = '';
|
||||||
let toolsAllowed = useTools;
|
let toolsAllowed = useTools;
|
||||||
for (let iteration = 0; iteration < 6 && !aborted(); iteration++) {
|
for (let iteration = 0; iteration < 6 && !aborted(); iteration++) {
|
||||||
const payload: Rec = { ...this.modelFields(), model: this.config.model || 'hermes-agent', messages, stream: true };
|
const payload: Rec = { model: 'hermes-agent', ...modelSelection(this.config.model), messages, stream: true };
|
||||||
if (toolsAllowed) {
|
if (toolsAllowed) {
|
||||||
payload.tools = options.localToolDefinitions;
|
payload.tools = options.localToolDefinitions;
|
||||||
payload.tool_choice = 'auto';
|
payload.tool_choice = 'auto';
|
||||||
}
|
}
|
||||||
|
if (this.config.reasoningEffort) payload.model_options = { reasoning_effort: this.config.reasoningEffort };
|
||||||
|
|
||||||
const toolCalls = new Map<number, CompletionToolCallAccumulator>();
|
const toolCalls = new Map<number, CompletionToolCallAccumulator>();
|
||||||
let finishReason: string | null = null;
|
let finishReason: string | null = null;
|
||||||
|
|||||||
@@ -1,47 +1,21 @@
|
|||||||
export type HermesTransport = 'auto' | 'runs' | 'sessions' | 'completions';
|
export type HermesTransport = 'auto' | 'runs' | 'sessions' | 'completions';
|
||||||
|
|
||||||
/** Thinking depth accepted by Hermes (`model_options.reasoning_effort`); empty = server default (medium). */
|
|
||||||
export type HermesReasoningEffort = '' | 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max' | 'ultra';
|
|
||||||
|
|
||||||
export interface HermesConfig {
|
export interface HermesConfig {
|
||||||
url: string;
|
url: string;
|
||||||
apiKey: string;
|
apiKey: string;
|
||||||
model: string;
|
model: string;
|
||||||
/** Hermes provider slug that serves `model` (from /api/model/options); empty = let Hermes resolve it. */
|
|
||||||
provider?: string;
|
|
||||||
/** Stable per-user key for long-term memory (X-Hermes-Session-Key). */
|
/** Stable per-user key for long-term memory (X-Hermes-Session-Key). */
|
||||||
sessionKey: string;
|
sessionKey: string;
|
||||||
transport: HermesTransport;
|
transport: HermesTransport;
|
||||||
reasoningEffort: HermesReasoningEffort;
|
reasoningEffort: '' | 'low' | 'medium' | 'high';
|
||||||
/** Extra instructions layered on top of the Hermes system prompt. */
|
/** Extra instructions layered on top of the Hermes system prompt. */
|
||||||
instructions: string;
|
instructions: string;
|
||||||
/** Model used in "mission" mode (long tasks); empty = same as `model`. */
|
/** Model used in "mission" mode (long tasks); empty = same as `model`. */
|
||||||
missionModel: string;
|
missionModel: string;
|
||||||
missionProvider?: string;
|
|
||||||
/** Expose EveFlow client tools in chat-completions mode. */
|
/** Expose EveFlow client tools in chat-completions mode. */
|
||||||
localTools: boolean;
|
localTools: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** One provider row of GET /api/model/options (the dashboard / TUI picker inventory). */
|
|
||||||
export interface HermesProviderRow {
|
|
||||||
slug: string;
|
|
||||||
name: string;
|
|
||||||
models: string[];
|
|
||||||
is_current?: boolean;
|
|
||||||
is_user_defined?: boolean;
|
|
||||||
/** False for skeleton rows of providers without credentials. */
|
|
||||||
authenticated?: boolean;
|
|
||||||
warning?: string;
|
|
||||||
[key: string]: unknown;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface HermesModelOptions {
|
|
||||||
providers: HermesProviderRow[];
|
|
||||||
/** Model and provider currently selected on the server. */
|
|
||||||
model?: string | null;
|
|
||||||
provider?: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface HermesCapabilities {
|
export interface HermesCapabilities {
|
||||||
object?: string;
|
object?: string;
|
||||||
platform?: string;
|
platform?: string;
|
||||||
@@ -61,6 +35,8 @@ export interface HermesHealth {
|
|||||||
|
|
||||||
export interface HermesModel {
|
export interface HermesModel {
|
||||||
id: string;
|
id: string;
|
||||||
|
name?: string;
|
||||||
|
available?: boolean;
|
||||||
owned_by?: string;
|
owned_by?: string;
|
||||||
provider?: string;
|
provider?: string;
|
||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
|
|||||||
+37
-35
@@ -9,7 +9,6 @@ import type {
|
|||||||
HermesJob,
|
HermesJob,
|
||||||
HermesJobDraft,
|
HermesJobDraft,
|
||||||
HermesModel,
|
HermesModel,
|
||||||
HermesModelOptions,
|
|
||||||
HermesSession,
|
HermesSession,
|
||||||
HermesSkill,
|
HermesSkill,
|
||||||
HermesToolset
|
HermesToolset
|
||||||
@@ -34,9 +33,10 @@ interface HermesStore {
|
|||||||
capabilities: HermesCapabilities | null;
|
capabilities: HermesCapabilities | null;
|
||||||
health: HermesHealth | null;
|
health: HermesHealth | null;
|
||||||
models: HermesModel[];
|
models: HermesModel[];
|
||||||
/** Provider/model inventory from /api/model/options (null until fetched or when unsupported). */
|
modelsLoading: boolean;
|
||||||
modelOptions: HermesModelOptions | null;
|
modelsError: string | null;
|
||||||
modelOptionsError: string | null;
|
modelsNotice: string | null;
|
||||||
|
refreshModels: (refresh?: boolean) => Promise<void>;
|
||||||
skills: HermesSkill[];
|
skills: HermesSkill[];
|
||||||
toolsets: HermesToolset[];
|
toolsets: HermesToolset[];
|
||||||
sessions: HermesSession[];
|
sessions: HermesSession[];
|
||||||
@@ -51,13 +51,11 @@ interface HermesStore {
|
|||||||
webhook: WebhookStatus | null;
|
webhook: WebhookStatus | null;
|
||||||
busy: boolean;
|
busy: boolean;
|
||||||
|
|
||||||
client: (modelOverride?: string, providerOverride?: string) => HermesClient;
|
client: (modelOverride?: string) => HermesClient;
|
||||||
connect: () => Promise<void>;
|
connect: () => Promise<void>;
|
||||||
refreshJobs: () => Promise<void>;
|
refreshJobs: () => Promise<void>;
|
||||||
refreshSessions: () => Promise<void>;
|
refreshSessions: () => Promise<void>;
|
||||||
refreshCatalog: () => Promise<void>;
|
refreshCatalog: () => Promise<void>;
|
||||||
/** Fetch the provider/model inventory; `refresh` asks the server to re-probe every provider. */
|
|
||||||
refreshModelOptions: (refresh?: boolean) => Promise<HermesModelOptions | null>;
|
|
||||||
refreshWebhook: () => Promise<void>;
|
refreshWebhook: () => Promise<void>;
|
||||||
createJob: (draft: HermesJobDraft) => Promise<void>;
|
createJob: (draft: HermesJobDraft) => Promise<void>;
|
||||||
updateJob: (id: string, patch: Partial<HermesJobDraft>) => Promise<void>;
|
updateJob: (id: string, patch: Partial<HermesJobDraft>) => Promise<void>;
|
||||||
@@ -69,6 +67,7 @@ interface HermesStore {
|
|||||||
const CACHE_KEY = 'eveflow.hermes.cache.v2';
|
const CACHE_KEY = 'eveflow.hermes.cache.v2';
|
||||||
let connectInflight: Promise<void> | null = null;
|
let connectInflight: Promise<void> | null = null;
|
||||||
let lastCacheSnapshot = '';
|
let lastCacheSnapshot = '';
|
||||||
|
let modelsRequest = 0;
|
||||||
const isTerminal = (status: string) => ['ok', 'failed', 'delivery_failed', 'completed', 'error'].includes(status.toLowerCase());
|
const isTerminal = (status: string) => ['ok', 'failed', 'delivery_failed', 'completed', 'error'].includes(status.toLowerCase());
|
||||||
|
|
||||||
function runFromJob(job: HermesJob): JobRun | null {
|
function runFromJob(job: HermesJob): JobRun | null {
|
||||||
@@ -93,8 +92,9 @@ export const useHermes = create<HermesStore>((set, get) => ({
|
|||||||
capabilities: null,
|
capabilities: null,
|
||||||
health: null,
|
health: null,
|
||||||
models: [],
|
models: [],
|
||||||
modelOptions: null,
|
modelsLoading: false,
|
||||||
modelOptionsError: null,
|
modelsError: null,
|
||||||
|
modelsNotice: null,
|
||||||
skills: [],
|
skills: [],
|
||||||
toolsets: [],
|
toolsets: [],
|
||||||
sessions: [],
|
sessions: [],
|
||||||
@@ -107,13 +107,13 @@ export const useHermes = create<HermesStore>((set, get) => ({
|
|||||||
webhook: null,
|
webhook: null,
|
||||||
busy: false,
|
busy: false,
|
||||||
|
|
||||||
client: (modelOverride, providerOverride) => {
|
client: (modelOverride) => {
|
||||||
const config = useSettings.getState().settings.hermes;
|
const settings = useSettings.getState().settings;
|
||||||
// Without an explicit model, use the alias advertised by /v1/models (Hermes rejects unknown names).
|
const config = settings.hermes;
|
||||||
const override = (modelOverride ?? '').trim();
|
const model = (modelOverride ?? '').trim() || config.model.trim();
|
||||||
const model = override || config.model.trim() || get().models[0]?.id || '';
|
const name = settings.assistantName.trim() || 'JARVIS';
|
||||||
const provider = override ? (providerOverride ?? '').trim() : (config.provider ?? '').trim();
|
const identity = `Identité de l'assistant dans cette conversation : ton nom est ${JSON.stringify(name)}. Utilise ce nom pour te présenter et parler de toi. EveFlow est le nom de l'application, pas ton nom. Cette identité remplace les anciens noms ou personas présents dans l'historique, la mémoire ou les instructions précédentes. Ne rappelle pas ton nom dans chaque réponse.`;
|
||||||
return new HermesClient({ ...config, model, provider });
|
return new HermesClient({ ...config, model, instructions: [config.instructions.trim(), identity].filter(Boolean).join('\n\n') });
|
||||||
},
|
},
|
||||||
|
|
||||||
connect: () => {
|
connect: () => {
|
||||||
@@ -170,30 +170,32 @@ export const useHermes = create<HermesStore>((set, get) => ({
|
|||||||
return connectInflight;
|
return connectInflight;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
refreshModels: async (refresh = false) => {
|
||||||
|
const request = ++modelsRequest;
|
||||||
|
const config = useSettings.getState().settings.hermes;
|
||||||
|
const current = () => {
|
||||||
|
const now = useSettings.getState().settings.hermes;
|
||||||
|
return request === modelsRequest && now.url === config.url && now.apiKey === config.apiKey && now.sessionKey === config.sessionKey;
|
||||||
|
};
|
||||||
|
set({ models: [], modelsLoading: true, modelsError: null, modelsNotice: null });
|
||||||
|
try {
|
||||||
|
const { models, notice } = await new HermesClient(config).modelCatalog(refresh);
|
||||||
|
if (current()) set({ models, modelsNotice: notice });
|
||||||
|
} catch (err) {
|
||||||
|
if (current()) set({ modelsError: (err as Error).message });
|
||||||
|
} finally {
|
||||||
|
if (request === modelsRequest) set({ modelsLoading: false });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
refreshCatalog: async () => {
|
refreshCatalog: async () => {
|
||||||
const client = get().client();
|
const client = get().client();
|
||||||
const [models, skills, toolsets] = await Promise.all([
|
const [, skills, toolsets] = await Promise.all([
|
||||||
client.models().catch(() => [] as HermesModel[]),
|
get().refreshModels(),
|
||||||
client.skills().catch(() => [] as HermesSkill[]),
|
client.skills().catch(() => [] as HermesSkill[]),
|
||||||
client.toolsets().catch(() => [] as HermesToolset[])
|
client.toolsets().catch(() => [] as HermesToolset[])
|
||||||
]);
|
]);
|
||||||
set({ models, skills, toolsets });
|
set({ skills, toolsets });
|
||||||
void get().refreshModelOptions();
|
|
||||||
},
|
|
||||||
|
|
||||||
refreshModelOptions: async (refresh = false) => {
|
|
||||||
if (!useSettings.getState().settings.hermes.url.trim()) return null;
|
|
||||||
try {
|
|
||||||
const modelOptions = await get().client().modelOptions(refresh);
|
|
||||||
set({ modelOptions, modelOptionsError: null });
|
|
||||||
return modelOptions;
|
|
||||||
} catch (err) {
|
|
||||||
const message = (err as Error).message;
|
|
||||||
// Older Hermes versions have no /api/model/options: the picker falls back to a free text field.
|
|
||||||
set({ modelOptionsError: message });
|
|
||||||
Log.debug('hermes', `model options unavailable: ${message}`);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
refreshSessions: async () => {
|
refreshSessions: async () => {
|
||||||
|
|||||||
@@ -87,11 +87,9 @@ export const DEFAULT_SETTINGS: Settings = {
|
|||||||
model: '',
|
model: '',
|
||||||
sessionKey: 'eveflow-desktop',
|
sessionKey: 'eveflow-desktop',
|
||||||
transport: 'auto',
|
transport: 'auto',
|
||||||
provider: '',
|
|
||||||
reasoningEffort: '',
|
reasoningEffort: '',
|
||||||
missionProvider: '',
|
|
||||||
instructions:
|
instructions:
|
||||||
"Tu es l'interface vocale EveFlow (style JARVIS). Réponds en français, de façon concise et orale quand la question est simple; utilise le Markdown uniquement pour le contenu structuré (code, listes, tableaux). Les images doivent être des URL http(s) ou des fichiers du dossier partagé.",
|
"Réponds en français, de façon concise et orale quand la question est simple; utilise le Markdown uniquement pour le contenu structuré (code, listes, tableaux). Les images doivent être des URL http(s) ou des fichiers du dossier partagé.",
|
||||||
localTools: true,
|
localTools: true,
|
||||||
missionModel: ''
|
missionModel: ''
|
||||||
},
|
},
|
||||||
|
|||||||
+114
-37
@@ -1,45 +1,122 @@
|
|||||||
import { describe, expect, it } from 'vitest';
|
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||||
import { flattenModelOptions, groupModelChoices, isReasoningEffort, modelChoiceValue, parseModelChoice } from '../src/lib/hermesModels';
|
import { HermesClient } from '../src/services/hermes/client';
|
||||||
|
import { httpFetch, httpStream } from '../src/lib/transport';
|
||||||
|
import { DEFAULT_SETTINGS, useSettings } from '../src/state/settings';
|
||||||
|
import { useHermes } from '../src/state/hermes';
|
||||||
|
import { createElement, act } from 'react';
|
||||||
|
import { createRoot } from 'react-dom/client';
|
||||||
|
import { ModelSelect } from '../src/components/settings/ModelSelect';
|
||||||
|
|
||||||
const payload = {
|
vi.mock('../src/lib/transport', async (original) => ({ ...await original<typeof import('../src/lib/transport')>(), httpFetch: vi.fn(), httpStream: vi.fn() }));
|
||||||
model: 'claude-fable-5-1',
|
const config = { ...DEFAULT_SETTINGS.hermes, url: 'https://example.test/v1/', apiKey: ' test-key ' };
|
||||||
provider: 'anthropic',
|
function respond(payload: unknown, status = 200) {
|
||||||
providers: [
|
vi.mocked(httpFetch).mockResolvedValue({ ok: status === 200, status, statusText: '', headers: {}, text: JSON.stringify(payload) });
|
||||||
{ slug: 'anthropic', name: 'Anthropic', is_current: true, models: ['claude-opus-5', 'claude-fable-5-1', 'claude-opus-5'], authenticated: true },
|
}
|
||||||
{ slug: 'openrouter', name: 'OpenRouter', models: ['deepseek/deepseek-v4', ' '], authenticated: true },
|
afterEach(() => { vi.restoreAllMocks(); useSettings.setState({ settings: DEFAULT_SETTINGS }); });
|
||||||
{ slug: 'nous', name: 'Nous Portal', models: [], authenticated: false, warning: 'paste NOUS_API_KEY to activate' },
|
|
||||||
{ slug: 'custom', name: 'Custom endpoint', models: ['qwen3'], authenticated: true }
|
|
||||||
]
|
|
||||||
};
|
|
||||||
|
|
||||||
describe('flattenModelOptions', () => {
|
describe('Hermes models', () => {
|
||||||
it('lists authenticated providers, current model first in its row, without duplicates or blanks', () => {
|
it.each(['runs', 'sessions', 'completions'] as const)('sends the configured assistant identity over %s, including after a rename', async (transport) => {
|
||||||
const choices = flattenModelOptions(payload);
|
const requests: Record<string, unknown>[] = [];
|
||||||
expect(choices.map((c) => `${c.provider}/${c.model}`)).toEqual(['anthropic/claude-fable-5-1', 'anthropic/claude-opus-5', 'openrouter/deepseek/deepseek-v4', 'custom/qwen3']);
|
const capture = async (req: { body?: string }) => { requests.push(JSON.parse(req.body!)); throw new Error('stop'); };
|
||||||
expect(choices[0].current).toBe(true);
|
vi.mocked(httpFetch).mockImplementation(capture);
|
||||||
expect(choices[1].current).toBe(false);
|
vi.mocked(httpStream).mockImplementation(capture);
|
||||||
|
for (const name of ['Jarvis', 'Nova']) {
|
||||||
|
useSettings.setState({ settings: { ...DEFAULT_SETTINGS, assistantName: name, hermes: { ...config, instructions: 'Tu es Eve. Réponds en français.' } } });
|
||||||
|
const send = useHermes.getState().client().send({ text: 'Qui es-tu ?', sessionId: 'hs:test', history: [], onEvent: vi.fn() }, transport);
|
||||||
|
await expect(send.result).rejects.toThrow('stop');
|
||||||
|
const body = requests.at(-1)!;
|
||||||
|
const instructions = transport === 'completions' ? (body.messages as { content: string }[])[0].content : body.instructions as string;
|
||||||
|
expect(instructions).toContain(`ton nom est "${name}"`);
|
||||||
|
expect(instructions).toContain('Réponds en français.');
|
||||||
|
expect(instructions).toContain("EveFlow est le nom de l'application, pas ton nom");
|
||||||
|
}
|
||||||
|
expect(useSettings.getState().settings.hermes.instructions).toBe('Tu es Eve. Réponds en français.');
|
||||||
});
|
});
|
||||||
it('tolerates an empty or malformed payload', () => {
|
it('reads the real provider inventory, keeps providers distinct and marks inaccessible models', async () => {
|
||||||
expect(flattenModelOptions(null)).toEqual([]);
|
respond({ providers: [
|
||||||
expect(flattenModelOptions({ providers: [{ slug: 'x', name: 'x', models: 'nope' } as unknown as { slug: string; name: string; models: string[] }] })).toEqual([]);
|
{ slug: 'first', name: 'First', authenticated: true, models: ['same', 'locked'], unavailable_models: ['locked'] },
|
||||||
|
{ slug: 'second', name: 'Second', authenticated: false, models: ['same'] }
|
||||||
|
] });
|
||||||
|
const result = await new HermesClient(config).modelCatalog(true);
|
||||||
|
expect(httpFetch).toHaveBeenCalledWith(expect.objectContaining({ url: 'https://example.test/api/model/options?refresh=true' }));
|
||||||
|
expect(result.models.map(m => [m.id, m.available])).toEqual([['first::same', true], ['first::locked', false], ['second::same', false]]);
|
||||||
|
expect(result.notice).toBeNull();
|
||||||
});
|
});
|
||||||
it('groups by provider in row order', () => {
|
it('explains old servers instead of presenting the connection alias as an LLM catalog', async () => {
|
||||||
const groups = groupModelChoices(flattenModelOptions(payload));
|
vi.mocked(httpFetch).mockResolvedValueOnce({ ok: false, status: 404, statusText: '', headers: {}, text: '' })
|
||||||
expect(groups.map((g) => g.providerName)).toEqual(['Anthropic', 'OpenRouter', 'Custom endpoint']);
|
.mockResolvedValueOnce({ ok: true, status: 200, statusText: '', headers: {}, text: JSON.stringify({ data: [{ id: 'hermes-agent' }] }) });
|
||||||
expect(groups[0].models).toHaveLength(2);
|
const result = await new HermesClient(config).modelCatalog();
|
||||||
|
expect(result.models).toEqual([{ id: 'hermes-agent' }]);
|
||||||
|
expect(result.notice).toContain('Mettez Hermes à jour');
|
||||||
});
|
});
|
||||||
});
|
it.each(['runs', 'sessions', 'completions'] as const)('sends provider and actual model separately over %s', async (transport) => {
|
||||||
|
const requests: unknown[] = [];
|
||||||
describe('model choice value', () => {
|
vi.mocked(httpFetch).mockImplementation(async req => {
|
||||||
it('round-trips provider and model, including model ids containing slashes and colons', () => {
|
requests.push(JSON.parse(req.body as string));
|
||||||
const v = modelChoiceValue('openrouter', 'deepseek/deepseek-v4:free');
|
throw new Error('stop');
|
||||||
expect(parseModelChoice(v)).toEqual({ provider: 'openrouter', model: 'deepseek/deepseek-v4:free' });
|
});
|
||||||
expect(parseModelChoice('hermes-agent')).toEqual({ provider: '', model: 'hermes-agent' });
|
vi.mocked(httpStream).mockImplementation(async req => {
|
||||||
expect(parseModelChoice('::')).toEqual({ provider: '', model: '' });
|
requests.push(JSON.parse(req.body as string));
|
||||||
|
throw new Error('stop');
|
||||||
|
});
|
||||||
|
const send = new HermesClient({ ...config, model: 'custom:local::real-model' }).send({ text: 'Bonjour', sessionId: 'hs:test', history: [], onEvent: vi.fn() }, transport);
|
||||||
|
await expect(send.result).rejects.toThrow('stop');
|
||||||
|
expect(requests[0]).toMatchObject({ model: 'real-model', provider: 'custom:local' });
|
||||||
});
|
});
|
||||||
it('validates reasoning effort levels', () => {
|
it('uses authenticated discovery and preserves provider labels, order and unique valid IDs', async () => {
|
||||||
expect(isReasoningEffort('xhigh')).toBe(true);
|
respond({ data: [{ id: 'b', provider: 'provider-b' }, { id: 'a' }, { id: 'b' }, {}, ' c '] });
|
||||||
expect(isReasoningEffort('')).toBe(true);
|
expect(await new HermesClient(config).models()).toEqual([{ id: 'b', provider: 'provider-b' }, { id: 'a' }, { id: 'c' }]);
|
||||||
expect(isReasoningEffort('turbo')).toBe(false);
|
expect(httpFetch).toHaveBeenCalledWith(expect.objectContaining({ url: 'https://example.test/v1/models', headers: expect.objectContaining({ Authorization: 'Bearer test-key' }) }));
|
||||||
|
});
|
||||||
|
it('accepts nested catalogs and empty lists, rejects malformed responses', async () => {
|
||||||
|
respond({ data: { models: ['a'] } });
|
||||||
|
expect(await new HermesClient(config).models()).toEqual([{ id: 'a' }]);
|
||||||
|
respond({ data: [] });
|
||||||
|
expect(await new HermesClient(config).models()).toEqual([]);
|
||||||
|
respond({ data: { error: 'unavailable' } });
|
||||||
|
await expect(new HermesClient(config).models()).rejects.toThrow('invalide');
|
||||||
|
});
|
||||||
|
it('surfaces authentication failures without clearing the selected model', async () => {
|
||||||
|
useSettings.setState({ settings: { ...DEFAULT_SETTINGS, hermes: { ...config, model: 'chosen' } } });
|
||||||
|
respond({}, 401);
|
||||||
|
await useHermes.getState().refreshModels();
|
||||||
|
expect(useHermes.getState().modelsError).toContain('401');
|
||||||
|
expect(useHermes.getState().modelsLoading).toBe(false);
|
||||||
|
expect(useSettings.getState().settings.hermes.model).toBe('chosen');
|
||||||
|
});
|
||||||
|
it('discards results from a previous server or an older refresh', async () => {
|
||||||
|
useSettings.setState({ settings: { ...DEFAULT_SETTINGS, hermes: config } });
|
||||||
|
let finish!: (value: { models: { id: string }[]; notice: null }) => void;
|
||||||
|
vi.spyOn(HermesClient.prototype, 'modelCatalog').mockImplementationOnce(() => new Promise(resolve => { finish = resolve; })).mockResolvedValue({ models: [{ id: 'new' }], notice: null });
|
||||||
|
const old = useHermes.getState().refreshModels();
|
||||||
|
useSettings.setState({ settings: { ...DEFAULT_SETTINGS, hermes: { ...config, url: 'https://new.test' } } });
|
||||||
|
await useHermes.getState().refreshModels();
|
||||||
|
finish({ models: [{ id: 'old' }], notice: null });
|
||||||
|
await old;
|
||||||
|
expect(useHermes.getState().models).toEqual([{ id: 'new' }]);
|
||||||
|
});
|
||||||
|
it('sends the selected principal model and the mission override on new runs', async () => {
|
||||||
|
useSettings.setState({ settings: { ...DEFAULT_SETTINGS, hermes: { ...config, model: 'principal', missionModel: 'mission' } } });
|
||||||
|
const start = vi.spyOn(HermesClient.prototype, 'startRun').mockRejectedValue(new Error('stop before network'));
|
||||||
|
for (const [override, expected] of [[undefined, 'principal'], ['mission', 'mission']] as const) {
|
||||||
|
const send = useHermes.getState().client(override).send({ text: 'Bonjour', sessionId: 'test-session', history: [], onEvent: vi.fn() }, 'runs');
|
||||||
|
await expect(send.result).rejects.toThrow('stop before network');
|
||||||
|
expect(start).toHaveBeenLastCalledWith(expect.objectContaining({ model: expected }));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
it('offers a visible selection, preserves a custom value and supports the default', async () => {
|
||||||
|
Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
|
||||||
|
const container = document.createElement('div');
|
||||||
|
const root = createRoot(container);
|
||||||
|
const onChange = vi.fn();
|
||||||
|
try {
|
||||||
|
await act(async () => root.render(createElement(ModelSelect, { label: 'Modèle IA', value: 'custom', models: [{ id: 'available' }], defaultLabel: 'Défaut', onChange })));
|
||||||
|
const select = container.querySelector('select')!;
|
||||||
|
expect(select.value).toBe('custom');
|
||||||
|
await act(async () => { select.value = 'available'; select.dispatchEvent(new Event('change', { bubbles: true })); });
|
||||||
|
expect(onChange).toHaveBeenLastCalledWith('available');
|
||||||
|
await act(async () => { select.value = ''; select.dispatchEvent(new Event('change', { bubbles: true })); });
|
||||||
|
expect(onChange).toHaveBeenLastCalledWith('');
|
||||||
|
} finally { await act(async () => root.unmount()); }
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
Reference in new issue
Block a user