Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7468e497c6 | ||
|
|
162eb257c7 | ||
|
|
b9a776b626 | ||
|
|
674baf6954 | ||
|
|
3d3b46b58b | ||
|
|
7cf922106f | ||
|
|
d58c321c07 | ||
|
|
db6bf03a00 | ||
|
|
c031bf67de | ||
|
|
ab6977733d | ||
|
|
00c5e2a60d | ||
|
|
858649e3c3 | ||
|
|
400a827e3f | ||
|
|
699165469d | ||
|
|
3a6445ca4e | ||
|
|
033490c464 | ||
|
|
f132885b08 | ||
|
|
a79bdc1641 | ||
|
|
a67bd252aa | ||
|
|
39d34ac866 | ||
|
|
efa3d57e93 | ||
|
|
992200a90a | ||
|
|
21b96afa12 | ||
|
|
16f73fe39e | ||
|
|
f8acb906e5 | ||
|
|
1d7750bda0 | ||
|
|
18c72d77fe | ||
|
|
64c85caffc | ||
|
|
a68e8848ea | ||
|
|
18a2d45d46 | ||
|
|
f271ac9b7a | ||
|
|
f006880394 | ||
|
|
81746d9440 | ||
|
|
f53205bc45 | ||
|
|
3706689eca | ||
|
|
0f86294abc |
@@ -20,6 +20,16 @@ GITHUB_OAUTH_CLIENT_SECRET=
|
||||
# Exemple : OAUTH_REDIRECT_URI=https://flowdeck.dracodev.net/auth/callback
|
||||
OAUTH_REDIRECT_URI=
|
||||
|
||||
# ── Connecteurs OAuth (v7.56.0) — Google / Microsoft 365 ──
|
||||
# Vidés = connecteur « non configuré » (le menu + affiche la raison).
|
||||
# Le redirect URI à enregistrer est dérivé d'APP_BASE_URL :
|
||||
# {APP_BASE_URL}/api/agent/connectors/oauth/google/callback
|
||||
# {APP_BASE_URL}/api/agent/connectors/oauth/ms365/callback
|
||||
GOOGLE_CLIENT_ID=
|
||||
GOOGLE_CLIENT_SECRET=
|
||||
MS_CLIENT_ID=
|
||||
MS_CLIENT_SECRET=
|
||||
|
||||
# ── App ──
|
||||
APP_SECRET_KEY=change-me-to-random
|
||||
APP_HOST=0.0.0.0
|
||||
|
||||
@@ -23,6 +23,7 @@ uv.lock
|
||||
*.db-*
|
||||
test-commit.md
|
||||
upload_test.txt
|
||||
commit_msg.txt
|
||||
e2e/node_modules/
|
||||
e2e/shots/
|
||||
e2e/test-results/
|
||||
|
||||
@@ -284,6 +284,251 @@ Propriétés custom, AI keywords, sync API, 12 tables DB
|
||||
|
||||
---
|
||||
|
||||
## v7.51.0 → v7.58.0 — Menu + de l'assistant : hub de contexte (phases 1-8 ✅ 2026-10-06 — menu + complet)
|
||||
|
||||
> **Objectif** : faire du bouton **+** du panneau agent (à gauche de la zone d'édition)
|
||||
> un menu à sections, tel que demandé :
|
||||
>
|
||||
> ```
|
||||
> + ├─ Ajouter des fichiers ou répertoires … → picker actuel + parcours de l'arborescence
|
||||
> ├─ Compétences-skills … … … … … … … … → Deep research, Skill-creator, … + Gérer + Parcourir
|
||||
> ├─ Connecteurs … … … … … … … … … … … → Parcourir + Ajouter un connecteur personnalisé
|
||||
> ├─ Design System – Canevas … … … … … → galerie de canevas (templates de page)
|
||||
> ├─ Add plugins … … … … … … … … … … … → catalogue de modules on/off
|
||||
> └─ Mémoire (on/off) … … … … … … … … → mémoire persistante de l'agent
|
||||
> ```
|
||||
>
|
||||
> **Doc de design** : [`docs/V74_Agent_Plus_Menu.md`](docs/V74_Agent_Plus_Menu.md)
|
||||
> — maquette, découpage front/back, modèle de données, endpoints, décisions, pièges.
|
||||
|
||||
**État des lieux lu dans le code le 2026-10-06** (constat **avant** la phase 1) :
|
||||
|
||||
- Le **+** = `toggleAddPicker()` (`static/js/agent_panel_2.js:1074`) → menu **plat** de
|
||||
mentions (`GET /api/agent/mentions`, `app/routers/agent.py:596`) : documents,
|
||||
collections, pages. **Pas de dossiers, pas de sous-menu, pas de section.**
|
||||
- **Compétences** : 11 skills builtin (`FD_SKILLS`, `static/js/agent_panel_2.js:11`) +
|
||||
table `agent_skills` (CRUD `/api/agent/skills`) + galerie de 17 presets — mais
|
||||
**aucune UI « Gérer » ni « Parcourir »** : tout passe par la palette `/`.
|
||||
- **Canevas** : `GET /api/page-templates` (built-ins `app/services/block_templates.py` +
|
||||
personnels) et `POST /api/page-templates/{id}/use` existent déjà, **jamais appelés
|
||||
depuis le panneau agent**.
|
||||
- **Connecteurs / Plugins / Mémoire** : **inexistants** — 0 hit `connector|plugin|memory`
|
||||
dans `app/` hors « in-memory ».
|
||||
|
||||
**Ordre** : phases 1 → 8, chacune indépendante et livrable (version + tests verts +
|
||||
CHANGELOG). Chiffrage : S < ½ j · M = 1–2 j · L = 3–5 j.
|
||||
|
||||
### Phase 1 — v7.51.0 — Menu hub + fichiers/répertoires · effort S–M ✅ (livrée 2026-10-06)
|
||||
|
||||
- [x] **Structure du menu** — sections + sous-menus, navigation clavier (↑/↓/Entrée/Échap),
|
||||
styles réutilisés depuis `.fd-ap-mention-menu` ; les sections pas encore livrées
|
||||
s'affichent « bientôt » et désactivées (le menu ne promet rien que le code ne fait)
|
||||
→ `FD_PLUS_MENU` / `FD_PLUS_FILES` (`static/js/agent_panel_2.js`), markup
|
||||
`.fd-ap-plus-menu` (`agent_panel.html`), Échap remonte d'un niveau, la frappe
|
||||
referme le menu
|
||||
- [x] **Fichiers & répertoires** — picker actuel (recherche) **+ mode « Parcourir… »** :
|
||||
arborescence **un niveau par appel via `GET /api/nav/menu?parent_id=`**
|
||||
(contrat : dossier = `icon === 'folder'` — plus simple que le tree récursif,
|
||||
déjà testé), fil d'Ariane cliquable ; un répertoire s'épingle comme un fichier
|
||||
(ligne « 📌 Épingler le dossier »)
|
||||
- [x] **Jeton `folder:<id>`** résolu par `ContextBuilder._mentions_context` →
|
||||
`_single_folder()` : titre du dossier + documents directs, budget ~12k caractères
|
||||
(marqueur « tronqué ») ; enfants directs seulement (récursion si besoin réel)
|
||||
- [x] **Tests** — `tests/test_v751_plus_menu.py` : **7 tests** (résolution, budget,
|
||||
id inconnu, contrat `/api/nav/menu`, rendu du menu, 6 sections / 5 désactivées
|
||||
à la livraison de la phase 1, jeton `folder:` front+back) ; **suite complète
|
||||
1273 verts** à la livraison, `ruff` 0, `eslint` 0 erreur
|
||||
- [x] **Livraison** — `VERSION` + `app/main.py` = **7.51.0**, CHANGELOG, ce ROADMAP
|
||||
|
||||
### Phase 2 — v7.52.0 — Compétences : « Gérer » + « Parcourir » · effort M ✅ (livrée 2026-10-06)
|
||||
|
||||
- [x] **Sous-menu Compétences** — 11 builtin + skills enregistrés listés, le clic
|
||||
épingle le skill au contexte (même chemin que la palette `/`, comportement
|
||||
conservé)
|
||||
- [x] **Libellés affichés** — alias « Deep research » (`/research`) et
|
||||
« Skill-creator » (`/create-new-skill`) via `FD_SKILL_ALIAS`, slugs intacts
|
||||
- [x] **« Gérer les compétences »** — **section du menu + formulaire intégré**
|
||||
(nom, description, prompt) plutôt que modale : CRUD `POST`/`PATCH`/`DELETE`
|
||||
sur `/api/agent/skills` — **`PATCH /api/agent/skills/{id}` créé** (champs
|
||||
présents seuls, whitelist de colonnes, 400/401/404/409) + **export JSON**
|
||||
(`/skills/{id}/export` → téléchargement) et **import fichier**
|
||||
(`/skills/import`, `overwrite:true` → pas de doublon) ; suppression = nettoyage
|
||||
du chip épinglé
|
||||
- [x] **« Parcourir les compétences »** — section galerie sur
|
||||
`GET /api/agent/skills/gallery`, **filtre** (nom/description/slug),
|
||||
installation en 1 clic (réutilise `installGallerySkill`)
|
||||
- [x] **En-tête ← + titre** dans le menu (navigation à 3 niveaux)
|
||||
- [x] **Fix** — épingler un skill enregistré n'efface plus le message tapé
|
||||
- [x] **Tests** — `tests/test_v752_skills_menu.py` : **7 tests** (PATCH complet +
|
||||
partiel, 400/404, 401 sans session, import sans doublon, export→import,
|
||||
câblage sections/alias, markup) ; `test_v751` adapté (4 sections « bientôt ») ;
|
||||
**suite complète 1280 verts**, `ruff` 0, `eslint` 0 problème
|
||||
- [x] **Livraison** — `VERSION` + `app/main.py` = **7.52.0**, OpenAPI régénéré
|
||||
(515 chemins), CHANGELOG, ce ROADMAP
|
||||
|
||||
### Phase 3 — v7.53.0 — Design System – Canevas · effort M ✅ (livrée 2026-10-06)
|
||||
|
||||
- [x] **Sous-menu Canevas** — `GET /board/api/page-templates` (built-ins **+
|
||||
personnels**) ; **piège confirmé** : le router est sous `prefix="/board"` →
|
||||
l'URL réelle est `/board/api/page-templates`, pas `/api/page-templates`
|
||||
(404 silencieux corrigé dans le front)
|
||||
- [x] **Deux actions (3 en réalité)** — page de détail par canevas :
|
||||
« Créer une page à partir du canevas » (`POST …/0/use` avec `{key}` **dans le
|
||||
body** — la clé en query est ignorée par la route), « Insérer dans le document
|
||||
ouvert » (`GET …/blocks` **nouvelle route** → `ensureBlockIds()` global →
|
||||
concat dans `E.blocks` + `autoSave/render`, désactivé sans document ouvert)
|
||||
et « Enregistrer le document ouvert comme canevas » (`POST` + `page_id`)
|
||||
- [x] **Canevas « design system »** — preset `design_system` dans
|
||||
`block_templates.py` (callout tokens, TOC, toggles composants, grille,
|
||||
checklist revue UI) ; `design-tokens.css` référencé dans le callout
|
||||
- [x] **Sauver le doc ouvert comme canevas** — `POST /board/api/page-templates`
|
||||
(existante) branchée depuis le menu, nom via `prompt()` natif
|
||||
- [x] **Tests** — `tests/test_v753_canvases.py` : **5 tests** (preset listé,
|
||||
route blocks intégré/personnel + 404, création de page vérifiée en base avec
|
||||
ids, câblage 3 « bientôt » + garde-fou `key`-dans-le-body) ; `test_v751`
|
||||
adapté ; **suite complète 1285 verts**, `ruff` 0, `eslint` 0 problème
|
||||
- [x] **Livraison** — `VERSION` + `app/main.py` = **7.53.0**, OpenAPI régénéré
|
||||
(516 chemins), CHANGELOG, ce ROADMAP
|
||||
|
||||
### Phase 4 — v7.54.0 — Mémoire de l'agent · effort M ✅ (livrée 2026-10-06)
|
||||
|
||||
- [x] **Table `agent_memory`** — **une ligne résumé par conversation**
|
||||
(`conversation_id` PK, upsert) + colonne `agent_conversations.memory_enabled`
|
||||
(migration **31**, défaut `1`) ; la variante « mémoire d'espace » prévue au
|
||||
design est **remise** (YAGNI : rien ne l'écrit — `ponytail:` noté dans le service)
|
||||
- [x] **Service `app/services/agent_memory.py`** — **extraction déterministe**
|
||||
(pas d'LLM) : 1 note par échange (objectif 180 car. → réponse 700 car.),
|
||||
20 notes max, écrite en fin de run via `agent_memory.remember()` ; toute
|
||||
erreur est journalisée, **un run ne peut pas échouer à cause de la mémoire**
|
||||
- [x] **Injection** — `AgentEngine.run()` appelle `agent_memory.context_for()` après
|
||||
`ContextBuilder.build()` : bloc « ## Mémoire de la conversation », **budget
|
||||
4 000 caractères** (troncature par la gauche + marqueur) ; OFF = ni lecture ni
|
||||
écriture → contexte strict du run courant
|
||||
- [x] **Toggle « Mémoire »** dans le menu + — entrée racine à l'état réel
|
||||
(🧠/💭 + libellé), `PATCH /api/agent/conversations/{id}` (`memory_enabled`
|
||||
ajouté au whitelist), état lu à l'ouverture et à la création, défaut
|
||||
`AGENT_MEMORY_DEFAULT` (config + réponse de création)
|
||||
- [x] **Tests** — `tests/test_v754_memory.py` : **8 tests** dont **2 runs réels du
|
||||
moteur** (FakeLLM capture le prompt : mémoire présente ON / absente OFF),
|
||||
budget et nombre de notes bornés, toggle relu en base ; `test_v751` +
|
||||
`test_v753` adaptés (2 sections « bientôt ») ; **suite complète 1293 verts**,
|
||||
`ruff` 0, `eslint` 0 problème
|
||||
- [x] **Livraison** — `VERSION` + `app/main.py` = **7.54.0**, OpenAPI régénéré
|
||||
(516 chemins), CHANGELOG, ce ROADMAP
|
||||
|
||||
### Phase 5 — v7.55.0 — Connecteurs : socle · effort L ✅ (livrée 2026-10-06)
|
||||
|
||||
- [x] **Table `agent_connectors`** (migration **32**) — colonnes **plates**
|
||||
(`name`, `url`, `secret_encrypted`, `enabled`, `status`, `detail`) ; le
|
||||
`config_json` prévu est **remis** (YAGNI : rien ne le remplissait — les scopes
|
||||
OAuth des phases 6-7 ajouteront le leur)
|
||||
- [x] **`app/services/connectors.py`** — **1 fichier au lieu du package
|
||||
`connectors/`** promis (3 probes + 1 fetch ne justifient pas une arborescence) ;
|
||||
3 natifs `gitea`/`github`/`web` servis à la volée, statut **sans réseau**
|
||||
(`native_state()`) ; `probe()` et `connector_fetch()` passent par `_get()`
|
||||
(gardé SSRF + re-vérification après redirection, timeout 10 s, borne 20 000 car.)
|
||||
- [x] **Menu « Connecteurs »** — « Parcourir » = catalogue avec badge
|
||||
(✓ ok / ✗ error / ⚠ missing / ? inconnu) + fiche (Tester, Activer/Désactiver,
|
||||
Supprimer — masqués pour les natifs) ; « Ajouter un connecteur personnalisé » =
|
||||
formulaire nom + URL + clé (`type="password"`)
|
||||
- [x] **Tool agent** — **un seul `connector_fetch`** (id/nom/kind + `path` +
|
||||
`query`) au lieu d'un outil par connecteur : même capacité, moins de bruit de
|
||||
schéma — l'outil dispatche vers Gitea/GitHub/web/personnalisé. Connecteur
|
||||
désactivé ou inconnu = erreur outil, jamais une exception de run
|
||||
- [x] **Sécurité** — `_validate_url` (SSRF) à la création **et** à chaque appel,
|
||||
clé **chiffrée Fernet** et jamais renvoyée (`has_secret` seulement), 401 sans
|
||||
session sur les 5 routes, CSRF global
|
||||
- [x] **Tests** — `tests/test_v755_connectors.py` : **13 tests** (3 natifs, clé
|
||||
chiffrée roundtrip, **5 URLs refusées** : localhost / 127.0.0.1 / metadata
|
||||
cloud / ftp: / file:, toggle persisté, 401, probe OK + probe erreur persistée,
|
||||
outil complet, câblage menu) ; 3 autres fichiers de phase adaptés (1 section
|
||||
« bientôt » restante) ; **suite complète 1306 verts**, `ruff` 0, `eslint` 0
|
||||
- [x] **Livraison** — `VERSION` + `app/main.py` = **7.55.0**, OpenAPI régénéré
|
||||
(519 chemins), CHANGELOG, ce ROADMAP
|
||||
|
||||
### Phase 6 — v7.56.0 — Connecteurs : Google + Microsoft 365 · effort L ✅ (livrée 2026-10-06)
|
||||
|
||||
- [x] **OAuth2 PKCE Google** — Drive / Gmail / Calendar **en lecture seule** ;
|
||||
connexion (`begin()` → URL + state + `code_verifier` S256), échange du code,
|
||||
**refresh automatique** (60 s de marge, `refresh_token` conservé si absent de
|
||||
la réponse), déconnexion — table `connector_tokens` (migration **33**,
|
||||
PK `(kind, user_id)`), tokens chiffrés Fernet **réutilisant**
|
||||
`calendar_sync._encrypt_tokens` (zéro dépendance ajoutée)
|
||||
- [x] **OAuth2 Microsoft (Graph)** — `Files.Read` / `Mail.Read` / `Calendars.Read`
|
||||
+ `offline_access`, même code (2 providers décrits par **1 dict**)
|
||||
- [x] **Écran connecteur** — **pas de page dédiée** : l'état vit dans la fiche du
|
||||
menu + (badge « connecté · N scope(s) » / « non connecté »), boutons
|
||||
**Se connecter / Déconnecter**, toast au retour du flux (`?oauth=connected` /
|
||||
`?oauth_error=` nettoyés par `history.replaceState`)
|
||||
- [x] **Tests** — `tests/test_v756_oauth_connectors.py` : **13 tests**, **0 appel
|
||||
réseau réel** (`_post_form` / `_api_get` monkeypatchés) — URL d'autorisation
|
||||
(PKCE, scopes, redirect URI, cookies), 400 non configuré, callback → tokens
|
||||
chiffrés + redirection, **state forgé refusé sans échange**, callback sans
|
||||
session, refresh, `api_get` (Bearer, URL absolue refusée), déconnexion,
|
||||
catalogue, outil LLM, 401/404, câblage menu ; `test_v755` adapté (5 natifs) ;
|
||||
**suite complète 1319 verts**, `ruff` 0, `eslint` 0
|
||||
- [x] **Livraison** — `VERSION` + `app/main.py` = **7.56.0**, `.env.example`
|
||||
(GOOGLE_/MS_ CLIENT_ID/SECRET + redirect URI), OpenAPI régénéré (523 chemins),
|
||||
CHANGELOG, ce ROADMAP
|
||||
|
||||
### Phase 7 — v7.57.0 — Connecteurs : Discord, Telegram, Teams, MCP · effort L ✅
|
||||
|
||||
- [x] **Presets Discord / Telegram** — champ **Type** dans le formulaire
|
||||
« Ajouter un connecteur » : `kind` + `auth` (`bearer`/`bot`/`none`) ajoutés à
|
||||
`agent_connectors` (migration **34**) ; Discord = en-tête d'autorisation avec
|
||||
le jeton préfixé, Telegram = jeton **dans l'URL** via le substitut `{secret}`
|
||||
(remplacé à l'appel, **jamais stocké en clair** — colonne url = `…/bot{secret}`)
|
||||
- [x] **Teams** — scope `ChannelMessage.Read.All` ajouté aux Graph scopes M365
|
||||
(consentement admin)
|
||||
- [x] **MCP complet** — `app/services/mcp_client.py` : `initialize` →
|
||||
`notifications/initialized` → `tools/list` → `tools/call` (JSON-RPC 2.0,
|
||||
réponse JSON **ou** 1er `data:` d'un `text/event-stream`), garde SSRF,
|
||||
outils **cachés** en base (`tools_json`, maj par le bouton « Tester »)
|
||||
- [x] **Outils dynamiques au registre** — `ToolRegistry._all()` merge le cache
|
||||
MCP à chaque run : nom `mcp_<serveur>_<outil>` + `inputSchema` exposés au
|
||||
LLM, `execute()` dispatche sur `tools/call` ; serveur désactivé → outil
|
||||
**absent du schéma** ; erreur RPC → `ToolResult(error)` (jamais de run perdu)
|
||||
- [x] **Tests** — `tests/test_v757_mcp_discord.py` : **12 tests**, 0 appel
|
||||
réseau (`_rpc` / `_get` monkeypatchés) — presets, `{secret}` absent de la
|
||||
base, kind/auth invalides → 400, handshake + séquence d'appels, cache
|
||||
`tools_json`, dispatch LLM, serveur désactivé, erreur handshake → probe
|
||||
error, parse SSE/erreurs JSON-RPC, slug, scopes Teams, câblage menu
|
||||
- [x] **Livraison** — `VERSION` + `app/main.py` = **7.57.0**, OpenAPI régénéré,
|
||||
CHANGELOG, ce ROADMAP
|
||||
|
||||
### Phase 8 — v7.58.0 — Add plugins · effort M ✅
|
||||
|
||||
- [x] **Registre `plugins`** (`slug`, `name`, `description`, `enabled`) —
|
||||
migration **35**, table pré-remplie avec les **3 modules** ; ligne absente =
|
||||
activé (défaut sûr)
|
||||
- [x] **Catalogue dans le menu +** — l'entrée « Add plugins » devient vivante
|
||||
(fini le `disabled:true`) : liste des 3 plugins + bascule via
|
||||
`GET/PATCH /api/agent/plugins[/slug]`
|
||||
- [x] **Bascule on/off à effet réel** :
|
||||
- `automations` → **toutes** les routes `/workspace/automations*` refusées
|
||||
(dépendance FastAPI posée **à l'`include_router`**, aucun router touché) +
|
||||
scheduler de fond en veille (garde par tick) ;
|
||||
- `web-clipper` → `GET /extensions` + `/api/v2/web-clipper/*` refusés ;
|
||||
- `web-tools` → `web_search` / `fetch_url` retirés du **schéma** et de
|
||||
`execute()` (`ToolRegistry._all()`) ;
|
||||
- UI → nav « Extensions » / « Automations » rendues sous
|
||||
`{% if plugin_enabled(...) %}` (global Jinja, élément **absent** du DOM),
|
||||
sections conditionnées en `x-show`
|
||||
- [x] **Tests** — `tests/test_v758_plugins.py` : **10 tests** — plugin OFF =
|
||||
route refusée (302 hors `/api`, 404 JSON pour `/api*`) + UI absente + outil
|
||||
retiré, persistance, 401 sans session
|
||||
- [x] **Livraison** — `VERSION` + `app/main.py` = **7.58.0**, OpenAPI régénéré
|
||||
(525 chemins), CHANGELOG, ce ROADMAP
|
||||
|
||||
---
|
||||
|
||||
*Plan produit le 2026-10-06 à partir du code réel — **phases 1 à 8 livrées le
|
||||
2026-10-06 (v7.51.0 → v7.58.0) : le menu + est complet** (aucune section
|
||||
« bientôt »). Toute extension ultérieure = nouvelle phase à valider.
|
||||
Chaque phase se clôt par tests verts, bump de version, CHANGELOG et ROADMAP à jour.*
|
||||
|
||||
---
|
||||
|
||||
## 🔜 Prochaines versions
|
||||
|
||||
### v4.0.1 — Onboarding & Polish ✅ (2026-07-18)
|
||||
@@ -1163,6 +1408,224 @@ Détails livrés :
|
||||
- [x] **Tests follow-ups** — `tests/test_v73_wiki_polish.py` (58 → **72 tests**) : sidebar cross-workspace, page teamspace (owner 200 / outsider 404 API), auto-follow comment, notif throttlée, unfurl gitea/github + endpoint, KPI + dashboards multi-DB
|
||||
- [x] **Suite complète** — `python -m pytest -n auto` → **1016 passed** (était 981 passed / 21 failed en SSO)
|
||||
|
||||
### v7.62.0 — Menu contextuel au highlight de texte ✅ (2026-10-08)
|
||||
> **Objectif** : menu façon Notion (mode sombre) au surlignage de texte dans l'éditeur. **COMPLETED**.
|
||||
|
||||
- [x] **Toolbar de sélection 4 lignes** — `T` + type de bloc dynamique + `›` (sous-menu Turn into existant) / `A` `B` `I` `U` `T` barré `Tx` / 🔗 `S` `</>` `√x` `…` / 💬 `✨`, section grise **Skills** (Improve writing, Proofread, Explain, Reformat → `runSkill`) et pied **Edit with AI** `Alt+⇧+E` — affichée **sous** la sélection (au-dessus si pas de place), clampée au viewport, fermeture au clic hors sélection
|
||||
- [x] **`…` → menu contextuel de bloc** déjà existant (recherche « Search actions… », groupe Text, 10 actions + raccourcis, pied métadonnées auteur/heure/taille) — pas de doublon de menu
|
||||
- [x] **Persistance du formatage inline** — sérialiseur `gtMd()` (DOM → source markdown) branché sur `sync()` ; `mdEsc()` rend `__…__`, `==…==`, `$$…$$` (KaTeX inline) — avant, `sync()` relisait du texte brut et perdait tout le formatage au prochain rendu
|
||||
- [x] **Info-bulle claire à droite** — `data-tooltip-html` + `.tooltip-light` dans le tooltip global (`app.js`)
|
||||
- [x] **Fix `askAI(idx)` écrasé par `askAI()`** — « Ask AI » / `Ctrl+J` ouvraient l'IA de page → `askAIBlock(idx)`
|
||||
- [x] **Fix « toolbar muette sous Alpine v3 »** — `ed.__x` (API v2) n'existe plus : `showFmt`/`hideCommentBtn`/mentions ne s'exécutaient jamais → accès via `_xed()` (`_x_dataStack[0]`) ; ancre de sélection élément gérée ; `checkMd()` recevait un id au lieu d'un index (exception à chaque espace)
|
||||
- [x] **Tests** — `tests/test_v762_selection_toolbar.py` (roundtrip `gtMd`/`mdEsc` réel sous node) + **e2e Playwright** `e2e/v762_selection_toolbar.spec.js` (structure, sous-menus, géométrie, persistance bold/highlight après reload) ; `VERSION` + `app/main.py` = 7.62.0
|
||||
|
||||
### v7.63.0 — Menus mobiles façon Notion ✅ (2026-10-08)
|
||||
> **Objectif** : parité des menus mobiles (Android sombre) — barre contextuelle au
|
||||
> « / » + menu « Insert block » plein écran. **COMPLETED**.
|
||||
|
||||
- [x] **Barre horizontale défilante** sous le curseur (mobile ≤ 768 px) — 15 boutons
|
||||
dans l'ordre Notion : `+▾`, `Turn into▾`, `@`, 💬, 🖼, 🗑, `←→↑↓`, `↩↪`, `Color▾`,
|
||||
`More▾`, `⌨` ; `overflow-x:auto`, fermeture auto quand le `/` disparaît, taps
|
||||
exclus du handler « clic hors-zone »
|
||||
- [x] **Feuille plein écran « Insert block »** (`+`) — titre centré + « Cancel » bleu,
|
||||
groupes CMDS avec raccourcis markdown (items partagés avec la popup desktop) ;
|
||||
`Turn into` / `Color` réutilisent les générateurs extraits (`_blockTurnItems`,
|
||||
`_blockColorItems`) ; `More` ouvre le menu de bloc existant
|
||||
- [x] **`moveBlock(bid, dir)`** — ↑↓ ordre (racine + enfants toggle/columns),
|
||||
→ indent dans le frère précédent, ← outdent, garde-fous toast
|
||||
- [x] **Raccourcis slash** alignés sur les préfixes markdown (`-`, `[]`, `>`, `---`)
|
||||
- [x] **Tests** — `tests/test_v763_mobile_menus.py` (+ `moveBlock` exécuté sous node),
|
||||
e2e mobile `e2e/v763_mobile_menus.spec.js` (390×844) ; `VERSION` + `app/main.py`
|
||||
= 7.63.0
|
||||
|
||||
### v7.64.0 — Commentaires & réactions façon Notion ✅ (2026-10-08)
|
||||
> **Objectif** : affichage/prise de commentaire identique à Notion + réaction emoji
|
||||
> sur le texte sélectionné. **COMPLETED**.
|
||||
|
||||
- [x] **Réaction sur texte** — bouton 🙂+ (« React to selected text ») dans la
|
||||
toolbar de sélection → sélecteur d'émoji **existant** en mode réaction (en-tête =
|
||||
texte sélectionné + ✋, onglets masqués, Recent au-dessus de People, Filter…,
|
||||
catégories + `+` custom) ; plage jaune + pastille (emoji + compte), clic pastille
|
||||
= rouvrir le sélecteur pour la plage
|
||||
- [x] **Backend** — migration 37 `text_reactions` (UNIQUE plage × emoji × user) +
|
||||
`GET/POST /api/pages/{id}/reactions` (GET groupé, POST toggle) ; `gtTok`/`gtMd`
|
||||
ignorent les pastilles et `_srcOffset` exclut les annotations des offsets → le
|
||||
texte sauvé est identique
|
||||
- [x] **Ancres jaunes** — `_paintAnchors()` après chaque `render()`/chargement ;
|
||||
clic sur l'ancre → tiroir ouvert + fil centré (flash) ; résolu = gris
|
||||
- [x] **Tiroir refondu** — carte de fil (avatar, nom, horodatage, ✓ toggle
|
||||
resolve/reopen, ⋯ → Copy link `#cmt-<id>` / Delete), saisie « Add a comment... »
|
||||
avec `@` et envoi `↑`/Entrée ; `resolveComment(c)` corrige l'impossibilité de
|
||||
rouvrir
|
||||
- [x] **Tests** — `tests/test_v764_comments_reactions.py` (8, dont toggle API réel),
|
||||
e2e `e2e/v764_comments_reactions.spec.js` ; `VERSION` + `app/main.py` = 7.64.0
|
||||
- [x] **v7.64.1 — Fix Delete sur bloc vide** : la garde « texte vide → supprimer
|
||||
le bloc » couvre `Backspace` **et** `Delete` (une seule branche dans `onKd`),
|
||||
vide jugé via `gtTok()` (ignore les pastilles) ; e2e
|
||||
`e2e/v7641_delete_key.spec.js`
|
||||
|
||||
### v7.65.0 — Comment ancré sur la sélection de texte ✅ (2026-10-08)
|
||||
> **Objectif** : le commentaire porte sur le texte sélectionné dans le bloc,
|
||||
> pas sur le bloc entier, et le bouton bleu flottant disparaît. **COMPLETED**.
|
||||
|
||||
- [x] **Ancrage sur la plage** — `commentBlock()` prend la sélection vivante dans
|
||||
le bloc (repli : la plage mémorisée par la toolbar, qui survit au clic du
|
||||
bouton), sinon tout le bloc ; offsets calculés par `_srcOffset()` →
|
||||
`anchor_start/anchor_end` exacts dans le texte source
|
||||
- [x] **Bouton bleu « 💬 Comment » retiré** — `#_commentSelBtn`,
|
||||
`showCommentBtn()`, `hideCommentBtn()` et leur listener `mousedown` supprimés ;
|
||||
déclencheurs restants = 💬 de la toolbar de sélection, menu de bloc,
|
||||
Ctrl+⇧+M
|
||||
- [x] **Tiroir** — fermer remet `_commentSel` à zéro (pas d'ancrage périmé)
|
||||
- [x] **Tests** — e2e `e2e/v764_comments_reactions.spec.js` : sous-sélection
|
||||
`reaction a un` → `.fd-anchor[data-cid]` = la plage seule, avant/après
|
||||
reload, `#_commentSelBtn` absent ; `pytest` 1383 passed, `ruff` OK ;
|
||||
`VERSION` + `app/main.py` = 7.65.0
|
||||
|
||||
### v7.66.0 — Escape du menu slash + bouton commenter à droite ✅ (2026-10-08)
|
||||
> **Objectif** : Esc efface le `/` qui a ouvert le menu slash, et chaque bloc
|
||||
> gagne un bouton de commentaire à droite. **COMPLETED**.
|
||||
|
||||
- [x] **`SM.escClose()`** — un seul implément, appelé par les deux chemins
|
||||
(focus dans le bloc → `onKd`, focus dans l'entrée du menu → listener
|
||||
`document`) ; retire le `/` d'ouverture seulement, remet le caret, `sync` +
|
||||
`autoSave`
|
||||
- [x] **Bouton à droite du bloc** — `.block-comment-btn` (bulle + `+`,
|
||||
`E.commentBlock(idx)`), gouttière 64px, visible au survol, masqué mobile +
|
||||
page verrouillée ; remplace l'ancien `.block-actions` mort (opacity:0 sans
|
||||
survol → `+` invisible qui capait les clics)
|
||||
- [x] **`fmtComment()`** restaure la plage de la toolbar avant d'ancrer ;
|
||||
`commentBlock()` ne se replie plus sur `this._sel` périmé
|
||||
- [x] **Tests** — e2e `e2e/v766_slash_esc_comment_btn.spec.js` (Esc → menu
|
||||
fermé + bloc vide ; bouton à droite mesuré, ancre = bloc entier),
|
||||
`tests/test_v766_slash_esc_comment_btn.py` (3) ; `pytest` **1386 passed**,
|
||||
`ruff` OK ; `VERSION` + `app/main.py` = 7.66.0
|
||||
|
||||
### v7.67.0 — Réactions dans le tiroir + suppression + refonte du menu de sélection ✅ (2026-10-08)
|
||||
> **Objectif** : une réaction s'ajoute/supprime depuis le tiroir Comments, et
|
||||
> le menu de sélection correspond à la maquette ASCII fournie. **COMPLETED**.
|
||||
|
||||
- [x] **Section « Reactions » du tiroir** — `reactionList()` + `_anchorText()`
|
||||
(texte de la plage lu dans le DOM, hors pastilles), compte si >1, état vide
|
||||
adapté ; `removeReaction()` = POST toggle
|
||||
- [x] **Suppression** — ✕ dans le tiroir (mes réactions seulement) **et**
|
||||
croix `::after` au survol de la pastille sur l'émoji que j'ai posé (aucun
|
||||
nœud ajouté → offsets source intacts)
|
||||
- [x] **Refonte du menu** — ligne 4 scannée `💬 Comment | 🙂 réaction`,
|
||||
réaction sortie de la ligne 3, entête `Skills ≡`, liste Skills scrollable,
|
||||
`✨ Ask AI` retiré (doublon exact du pied)
|
||||
- écart volontaire à la maquette : le **barré (T)** de la ligne 2 est
|
||||
conservé (il n'y figure pas) pour ne pas perdre la fonction
|
||||
- [x] **Flake de gate corrigé** — `_is_public_host` attrape `OSError` (le
|
||||
garde SSRF ne lève plus) + fixture `stub_dns` sur `TestOGParser`
|
||||
(le test faisait un vrai `getaddrinfo("example.com")`, échec sous `-n auto`)
|
||||
- [x] **Tests** — `tests/test_v767_reactions_drawer.py` (3), e2e v764 étendu
|
||||
(réactions dans le tiroir + suppression A/B), e2e v762 (nouvelle ligne 4) ;
|
||||
`pytest` **1390 passed / 0 failed**, `ruff` OK ; `VERSION` +
|
||||
`app/main.py` = 7.67.0
|
||||
|
||||
### v7.68.0 — Colonnes rendues, tables IA, copier/couper/coller multi-blocs ✅ (2026-10-08)
|
||||
> **Objectif** : les colonnes (slash + Turn into) marchent, l'IA crée de vrais
|
||||
> tableaux, et une sélection multi-blocs se copie/coupe/colle. **COMPLETED**.
|
||||
|
||||
- [x] **Renderers morts branchés** — `renderBlock()` n'appelait jamais
|
||||
`renderColumnsBlock()` / `renderMathBlock()` / `renderTOC()` → bloc colonnes,
|
||||
équation et TOC rendaient un paragraphe vide (bug rapporté) ; × de
|
||||
suppression de colonne visible au survol (était invisible mais cliquable)
|
||||
- [x] **Tables IA** — `_tblIsData`/`_tblIsSep` acceptent le GFM **sans pipe de
|
||||
tête** (séparateur ≥2 cellules pour ne pas avaler « texte » + « --- ») ;
|
||||
`md2b` et `paste2b` alignés d'office
|
||||
- [x] **Coller** un seul bloc structuré (table/code/titre) = vraie insertion ;
|
||||
« Copy link to block » réparé (`link` → `copy-link`)
|
||||
- [x] **Copier/couper multi-blocs** — `_clipState()`/`_clipMarkdown()`/
|
||||
`clipCopy()`/`clipCut()`, listeners `copy`/`cut` (Ctrl+C/X), groupe
|
||||
**Clipboard** dans le menu du clic droit (sélection figée à l'ouverture),
|
||||
clic droit sur un bloc sélectionné = sélection multi-blocs conservée
|
||||
- [x] **Tests** — `tests/test_v768_columns_clipboard.py` (4), e2e
|
||||
`v768_columns_clipboard.spec.js` (4) ; `pytest` **1394 passed / 0 failed**,
|
||||
`ruff` OK ; `VERSION` + `app/main.py` = 7.68.0
|
||||
|
||||
### v7.69.0 — La sélection multi-blocs fonctionne enfin ✅ (2026-10-08)
|
||||
|
||||
**Contexte** : v7.68.0 livrait la mécanique Clipboard (plage multi-blocs, handlers
|
||||
`copy`/`cut`, groupe Clipboard du menu contextuel) mais elle était **inutilisable en
|
||||
pratique** — trois rapports d'usage : Ctrl+C ne copie rien, le glisser souris ne
|
||||
sélectionne qu'un bloc, le clic droit efface le surlignage.
|
||||
|
||||
**Causes racines trouvées (trace d'événements à l'appui, pas de supposition)** :
|
||||
|
||||
| Symptôme | Cause réelle |
|
||||
|----------|--------------|
|
||||
| Ctrl+C/X muet | le navigateur **n'émet aucun événement `copy`** quand la sélection traverse deux `contenteditable` : `getSelection().toString()` renvoie `""`, donc nos handlers n'étaient jamais atteints |
|
||||
| Glisser = 1 bloc | séquence `mouseup` → `click` → `focusin` → **collapse** : la plage reconstruite mourait dans la foulée |
|
||||
| Clic droit efface | `.bm-search` prenait le focus 10 ms après l'ouverture du menu |
|
||||
|
||||
**Corrections** : interception du raccourci au `keydown` (capture `document`,
|
||||
garde `closest('#_blocksCt')`) ; plage reconstruite mise en attente
|
||||
(`_mdSelRange`) et restaurée au tour suivant, remise à zéro à chaque nouveau
|
||||
geste ; le menu ne vole plus le focus quand un texte est sélectionné ;
|
||||
`preventDefault` du clic droit remonté sur `mousedown` (sur `contextmenu` c'est
|
||||
trop tard).
|
||||
|
||||
**Identité visuelle** : bannière + logo intégrés — WebP 22,5 Ko / 5,3 Ko (les
|
||||
originaux faisaient 1,6 Mo / 1,1 Mo), JPEG de secours, icônes PWA régénérées à
|
||||
partir du vrai logo, `<picture>` sur la landing, `og:image`/`twitter:card`.
|
||||
|
||||
**Vérification** : `tests/test_v769_selection_persistence.py` (19 statiques) +
|
||||
`e2e/v769_selection_persistence.spec.js` (5, **vrais gestes**) ; le spec v768 a
|
||||
été corrigé pour remplacer `execCommand` et les plages fabriquées par de vrais
|
||||
gestes.
|
||||
|
||||
**Piège de test relevé au passage** : les `···` dans les échecs Playwright sont
|
||||
le marqueur de troncature du message d'erreur, **pas** un bug produit — une heure
|
||||
passée à chercher une fuite inexistante. Vérifier `JSON.stringify()` de la valeur
|
||||
réelle avant de croire un affichage tronqué.
|
||||
|
||||
---
|
||||
|
||||
### v7.69.3 — Aide alignée sur Settings ✅ · double-clic close ⏳ ouvert (2026-10-08)
|
||||
|
||||
**Livré** : la section Aide partage maintenant le positionnement exact de la
|
||||
section Settings. `help.html` neutralisait son overlay en style inline
|
||||
(`position:static`, fond transparent, sans blur, sans padding) et forçait un
|
||||
panneau `1050px / 100vh-120px` — les deux pages pourtant identiques au CSS
|
||||
près produisaient deux rendus. Surcharges retirées ; e2e compare les
|
||||
géométries calculées : **identiques des deux côtés** (overlay `fixed` avec
|
||||
fond, panneau 1050×765 centré, close à 13/13 px du coin).
|
||||
|
||||
**Terminé en v7.69.4** — double-clic sur le bouton close de Settings.
|
||||
|
||||
Le diagnostic posé en v7.69.3 était **FAUX** : je pensais qu'Alpine ne liait
|
||||
pas le composant (`_x_dataStack` absent), donc que le handler était inerte.
|
||||
La question à l'utilisateur a tranché : *« après le premier clic la page est
|
||||
réactive »* → Alpine lie bien le composant, le handler s'exécute. Le scénario
|
||||
`target="_blank"` qui m'avait donné `_x_dataStack` absent était un artefact de
|
||||
mon propre banc d'essai, pas le parcours réel. **Ne pas relire ce diagnostic.**
|
||||
|
||||
Cause réelle : `closeSettings()` faisait `history.back()` puis
|
||||
`window.location.reload()` après un délai **fixe de 100 ms**. Entre les deux,
|
||||
le retour est une navigation asynchrone ; quand elle n'est pas terminée en
|
||||
100 ms, le `reload()` retombe sur `/settings` — le panneau « se ferme puis
|
||||
revient ». Depuis `/workspaces`, la profondeur d'historique diffère et le
|
||||
retour arrive à temps : d'où l'absence de symptôme sur ce seul parcours.
|
||||
|
||||
Correctif : `location.replace()` vers la page d'origine. Une seule navigation
|
||||
déterministe, ni `history.back()`, ni `popstate`, ni rechargement différé.
|
||||
Effet secondaire assumé et souhaitable : « Retour » ne rouvre plus Settings.
|
||||
|
||||
**Preuve avant/après (contrôle négatif fait)** : même spec, deux builds.
|
||||
- ancien `closeSettings()` → le test du parcours menu-utilisateur **ÉCHOUE**
|
||||
(`Received: "…/settings"`), celui de `/workspaces` passe ;
|
||||
- correctif → **les deux passent**.
|
||||
|
||||
**Piège relevé** : ma « réfutation » de la thèse de course était fausse. J'avais
|
||||
interposé 400 ms via `page.route()`, qui intercepte les requêtes de sous-ressources
|
||||
— pas la navigation du document lors d'un `history.back()`, servie depuis le
|
||||
bfcache. Le délai n'a donc jamais été appliqué. Un contrôle négatif (rebuild
|
||||
avec l'ancien code) aurait tranché en un tour ; il a fallu plusieurs tours pour
|
||||
le faire.
|
||||
|
||||
|
||||
---
|
||||
|
||||
## ✅ Fonctionnalités livrées hors roadmap (bonus détectés dans le code)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# WORKLOAD — FlowDeck Notion Clone
|
||||
|
||||
> **Début**: 2026-07-08 | **Version**: v7.49.2 (pages de base : titre au-dessus du tableau, tableau calé à gauche au ras du sidebar) | **Statut**: EN COURS 🔄
|
||||
> **Début**: 2026-07-08 | **Version**: v7.69.4 (sélection multi-blocs fonctionnelle ; identité visuelle logo/bannière/favicon ; Aide alignée sur Settings ; close Settings réparé)
|
||||
> **Cible**: parité Notion + intégration forge · **Follow-ups v7.3 livrés**: sidebar teamspaces, notif `page.updated`, charts `number` + dashboards multi-DB, unfurl forge, UI Settings → Audit — voir `ROADMAP.md § v7.3.0`
|
||||
|
||||
## Avancement Global
|
||||
|
||||
@@ -126,6 +126,19 @@ class Settings(BaseSettings):
|
||||
agent_max_tokens_budget: int = 500000
|
||||
agent_run_timeout_seconds: int = 300
|
||||
|
||||
# ── Connecteurs OAuth (v7.56.0) — Google / Microsoft 365 ──
|
||||
# Client OAuth2 à créer dans les consoles : Google Cloud (OAuth client web)
|
||||
# et Entra ID (application web). Le redirect URI est dérivé d'APP_BASE_URL.
|
||||
google_client_id: str = ""
|
||||
google_client_secret: str = ""
|
||||
ms_client_id: str = ""
|
||||
ms_client_secret: str = ""
|
||||
|
||||
# ── Mémoire de l'agent (v7.54.0) ──
|
||||
# État initial du toggle « Mémoire » à la création d'une conversation ;
|
||||
# le basculement se fait ensuite par PATCH /api/agent/conversations/{id}.
|
||||
agent_memory_default: bool = True
|
||||
|
||||
# ── Web tools de l'agent (web_search / fetch_url / search_code) ──
|
||||
# `web_search_provider` : « exa » (recherche sémantique + snippets, clé
|
||||
# requise) ou « duckduckgo » (repli sans compte, parsing HTML — dégradé).
|
||||
|
||||
@@ -5,7 +5,7 @@ import asyncio
|
||||
import logging
|
||||
from contextlib import asynccontextmanager
|
||||
|
||||
from fastapi import FastAPI, Request
|
||||
from fastapi import Depends, FastAPI, Request
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from starlette.exceptions import HTTPException as _StarHTTPException
|
||||
@@ -62,6 +62,7 @@ from app.routers.web_clipper import router as web_clipper_router
|
||||
from app.routers.webauthn import router as webauthn_router
|
||||
from app.routers.wiki import router as wiki_router
|
||||
from app.routers.workers import router as workers_router
|
||||
from app.services import plugins as plugins_service
|
||||
from app.services.webhook_outbound import init_webhook_tables
|
||||
|
||||
logging.basicConfig(
|
||||
@@ -185,7 +186,7 @@ async def lifespan(_app: FastAPI):
|
||||
|
||||
app = FastAPI(
|
||||
title="FlowDeck",
|
||||
version="7.49.2",
|
||||
version="7.69.4",
|
||||
docs_url="/docs",
|
||||
redoc_url="/redoc",
|
||||
lifespan=lifespan,
|
||||
@@ -235,7 +236,9 @@ app.include_router(sharing.router)
|
||||
app.include_router(sidebar_config.router)
|
||||
app.include_router(export.router)
|
||||
app.include_router(notifications_router)
|
||||
app.include_router(automations_router)
|
||||
# Plugin « automations » OFF → chaque route de ce router renvoie 404
|
||||
app.include_router(automations_router,
|
||||
dependencies=[Depends(plugins_service.plugin_required("automations"))])
|
||||
app.include_router(collaboration_router)
|
||||
app.include_router(emoji_router)
|
||||
app.include_router(realtime_router)
|
||||
@@ -247,8 +250,11 @@ app.include_router(sync.router)
|
||||
app.include_router(imports_router)
|
||||
app.include_router(import_page_router)
|
||||
app.include_router(permissions_router)
|
||||
app.include_router(web_clipper_api_router)
|
||||
app.include_router(web_clipper_router)
|
||||
# Plugin « web-clipper » OFF → page /extensions + API clip refusées
|
||||
app.include_router(web_clipper_api_router,
|
||||
dependencies=[Depends(plugins_service.plugin_required("web-clipper"))])
|
||||
app.include_router(web_clipper_router,
|
||||
dependencies=[Depends(plugins_service.plugin_required("web-clipper"))])
|
||||
app.include_router(api_v2_router)
|
||||
app.include_router(api_v2_agent_router)
|
||||
app.include_router(sites_router)
|
||||
|
||||
@@ -1584,3 +1584,144 @@ def _migration_my_tasks_mapping(conn: sqlite3.Connection) -> None:
|
||||
"CREATE INDEX IF NOT EXISTS idx_collections_task "
|
||||
"ON collections(is_task, workspace_id)"
|
||||
)
|
||||
|
||||
|
||||
@register(35, "v7.58.0: registre des plugins (on/off à effet réel)")
|
||||
def _migration_plugins(conn: sqlite3.Connection) -> None:
|
||||
"""Catalogue de l'instance : 3 modules câblés (routes/UI/outils réels)."""
|
||||
conn.execute(
|
||||
"""CREATE TABLE IF NOT EXISTS plugins (
|
||||
slug TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
description TEXT NOT NULL DEFAULT '',
|
||||
enabled INTEGER NOT NULL DEFAULT 1
|
||||
)"""
|
||||
)
|
||||
conn.executemany(
|
||||
"INSERT OR IGNORE INTO plugins (slug, name, description, enabled) VALUES (?,?,?,1)",
|
||||
[
|
||||
("web-tools", "Outils web de l'agent",
|
||||
"Retire web_search et fetch_url du registre d'outils de l'agent"),
|
||||
("web-clipper", "Web Clipper",
|
||||
"Coupe la page /extensions et l'API /api/v2/web-clipper/*"),
|
||||
("automations", "Automations",
|
||||
"Coupe /workspace/automations* et le scheduler en arrière-plan"),
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@register(34, "v7.57.0: connecteurs — kind/auth/tools_json (Discord, Telegram, MCP)")
|
||||
def _migration_connector_kinds(conn: sqlite3.Connection) -> None:
|
||||
"""Discord (auth « Bot »), Telegram (jeton dans l'URL via `{secret}`) et
|
||||
serveurs MCP (kind='mcp', cache d'outils) réutilisent la même table."""
|
||||
cols = columns(conn, "agent_connectors")
|
||||
if "kind" not in cols:
|
||||
conn.execute("ALTER TABLE agent_connectors ADD COLUMN kind TEXT NOT NULL DEFAULT 'custom'")
|
||||
if "auth" not in cols:
|
||||
conn.execute("ALTER TABLE agent_connectors ADD COLUMN auth TEXT NOT NULL DEFAULT 'bearer'")
|
||||
if "tools_json" not in cols:
|
||||
conn.execute("ALTER TABLE agent_connectors ADD COLUMN tools_json TEXT NOT NULL DEFAULT '[]'")
|
||||
|
||||
|
||||
@register(33, "v7.56.0: tokens OAuth des connecteurs (Google / M365)")
|
||||
def _migration_connector_tokens(conn: sqlite3.Connection) -> None:
|
||||
"""Tokens OAuth par (kind, utilisateur), chiffrés Fernet côté service."""
|
||||
conn.execute(
|
||||
"""CREATE TABLE IF NOT EXISTS connector_tokens (
|
||||
kind TEXT NOT NULL,
|
||||
user_id INTEGER NOT NULL,
|
||||
tokens_enc TEXT NOT NULL DEFAULT '',
|
||||
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
PRIMARY KEY (kind, user_id)
|
||||
)"""
|
||||
)
|
||||
|
||||
|
||||
@register(32, "v7.55.0: connecteurs de l'agent (socle)")
|
||||
def _migration_agent_connectors(conn: sqlite3.Connection) -> None:
|
||||
"""Catalogue de connecteurs : 3 natifs servis à la volée + personnels ici.
|
||||
|
||||
Colonne ``url`` plate (pas de ``config_json``) : les scopes/OAuth des
|
||||
phases 6-7 ajouteront leur propre colonne le moment venu.
|
||||
"""
|
||||
conn.execute(
|
||||
"""CREATE TABLE IF NOT EXISTS agent_connectors (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL,
|
||||
url TEXT NOT NULL,
|
||||
secret_encrypted TEXT NOT NULL DEFAULT '',
|
||||
enabled INTEGER NOT NULL DEFAULT 1,
|
||||
status TEXT NOT NULL DEFAULT 'unknown',
|
||||
detail TEXT NOT NULL DEFAULT '',
|
||||
created_by INTEGER
|
||||
)"""
|
||||
)
|
||||
|
||||
|
||||
@register(31, "v7.54.0: agent memory (mémoire de l'agent)")
|
||||
def _migration_agent_memory(conn: sqlite3.Connection) -> None:
|
||||
"""Toggle par conversation + table des résumés mémorisés.
|
||||
|
||||
Une ligne résumé par conversation (upsert) — voir `app/services/agent_memory.py`.
|
||||
"""
|
||||
if "memory_enabled" not in columns(conn, "agent_conversations"):
|
||||
conn.execute(
|
||||
"ALTER TABLE agent_conversations "
|
||||
"ADD COLUMN memory_enabled INTEGER NOT NULL DEFAULT 1"
|
||||
)
|
||||
conn.execute(
|
||||
"""CREATE TABLE IF NOT EXISTS agent_memory (
|
||||
conversation_id INTEGER PRIMARY KEY
|
||||
REFERENCES agent_conversations(id) ON DELETE CASCADE,
|
||||
kind TEXT NOT NULL DEFAULT 'summary',
|
||||
content TEXT NOT NULL DEFAULT '',
|
||||
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
)"""
|
||||
)
|
||||
|
||||
|
||||
@register(37, "v7.64.0: réactions emoji sur un texte sélectionné")
|
||||
def _migration_text_reactions(conn: sqlite3.Connection) -> None:
|
||||
"""Réactions emoji ancrées sur une plage de texte (façon Notion) : miroir des
|
||||
ancres de commentaires (block_id + offsets dans le texte rendu). Une ligne par
|
||||
(plage, emoji, utilisateur) → le POST agit comme un toggle et le GET regroupe
|
||||
par plage pour afficher la pastille d'émojis."""
|
||||
conn.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS text_reactions (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
page_id INTEGER NOT NULL REFERENCES pages(id) ON DELETE CASCADE,
|
||||
block_id TEXT NOT NULL,
|
||||
anchor_start INTEGER NOT NULL,
|
||||
anchor_end INTEGER NOT NULL,
|
||||
emoji TEXT NOT NULL,
|
||||
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
UNIQUE(page_id, block_id, anchor_start, anchor_end, emoji, user_id)
|
||||
)
|
||||
"""
|
||||
)
|
||||
conn.execute(
|
||||
"CREATE INDEX IF NOT EXISTS idx_text_reactions_page ON text_reactions(page_id)"
|
||||
)
|
||||
|
||||
|
||||
@register(36, "v7.59.1: mistral — modèles par défaut hors plan basique")
|
||||
def _migration_mistral_default_model(conn: sqlite3.Connection) -> None:
|
||||
"""mistral-large-latest / pixtral-large-latest renvoient 403
|
||||
« tier_not_allowed » sur les plans d'abonnement basiques : la clé est
|
||||
valide mais le test de connexion et l'agent échouaient. Reset du
|
||||
default_model stocké → vide = nouveau défaut du provider (small-latest,
|
||||
servi par tous les plans).
|
||||
"""
|
||||
blocked = ("mistral-large-latest", "pixtral-large-latest")
|
||||
conn.execute(
|
||||
"UPDATE user_llm_keys SET default_model='' "
|
||||
"WHERE provider='mistral' AND default_model IN (?,?)",
|
||||
blocked,
|
||||
)
|
||||
conn.execute(
|
||||
"UPDATE llm_config SET model='mistral-small-latest' "
|
||||
"WHERE provider='mistral' AND model IN (?,?)",
|
||||
blocked,
|
||||
)
|
||||
|
||||
@@ -7,15 +7,17 @@ from __future__ import annotations
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import secrets
|
||||
from datetime import UTC
|
||||
from urllib.parse import urlparse
|
||||
|
||||
from fastapi import APIRouter, Body, HTTPException, Request
|
||||
from fastapi.responses import StreamingResponse
|
||||
from fastapi.responses import JSONResponse, RedirectResponse, StreamingResponse
|
||||
|
||||
from app.auth.session import get_current_user
|
||||
from app.config import settings
|
||||
from app.db import get_conn
|
||||
from app.services import skill_gallery
|
||||
from app.services import connectors, oauth_connectors, plugins, skill_gallery
|
||||
from app.services.agent_engine import AgentEngine, undo_action
|
||||
from app.services.llm_client import PROVIDER_MODELS, PROVIDERS, LLMClient
|
||||
from app.services.llm_config import (
|
||||
@@ -199,15 +201,17 @@ def create_conversation(request: Request, body: dict = Body(default={})):
|
||||
ws = _workspace_id(request)
|
||||
with get_conn() as conn:
|
||||
agent = _default_agent(conn, user_id)
|
||||
mem_default = 1 if settings.agent_memory_default else 0
|
||||
cur = conn.execute(
|
||||
"""INSERT INTO agent_conversations (agent_id, user_id, title, context_json, provider, model)
|
||||
VALUES (?,?,?,?,?,?)""",
|
||||
"""INSERT INTO agent_conversations (agent_id, user_id, title, context_json, provider, model, memory_enabled)
|
||||
VALUES (?,?,?,?,?,?,?)""",
|
||||
(agent["id"], user_id, body.get("title", "New conversation"),
|
||||
json.dumps({"workspace_id": ws}),
|
||||
body.get("provider", ""), body.get("model", "")),
|
||||
body.get("provider", ""), body.get("model", ""), mem_default),
|
||||
)
|
||||
conn.commit()
|
||||
return {"id": cur.lastrowid, "title": body.get("title", "New conversation"), "status": "created"}
|
||||
return {"id": cur.lastrowid, "title": body.get("title", "New conversation"),
|
||||
"status": "created", "memory_enabled": mem_default}
|
||||
|
||||
|
||||
@router.get("/conversations/{conversation_id}")
|
||||
@@ -249,6 +253,10 @@ def patch_conversation(request: Request, conversation_id: int, body: dict = Body
|
||||
if body.get(col) is not None:
|
||||
sets.append(f"{col}=?")
|
||||
params.append(str(body[col]))
|
||||
# v7.54.0 — toggle « Mémoire » de la conversation (0/1).
|
||||
if body.get("memory_enabled") is not None:
|
||||
sets.append("memory_enabled=?")
|
||||
params.append(1 if body["memory_enabled"] else 0)
|
||||
params.append(conversation_id)
|
||||
conn.execute(f"UPDATE agent_conversations SET {', '.join(sets)} WHERE id=?", params)
|
||||
conn.commit()
|
||||
@@ -498,6 +506,43 @@ def create_skill(request: Request, body: dict = Body(default={})):
|
||||
return {"id": cur.lastrowid, "name": name, "status": "created"}
|
||||
|
||||
|
||||
@router.patch("/skills/{skill_id}")
|
||||
def update_skill(request: Request, skill_id: int, body: dict = Body(default={})):
|
||||
"""Édition d'un skill enregistré (v7.52.0 — « Gérer les compétences »).
|
||||
|
||||
Seuls les champs présents dans ``body`` sont mis à jour ; la liste des
|
||||
colonnes est figée ici (jamais interpolée depuis la requête).
|
||||
"""
|
||||
_current_user_id(request)
|
||||
fields: dict = {}
|
||||
if "name" in body:
|
||||
name = str(body.get("name") or "").strip()
|
||||
if not name:
|
||||
raise HTTPException(status_code=400, detail="name est requis")
|
||||
fields["name"] = name
|
||||
if "description" in body:
|
||||
fields["description"] = str(body.get("description") or "")
|
||||
if "prompt_template" in body:
|
||||
fields["prompt_template"] = str(body.get("prompt_template") or "")
|
||||
if "allowed_tools" in body:
|
||||
fields["allowed_tools_json"] = json.dumps(body.get("allowed_tools") or [])
|
||||
if not fields:
|
||||
raise HTTPException(status_code=400, detail="Aucun champ à mettre à jour")
|
||||
cols = ", ".join(f"{k}=?" for k in fields)
|
||||
with get_conn() as conn:
|
||||
if not conn.execute("SELECT id FROM agent_skills WHERE id=?", (skill_id,)).fetchone():
|
||||
raise HTTPException(status_code=404, detail="Skill introuvable")
|
||||
try:
|
||||
conn.execute(
|
||||
f"UPDATE agent_skills SET {cols} WHERE id=?",
|
||||
(*fields.values(), skill_id),
|
||||
)
|
||||
conn.commit()
|
||||
except Exception as exc: # noqa: BLE001 — contrainte UNIQUE(name)
|
||||
raise HTTPException(status_code=409, detail=f"Skill existe déjà: {exc}") from exc
|
||||
return {"id": skill_id, "status": "updated", "fields": sorted(fields)}
|
||||
|
||||
|
||||
@router.post("/skills/{skill_id}/apply")
|
||||
def apply_skill(request: Request, skill_id: int):
|
||||
"""Create a conversation pre-loaded with a skill, ready to run."""
|
||||
@@ -590,6 +635,192 @@ def delete_skill(request: Request, skill_id: int):
|
||||
return {"id": skill_id, "status": "deleted"}
|
||||
|
||||
|
||||
# ── Connecteurs (v7.55.0) ──
|
||||
# ponytail : catalogue partagé au même titre que les skills (`list_skills`
|
||||
# n'a pas non plus de filtre par créateur) — la clé n'est jamais renvoyée.
|
||||
|
||||
|
||||
@router.get("/connectors")
|
||||
def list_connectors_route(request: Request):
|
||||
"""Catalogue : natifs (statut dérivé de la config) + personnels."""
|
||||
user_id = _current_user_id(request)
|
||||
return {"connectors": connectors.list_connectors(user_id)}
|
||||
|
||||
|
||||
@router.get("/plugins")
|
||||
def list_plugins_route(request: Request):
|
||||
"""Catalogue des plugins de l'instance (menu + → « Add plugins »)."""
|
||||
_current_user_id(request)
|
||||
return {"plugins": plugins.list_plugins()}
|
||||
|
||||
|
||||
@router.patch("/plugins/{slug}")
|
||||
def set_plugin_route(request: Request, slug: str, body: dict = Body(default={})):
|
||||
"""Bascule un plugin : l'effet est réel (routes/UI/outils), pas un drapeau."""
|
||||
_current_user_id(request)
|
||||
try:
|
||||
return plugins.set_enabled(slug, bool(body.get("enabled")))
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
|
||||
|
||||
@router.post("/connectors")
|
||||
def create_connectors_route(request: Request, body: dict = Body(default={})):
|
||||
"""Ajoute un connecteur personnalisé — l'URL est validée (garde SSRF)."""
|
||||
_current_user_id(request)
|
||||
try:
|
||||
return connectors.create_connector(
|
||||
body.get("name") or "", body.get("url") or "", str(body.get("secret") or ""),
|
||||
kind=str(body.get("kind") or "custom"),
|
||||
auth=str(body.get("auth") or "bearer"),
|
||||
)
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||||
|
||||
|
||||
@router.patch("/connectors/{connector_id}")
|
||||
def update_connectors_route(request: Request, connector_id: int, body: dict = Body(default={})):
|
||||
_current_user_id(request)
|
||||
try:
|
||||
row = connectors.update_connector(
|
||||
connector_id,
|
||||
name=body.get("name"),
|
||||
enabled=body.get("enabled"),
|
||||
secret=body.get("secret"),
|
||||
)
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||||
if row is None:
|
||||
raise HTTPException(status_code=404, detail="Connecteur introuvable")
|
||||
return row
|
||||
|
||||
|
||||
@router.delete("/connectors/{connector_id}")
|
||||
def delete_connectors_route(request: Request, connector_id: int):
|
||||
_current_user_id(request)
|
||||
if not connectors.delete_connector(connector_id):
|
||||
raise HTTPException(status_code=404, detail="Connecteur introuvable")
|
||||
return {"id": connector_id, "status": "deleted"}
|
||||
|
||||
|
||||
@router.post("/connectors/probe")
|
||||
async def probe_connectors_route(request: Request, body: dict = Body(default={})):
|
||||
"""Teste un connecteur (id, nom ou kind natif) et persiste le résultat."""
|
||||
target = str(body.get("connector") or "").strip()
|
||||
if not target:
|
||||
raise HTTPException(status_code=400, detail="connector est requis")
|
||||
user_id = _current_user_id(request)
|
||||
try:
|
||||
return await connectors.probe(target, user_id)
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
|
||||
|
||||
# ── Connecteurs OAuth : Google / Microsoft 365 (v7.56.0) ──
|
||||
# Flow : POST authorize (cookies state/verifier/next) → fournisseur →
|
||||
# GET callback (échange du code, tokens chiffrés) → redirection vers la page
|
||||
# d'origine. Le GET est en SAFE_METHODS : pas de CSRF (comme /auth/callback).
|
||||
|
||||
|
||||
def _oauth_kind(kind: str) -> str:
|
||||
if kind not in oauth_connectors.OAUTH_KINDS:
|
||||
raise HTTPException(status_code=404, detail="Connecteur OAuth inconnu")
|
||||
return kind
|
||||
|
||||
|
||||
def _oauth_next(request: Request, kind: str, key: str, default: str = "/") -> str:
|
||||
"""Chemin de retour same-origin (cookie `key` pour le callback)."""
|
||||
raw = request.cookies.get(key, "") or default
|
||||
path = urlparse(raw).path if raw.startswith("http") else raw
|
||||
if not path.startswith("/") or path.startswith("//"):
|
||||
return default
|
||||
return path
|
||||
|
||||
|
||||
@router.get("/connectors/oauth/{kind}/status")
|
||||
def connector_oauth_status(request: Request, kind: str):
|
||||
"""État du connecteur OAuth pour l'utilisateur courant."""
|
||||
_oauth_kind(kind)
|
||||
user_id = _current_user_id(request)
|
||||
try:
|
||||
oauth_connectors._client(kind)
|
||||
configured, detail = True, ""
|
||||
except ValueError as exc:
|
||||
configured, detail = False, str(exc)
|
||||
tok = oauth_connectors.tokens(kind, user_id)
|
||||
return {
|
||||
"kind": kind, "configured": configured, "configured_detail": detail,
|
||||
"connected": bool(tok.get("access_token")), "scope": tok.get("scope", ""),
|
||||
"expires_at": tok.get("expires_at", 0),
|
||||
}
|
||||
|
||||
|
||||
@router.post("/connectors/oauth/{kind}/authorize")
|
||||
def connector_oauth_authorize(request: Request, kind: str):
|
||||
"""URL d'autorisation (PKCE) + cookies d'état éphémères (10 min)."""
|
||||
_oauth_kind(kind)
|
||||
_current_user_id(request)
|
||||
try:
|
||||
flow = oauth_connectors.begin(kind)
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||||
referer = request.headers.get("referer") or ""
|
||||
next_path = urlparse(referer).path if referer else "/"
|
||||
if not next_path.startswith("/") or next_path.startswith("//"):
|
||||
next_path = "/"
|
||||
secure = request.url.scheme == "https"
|
||||
resp = JSONResponse({"url": flow["url"], "kind": kind})
|
||||
for key, value in (
|
||||
(f"fd_oauth_state_{kind}", flow["state"]),
|
||||
(f"fd_oauth_verifier_{kind}", flow["verifier"]),
|
||||
(f"fd_oauth_next_{kind}", next_path),
|
||||
):
|
||||
resp.set_cookie(key, value, max_age=600, httponly=True, samesite="lax", secure=secure)
|
||||
return resp
|
||||
|
||||
|
||||
@router.get("/connectors/oauth/{kind}/callback")
|
||||
async def connector_oauth_callback(
|
||||
request: Request, kind: str, code: str = "", state: str = "", error: str = ""
|
||||
):
|
||||
"""Reçoit le code du fournisseur, échange, stocke, renvoie sur la page."""
|
||||
_oauth_kind(kind)
|
||||
next_path = _oauth_next(request, kind, f"fd_oauth_next_{kind}")
|
||||
expected = request.cookies.get(f"fd_oauth_state_{kind}", "")
|
||||
verifier = request.cookies.get(f"fd_oauth_verifier_{kind}", "")
|
||||
|
||||
def _back(flag: str) -> RedirectResponse:
|
||||
sep = "&" if "?" in next_path else "?"
|
||||
resp = RedirectResponse(f"{next_path}{sep}{flag}", status_code=302)
|
||||
for key in (f"fd_oauth_state_{kind}", f"fd_oauth_verifier_{kind}",
|
||||
f"fd_oauth_next_{kind}"):
|
||||
resp.delete_cookie(key, samesite="lax")
|
||||
return resp
|
||||
|
||||
if error:
|
||||
return _back("oauth_error=" + error[:80])
|
||||
if not code or not expected or not secrets.compare_digest(expected, state):
|
||||
return _back("oauth_error=state")
|
||||
user = get_current_user(request)
|
||||
if not user or not user.get("id"):
|
||||
return _back("oauth_error=session")
|
||||
try:
|
||||
tokens = await oauth_connectors.complete(kind, code, verifier)
|
||||
except ValueError as exc:
|
||||
return _back("oauth_error=" + str(exc)[:80].replace(" ", "+"))
|
||||
oauth_connectors.save(kind, int(user["id"]), tokens)
|
||||
logger.info("Connector OAuth connected: %s (user #%s)", kind, user["id"])
|
||||
return _back("oauth=connected")
|
||||
|
||||
|
||||
@router.post("/connectors/oauth/{kind}/disconnect")
|
||||
def connector_oauth_disconnect(request: Request, kind: str):
|
||||
_oauth_kind(kind)
|
||||
user_id = _current_user_id(request)
|
||||
removed = oauth_connectors.clear(kind, user_id)
|
||||
return {"kind": kind, "status": "disconnected" if removed else "not-connected"}
|
||||
|
||||
|
||||
# ── Mentions (commande @ / +) & feedback (boutons 👍 / 👎) ──
|
||||
|
||||
|
||||
|
||||
@@ -226,4 +226,38 @@ def use_page_template(request: Request, template_id: int, body: dict = Body(defa
|
||||
return {"status": "ok", "id": page_id, "title": title or name}
|
||||
|
||||
|
||||
@router.get("/api/page-templates/{template_id}/blocks")
|
||||
def page_template_blocks(request: Request, template_id: int, key: str = ""):
|
||||
"""v7.53.0 : blocs d'un canevas, pour l'insérer dans le document ouvert.
|
||||
|
||||
Builtin : ``template_id=0`` + ``?key=`` (même convention que ``/use``).
|
||||
Canevas personnel : son ``id``. Les blocs builtin sont sans ``id`` — le
|
||||
front appelle ``ensureBlockIds()`` (déjà global côté éditeur).
|
||||
"""
|
||||
user = SessionManager.decode_session(request.cookies.get("flowdeck_session", ""))
|
||||
if template_id == 0:
|
||||
from app.services.block_templates import blocks_json_for
|
||||
raw = blocks_json_for(key or "empty")
|
||||
if raw is None:
|
||||
raise HTTPException(404, "Unknown built-in template")
|
||||
else:
|
||||
uid = (user or {}).get("id")
|
||||
with get_conn() as conn:
|
||||
row = conn.execute(
|
||||
"SELECT blocks_json FROM page_global_templates "
|
||||
"WHERE id=? AND (created_by IS NULL OR created_by=?)",
|
||||
(template_id, uid),
|
||||
).fetchone()
|
||||
if not row:
|
||||
raise HTTPException(404, "Template not found")
|
||||
raw = row["blocks_json"]
|
||||
try:
|
||||
blocks = json.loads(raw)
|
||||
except (json.JSONDecodeError, TypeError) as exc:
|
||||
raise HTTPException(500, "Template content corrupted") from exc
|
||||
if not isinstance(blocks, list):
|
||||
raise HTTPException(500, "Template content corrupted")
|
||||
return {"blocks": blocks}
|
||||
|
||||
|
||||
# ── Core helpers ──
|
||||
|
||||
@@ -206,3 +206,67 @@ def delete_comment(request: Request, comment_id: int):
|
||||
conn.execute("DELETE FROM comments WHERE id=? OR parent_id=?", (comment_id, comment_id))
|
||||
conn.commit()
|
||||
return {"id": comment_id, "status": "deleted"}
|
||||
|
||||
|
||||
# ── v7.64.0 : réactions emoji sur un texte sélectionné ──────────────────────
|
||||
|
||||
@router.get("/pages/{page_id}/reactions")
|
||||
def list_reactions(request: Request, page_id: int):
|
||||
"""Réactions regroupées par plage de texte : {block_id, start, end, emoji, count, mine}."""
|
||||
user = _current_user(request)
|
||||
with get_conn() as conn:
|
||||
if not conn.execute("SELECT id FROM pages WHERE id=?", (page_id,)).fetchone():
|
||||
raise HTTPException(404, "Page not found")
|
||||
rows = conn.execute(
|
||||
"""SELECT block_id, anchor_start, anchor_end, emoji,
|
||||
COUNT(*) AS count,
|
||||
MAX(CASE WHEN user_id=? THEN 1 ELSE 0 END) AS mine
|
||||
FROM text_reactions
|
||||
WHERE page_id=?
|
||||
GROUP BY block_id, anchor_start, anchor_end, emoji
|
||||
ORDER BY MIN(id)""",
|
||||
(user["id"], page_id),
|
||||
).fetchall()
|
||||
return {"page_id": page_id, "reactions": [dict(r) for r in rows]}
|
||||
|
||||
|
||||
@router.post("/pages/{page_id}/reactions")
|
||||
def toggle_reaction(request: Request, page_id: int, body: dict = Body(default={})):
|
||||
"""Ajoute ou retire la réaction de l'utilisateur sur une plage de texte (toggle)."""
|
||||
user = _current_user(request)
|
||||
block = (body.get("block_id") or "").strip()
|
||||
emoji = (body.get("emoji") or "").strip()
|
||||
try:
|
||||
start = int(body.get("anchor_start"))
|
||||
end = int(body.get("anchor_end"))
|
||||
except (TypeError, ValueError):
|
||||
raise HTTPException(400, "anchor offsets required") from None
|
||||
if not block or not emoji or start < 0 or end <= start:
|
||||
raise HTTPException(400, "block_id, emoji and a non-empty range are required")
|
||||
uid = user["id"]
|
||||
with get_conn() as conn:
|
||||
if not conn.execute("SELECT id FROM pages WHERE id=?", (page_id,)).fetchone():
|
||||
raise HTTPException(404, "Page not found")
|
||||
conn.execute(
|
||||
"INSERT OR IGNORE INTO users (id, login, full_name, is_admin) VALUES (?,?,?,1)",
|
||||
(uid, user.get("login", "admin"), user.get("full_name", "Admin")),
|
||||
)
|
||||
existing = conn.execute(
|
||||
"""SELECT id FROM text_reactions
|
||||
WHERE page_id=? AND block_id=? AND anchor_start=? AND anchor_end=?
|
||||
AND emoji=? AND user_id=?""",
|
||||
(page_id, block, start, end, emoji, uid),
|
||||
).fetchone()
|
||||
if existing:
|
||||
conn.execute("DELETE FROM text_reactions WHERE id=?", (existing["id"],))
|
||||
status = "removed"
|
||||
else:
|
||||
conn.execute(
|
||||
"""INSERT INTO text_reactions
|
||||
(page_id, block_id, anchor_start, anchor_end, emoji, user_id)
|
||||
VALUES (?,?,?,?,?,?)""",
|
||||
(page_id, block, start, end, emoji, uid),
|
||||
)
|
||||
status = "added"
|
||||
conn.commit()
|
||||
return {"status": status, "emoji": emoji}
|
||||
|
||||
@@ -217,8 +217,10 @@ def view_page_root(request: Request, page_id: int):
|
||||
"{% from '_icons.html' import fd_icon %}{{ fd_icon('paperclip', 14) }}"
|
||||
).render(),
|
||||
)
|
||||
# Select template: collection pages use database table view
|
||||
if page.get("content_format") == "collection" and not embed:
|
||||
# Select template: collection pages use database table view (aussi en
|
||||
# mode embed : `page_editor_collection.html` + body.embed-mode = le
|
||||
# tableau SANS sidebar ni barre — le peek d'une base reste le tableau).
|
||||
if page.get("content_format") == "collection":
|
||||
template = env.get_template("page_editor_collection.html")
|
||||
else:
|
||||
template = env.get_template("page_editor_embed.html" if embed else "page_editor.html")
|
||||
@@ -249,209 +251,10 @@ def accounts_page(request: Request):
|
||||
|
||||
@router.get("/help", response_class=HTMLResponse)
|
||||
def help_page(request: Request):
|
||||
"""Comprehensive help & documentation page."""
|
||||
"""Help & documentation page — settings-style panel with side navigation."""
|
||||
from app.templating import ENV
|
||||
env = ENV
|
||||
sidebar = _sidebar_data(request, [])
|
||||
# Render via a block-based template so content_html lands in {% block content %}
|
||||
block_tpl = env.from_string(
|
||||
'{% extends "base.html" %}{% block content %}{{ content_html|safe }}{% endblock %}'
|
||||
)
|
||||
return HTMLResponse(block_tpl.render(
|
||||
**sidebar,
|
||||
request=request,
|
||||
page_title="Help",
|
||||
title_prefix="Help",
|
||||
page_icon="❓",
|
||||
content_html="""<style>
|
||||
.help-page{max-width:900px;margin:0 auto;padding:40px 24px 80px;}
|
||||
.help-hero{text-align:center;margin-bottom:48px;}
|
||||
.help-hero h1{font-size:32px;font-weight:800;margin:0 0 8px;}
|
||||
.help-hero p{font-size:16px;color:var(--text-dim);max-width:500px;margin:0 auto;}
|
||||
.help-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(280px,1fr));gap:16px;margin-bottom:48px;}
|
||||
.help-card{background:var(--bg-card);border:1px solid var(--border);border-radius:12px;padding:24px;transition:border-color .15s;}
|
||||
.help-card:hover{border-color:rgba(255,255,255,.12);}
|
||||
.help-card h3{font-size:15px;font-weight:600;margin:0 0 4px;display:flex;align-items:center;gap:8px;}
|
||||
.help-card .icon{font-size:20px;}
|
||||
.help-card p{font-size:13px;color:var(--text-dim);line-height:1.5;margin:8px 0 0;}
|
||||
.help-card ul{list-style:none;padding:0;margin:12px 0 0;}
|
||||
.help-card li{font-size:13px;padding:3px 0;color:var(--text-dim);}
|
||||
.help-card li::before{content:'• ';color:var(--accent);}
|
||||
.help-section{margin-bottom:48px;}
|
||||
.help-section h2{font-size:20px;font-weight:700;margin:0 0 16px;padding-bottom:8px;border-bottom:1px solid var(--border);}
|
||||
.help-kbd{display:inline-block;padding:2px 8px;background:var(--bg-tertiary);border:1px solid var(--border);border-radius:4px;font-family:monospace;font-size:12px;color:var(--text);min-width:16px;text-align:center;}
|
||||
.help-shortcut-row{display:flex;align-items:center;gap:12px;padding:8px 12px;border-radius:6px;margin-bottom:2px;}
|
||||
.help-shortcut-row:hover{background:var(--bg-hover);}
|
||||
.help-shortcut-row .keys{display:flex;gap:4px;min-width:140px;}
|
||||
.help-shortcut-row .desc{font-size:13px;color:var(--text-dim);}
|
||||
.help-badge{display:inline-block;padding:2px 10px;border-radius:20px;font-size:11px;font-weight:600;}
|
||||
.help-badge.local{background:rgba(35,131,226,.15);color:#2C8CEB;}
|
||||
.help-badge.gitea{background:rgba(0,200,100,.15);color:#00CC66;}
|
||||
.help-badge.github{background:rgba(130,80,220,.15);color:#A060F0;}
|
||||
.help-badge.sso{background:rgba(217,115,13,.18);color:#E0952B;}
|
||||
</style>
|
||||
<div class="help-page">
|
||||
<div class="help-hero">
|
||||
<h1>❓ FlowDeck Help</h1>
|
||||
<p>Everything you need to know about your Notion-style workspace with Gitea & GitHub integration.</p>
|
||||
</div>
|
||||
|
||||
<div class="help-grid">
|
||||
<div class="help-card">
|
||||
<h3><span class="icon">🚀</span>Getting Started</h3>
|
||||
<p>FlowDeck is your private, self-hosted workspace. Create pages, organize projects, and integrate with your Git forge.</p>
|
||||
<ul>
|
||||
<li>Create a workspace from the <b>Workspaces</b> page</li>
|
||||
<li>Click <b>📄 New Page</b> in the sidebar to start writing</li>
|
||||
<li>Use <span class="help-kbd">Ctrl+N</span> anywhere to create a page</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-card">
|
||||
<h3><span class="icon">📝</span>Pages & Editor</h3>
|
||||
<p>Notion-style block editor with slash commands, markdown shortcuts, and rich formatting.</p>
|
||||
<ul>
|
||||
<li>Type <span class="help-kbd">/</span> for the slash command menu</li>
|
||||
<li>Drag & drop pages in the sidebar to reorganize</li>
|
||||
<li>Right-click for context menu (duplicate, rename, delete)</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-card">
|
||||
<h3><span class="icon">{{ fd_icon("folder",16) }}</span>Workspaces</h3>
|
||||
<p>Organize your work into separate workspaces. Each has its own pages and files.</p>
|
||||
<ul>
|
||||
<li><span class="help-badge local">Local</span> Files stored on your server</li>
|
||||
<li><span class="help-badge gitea">Gitea</span> Connect to browse & edit repos</li>
|
||||
<li><span class="help-badge github">GitHub</span> Connect via Settings → Integrations</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-card">
|
||||
<h3><span class="icon">🦎</span>Gitea Integration</h3>
|
||||
<p>Connect your Gitea account to access repositories directly from FlowDeck.</p>
|
||||
<ul>
|
||||
<li>Go to <b>Settings → Integrations</b> to connect</li>
|
||||
<li>Browse repo file trees in the sidebar</li>
|
||||
<li>Create & edit files with commit messages</li>
|
||||
<li>Sync labels as tags</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-card">
|
||||
<h3><span class="icon">🌐</span>Sharing & Publishing</h3>
|
||||
<p>Share pages with collaborators or publish them to the web.</p>
|
||||
<ul>
|
||||
<li>Click <b>Share</b> in the page editor top-right</li>
|
||||
<li>Share with specific users or get a public link</li>
|
||||
<li>Publish to make a page visible at <code>/p/your-slug</code></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-card">
|
||||
<h3><span class="icon">📚</span>Library, Trash & Tasks</h3>
|
||||
<p>Find all your content in one place with powerful filtering.</p>
|
||||
<ul>
|
||||
<li><b>Library</b> — Tabs for Recents, Favorites, Shared, Published</li>
|
||||
<li><b>Trash</b> — Soft-deleted pages (30-day retention)</li>
|
||||
<li><b>My Tasks</b> — Aggregated tasks from all collections</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-card">
|
||||
<h3><span class="icon">📶</span>Offline & PWA</h3>
|
||||
<p>Install FlowDeck as an app and keep working without a connection.</p>
|
||||
<ul>
|
||||
<li><b>Install</b> — browser menu → <i>Install app</i> / <i>Add to Home Screen</i></li>
|
||||
<li>Edits made offline are queued locally and synced automatically</li>
|
||||
<li>A <b>⟳</b> marker shows pages with pending changes</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="help-section">
|
||||
<h2>⌨️ Keyboard Shortcuts</h2>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Ctrl</span>+<span class="help-kbd">N</span></div><div class="desc">Create new page</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Ctrl</span>+<span class="help-kbd">K</span></div><div class="desc">Quick find / command palette</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Ctrl</span>+<span class="help-kbd">S</span></div><div class="desc">Save current page</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">F2</span></div><div class="desc">Rename selected item</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Delete</span></div><div class="desc">Move selected item to trash</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Escape</span></div><div class="desc">Close modal / cancel editing</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Enter</span></div><div class="desc">Open selected page</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Ctrl</span>+<span class="help-kbd">O</span></div><div class="desc">New AI chat (in footer)</div></div>
|
||||
</div>
|
||||
|
||||
<div class="help-section">
|
||||
<h2>🔐 Authentication</h2>
|
||||
<p style="color:var(--text-dim);font-size:14px;line-height:1.6;">
|
||||
FlowDeck supports three authentication methods:<br>
|
||||
<span class="help-badge local">Local</span> Email + password — create an account on the login page.<br>
|
||||
<span class="help-badge gitea">Gitea OAuth</span> Login with your Gitea account. Your repos appear as workspaces.<br>
|
||||
<span class="help-badge github">GitHub OAuth</span> Login or link your GitHub account in Settings → Integrations.<br><br>
|
||||
<b>Tip:</b> You can connect Gitea/GitHub to an existing local account — your identity stays as your local user.
|
||||
</p>
|
||||
<p style="color:var(--text-dim);font-size:14px;line-height:1.6;">
|
||||
<span class="help-badge sso">SSO</span> <b>Enterprise SSO</b> (v6.7.0) — sign in with your organization account.<br>
|
||||
<i>For administrators:</i> open <b>Settings → Admin → SSO / Enterprise</b> and pick a provider:<br>
|
||||
• <b>SAML 2.0</b> — paste the IdP <i>Entity ID</i>, <i>SSO URL</i> and signing certificate, then give the IdP this
|
||||
<code>/auth/saml/metadata</code> link (it contains the SP Entity ID, ACS URL and certificate).<br>
|
||||
• <b>OpenID Connect</b> — paste the <i>Issuer URL</i>, <i>Client ID</i> and <i>Client Secret</i> (PKCE is used, scopes default to <code>openid profile email</code>).<br>
|
||||
• <b>Provisioning</b> — accounts are created automatically on first login, groups from the IdP map to workspace roles,
|
||||
and <i>SSO only</i> disables local login (admins keep their local door). Every attempt is audited in
|
||||
<b>Settings → Admin → SSO / Enterprise</b> (login history).
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="help-section">
|
||||
<h2>📶 Offline mode (PWA)</h2>
|
||||
<p style="color:var(--text-dim);font-size:14px;line-height:1.6;">
|
||||
FlowDeck is a Progressive Web App: pages you visited stay available offline and your
|
||||
edits are saved locally, then synchronised when the connection returns.<br><br>
|
||||
<b>Install:</b> open your browser menu and choose <i>Install app</i> (Chrome/Edge) or
|
||||
<i>Add to Home Screen</i> (Safari/iOS). FlowDeck then opens in its own window.<br>
|
||||
<b>Offline editing:</b> while offline, the editor stores changes in the browser
|
||||
(IndexedDB) and shows an offline banner with the number of pending changes. A
|
||||
<b>⟳</b> icon appears next to pages that have unsynced edits.<br>
|
||||
<b>Reconnection:</b> the queue is replayed automatically (and via Background Sync).
|
||||
A spinner badge appears while syncing, followed by a confirmation toast.<br>
|
||||
<b>Conflicts:</b> if a page changed on the server, the latest edit wins and a notice is
|
||||
shown. If a page was deleted server-side, your offline copy is recreated as an orphan
|
||||
page. If a page with the same title already exists, the offline copy is renamed
|
||||
<i>“Title (copie offline)”</i>.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="help-section">
|
||||
<h2>🔌 API publique v2</h2>
|
||||
<p style="color:var(--text-dim);font-size:14px;line-height:1.6;">
|
||||
FlowDeck exposes a full REST API under <b>/api/v2</b> for third-party integrations.<br>
|
||||
<b>Auth:</b> create a token in Settings → API tokens, then send it as
|
||||
<code>Authorization: Bearer <token></code>. Tokens carry scopes
|
||||
<code>read</code>, <code>write</code> or <code>admin</code> (a higher scope implies the lower ones).<br>
|
||||
<b>Features:</b> CRUD on collections, pages, properties, views, comments, notifications,
|
||||
favorites, tags, sharing, sprints and templates; pagination (<code>?limit=&offset=</code> +
|
||||
<code>X-Total-Count</code>), filters (<code>filter[prop]=value</code>), sorting, full-text search
|
||||
(<code>/api/v2/search</code>), idempotency (<code>Idempotency-Key</code>) and RFC 7807 error bodies.<br>
|
||||
<b>Reference:</b> interactive OpenAPI docs at <a href="/docs" target="_blank" rel="noopener">/docs</a>
|
||||
(also <code>/redoc</code>, <code>docs/openapi-v2.json</code>).
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="help-section">
|
||||
<h2>💡 Tips</h2>
|
||||
<p style="color:var(--text-dim);font-size:14px;line-height:1.6;">
|
||||
• Toggle the sidebar with the <b>«</b> button in the top-left corner.<br>
|
||||
• Switch between workspaces using the dropdown menu in the sidebar header.<br>
|
||||
• The <b>Private</b> section appears when a remote workspace is active — files here stay local.<br>
|
||||
• Hover over any sidebar item to see action buttons (favorite, share, delete).<br>
|
||||
• Use <b>Ctrl+Click</b> or <b>Shift+Click</b> to multi-select items in the sidebar.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>"""
|
||||
))
|
||||
|
||||
|
||||
return ENV.get_template("help.html").render(**sidebar, request=request)
|
||||
|
||||
|
||||
@router.get("/accounts/settings", response_class=HTMLResponse)
|
||||
|
||||
@@ -18,6 +18,7 @@ import re
|
||||
|
||||
from app.config import settings
|
||||
from app.db import get_conn
|
||||
from app.services import agent_memory
|
||||
from app.services.agent_policies import check_tool, get_policy
|
||||
from app.services.context_builder import ContextBuilder
|
||||
from app.services.llm_client import LLMClient
|
||||
@@ -156,6 +157,11 @@ class AgentEngine:
|
||||
skills = [s for s in (self._load_skill(i, scope) for i in ids) if s]
|
||||
system = self._build_system_prompt(agent, skills)
|
||||
context = self.ctx.build(mentions=mentions, files=files)
|
||||
# v7.54.0 — mémoire de la conversation (toggle) : le moteur n'envoie
|
||||
# jamais l'historique, sans elle chaque run repart de zéro.
|
||||
memory = agent_memory.context_for(conversation_id)
|
||||
if memory:
|
||||
context = (context + "\n\n" + memory) if context else memory
|
||||
if extra_context and extra_context.strip():
|
||||
context += "\n\n## Document / contexte fourni par l'utilisateur\n" + extra_context.strip()
|
||||
|
||||
@@ -304,6 +310,8 @@ class AgentEngine:
|
||||
self._persist_message(conversation_id, "assistant", final_text,
|
||||
model=used_model, tokens=self._tokens)
|
||||
await self._autotitle(conversation_id, objective, final_text)
|
||||
# v7.54.0 — memorise l'echange (no-op si le toggle memoire est OFF).
|
||||
agent_memory.remember(conversation_id, objective, final_text)
|
||||
# v6.4.0: emit agent.run.finished (outbound webhooks only).
|
||||
await _fire_agent_webhook("agent.run.finished", {
|
||||
"conversation_id": conversation_id,
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
"""Mémoire de l'agent (v7.54.0).
|
||||
|
||||
Une ligne résumé **par conversation**, mise à jour à chaque run et ré-injectée
|
||||
au contexte du run suivant — le moteur n'envoie jamais l'historique des messages
|
||||
(`AgentEngine.run()` ne construit que system + objectif courant), donc sans
|
||||
mémoire chaque run repart de zéro.
|
||||
|
||||
Toggle : colonne `agent_conversations.memory_enabled` — OFF = aucune lecture ni
|
||||
écriture (contexte strict du run courant).
|
||||
|
||||
ponytail : mémoire par conversation seulement. Si besoin de notes partagées
|
||||
entre conversations, ajouter des lignes avec ``conversation_id NULL`` +
|
||||
``workspace_id`` et élargir la lecture dans ``context_for()``.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import sqlite3
|
||||
|
||||
from app.db import get_conn
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
INJECT_BUDGET = 4000 # caractères de mémoire max injectés dans un prompt
|
||||
NOTE_LINES = 20 # échanges max conservés
|
||||
NOTE_OBJECTIVE = 180 # troncature de l'objectif
|
||||
NOTE_ANSWER = 700 # troncature de la réponse
|
||||
|
||||
|
||||
def _enabled(conn: sqlite3.Connection, conversation_id: int) -> bool:
|
||||
row = conn.execute(
|
||||
"SELECT memory_enabled FROM agent_conversations WHERE id=?",
|
||||
(conversation_id,),
|
||||
).fetchone()
|
||||
if row is None:
|
||||
return False
|
||||
return bool(row["memory_enabled"])
|
||||
|
||||
|
||||
def _one_line(text: str, limit: int) -> str:
|
||||
return " ".join((text or "").split())[:limit]
|
||||
|
||||
|
||||
def context_for(conversation_id: int) -> str:
|
||||
"""Bloc « mémoire » à préfixer au contexte, ou ``''`` (toggle OFF / vide)."""
|
||||
with get_conn() as conn:
|
||||
if not _enabled(conn, conversation_id):
|
||||
return ""
|
||||
row = conn.execute(
|
||||
"SELECT content FROM agent_memory WHERE conversation_id=?",
|
||||
(conversation_id,),
|
||||
).fetchone()
|
||||
content = ((row["content"] if row else "") or "").strip()
|
||||
if not content:
|
||||
return ""
|
||||
if len(content) > INJECT_BUDGET:
|
||||
content = "…(début de mémoire tronqué)\n" + content[-INJECT_BUDGET:]
|
||||
return "## Mémoire de la conversation (échanges précédents)\n" + content
|
||||
|
||||
|
||||
def remember(conversation_id: int, objective: str, final_text: str) -> None:
|
||||
"""Ajoute un échange à la mémoire — no-op si le toggle est OFF.
|
||||
|
||||
Ne doit **jamais** faire échouer un run : toute erreur est journalisée.
|
||||
"""
|
||||
note = f"- **{_one_line(objective, NOTE_OBJECTIVE)}** → {_one_line(final_text, NOTE_ANSWER)}"
|
||||
try:
|
||||
with get_conn() as conn:
|
||||
if not _enabled(conn, conversation_id):
|
||||
return
|
||||
row = conn.execute(
|
||||
"SELECT content FROM agent_memory WHERE conversation_id=?",
|
||||
(conversation_id,),
|
||||
).fetchone()
|
||||
lines = [ln for ln in ((row["content"] if row else "") or "").split("\n") if ln.strip()]
|
||||
lines.append(note)
|
||||
if len(lines) > NOTE_LINES:
|
||||
lines = lines[-NOTE_LINES:]
|
||||
conn.execute(
|
||||
"INSERT INTO agent_memory (conversation_id, content, updated_at) "
|
||||
"VALUES (?, ?, CURRENT_TIMESTAMP) "
|
||||
"ON CONFLICT(conversation_id) DO UPDATE SET "
|
||||
"content=excluded.content, updated_at=CURRENT_TIMESTAMP",
|
||||
(conversation_id, "\n".join(lines)),
|
||||
)
|
||||
conn.commit()
|
||||
except Exception: # noqa: BLE001 — la mémoire ne casse jamais un run
|
||||
logger.exception("Agent memory save failed for conversation #%s", conversation_id)
|
||||
@@ -27,7 +27,7 @@ import time
|
||||
from datetime import UTC, datetime, timedelta
|
||||
|
||||
from app.db import get_conn
|
||||
from app.services import notifications
|
||||
from app.services import notifications, plugins
|
||||
from app.services.http_client import shared_client
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -479,6 +479,9 @@ async def automation_scheduler():
|
||||
"""Background loop: fire due cron automations (checked every 60s)."""
|
||||
while True:
|
||||
try:
|
||||
if not plugins.is_enabled("automations"): # plugin OFF = rien de planifié
|
||||
await asyncio.sleep(60)
|
||||
continue
|
||||
with get_conn() as conn:
|
||||
rows = conn.execute(
|
||||
"SELECT * FROM automations WHERE trigger_type='cron' AND enabled=1"
|
||||
|
||||
@@ -86,6 +86,34 @@ BUILTIN_TEMPLATES: dict[str, dict] = {
|
||||
_b("bulleted_list"),
|
||||
],
|
||||
},
|
||||
"design_system": {
|
||||
"name": "Design System",
|
||||
"icon": "🎨",
|
||||
"description": "Tokens, composants et grille — canevas de référence UI.",
|
||||
"blocks": [
|
||||
_b("heading_1", "Design System"),
|
||||
_b("callout",
|
||||
"Tokens : couleur, espacement, typographie, rayon, ombres "
|
||||
"(static/css/design-tokens.css).",
|
||||
icon="🎨"),
|
||||
_b("table_of_contents"),
|
||||
_b("heading_2", "Composants"),
|
||||
_b("toggle", "Boutons & actions", expanded=False,
|
||||
children=[_b("paragraph", "Primaire · secondaire · danger — états idle, hover, focus, disabled.")]),
|
||||
_b("toggle", "Cartes & panneaux", expanded=False,
|
||||
children=[_b("paragraph", "Élévation, rayon, bordure, padding, zones de clic.")]),
|
||||
_b("toggle", "Formulaires", expanded=False,
|
||||
children=[_b("paragraph", "Champs, labels, hints, erreurs, focus visible.")]),
|
||||
_b("heading_2", "Grille & espacement"),
|
||||
_b("bulleted_list", "Base 4 px — pas d'espacement hors échelle."),
|
||||
_b("bulleted_list", "Colonnes : 12 / 8 / 4 selon le point de rupture."),
|
||||
_b("heading_2", "Revue UI"),
|
||||
_b("to_do", "Contraste AA vérifié", checked=False),
|
||||
_b("to_do", "États hover / focus / disabled", checked=False),
|
||||
_b("to_do", "Responsive mobile", checked=False),
|
||||
_b("quote", "Une décision de design vaut mieux qu'une justification après coup."),
|
||||
],
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,336 @@
|
||||
"""Connecteurs de l'agent (v7.55.0) — socle : catalogue, statut, fetch gardé SSRF.
|
||||
|
||||
5 connecteurs **natifs** (gitea, github, web, google, ms365) servis à la volée,
|
||||
plus des connecteurs **personnels** persistés (URL + clé) en base avec un
|
||||
``kind`` : ``custom`` | ``discord`` (auth « Bot ») | ``telegram`` (jeton dans
|
||||
l'URL via ``{secret}``) | ``mcp`` (serveur Model Context Protocol, cache
|
||||
d'outils dans ``tools_json``).
|
||||
|
||||
ponytail : un seul fichier (pas de package ``connectors/`` ni de classe par
|
||||
provider) — 3 probes dans un dict + 1 fetch. Les adapters lourds des phases 6-7
|
||||
(Google, M365, Discord/Telegram, MCP) arriveront avec leur propre module.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
|
||||
from app.config import settings
|
||||
from app.db import get_conn
|
||||
from app.services import oauth_connectors
|
||||
from app.services.sso_provisioning import decrypt_secret, encrypt_secret
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
NATIVE_KINDS = ("gitea", "github", "web", "google", "ms365")
|
||||
CUSTOM_KINDS = ("custom", "discord", "telegram", "mcp")
|
||||
AUTH_SCHEMES = ("bearer", "bot", "none")
|
||||
# Presets proposés par le formulaire du menu + (le jeton reste toujours saisi
|
||||
# par l'utilisateur — jamais codé en dur ici).
|
||||
PRESETS = {
|
||||
"discord": {"url": "https://discord.com/api/v10", "auth": "bot",
|
||||
"hint": "Bot Discord Developers → Token"},
|
||||
"telegram": {"url": "https://api.telegram.org/bot{secret}", "auth": "none",
|
||||
"hint": "BotFather → Bot Token (jeton dans l'URL)"},
|
||||
"mcp": {"url": "https://", "auth": "bearer",
|
||||
"hint": "URL du endpoint MCP (streamable HTTP)"},
|
||||
}
|
||||
OAUTH_KINDS = oauth_connectors.OAUTH_KINDS
|
||||
FETCH_LIMIT = 20000 # caractères max renvoyés au LLM (ponytail : borne fixe)
|
||||
|
||||
|
||||
# ── Natifs (config, sans réseau) ─────────────────────────────────────────────
|
||||
|
||||
def native_state(kind: str, user_id: int | None = None) -> tuple[str, str]:
|
||||
"""(status, detail) d'un connecteur natif — dérivé de la config, sans réseau."""
|
||||
if kind in OAUTH_KINDS:
|
||||
try:
|
||||
oauth_connectors._client(kind) # lève si client_id/secret absents
|
||||
except ValueError as exc:
|
||||
return ("missing", str(exc))
|
||||
tok = oauth_connectors.tokens(kind, user_id)
|
||||
if tok.get("access_token"):
|
||||
scope = (tok.get("scope") or "").split()
|
||||
return ("ok", f"connecté · {len(scope)} scope(s)")
|
||||
return ("missing", "non connecté — lancer la connexion OAuth")
|
||||
if kind == "gitea":
|
||||
ok = bool(settings.gitea_url) and settings.gitea_token not in ("", "change-me")
|
||||
return ("ok", settings.gitea_url if ok else "GITEA_TOKEN non configuré")
|
||||
if kind == "github":
|
||||
if settings.github_token:
|
||||
return ("ok", "PAT configuré (30 req/min)")
|
||||
return ("missing", "aucun GITHUB_TOKEN (10 req/min anonyme)")
|
||||
return ("ok", f"recherche web via {settings.web_search_provider or 'duckduckgo'}")
|
||||
|
||||
|
||||
def _row(r) -> dict:
|
||||
"""Ligne `agent_connectors` → dict API (le jeton n'y figure jamais)."""
|
||||
try:
|
||||
tools = json.loads(r["tools_json"] or "[]") if "tools_json" in r.keys() else []
|
||||
except (ValueError, TypeError):
|
||||
tools = []
|
||||
return {
|
||||
"id": r["id"], "builtin": False, "kind": r["kind"], "name": r["name"],
|
||||
"url": r["url"], "auth": r["auth"], "enabled": bool(r["enabled"]),
|
||||
"status": r["status"], "detail": r["detail"] or "",
|
||||
"has_secret": bool(r["secret_encrypted"]), "oauth": False,
|
||||
"tools_count": len(tools),
|
||||
}
|
||||
|
||||
|
||||
def list_connectors(user_id: int | None = None) -> list[dict]:
|
||||
"""Catalogue : natifs (toujours présents) + connecteurs personnels."""
|
||||
out: list[dict] = []
|
||||
for kind in NATIVE_KINDS:
|
||||
status, detail = native_state(kind, user_id)
|
||||
out.append({
|
||||
"id": None, "builtin": True, "kind": kind,
|
||||
"name": (oauth_connectors.PROVIDERS[kind]["name"] if kind in OAUTH_KINDS
|
||||
else kind.capitalize()),
|
||||
"url": "", "enabled": True, "status": status, "detail": detail,
|
||||
"has_secret": False, "oauth": kind in OAUTH_KINDS,
|
||||
})
|
||||
with get_conn() as conn:
|
||||
rows = conn.execute(
|
||||
"SELECT id, name, url, secret_encrypted, enabled, status, detail, "
|
||||
"kind, auth, tools_json FROM agent_connectors ORDER BY id"
|
||||
).fetchall()
|
||||
return out + [_row(r) for r in rows]
|
||||
|
||||
|
||||
def get(connector_id: int) -> dict | None:
|
||||
with get_conn() as conn:
|
||||
r = conn.execute(
|
||||
"SELECT id, name, url, secret_encrypted, enabled, status, detail, "
|
||||
"kind, auth, tools_json FROM agent_connectors WHERE id=?",
|
||||
(connector_id,),
|
||||
).fetchone()
|
||||
return _row(r) if r else None
|
||||
|
||||
|
||||
# ── CRUD (personnels) ────────────────────────────────────────────────────────
|
||||
|
||||
def create_connector(name: str, url: str, secret: str = "", *,
|
||||
kind: str = "custom", auth: str = "bearer") -> dict:
|
||||
"""Valide l'URL (garde SSRF) puis stocke la clé **chiffrée** (Fernet)."""
|
||||
from app.services.importers.url_fetch import _validate_url
|
||||
|
||||
name = (name or "").strip()
|
||||
if not name:
|
||||
raise ValueError("name est requis")
|
||||
if kind not in CUSTOM_KINDS:
|
||||
raise ValueError(f"kind invalide: {kind} (attendu {', '.join(CUSTOM_KINDS)})")
|
||||
if auth not in AUTH_SCHEMES:
|
||||
raise ValueError(f"auth invalide: {auth} (attendu {', '.join(AUTH_SCHEMES)})")
|
||||
url = (url or "").strip()
|
||||
if "{secret}" in url and not (secret or "").strip():
|
||||
raise ValueError("clé requise : l'URL contient {secret}")
|
||||
url = _validate_url(url) # lève ValueError si hôte interne
|
||||
with get_conn() as conn:
|
||||
cur = conn.execute(
|
||||
"INSERT INTO agent_connectors (name, url, secret_encrypted, status, "
|
||||
"detail, kind, auth) VALUES (?,?,?,?,?,?,?)",
|
||||
(name, url, encrypt_secret(secret or ""), "unknown", "", kind, auth),
|
||||
)
|
||||
conn.commit()
|
||||
cid = cur.lastrowid
|
||||
return get(cid)
|
||||
|
||||
|
||||
def update_connector(connector_id: int, *, name=None, enabled=None, secret=None) -> dict | None:
|
||||
row = get(connector_id)
|
||||
if row is None:
|
||||
return None
|
||||
sets, params = [], []
|
||||
if name is not None:
|
||||
name = str(name).strip()
|
||||
if not name:
|
||||
raise ValueError("name est requis")
|
||||
sets.append("name=?")
|
||||
params.append(name)
|
||||
if enabled is not None:
|
||||
sets.append("enabled=?")
|
||||
params.append(1 if enabled else 0)
|
||||
if secret is not None:
|
||||
sets.append("secret_encrypted=?")
|
||||
params.append(encrypt_secret(str(secret)))
|
||||
if sets:
|
||||
with get_conn() as conn:
|
||||
params.append(connector_id)
|
||||
conn.execute(f"UPDATE agent_connectors SET {', '.join(sets)} WHERE id=?", params)
|
||||
conn.commit()
|
||||
return get(connector_id)
|
||||
|
||||
|
||||
def delete_connector(connector_id: int) -> bool:
|
||||
with get_conn() as conn:
|
||||
cur = conn.execute("DELETE FROM agent_connectors WHERE id=?", (connector_id,))
|
||||
conn.commit()
|
||||
return cur.rowcount > 0
|
||||
|
||||
|
||||
# ── Réseau (toujours gardé SSRF) ─────────────────────────────────────────────
|
||||
|
||||
def _headers(connector_id: int | None = None) -> dict:
|
||||
"""En-têtes d'appel : la clé n'est lue (et déchiffrée) qu'ici, jamais renvoyée.
|
||||
|
||||
``auth`` = bearer (défaut) | bot (Discord, jeton préfixé) | none (jeton ailleurs).
|
||||
"""
|
||||
headers = {"User-Agent": "FlowDeck-Connectors/1.0"}
|
||||
secret, auth = "", "bearer"
|
||||
if connector_id:
|
||||
with get_conn() as conn:
|
||||
r = conn.execute(
|
||||
"SELECT secret_encrypted, auth FROM agent_connectors WHERE id=?",
|
||||
(connector_id,),
|
||||
).fetchone()
|
||||
if r:
|
||||
secret = decrypt_secret(r["secret_encrypted"] or "")
|
||||
auth = r["auth"] or "bearer"
|
||||
if secret and auth == "bot":
|
||||
headers["Authorization"] = f"Bot {secret}"
|
||||
elif secret and auth != "none":
|
||||
headers["Authorization"] = f"Bearer {secret}"
|
||||
headers["X-Api-Key"] = secret
|
||||
return headers
|
||||
|
||||
|
||||
def _with_secret(url: str, connector_id: int) -> str:
|
||||
"""Substitue ``{secret}`` (Telegram : le jeton vit dans l'URL, jamais stocké clair)."""
|
||||
if "{secret}" not in url:
|
||||
return url
|
||||
with get_conn() as conn:
|
||||
r = conn.execute(
|
||||
"SELECT secret_encrypted FROM agent_connectors WHERE id=?",
|
||||
(connector_id,),
|
||||
).fetchone()
|
||||
secret = decrypt_secret((r["secret_encrypted"] if r else "") or "")
|
||||
if not secret:
|
||||
raise ValueError("clé manquante pour une URL contenant {secret}")
|
||||
return url.replace("{secret}", secret)
|
||||
|
||||
|
||||
async def _get(url: str, headers: dict | None = None) -> tuple[int, str]:
|
||||
"""GET gardé SSRF (validation + re-vérification après redirection).
|
||||
|
||||
Point d'injection des tests : on monkeypatche ``connectors._get``.
|
||||
"""
|
||||
from app.services.http_client import shared_client
|
||||
from app.services.importers.url_fetch import _is_public_host, _validate_url
|
||||
|
||||
safe = _validate_url(url)
|
||||
async with shared_client(timeout=10, follow_redirects=True, headers=headers or {}) as client:
|
||||
resp = await client.get(safe)
|
||||
if resp.url.host and not _is_public_host(resp.url.host):
|
||||
raise ValueError("Redirection vers un hôte non autorisé")
|
||||
return resp.status_code, (resp.text or "")[:FETCH_LIMIT]
|
||||
|
||||
|
||||
def _resolve(connector: str) -> tuple[str, str | int]:
|
||||
"""« 3 », « Ma clé API » ou « gitea » → (kind, id_custom|kind)."""
|
||||
token = str(connector or "").strip()
|
||||
if not token:
|
||||
raise ValueError("connector est requis")
|
||||
if token.isdigit():
|
||||
row = get(int(token))
|
||||
if row is None:
|
||||
raise ValueError(f"Connecteur inconnu: {token}")
|
||||
return (row["kind"], row["id"])
|
||||
low = token.lower()
|
||||
if low in NATIVE_KINDS:
|
||||
return (low, low)
|
||||
with get_conn() as conn:
|
||||
row = conn.execute(
|
||||
"SELECT id FROM agent_connectors WHERE lower(name)=?", (low,)
|
||||
).fetchone()
|
||||
if row:
|
||||
return (get(row["id"])["kind"], row["id"])
|
||||
raise ValueError(f"Connecteur inconnu: {token}")
|
||||
|
||||
|
||||
async def probe(connector: str, user_id: int | None = None) -> dict:
|
||||
"""Teste un connecteur et **persiste** le résultat (personnel uniquement)."""
|
||||
kind, ref = _resolve(connector)
|
||||
try:
|
||||
if kind == "mcp":
|
||||
from app.services import mcp_client
|
||||
tools = await mcp_client.initialize_and_list(int(ref))
|
||||
status, detail = "ok", f"MCP · {len(tools)} outil(s)"
|
||||
elif kind in OAUTH_KINDS:
|
||||
res = await oauth_connectors.api_get(kind, user_id,
|
||||
oauth_connectors.PROVIDERS[kind]["probe_path"])
|
||||
status, detail = res["status"], res["text"][:200]
|
||||
elif kind == "gitea":
|
||||
code, _ = await _get(f"{settings.gitea_url.rstrip('/')}/api/v1/version",
|
||||
{"Authorization": f"token {settings.gitea_token}"})
|
||||
status, detail = ("ok" if code < 400 else "error"), f"HTTP {code}"
|
||||
elif kind == "github":
|
||||
code, _ = await _get("https://api.github.com/rate_limit", _gh_headers())
|
||||
status, detail = ("ok" if code < 400 else "error"), f"HTTP {code}"
|
||||
elif kind == "web":
|
||||
status, detail = "ok", native_state("web")[1]
|
||||
else:
|
||||
row = get(int(ref))
|
||||
url = _with_secret(row["url"], int(ref))
|
||||
code, _ = await _get(url, _headers(int(ref)))
|
||||
status, detail = ("ok" if code < 400 else "error"), f"HTTP {code}"
|
||||
except Exception as exc: # noqa: BLE001 — un probe ne casse jamais l'UI
|
||||
logger.info("Connector probe failed (%s): %s", connector, exc)
|
||||
status, detail = "error", str(exc)[:200]
|
||||
if kind not in NATIVE_KINDS:
|
||||
with get_conn() as conn:
|
||||
conn.execute(
|
||||
"UPDATE agent_connectors SET status=?, detail=? WHERE id=?",
|
||||
(status, detail, int(ref)),
|
||||
)
|
||||
conn.commit()
|
||||
return {"connector": connector, "status": status, "detail": detail}
|
||||
|
||||
|
||||
def _gh_headers() -> dict:
|
||||
headers = {"User-Agent": "FlowDeck-Connectors/1.0",
|
||||
"Accept": "application/vnd.github+json"}
|
||||
if settings.github_token:
|
||||
headers["Authorization"] = f"Bearer {settings.github_token}"
|
||||
return headers
|
||||
|
||||
|
||||
async def connector_fetch(connector: str, path: str = "", query: str = "",
|
||||
user_id: int | None = None) -> dict:
|
||||
"""Lit un connecteur pour l'LLM : natif = API, web = recherche, perso = GET."""
|
||||
kind, ref = _resolve(connector)
|
||||
path = (path or "").strip()
|
||||
if kind in OAUTH_KINDS:
|
||||
return await oauth_connectors.api_get(kind, user_id, path)
|
||||
if kind == "mcp":
|
||||
from app.services import mcp_client
|
||||
return {"status": "ok", "text": mcp_client.tools_text(int(ref))}
|
||||
if kind == "gitea":
|
||||
base = settings.gitea_url.rstrip("/")
|
||||
url = f"{base}/{path.lstrip('/')}" if path else f"{base}/api/v1/version"
|
||||
code, text = await _get(url, {"Authorization": f"token {settings.gitea_token}"})
|
||||
elif kind == "github":
|
||||
url = "https://api.github.com/" + path.lstrip("/") if path else "https://api.github.com/rate_limit"
|
||||
code, text = await _get(url, _gh_headers())
|
||||
elif kind == "web":
|
||||
from app.services.web_search import search_web
|
||||
if not (query or "").strip():
|
||||
return {"status": "error", "text": "query est requis pour le connecteur web"}
|
||||
results, provider = await search_web(query.strip(), 5)
|
||||
text = "\n".join(f"- {r.get('title', '')} — {r.get('url', '')}\n {r.get('snippet', '')}"
|
||||
for r in results) or "Aucun résultat."
|
||||
return {"status": "ok", "text": f"provider: {provider}\n{text}"[:FETCH_LIMIT]}
|
||||
else:
|
||||
row = get(int(ref))
|
||||
if row is None:
|
||||
return {"status": "error", "text": "Connecteur supprimé"}
|
||||
if not row["enabled"]:
|
||||
return {"status": "error", "text": "Connecteur désactivé"}
|
||||
url = _with_secret(row["url"], int(ref)).rstrip("/")
|
||||
if path:
|
||||
url += "/" + path.lstrip("/")
|
||||
code, text = await _get(url, _headers(int(ref)))
|
||||
if code >= 400:
|
||||
return {"status": "error", "text": f"HTTP {code} — {text[:400]}"}
|
||||
return {"status": "ok", "text": text[:FETCH_LIMIT]}
|
||||
@@ -118,7 +118,7 @@ class ContextBuilder:
|
||||
return "\n".join(lines)
|
||||
|
||||
def _mentions_context(self, mentions: list[str]) -> str:
|
||||
"""Resolve @document:x / @collection:x / @page:y / @repo:o/r mentions.
|
||||
"""Resolve @document:x / @collection:x / @page:y / @folder:d / @repo:o/r mentions.
|
||||
|
||||
Mentions bring the *actual content* of the referenced object into the
|
||||
context so the LLM can summarise / rewrite / analyse it directly without
|
||||
@@ -135,6 +135,8 @@ class ContextBuilder:
|
||||
elif m.startswith("page:"):
|
||||
pid = m.split(":", 1)[1]
|
||||
lines.append(self._single_page(pid))
|
||||
elif m.startswith("folder:"):
|
||||
lines.append(self._single_folder(m.split(":", 1)[1]))
|
||||
elif m.startswith("repo:"):
|
||||
lines.append(f"- @repo: {m.split(':', 1)[1]} (Gitea issues available via read_gitea_issues)")
|
||||
elif m == "ws":
|
||||
@@ -209,6 +211,37 @@ class ContextBuilder:
|
||||
return f"{head}:\n{body[:9000]}"
|
||||
return head
|
||||
|
||||
def _single_folder(self, fid: str) -> str:
|
||||
"""Folder (répertoire) mention : titre du dossier + ses documents directs.
|
||||
|
||||
ponytail : enfants directs seulement, budget ~12k caractères —
|
||||
ajouter une profondeur récursive si les arbres profonds deviennent réels.
|
||||
"""
|
||||
with get_conn() as conn:
|
||||
row = conn.execute(
|
||||
"SELECT id, title FROM pages WHERE id=? AND deleted_at IS NULL",
|
||||
(fid,),
|
||||
).fetchone()
|
||||
if not row:
|
||||
return f"- dossier #{fid}: introuvable"
|
||||
kids = conn.execute(
|
||||
"SELECT id FROM pages WHERE parent_id=? AND deleted_at IS NULL "
|
||||
"ORDER BY sort_order ASC, created_at DESC",
|
||||
(fid,),
|
||||
).fetchall()
|
||||
title = row["title"] or "Sans titre"
|
||||
head = f"- dossier #{row['id']} **{title}** ({len(kids)} élément(s))"
|
||||
out = [head]
|
||||
used = len(head)
|
||||
for k in kids:
|
||||
part = self._single_document(str(k["id"]))
|
||||
if used + len(part) + 1 > 12000:
|
||||
out.append("- … (contenu du dossier tronqué)")
|
||||
break
|
||||
used += len(part) + 1
|
||||
out.append(part)
|
||||
return "\n".join(out)
|
||||
|
||||
def _single_collection(self, cid: str) -> str:
|
||||
with get_conn() as conn:
|
||||
row = conn.execute("SELECT id, name, icon, schema_json FROM collections WHERE id=?", (cid,)).fetchone()
|
||||
|
||||
@@ -26,7 +26,10 @@ def _is_public_host(host: str) -> bool:
|
||||
return False
|
||||
try:
|
||||
infos = socket.getaddrinfo(host, None)
|
||||
except socket.gaierror:
|
||||
except OSError:
|
||||
# gaierror, socket.timeout, herror… : le garde-fou doit TOUJOURS
|
||||
# renvoyer un booléen, jamais lever — sinon l'appelant tombe dans son
|
||||
# `except Exception` (bookmarks) au lieu d'un refus explicite.
|
||||
return False
|
||||
for info in infos:
|
||||
address = info[4][0]
|
||||
|
||||
@@ -37,7 +37,9 @@ logger = logging.getLogger(__name__)
|
||||
PROVIDERS = {
|
||||
"openai": ("https://api.openai.com/v1", "gpt-4o"),
|
||||
"anthropic": ("https://api.anthropic.com/v1", "claude-opus-4-8"),
|
||||
"mistral": ("https://api.mistral.ai/v1", "mistral-large-latest"),
|
||||
# mistral-small est servi par tous les plans d'abonnement ;
|
||||
# mistral-large → 403 tier_not_allowed sur les plans basiques.
|
||||
"mistral": ("https://api.mistral.ai/v1", "mistral-small-latest"),
|
||||
"cohere": ("https://api.cohere.ai/compatibility/v1", "command-a-plus-05-2026"),
|
||||
"google": ("https://generativelanguage.googleapis.com/v1beta/openai", "gemini-2.0-flash"),
|
||||
"groq": ("https://api.groq.com/openai/v1", "llama-3.3-70b-versatile"),
|
||||
@@ -94,8 +96,11 @@ PROVIDER_LABELS: dict[str, str] = {
|
||||
PROVIDER_MODELS: dict[str, list[str]] = {
|
||||
"openai": ["gpt-4o", "gpt-4o-mini", "gpt-4.1", "gpt-4.1-mini", "o3-mini", "gpt-4-turbo"],
|
||||
"anthropic": ["claude-opus-4-8", "claude-sonnet-4-5", "claude-3-5-sonnet", "claude-haiku-4-5"],
|
||||
"mistral": ["mistral-large-latest", "mistral-medium-latest", "mistral-small-latest",
|
||||
"codestral-latest", "open-mistral-nemo", "pixtral-large-latest"],
|
||||
# Ordre = ordre de sélection du test de connexion : les modèles servis par
|
||||
# tous les plans d'abord (large/pixtral-large = 403 tier_not_allowed en plan
|
||||
# basique), les modèles à plan élevé en fin de liste.
|
||||
"mistral": ["mistral-small-latest", "mistral-medium-latest", "open-mistral-nemo",
|
||||
"codestral-latest", "mistral-large-latest", "pixtral-large-latest"],
|
||||
"cohere": ["command-a-plus-05-2026", "command-r-plus", "command-r", "command-a-03-2025"],
|
||||
"google": ["gemini-2.0-flash", "gemini-2.0-flash-lite", "gemini-1.5-pro", "gemini-1.5-flash"],
|
||||
"groq": ["llama-3.3-70b-versatile", "llama-3.1-8b-instant",
|
||||
|
||||
@@ -22,7 +22,10 @@ from app.services.llm_client import PROVIDER_LABELS, PROVIDER_MODELS, PROVIDERS
|
||||
# before being exposed as "usable models". NVIDIA exposes all of its catalog
|
||||
# (embeddings, rerank, image/video/audio gen…) many of which answer 404 on
|
||||
# chat completions — the exact failure the user hit.
|
||||
_CHAT_VALIDATED_PROVIDERS = frozenset({"nvidia"})
|
||||
# Mistral : le /models liste des modèles hors du plan d'abonnement du compte
|
||||
# (403 « tier_not_allowed » ex. mistral-large sur plan basique) — la sonde
|
||||
# chat ne garde que ceux réellement servis par la CLÉ de l'utilisateur.
|
||||
_CHAT_VALIDATED_PROVIDERS = frozenset({"nvidia", "mistral"})
|
||||
|
||||
# Markers that identify clearly non-chat models (embeddings, rerank, media gen…).
|
||||
_NON_CHAT_MARKERS = (
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
"""Client MCP (Model Context Protocol) — streamable HTTP, v7.57.0.
|
||||
|
||||
JSON-RPC 2.0 : ``initialize`` → ``notifications/initialized`` → ``tools/list``
|
||||
→ ``tools/call``. Les outils sont **cachés** dans
|
||||
``agent_connectors.tools_json`` (kind ``mcp``) puis exposés au LLM par
|
||||
``ToolRegistry`` sous des noms ``mcp_<serveur>_<outil>`` — outils dynamiques,
|
||||
sans état en mémoire.
|
||||
|
||||
ponytail : **1 seul seam** ``_rpc()`` (monkeypatché en test) ; on lit soit la
|
||||
réponse JSON directe, soit la première ligne ``data:`` d'une
|
||||
``text/event-stream`` — pas de client SSE à l'état (les méthodes utilisées
|
||||
répondent en JSON chez la grande majorité des serveurs).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import re
|
||||
|
||||
from app.db import get_conn
|
||||
from app.services.connectors import _headers, _with_secret, get
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Version la plus répandue côté serveurs (un serveur plus récent rétrograde).
|
||||
PROTOCOL_VERSION = "2024-11-05"
|
||||
CLIENT_INFO = {"name": "FlowDeck", "version": "7"}
|
||||
|
||||
|
||||
def tool_name(server_name: str, tool_name: str) -> str:
|
||||
"""Nom LLM stable : ``mcp_<serveur>_<outil>`` (slug minuscules/underscores)."""
|
||||
def slug(text: str) -> str:
|
||||
return re.sub(r"[^a-z0-9]+", "_", str(text).lower()).strip("_")
|
||||
joined = f"mcp_{slug(server_name)}_{slug(tool_name)}"
|
||||
return re.sub(r"_{2,}", "_", joined)
|
||||
|
||||
|
||||
def parse_body(content_type: str, body: str, status: int) -> dict:
|
||||
"""Corps MCP → dict JSON (JSON direct ou événement ``data:`` d'un flux SSE)."""
|
||||
text = body or ""
|
||||
if "text/event-stream" in (content_type or ""):
|
||||
for line in text.splitlines():
|
||||
if line.startswith("data:"):
|
||||
text = line[5:].strip()
|
||||
break
|
||||
try:
|
||||
data = json.loads(text)
|
||||
except ValueError as exc:
|
||||
raise ValueError(f"Réponse MCP illisible (HTTP {status})") from exc
|
||||
if isinstance(data, dict) and data.get("error"):
|
||||
err = data["error"] if isinstance(data["error"], dict) else {}
|
||||
raise ValueError(f"MCP {err.get('code', '?')} : {err.get('message', 'erreur')}")
|
||||
return data if isinstance(data, dict) else {}
|
||||
|
||||
|
||||
async def _rpc(url: str, payload: dict, headers: dict | None = None) -> dict:
|
||||
"""POST JSON-RPC gardé SSRF → réponse décodée. Point d'injection des tests."""
|
||||
from app.services.http_client import shared_client
|
||||
from app.services.importers.url_fetch import _validate_url
|
||||
|
||||
safe = _validate_url(url)
|
||||
hdrs = {"Content-Type": "application/json",
|
||||
"Accept": "application/json, text/event-stream",
|
||||
**(headers or {})}
|
||||
async with shared_client(timeout=15, headers=hdrs) as client:
|
||||
resp = await client.post(safe, json=payload)
|
||||
return parse_body(resp.headers.get("content-type", ""), resp.text or "",
|
||||
resp.status_code)
|
||||
|
||||
|
||||
async def _notify(url: str, payload: dict, headers: dict | None = None) -> None:
|
||||
"""Notification JSON-RPC (202 sans corps) — les erreurs sont ignorées."""
|
||||
try:
|
||||
await _rpc(url, payload, headers)
|
||||
except Exception as exc: # noqa: BLE001
|
||||
logger.debug("MCP notification ignorée: %s", exc)
|
||||
|
||||
|
||||
def _server(connector_id: int) -> dict:
|
||||
row = get(connector_id)
|
||||
if row is None:
|
||||
raise ValueError("Serveur MCP introuvable")
|
||||
if row["kind"] != "mcp":
|
||||
raise ValueError("Ce connecteur n'est pas un serveur MCP")
|
||||
if not row["enabled"]:
|
||||
raise ValueError("Serveur MCP désactivé")
|
||||
return {"id": row["id"], "name": row["name"], "url": row["url"],
|
||||
"headers": _headers(connector_id)}
|
||||
|
||||
|
||||
def _normalize(server: dict, raw: list) -> list[dict]:
|
||||
out = []
|
||||
for t in raw if isinstance(raw, list) else []:
|
||||
if not isinstance(t, dict) or not t.get("name"):
|
||||
continue
|
||||
params = t.get("inputSchema")
|
||||
if not isinstance(params, dict):
|
||||
params = {"type": "object", "properties": {}}
|
||||
out.append({
|
||||
"name": tool_name(server["name"], t["name"]),
|
||||
"original": str(t["name"]),
|
||||
"description": str(t.get("description") or "Outil MCP"),
|
||||
"parameters": params,
|
||||
})
|
||||
return out
|
||||
|
||||
|
||||
def _save_tools(connector_id: int, tools: list[dict]) -> None:
|
||||
with get_conn() as conn:
|
||||
conn.execute("UPDATE agent_connectors SET tools_json=? WHERE id=?",
|
||||
(json.dumps(tools), connector_id))
|
||||
conn.commit()
|
||||
|
||||
|
||||
async def initialize_and_list(connector_id: int) -> list[dict]:
|
||||
"""Handshake + ``tools/list`` → met à jour le cache de la base."""
|
||||
srv = _server(connector_id)
|
||||
url = _with_secret(srv["url"], connector_id)
|
||||
await _rpc(url, {
|
||||
"jsonrpc": "2.0", "id": 1, "method": "initialize",
|
||||
"params": {"protocolVersion": PROTOCOL_VERSION, "capabilities": {},
|
||||
"clientInfo": CLIENT_INFO},
|
||||
}, srv["headers"])
|
||||
await _notify(url, {"jsonrpc": "2.0", "method": "notifications/initialized"},
|
||||
srv["headers"])
|
||||
data = await _rpc(url, {"jsonrpc": "2.0", "id": 2, "method": "tools/list",
|
||||
"params": {}}, srv["headers"])
|
||||
result = data.get("result") if isinstance(data.get("result"), dict) else {}
|
||||
tools = _normalize(srv, result.get("tools") or [])
|
||||
_save_tools(connector_id, tools)
|
||||
return tools
|
||||
|
||||
|
||||
def cached_tools() -> list[dict]:
|
||||
"""Outils MCP des serveurs **activés** (cache en base) — lu par ToolRegistry."""
|
||||
with get_conn() as conn:
|
||||
rows = conn.execute(
|
||||
"SELECT id, tools_json FROM agent_connectors WHERE kind='mcp' AND enabled=1"
|
||||
).fetchall()
|
||||
out: list[dict] = []
|
||||
for r in rows:
|
||||
try:
|
||||
tools = json.loads(r["tools_json"] or "[]")
|
||||
except (ValueError, TypeError):
|
||||
tools = []
|
||||
for t in tools if isinstance(tools, list) else []:
|
||||
if isinstance(t, dict) and t.get("name"):
|
||||
out.append({**t, "connector_id": r["id"]})
|
||||
return out
|
||||
|
||||
|
||||
def tools_text(connector_id: int) -> str:
|
||||
"""Liste lisible des outils cachés (utilisée par ``connector_fetch``)."""
|
||||
tools = [t for t in cached_tools() if t["connector_id"] == connector_id]
|
||||
if not tools:
|
||||
return "Aucun outil en cache — lancez « Tester le connecteur » (tools/list)."
|
||||
return "\n".join(f"- {t['name']} : {t.get('description', '')}" for t in tools)
|
||||
|
||||
|
||||
def _content_text(result: dict) -> str:
|
||||
parts = []
|
||||
for item in result.get("content") or []:
|
||||
if isinstance(item, dict) and item.get("type") == "text":
|
||||
parts.append(str(item.get("text") or ""))
|
||||
else:
|
||||
parts.append(json.dumps(item, ensure_ascii=False)[:2000])
|
||||
return "\n".join(p for p in parts if p) or json.dumps(result, ensure_ascii=False)[:4000]
|
||||
|
||||
|
||||
async def call_tool(connector_id: int, tool: str, arguments: dict | None = None) -> dict:
|
||||
"""``tools/call`` → {status, text} (isError → error, borné à 20 000 car.)."""
|
||||
srv = _server(connector_id)
|
||||
url = _with_secret(srv["url"], connector_id)
|
||||
data = await _rpc(url, {
|
||||
"jsonrpc": "2.0", "id": 3, "method": "tools/call",
|
||||
"params": {"name": tool, "arguments": arguments or {}},
|
||||
}, srv["headers"])
|
||||
result = data.get("result") if isinstance(data.get("result"), dict) else {}
|
||||
text = _content_text(result)[:20000]
|
||||
return {"status": "error" if result.get("isError") else "ok", "text": text}
|
||||
@@ -0,0 +1,255 @@
|
||||
"""Connecteurs OAuth Google / Microsoft 365 (v7.56.0 — phase 6).
|
||||
|
||||
Flow : ``begin()`` (URL d'autorisation PKCE S256 + state) → callback
|
||||
``complete()`` (échange du code) → tokens chiffrés Fernet → ``api_get()`` avec
|
||||
refresh automatique.
|
||||
|
||||
Réutilise : `_encrypt_tokens` / `_decrypt_tokens` (`calendar_sync`, déjà Fernet)
|
||||
et `shared_client` (A42). Les scopes sont **figés en lecture seule**.
|
||||
|
||||
ponytail : 2 providers décrits par 1 dict (pas de classe par provider) ; les
|
||||
scopes au choix et un écran de connexion dédié arriveront si le besoin se
|
||||
présente — l'état vit dans le catalogue du menu +.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import base64
|
||||
import hashlib
|
||||
import logging
|
||||
import secrets
|
||||
import time
|
||||
from urllib.parse import urlencode
|
||||
|
||||
from app.config import settings
|
||||
from app.db import get_conn
|
||||
from app.services.calendar_sync import _decrypt_tokens, _encrypt_tokens
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
PROVIDERS: dict[str, dict] = {
|
||||
"google": {
|
||||
"name": "Google (Drive · Gmail · Calendar)",
|
||||
"authorize": "https://accounts.google.com/o/oauth2/v2/auth",
|
||||
"token": "https://oauth2.googleapis.com/token",
|
||||
"api": "https://www.googleapis.com",
|
||||
"scopes": [
|
||||
"openid", "email", "profile",
|
||||
"https://www.googleapis.com/auth/drive.readonly",
|
||||
"https://www.googleapis.com/auth/gmail.readonly",
|
||||
"https://www.googleapis.com/auth/calendar.readonly",
|
||||
],
|
||||
"extra": {"access_type": "offline", "include_granted_scopes": "true"},
|
||||
"probe_path": "/oauth2/v3/userinfo",
|
||||
},
|
||||
"ms365": {
|
||||
"name": "Microsoft 365 (Outlook · OneDrive)",
|
||||
"authorize": "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
|
||||
"token": "https://login.microsoftonline.com/common/oauth2/v2.0/token",
|
||||
"api": "https://graph.microsoft.com/v1.0",
|
||||
"scopes": [
|
||||
"openid", "email", "profile", "offline_access",
|
||||
"User.Read", "Files.Read", "Mail.Read", "Calendars.Read",
|
||||
"ChannelMessage.Read.All", # Teams (phase 7) — consentement admin
|
||||
],
|
||||
"extra": {"response_mode": "query", "prompt": "consent"},
|
||||
"probe_path": "/me",
|
||||
},
|
||||
}
|
||||
OAUTH_KINDS = tuple(PROVIDERS)
|
||||
# l'access token est renouvelé 60 s avant expiration
|
||||
_REFRESH_SKEW = 60
|
||||
|
||||
|
||||
# ── Config client ───────────────────────────────────────────────────────────
|
||||
|
||||
def _client(kind: str) -> tuple[str, str, str]:
|
||||
"""(client_id, client_secret, redirect_uri) — lève si non configuré."""
|
||||
if kind not in PROVIDERS:
|
||||
raise ValueError(f"Connecteur OAuth inconnu: {kind}")
|
||||
if kind == "google":
|
||||
cid, secret = settings.google_client_id, settings.google_client_secret
|
||||
else:
|
||||
cid, secret = settings.ms_client_id, settings.ms_client_secret
|
||||
if not cid or not secret:
|
||||
raise ValueError(
|
||||
f"Connecteur {kind} non configuré (GOOGLE_CLIENT_ID/SECRET ou MS_CLIENT_ID/SECRET)"
|
||||
)
|
||||
redirect = f"{settings.app_base_url.rstrip('/')}/api/agent/connectors/oauth/{kind}/callback"
|
||||
return cid, secret, redirect
|
||||
|
||||
|
||||
def callback_path(kind: str) -> str:
|
||||
return f"/api/agent/connectors/oauth/{kind}/callback"
|
||||
|
||||
|
||||
def _pkce_pair() -> tuple[str, str]:
|
||||
verifier = secrets.token_urlsafe(48)
|
||||
digest = hashlib.sha256(verifier.encode("ascii")).digest()
|
||||
return verifier, base64.urlsafe_b64encode(digest).rstrip(b"=").decode("ascii")
|
||||
|
||||
|
||||
# ── Flow ────────────────────────────────────────────────────────────────────
|
||||
|
||||
def begin(kind: str) -> dict:
|
||||
"""URL d'autorisation + state + code_verifier (le route met les cookies)."""
|
||||
cid, _secret, redirect = _client(kind)
|
||||
verifier, challenge = _pkce_pair()
|
||||
state = secrets.token_urlsafe(24)
|
||||
params = {
|
||||
"client_id": cid,
|
||||
"redirect_uri": redirect,
|
||||
"response_type": "code",
|
||||
"scope": " ".join(PROVIDERS[kind]["scopes"]),
|
||||
"state": state,
|
||||
"code_challenge": challenge,
|
||||
"code_challenge_method": "S256",
|
||||
}
|
||||
params.update(PROVIDERS[kind].get("extra", {}))
|
||||
return {
|
||||
"url": f"{PROVIDERS[kind]['authorize']}?{urlencode(params)}",
|
||||
"state": state,
|
||||
"verifier": verifier,
|
||||
"redirect_uri": redirect,
|
||||
}
|
||||
|
||||
|
||||
def _normalize(data: dict) -> dict:
|
||||
expires_in = int(data.get("expires_in") or 3600)
|
||||
return {
|
||||
"access_token": str(data.get("access_token") or ""),
|
||||
"refresh_token": str(data.get("refresh_token") or ""),
|
||||
"scope": str(data.get("scope") or ""),
|
||||
"expires_at": int(time.time()) + expires_in,
|
||||
}
|
||||
|
||||
|
||||
async def complete(kind: str, code: str, verifier: str) -> dict:
|
||||
"""Échange le code contre des tokens (aucun réseau ici hors `_post_form`)."""
|
||||
cid, secret, redirect = _client(kind)
|
||||
data = await _post_form(PROVIDERS[kind]["token"], {
|
||||
"client_id": cid,
|
||||
"client_secret": secret,
|
||||
"grant_type": "authorization_code",
|
||||
"code": code,
|
||||
"redirect_uri": redirect,
|
||||
"code_verifier": verifier,
|
||||
})
|
||||
tokens = _normalize(data)
|
||||
if not tokens["access_token"]:
|
||||
raise ValueError(str(data.get("error_description") or data.get("error") or "échec de l'échange du code"))
|
||||
return tokens
|
||||
|
||||
|
||||
# ── Stockage (chiffré Fernet, comme calendar_sync) ──────────────────────────
|
||||
|
||||
def save(kind: str, user_id: int, tokens: dict) -> None:
|
||||
with get_conn() as conn:
|
||||
conn.execute(
|
||||
"INSERT INTO connector_tokens (kind, user_id, tokens_enc, updated_at) "
|
||||
"VALUES (?,?,?,CURRENT_TIMESTAMP) "
|
||||
"ON CONFLICT(kind, user_id) DO UPDATE SET "
|
||||
"tokens_enc=excluded.tokens_enc, updated_at=CURRENT_TIMESTAMP",
|
||||
(kind, user_id, _encrypt_tokens(tokens)),
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
|
||||
def tokens(kind: str, user_id: int | None) -> dict:
|
||||
if not user_id:
|
||||
return {}
|
||||
with get_conn() as conn:
|
||||
row = conn.execute(
|
||||
"SELECT tokens_enc FROM connector_tokens WHERE kind=? AND user_id=?",
|
||||
(kind, user_id),
|
||||
).fetchone()
|
||||
return _decrypt_tokens(row["tokens_enc"]) if row else {}
|
||||
|
||||
|
||||
def clear(kind: str, user_id: int) -> bool:
|
||||
with get_conn() as conn:
|
||||
cur = conn.execute(
|
||||
"DELETE FROM connector_tokens WHERE kind=? AND user_id=?", (kind, user_id)
|
||||
)
|
||||
conn.commit()
|
||||
return cur.rowcount > 0
|
||||
|
||||
|
||||
def is_connected(kind: str, user_id: int | None) -> bool:
|
||||
return bool(tokens(kind, user_id).get("access_token"))
|
||||
|
||||
|
||||
# ── Réseau ──────────────────────────────────────────────────────────────────
|
||||
|
||||
async def _post_form(url: str, data: dict) -> dict:
|
||||
"""POST x-www-form-urlencoded vers le token endpoint → dict JSON.
|
||||
|
||||
Point d'injection des tests (on monkeypatche ``oauth_connectors._post_form``).
|
||||
"""
|
||||
from app.services.http_client import shared_client
|
||||
|
||||
async with shared_client(timeout=15, headers={"Accept": "application/json"}) as client:
|
||||
resp = await client.post(url, data=data)
|
||||
return resp.json()
|
||||
|
||||
|
||||
async def _api_get(url: str, headers: dict) -> tuple[int, str]:
|
||||
"""GET d'une API fournisseur — 2ᵉ point d'injection des tests."""
|
||||
from app.services.http_client import shared_client
|
||||
|
||||
async with shared_client(timeout=15, headers=headers) as client:
|
||||
resp = await client.get(url)
|
||||
return resp.status_code, (resp.text or "")[:20000]
|
||||
|
||||
|
||||
async def access_token(kind: str, user_id: int | None) -> str:
|
||||
"""Access token valide, rafraîchi (refresh_token) si nécessaire."""
|
||||
tok = tokens(kind, user_id)
|
||||
if not tok.get("access_token"):
|
||||
return ""
|
||||
if tok.get("expires_at", 0) > time.time() + _REFRESH_SKEW:
|
||||
return tok["access_token"]
|
||||
if not tok.get("refresh_token"):
|
||||
return "" # expiré sans refresh → à reconnexion
|
||||
try:
|
||||
cid, secret, redirect = _client(kind)
|
||||
data = await _post_form(PROVIDERS[kind]["token"], {
|
||||
"client_id": cid,
|
||||
"client_secret": secret,
|
||||
"grant_type": "refresh_token",
|
||||
"refresh_token": tok["refresh_token"],
|
||||
"redirect_uri": redirect,
|
||||
})
|
||||
fresh = _normalize(data)
|
||||
if not fresh["access_token"]:
|
||||
raise ValueError(data.get("error_description") or "refresh refusé")
|
||||
# Google ne renvoie parfois pas de nouveau refresh_token : on garde l'ancien
|
||||
fresh["refresh_token"] = fresh["refresh_token"] or tok["refresh_token"]
|
||||
save(kind, int(user_id), fresh)
|
||||
return fresh["access_token"]
|
||||
except Exception as exc: # noqa: BLE001 — jamais d'exception qui casse un run
|
||||
logger.warning("OAuth refresh failed (%s): %s", kind, exc)
|
||||
return ""
|
||||
|
||||
|
||||
async def api_get(kind: str, user_id: int | None, path: str = "") -> dict:
|
||||
"""GET sur l'API du fournisseur avec le token de l'utilisateur."""
|
||||
if kind not in PROVIDERS:
|
||||
return {"status": "error", "text": f"Connecteur OAuth inconnu: {kind}"}
|
||||
access = await access_token(kind, user_id)
|
||||
if not access:
|
||||
return {"status": "error", "text": f"{kind} non connecté (lancez la connexion OAuth)"}
|
||||
if "://" in (path or ""):
|
||||
return {"status": "error", "text": "path doit être relatif (pas d'URL absolue)"}
|
||||
# base fixe + chemin : pas d'urljoin (une URL absolue ne peut pas dévier
|
||||
# l'hôte), puis validation SSRF par principe.
|
||||
url = PROVIDERS[kind]["api"].rstrip("/") + "/" + (path or "").lstrip("/")
|
||||
from app.services.importers.url_fetch import _validate_url
|
||||
try:
|
||||
_validate_url(url)
|
||||
except ValueError as exc:
|
||||
return {"status": "error", "text": str(exc)}
|
||||
code, text = await _api_get(url, {"Authorization": f"Bearer {access}"})
|
||||
if code >= 400:
|
||||
return {"status": "error", "text": f"HTTP {code} — {text[:400]}"}
|
||||
return {"status": "ok", "text": text[:20000]}
|
||||
@@ -0,0 +1,77 @@
|
||||
"""Plugins de l'instance — on/off à **effet réel** (v7.58.0).
|
||||
|
||||
Chaque plugin câble une chose concrète, jamais un simple drapeau :
|
||||
|
||||
- ``web-tools`` → retiré du registre d'outils de l'agent (schéma + exécution)
|
||||
- ``web-clipper`` → routers ``/extensions`` et ``/api/v2/web-clipper/*`` refusés
|
||||
- ``automations`` → routes ``/workspace/automations*`` refusées + scheduler
|
||||
|
||||
Le garde de route est une **dépendance FastAPI posée à l'`include_router`**
|
||||
(``main.py``) : 3 lignes, aucun fichier de router touché.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from fastapi import HTTPException, Request
|
||||
|
||||
from app.db import get_conn
|
||||
|
||||
# slug → (nom affiché, description affichée)
|
||||
CATALOG: list[tuple[str, str, str]] = [
|
||||
("web-tools", "Outils web de l'agent",
|
||||
"Retire web_search et fetch_url du registre d'outils de l'agent"),
|
||||
("web-clipper", "Web Clipper",
|
||||
"Coupe la page /extensions et l'API /api/v2/web-clipper/*"),
|
||||
("automations", "Automations",
|
||||
"Coupe /workspace/automations* et le scheduler en arrière-plan"),
|
||||
]
|
||||
|
||||
# slug → outils LLM retirés du registre quand le plugin est OFF
|
||||
PLUGIN_TOOLS: dict[str, tuple[str, ...]] = {"web-tools": ("web_search", "fetch_url")}
|
||||
|
||||
|
||||
def is_enabled(slug: str) -> bool:
|
||||
"""Ligne absente = activé (défaut sûr : ne rien couper par accident)."""
|
||||
with get_conn() as conn:
|
||||
row = conn.execute("SELECT enabled FROM plugins WHERE slug=?", (slug,)).fetchone()
|
||||
return True if row is None else bool(row["enabled"])
|
||||
|
||||
|
||||
def list_plugins() -> list[dict]:
|
||||
with get_conn() as conn:
|
||||
rows = {r["slug"]: bool(r["enabled"])
|
||||
for r in conn.execute("SELECT slug, enabled FROM plugins")}
|
||||
return [{"slug": slug, "name": name, "description": desc,
|
||||
"enabled": rows.get(slug, True)}
|
||||
for slug, name, desc in CATALOG]
|
||||
|
||||
|
||||
def set_enabled(slug: str, enabled: bool) -> dict:
|
||||
if not any(s == slug for s, _, _ in CATALOG):
|
||||
raise ValueError(f"Plugin inconnu: {slug}")
|
||||
name = next(n for s, n, _ in CATALOG if s == slug)
|
||||
desc = next(d for s, _, d in CATALOG if s == slug)
|
||||
with get_conn() as conn:
|
||||
# SQLite vérifie NOT NULL AVANT l'upsert : il faut fournir name/description.
|
||||
conn.execute(
|
||||
"INSERT INTO plugins (slug, name, description, enabled) VALUES (?,?,?,?) "
|
||||
"ON CONFLICT(slug) DO UPDATE SET enabled=excluded.enabled",
|
||||
(slug, name, desc, 1 if enabled else 0))
|
||||
conn.commit()
|
||||
return next(p for p in list_plugins() if p["slug"] == slug)
|
||||
|
||||
|
||||
def plugin_required(slug: str):
|
||||
"""Dépendance FastAPI : 404 dès que le plugin est désactivé.
|
||||
|
||||
`Request` doit être importé au **module** : les annotations sont des
|
||||
chaînes (`from __future__ import annotations`) et FastAPI les résout dans
|
||||
les globales du module — sinon il lit un query param → 422.
|
||||
"""
|
||||
|
||||
def dep(request: Request) -> None:
|
||||
# annotation Request OBLIGATOIRE : sans elle FastAPI lit un query param → 422
|
||||
if not is_enabled(slug):
|
||||
raise HTTPException(status_code=404, detail=f"Plugin désactivé: {slug}")
|
||||
|
||||
return dep
|
||||
@@ -1072,6 +1072,79 @@ class SearchCode(Tool):
|
||||
|
||||
# ══════════════════════════ Registry ══════════════════════════
|
||||
|
||||
class ConnectorFetch(Tool):
|
||||
name = "connector_fetch"
|
||||
description = (
|
||||
"Lit un connecteur configuré dans FlowDeck : API Gitea / GitHub (natives), "
|
||||
"recherche web (natif « web »), ou un connecteur personnalisé (URL + clé). "
|
||||
"`path` est relatif à l'URL du connecteur (ex. « /api/v1/repos ») ; "
|
||||
"`query` sert au connecteur web. Les hôtes privés sont refusés."
|
||||
)
|
||||
parameters = {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"connector": {"type": "string",
|
||||
"description": "id, nom ou kind (gitea / github / web)"},
|
||||
"path": {"type": "string", "description": "chemin relatif (API natives)"},
|
||||
"query": {"type": "string", "description": "terme de recherche (web)"},
|
||||
},
|
||||
"required": ["connector"],
|
||||
}
|
||||
|
||||
async def execute(self, args, *, user_id=None) -> ToolResult:
|
||||
from app.services import connectors
|
||||
|
||||
try:
|
||||
res = await connectors.connector_fetch(
|
||||
str(args.get("connector") or ""),
|
||||
str(args.get("path") or ""),
|
||||
str(args.get("query") or ""),
|
||||
user_id=user_id,
|
||||
)
|
||||
except ValueError as exc:
|
||||
return ToolResult(status="error", tool=self.name, message=str(exc))
|
||||
except Exception as exc: # noqa: BLE001 — réseau : erreur outil, pas run
|
||||
logger.warning("connector_fetch failed: %s", exc)
|
||||
return ToolResult(status="error", tool=self.name,
|
||||
message=f"Connecteur indisponible: {exc}")
|
||||
if res.get("status") != "ok":
|
||||
return ToolResult(status="error", tool=self.name,
|
||||
message=(res.get("text") or "erreur")[:500])
|
||||
text = res.get("text") or ""
|
||||
return ToolResult(status="success", tool=self.name, target_type="connector",
|
||||
message=text[:800], data={"text": text})
|
||||
|
||||
|
||||
class McpTool(Tool):
|
||||
"""Outil MCP dynamique — instance construite à la volée depuis le cache
|
||||
en base (`mcp_client.cached_tools()`), pas enregistrée dans TOOL_CLASSES."""
|
||||
|
||||
def __init__(self, entry: dict):
|
||||
self.name = entry["name"]
|
||||
self.description = entry.get("description") or "Outil MCP"
|
||||
self.parameters = entry.get("parameters") or {"type": "object", "properties": {}}
|
||||
self.entry = entry
|
||||
|
||||
async def execute(self, args, *, user_id=None) -> ToolResult:
|
||||
from app.services import mcp_client
|
||||
|
||||
try:
|
||||
res = await mcp_client.call_tool(self.entry["connector_id"],
|
||||
self.entry.get("original") or "", args)
|
||||
except ValueError as exc:
|
||||
return ToolResult(status="error", tool=self.name, message=str(exc))
|
||||
except Exception as exc: # noqa: BLE001 — réseau : erreur outil, pas run
|
||||
logger.warning("MCP tool failed (%s): %s", self.name, exc)
|
||||
return ToolResult(status="error", tool=self.name,
|
||||
message=f"MCP indisponible: {exc}")
|
||||
if res.get("status") != "ok":
|
||||
return ToolResult(status="error", tool=self.name,
|
||||
message=(res.get("text") or "erreur MCP")[:500])
|
||||
text = res.get("text") or ""
|
||||
return ToolResult(status="success", tool=self.name, target_type="mcp",
|
||||
message=text[:800], data={"text": text})
|
||||
|
||||
|
||||
TOOL_CLASSES = [
|
||||
SearchWorkspace, ReadCollection, ReadPage, ReadWorkspaces, ReadDocument,
|
||||
CreateCollection, CreateView, AddProperty, CreatePage, CreateDocument,
|
||||
@@ -1080,7 +1153,7 @@ TOOL_CLASSES = [
|
||||
DeletePage, DeleteCollection,
|
||||
ReadGiteaIssues, SyncGitea, CreateGiteaIssue,
|
||||
DeleteDocument,
|
||||
WebSearch, FetchUrl, SearchCode,
|
||||
WebSearch, FetchUrl, SearchCode, ConnectorFetch,
|
||||
]
|
||||
|
||||
|
||||
@@ -1090,24 +1163,47 @@ class ToolRegistry:
|
||||
def __init__(self):
|
||||
self.tools: dict[str, Tool] = {t.name: t() for t in TOOL_CLASSES}
|
||||
|
||||
def _all(self) -> dict[str, Tool]:
|
||||
"""Outils statiques + **outils MCP dynamiques** (cache en base).
|
||||
|
||||
Les MCP ne sont jamais mis en cache en mémoire : un run re-lit la base,
|
||||
donc « Tester le connecteur » suffit à rendre un outil disponible.
|
||||
"""
|
||||
tools = dict(self.tools)
|
||||
try:
|
||||
from app.services import mcp_client
|
||||
from app.services import plugins as plugins_service
|
||||
for entry in mcp_client.cached_tools():
|
||||
tools[entry["name"]] = McpTool(entry)
|
||||
# plugin « web-tools » OFF → outils web retirés du schéma ET de execute()
|
||||
for slug, names in plugins_service.PLUGIN_TOOLS.items():
|
||||
if not plugins_service.is_enabled(slug):
|
||||
for name in names:
|
||||
tools.pop(name, None)
|
||||
except Exception: # noqa: BLE001 — la base ne doit jamais casser un run
|
||||
logger.exception("dynamic tools load failed")
|
||||
return tools
|
||||
|
||||
def list(self, scope: dict | None = None) -> list[str]:
|
||||
"""Tool names allowed by an agent scope (default: all)."""
|
||||
tools = self._all()
|
||||
allowed = (scope or {}).get("tools")
|
||||
if allowed is None:
|
||||
return list(self.tools.keys())
|
||||
return [n for n in self.tools if n in allowed]
|
||||
return list(tools.keys())
|
||||
return [n for n in tools if n in allowed]
|
||||
|
||||
def schema(self, scope: dict | None = None) -> list[dict]:
|
||||
"""Function-calling schema for the LLM, filtered by scope."""
|
||||
tools = self._all()
|
||||
return [
|
||||
{"name": self.tools[n].name,
|
||||
"description": self.tools[n].description,
|
||||
"parameters": self.tools[n].parameters}
|
||||
{"name": tools[n].name,
|
||||
"description": tools[n].description,
|
||||
"parameters": tools[n].parameters}
|
||||
for n in self.list(scope)
|
||||
]
|
||||
|
||||
async def execute(self, tool: str, args: dict, *, user_id: int | None = None) -> ToolResult:
|
||||
impl = self.tools.get(tool)
|
||||
impl = self._all().get(tool)
|
||||
if not impl:
|
||||
return ToolResult(status="error", tool=tool, message=f"Outil inconnu: {tool}")
|
||||
return await impl.execute(args, user_id=user_id)
|
||||
|
||||
@@ -125,21 +125,7 @@
|
||||
<div class="db-col-menu-item" id="db-col-insert-right"><span>→┤ Insert right</span></div>
|
||||
</div>
|
||||
|
||||
<!-- Side Peek Panel for Database Pages (vanilla JS, piloté par database_table.js) -->
|
||||
<div id="db-side-peek" class="db-side-peek">
|
||||
<div class="peek-resize-handle" title="Glisser pour redimensionner — cliquer pour fermer"></div>
|
||||
<div class="db-side-peek-header">
|
||||
<button id="db-side-peek-close" title="Close">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
<div class="db-side-peek-title" id="db-side-peek-title"></div>
|
||||
<button id="db-side-peek-full" title="Open full page">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 13v6a2 2 0 01-2 2H5a2 2 0 01-2-2V8a2 2 0 012-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
<div class="db-side-peek-body">
|
||||
<div class="db-side-peek-loading" id="db-side-peek-loading">Chargement…</div>
|
||||
<iframe id="db-side-peek-iframe" src="about:blank" title="Document" style="width:100%;height:100%;border:none;flex:1;min-height:0;"></iframe>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Le panneau de peek (#db-side-peek) est créé à la demande par
|
||||
database_table.js (ensureDbPeek) : une seule source de markup pour
|
||||
la page de base et les bases embarquées dans un document. -->
|
||||
</div>
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
{% if not hide_hamburger %}
|
||||
<button class="hamburger-btn"
|
||||
:class="{ 'hamburger-desktop-show': sidebarCollapsed }"
|
||||
@click="{{ hamburger_click|default('sidebarCollapsed ? toggleSidebar() : (mobileSidebarOpen = true, sidebarCollapsed = false)') }}"
|
||||
@click="{{ hamburger_click|default('fdHamburgerClick()') }}"
|
||||
title="Toggle sidebar">
|
||||
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||
<line x1="3" y1="6" x2="21" y2="6"/>
|
||||
|
||||
@@ -16,6 +16,9 @@
|
||||
|
||||
<style>
|
||||
.fd-icon-picker{position:fixed;top:0;left:0;width:344px;background:var(--bg-modal);border:1px solid var(--border);border-radius:10px;box-shadow:0 8px 32px rgba(0,0,0,.28);z-index:2200;display:flex;flex-direction:column;max-height:440px;overflow:hidden;padding:0;}
|
||||
.fd-icon-picker .fdip-title{display:flex;align-items:center;gap:8px;padding:10px 12px;border-bottom:1px solid var(--border);}
|
||||
.fd-icon-picker .fdip-title-text{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:13px;font-weight:600;color:var(--text-primary);}
|
||||
.fd-icon-picker .fdip-title-grip{opacity:.6;font-size:14px;}
|
||||
.fd-icon-picker .fdip-tabs{display:flex;align-items:center;gap:2px;padding:8px 10px 6px;border-bottom:1px solid var(--border);}
|
||||
.fd-icon-picker .fdip-tab{background:transparent;border:none;color:var(--text-secondary);font-size:13px;padding:5px 10px;border-radius:6px;cursor:pointer;}
|
||||
.fd-icon-picker .fdip-tab:hover{background:var(--bg-hover);}
|
||||
@@ -70,7 +73,11 @@
|
||||
@click.outside="$store.fdIconPicker.customModal || $store.fdIconPicker.close()"
|
||||
@keydown.escape.window="$store.fdIconPicker.close()"
|
||||
:style="'top:' + $store.fdIconPicker.y + 'px;left:' + $store.fdIconPicker.x + 'px'">
|
||||
<div class="fdip-tabs">
|
||||
<div class="fdip-title" x-show="$store.fdIconPicker.title" x-cloak>
|
||||
<span class="fdip-title-text" x-text="$store.fdIconPicker.title"></span>
|
||||
<span class="fdip-title-grip" title="Drag">✋</span>
|
||||
</div>
|
||||
<div class="fdip-tabs" x-show="!$store.fdIconPicker.title">
|
||||
<button class="fdip-tab" :class="{ active: $store.fdIconPicker.tab === 'emoji' }" @click="$store.fdIconPicker.setTab('emoji')">Emoji</button>
|
||||
<button class="fdip-tab" :class="{ active: $store.fdIconPicker.tab === 'icons' }" @click="$store.fdIconPicker.setTab('icons')">Icons</button>
|
||||
<button class="fdip-tab" :class="{ active: $store.fdIconPicker.tab === 'upload' }" @click="$store.fdIconPicker.setTab('upload')">Upload</button>
|
||||
@@ -93,6 +100,15 @@
|
||||
<div class="fdip-body">
|
||||
<template x-if="$store.fdIconPicker.tab === 'emoji'">
|
||||
<div>
|
||||
<!-- v7.64 : mode réaction — les récents au-dessus de la grille (façon Notion) -->
|
||||
<div x-show="$store.fdIconPicker.title && $store.fdIconPicker.category !== 'recent' && !$store.fdIconPicker.query && $store.fdIconPicker.recent.length">
|
||||
<div class="fdip-section">Recent</div>
|
||||
<div class="fdip-grid">
|
||||
<template x-for="e in $store.fdIconPicker.recent.slice(0, 8)" :key="'rt' + e">
|
||||
<button class="fdip-emoji" @click="$store.fdIconPicker.pick($store.fdIconPicker.withTone(e))" x-text="$store.fdIconPicker.withTone(e)"></button>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="fdip-section" x-show="$store.fdIconPicker.category === 'recent' && !$store.fdIconPicker.query">Recent</div>
|
||||
<div class="fdip-grid">
|
||||
<template x-for="e in $store.fdIconPicker.items()" :key="e">
|
||||
|
||||
@@ -578,74 +578,132 @@
|
||||
background:var(--bg-modal,#1f1f1f);border:1px solid var(--border,#333);border-radius:10px;
|
||||
box-shadow:var(--shadow-modal);padding:6px;"></div>
|
||||
|
||||
<!-- ═══════════ Inline comment trigger on selection (v4.9.0) ═══════════ -->
|
||||
<button type="button" id="_commentSelBtn"
|
||||
style="display:none;position:fixed;z-index:1100;padding:7px 12px;font-size:13px;font-weight:600;
|
||||
color:#fff;background:var(--accent,#2383E2);border:none;border-radius:8px;cursor:pointer;
|
||||
box-shadow:0 4px 16px rgba(0,0,0,.35);" title="Comment on selection"
|
||||
@click="edCall('commentOnSelection')">
|
||||
💬 Comment
|
||||
</button>
|
||||
|
||||
<!-- ═══════════ Comments drawer (v4.9.0) ═══════════ -->
|
||||
<!-- ═══════════ Comments drawer (v4.9.0 · refonte v7.64 façon Notion) ═══════════ -->
|
||||
<div class="comments-drawer" x-show="commentsOpen" x-cloak x-transition
|
||||
style="position:fixed;top:var(--topbar-height,44px);right:0;bottom:0;width:320px;max-width:92vw;
|
||||
style="position:fixed;top:var(--topbar-height,44px);right:0;bottom:0;width:340px;max-width:92vw;
|
||||
background:var(--bg-primary,#1c1c1c);border-left:1px solid var(--border,#333);
|
||||
box-shadow:-8px 0 30px rgba(0,0,0,.25);z-index:900;display:flex;flex-direction:column;">
|
||||
<div class="comments-drawer-header"
|
||||
style="display:flex;align-items:center;justify-content:space-between;padding:12px 16px;
|
||||
border-bottom:1px solid var(--border,#333);font-weight:600;font-size:14px;">
|
||||
<span>Comments</span>
|
||||
<span>Comments <span style="color:var(--text-dim);font-weight:400;" x-text="'(' + commentCount + ')'"></span></span>
|
||||
<button type="button" class="topbar-btn" @click="toggleComments()" title="Close">✕</button>
|
||||
</div>
|
||||
<div class="comments-drawer-list" style="flex:1;overflow-y:auto;padding:12px 16px;">
|
||||
<div x-show="comments.length === 0" style="text-align:center;color:var(--text-dim,#999);padding:32px 0;">
|
||||
<!-- v7.67 : les réactions emoji du texte vivent aussi ici (✕ = retirer) -->
|
||||
<div class="ct-reactions" x-show="reactionList().length" x-cloak style="margin-bottom:14px;">
|
||||
<div class="ct-section-title">Reactions</div>
|
||||
<template x-for="r in reactionList()" :key="r.key">
|
||||
<div class="ct-reaction">
|
||||
<span class="ct-re-emoji" x-text="r.emoji"></span>
|
||||
<span class="ct-re-count" x-show="r.count > 1" x-text="r.count"></span>
|
||||
<span class="ct-re-text" x-text="r.text"></span>
|
||||
<button type="button" class="ct-act" title="Remove reaction"
|
||||
x-show="r.mine" @click="removeReaction(r)">✕</button>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div x-show="comments.length === 0 && !reactionList().length" style="text-align:center;color:var(--text-dim,#999);padding:32px 0;">
|
||||
No comments yet. Select some text and click 💬 Comment.
|
||||
</div>
|
||||
<template x-for="c in comments" :key="c.id">
|
||||
<div class="comment-thread" style="margin-bottom:18px;"
|
||||
:style="c.anchor_block_id ? 'border-left:3px solid var(--accent);padding-left:10px;' : ''">
|
||||
<div style="display:flex;align-items:center;gap:8px;margin-bottom:4px;">
|
||||
<div style="width:22px;height:22px;border-radius:50%;background:#3A3A3A;color:#fff;
|
||||
display:flex;align-items:center;justify-content:center;font-size:11px;font-weight:700;"
|
||||
<div class="comment-thread" :data-thread="c.id"
|
||||
:class="{ 'is-resolved': c.resolved, 'has-anchor': !!c.anchor_block_id }">
|
||||
<div class="ct-head">
|
||||
<div class="ct-avatar"
|
||||
:style="{ background: c.author && c.author.avatar_color ? c.author.avatar_color : '#3A3A3A' }">
|
||||
<span x-text="(c.author ? (c.author.full_name || c.author.login || '?') : '?').charAt(0).toUpperCase()"></span>
|
||||
</div>
|
||||
<span style="font-size:12px;font-weight:600;" x-text="c.author ? (c.author.full_name || c.author.login) : 'Unknown'"></span>
|
||||
<span style="font-size:11px;color:var(--text-dim,#999);margin-left:auto;" x-text="fmtTime(c.created_at)"></span>
|
||||
</div>
|
||||
<div style="font-size:13px;white-space:pre-wrap;margin-bottom:6px;" x-text="c.body"></div>
|
||||
<div style="display:flex;gap:8px;align-items:center;">
|
||||
<button class="btn-sm" style="font-size:11px;" @click="resolveComment(c.id)"
|
||||
x-text="c.resolved ? '↪ Reopen' : '✔ Resolve'"></button>
|
||||
<button class="btn-sm" style="font-size:11px;" x-show="c.user_id === currentUserId"
|
||||
@click="deleteComment(c.id)">🗑 Delete</button>
|
||||
<span class="ct-name" x-text="c.author ? (c.author.full_name || c.author.login) : 'Unknown'"></span>
|
||||
<span class="ct-time" x-text="fmtTime(c.created_at)"></span>
|
||||
<div class="ct-actions">
|
||||
<button type="button" class="ct-act" :title="c.resolved ? 'Reopen' : 'Resolve'"
|
||||
@click="resolveComment(c)"
|
||||
:class="{ 'is-on': c.resolved }">✓</button>
|
||||
<button type="button" class="ct-act" title="More"
|
||||
x-show="c.user_id === currentUserId"
|
||||
@click.stop="commentMenu = commentMenu === c.id ? null : c.id">⋯</button>
|
||||
</div>
|
||||
<div class="ct-menu" x-cloak x-show="commentMenu === c.id" @click.outside="commentMenu = null">
|
||||
<button type="button" class="ct-menu-item" @click="copyCommentLink(c.id)">🔗 Copy link</button>
|
||||
<button type="button" class="ct-menu-item is-danger" @click="deleteComment(c.id)">🗑 Delete</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ct-body" x-text="c.body"></div>
|
||||
<div class="ct-anchor-label" x-show="!!c.anchor_block_id && !c.resolved">💬 on selected text</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div class="comments-drawer-input" style="border-top:1px solid var(--border,#333);padding:12px 16px;">
|
||||
<textarea x-model="commentDraft" rows="2"
|
||||
placeholder="Add a comment... Use @ to mention someone."
|
||||
style="width:100%;background:var(--bg-secondary,#2a2a2a);border:1px solid var(--border,#333);
|
||||
border-radius:8px;color:var(--text);font-size:13px;padding:8px 10px;resize:none;outline:none;"></textarea>
|
||||
<div style="display:flex;justify-content:flex-end;margin-top:8px;">
|
||||
<button class="btn btn-primary" style="font-size:12px;padding:6px 14px;" @click="addPageComment()">Comment</button>
|
||||
<div class="comments-drawer-input">
|
||||
<div class="ct-input-row">
|
||||
<textarea x-model="commentDraft" rows="1"
|
||||
placeholder="Add a comment..."
|
||||
@keydown.enter.exact.prevent="addPageComment()"></textarea>
|
||||
<div class="ct-input-actions">
|
||||
<button type="button" class="ct-act" title="Mention" @click="commentAt()">@</button>
|
||||
<button type="button" class="ct-send" title="Send"
|
||||
:disabled="!(commentDraft || '').trim()" @click="addPageComment()">↑</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ═══════════ Menu contextuel au highlight de texte (v7.62.0, façon Notion) ═══════════ -->
|
||||
<div
|
||||
class="format-toolbar"
|
||||
x-show="fmt.open"
|
||||
x-cloak
|
||||
:style="{top:fmt.top+'px',left:fmt.left+'px'}"
|
||||
@mousedown.prevent
|
||||
>
|
||||
<button @click="fmtApply('bold')"><strong>B</strong></button>
|
||||
<button @click="fmtApply('italic')"><em>I</em></button>
|
||||
<button @click="fmtApply('underline')"><u>U</u></button>
|
||||
<button @click="fmtApply('strikeThrough')"><s>S</s></button>
|
||||
<button @click="fmtLink()">{{ fd_icon("link",14) }}</button>
|
||||
<!-- Ligne 1 : style de texte -->
|
||||
<div class="ft-row">
|
||||
<button type="button" class="ft-item ft-style"
|
||||
@click="fmtStyle($event)"
|
||||
data-tooltip-html="<em>To be the foremost driver…</em><br>Just start writing with plain text">
|
||||
<span class="ft-style-ico">T</span>
|
||||
<span class="ft-style-name" x-text="fmtStyleName()"></span>
|
||||
<span class="ft-caret">›</span>
|
||||
</button>
|
||||
</div>
|
||||
<!-- Ligne 2 : formatage de base -->
|
||||
<div class="ft-row">
|
||||
<button type="button" class="ft-item ft-a" @click="fmtColor($event)" data-tooltip="Color — text and background colors"><span class="ft-a-letter">A</span></button>
|
||||
<button type="button" class="ft-item" @click="fmtApply('bold')" data-tooltip="Bold — Ctrl+B"><strong>B</strong></button>
|
||||
<button type="button" class="ft-item" @click="fmtApply('italic')" data-tooltip="Italic — Ctrl+I"><em>I</em></button>
|
||||
<button type="button" class="ft-item" @click="fmtApply('underline')" data-tooltip="Underline"><u>U</u></button>
|
||||
<button type="button" class="ft-item" @click="fmtApply('strikeThrough')" data-tooltip="Strikethrough"><s>T</s></button>
|
||||
<button type="button" class="ft-item ft-tx" @click="fmtCode()" data-tooltip="Inline code">Tx</button>
|
||||
</div>
|
||||
<!-- Ligne 3 : outils avancés -->
|
||||
<div class="ft-row">
|
||||
<button type="button" class="ft-item" @click="fmtLink()" data-tooltip="Link">{{ fd_icon("link",15) }}</button>
|
||||
<button type="button" class="ft-item" @click="fmtHighlight()" data-tooltip="Highlight"><span class="ft-hl">S</span></button>
|
||||
<button type="button" class="ft-item ft-code-ico" @click="fmtCodeBlock()" data-tooltip="Code block"></></button>
|
||||
<button type="button" class="ft-item" @click="fmtEquation()" data-tooltip="Equation">√x</button>
|
||||
<button type="button" class="ft-item ft-more" @click="fmtMore($event)" data-tooltip="More actions">…</button>
|
||||
</div>
|
||||
<!-- Ligne 4 : Comment à gauche, réaction à droite (le ✨ Ask AI sauté :
|
||||
doublon exact du bouton du pied, même action) -->
|
||||
<div class="ft-row ft-row-split">
|
||||
<button type="button" class="ft-item ft-comment" @click="fmtComment()" data-tooltip="Comment — Ctrl+⇧+M">{{ fd_icon("message-square",15) }}<span>Comment</span></button>
|
||||
<button type="button" class="ft-item ft-react" @click="fmtReact()" data-tooltip="React to selected text"><span class="ft-react-ico">🙂<span class="ft-react-plus">+</span></span></button>
|
||||
</div>
|
||||
<!-- Section « Skills » -->
|
||||
<div class="ft-sep"></div>
|
||||
<div class="ft-group ft-skills-head">Skills</div>
|
||||
<div class="ft-skills">
|
||||
<button type="button" class="ft-item ft-skill" @click="fmtSkill('Improve the writing of this text (wording, clarity, style). Keep the meaning, language and format. Reply ONLY with the improved text.')" data-tooltip="Run on this block">Improve writing</button>
|
||||
<button type="button" class="ft-item ft-skill" @click="fmtSkill('Proofread this text: fix spelling and grammar mistakes only. Reply ONLY with the corrected text.')" data-tooltip="Run on this block">Proofread</button>
|
||||
<button type="button" class="ft-item ft-skill" @click="fmtSkill('Explain this text in simpler terms, in the same language. Reply ONLY with the explanation.')" data-tooltip="Run on this block">Explain</button>
|
||||
<button type="button" class="ft-item ft-skill" @click="fmtSkill('Reformat this text for readability (structure, spacing, lists where useful) without changing its meaning. Reply ONLY with the reformatted text.')" data-tooltip="Run on this block">Reformat</button>
|
||||
</div>
|
||||
<!-- Pied de page -->
|
||||
<div class="ft-sep"></div>
|
||||
<button type="button" class="ft-item ft-foot" @click="fmtEditAI()" data-tooltip="Edit with AI">
|
||||
<span>Edit with AI</span>
|
||||
<kbd>Alt+⇧+E</kbd>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- ═══════════ Copy Link Toast ═══════════ -->
|
||||
|
||||
@@ -180,6 +180,26 @@ body.fd-ap-resizing *{cursor:col-resize!important}
|
||||
.fd-mention-sep{font-size:10px;text-transform:uppercase;letter-spacing:.6px;color:var(--text-dim,#888);padding:8px 14px 2px}
|
||||
.fd-mention-empty,.fd-mention-load{padding:11px 12px;font-size:12px;color:var(--text-dim,#aaa);text-align:center}
|
||||
|
||||
/* Menu + (sections) — réutilise le skin du menu de mentions */
|
||||
.fd-ap-plus-menu{max-height:min(340px,60vh)}
|
||||
.fd-ap-plus-menu .fd-mention-item.disabled{opacity:.45;cursor:default;background:none}
|
||||
.fd-ap-plus-menu .fd-mention-item.disabled:hover{background:none}
|
||||
.fd-plus-head{display:flex;align-items:center;gap:8px;padding:7px 11px 6px;border-bottom:1px solid var(--border,rgba(255,255,255,.08));margin-bottom:3px}
|
||||
.fd-plus-back{background:none;border:1px solid var(--border,rgba(255,255,255,.14));color:var(--text,#ddd);border-radius:7px;width:26px;height:22px;cursor:pointer;line-height:1;flex-shrink:0}
|
||||
.fd-plus-back:hover{background:var(--bg-hover,#2b2b2b)}
|
||||
.fd-plus-title{font-size:11px;font-weight:600;color:var(--text-secondary,#ddd);text-transform:uppercase;letter-spacing:.4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
||||
.fd-plus-filter{padding:7px 11px 2px}
|
||||
.fd-plus-filter input{width:100%;background:var(--bg-tertiary,#232323);border:1px solid var(--border,rgba(255,255,255,.14));border-radius:8px;color:var(--text,#fff);font-size:12.5px;padding:6px 8px;outline:none;box-sizing:border-box}
|
||||
.fd-plus-form{padding:4px 11px 12px}
|
||||
.fd-plus-form label{display:block;font-size:10.5px;text-transform:uppercase;letter-spacing:.5px;color:var(--text-dim,#999);margin:9px 0 3px}
|
||||
.fd-plus-form input,.fd-plus-form textarea{width:100%;background:var(--bg-tertiary,#232323);border:1px solid var(--border,rgba(255,255,255,.14));border-radius:8px;color:var(--text,#fff);font-size:12.5px;padding:7px 8px;outline:none;font-family:inherit;box-sizing:border-box}
|
||||
.fd-plus-form textarea{min-height:110px;resize:vertical;line-height:1.5}
|
||||
.fd-plus-file{display:none}
|
||||
.fd-plus-chev{margin-left:auto;color:var(--text-dim,#999);opacity:.75;font-size:15px;flex-shrink:0}
|
||||
.fd-plus-crumb{display:flex;gap:5px;flex-wrap:wrap;padding:7px 11px 3px;font-size:11px;border-bottom:1px solid var(--border,rgba(255,255,255,.08));margin-bottom:3px}
|
||||
.fd-plus-crumb-it{color:var(--accent,#2383E2);cursor:pointer;white-space:nowrap}
|
||||
.fd-plus-crumb-it:hover{text-decoration:underline}
|
||||
|
||||
/* Toast */
|
||||
.fd-ap-toast{position:absolute;left:14px;right:14px;bottom:calc(100% + 10px);background:var(--bg-modal,#1c1c1c);border:1px solid rgba(35,131,226,.5);color:var(--text,#fff);font-size:12px;border-radius:9px;padding:8px 12px;box-shadow:0 10px 30px rgba(0,0,0,.45);z-index:90;display:flex;gap:8px;align-items:center;justify-content:space-between}
|
||||
.fd-ap-toast.err{border-color:rgba(227,98,98,.55)}
|
||||
@@ -380,6 +400,71 @@ body.fd-ap-resizing *{cursor:col-resize!important}
|
||||
</template>
|
||||
</template>
|
||||
</div>
|
||||
<div class="fd-ap-mention-menu fd-ap-plus-menu" :class="{show: plusOpen}" x-ref="plusMenu">
|
||||
<div class="fd-plus-head" x-show="plusSection!=='root'" x-cloak>
|
||||
<button class="fd-plus-back" type="button" @click="plusBack()" title="Retour" aria-label="Retour">←</button>
|
||||
<span class="fd-plus-title" x-text="plusTitle"></span>
|
||||
</div>
|
||||
<div class="fd-plus-filter" x-show="plusSection==='skills-gallery'" x-cloak>
|
||||
<input type="search" placeholder="Filtrer les compétences…" aria-label="Filtrer les compétences" x-model="galleryFilter">
|
||||
</div>
|
||||
<div class="fd-plus-crumb" x-show="plusSection==='browse'">
|
||||
<span class="fd-plus-crumb-it" @click="plusGoto(-1)">Racine</span>
|
||||
<template x-for="(c, ci) in plusCrumb" :key="c.id">
|
||||
<span class="fd-plus-crumb-it" @click="plusGoto(ci)" x-text="'› ' + c.name"></span>
|
||||
</template>
|
||||
</div>
|
||||
<div class="fd-mention-load" x-show="plusSection==='browse' && plusLoading" x-cloak>Chargement…</div>
|
||||
<div class="fd-mention-empty" x-show="plusSection==='browse' && !plusLoading && !plusItems.length" x-cloak>Dossier vide</div>
|
||||
<template x-for="(it, i) in plusItems" :key="it.key">
|
||||
<div>
|
||||
<div class="fd-mention-sep" x-show="it._sep" x-text="it._sep"></div>
|
||||
<div class="fd-mention-item" x-show="!it._sep" :class="{focus: i===plusFocus, disabled: !!it.disabled}"
|
||||
@click="plusAction(it)" @mouseenter="it.disabled ? null : plusFocus = i">
|
||||
<span class="fd-mention-ico" x-text="it.icon"></span>
|
||||
<div class="fd-mention-main">
|
||||
<div class="fd-mention-lbl" x-text="it.label"></div>
|
||||
<div class="fd-mention-sub" x-text="it.sub"></div>
|
||||
</div>
|
||||
<span class="fd-plus-chev" x-show="it.chev || it._folder">›</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<div class="fd-plus-form" x-show="plusSection==='skills-edit'" x-cloak>
|
||||
<label for="fd-plus-skill-name">Nom</label>
|
||||
<input id="fd-plus-skill-name" type="text" x-model="skillForm.name" placeholder="ex. synthese-reunion" @keydown.enter.prevent="saveSkill()">
|
||||
<label for="fd-plus-skill-desc">Description</label>
|
||||
<input id="fd-plus-skill-desc" type="text" x-model="skillForm.description" placeholder="Une phrase">
|
||||
<label for="fd-plus-skill-prompt">Prompt (consigne appliquée à la demande)</label>
|
||||
<textarea id="fd-plus-skill-prompt" x-model="skillForm.prompt_template" placeholder="Fais…"></textarea>
|
||||
<div class="fd-proposal-bar">
|
||||
<button class="fd-proposal-btn primary" type="button" @click="saveSkill()">✓ Enregistrer</button>
|
||||
<button class="fd-proposal-btn" type="button" x-show="skillForm.id" @click="deleteSkill()" x-cloak>✕ Supprimer</button>
|
||||
<button class="fd-proposal-btn" type="button" x-show="skillForm.id" @click="exportSkill()" x-cloak>⤓ Export</button>
|
||||
<button class="fd-proposal-btn" type="button" @click="plusBack()">← Retour</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="fd-plus-form" x-show="plusSection==='connector-new'" x-cloak>
|
||||
<label for="fd-plus-cn-kind">Type</label>
|
||||
<select id="fd-plus-cn-kind" x-model="connectorForm.kind" @change="connectorPreset()">
|
||||
<option value="custom">Connecteur personnalisé (HTTP + clé)</option>
|
||||
<option value="discord">Discord (bot)</option>
|
||||
<option value="telegram">Telegram (bot)</option>
|
||||
<option value="mcp">Serveur MCP (streamable HTTP)</option>
|
||||
</select>
|
||||
<label for="fd-plus-cn-name">Nom</label>
|
||||
<input id="fd-plus-cn-name" type="text" x-model="connectorForm.name" placeholder="ex. Base de connaissances" @keydown.enter.prevent="connectorCreate()">
|
||||
<label for="fd-plus-cn-url" x-text="connectorForm.hint || 'URL publique (hôtes privés refusés)'"></label>
|
||||
<input id="fd-plus-cn-url" type="text" x-model="connectorForm.url" placeholder="https://api.exemple.com">
|
||||
<label for="fd-plus-cn-secret">Clé / jeton — chiffrée, jamais renvoyée</label>
|
||||
<input id="fd-plus-cn-secret" type="password" x-model="connectorForm.secret" placeholder="sk-…" autocomplete="off">
|
||||
<div class="fd-proposal-bar">
|
||||
<button class="fd-proposal-btn primary" type="button" @click="connectorCreate()">✓ Ajouter</button>
|
||||
<button class="fd-proposal-btn" type="button" @click="plusBack()">← Retour</button>
|
||||
</div>
|
||||
</div>
|
||||
<input type="file" accept="application/json,.json" x-ref="skillImport" class="fd-plus-file" aria-label="Importer un skill JSON" @change="importSkillFile($event)">
|
||||
</div>
|
||||
</div>
|
||||
<div class="fd-ap-chips" x-show="contextChips.length" x-cloak>
|
||||
<div class="fd-chip-row" x-show="mentionChips.length">
|
||||
@@ -406,7 +491,7 @@ body.fd-ap-resizing *{cursor:col-resize!important}
|
||||
data-placeholder="Demandez à l'agent… Tapez @ pour référencer une page/base, / pour un skill. Entrée = envoyer, Maj+Entrée = ligne"
|
||||
@input="onInput()" @keydown="onComposerKeydown($event)" @paste="onPaste($event)"></div>
|
||||
<div class="fd-ap-toolbar">
|
||||
<button class="fd-ap-add" type="button" title="Ajouter un élément au contexte (@ / +)" @click="toggleAddPicker()">+</button>
|
||||
<button class="fd-ap-add" type="button" title="Ajouter au contexte : fichiers, répertoires, compétences…" aria-label="Menu d'ajout au contexte" aria-haspopup="menu" :aria-expanded="plusOpen" @click="toggleAddPicker()">+</button>
|
||||
<span class="fd-ap-tip" x-text="composerHint"></span>
|
||||
<div class="fd-ap-tools">
|
||||
<button class="fd-ap-model" :class="{off: !hasActiveProvider}" type="button" @click="modelOpen=!modelOpen" title="Choisir fournisseur et modèle">
|
||||
|
||||
@@ -4,15 +4,27 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>FlowDeck — {% block title_prefix %}Home{% endblock %}</title>
|
||||
<link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
|
||||
<link rel="icon" href="/static/favicon.ico" sizes="48x48">
|
||||
<link rel="manifest" href="/static/manifest.json">
|
||||
<meta name="theme-color" content="#191919">
|
||||
<link rel="apple-touch-icon" href="/static/icons/apple-touch-icon.png">
|
||||
<!-- v7.69 : identité visuelle (logo + bannière du projet) -->
|
||||
<meta name="description" content="FlowDeck — espace de travail style Notion auto-hébergé, intégré à Gitea/GitHub.">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:site_name" content="FlowDeck">
|
||||
<meta property="og:title" content="FlowDeck — votre espace Notion auto-hébergé">
|
||||
<meta property="og:description" content="Éditeur de blocs, Kanban, bases de données et intégration Gitea/GitHub, sur votre propre serveur.">
|
||||
<meta property="og:image" content="{{ app_base_url() }}/static/img/logo-512.jpg">
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<meta name="twitter:title" content="FlowDeck — votre espace Notion auto-hébergé">
|
||||
<meta name="twitter:description" content="Éditeur de blocs, Kanban, bases de données et intégration Gitea/GitHub.">
|
||||
<meta name="twitter:image" content="{{ app_base_url() }}/static/img/logo-512.jpg">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
||||
<link rel="stylesheet" href="/static/css/app.css?v={{ asset_version }}">
|
||||
<link rel="stylesheet" href="/static/css/design-tokens.css?v={{ asset_version }}">
|
||||
<link rel="stylesheet" href="/static/css/components.css?v={{ asset_version }}">
|
||||
<link rel="stylesheet" href="/static/css/settings.css?v={{ asset_version }}">
|
||||
<!-- My Tasks + page « /db » : lies dans le SHELL et non dans la zone
|
||||
swappée. Un <link> à l'intérieur de `.main-wrapper` peut être retiré par
|
||||
htmx lors d'une navigation partielle : la page revenait alors sans
|
||||
@@ -1944,6 +1956,17 @@
|
||||
this.sidebarCollapsed = !this.sidebarCollapsed;
|
||||
},
|
||||
|
||||
// Hamburger: mobile opens the drawer (assignment expressions are illegal
|
||||
// in the Alpine CSP build, hence this method), desktop toggles collapse.
|
||||
fdHamburgerClick() {
|
||||
if (window.matchMedia('(max-width: 768px)').matches) {
|
||||
this.mobileSidebarOpen = true;
|
||||
this.sidebarCollapsed = false;
|
||||
} else {
|
||||
this.toggleSidebar();
|
||||
}
|
||||
},
|
||||
|
||||
closeSidebar() {
|
||||
if (this.sidebarPeek) { this.sidebarPeek = false; return; }
|
||||
this.sidebarCollapsed = true;
|
||||
@@ -2093,9 +2116,16 @@
|
||||
case 'openTab':
|
||||
window.open('/' + pageId, '_blank');
|
||||
break;
|
||||
case 'openPeek':
|
||||
this.toast('Side peek not available in browser', 'info');
|
||||
case 'openPeek': {
|
||||
// Route vers le panneau de peek DE LA PAGE courante (même
|
||||
// éditeur allégé `?embed=1` que le bouton « ↢ Open »), jamais une
|
||||
// navigation. En dehors de ces pages : repli sur un nouvel onglet.
|
||||
var num = pageId.replace('page/', '');
|
||||
if (window._libData && window._libData.openPeekById) window._libData.openPeekById(parseInt(num));
|
||||
else if (window._wsData && window._wsData.openSidePeek) window._wsData.openSidePeek(parseInt(num));
|
||||
else window.open('/pages/' + num, '_blank');
|
||||
break;
|
||||
}
|
||||
}
|
||||
this.contextMenu.visible = false;
|
||||
},
|
||||
|
||||
@@ -0,0 +1,252 @@
|
||||
{% extends "base.html" %}
|
||||
{% block page_title %}Help{% endblock %}
|
||||
{% block title_prefix %}Help{% endblock %}
|
||||
{% block page_icon %}{{ fd_icon("help-circle",18) }}{% endblock %}
|
||||
|
||||
{% block topbar %}
|
||||
{% set page_icon = "help-circle" %}
|
||||
{% set page_title = "Help" %}
|
||||
{% include '_header.html' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{# Same panel skeleton as settings (shared /static/css/settings.css) #}
|
||||
<style>
|
||||
.help-body{margin-bottom:24px;max-width:760px;}
|
||||
.help-body p{font-size:14px;color:var(--text-secondary);line-height:1.65;margin:0 0 10px;}
|
||||
.help-body ul{margin:0 0 14px;padding-left:18px;}
|
||||
.help-body li{font-size:14px;color:var(--text-secondary);line-height:1.6;margin-bottom:4px;}
|
||||
.help-body code{background:var(--bg-tertiary);border:1px solid var(--border);border-radius:4px;padding:1px 6px;font-size:12.5px;}
|
||||
.help-body h3{font-size:13px;text-transform:uppercase;letter-spacing:.5px;color:var(--text-dim);margin:22px 0 8px;padding-bottom:4px;border-bottom:1px solid var(--border);}
|
||||
.help-kbd{display:inline-block;padding:2px 8px;background:var(--bg-tertiary);border:1px solid var(--border);border-radius:4px;font-family:monospace;font-size:12px;color:var(--text);min-width:16px;text-align:center;}
|
||||
.help-shortcut-row{display:flex;align-items:center;gap:12px;padding:8px 12px;border-radius:6px;margin-bottom:2px;}
|
||||
.help-shortcut-row:hover{background:var(--bg-hover);}
|
||||
.help-shortcut-row .keys{display:flex;gap:4px;min-width:140px;}
|
||||
.help-shortcut-row .desc{font-size:13px;color:var(--text-dim);}
|
||||
.help-badge{display:inline-block;padding:2px 10px;border-radius:20px;font-size:11px;font-weight:600;}
|
||||
.help-badge.local{background:rgba(35,131,226,.15);color:#2C8CEB;}
|
||||
.help-badge.gitea{background:rgba(0,200,100,.15);color:#00CC66;}
|
||||
.help-badge.github{background:rgba(130,80,220,.15);color:#A060F0;}
|
||||
.help-badge.sso{background:rgba(217,115,13,.18);color:#E0952B;}
|
||||
</style>
|
||||
|
||||
<!-- v7.69.3 : positionnement IDENTIQUE à la section Settings — les surcharges
|
||||
inline (position:static / background:none / panneau 1050px) faisaient
|
||||
d'Aide un bloc posé dans la page au lieu de l'overlay centré de Settings. -->
|
||||
<div class="settings-overlay" x-data="helpInit()">
|
||||
<div class="settings-panel" @keydown.escape="navOpen = false">
|
||||
<button class="settings-menu-btn" @click="navOpen = !navOpen" title="Sections" aria-label="Open sections menu">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="3" y1="6" x2="21" y2="6"/><line x1="3" y1="12" x2="21" y2="12"/><line x1="3" y1="18" x2="21" y2="18"/></svg>
|
||||
</button>
|
||||
<button class="settings-close" @click="close()" title="Close" aria-label="Close help">×</button>
|
||||
|
||||
<!-- Mobile drawer backdrop -->
|
||||
<div class="settings-nav-backdrop" x-show="navOpen" x-cloak @click="navOpen = false"></div>
|
||||
|
||||
<!-- Left navigation -->
|
||||
<div class="settings-nav" :class="{ 'nav-open': navOpen }" @click.capture="closeNavOnMobile()">
|
||||
<div class="settings-nav-header">Basics</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='start' }" @click="go('start')">🚀 Getting Started</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='editor' }" @click="go('editor')">📝 Pages & Editor</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='databases' }" @click="go('databases')">🗄️ Databases & Views</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='tasks' }" @click="go('tasks')">✅ Tasks & Dependencies</div>
|
||||
<div class="settings-nav-header">Workspace</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='workspaces' }" @click="go('workspaces')">📁 Workspaces & Forges</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='collab' }" @click="go('collab')">👥 Collaboration</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='nav' }" @click="go('nav')">📚 Library, Trash & Search</div>
|
||||
<div class="settings-nav-header">Features</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='agent' }" @click="go('agent')">🤖 AI Agent & Automations</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='integrations' }" @click="go('integrations')">🔌 Integrations & API</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='pwa' }" @click="go('pwa')">📶 Offline & PWA</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='auth' }" @click="go('auth')">🔐 Accounts & SSO</div>
|
||||
<div class="settings-nav-header">Reference</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='shortcuts' }" @click="go('shortcuts')">⌨️ Keyboard Shortcuts</div>
|
||||
<div class="settings-nav-item" :class="{ active: section==='tips' }" @click="go('tips')">💡 Tips</div>
|
||||
</div>
|
||||
|
||||
<!-- Content -->
|
||||
<div class="settings-content">
|
||||
|
||||
<div class="help-body" x-show="section==='start'">
|
||||
<h2>Getting Started</h2>
|
||||
<p>FlowDeck is your private, self-hosted Notion-style workspace — pages, databases, and Git-forge (Gitea / GitHub) integration in one app.</p>
|
||||
<h3>First steps</h3>
|
||||
<ul>
|
||||
<li>Open <b>Workspaces</b> (<code>/workspaces</code>) to pick or create a workspace — local or connected to a forge.</li>
|
||||
<li>Click <b>+ New page</b> in the sidebar to start writing, or press <span class="help-kbd">Ctrl</span>+<span class="help-kbd">N</span>.</li>
|
||||
<li>Use the <b>Agent & IA</b> section in Settings to plug an LLM provider (OpenAI, Ollama, DeepInfra…) if you want AI features.</li>
|
||||
</ul>
|
||||
<h3>The sidebar</h3>
|
||||
<ul>
|
||||
<li>The workspace header (top-left) switches workspaces and opens your account menu.</li>
|
||||
<li>Tabs <b>Home / Chat / Meetings / Inbox</b> swap the sidebar content; pages are a drag-and-drop tree.</li>
|
||||
<li>On mobile the sidebar is a drawer: open it with the hamburger button, close it by tapping outside or swiping left.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='editor'">
|
||||
<h2>Pages & Editor</h2>
|
||||
<p>Notion-style block editor: every line is a block you can drag, convert, and nest.</p>
|
||||
<h3>Blocks</h3>
|
||||
<ul>
|
||||
<li>Type <code>/</code> for the slash menu — headings, callouts, toggles, code, math (KaTeX), tables, images, embeds, ToC…</li>
|
||||
<li>Markdown shortcuts as you type: <code># </code> heading, <code>- </code> bullet, <code>1. </code> numbered, <code>> </code> quote, <code>[] </code> todo, <code>``` </code> code.</li>
|
||||
<li>Drag the handle left of a block to move or nest it; <span class="help-kbd">Tab</span>/<span class="help-kbd">Shift+Tab</span> indent/outdent.</li>
|
||||
<li>Inline formatting: bold, italic, code, links, colors via the selection toolbar.</li>
|
||||
</ul>
|
||||
<h3>Page features</h3>
|
||||
<ul>
|
||||
<li>Cover image and icon on every page (click the top of the page).</li>
|
||||
<li>Inline databases: add a table/board/calendar collection directly in a page.</li>
|
||||
<li>Comments (threaded), page history with snapshots, backlinks.</li>
|
||||
<li>Right-click any sidebar item for context menu: duplicate, rename, move, delete.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='databases'">
|
||||
<h2>Databases & Views</h2>
|
||||
<p>Collections are databases with a JSON schema, independent of Gitea. <b>21 property types</b>: title, text, number, select, multi-select, status, date, person, checkbox, url, email, phone, files, unique_id, relation, rollup, formula, and auto-properties.</p>
|
||||
<h3>Views</h3>
|
||||
<ul>
|
||||
<li><b>Table</b> — sortable columns, inline editing.</li>
|
||||
<li><b>Board (Kanban)</b> — group by select/status, drag & drop between columns.</li>
|
||||
<li><b>Calendar</b> — month grid by date property.</li>
|
||||
<li><b>Gallery</b> — visual cards, configurable card size.</li>
|
||||
<li><b>List</b> — compact rows with preview.</li>
|
||||
<li><b>Timeline</b> — Gantt bars from date ranges.</li>
|
||||
<li><b>Status Overview / Team Load</b> — donut + stacked-bar dashboards.</li>
|
||||
</ul>
|
||||
<h3>Relations, rollups, formulas</h3>
|
||||
<ul>
|
||||
<li>Relations are bidirectional: link rows across collections.</li>
|
||||
<li>Rollups aggregate related rows (12 aggregations: sum, count, average, min, max…).</li>
|
||||
<li>Formulas support 19 functions over row properties.</li>
|
||||
<li>Filters, sorts and grouping apply per-view.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='tasks'">
|
||||
<h2>Tasks & Dependencies</h2>
|
||||
<ul>
|
||||
<li>Todo blocks anywhere in pages become checkboxes; the <b>My Tasks</b> page aggregates every task in every collection you can access.</li>
|
||||
<li>My Tasks views: <b>All / Today / Overdue / Next 7 days</b>.</li>
|
||||
<li><b>Sub-items</b>: unlimited hierarchy — a parent row is Done when all children are Done (status aggregate).</li>
|
||||
<li><b>Dependencies</b>: Blocking / Blocked by between rows; transitioning a blocked task is refused until its blocker is done.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='workspaces'">
|
||||
<h2>Workspaces & Forges</h2>
|
||||
<p>Organize work into separate workspaces, each with its own page tree, collections and members.</p>
|
||||
<ul>
|
||||
<li><span class="help-badge local">Local</span> Pages and files stored on your server (SQLite under <code>/data</code>).</li>
|
||||
<li><span class="help-badge gitea">Gitea</span> Connect your Gitea account (Settings → Integrations): repos appear as workspaces, browse the file tree in the sidebar, create/edit files with commit messages, sync labels as tags.</li>
|
||||
<li><span class="help-badge github">GitHub</span> Connect via Settings → Integrations for repo browsing.</li>
|
||||
<li>Gitea legacy boards are auto-adapted into FlowDeck collections (GiteaBoardCompat).</li>
|
||||
<li>The <b>Private</b> section appears when a remote workspace is active — those pages stay local.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='collab'">
|
||||
<h2>Collaboration</h2>
|
||||
<ul>
|
||||
<li><b>Roles</b>: workspace members are admin / editor / commenter / viewer.</li>
|
||||
<li><b>Sharing</b>: the Share button (top-right of a page) — share with specific users or publish a read-only public link (<code>/p/your-slug</code>).</li>
|
||||
<li><b>Teamspaces</b> (wiki): shared knowledge spaces with their own pages.</li>
|
||||
<li><b>Meetings</b>: meeting notes with an action-items panel.</li>
|
||||
<li><b>Sprints</b>: time-box collections of tasks, with burndown-ready statuses.</li>
|
||||
<li><b>Notifications</b>: bell in the topbar for mentions, assignments, comments.</li>
|
||||
<li>Live editing: changes propagate to other open tabs (real-time sync).</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='nav'">
|
||||
<h2>Library, Trash & Search</h2>
|
||||
<ul>
|
||||
<li><b>Library</b> (<code>/library</code>) — tabs for Recents, Favorites, Shared, Published, with filtering.</li>
|
||||
<li><b>Trash</b> (<code>/trash</code>) — soft-deleted pages, 30-day retention, restore or purge.</li>
|
||||
<li><b>Ctrl+K</b> — command palette: fuzzy search across pages, jump anywhere, start an AI answer.</li>
|
||||
<li>Full-text search API: <code>/api/v2/search</code>.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='agent'">
|
||||
<h2>AI Agent & Automations</h2>
|
||||
<ul>
|
||||
<li><b>Chat sidebar</b> (Chat tab): conversations with your configured LLM; pages can be attached as context.</li>
|
||||
<li><b>Agent panel</b> on pages: propose edits, generate content, answer questions about the workspace.</li>
|
||||
<li><b>Skill marketplace</b>: export/import portable skills, install presets from the <code>/</code> gallery.</li>
|
||||
<li><b>Automations</b> (Settings → Automations): visual pipeline of trigger → condition → delay → action (webhook, notification, page update…), with run history and legacy JSON conversion.</li>
|
||||
<li>Configure providers in <b>Settings → Agent & IA</b>: per-provider API keys, model lists, offline mode without any provider.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='integrations'">
|
||||
<h2>Integrations & API</h2>
|
||||
<ul>
|
||||
<li><b>Public API v2</b> — <code>/api/v2</code>: CRUD on collections, pages, properties, views, comments, notifications, favorites, tags, sharing, sprints, templates. Bearer tokens (Settings → API tokens) with scopes <code>read</code>/<code>write</code>/<code>admin</code>, pagination, filters, sorting, idempotency keys, RFC 7807 errors. Interactive docs at <a href="/docs" target="_blank" rel="noopener">/docs</a>.</li>
|
||||
<li><b>Agent API</b> — <code>/api/v2/agents/*</code>: agents, conversations, synchronous JSON run, action journal with rollback, external trigger.</li>
|
||||
<li><b>Webhooks</b>: outgoing events (create/update/delete) managed in Settings → Integrations; incoming Gitea webhooks keep boards in sync.</li>
|
||||
<li><b>Web Clipper</b> — browser extension (Manifest V3): clip article / selection / bookmark / screenshot straight into FlowDeck.</li>
|
||||
<li><b>Import / Export</b>: CSV import, JSON/CSV/Markdown export.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='pwa'">
|
||||
<h2>Offline mode (PWA)</h2>
|
||||
<p>FlowDeck is a Progressive Web App: pages you visited stay available offline and your edits are saved locally, then synchronised when the connection returns.</p>
|
||||
<ul>
|
||||
<li><b>Install:</b> browser menu → <i>Install app</i> (Chrome/Edge) or <i>Add to Home Screen</i> (Safari/iOS).</li>
|
||||
<li><b>Offline editing:</b> while offline, the editor stores changes in the browser (IndexedDB) and shows an offline banner with the number of pending changes. A ⟳ icon marks pages with unsynced edits.</li>
|
||||
<li><b>Reconnection:</b> the queue is replayed automatically (and via Background Sync); a spinner badge appears while syncing, then a confirmation toast.</li>
|
||||
<li><b>Conflicts:</b> the latest edit wins with a notice; server-side-deleted pages are recreated as orphan pages; title collisions get an <i>“…(copie offline)”</i> suffix.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='auth'">
|
||||
<h2>Accounts & SSO</h2>
|
||||
<p>
|
||||
<span class="help-badge local">Local</span> Email + password — create an account on the login page.<br><br>
|
||||
<span class="help-badge gitea">Gitea OAuth</span> / <span class="help-badge github">GitHub OAuth</span> — sign in with your forge; your repos become workspaces. You can link a forge to an existing local account — your identity stays local.<br><br>
|
||||
<span class="help-badge sso">SSO</span> <b>Enterprise SSO</b> — in <b>Settings → Admin → SSO / Enterprise</b>:
|
||||
</p>
|
||||
<ul>
|
||||
<li><b>SAML 2.0</b> — paste IdP Entity ID, SSO URL and signing certificate; give the IdP your <code>/auth/saml/metadata</code> link.</li>
|
||||
<li><b>OpenID Connect</b> — Issuer URL, Client ID and Client Secret (PKCE, scopes <code>openid profile email</code>).</li>
|
||||
<li>Just-in-time provisioning, IdP groups mapped to workspace roles, <i>SSO only</i> mode disables local login (admins keep their door). Every attempt is audited in the login history.</li>
|
||||
</ul>
|
||||
<p>Sessions and API tokens are managed in Settings → Sessions / API tokens.</p>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='shortcuts'">
|
||||
<h2>Keyboard Shortcuts</h2>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Ctrl</span>+<span class="help-kbd">K</span></div><div class="desc">Command palette / quick find</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Ctrl</span>+<span class="help-kbd">N</span></div><div class="desc">Create new page</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Ctrl</span>+<span class="help-kbd">S</span></div><div class="desc">Save current page</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Ctrl</span>+<span class="help-kbd">O</span></div><div class="desc">New AI chat (footer)</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">/</span></div><div class="desc">Slash command menu (in editor)</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">F2</span></div><div class="desc">Rename selected item</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Delete</span></div><div class="desc">Move selected item to trash</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Enter</span></div><div class="desc">Open selected page</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Tab</span> / <span class="help-kbd">Shift</span>+<span class="help-kbd">Tab</span></div><div class="desc">Indent / outdent block</div></div>
|
||||
<div class="help-shortcut-row"><div class="keys"><span class="help-kbd">Escape</span></div><div class="desc">Close modal / cancel editing</div></div>
|
||||
</div>
|
||||
|
||||
<div class="help-body" x-show="section==='tips'">
|
||||
<h2>Tips</h2>
|
||||
<ul>
|
||||
<li>Toggle the desktop sidebar with the « button; collapsed, hover the left edge to peek it.</li>
|
||||
<li><b>Ctrl+Click</b> / <b>Shift+Click</b> multi-select in the sidebar tree.</li>
|
||||
<li>Hover any sidebar item for quick actions (favorite, share, delete).</li>
|
||||
<li>Drag pages into the tree to reorganize; drop onto a page to nest it.</li>
|
||||
<li>The section <b>⋮</b> menus reorder or hide sidebar sections to taste.</li>
|
||||
<li>Dark/light theme toggle is in the topbar and persists across reloads.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script data-cfasync="false" src="/static/js/help.js?v={{ asset_version }}"></script>
|
||||
{% endblock %}
|
||||
@@ -4,7 +4,7 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Importer — FlowDeck</title>
|
||||
<link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
|
||||
<link rel="icon" href="/static/favicon.ico" sizes="48x48">
|
||||
<script src="/static/js/alpine.csp.min.js" defer data-cfasync="false"></script>
|
||||
<style>
|
||||
:root{--bg:#191919;--bg2:#1F1F1F;--bg3:#2D2D2D;--border:#333;--text:#fff;--dim:#9B9A97;--accent:#2383E2;--accent-h:#1a6bc0;--success:#0F7B6C;--danger:#E03E3E;--warn:#D9730D;}
|
||||
|
||||
@@ -5,12 +5,23 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
{% from '_icons.html' import fd_icon %}
|
||||
<title>FlowDeck — All-in-one workspace</title>
|
||||
<link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
|
||||
<link rel="icon" href="/static/favicon.ico" sizes="48x48">
|
||||
<link rel="manifest" href="/static/manifest.json">
|
||||
<meta name="theme-color" content="#191919">
|
||||
<link rel="apple-touch-icon" href="/static/icons/apple-touch-icon.png">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
||||
<!-- v7.69 : identité visuelle — la landing est la page la plus partagée -->
|
||||
<meta name="description" content="FlowDeck — espace de travail style Notion auto-hébergé, intégré à Gitea/GitHub. Éditeur de blocs, Kanban, bases de données.">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:site_name" content="FlowDeck">
|
||||
<meta property="og:title" content="FlowDeck — votre espace Notion auto-hébergé">
|
||||
<meta property="og:description" content="Éditeur de blocs, Kanban, bases de données et intégration Gitea/GitHub, sur votre propre serveur.">
|
||||
<meta property="og:image" content="{{ app_base_url() }}/static/img/logo-512.jpg">
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<meta name="twitter:title" content="FlowDeck — votre espace Notion auto-hébergé">
|
||||
<meta name="twitter:description" content="Éditeur de blocs, Kanban, bases de données et intégration Gitea/GitHub.">
|
||||
<meta name="twitter:image" content="{{ app_base_url() }}/static/img/logo-512.jpg">
|
||||
<style>
|
||||
:root {
|
||||
--bg: #191919;
|
||||
@@ -112,6 +123,22 @@
|
||||
padding:12px 28px;
|
||||
}
|
||||
|
||||
/* v7.69 : identité visuelle */
|
||||
.brand-mark{border-radius:7px;flex:none;}
|
||||
.hero-visual{
|
||||
max-width:1060px;
|
||||
margin:0 auto 72px;
|
||||
padding:0 32px;
|
||||
}
|
||||
.hero-visual img{
|
||||
width:100%;
|
||||
height:auto;
|
||||
display:block;
|
||||
border-radius:14px;
|
||||
border:1px solid var(--border);
|
||||
box-shadow:0 30px 70px -30px rgba(0,0,0,.5);
|
||||
}
|
||||
|
||||
/* Features grid */
|
||||
.features{
|
||||
display:grid;
|
||||
@@ -148,7 +175,7 @@
|
||||
|
||||
<nav class="landing-nav">
|
||||
<a href="/" class="landing-logo">
|
||||
<span>{{ fd_icon("book",20) }}</span> FlowDeck
|
||||
<img class="brand-mark" src="/static/img/logo.webp" alt="" width="26" height="26"> FlowDeck
|
||||
</a>
|
||||
<div class="landing-nav-actions">
|
||||
<a href="/auth/login?provider=local" class="btn btn-secondary">Log in</a>
|
||||
@@ -169,6 +196,14 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- v7.69 : bannière du projet (asset optimisé : WebP 22 KB, JPEG en secours) -->
|
||||
<div class="hero-visual">
|
||||
<picture>
|
||||
<source srcset="/static/img/banner.webp" type="image/webp">
|
||||
<img src="/static/img/banner.jpg" alt="FlowDeck — éditeur de blocs, Kanban et bases de données" width="2400" height="793" loading="lazy" decoding="async">
|
||||
</picture>
|
||||
</div>
|
||||
|
||||
<div class="features">
|
||||
<div class="feature-card">
|
||||
<div class="feature-icon">{{ fd_icon("edit",24) }}</div>
|
||||
|
||||
@@ -150,7 +150,7 @@
|
||||
.peek-header button{background:transparent;border:none;color:var(--text-secondary);cursor:pointer;padding:6px;border-radius:4px;font-size:13px;display:flex;align-items:center;}
|
||||
.peek-header button:hover{background:var(--bg-hover);color:var(--text-primary);}
|
||||
.peek-header button svg{width:15px;height:15px;}
|
||||
.peek-body{flex:1;overflow-y:auto;padding:16px 20px;}
|
||||
.peek-body{flex:1;overflow:hidden;padding:0;}
|
||||
.peek-body .peek-empty{text-align:center;padding:60px 20px;color:var(--text-dim);}
|
||||
.peek-loading{text-align:center;padding:40px;color:var(--text-dim);}
|
||||
|
||||
@@ -450,8 +450,8 @@
|
||||
<!-- Le corps et l'iframe sont HORS du <template x-if> : ils existent donc en
|
||||
permanence, ce qui permet de piloter `src` en JS (le build CSP
|
||||
d'Alpine n'evalue pas le binding `:src` — l'iframe restait donc vide).
|
||||
Charger `/pages/{id}` sans `?embed=1` : c'est exactement l'editeur
|
||||
plein ecran, le peek n'est plus une variante allegee. -->
|
||||
Charger `/pages/{id}?embed=1` : le peek affiche uniquement le
|
||||
document en mode edition, sans sidebar ni barre de navigation. -->
|
||||
<div class="peek-body" style="flex:1;display:flex;flex-direction:column;min-height:0;">
|
||||
<div class="peek-loading" id="lib-peek-loading">Chargement…</div>
|
||||
<iframe id="lib-peek-iframe" src="about:blank" title="Document" style="width:100%;height:100%;border:none;flex:1;min-height:0;"></iframe>
|
||||
|
||||
@@ -8,4 +8,9 @@
|
||||
{% endblock %}
|
||||
{% block scripts %}
|
||||
{% include '_page_editor_scripts.html' %}
|
||||
{# database_table.js = FlowDeckDB + le panneau de peek des bases : sans cet
|
||||
include, une base embarquée dans un document restait bloquée à
|
||||
« Loading database… » dans le peek et l'icône Open de fin de ligne ne
|
||||
faisait rien. #}
|
||||
{% include '_database_table_scripts.html' %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
{% from '_icons.html' import fd_icon %}
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>{{ title }} — FlowDeck</title>
|
||||
<link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
|
||||
<link rel="icon" href="/static/favicon.ico" sizes="48x48">
|
||||
<style>
|
||||
:root {
|
||||
--bg: #191919;
|
||||
|
||||
@@ -11,16 +11,6 @@
|
||||
|
||||
{% block content %}
|
||||
<style>
|
||||
.settings-overlay{position:fixed;inset:0;z-index:500;display:flex;background:rgba(0,0,0,.4);backdrop-filter:blur(2px);}
|
||||
.settings-panel{display:flex;width:1050px;max-width:98vw;height:85vh;margin:auto;background:var(--bg-primary);border:1px solid var(--border-strong);border-radius:14px;box-shadow:var(--shadow-modal);overflow:hidden;}
|
||||
.settings-nav{width:200px;min-width:200px;background:var(--bg-sidebar);border-right:1px solid var(--border);padding:8px 0;overflow-y:auto;}
|
||||
.settings-nav-header{padding:12px 16px;font-size:13px;font-weight:600;color:var(--text-dim);text-transform:uppercase;letter-spacing:.5px;}
|
||||
.settings-nav-item{display:flex;align-items:center;gap:8px;padding:6px 16px;font-size:13px;color:var(--text-secondary);cursor:pointer;transition:background 100ms;border-radius:0;}
|
||||
.settings-nav-item:hover{background:var(--bg-hover);}
|
||||
.settings-nav-item.active{background:rgba(35,131,226,.12);color:var(--text);font-weight:500;}
|
||||
.settings-content{flex:1;overflow-y:auto;padding:24px 32px;}
|
||||
.settings-content h2{font-size:18px;font-weight:600;margin-bottom:4px;}
|
||||
.settings-content .section-desc{font-size:12px;color:var(--text-dim);margin-bottom:24px;}
|
||||
.setting-group{margin-bottom:28px;}
|
||||
.setting-group h3{font-size:12px;text-transform:uppercase;letter-spacing:.5px;color:var(--text-dim);margin-bottom:8px;padding-bottom:4px;border-bottom:1px solid var(--border);}
|
||||
.setting-row{display:flex;align-items:center;justify-content:space-between;padding:10px 0;border-bottom:1px solid var(--border);}
|
||||
@@ -69,9 +59,7 @@
|
||||
.status-dot.active{background:var(--toast-success-bg);}
|
||||
.status-dot.inactive{background:var(--danger);}
|
||||
|
||||
/* Close button */
|
||||
.settings-close{position:absolute;top:12px;right:12px;width:32px;height:32px;background:none;border:none;color:var(--text-dim);font-size:20px;cursor:pointer;border-radius:6px;display:flex;align-items:center;justify-content:center;}
|
||||
.settings-close:hover{background:var(--bg-hover);color:var(--text);}
|
||||
/* Close button — shared styles in /static/css/settings.css */
|
||||
|
||||
/* Agent & IA — status summary + provider cards */
|
||||
.llm-summary{display:flex;gap:14px;align-items:flex-start;background:var(--bg-tertiary);border:1px solid var(--border);border-radius:12px;padding:14px 16px;margin-bottom:22px;flex-wrap:wrap;}
|
||||
@@ -125,26 +113,32 @@
|
||||
.llm-detail .prov-field-row{margin-top:12px;}
|
||||
.llm-detail-empty{display:flex;align-items:center;justify-content:center;height:260px;font-size:13px;color:var(--text-dim);text-align:center;padding:0 20px;}
|
||||
@media (max-width:760px){.llm-layout{grid-template-columns:1fr;}.llm-list{max-height:220px;}}
|
||||
|
||||
/* ── Mobile side-nav drawer: shared settings.css handles overlay/nav/panel ── */
|
||||
</style>
|
||||
|
||||
<div class="settings-overlay" x-data="settingsInit()" @keydown.escape="historyBack()">
|
||||
<div class="settings-panel" style="position:relative;">
|
||||
<div class="settings-overlay" x-data="settingsInit()">
|
||||
<div class="settings-panel" style="position:relative;" @keydown.escape="historyBack()">
|
||||
<button class="settings-menu-btn" @click="navOpen = !navOpen" title="Sections" aria-label="Open sections menu">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="3" y1="6" x2="21" y2="6"/><line x1="3" y1="12" x2="21" y2="12"/><line x1="3" y1="18" x2="21" y2="18"/></svg>
|
||||
</button>
|
||||
<button class="settings-close" @click="closeSettings()" title="Close">×</button>
|
||||
|
||||
<!-- Left navigation -->
|
||||
<div class="settings-nav">
|
||||
<!-- Left navigation (mobile: side-navigation drawer via hamburger + backdrop) -->
|
||||
<div class="settings-nav-backdrop" x-show="navOpen" x-cloak @click="navOpen = false"></div>
|
||||
<div class="settings-nav" :class="{ 'nav-open': navOpen }" @click.capture="closeNavOnMobile()">
|
||||
<div class="settings-nav-header">Account</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='account' }" @click="activeSection='account'"><span class="nav-icon-inline">{{ fd_icon("user",14) }}</span> My account</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='notifications' }" @click="activeSection='notifications'"><span class="nav-icon-inline">{{ fd_icon("bell",14) }}</span> Notifications</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='api-tokens' }" @click="navTo('api-tokens')"><span class="nav-icon-inline">{{ fd_icon("key",14) }}</span> API tokens</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='sessions' }" @click="navTo('sessions')"><span class="nav-icon-inline">{{ fd_icon("users",14) }}</span> Sessions</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='extensions' }" @click="navTo('extensions')"><span class="nav-icon-inline">{{ fd_icon("zap",14) }}</span> Extensions</div>
|
||||
{% if plugin_enabled('web-clipper') %}<div class="settings-nav-item" :class="{ active: activeSection==='extensions' }" @click="navTo('extensions')"><span class="nav-icon-inline">{{ fd_icon("zap",14) }}</span> Extensions</div>{% endif %}
|
||||
<div class="settings-nav-header">Workspace</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='workspace' }" @click="activeSection='workspace'">{{ fd_icon("file",14) }} General</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='tags' }" @click="activeSection='tags'">{{ fd_icon("tag",14) }} Tags</div>
|
||||
<div class="settings-nav-header">Features</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='features' }" @click="activeSection='features'">{{ fd_icon("link",14) }} Integrations</div>
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='automations' }" @click="navTo('automations')">{{ fd_icon("zap",14) }} Automations</div>
|
||||
{% if plugin_enabled('automations') %}<div class="settings-nav-item" :class="{ active: activeSection==='automations' }" @click="navTo('automations')">{{ fd_icon("zap",14) }} Automations</div>{% endif %}
|
||||
<div class="settings-nav-item" :class="{ active: activeSection==='llm' }" @click="activeSection='llm'">{{ fd_icon("bot",14) }} Agent & IA</div>
|
||||
<!-- Admin nav: only visible to admins -->
|
||||
<template x-if="userIsAdmin">
|
||||
@@ -423,7 +417,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Extensions (Web Clipper) -->
|
||||
<div x-show="activeSection==='extensions'">
|
||||
<div x-show="{{ 'true' if plugin_enabled('web-clipper') else 'false' }} && activeSection==='extensions'">
|
||||
<h2>Extensions</h2>
|
||||
<p class="section-desc">FlowDeck Web Clipper — capture web content directly into FlowDeck. Manage connected browsers.</p>
|
||||
<div class="setting-group">
|
||||
@@ -584,7 +578,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Automations -->
|
||||
<div x-show="activeSection==='automations'">
|
||||
<div x-show="{{ 'true' if plugin_enabled('automations') else 'false' }} && activeSection==='automations'">
|
||||
<h2>Automations</h2>
|
||||
<p class="section-desc">Règles if-this-then-that : déclencheur + condition + action. Utilisables aussi via le bloc bouton dans l'éditeur de page.</p>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Bienvenue sur FlowDeck</title>
|
||||
<link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
|
||||
<link rel="icon" href="/static/favicon.ico" sizes="48x48">
|
||||
<script src="/static/js/alpine.csp.min.js" defer data-cfasync="false"></script>
|
||||
<style>
|
||||
:root{--bg:#191919;--bg2:#1F1F1F;--bg3:#2D2D2D;--border:#333;--text:#fff;--dim:#9B9A97;--accent:#2383E2;--accent-h:#1a6bc0;--success:#0F7B6C;--danger:#E03E3E;}
|
||||
|
||||
@@ -77,3 +77,23 @@ except OSError: # pragma: no cover
|
||||
ENV.globals["asset_version"] = ASSET_VERSION
|
||||
ENV.globals["csp_nonce"] = lambda: CSP_NONCE.get()
|
||||
ENV.globals["csrf_token"] = lambda: CSRF_TOKEN.get()
|
||||
# Plugins activés : conditionne les blocs de UI rendus côté serveur.
|
||||
ENV.globals["plugin_enabled"] = lambda slug: _plugin_enabled(slug)
|
||||
# v7.69 : URL de base absolue pour og:image / twitter:image — les crawlers
|
||||
# ignorent les URL relatives. Lecture paresseuse comme _plugin_enabled
|
||||
# (évite l'import circulaire au chargement du module). Même source que les
|
||||
# liens de partage de pages (collaboration.py) : si elle est mal renseignée,
|
||||
# ces liens le sont déjà.
|
||||
ENV.globals["app_base_url"] = lambda: _app_base_url()
|
||||
|
||||
|
||||
def _app_base_url() -> str:
|
||||
from app.config import settings
|
||||
|
||||
return (settings.app_base_url or "").rstrip("/")
|
||||
|
||||
|
||||
def _plugin_enabled(slug: str) -> bool:
|
||||
from app.services.plugins import is_enabled
|
||||
|
||||
return is_enabled(slug)
|
||||
|
||||
|
After Width: | Height: | Size: 1.6 MiB |
|
After Width: | Height: | Size: 1.1 MiB |
@@ -0,0 +1,253 @@
|
||||
# V74 — Menu + de l'assistant : hub de contexte (design)
|
||||
|
||||
> **Statut** : design — **phases 1 à 6 livrées (v7.51.0 → v7.56.0, 2026-10-06)** ;
|
||||
> phases 7-8 restent à livrer. La **mémoire** a été simplifiée par rapport au
|
||||
> modèle ici : une seule ligne résumé **par conversation** (pas de lignes
|
||||
> `workspace_id NULL` — rien ne les écrivait), extraction déterministe sans LLM. Adaptations faites en cours de route : le parcours
|
||||
> utilise `GET /api/nav/menu?parent_id=` (un niveau par appel, contrat
|
||||
> dossier = `icon === 'folder'`), la gestion des skills est une **section du menu
|
||||
> avec formulaire intégré** (pas une modale — `PATCH /api/agent/skills/{id}`
|
||||
> ajouté), et les canevas vivent sous **`/board/api/page-templates`** (prefix
|
||||
> `/board`) avec la nouvelle route `GET …/{id}/blocks` pour l'insertion.
|
||||
> **Plan phasé** : `ROADMAP.md` → section « v7.51.0 → v7.58.0 — Menu + de l'assistant ».
|
||||
> **Date** : 2026-10-06 · Version cible de départ : **v7.51.0** (phase 1).
|
||||
|
||||
---
|
||||
|
||||
## 1. Objectif
|
||||
|
||||
Le bouton **+** du panneau agent (`app/templates/agent_panel.html:409`) ouvre
|
||||
aujourd'hui une liste plate de fichiers/pages/bases à épingler en contexte. On le
|
||||
transforme en **menu à sections à deux niveaux** :
|
||||
|
||||
```
|
||||
+ ┌──────────────────────────────────────────────────────┐
|
||||
│ 📎 Ajouter des fichiers ou répertoires › │ → picker actuel + « Parcourir… »
|
||||
│ ✨ Compétences-skills › │ → Deep research, Skill-creator, …
|
||||
│ │ ────────────────
|
||||
│ │ Gérer les compétences
|
||||
│ │ Parcourir les compétences
|
||||
│ 🔌 Connecteurs › │ → Parcourir les connecteurs
|
||||
│ │ Ajouter un connecteur personnalisé
|
||||
│ 🎨 Design System – Canevas › │ → liste des canevas
|
||||
│ 🧩 Add plugins │ → catalogue on/off (modale)
|
||||
│ 🧠 Mémoire [◉/○] │ → toggle persisté
|
||||
└──────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
Règle d'or : **chaque entrée vit dans la même phase qui la rend réelle**. Tant qu'une
|
||||
section n'est pas livrée, elle s'affiche grisée « Bientôt (phase N) » — le menu ne
|
||||
promet rien que le code ne fait.
|
||||
|
||||
## 2. État des lieux (lu dans le code, 2026-10-06)
|
||||
|
||||
| Section | Existe | Manque |
|
||||
|---|---|---|
|
||||
| Fichiers / répertoires | `GET /api/agent/mentions` (`app/routers/agent.py:596`) → documents, collections, pages ; jetons `document:id`, `collection:id`, `page:id` résolus par `ContextBuilder._mentions_context` (`app/services/context_builder.py:120`) | Sous-menu, mode parcours d'arborescence, jeton `folder:<id>` |
|
||||
| Compétences | `agent_skills` CRUD (`/api/agent/skills` : GET/POST/DELETE, apply, import/export), galerie de 17 presets (`app/services/skill_gallery.py`), 11 skills builtin (`FD_SKILLS`, `static/js/agent_panel_2.js:11`) | UI « Gérer » (CRUD complet : **`PATCH /skills/{id}` à créer**), UI « Parcourir » (la galerie n'est accessible que via la palette `/`), libellés affichés type « Deep research » |
|
||||
| Canevas | `GET /api/page-templates` (built-ins `app/services/block_templates.py` + personnels), `POST /api/page-templates/{id}/use` (`app/routers/board/page_api.py:75,135`) | Menu dans le panneau agent, action « insérer dans le document ouvert », canevas « design system » |
|
||||
| Connecteurs | Rien (0 hit `connector` dans `app/`). Natifs déjà branchés ailleurs : Gitea (`gitea_client.py`), GitHub (`github_adapter.py`), Web (`web_search.py` + tool `fetch_url` v7.46) | Table, service d'adapters, catalogue UI, tools agent, OAuth Google/M365, Discord/Telegram, MCP |
|
||||
| Plugins | Rien | Registre, catalogue UI, **câblage réel** (désactivation effective) |
|
||||
| Mémoire | Rien (l'historique de la conversation est déjà envoyé, ce n'est pas de la mémoire) | Table, service d'extraction, injection conditionnelle, toggle persisté |
|
||||
|
||||
## 3. Découpage front (Alpine)
|
||||
|
||||
Tout vit dans `static/js/agent_panel_2.js` (composant `agentPanel()`) + un bloc de
|
||||
markup dans `app/templates/agent_panel.html`, sans nouveau fichier JS.
|
||||
|
||||
**État ajouté**
|
||||
|
||||
```js
|
||||
plusOpen: false, // menu ouvert
|
||||
plusSection: 'root', // 'root' | 'files' | 'skills' | 'connectors' | 'canvases'
|
||||
plusFocus: -1, // index de l'item focalisé
|
||||
plusItems: [], // items de la section courante (fetch si besoin)
|
||||
memoryOn: true, // état du toggle (phase 4)
|
||||
```
|
||||
|
||||
**Items = données, pas du markup en dur** : un tableau `FD_PLUS_MENU`
|
||||
`{key, icon, label, sub, action, phase}` → le rendu et la navigation clavier
|
||||
(↑/↓/Entrée/Échap) sont une seule boucle. Les sections `phase > livrée` sont
|
||||
`disabled: true`.
|
||||
|
||||
**Réemploi** : le conteneur et les styles `.fd-ap-mention-menu` /
|
||||
`.fd-mention-item` (`agent_panel.html:171-181`) servent déjà exactement ce
|
||||
comportement — on duplique le CSS minimal (`.fd-plus-*`) et on garde la logique de
|
||||
focus/scroll (`moveMentionFocus`, `_scrollMentionItem`) comme modèle.
|
||||
|
||||
**Entrées existantes préservées** : la touche `@` dans le composer et le mode
|
||||
recherche du `+` continuent de fonctionner à l'identique (régression zéro) ; le `+`
|
||||
devient seulement *l'entrée en menu* au lieu d'ouvrir directement la liste.
|
||||
|
||||
## 4. Backend par phase
|
||||
|
||||
| Phase | Existant réutilisé | À créer |
|
||||
|---|---|---|
|
||||
| 1 — menu + fichiers/répertoires | `/api/agent/mentions`, `/api/local-workspace/tree?folder=`, enfants de page (`parent_id`, `local_workspace.py:243`) | Route(s) de parcours adaptée(s) au panneau (shape items compatible mention), jeton `folder:<id>` dans `ContextBuilder` |
|
||||
| 2 — compétences | `/api/agent/skills` (GET/POST/DELETE/apply/import/export), `/api/agent/skills/gallery` + install | `PATCH /api/agent/skills/{id}` (édition), 2 modales |
|
||||
| 3 — canevas | `/api/page-templates` (GET/POST/use) | Insersion dans l'éditeur ouvert (API d'insertion de blocs de l'éditeur), presets « design system » dans `block_templates.py` |
|
||||
| 4 — mémoire | `ContextBuilder`, `PATCH /conversations/{id}` (pattern du toggle) | Table `agent_memory`, `app/services/agent_memory.py`, colonne `conversations.memory_enabled`, config `AGENT_MEMORY_DEFAULT` |
|
||||
| 5 — connecteurs (socle) | `_is_public_host` (SSRF), `encrypt_secret` (`sso_provisioning.py:51`), `http_client.shared_client`, `tool_registry` | Table `agent_connectors`, `app/services/connectors/`, 3 adapters natifs (gitea/github/web), catalogue UI |
|
||||
| 6 — Google + M365 | `auth/oauth.py` (client OAuth2), `encrypt_secret`, `shared_client` | Flows PKCE Google + Microsoft Graph, table de tokens (motif `calendar_sync.py:38`), écran connecteur |
|
||||
| 7 — Discord / Telegram / Teams / MCP | Graph (phase 6), pattern de tools dynamiques du registre | 3 adapters + client MCP (`initialize`, `tools/list`, `tools/call`) |
|
||||
| 8 — plugins | — | Table `plugins`, catalogue UI, désactivation réelle (routes + UI) |
|
||||
|
||||
## 5. Modèle de données
|
||||
|
||||
```sql
|
||||
-- Phase 4 — mémoire
|
||||
ALTER TABLE conversations ADD COLUMN memory_enabled INTEGER NOT NULL DEFAULT 1;
|
||||
CREATE TABLE agent_memory (
|
||||
id INTEGER PRIMARY KEY,
|
||||
workspace_id INTEGER NOT NULL,
|
||||
conversation_id INTEGER, -- NULL = mémoire d'espace (partagée)
|
||||
kind TEXT NOT NULL DEFAULT 'summary', -- summary | fact
|
||||
content TEXT NOT NULL,
|
||||
created_at TEXT NOT NULL,
|
||||
updated_at TEXT NOT NULL
|
||||
);
|
||||
CREATE INDEX idx_agent_memory_ws ON agent_memory(workspace_id, conversation_id);
|
||||
|
||||
-- Phase 5 — connecteurs
|
||||
CREATE TABLE agent_connectors (
|
||||
id INTEGER PRIMARY KEY,
|
||||
workspace_id INTEGER,
|
||||
kind TEXT NOT NULL, -- gitea | github | web | google | ms365 | discord | telegram | mcp | custom
|
||||
name TEXT NOT NULL,
|
||||
config_json TEXT NOT NULL DEFAULT '{}', -- URL, scopes, channels…
|
||||
secret_encrypted TEXT, -- Fernet (encrypt_secret, sso_provisioning.py:51)
|
||||
enabled INTEGER NOT NULL DEFAULT 1,
|
||||
status TEXT NOT NULL DEFAULT 'unknown', -- ok | error | unknown
|
||||
last_probe_at TEXT,
|
||||
created_by INTEGER
|
||||
);
|
||||
|
||||
-- Phase 8 — plugins
|
||||
CREATE TABLE plugins (
|
||||
slug TEXT PRIMARY KEY, -- web-tools | web-clipper | automations | …
|
||||
enabled INTEGER NOT NULL DEFAULT 1,
|
||||
updated_at TEXT NOT NULL
|
||||
);
|
||||
```
|
||||
|
||||
Migrations ajoutées dans `app/migrations.py` (motif `_migration_*` existant,
|
||||
transaction par migration — A31).
|
||||
|
||||
## 6. Sécurité (non négociable)
|
||||
|
||||
- **SSRF** : toute URL de connecteur passée par `_is_public_host`
|
||||
(`app/services/importers/url_fetch.py`), re-vérifiée à chaque saut de redirection.
|
||||
- **Secrets** : jamais en clair, jamais renvoyés par l'API (champ retiré des
|
||||
sérialiseurs) — `encrypt_secret()` existant, dérivé de `app_secret_key`.
|
||||
- **Auth + CSRF** : session requise sur tout CUD ; `/api/agent` est sur la liste des
|
||||
préfixes CSRF cookie → header `X-CSRF-Token` sur les nouveaux `fetch` (helper
|
||||
`getCsrf()`).
|
||||
- **Borne de tokens** : la mémoire et les sources de connecteurs injectées dans le
|
||||
contexte sont tronquées (budget explicite) — sinon la phase 4 fait exploser le
|
||||
coût de chaque run.
|
||||
- **Plugins OFF = effet réel** : un simple drapeau affiché serait un menu qui ment
|
||||
(règle du projet).
|
||||
|
||||
## 7. Décisions techniques
|
||||
|
||||
- **D1 — Un seul menu, deux niveaux** (pas de modale racine) : ouverture instantanée,
|
||||
clavier, et le `+` reste un geste unique. Les modales ne servent qu'aux écrans
|
||||
lourds (Gérer / Parcourir / Connecteurs / Plugins).
|
||||
- **D2 — Pas de nouveau fichier JS** : tout dans `agent_panel_2.js` + markup du
|
||||
template, conforme à l'extraction A27 (un fichier par bloc).
|
||||
- **D3 — États « Bientôt » visibles** plutôt que sections masquées : le menu sert de
|
||||
spec vivante et évite d'implémenter6 features d'un coup.
|
||||
- **D4 — La mémoire est un résumé structuré, pas l'historique brut** : réinvoquer
|
||||
tout l'historique à chaque run coûterait plus cher que la réponse ; un résumé borné
|
||||
(~1–2 k tokens) + les faits saillants suffisent, avec repli déterministe hors-ligne
|
||||
(motif `ai_writing.py`).
|
||||
- **D5 — Connecteurs = registry + adapters** (interface `probe/list_sources/fetch`),
|
||||
pas un if par provider : la phase 7 (MCP) ajoute des adapters sans toucher au socle.
|
||||
- **D6 — Canevas : « créer » par défaut, « insérer » seulement si un document est
|
||||
ouvert** — l'insertion dans l'éditeur est le point le plus fragile (blocs +
|
||||
sélection), donc livrée en second dans la phase 3.
|
||||
- **D7 — Pas de dépendance ajoutée** : OAuth via `httpx` (`shared_client`), chiffrement
|
||||
via `cryptography` déjà présent, MCP en HTTP direct.
|
||||
|
||||
## 8. Pièges du repo à respecter
|
||||
|
||||
- `ROADMAP.md` / `CHANGELOG.md` sont en **CRLF** : `patch` exige des lignes complètes.
|
||||
- **Routes statiques avant les wildcards** (`/skills/gallery` avant `/skills/{id}`),
|
||||
sinon 422 sur un id non numérique.
|
||||
- **Events `AgentEngine.run()` plats** (`{"type": …, "content": …}`), pas enveloppés
|
||||
dans `data`.
|
||||
- Bumper **`VERSION` + `app/main.py`** à chaque phase, régénérer
|
||||
`docs/openapi-v2.json` (CRLF, sans newline final) si de nouvelles routes sortent.
|
||||
- Le panneau agent est rendu sur **toutes les pages** (`base.html:2555`) : le JS doit
|
||||
rester défensif (`window.appState` absent, page non authentifiée).
|
||||
|
||||
## 9. Critères d'acceptation par phase
|
||||
|
||||
1. **Phase 1** : le `+` ouvre le menu, « Parcourir… » montre l'arborescence, un
|
||||
dossier épinglé apparaît en chip et son contenu est bien dans le contexte du run.
|
||||
2. **Phase 2** : créer/éditer/supprimer un skill depuis la modale, l'installer depuis
|
||||
la galerie, il apparaît dans la palette `/` et le sous-menu.
|
||||
3. **Phase 3** : choisir un canevas crée la page (et l'insertion dans le document
|
||||
ouvert fonctionne quand un doc est édité).
|
||||
4. **Phase 4** : ON → la mémoire est injectée (test qui le prouve) ; OFF → absente ;
|
||||
l'état survit au rechargement et au changement de conversation.
|
||||
5. **Phase 5** : connecteur créé/testé/supprimé, URL privée refusée (SSRF), tool
|
||||
exposé au LLM avec le bon schéma.
|
||||
6. **Phase 6** : connexion Google et Microsoft, refresh, déconnexion, aucun appel
|
||||
réseau réel dans les tests.
|
||||
7. **Phase 7** : Discord/Telegram branchés, MCP `tools/list` → outils visibles dans le
|
||||
registre.
|
||||
8. **Phase 8** : plugin OFF = route refusée + UI disparue (test de non-réintroduction).
|
||||
|
||||
Chaque phase se clôt par : `ruff` + suite verte, bump de version, CHANGELOG, ROADMAP
|
||||
à jour, tag.
|
||||
|
||||
## 9bis. Avenant phase 7 (v7.57.0) — décisions livrées
|
||||
|
||||
- **D5 (`probe/list_sources/fetch` par adapter) écartée** : 1 switch sur
|
||||
`agent_connectors.kind` dans `probe()` / `connector_fetch()` — une interface
|
||||
à 3 méthodes pour 4 kinds tordrait plus qu'elle ne simplifie ; ajouter un
|
||||
kind = 1 branche de plus dans le même switch.
|
||||
- **Discord / Telegram = presets du socle**, pas 3 adapters dédiés : le champ
|
||||
**Type** du formulaire pré-remplit l'URL + le schéma d'auth
|
||||
(`bearer`/`bot`/`none`). La Bot API de Telegram impose le jeton **dans l'URL**
|
||||
→ substitut `{secret}` remplacé à l'appel (`connectors._with_secret`),
|
||||
stockage = motif seul, test « le jeton n'est jamais en base ».
|
||||
- **MCP : outils dynamiques sans état** — `ToolRegistry._all()` relit le cache
|
||||
`tools_json` à chaque run (rien à invalider, « Tester » suffit) ; nom LLM
|
||||
`mcp_<serveur>_<outil>` (slug sans double soulignement) ; dispatch
|
||||
`tools/call` dans `McpTool.execute()`. Serveur désactivé → outil **absent du
|
||||
schéma**, échec réseau → `ToolResult(error)` : le run continue toujours.
|
||||
- **Pas de client SSE à l'état** : `parse_body()` lit le JSON direct ou le
|
||||
premier `data:` d'un `text/event-stream`, ce qui couvre
|
||||
`initialize` / `tools/list` / `tools/call` des serveurs streamables courants.
|
||||
Upgrade : client SSE persistant si un serveur ne répond qu'en flux.
|
||||
|
||||
## 9ter. Avenant phase 8 (v7.58.0) — décisions livrées
|
||||
|
||||
- **Garde de route = dépendance posée à l'`include_router`** (`main.py`), pas
|
||||
de décorateur par route ni de middleware : 3 lignes, aucun router modifié.
|
||||
⚠️ l'annotation `request: Request` doit être importée **au module** : avec
|
||||
`from __future__ import annotations` les annotations sont des chaînes et
|
||||
FastAPI les résout dans les globales du module — sinon il lit un query param
|
||||
→ 422 (piège réel, corrigé en cours de phase).
|
||||
- **Effet réel aux 4 niveaux** : routes (dépendance), arrière-plan (garde de
|
||||
tick du scheduler), outils (`ToolRegistry._all()`), UI (rendu serveur).
|
||||
- **UI : `{% if %}` pour la nav, `x-show` pour les sections** — la nav est
|
||||
**absente du DOM** (test « UI absente » au sens propre) ; les grosses
|
||||
sections ne sont pas restructurées, leur booléen est rendu au serveur.
|
||||
- **Handler unifié des 404** (comportement historique conservé) : hors `/api`
|
||||
une route refusée **redirige 302 → /workspaces**, `/api*` répond 404 JSON —
|
||||
les tests assertent les deux formes au lieu de réécrire le handler.
|
||||
- **SQLite** : `INSERT … ON CONFLICT` évalue NOT NULL **avant** l'upsert →
|
||||
fournir toutes les colonnes NOT NULL, même pour un simple changement d'état.
|
||||
- `ponytail:` plafond assumé — pas de classe-adapter par plugin ni de
|
||||
« marketplace » : ajouter un plugin = 1 tuple dans `CATALOG` (+ 1 garde si
|
||||
son effet n'est pas déjà couvert).
|
||||
|
||||
## 10. Hors périmètre
|
||||
|
||||
- Écriture dans les sources distantes (Google Docs, Slack…) — lecture seule au départ.
|
||||
- Synchronisation d'arborescence locale ↔ connecteur.
|
||||
- Marketplace de plugins tiers (le registre est interne à l'instance).
|
||||
- Refonte du composer / de la palette `/` (compatibilité maintenue à l'identique).
|
||||
@@ -2,7 +2,7 @@
|
||||
"openapi": "3.1.0",
|
||||
"info": {
|
||||
"title": "FlowDeck",
|
||||
"version": "7.49.2"
|
||||
"version": "7.69.4"
|
||||
},
|
||||
"paths": {
|
||||
"/auth/register": {
|
||||
@@ -1098,7 +1098,7 @@
|
||||
"dashboard"
|
||||
],
|
||||
"summary": "Help Page",
|
||||
"description": "Comprehensive help & documentation page.",
|
||||
"description": "Help & documentation page — settings-style panel with side navigation.",
|
||||
"operationId": "help_page_help_get",
|
||||
"responses": {
|
||||
"200": {
|
||||
@@ -3706,6 +3706,57 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/board/api/page-templates/{template_id}/blocks": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"board"
|
||||
],
|
||||
"summary": "Page Template Blocks",
|
||||
"description": "v7.53.0 : blocs d'un canevas, pour l'insérer dans le document ouvert.\n\nBuiltin : ``template_id=0`` + ``?key=`` (même convention que ``/use``).\nCanevas personnel : son ``id``. Les blocs builtin sont sans ``id`` — le\nfront appelle ``ensureBlockIds()`` (déjà global côté éditeur).",
|
||||
"operationId": "page_template_blocks_board_api_page_templates__template_id__blocks_get",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "template_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Template Id"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "key",
|
||||
"in": "query",
|
||||
"required": false,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"default": "",
|
||||
"title": "Key"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/board/library": {
|
||||
"get": {
|
||||
"tags": [
|
||||
@@ -15317,6 +15368,97 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/pages/{page_id}/reactions": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"collaboration"
|
||||
],
|
||||
"summary": "List Reactions",
|
||||
"description": "Réactions regroupées par plage de texte : {block_id, start, end, emoji, count, mine}.",
|
||||
"operationId": "list_reactions_api_pages__page_id__reactions_get",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "page_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Page Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"post": {
|
||||
"tags": [
|
||||
"collaboration"
|
||||
],
|
||||
"summary": "Toggle Reaction",
|
||||
"description": "Ajoute ou retire la réaction de l'utilisateur sur une plage de texte (toggle).",
|
||||
"operationId": "toggle_reaction_api_pages__page_id__reactions_post",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "page_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Page Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"default": {},
|
||||
"title": "Body"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/custom-emojis": {
|
||||
"get": {
|
||||
"tags": [
|
||||
@@ -15906,6 +16048,96 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/skills/{skill_id}": {
|
||||
"patch": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Update Skill",
|
||||
"description": "Édition d'un skill enregistré (v7.52.0 — « Gérer les compétences »).\n\nSeuls les champs présents dans ``body`` sont mis à jour ; la liste des\ncolonnes est figée ici (jamais interpolée depuis la requête).",
|
||||
"operationId": "update_skill_api_agent_skills__skill_id__patch",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "skill_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Skill Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"default": {},
|
||||
"title": "Body"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"delete": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Delete Skill",
|
||||
"operationId": "delete_skill_api_agent_skills__skill_id__delete",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "skill_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Skill Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/skills/{skill_id}/apply": {
|
||||
"post": {
|
||||
"tags": [
|
||||
@@ -16099,21 +16331,435 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/skills/{skill_id}": {
|
||||
"delete": {
|
||||
"/api/agent/connectors": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Delete Skill",
|
||||
"operationId": "delete_skill_api_agent_skills__skill_id__delete",
|
||||
"summary": "List Connectors Route",
|
||||
"description": "Catalogue : natifs (statut dérivé de la config) + personnels.",
|
||||
"operationId": "list_connectors_route_api_agent_connectors_get",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"post": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Create Connectors Route",
|
||||
"description": "Ajoute un connecteur personnalisé — l'URL est validée (garde SSRF).",
|
||||
"operationId": "create_connectors_route_api_agent_connectors_post",
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"title": "Body",
|
||||
"default": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/plugins": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "List Plugins Route",
|
||||
"description": "Catalogue des plugins de l'instance (menu + → « Add plugins »).",
|
||||
"operationId": "list_plugins_route_api_agent_plugins_get",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/plugins/{slug}": {
|
||||
"patch": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Set Plugin Route",
|
||||
"description": "Bascule un plugin : l'effet est réel (routes/UI/outils), pas un drapeau.",
|
||||
"operationId": "set_plugin_route_api_agent_plugins__slug__patch",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "skill_id",
|
||||
"name": "slug",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Slug"
|
||||
}
|
||||
}
|
||||
],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"default": {},
|
||||
"title": "Body"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/connectors/{connector_id}": {
|
||||
"patch": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Update Connectors Route",
|
||||
"operationId": "update_connectors_route_api_agent_connectors__connector_id__patch",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "connector_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Skill Id"
|
||||
"title": "Connector Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"default": {},
|
||||
"title": "Body"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"delete": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Delete Connectors Route",
|
||||
"operationId": "delete_connectors_route_api_agent_connectors__connector_id__delete",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "connector_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Connector Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/connectors/probe": {
|
||||
"post": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Probe Connectors Route",
|
||||
"description": "Teste un connecteur (id, nom ou kind natif) et persiste le résultat.",
|
||||
"operationId": "probe_connectors_route_api_agent_connectors_probe_post",
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"title": "Body",
|
||||
"default": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/connectors/oauth/{kind}/status": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Connector Oauth Status",
|
||||
"description": "État du connecteur OAuth pour l'utilisateur courant.",
|
||||
"operationId": "connector_oauth_status_api_agent_connectors_oauth__kind__status_get",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "kind",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Kind"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/connectors/oauth/{kind}/authorize": {
|
||||
"post": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Connector Oauth Authorize",
|
||||
"description": "URL d'autorisation (PKCE) + cookies d'état éphémères (10 min).",
|
||||
"operationId": "connector_oauth_authorize_api_agent_connectors_oauth__kind__authorize_post",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "kind",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Kind"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/connectors/oauth/{kind}/callback": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Connector Oauth Callback",
|
||||
"description": "Reçoit le code du fournisseur, échange, stocke, renvoie sur la page.",
|
||||
"operationId": "connector_oauth_callback_api_agent_connectors_oauth__kind__callback_get",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "kind",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Kind"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "code",
|
||||
"in": "query",
|
||||
"required": false,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"default": "",
|
||||
"title": "Code"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "state",
|
||||
"in": "query",
|
||||
"required": false,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"default": "",
|
||||
"title": "State"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "error",
|
||||
"in": "query",
|
||||
"required": false,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"default": "",
|
||||
"title": "Error"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/agent/connectors/oauth/{kind}/disconnect": {
|
||||
"post": {
|
||||
"tags": [
|
||||
"agent"
|
||||
],
|
||||
"summary": "Connector Oauth Disconnect",
|
||||
"operationId": "connector_oauth_disconnect_api_agent_connectors_oauth__kind__disconnect_post",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "kind",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"title": "Kind"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
@@ -0,0 +1,163 @@
|
||||
// Mobile regression: hamburger drawer, wheel scroll, settings side-nav, help page.
|
||||
const { test, expect } = require('@playwright/test');
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8080';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-pass-123';
|
||||
|
||||
// One login for the whole file (app rate limiter: 60 req/min per IP) — reused
|
||||
// as storageState by every test.
|
||||
let STATE = null;
|
||||
test.beforeAll(async ({ browser }) => {
|
||||
const ctx = await browser.newContext();
|
||||
const page = await ctx.newPage();
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page.waitForURL('**/workspaces', { timeout: 10000 }).then(() => true).catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, { data: { email: USER, password: PASS, name: 'E2E Mobile' } });
|
||||
if (!resp.ok() && resp.status() !== 409) throw new Error(`register ${resp.status()}`);
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
await page.waitForURL('**/workspaces', { timeout: 10000 });
|
||||
}
|
||||
STATE = await ctx.storageState();
|
||||
await ctx.close();
|
||||
});
|
||||
async function login(page) {
|
||||
// Session reused from the single beforeAll login (rate limiter: 60 req/min/IP)
|
||||
await page.context().addCookies(STATE.cookies);
|
||||
}
|
||||
|
||||
test.describe('mobile', () => {
|
||||
test.use({ viewport: { width: 390, height: 844 } });
|
||||
|
||||
test('hamburger opens mobile sidebar drawer', async ({ page }) => {
|
||||
const errs = [];
|
||||
page.on('pageerror', (e) => errs.push(e.message));
|
||||
await login(page);
|
||||
await page.goto(`${FD_BASE}/library`, { waitUntil: 'domcontentloaded' });
|
||||
|
||||
const burger = page.locator('.hamburger-btn');
|
||||
await expect(burger).toBeVisible();
|
||||
|
||||
// Sidebar starts off-canvas
|
||||
const sidebar = page.locator('#sidebar');
|
||||
const boxBefore = await sidebar.boundingBox();
|
||||
expect(boxBefore.x).toBeLessThan(0);
|
||||
|
||||
await burger.click();
|
||||
await expect(sidebar).toHaveClass(/mobile-open/, { timeout: 5000 });
|
||||
const boxAfter = await sidebar.boundingBox();
|
||||
expect(boxAfter.x).toBeGreaterThanOrEqual(0);
|
||||
expect(errs).toEqual([]);
|
||||
|
||||
// Overlay tap closes it
|
||||
await page.locator('.sidebar-overlay').click({ position: { x: 350, y: 400 } });
|
||||
await expect(sidebar).not.toHaveClass(/mobile-open/, { timeout: 5000 });
|
||||
});
|
||||
|
||||
test('mobile sidebar drawer scrolls with mouse wheel', async ({ page }) => {
|
||||
await login(page);
|
||||
await page.goto(`${FD_BASE}/library`, { waitUntil: 'domcontentloaded' });
|
||||
await page.locator('.hamburger-btn').click();
|
||||
await page.waitForSelector('#sidebar.mobile-open');
|
||||
const sc = page.locator('.sidebar-scroll');
|
||||
await expect.poll(async () => sc.evaluate((el) => el.scrollHeight > el.clientHeight), { timeout: 3000 }).toBe(true);
|
||||
const box = await sc.boundingBox();
|
||||
await page.mouse.move(box.x + box.width / 2, box.y + Math.min(box.height / 2, 400));
|
||||
await page.mouse.wheel(0, 300);
|
||||
await expect.poll(async () => sc.evaluate((el) => el.scrollTop), { timeout: 3000 }).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
test('settings page fits mobile viewport', async ({ page }) => {
|
||||
await login(page);
|
||||
await page.goto(`${FD_BASE}/settings`, { waitUntil: 'domcontentloaded' });
|
||||
const panel = page.locator('.settings-panel');
|
||||
await expect(panel).toBeVisible();
|
||||
|
||||
const box = await panel.boundingBox();
|
||||
expect(box.width).toBeLessThanOrEqual(390);
|
||||
expect(box.height).toBeLessThanOrEqual(844);
|
||||
|
||||
// No horizontal page overflow
|
||||
const overflow = await page.evaluate(() => document.documentElement.scrollWidth - document.documentElement.clientWidth);
|
||||
expect(overflow).toBeLessThanOrEqual(0);
|
||||
});
|
||||
|
||||
test('settings mobile nav is a hamburger side drawer', async ({ page }) => {
|
||||
await login(page);
|
||||
await page.goto(`${FD_BASE}/settings`, { waitUntil: 'domcontentloaded' });
|
||||
const burger = page.locator('.settings-menu-btn');
|
||||
await expect(burger).toBeVisible();
|
||||
const nav = page.locator('.settings-nav');
|
||||
const before = await nav.boundingBox();
|
||||
expect(before.x + before.width).toBeLessThanOrEqual(1);
|
||||
|
||||
await burger.click();
|
||||
await expect(nav).toHaveClass(/nav-open/);
|
||||
|
||||
// Nav item switches section AND closes the drawer
|
||||
await page.locator('.settings-nav-item', { hasText: 'Tags' }).click();
|
||||
await expect(nav).not.toHaveClass(/nav-open/);
|
||||
await expect(page.locator('h2', { hasText: 'Tags' }).first()).toBeVisible();
|
||||
|
||||
// Re-open and dismiss via backdrop
|
||||
await burger.click();
|
||||
await expect(nav).toHaveClass(/nav-open/);
|
||||
await page.locator('.settings-nav-backdrop').click({ position: { x: 375, y: 500 } });
|
||||
await expect(nav).not.toHaveClass(/nav-open/);
|
||||
});
|
||||
|
||||
test('help page uses settings-style side navigation', async ({ page }) => {
|
||||
const errs = [];
|
||||
page.on('pageerror', (e) => errs.push(e.message));
|
||||
await login(page);
|
||||
await page.goto(`${FD_BASE}/help`, { waitUntil: 'domcontentloaded' });
|
||||
|
||||
// Same panel skeleton as settings
|
||||
await expect(page.locator('.settings-panel')).toBeVisible();
|
||||
await expect(page.locator('.settings-menu-btn')).toBeVisible();
|
||||
|
||||
// Mobile: nav drawer behind hamburger
|
||||
const nav = page.locator('.settings-nav');
|
||||
await expect(nav).not.toHaveClass(/nav-open/);
|
||||
await page.locator('.settings-menu-btn').click();
|
||||
await expect(nav).toHaveClass(/nav-open/);
|
||||
await page.locator('.settings-nav-item', { hasText: 'Databases' }).click();
|
||||
await expect(nav).not.toHaveClass(/nav-open/);
|
||||
await expect(page.locator('h2', { hasText: 'Databases & Views' })).toBeVisible();
|
||||
|
||||
// App-wide coverage: all sections exist in the nav
|
||||
const sections = ['Getting Started', 'Pages & Editor', 'Databases & Views', 'Tasks & Dependencies',
|
||||
'Workspaces & Forges', 'Collaboration', 'Library, Trash & Search', 'AI Agent & Automations',
|
||||
'Integrations & API', 'Offline & PWA', 'Accounts & SSO', 'Keyboard Shortcuts', 'Tips'];
|
||||
const labels = (await nav.locator('.settings-nav-item').allInnerTexts()).join(' ');
|
||||
for (const s of sections) expect(labels, s).toContain(s);
|
||||
|
||||
expect(errs).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('desktop', () => {
|
||||
test.use({ viewport: { width: 1440, height: 900 } });
|
||||
|
||||
test('settings and help keep the 2-column layout on desktop', async ({ page }) => {
|
||||
await login(page);
|
||||
await page.goto(`${FD_BASE}/settings`, { waitUntil: 'domcontentloaded' });
|
||||
await expect(page.locator('.settings-menu-btn')).toBeHidden();
|
||||
const nav = page.locator('.settings-nav');
|
||||
await expect(nav).toBeVisible();
|
||||
const navBox = await nav.boundingBox();
|
||||
expect(navBox.height).toBeGreaterThan(navBox.width);
|
||||
|
||||
await page.goto(`${FD_BASE}/help`, { waitUntil: 'domcontentloaded' });
|
||||
await expect(page.locator('.settings-menu-btn')).toBeHidden();
|
||||
await page.locator('.settings-nav-item', { hasText: 'SSO' }).click();
|
||||
await expect(page.locator('h2', { hasText: 'Accounts & SSO' })).toBeVisible();
|
||||
await expect(page.locator('.settings-content')).toContainText('IndexedDB');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,37 @@
|
||||
const { test } = require('@playwright/test');
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8080';
|
||||
|
||||
test.use({ viewport: { width: 390, height: 844 } });
|
||||
test('diagnose mobile sidebar wheel scroll', async ({ page }) => {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', process.env.FD_USER || '[email protected]');
|
||||
await page.fill('#password', process.env.FD_PASS || 'e2e-pass-123');
|
||||
await page.click('.btn-primary');
|
||||
await page.waitForURL('**/workspaces', { timeout: 10000 }).catch(() => {});
|
||||
await page.goto(`${FD_BASE}/library`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForFunction(() => document.querySelector('.hamburger-btn'));
|
||||
await page.locator('.hamburger-btn').click();
|
||||
await page.waitForSelector('#sidebar.mobile-open');
|
||||
|
||||
const info = await page.evaluate(() => {
|
||||
const sb = document.getElementById('sidebar');
|
||||
const sc = document.querySelector('.sidebar-scroll');
|
||||
const cs = getComputedStyle(sb);
|
||||
const ccs = sc ? getComputedStyle(sc) : null;
|
||||
return {
|
||||
sidebar: { display: cs.display, height: cs.height, overflow: cs.overflow, sh: sb.scrollHeight, ch: sb.clientHeight },
|
||||
scroll: sc ? { top: sc.scrollTop, sh: sc.scrollHeight, ch: sc.clientHeight, oy: ccs.overflowY, flex: ccs.flex, rect: JSON.stringify(sc.getBoundingClientRect()) } : null,
|
||||
wheelTarget: (() => { const el = document.elementFromPoint(150, 400); return el ? el.className : 'none'; })(),
|
||||
};
|
||||
});
|
||||
console.log('DIAG:', JSON.stringify(info, null, 1));
|
||||
|
||||
await page.mouse.move(150, 400);
|
||||
await page.mouse.wheel(0, 300);
|
||||
await page.waitForTimeout(300);
|
||||
const after = await page.evaluate(() => {
|
||||
const sc = document.querySelector('.sidebar-scroll');
|
||||
return { scTop: sc.scrollTop, scSH: sc.scrollHeight, scCH: sc.clientHeight, bodyTop: document.scrollingElement.scrollTop };
|
||||
});
|
||||
console.log('AFTER WHEEL:', JSON.stringify(after));
|
||||
});
|
||||
@@ -0,0 +1,133 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.62 — menu contextuel au highlight de texte (toolbar façon Notion).
|
||||
* Vérifie : les 4 lignes + Skills + pied, le menu « … », le sous-menu
|
||||
* « Turn into », et surtout la PERSISTANCE du formatage après reload
|
||||
* (sync() relit le DOM formaté via gtMd → source markdown).
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block' });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
// Sélectionne tout le bloc et simule la fin du glisser-souris
|
||||
async function selectBlock(page) {
|
||||
await page.evaluate(() => {
|
||||
const el = document.querySelector('#_blocksCt [data-bid]');
|
||||
const r = document.createRange();
|
||||
r.selectNodeContents(el);
|
||||
const s = getSelection();
|
||||
s.removeAllRanges();
|
||||
s.addRange(r);
|
||||
el.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }));
|
||||
});
|
||||
await expect(page.locator('.format-toolbar')).toBeVisible({ timeout: 5000 });
|
||||
}
|
||||
|
||||
test('toolbar de sélection : structure, sous-menus, persistance', async ({ page }) => {
|
||||
await login(page);
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=Menu highlight ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
await page.click('#_blocksCt [data-bid]');
|
||||
await page.keyboard.type('Menu lors d un highlight de texte');
|
||||
|
||||
// ── 1. structure : 4 lignes + Skills + pied ──
|
||||
await selectBlock(page);
|
||||
const bar = page.locator('.format-toolbar');
|
||||
await expect(bar.locator('.ft-row')).toHaveCount(4);
|
||||
await expect(bar.locator('.ft-style')).toContainText('Normal Text');
|
||||
await expect(bar.locator('.ft-group')).toHaveText('Skills');
|
||||
await expect(bar.locator('.ft-skill')).toHaveCount(4);
|
||||
await expect(bar.locator('.ft-skill').first()).toHaveText('Improve writing');
|
||||
await expect(bar.locator('.ft-foot')).toContainText('Edit with AI');
|
||||
// refonte v7.67 : ligne 4 = Comment (libellé) à gauche, réaction à droite ;
|
||||
// entête Skills avec ≡ ; plus de bouton ✨ Ask AI (doublon du pied)
|
||||
await expect(bar.locator('.ft-comment')).toContainText('Comment');
|
||||
await expect(bar.locator('.ft-row-split .ft-react')).toHaveCount(1);
|
||||
await expect(bar.locator('.ft-skills-head')).toHaveText('Skills');
|
||||
await expect(bar.locator('[data-tooltip^="Ask AI"]')).toHaveCount(0);
|
||||
// géométrie : sous la sélection, entièrement dans le viewport
|
||||
const barBox = await bar.boundingBox();
|
||||
const selBox = await page.evaluate(() => {
|
||||
const r = getSelection().getRangeAt(0).getBoundingClientRect();
|
||||
return { bottom: r.bottom };
|
||||
});
|
||||
expect(barBox.y).toBeGreaterThanOrEqual(selBox.bottom);
|
||||
expect(barBox.y + barBox.height).toBeLessThanOrEqual(900);
|
||||
expect(barBox.x).toBeGreaterThanOrEqual(0);
|
||||
expect(barBox.x + barBox.width).toBeLessThanOrEqual(1440);
|
||||
await page.screenshot({ path: 'shots/v762-toolbar.png' });
|
||||
|
||||
// ── 2. ligne 1 → sous-menu « Turn into » ──
|
||||
await bar.locator('.ft-style').click();
|
||||
const sub = page.locator('#blockMenuSub');
|
||||
await expect(sub).toBeVisible();
|
||||
await expect(sub).toContainText('Heading 4');
|
||||
await expect(sub.locator('.bm-check')).toHaveCount(1); // type courant coché
|
||||
await page.screenshot({ path: 'shots/v762-turn-submenu.png' });
|
||||
await page.keyboard.press('Escape');
|
||||
|
||||
// ── 3. « … » → menu contextuel de bloc (recherche + pied) ──
|
||||
await selectBlock(page);
|
||||
await bar.locator('.ft-more').click();
|
||||
const menu = page.locator('#blockMenu');
|
||||
await expect(menu).toBeVisible();
|
||||
await expect(menu.locator('.bm-search')).toHaveAttribute('placeholder', 'Search actions...');
|
||||
await expect(menu).toContainText('Copy link to block');
|
||||
await expect(menu.locator('.bm-foot')).toContainText('Last edited by');
|
||||
await page.screenshot({ path: 'shots/v762-more-menu.png' });
|
||||
await page.keyboard.press('Escape');
|
||||
await expect(menu).toBeHidden();
|
||||
|
||||
// ── 4. persistance : B (gras) survit au reload ──
|
||||
await selectBlock(page);
|
||||
await page.getByRole('button', { name: 'B', exact: true }).click();
|
||||
await expect(page.locator('#_blocksCt [data-bid] b, #_blocksCt [data-bid] strong')).toHaveCount(1);
|
||||
await page.waitForTimeout(2500); // autosave 1,5 s
|
||||
await page.reload({ waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
await expect(page.locator('#_blocksCt [data-bid] strong')).toHaveCount(1); // rendu mdEsc
|
||||
|
||||
// ── 5. persistance : S (surlignage) survit au reload ──
|
||||
await selectBlock(page);
|
||||
await bar.locator('.ft-hl').click();
|
||||
await expect(page.locator('#_blocksCt [data-bid] mark')).toHaveCount(1);
|
||||
await page.waitForTimeout(2500);
|
||||
await page.reload({ waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
await expect(page.locator('#_blocksCt [data-bid] mark')).toHaveCount(1);
|
||||
|
||||
// ── 6. fermeture hors sélection ──
|
||||
await page.mouse.click(10, 400);
|
||||
await expect(page.locator('.format-toolbar')).toBeHidden();
|
||||
});
|
||||
@@ -0,0 +1,125 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.63 — menus mobiles façon Notion (viewport 390×844) :
|
||||
* - « / » → barre horizontale défilante sous le curseur (15 boutons, ordre du doc)
|
||||
* - « + » → feuille plein écran « Insert block » (titre centré + Cancel, groupes,
|
||||
* raccourcis) → choix d'un type = applySlash
|
||||
* - « Turn into » / « Color » → feuilles réutilisant les sous-menus de bloc
|
||||
* - « More » → menu contextuel de bloc (desktop)
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block', viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
async function newPage(page) {
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=Mobile menus ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
return id;
|
||||
}
|
||||
|
||||
test('barre mobile au / + feuilles Insert block / Turn into / More', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page);
|
||||
await page.click('#_blocksCt [data-bid]');
|
||||
await page.keyboard.type('/');
|
||||
|
||||
// ── 1. la barre apparaît, 15 boutons dans l'ordre de la description ──
|
||||
const bar = page.locator('#fdMobileBar');
|
||||
await expect(bar).toBeVisible({ timeout: 5000 });
|
||||
const keys = await page.evaluate(() =>
|
||||
Array.from(document.querySelectorAll('#fdMobileBar [data-mtb]')).map((b) => b.dataset.mtb));
|
||||
expect(keys).toEqual(['plus', 'turn', 'at', 'comment', 'image', 'trash',
|
||||
'left', 'right', 'up', 'down', 'undo', 'redo', 'color', 'more', 'kbd']);
|
||||
// défilement latéral
|
||||
const overflowX = await bar.evaluate((el) => getComputedStyle(el).overflowX);
|
||||
expect(overflowX).toBe('auto');
|
||||
// pas de popup desktop en parallèle
|
||||
await expect(page.locator('#_slashMenu')).toBeHidden();
|
||||
await page.screenshot({ path: 'shots/v763-bar.png' });
|
||||
|
||||
// ── 2. « + » → feuille plein écran « Insert block » ──
|
||||
await bar.locator('[data-mtb="plus"]').click();
|
||||
const sheet = page.locator('.fd-msheet');
|
||||
await expect(sheet).toBeVisible();
|
||||
await expect(sheet.locator('.fd-msheet-title')).toHaveText('Insert block');
|
||||
await expect(sheet.locator('.fd-msheet-cancel')).toHaveText('Cancel');
|
||||
await expect(sheet.locator('.sm-group').first()).toHaveText('Basic blocks');
|
||||
await expect(sheet.locator('.slash-item', { hasText: 'Heading 1' })).toHaveCount(1);
|
||||
await page.screenshot({ path: 'shots/v763-insert.png' });
|
||||
|
||||
// ── 3. choix d'un type → applySlash (le bloc devient un titre) ──
|
||||
await sheet.locator('.slash-item', { hasText: 'Heading 1' }).click();
|
||||
await expect(sheet).toHaveCount(0);
|
||||
await expect(bar).toBeHidden();
|
||||
expect(await page.evaluate(() => window.E.blocks[0].type)).toBe('heading_1');
|
||||
|
||||
// ── 4. « Turn into » → feuille réutilisant les items du sous-menu de bloc ──
|
||||
await page.keyboard.type('/');
|
||||
await expect(bar).toBeVisible();
|
||||
await bar.locator('[data-mtb="turn"]').click();
|
||||
await expect(sheet.locator('.fd-msheet-title')).toHaveText('Turn into');
|
||||
await expect(sheet.locator('.bm-item', { hasText: 'Bulleted list' })).toHaveCount(1);
|
||||
await expect(sheet.locator('.bm-check')).toHaveCount(1); // type courant coché
|
||||
await page.screenshot({ path: 'shots/v763-turn.png' });
|
||||
await sheet.locator('.fd-msheet-cancel').click();
|
||||
await expect(sheet).toHaveCount(0);
|
||||
expect(await page.evaluate(() => window.E.blocks[0].type)).toBe('heading_1');
|
||||
|
||||
// ── 5. « Color » → feuille avec les 3 groupes ──
|
||||
await page.evaluate(() => localStorage.setItem('fdLastBlockColor', 'color|#E5484D'));
|
||||
await bar.locator('[data-mtb="color"]').click();
|
||||
for (const g of ['Last used', 'Text color', 'Background color']) {
|
||||
await expect(sheet.locator('.bm-group', { hasText: g })).toHaveCount(1);
|
||||
}
|
||||
await sheet.locator('.fd-msheet-cancel').click();
|
||||
|
||||
// ── 6. « More » → menu contextuel de bloc (recherche + pied) ──
|
||||
await bar.locator('[data-mtb="more"]').click();
|
||||
const menu = page.locator('#blockMenu');
|
||||
await expect(menu).toBeVisible();
|
||||
await expect(menu.locator('.bm-search')).toHaveAttribute('placeholder', 'Search actions...');
|
||||
await expect(menu.locator('.bm-foot')).toContainText('Last edited by');
|
||||
await page.keyboard.press('Escape');
|
||||
await expect(menu).toBeHidden();
|
||||
|
||||
// ── 7. ↑ déplace réellement le bloc ── (bloc 0 = titre, bloc 1 = paragraphe)
|
||||
await page.click('#_blocksCt [data-bid]'); // bloc 0 (contient '/')
|
||||
await page.keyboard.press('Enter');
|
||||
await page.waitForTimeout(150); // le focus du nouveau bloc est différé (60 ms)
|
||||
await page.keyboard.type('/'); // bloc neuf et vide → slash exact = ouverture
|
||||
await expect(bar).toBeVisible(); // SM._i = 1 (bloc du bas)
|
||||
await bar.locator('[data-mtb="up"]').click();
|
||||
expect(await page.evaluate(() => window.E.blocks.map((b) => b.type).join(',')))
|
||||
.toBe('paragraph,heading_1');
|
||||
await page.screenshot({ path: 'shots/v763-moved.png' });
|
||||
});
|
||||
@@ -0,0 +1,80 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.64.1 — Delete sur un bloc vide supprime le bloc (comme Backspace).
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block' });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
test('Delete : vide le bloc puis supprime le bloc vide', async ({ page }) => {
|
||||
await login(page);
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=Delete key ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
const bs = await page.request.post(`${FD_BASE}/board/api/pages/${id}/blocks`, {
|
||||
headers: { 'X-CSRF-Token': csrf },
|
||||
data: { title: 'Delete key', blocks: [
|
||||
{ id: 'b1', type: 'paragraph', content: 'hello' },
|
||||
{ id: 'b2', type: 'paragraph', content: 'world' },
|
||||
] },
|
||||
});
|
||||
expect(bs.status(), await bs.text()).toBeLessThan(400);
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
|
||||
// ── 1. Delete avec du texte : suppression avant le curseur (comportement natif) ──
|
||||
await page.locator('#_blocksCt [data-bid]').nth(1).click();
|
||||
await page.keyboard.press('Control+a');
|
||||
await page.keyboard.press('Delete');
|
||||
await page.waitForTimeout(200);
|
||||
const contents = await page.evaluate(() => {
|
||||
window.E.sync();
|
||||
return window.E.blocks.map((b) => b.content);
|
||||
});
|
||||
expect(contents[0]).toBe('hello');
|
||||
expect(contents[1].trim()).toBe(''); // bloc vidé (un <br> résiduel), mais toujours là
|
||||
|
||||
// ── 2. Delete sur le bloc vide : le bloc est supprimé ──
|
||||
await page.keyboard.press('Delete');
|
||||
await page.waitForTimeout(300);
|
||||
expect(await page.evaluate(() => window.E.blocks.length)).toBe(1);
|
||||
expect(await page.evaluate(() => window.E.blocks[0].content)).toBe('hello');
|
||||
await page.screenshot({ path: 'shots/v7641-delete.png' });
|
||||
|
||||
// ── 3. dernier bloc vide : jamais supprimé (l'éditeur garde un bloc) ──
|
||||
await page.locator('#_blocksCt [data-bid]').first().click();
|
||||
await page.keyboard.press('Control+a');
|
||||
await page.keyboard.press('Delete');
|
||||
await page.waitForTimeout(150);
|
||||
await page.keyboard.press('Delete');
|
||||
await page.waitForTimeout(300);
|
||||
expect(await page.evaluate(() => window.E.blocks.length)).toBe(1);
|
||||
expect(await page.evaluate(() => window.E.blocks[0].type)).toBe('paragraph');
|
||||
});
|
||||
@@ -0,0 +1,201 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.64 — commentaires & réactions façon Notion :
|
||||
* - sélection → bouton 🙂+ (« React to selected text ») → sélecteur d'émoji avec
|
||||
* le texte sélectionné en en-tête → pastille + plage jaune, contenu inchangé
|
||||
* - sélection → 💬 → tiroir refondu (avatar, nom, ✓, ⋯, saisie avec @ et ↑) →
|
||||
* fil ancré + plage jaune, clic sur l'ancre rouvre le fil, ✓ résout
|
||||
* - reload : ancres et pastilles repeintes depuis la base
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block' });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
async function newPage(page, body) {
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=Comments ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
if (body) {
|
||||
const bs = await page.request.post(`${FD_BASE}/board/api/pages/${id}/blocks`, {
|
||||
headers: { 'X-CSRF-Token': csrf },
|
||||
data: { title: 'Comments', blocks: body },
|
||||
});
|
||||
expect(bs.status(), await bs.text()).toBeLessThan(400);
|
||||
}
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
return id;
|
||||
}
|
||||
|
||||
// sélectionne une SOUS-chaîne du bloc (ancre = plage, pas le bloc entier)
|
||||
async function selectSub(page, sub) {
|
||||
await page.evaluate((sub) => {
|
||||
const el = document.querySelector('#_blocksCt [data-bid]');
|
||||
const w = document.createTreeWalker(el, NodeFilter.SHOW_TEXT);
|
||||
let n;
|
||||
while ((n = w.nextNode())) {
|
||||
if (n.parentElement && n.parentElement.closest('.fd-react-chip')) continue;
|
||||
const i = n.nodeValue.indexOf(sub);
|
||||
if (i < 0) continue;
|
||||
const r = document.createRange();
|
||||
r.setStart(n, i);
|
||||
r.setEnd(n, i + sub.length);
|
||||
const s = getSelection();
|
||||
s.removeAllRanges();
|
||||
s.addRange(r);
|
||||
el.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }));
|
||||
return;
|
||||
}
|
||||
throw new Error('sous-chaîne introuvable : ' + sub);
|
||||
}, sub);
|
||||
await expect(page.locator('.format-toolbar')).toBeVisible({ timeout: 5000 });
|
||||
}
|
||||
|
||||
// sélectionne tout le bloc et simule la fin du glisser-souris
|
||||
async function selectBlock(page) {
|
||||
await page.evaluate(() => {
|
||||
const el = document.querySelector('#_blocksCt [data-bid]');
|
||||
const r = document.createRange();
|
||||
r.selectNodeContents(el);
|
||||
const s = getSelection();
|
||||
s.removeAllRanges();
|
||||
s.addRange(r);
|
||||
el.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }));
|
||||
});
|
||||
await expect(page.locator('.format-toolbar')).toBeVisible({ timeout: 5000 });
|
||||
}
|
||||
|
||||
test('réaction emoji + commentaires ancrés', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, [{ id: 'b1', type: 'paragraph', content: 'Prise de reaction a un texte' }]);
|
||||
await expect(page.locator('#_blocksCt [data-bid]')).toHaveText('Prise de reaction a un texte');
|
||||
|
||||
// ── 1. bouton réaction dans la toolbar ──
|
||||
await selectBlock(page);
|
||||
const react = page.locator('.format-toolbar .ft-react');
|
||||
await expect(react).toHaveAttribute('data-tooltip', 'React to selected text');
|
||||
await page.screenshot({ path: 'shots/v764-toolbar-react.png' });
|
||||
await react.click();
|
||||
|
||||
// ── 2. sélecteur : en-tête = texte sélectionné, Filter…, Recent/People ──
|
||||
const picker = page.locator('.fd-icon-picker');
|
||||
await expect(picker).toBeVisible();
|
||||
await expect(picker.locator('.fdip-title-text')).toHaveText('Prise de reaction a un texte');
|
||||
await expect(picker.locator('.fdip-search')).toHaveAttribute('placeholder', 'Filter...');
|
||||
await expect(picker.locator('.fdip-tabs')).toBeHidden(); // mode réaction : emoji only
|
||||
await page.screenshot({ path: 'shots/v764-picker.png' });
|
||||
await picker.locator('.fdip-emoji').first().click();
|
||||
await expect(picker).toBeHidden();
|
||||
|
||||
// ── 3. pastille + plage jaune, contenu du bloc inchangé ──
|
||||
await expect(page.locator('#_blocksCt .fd-react-chip')).toHaveCount(1);
|
||||
await expect(page.locator('#_blocksCt .fd-anchor-react')).toHaveCount(1);
|
||||
const content = await page.evaluate(() => {
|
||||
window.E.sync();
|
||||
return window.E.blocks[0].content;
|
||||
});
|
||||
expect(content).toBe('Prise de reaction a un texte'); // la pastille n'est pas du contenu
|
||||
await page.screenshot({ path: 'shots/v764-chip.png' });
|
||||
|
||||
// ── 4. commentaire sur une SOUS-sélection : toolbar 💬 → tiroir refondu → envoi ──
|
||||
await expect(page.locator('#_commentSelBtn')).toHaveCount(0); // bouton bleu retiré
|
||||
await selectSub(page, 'reaction a un');
|
||||
await page.locator('.format-toolbar .ft-item[data-tooltip="Comment — Ctrl+⇧+M"]').click();
|
||||
const drawer = page.locator('.comments-drawer');
|
||||
await expect(drawer).toBeVisible();
|
||||
await drawer.locator('textarea').fill('Ceci est mon premier commentaire');
|
||||
await expect(drawer.locator('.ct-send')).toBeEnabled();
|
||||
await drawer.locator('.ct-send').click();
|
||||
const thread = page.locator('.comment-thread');
|
||||
await expect(thread).toHaveCount(1);
|
||||
await expect(thread.locator('.ct-avatar')).toHaveCount(1);
|
||||
await expect(thread.locator('.ct-name')).not.toHaveText('');
|
||||
await expect(thread.locator('.ct-act')).toHaveCount(2); // ✓ + ⋯
|
||||
await expect(thread.locator('.ct-body')).toHaveText('Ceci est mon premier commentaire');
|
||||
// l'ancre jaune = UNIQUEMENT la plage sélectionnée, pas le bloc
|
||||
await expect(page.locator('#_blocksCt .fd-anchor[data-cid]')).toHaveCount(1);
|
||||
await expect(page.locator('#_blocksCt .fd-anchor[data-cid]')).toHaveText('reaction a un');
|
||||
await page.screenshot({ path: 'shots/v764-drawer.png' });
|
||||
|
||||
// ── 5. menu ⋯ du fil (Copy link / Delete) ──
|
||||
await thread.locator('.ct-act').nth(1).click();
|
||||
await expect(thread.locator('.ct-menu')).toBeVisible();
|
||||
await expect(thread.locator('.ct-menu-item').first()).toContainText('Copy link');
|
||||
await page.keyboard.press('Escape');
|
||||
await page.locator('.comments-drawer-header .topbar-btn').click();
|
||||
await expect(drawer).toBeHidden();
|
||||
|
||||
// ── 6. clic sur l'ancre jaune → le fil se rouvre ──
|
||||
await page.locator('#_blocksCt .fd-anchor[data-cid]').click();
|
||||
await expect(drawer).toBeVisible();
|
||||
await expect(page.locator('.comment-thread')).toHaveCount(1);
|
||||
|
||||
// ── 7. ✓ résout le fil (ancre en gris) ──
|
||||
await page.locator('.comment-thread .ct-act').first().click();
|
||||
await expect(page.locator('.comment-thread.is-resolved')).toHaveCount(1);
|
||||
await expect(page.locator('#_blocksCt .fd-anchor.fd-anchor-done')).toHaveCount(1);
|
||||
|
||||
// ── 8. reload : ancres + pastilles rechargées depuis la base ──
|
||||
await page.reload({ waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
await expect(page.locator('#_blocksCt .fd-anchor[data-cid]')).toHaveCount(1, { timeout: 10000 });
|
||||
await expect(page.locator('#_blocksCt .fd-anchor[data-cid]')).toHaveText('reaction a un');
|
||||
await expect(page.locator('#_blocksCt .fd-react-chip')).toHaveCount(1, { timeout: 10000 });
|
||||
|
||||
// ── 9. v7.67 : la réaction vit aussi dans le tiroir Comments ──
|
||||
await page.locator('.topbar-btn[title="Comments"]').click();
|
||||
const re = page.locator('.ct-reactions');
|
||||
await expect(re).toBeVisible();
|
||||
await expect(re.locator('.ct-re-emoji')).toHaveCount(1);
|
||||
await expect(re.locator('.ct-re-text')).toHaveText('Prise de reaction a un texte');
|
||||
await page.screenshot({ path: 'shots/v764-drawer-reactions.png' });
|
||||
|
||||
// ── 10. suppression A : ✕ de la section Réactions ──
|
||||
await re.locator('.ct-reaction .ct-act').click();
|
||||
await expect(page.locator('#_blocksCt .fd-react-chip')).toHaveCount(0);
|
||||
await expect(re).toBeHidden();
|
||||
|
||||
// ── 11. suppression B : la croix survolée de la pastille ──
|
||||
await page.locator('.topbar-btn[title="Comments"]').click(); // referme le tiroir
|
||||
await selectBlock(page);
|
||||
await page.locator('.format-toolbar .ft-react').click();
|
||||
const picker2 = page.locator('.fd-icon-picker');
|
||||
await expect(picker2).toBeVisible();
|
||||
await picker2.locator('.fdip-emoji').first().click();
|
||||
await expect(page.locator('#_blocksCt .fd-react-chip')).toHaveCount(1);
|
||||
const emo = page.locator('#_blocksCt .fd-react-emo.is-mine');
|
||||
await expect(emo).toHaveCount(1);
|
||||
// la croix n'apparaît qu'au survol (::after)
|
||||
await expect.poll(() => emo.evaluate((el) => getComputedStyle(el, '::after').display)).toBe('none');
|
||||
await page.locator('#_blocksCt .fd-react-chip').hover();
|
||||
await expect.poll(() => emo.evaluate((el) => getComputedStyle(el, '::after').display)).toBe('flex');
|
||||
await emo.click();
|
||||
await expect(page.locator('#_blocksCt .fd-react-chip')).toHaveCount(0);
|
||||
});
|
||||
@@ -0,0 +1,99 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.66 — deux ajustements éditeur :
|
||||
* - « / » ouvre le menu slash → Escape ferme le menu ET retire le « / »
|
||||
* - survol d'un bloc → bouton à droite (bulle + ) qui commente le bloc
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block' });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
async function newPage(page, body) {
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=v766 ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
if (body) {
|
||||
const bs = await page.request.post(`${FD_BASE}/board/api/pages/${id}/blocks`, {
|
||||
headers: { 'X-CSRF-Token': csrf },
|
||||
data: { title: 'v766', blocks: body },
|
||||
});
|
||||
expect(bs.status(), await bs.text()).toBeLessThan(400);
|
||||
}
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
return id;
|
||||
}
|
||||
|
||||
test('Escape du menu slash retire le caractère /', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, [{ id: 'b1', type: 'paragraph', content: '' }]);
|
||||
const blk = page.locator('#_blocksCt [data-bid]').first();
|
||||
await blk.click();
|
||||
await page.keyboard.type('/');
|
||||
await expect(page.locator('#_slashMenu')).toBeVisible({ timeout: 5000 });
|
||||
await page.keyboard.press('Escape');
|
||||
await expect(page.locator('#_slashMenu')).toBeHidden();
|
||||
// le « / » a été retiré — pas de caractère résiduel
|
||||
await expect(blk).toHaveText('');
|
||||
await page.screenshot({ path: 'shots/v766-slash-esc.png' });
|
||||
});
|
||||
|
||||
test('bouton commenter à droite du bloc', async ({ page }) => {
|
||||
await login(page);
|
||||
// 2 blocs : l'éditeur focalise le 1er au chargement (`:focus-within` le
|
||||
// montre) → on mesure sur le 2e, ni focalisé ni survolé.
|
||||
await newPage(page, [
|
||||
{ id: 'b1', type: 'paragraph', content: 'Premier bloc' },
|
||||
{ id: 'b2', type: 'paragraph', content: 'Un bloc a commenter' },
|
||||
]);
|
||||
await expect(page.locator('#_blocksCt .block-comment-btn')).toHaveCount(2);
|
||||
const wrap = page.locator('#_blocksCt .block-wrapper').nth(1);
|
||||
const btn = page.locator('#_blocksCt .block-comment-btn').nth(1);
|
||||
|
||||
// masqué tant qu'on ne survole pas / ne focalise pas le bloc
|
||||
await expect.poll(() => btn.evaluate((el) => getComputedStyle(el).opacity)).toBe('0');
|
||||
await wrap.hover();
|
||||
await expect.poll(() => btn.evaluate((el) => getComputedStyle(el).opacity)).toBe('1');
|
||||
|
||||
// bien à droite du bloc (gouttière 64px)
|
||||
const wb = await wrap.boundingBox();
|
||||
const bb = await btn.boundingBox();
|
||||
expect(bb.x).toBeGreaterThan(wb.x + wb.width - 1);
|
||||
await page.screenshot({ path: 'shots/v766-comment-btn.png' });
|
||||
|
||||
// clic → tiroir → envoi → ancre = le bloc visé (et pas le 1er)
|
||||
await btn.click();
|
||||
const drawer = page.locator('.comments-drawer');
|
||||
await expect(drawer).toBeVisible();
|
||||
await drawer.locator('textarea').fill('Commentaire via le bouton de droite');
|
||||
await drawer.locator('.ct-send').click();
|
||||
await expect(page.locator('.comment-thread')).toHaveCount(1);
|
||||
await expect(page.locator('#_blocksCt .fd-anchor[data-cid]')).toHaveText('Un bloc a commenter');
|
||||
});
|
||||
@@ -0,0 +1,185 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.68 — colonnes rendues (slash + Turn into), tables IA sans pipe de tête,
|
||||
* copier/couper/coller d'une sélection multi-blocs (Ctrl+C/X/V + clic droit).
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block', permissions: ['clipboard-read', 'clipboard-write'] });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
async function newPage(page, body) {
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=v768 ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
if (body) {
|
||||
const bs = await page.request.post(`${FD_BASE}/board/api/pages/${id}/blocks`, {
|
||||
headers: { 'X-CSRF-Token': csrf },
|
||||
data: { title: 'v768', blocks: body },
|
||||
});
|
||||
expect(bs.status(), await bs.text()).toBeLessThan(400);
|
||||
}
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
return id;
|
||||
}
|
||||
|
||||
// VRAIE sélection multi-blocs : glisser la souris du 1er bloc jusqu'au 3e
|
||||
// (le navigateur seul ne franchit jamais deux contenteditable)
|
||||
async function dragAcross(page, last = 2) {
|
||||
const b1 = await page.locator('#_blocksCt [data-bid]').first().boundingBox();
|
||||
const b3 = await page.locator('#_blocksCt [data-bid]').nth(last).boundingBox();
|
||||
// on part du tout début du 1er bloc et on va jusqu'à la fin du dernier
|
||||
await page.mouse.move(b1.x + 2, b1.y + b1.height / 2);
|
||||
await page.mouse.down();
|
||||
for (let i = 1; i <= 8; i++) {
|
||||
await page.mouse.move(b1.x + 2, b1.y + b1.height / 2 + ((b3.y - b1.y) * i) / 8);
|
||||
}
|
||||
await page.mouse.move(b3.x + b3.width - 2, b3.y + b3.height / 2);
|
||||
await page.mouse.up();
|
||||
}
|
||||
|
||||
// sélection multi-blocs au CLAVIER : caret en fin de bloc 1, Maj+↓ Maj+↓
|
||||
async function shiftExtend(page) {
|
||||
// VRAI geste : un clic met le caret dans le bloc, End va à sa fin,
|
||||
// Maj+↓ l'étend ensuite dans les blocs suivants.
|
||||
const el = page.locator('#_blocksCt [data-bid]').first();
|
||||
const b = await el.boundingBox();
|
||||
await page.mouse.click(b.x + 2, b.y + b.height / 2);
|
||||
await page.keyboard.press('End');
|
||||
await page.keyboard.press('Shift+ArrowDown');
|
||||
await page.keyboard.press('Shift+ArrowDown');
|
||||
await page.waitForTimeout(80);
|
||||
}
|
||||
|
||||
// état de la sélection côté éditeur
|
||||
const clipState = (page) => page.evaluate(() => window.E._clipState());
|
||||
|
||||
test('colonnes : slash + Turn into 2 colonnes', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, [{ id: 'b1', type: 'paragraph', content: '' }]);
|
||||
await page.click('#_blocksCt [data-bid]');
|
||||
await page.keyboard.type('/');
|
||||
await expect(page.locator('#_slashMenu')).toBeVisible({ timeout: 5000 });
|
||||
await page.keyboard.type('columns');
|
||||
await page.locator('#_slashMenu .slash-item[data-sid="columns"]').click();
|
||||
// le bloc colonnes est RENDU (il tombait dans le rendu générique = vide)
|
||||
await expect(page.locator('#_blocksCt .block-columns')).toHaveCount(1);
|
||||
await expect(page.locator('#_blocksCt .block-column')).toHaveCount(1);
|
||||
await page.locator('#_blocksCt .columns-add-btn').click();
|
||||
await expect(page.locator('#_blocksCt .block-column')).toHaveCount(2);
|
||||
await page.screenshot({ path: 'shots/v768-columns-slash.png' });
|
||||
|
||||
// Turn into → 2 colonnes
|
||||
await newPage(page, [{ id: 'b1', type: 'paragraph', content: 'Pour le menu' }]);
|
||||
await page.locator('#_blocksCt [data-bid]').first().click({ button: 'right' });
|
||||
const menu = page.locator('#blockMenu');
|
||||
await expect(menu).toBeVisible();
|
||||
await menu.locator('[data-sub="turn"]').hover();
|
||||
const sub = page.locator('#blockMenuSub');
|
||||
await expect(sub).toBeVisible();
|
||||
await sub.locator('[data-bm-act="turn-type"][data-cols="2"]').click();
|
||||
await expect(page.locator('#_blocksCt .block-column')).toHaveCount(2);
|
||||
});
|
||||
|
||||
test('table IA sans pipe de tête devient un vrai tableau', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, [{ id: 'b1', type: 'paragraph', content: '' }]);
|
||||
await page.evaluate(() => {
|
||||
window.E.applyAIBlocks('Nom | Rôle\n--- | ---\nAlice | Dev\nBob | Test');
|
||||
});
|
||||
await expect(page.locator('#_blocksCt .ftable-editor')).toHaveCount(1);
|
||||
await expect(page.locator('#_blocksCt .ftable-cell').first()).toHaveText('Nom');
|
||||
await expect(page.locator('#_blocksCt .ftable-cell').last()).toHaveText('Test');
|
||||
// la ligne « texte » suivie d'« --- » ne doit PAS devenir un tableau
|
||||
await page.evaluate(() => {
|
||||
window.E.applyAIBlocks('juste du texte\n---\nune phrase');
|
||||
});
|
||||
await expect(page.locator('#_blocksCt .ftable-editor')).toHaveCount(1);
|
||||
await page.screenshot({ path: 'shots/v768-ai-table.png' });
|
||||
});
|
||||
|
||||
test('Ctrl+C / Ctrl+X / Ctrl+V sur une sélection multi-blocs', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, [
|
||||
{ id: 'b1', type: 'paragraph', content: 'Premier bloc' },
|
||||
{ id: 'b2', type: 'heading_2', content: 'Titre deux' },
|
||||
{ id: 'b3', type: 'paragraph', content: 'Troisieme bloc' },
|
||||
]);
|
||||
// sélection multi-blocs au CLAVIER (Maj+↓) — geste réel
|
||||
await shiftExtend(page);
|
||||
const st = await clipState(page);
|
||||
expect(st.si).toBe(0);
|
||||
expect(st.ei).toBe(2);
|
||||
// VRAI raccourci clavier (pas execCommand) : c'est lui qui était cassé
|
||||
await page.keyboard.press('Control+c');
|
||||
await page.waitForTimeout(250);
|
||||
const clip = await page.evaluate(() => navigator.clipboard.readText());
|
||||
expect(clip).toContain('## Titre deux'); // le titre sort en markdown
|
||||
expect(clip).toContain('Troisieme bloc');
|
||||
|
||||
// coupe (raccourci Ctrl+X) : on recouvre les 3 blocs du début à la fin
|
||||
await dragAcross(page);
|
||||
await page.keyboard.press('Control+x');
|
||||
await page.waitForTimeout(300);
|
||||
await expect(page.locator('#_blocksCt [data-bid]')).toHaveCount(2);
|
||||
await expect(page.locator('#_blocksCt [data-bid]').first()).toHaveText('');
|
||||
|
||||
// colle : les 3 blocs reviennent APRÈS le bloc du curseur (comme l'entrée
|
||||
// Paste du menu) → 2 blocs restants + 3 collés = 5
|
||||
await page.keyboard.press('Control+v');
|
||||
await page.waitForTimeout(300);
|
||||
await expect(page.locator('#_blocksCt [data-bid]')).toHaveCount(5, { timeout: 5000 });
|
||||
await expect(page.locator('#_blocksCt [data-bid]').nth(1)).toContainText('Premier bloc');
|
||||
await expect(page.locator('#_blocksCt [data-bid]').nth(2)).toContainText('Titre deux');
|
||||
});
|
||||
|
||||
test('clic droit avec une sélection → groupe Clipboard', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, [
|
||||
{ id: 'b1', type: 'paragraph', content: 'Alpha bloc' },
|
||||
{ id: 'b2', type: 'paragraph', content: 'Beta bloc' },
|
||||
]);
|
||||
await dragAcross(page, 1);
|
||||
// la sélection multi-blocs doit SURVIVRE au clic droit (le navigateur
|
||||
// déplacerait sinon le curseur dans le bloc cliqué)
|
||||
expect((await clipState(page)).ei).toBe(1);
|
||||
await page.locator('#_blocksCt [data-bid]').nth(1).click({ button: 'right', position: { x: 30, y: 6 } });
|
||||
expect((await clipState(page)).ei).toBe(1);
|
||||
const menu = page.locator('#blockMenu');
|
||||
await expect(menu).toBeVisible();
|
||||
await expect(menu.locator('[data-bm-act="clip-copy"]')).toBeVisible();
|
||||
await expect(menu.locator('[data-bm-act="clip-cut"]')).toBeVisible();
|
||||
await expect(menu.locator('[data-bm-act="clip-paste"]')).toBeVisible();
|
||||
await page.screenshot({ path: 'shots/v768-ctx-clipboard.png' });
|
||||
await menu.locator('[data-bm-act="clip-copy"]').click();
|
||||
const clip = await page.evaluate(() => navigator.clipboard.readText());
|
||||
expect(clip).toContain('Alpha bloc');
|
||||
expect(clip).toContain('Beta bloc');
|
||||
});
|
||||
@@ -0,0 +1,62 @@
|
||||
// v7.69.3 — la section Aide doit avoir le MÊME positionnement que Settings
|
||||
const { test, expect } = require('@playwright/test');
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
await page.waitForURL('**/workspaces', { timeout: 8000 }).catch(() => {});
|
||||
}
|
||||
|
||||
// géométrie de l'overlay + du panneau, telle que perçue à l'écran
|
||||
const geo = (page) =>
|
||||
page.evaluate(() => {
|
||||
const ov = document.querySelector('.settings-overlay');
|
||||
const pn = document.querySelector('.settings-panel');
|
||||
const o = getComputedStyle(ov);
|
||||
const p = getComputedStyle(pn);
|
||||
const r = pn.getBoundingClientRect();
|
||||
return {
|
||||
ovPosition: o.position,
|
||||
ovBgSet: o.backgroundColor !== 'rgba(0, 0, 0, 0)',
|
||||
pnWidth: Math.round(r.width),
|
||||
pnHeight: Math.round(r.height),
|
||||
pnCentered: Math.abs(r.left - (window.innerWidth - r.width) / 2) < 24,
|
||||
pnTop: Math.round(r.top),
|
||||
closeTop: Math.round(document.querySelector('.settings-close').getBoundingClientRect().top - r.top),
|
||||
closeRight: Math.round(r.right - document.querySelector('.settings-close').getBoundingClientRect().right),
|
||||
};
|
||||
});
|
||||
|
||||
test('Aide et Settings partagent le même positionnement', async ({ page }) => {
|
||||
await login(page);
|
||||
await page.goto(`${FD_BASE}/help`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForTimeout(400);
|
||||
const h = await geo(page);
|
||||
|
||||
await page.goto(`${FD_BASE}/settings`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForTimeout(400);
|
||||
const s = await geo(page);
|
||||
|
||||
console.log('HELP =', JSON.stringify(h));
|
||||
console.log('SETTING=', JSON.stringify(s));
|
||||
|
||||
// l'overlay de Aide n'est plus désactivé en inline
|
||||
expect(h.ovPosition).toBe(s.ovPosition);
|
||||
expect(h.ovPosition).toBe('fixed');
|
||||
expect(h.ovBgSet).toBe(true);
|
||||
// panneau centré et de la même taille que Settings
|
||||
expect(h.pnCentered).toBe(true);
|
||||
expect(h.pnWidth).toBe(s.pnWidth);
|
||||
expect(h.pnHeight).toBe(s.pnHeight);
|
||||
// le bouton close occupe la même place relative au panneau
|
||||
expect(h.closeTop).toBe(s.closeTop);
|
||||
expect(h.closeRight).toBe(s.closeRight);
|
||||
await page.goto(`${FD_BASE}/help`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForTimeout(300);
|
||||
await page.screenshot({ path: 'shots/v7693-help-overlay.png' });
|
||||
});
|
||||
@@ -0,0 +1,72 @@
|
||||
// v7.69.4 — le bouton close de Settings doit fermer le panneau, y compris
|
||||
// quand Settings est ouvert depuis le MENU UTILISATEUR (navigation partielle).
|
||||
//
|
||||
// `shouldIntercept()` accepte `/settings`, donc ce clic passe par fdLoad()
|
||||
// (htmx + history.pushState) SANS rechargement de page. L'ancien closeSettings()
|
||||
// faisait `history.back()` → popstate → swap PARTIEL de .main-wrapper, et le
|
||||
// panneau `position:fixed` restait peint : « ça ferme mais ça reste ouvert ».
|
||||
// Depuis /workspaces, c'est un chargement complet → pas de symptôme.
|
||||
const { test, expect } = require('@playwright/test');
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
await page.waitForURL('**/workspaces', { timeout: 8000 }).catch(() => {});
|
||||
}
|
||||
const csrfOf = async (page) => {
|
||||
const c = await page.context().cookies();
|
||||
return (c.find((x) => x.name === 'csrf_token') || {}).value || '';
|
||||
};
|
||||
async function makeWorkspace(page) {
|
||||
const r = await page.request.post(`${FD_BASE}/api/workspaces`, {
|
||||
headers: { 'X-CSRF-Token': await csrfOf(page) },
|
||||
data: { name: `e2e-cls-${Date.now()}-${Math.random().toString(16).slice(2, 6)}` },
|
||||
});
|
||||
const j = await r.json();
|
||||
return j.id || (j.workspace && j.workspace.id);
|
||||
}
|
||||
|
||||
// ouvre Settings depuis le menu utilisateur — le chemin qui provoque le bug
|
||||
async function openSettingsFromUserMenu(page) {
|
||||
await page.locator('.workspace-avatar, .user-avatar').first().click();
|
||||
await page.locator('.um-item[href="/settings"]').first().click();
|
||||
await page.waitForSelector('button.settings-close', { timeout: 8000 });
|
||||
}
|
||||
|
||||
test('close ferme Settings ouvert depuis le menu utilisateur (nav partielle)', async ({ page }) => {
|
||||
await login(page);
|
||||
const id = await makeWorkspace(page);
|
||||
await page.goto(`${FD_BASE}/local-workspace?ws=${id}`, { waitUntil: 'domcontentloaded' });
|
||||
|
||||
await openSettingsFromUserMenu(page);
|
||||
expect(page.url()).toContain('/settings');
|
||||
|
||||
await page.locator('button.settings-close').click();
|
||||
await page.waitForTimeout(900);
|
||||
|
||||
// plus sur /settings…
|
||||
expect(page.url()).not.toContain('/settings');
|
||||
expect(page.url()).toContain('/local-workspace');
|
||||
// …et surtout : le panneau `position:fixed` ne doit PLUS être peint. C'est
|
||||
// le symptôme exact rapporté (« ça ferme mais ça reste ouvert »).
|
||||
expect(await page.locator('.settings-overlay').count()).toBe(0);
|
||||
await expect(page.locator('button.settings-close')).toHaveCount(0);
|
||||
});
|
||||
|
||||
test('close ferme Settings ouvert par chargement complet depuis /workspaces', async ({ page }) => {
|
||||
await login(page);
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
await openSettingsFromUserMenu(page);
|
||||
expect(page.url()).toContain('/settings');
|
||||
|
||||
await page.locator('button.settings-close').click();
|
||||
await page.waitForTimeout(900);
|
||||
|
||||
expect(page.url()).not.toContain('/settings');
|
||||
expect(await page.locator('.settings-overlay').count()).toBe(0);
|
||||
});
|
||||
@@ -0,0 +1,164 @@
|
||||
// v7.69.0 — la sélection multi-blocs SURVIT aux gestes qui l'effaçaient :
|
||||
// 1) glisser la souris d'un bloc à l'autre
|
||||
// 2) Ctrl+C sur cette sélection
|
||||
// 3) clic droit → le menu n'efface plus le surlignage
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block', permissions: ['clipboard-read', 'clipboard-write'] });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page.waitForURL('**/workspaces', { timeout: 8000 }).then(() => true).catch(() => false);
|
||||
if (!ok) {
|
||||
await page.request.post(`${FD_BASE}/auth/register`, { data: { email: USER, password: PASS, name: 'E2E' } });
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
async function newPage(page, body) {
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(`${FD_BASE}/board/api/pages?title=sel ${Date.now()}`, {
|
||||
headers: { 'X-CSRF-Token': csrf },
|
||||
});
|
||||
const { id } = await created.json();
|
||||
if (body) {
|
||||
await page.request.post(`${FD_BASE}/board/api/pages/${id}/blocks`, {
|
||||
headers: { 'X-CSRF-Token': csrf },
|
||||
data: { title: 'sel', blocks: body },
|
||||
});
|
||||
}
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
}
|
||||
|
||||
const BLOCKS = [
|
||||
{ id: 'b1', type: 'paragraph', content: 'Premier bloc' },
|
||||
{ id: 'b2', type: 'heading_2', content: 'Titre deux' },
|
||||
{ id: 'b3', type: 'paragraph', content: 'Troisieme bloc' },
|
||||
];
|
||||
|
||||
// état natif de la sélection
|
||||
const nativeSel = (page) =>
|
||||
page.evaluate(() => {
|
||||
const s = window.getSelection();
|
||||
return { rc: s.rangeCount, coll: s.isCollapsed, txt: s.toString().slice(0, 40) };
|
||||
});
|
||||
const clipState = (page) => page.evaluate(() => window.E._clipState());
|
||||
|
||||
// VRAI glisser de souris : le navigateur seul ne franchit jamais deux
|
||||
// contenteditable — c'est _buildSelAt qui reconstruit la plage.
|
||||
async function dragAcross(page, last = 2) {
|
||||
const b1 = await page.locator('#_blocksCt [data-bid]').first().boundingBox();
|
||||
const bEnd = await page.locator('#_blocksCt [data-bid]').nth(last).boundingBox();
|
||||
// on part du tout début du 1er bloc et on va jusqu'à la fin du dernier
|
||||
await page.mouse.move(b1.x + 2, b1.y + b1.height / 2);
|
||||
await page.mouse.down();
|
||||
for (let i = 1; i <= 8; i++) {
|
||||
await page.mouse.move(b1.x + 2, b1.y + b1.height / 2 + ((bEnd.y - b1.y) * i) / 8);
|
||||
}
|
||||
await page.mouse.move(bEnd.x + bEnd.width - 2, bEnd.y + bEnd.height / 2);
|
||||
await page.mouse.up();
|
||||
await page.waitForTimeout(80);
|
||||
}
|
||||
|
||||
test('glisser la souris sur 3 blocs construit une sélection multi-blocs qui survit', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, BLOCKS);
|
||||
await dragAcross(page);
|
||||
|
||||
// la plage reconstruite ne doit PAS être effacée par le « click » suivant
|
||||
const s = await nativeSel(page);
|
||||
expect(s.coll).toBe(false);
|
||||
expect(s.rc).toBe(1);
|
||||
|
||||
const st = await clipState(page);
|
||||
expect(st.si).toBe(0);
|
||||
expect(st.ei).toBe(2);
|
||||
await page.screenshot({ path: 'shots/v769-drag.png' });
|
||||
});
|
||||
|
||||
// VRAI raccourci clavier (pas execCommand) : c'est ce qui était cassé.
|
||||
// Maj+↓ depuis la fin du bloc 1 → la sélection traverse les 3 blocs.
|
||||
async function keyboardExtend(page) {
|
||||
const b1 = await page.locator('#_blocksCt [data-bid]').first().boundingBox();
|
||||
await page.mouse.click(b1.x + 2, b1.y + b1.height / 2);
|
||||
await page.keyboard.press('End');
|
||||
await page.keyboard.press('Shift+ArrowDown');
|
||||
await page.keyboard.press('Shift+ArrowDown');
|
||||
await page.waitForTimeout(80);
|
||||
}
|
||||
|
||||
test('Ctrl+C copie la sélection multi-blocs en markdown', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, BLOCKS);
|
||||
await keyboardExtend(page);
|
||||
expect((await clipState(page)).ei).toBe(2);
|
||||
|
||||
await page.keyboard.press('Control+c'); // le vrai raccourci
|
||||
await page.waitForTimeout(250);
|
||||
const clip = await page.evaluate(() => navigator.clipboard.readText());
|
||||
|
||||
expect(clip).toContain('## Titre deux'); // le titre sort en markdown
|
||||
expect(clip).toContain('Troisieme bloc');
|
||||
|
||||
// Ctrl+X retire les blocs traversés (tête + queue restent)
|
||||
await page.keyboard.press('Control+x');
|
||||
await page.waitForTimeout(300);
|
||||
await expect(page.locator('#_blocksCt [data-bid]')).toHaveCount(2);
|
||||
});
|
||||
|
||||
test("clic droit : le menu s'ouvre SANS effacer le surlignage", async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, BLOCKS);
|
||||
await dragAcross(page);
|
||||
expect((await nativeSel(page)).coll).toBe(false);
|
||||
|
||||
await page.locator('#_blocksCt [data-bid]').nth(1).click({ button: 'right', position: { x: 30, y: 6 } });
|
||||
await page.waitForTimeout(150);
|
||||
|
||||
// le surlignage reste visible
|
||||
const s = await nativeSel(page);
|
||||
expect(s.coll).toBe(false);
|
||||
expect(s.txt.length).toBeGreaterThan(0);
|
||||
|
||||
// …et le groupe Clipboard est bien proposé
|
||||
const menu = page.locator('#blockMenu');
|
||||
await expect(menu).toBeVisible();
|
||||
await expect(menu).toContainText('Clipboard');
|
||||
await expect(menu.locator('[data-bm-act="clip-copy"]')).toBeVisible();
|
||||
await page.screenshot({ path: 'shots/v769-rightclick.png' });
|
||||
});
|
||||
|
||||
test('clic droit → Copy via le menu colle bien le markdown figé', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, BLOCKS);
|
||||
await dragAcross(page);
|
||||
await page.locator('#_blocksCt [data-bid]').nth(1).click({ button: 'right', position: { x: 30, y: 6 } });
|
||||
const menu = page.locator('#blockMenu');
|
||||
await expect(menu.locator('[data-bm-act="clip-copy"]')).toBeVisible();
|
||||
await menu.locator('[data-bm-act="clip-copy"]').click();
|
||||
await page.waitForTimeout(200);
|
||||
const clip = await page.evaluate(() => navigator.clipboard.readText());
|
||||
expect(clip).toContain('Premier bloc');
|
||||
expect(clip).toContain('## Titre deux');
|
||||
});
|
||||
|
||||
test('un clic simple dans un bloc place quand même le curseur (pas de sélection fantôme)', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, BLOCKS);
|
||||
await dragAcross(page);
|
||||
// le clic suivant est un NOUVEL geste : il doit effacer la sélection
|
||||
const b1 = await page.locator('#_blocksCt [data-bid]').first().boundingBox();
|
||||
await page.mouse.click(b1.x + 15, b1.y + b1.height / 2);
|
||||
await page.waitForTimeout(120);
|
||||
const st = await clipState(page);
|
||||
expect(st).toBeNull();
|
||||
});
|
||||
@@ -2246,13 +2246,15 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
|
||||
/* Page de base (premier bloc = embed collection) : le titre et le tableau
|
||||
s'alignent sur la marge gauche de la topbar (16px) au lieu d'être centrés
|
||||
dans la colonne 900px — le tableau démarre au ras du sidebar. */
|
||||
dans la colonne 900px — le tableau démarre au ras du sidebar et prend la
|
||||
LARGEUR DU DOCUMENT (les colonnes dictent le scroll horizontal). */
|
||||
.page-editor-wrapper.db-first .page-cover-area,
|
||||
.page-editor-wrapper.db-first .page-title-block,
|
||||
.page-editor-wrapper.db-first .blocks-container {
|
||||
max-width: 1100px;
|
||||
max-width: 100%;
|
||||
margin: 0;
|
||||
padding-left: var(--space-lg);
|
||||
padding-right: var(--space-lg);
|
||||
}
|
||||
|
||||
/* Une base embarquée ne doit jamais déborder de sa colonne de blocs :
|
||||
@@ -2262,7 +2264,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
/* Titre des pages de base dédiées (page_editor_collection.html) — même
|
||||
liseré gauche que .database-table-container. */
|
||||
.database-page-title {
|
||||
max-width: 1100px;
|
||||
max-width: 100%;
|
||||
margin: 0;
|
||||
padding: 28px var(--space-lg) 0;
|
||||
font-size: 30px;
|
||||
@@ -2339,6 +2341,65 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
/* + « ajouter un bloc dessous » — juste à gauche du handle (gouttière 64px) */
|
||||
.block-insert-btn {
|
||||
position: absolute;
|
||||
left: -64px;
|
||||
top: 5px;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: none;
|
||||
border: none;
|
||||
border-radius: 3px;
|
||||
color: var(--text-dim);
|
||||
font-size: 17px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
opacity: 0;
|
||||
transition: opacity 0.15s ease;
|
||||
}
|
||||
.block-wrapper:hover .block-insert-btn,
|
||||
.block-wrapper:focus-within .block-insert-btn {
|
||||
opacity: 1;
|
||||
}
|
||||
.block-insert-btn:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
/* ── v7.66 : bouton « commenter ce bloc » — à droite du bloc (gouttière 64px),
|
||||
bulle de conversation + , visible au survol comme le handle ── */
|
||||
.block-comment-btn {
|
||||
position: absolute;
|
||||
right: -60px;
|
||||
top: 4px;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: none;
|
||||
border: none;
|
||||
border-radius: 3px;
|
||||
color: var(--text-dim);
|
||||
cursor: pointer;
|
||||
opacity: 0;
|
||||
transition: opacity 0.15s ease;
|
||||
}
|
||||
.block-wrapper:hover .block-comment-btn,
|
||||
.block-wrapper:focus-within .block-comment-btn {
|
||||
opacity: 1;
|
||||
}
|
||||
.block-comment-btn:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
/* ── v5.10.0: selection multiple + menu contexte bloc ── */
|
||||
.block-wrapper.selected {
|
||||
background: rgba(35,131,226,0.06);
|
||||
@@ -2374,6 +2435,30 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.block-menu .bm-item.bm-danger .bm-ico { color: #e5484d; }
|
||||
.block-menu .bm-item.bm-danger:hover { background: rgba(229,72,77,.12); }
|
||||
.block-menu .bm-sep { height: 1px; background: var(--border, #2a2a2a); margin: 5px 4px; }
|
||||
/* ── v7.61 : menu contextuel type Notion — recherche, sections, pied, sous-menus ── */
|
||||
.block-menu .bm-group {
|
||||
padding: 9px 9px 3px;
|
||||
font-size: 10px;
|
||||
font-weight: 600;
|
||||
color: var(--text-tertiary);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: .5px;
|
||||
}
|
||||
.block-menu .bm-foot {
|
||||
border-top: 1px solid var(--border, #2a2a2a);
|
||||
margin-top: 6px;
|
||||
padding: 8px 9px 6px;
|
||||
font-size: 11.5px;
|
||||
line-height: 1.55;
|
||||
color: var(--text-tertiary);
|
||||
}
|
||||
.block-menu .bm-check { margin-left: auto; color: var(--accent, #2383e2); font-size: 12px; }
|
||||
.block-menu .bm-item.bm-current { background: var(--bg-secondary); }
|
||||
.block-menu .bm-dot {
|
||||
display: inline-block; width: 12px; height: 12px; border-radius: 3px;
|
||||
border: 1px solid var(--border, #333); vertical-align: -2px;
|
||||
}
|
||||
.block-menu .bm-search:focus { border-color: var(--accent, #2383e2); }
|
||||
.block-menu .bm-colors { padding: 6px 9px; }
|
||||
.block-menu .bm-colors-label { font-size: 10px; font-weight: 600; color: var(--text-tertiary); text-transform: uppercase; letter-spacing: .4px; margin-bottom: 6px; }
|
||||
.block-menu .bm-swatches { display: flex; flex-wrap: wrap; gap: 6px; }
|
||||
@@ -2404,7 +2489,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
color: var(--text-secondary); cursor: pointer; font-size: 12px; border-radius: 6px;
|
||||
}
|
||||
.block-menu .bm-cancel:hover { background: var(--bg-hover); }
|
||||
.block-menu-sub { min-width: 180px; max-height: 320px; overflow-y: auto; }
|
||||
.block-menu-sub { min-width: 230px; max-height: 60vh; overflow-y: auto; }
|
||||
|
||||
.ftable-hdr-toggle { margin-left: 12px; font-size: 12px; color: var(--text-tertiary); display:inline-flex; align-items:center; gap:2px; }
|
||||
.ftable-hdr-toggle label { display:inline-flex; align-items:center; gap:4px; cursor:pointer; }
|
||||
@@ -2474,11 +2559,20 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
/* Numbered list */
|
||||
/* Numbered list — data-num est calculé au rendu (rangée contiguë) */
|
||||
.block-numbered {
|
||||
padding-left: 22px;
|
||||
padding-left: 32px;
|
||||
position: relative;
|
||||
}
|
||||
.block-numbered[data-num]::before {
|
||||
content: attr(data-num) ". ";
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
min-width: 24px;
|
||||
color: var(--text-primary);
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
/* To-do */
|
||||
.block-todo {
|
||||
@@ -2771,6 +2865,11 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
border-radius: 50%;
|
||||
line-height: 1;
|
||||
}
|
||||
/* v7.68 : la × de suppression de colonne était en opacity:0 SANS règle de
|
||||
survol → invisible et pourtant cliquable (même piège que .block-actions) */
|
||||
.block-column-wrapper:hover .block-actions {
|
||||
opacity: 1;
|
||||
}
|
||||
.block-column {
|
||||
outline: none;
|
||||
min-height: 24px;
|
||||
@@ -2850,35 +2949,410 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/* FORMAT TOOLBAR (FLOATING) */
|
||||
/* FORMAT TOOLBAR (FLOATING) — menu contextuel au highlight (v7.62, façon Notion) */
|
||||
.format-toolbar {
|
||||
position: fixed;
|
||||
z-index: 998;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 2px;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 1px;
|
||||
min-width: 216px;
|
||||
max-height: calc(100vh - 16px);
|
||||
overflow-y: auto;
|
||||
background: var(--bg-modal);
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 16px rgba(0,0,0,0.4);
|
||||
padding: 4px 6px;
|
||||
padding: 6px;
|
||||
}
|
||||
|
||||
.format-toolbar button {
|
||||
width: 30px;
|
||||
.format-toolbar .ft-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.format-toolbar .ft-item {
|
||||
height: 28px;
|
||||
min-width: 28px;
|
||||
padding: 0 7px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
border-radius: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 7px;
|
||||
color: var(--text-primary);
|
||||
font-size: 14px;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
transition: background 0.1s;
|
||||
}
|
||||
.format-toolbar button:hover {
|
||||
.format-toolbar .ft-item:hover {
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
.format-toolbar .ft-item svg {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Ligne 1 : style de texte (libellé du type de bloc + sous-menu) */
|
||||
.format-toolbar .ft-style {
|
||||
width: 100%;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.format-toolbar .ft-style-ico {
|
||||
font-weight: 600;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
.format-toolbar .ft-style-name {
|
||||
flex: 1;
|
||||
text-align: left;
|
||||
}
|
||||
.format-toolbar .ft-caret {
|
||||
color: var(--text-dim);
|
||||
font-size: 15px;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
/* « A » : couleur du texte (barre colorée sous la lettre) */
|
||||
.format-toolbar .ft-a-letter {
|
||||
position: relative;
|
||||
font-weight: 600;
|
||||
}
|
||||
.format-toolbar .ft-a-letter::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 1px;
|
||||
right: 1px;
|
||||
bottom: -4px;
|
||||
height: 3px;
|
||||
border-radius: 2px;
|
||||
background: var(--accent);
|
||||
}
|
||||
.format-toolbar .ft-tx,
|
||||
.format-toolbar .ft-code-ico {
|
||||
font-size: 12px;
|
||||
font-family: var(--font-mono, monospace);
|
||||
}
|
||||
.format-toolbar .ft-hl {
|
||||
border-radius: 2px;
|
||||
padding: 0 3px;
|
||||
background: rgba(255,197,61,.28);
|
||||
}
|
||||
.format-toolbar .ft-more {
|
||||
font-size: 16px;
|
||||
letter-spacing: 1px;
|
||||
}
|
||||
|
||||
/* ── v7.67 : refonte façon capture — ligne Comment | réaction aux 2 extrémités,
|
||||
entête « Skills » avec ≡ à droite, liste Skills scrollable ── */
|
||||
.format-toolbar .ft-row-split {
|
||||
justify-content: space-between;
|
||||
gap: 4px;
|
||||
}
|
||||
.format-toolbar .ft-comment {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.format-toolbar .ft-skills-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.format-toolbar .ft-skills-head::after {
|
||||
content: '≡';
|
||||
font-size: 13px;
|
||||
color: var(--text-dim);
|
||||
}
|
||||
.format-toolbar .ft-skills {
|
||||
max-height: 132px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
/* Séparateurs, groupe « Skills », pied de page */
|
||||
.format-toolbar .ft-sep {
|
||||
height: 1px;
|
||||
background: var(--border);
|
||||
margin: 5px 2px;
|
||||
}
|
||||
.format-toolbar .ft-group {
|
||||
font-size: 11px;
|
||||
color: var(--text-dim);
|
||||
padding: 3px 7px 2px;
|
||||
cursor: default;
|
||||
}
|
||||
.format-toolbar .ft-skill {
|
||||
height: 26px;
|
||||
justify-content: flex-start;
|
||||
font-size: 13px;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
.format-toolbar .ft-foot {
|
||||
height: 26px;
|
||||
width: 100%;
|
||||
justify-content: space-between;
|
||||
font-size: 12px;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
.format-toolbar .ft-foot kbd {
|
||||
font-family: inherit;
|
||||
font-size: 11px;
|
||||
color: var(--text-dim);
|
||||
}
|
||||
|
||||
/* Info-bulle des éléments du menu de sélection : bulle claire, à droite */
|
||||
.tooltip.tooltip-light {
|
||||
background: #ffffff;
|
||||
border-color: #e3e3e3;
|
||||
color: #191919;
|
||||
box-shadow: 0 4px 12px rgba(0,0,0,0.25);
|
||||
white-space: normal;
|
||||
max-width: 240px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
.tooltip.tooltip-light em {
|
||||
color: #6b6b6b;
|
||||
}
|
||||
|
||||
/* ══ v7.63 — Menus mobiles façon Notion : barre horizontale au « / » ══
|
||||
(défilement latéral) + feuille plein écran Insert block / Turn into / Color ══ */
|
||||
.fd-mtb {
|
||||
position: fixed;
|
||||
z-index: 1300;
|
||||
display: none;
|
||||
gap: 2px;
|
||||
padding: 5px 6px;
|
||||
max-width: calc(100vw - 16px);
|
||||
overflow-x: auto;
|
||||
scrollbar-width: none;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
background: var(--bg-modal);
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 6px 20px rgba(0,0,0,.45);
|
||||
}
|
||||
.fd-mtb::-webkit-scrollbar { display: none; }
|
||||
.fd-mtb .fd-mtb-item {
|
||||
flex: 0 0 auto;
|
||||
min-width: 38px;
|
||||
height: 38px;
|
||||
padding: 0 8px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
border-radius: 6px;
|
||||
color: var(--text-primary);
|
||||
font-size: 16px;
|
||||
line-height: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.fd-mtb .fd-mtb-item:active { background: var(--bg-hover); }
|
||||
.fd-mtb .fd-mtb-wide { font-size: 13px; font-weight: 600; padding: 0 10px; }
|
||||
.fd-mtb .fd-mtb-caret { font-size: 10px; color: var(--text-dim); }
|
||||
|
||||
/* Feuille plein écran (titre centré + Cancel bleu à droite, liste qui défile) */
|
||||
.fd-msheet {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 1500;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: var(--bg-secondary, #191919);
|
||||
}
|
||||
.fd-msheet-head {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 14px 16px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
.fd-msheet-title { font-size: 15px; font-weight: 600; color: var(--text-primary); }
|
||||
.fd-msheet-cancel {
|
||||
position: absolute;
|
||||
right: 12px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--accent, #2383E2);
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
padding: 6px;
|
||||
cursor: pointer;
|
||||
}
|
||||
/* la liste porte la classe block-menu (hérite des styles .bm-item/.bm-group)
|
||||
mais doit couvrir tout l'écran, sans la chrome du menu flottant */
|
||||
.fd-msheet-list.block-menu {
|
||||
max-width: none;
|
||||
min-width: 0;
|
||||
background: none;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
box-shadow: none;
|
||||
padding: 6px 8px 40px;
|
||||
flex: 1 1 auto;
|
||||
overflow-y: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
.fd-msheet .bm-item { padding: 12px 10px; font-size: 15px; }
|
||||
.fd-msheet .bm-group { padding: 14px 10px 4px; }
|
||||
.fd-msheet .sm-group {
|
||||
padding: 14px 10px 4px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
color: var(--text-dim);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: .4px;
|
||||
}
|
||||
.fd-msheet .slash-item { padding: 12px 10px; font-size: 15px; }
|
||||
.fd-msheet .slash-item:active { background: var(--bg-hover); }
|
||||
|
||||
/* ══ v7.64 — Commentaires & réactions façon Notion ══
|
||||
Ancres jaunes (texte commenté), pastilles de réaction, tiroir refondu ══ */
|
||||
.fd-anchor {
|
||||
background: rgba(255, 213, 0, .32);
|
||||
border-radius: 2px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.fd-anchor-done { background: rgba(255, 255, 255, .10); }
|
||||
.fd-anchor-react { background: rgba(255, 213, 0, .28); }
|
||||
.fd-react-chip {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 2px;
|
||||
margin-left: 4px;
|
||||
padding: 0 5px;
|
||||
height: 19px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
background: var(--bg-secondary);
|
||||
cursor: pointer;
|
||||
vertical-align: middle;
|
||||
font-size: 11px;
|
||||
line-height: 1;
|
||||
user-select: none;
|
||||
}
|
||||
.fd-react-chip:hover { background: var(--bg-hover); }
|
||||
.fd-react-chip img { width: 12px; height: 12px; object-fit: contain; }
|
||||
.fd-react-n { font-size: 10px; color: var(--text-dim); }
|
||||
|
||||
/* v7.67 : suppression d'une réaction — au survol de la pastille, l'émoji que
|
||||
J'ai posé devient une croix (un seul clic = retirer). Pas de reflow : c'est
|
||||
un ::after, les offsets source ne bougent pas. */
|
||||
.fd-react-emo { position: relative; display: inline-flex; align-items: center; }
|
||||
.fd-react-emo.is-mine::after {
|
||||
content: '✕';
|
||||
position: absolute;
|
||||
inset: -3px;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 9px;
|
||||
line-height: 1;
|
||||
color: var(--text-dim);
|
||||
background: var(--bg-modal, #1f1f1f);
|
||||
border: 1px solid var(--border, #333);
|
||||
border-radius: 50%;
|
||||
cursor: pointer;
|
||||
}
|
||||
.fd-react-chip:hover .fd-react-emo.is-mine::after { display: flex; }
|
||||
.fd-react-emo.is-mine:hover::after { color: #e5484d; border-color: #e5484d; }
|
||||
|
||||
/* Tiroir de commentaires (fil + saisie) */
|
||||
.comment-thread {
|
||||
position: relative;
|
||||
margin-bottom: 12px;
|
||||
padding: 10px 12px;
|
||||
background: var(--bg-secondary, #2a2a2a);
|
||||
border: 1px solid var(--border, #333);
|
||||
border-radius: 10px;
|
||||
}
|
||||
.comment-thread.has-anchor { border-left: 3px solid var(--accent, #2383E2); }
|
||||
.comment-thread.is-resolved { opacity: .55; }
|
||||
.thread-flash { outline: 2px solid var(--accent, #2383E2); outline-offset: 2px; }
|
||||
.ct-head { display: flex; align-items: center; gap: 8px; position: relative; }
|
||||
.ct-avatar {
|
||||
width: 24px; height: 24px; border-radius: 50%; color: #fff; flex-shrink: 0;
|
||||
display: flex; align-items: center; justify-content: center; font-size: 11px; font-weight: 700;
|
||||
}
|
||||
.ct-name { font-size: 12px; font-weight: 600; color: var(--text-primary); }
|
||||
.ct-time { font-size: 11px; color: var(--text-dim); margin-left: auto; }
|
||||
.ct-actions { display: flex; gap: 2px; margin-left: 2px; }
|
||||
.ct-act {
|
||||
width: 24px; height: 24px; border: none; background: transparent; border-radius: 5px;
|
||||
color: var(--text-dim); font-size: 13px; line-height: 1; cursor: pointer;
|
||||
}
|
||||
.ct-act:hover { background: var(--bg-hover); color: var(--text-primary); }
|
||||
.ct-act.is-on { color: var(--accent, #2383E2); }
|
||||
.ct-menu {
|
||||
position: absolute; right: 0; top: 28px; z-index: 6; min-width: 156px; padding: 4px;
|
||||
background: var(--bg-modal); border: 1px solid var(--border); border-radius: 8px;
|
||||
box-shadow: 0 8px 24px rgba(0,0,0,.4);
|
||||
}
|
||||
.ct-menu-item {
|
||||
display: block; width: 100%; text-align: left; padding: 7px 10px; font-size: 13px;
|
||||
color: var(--text-primary); background: none; border: none; border-radius: 5px; cursor: pointer;
|
||||
}
|
||||
.ct-menu-item:hover { background: var(--bg-hover); }
|
||||
.ct-menu-item.is-danger { color: #e5484d; }
|
||||
.ct-body { font-size: 13px; white-space: pre-wrap; margin-top: 6px; color: var(--text-primary); }
|
||||
.ct-anchor-label { font-size: 10px; color: var(--text-dim); margin-top: 6px; }
|
||||
|
||||
/* v7.67 : section Réactions du tiroir (liste des plages réagies + retirer) */
|
||||
.ct-section-title {
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
letter-spacing: .5px;
|
||||
text-transform: uppercase;
|
||||
color: var(--text-dim);
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.ct-reaction {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 6px 8px;
|
||||
margin-bottom: 6px;
|
||||
background: var(--bg-secondary, #2a2a2a);
|
||||
border: 1px solid var(--border, #333);
|
||||
border-radius: 8px;
|
||||
font-size: 13px;
|
||||
}
|
||||
.ct-re-emoji { font-size: 14px; line-height: 1; flex-shrink: 0; }
|
||||
.ct-re-count { font-size: 11px; color: var(--text-dim); }
|
||||
.ct-re-text {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
color: var(--text-secondary);
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.comments-drawer-input { border-top: 1px solid var(--border, #333); padding: 12px 16px; }
|
||||
.ct-input-row { display: flex; gap: 6px; align-items: flex-end; }
|
||||
.ct-input-row textarea {
|
||||
flex: 1; min-width: 0; background: var(--bg-secondary, #2a2a2a);
|
||||
border: 1px solid var(--border, #333); border-radius: 8px; color: var(--text-primary);
|
||||
font-size: 13px; font-family: inherit; line-height: 1.4; padding: 8px 10px; resize: none; outline: none;
|
||||
}
|
||||
.ct-input-row textarea:focus { border-color: var(--accent, #2383E2); }
|
||||
.ct-input-actions { display: flex; gap: 4px; align-items: center; padding-bottom: 2px; }
|
||||
.ct-send {
|
||||
width: 30px; height: 30px; border-radius: 50%; background: var(--accent, #2383E2); color: #fff;
|
||||
border: none; font-size: 15px; line-height: 1; cursor: pointer; flex-shrink: 0;
|
||||
}
|
||||
.ct-send:disabled { opacity: .4; cursor: default; }
|
||||
|
||||
/* Bouton « React to selected text » de la toolbar de sélection */
|
||||
.ft-react-ico { position: relative; font-size: 15px; line-height: 1; }
|
||||
.ft-react-plus {
|
||||
position: absolute; right: -5px; top: -4px; font-size: 9px; font-weight: 700; color: var(--text-dim);
|
||||
}
|
||||
|
||||
/* EDITOR STATUSBAR */
|
||||
.editor-statusbar {
|
||||
@@ -2923,7 +3397,9 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.page-title-input { font-size: 28px; }
|
||||
.blocks-container { padding: 8px 16px 96px; }
|
||||
.block-handle { display: none; }
|
||||
.block-insert-btn { display: none; }
|
||||
.block-actions { display: none; }
|
||||
.block-comment-btn { display: none; }
|
||||
.editor-statusbar { left: 0; }
|
||||
}
|
||||
|
||||
@@ -3398,6 +3874,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.page-cover-area { padding: 32px 32px 8px; }
|
||||
.blocks-container { padding: 8px 32px 80px; }
|
||||
.block-handle { left: -32px; }
|
||||
.block-insert-btn { left: -56px; }
|
||||
.page-title-block::before { left: -32px; }
|
||||
.page-title-input { font-size: 32px; }
|
||||
|
||||
@@ -3422,7 +3899,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
|
||||
/* ── Sidebar mobile ── */
|
||||
.sidebar {
|
||||
display: block;
|
||||
display: flex; flex-direction: column; /* block cassait flex:1 de .sidebar-scroll → drawer impossible à scroller */
|
||||
position: fixed !important;
|
||||
top: 0; left: 0;
|
||||
bottom: 0; width: 85vw; max-width: 320px;
|
||||
@@ -3488,7 +3965,9 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.page-title-input { font-size: 24px; }
|
||||
.blocks-container { padding: 8px 16px 96px; }
|
||||
.block-handle { display: none; }
|
||||
.block-insert-btn { display: none; }
|
||||
.block-actions { display: none; }
|
||||
.block-comment-btn { display: none; }
|
||||
.page-title-block::before { display: none; }
|
||||
.page-title-block .page-icon-emoji { margin-left: 0; }
|
||||
.page-title-block .page-title-input { padding-left: 0; }
|
||||
@@ -3575,7 +4054,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.slash-menu { width: 90vw; max-width: 90vw; left: 5vw !important; }
|
||||
|
||||
/* ── Format Toolbar ── */
|
||||
.format-toolbar { left: 8px !important; right: 8px; flex-wrap: wrap; justify-content: center; }
|
||||
.format-toolbar { left: 8px !important; right: 8px; }
|
||||
}
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════
|
||||
@@ -3899,11 +4378,10 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
═══════════════════════════════════════════════════════════ */
|
||||
|
||||
/* Base = viewport du contenu ; les vues tabulaires larges (bases de
|
||||
données) s'alignent à gauche, au ras de la marge, à la même largeur
|
||||
que Library (1100px). */
|
||||
données) prennent la LARGEUR DU DOCUMENT (les colonnes dictent le scroll
|
||||
horizontal), alignées à gauche au ras de la marge. */
|
||||
.database-table-container {
|
||||
width: 100%;
|
||||
max-width: 1100px;
|
||||
margin: 0;
|
||||
/* var(--space-lg) = padding de .topbar : le bord gauche du tableau
|
||||
s'aligne sur le titre du fil d'ariane, au ras de la marge. */
|
||||
@@ -4633,6 +5111,7 @@ a.fd-wiki-link:hover { border-bottom-color: var(--accent, #2383e2); }
|
||||
font-weight: 500;
|
||||
}
|
||||
body.page-locked .block-handle,
|
||||
body.page-locked .block-comment-btn,
|
||||
body.page-locked .block-add-btn,
|
||||
body.page-locked .format-toolbar,
|
||||
body.page-locked .get-started-toolbar { display: none !important; }
|
||||
|
||||
@@ -207,6 +207,14 @@
|
||||
}
|
||||
.mt-card:active { cursor: grabbing; opacity: .7; }
|
||||
.mt-card-title { font-weight: 500; }
|
||||
/* Bouton « Open » en overlay au survol de la tuile (la carte est une
|
||||
colonne flex : une place en flux déformerait la tuile). */
|
||||
.mt-card { position: relative; }
|
||||
.mt-card .mt-open-btn {
|
||||
position: absolute; top: 6px; right: 6px; margin-left: 0;
|
||||
}
|
||||
.mt-card:hover .mt-hover-only,
|
||||
.mt-card:focus-within .mt-hover-only { opacity: 1; }
|
||||
.mt-card-due,
|
||||
.mt-card-src { font-size: 11px; color: var(--text-dim, #999); }
|
||||
.mt-card-src { opacity: .8; }
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
/* ═══ Panel skeleton shared by /settings and /help (Notion-style modal) ═══ */
|
||||
.settings-overlay{position:fixed;inset:0;z-index:500;display:flex;background:rgba(0,0,0,.4);backdrop-filter:blur(2px);}
|
||||
.settings-panel{position:relative;display:flex;width:1050px;max-width:98vw;height:85vh;margin:auto;background:var(--bg-primary);border:1px solid var(--border-strong);border-radius:14px;box-shadow:var(--shadow-modal);overflow:hidden;}
|
||||
.settings-nav{width:200px;min-width:200px;background:var(--bg-sidebar);border-right:1px solid var(--border);padding:8px 0;overflow-y:auto;}
|
||||
.settings-nav-header{padding:12px 16px;font-size:13px;font-weight:600;color:var(--text-dim);text-transform:uppercase;letter-spacing:.5px;}
|
||||
.settings-nav-item{display:flex;align-items:center;gap:8px;padding:6px 16px;font-size:13px;color:var(--text-secondary);cursor:pointer;transition:background 100ms;border-radius:0;}
|
||||
.settings-nav-item:hover{background:var(--bg-hover);}
|
||||
.settings-nav-item.active{background:rgba(35,131,226,.12);color:var(--text);font-weight:500;}
|
||||
.settings-content{flex:1;overflow-y:auto;padding:24px 32px;}
|
||||
.settings-content h2{font-size:18px;font-weight:600;margin-bottom:4px;}
|
||||
.settings-content .section-desc{font-size:12px;color:var(--text-dim);margin-bottom:24px;}
|
||||
.settings-close{position:absolute;top:12px;right:12px;width:32px;height:32px;background:none;border:none;color:var(--text-dim);font-size:20px;cursor:pointer;border-radius:6px;display:flex;align-items:center;justify-content:center;text-decoration:none;}
|
||||
.settings-close:hover{background:var(--bg-hover);color:var(--text);}
|
||||
|
||||
/* Mobile hamburger for the panel nav — hidden on desktop */
|
||||
.settings-menu-btn{display:none;position:absolute;top:8px;left:8px;z-index:20;width:40px;height:40px;border:none;border-radius:8px;background:var(--bg-tertiary);color:var(--text);align-items:center;justify-content:center;cursor:pointer;}
|
||||
.settings-nav-backdrop{display:none;}
|
||||
|
||||
/* ── Mobile: nav becomes a left side-navigation drawer (hamburger opens it) ── */
|
||||
@media (max-width:768px){
|
||||
.settings-overlay{background:var(--bg-primary);backdrop-filter:none;}
|
||||
.settings-panel{flex-direction:column;width:100vw;max-width:100vw;height:100dvh;max-height:100dvh;margin:0;border:none;border-radius:0;box-shadow:none;}
|
||||
.settings-menu-btn{display:flex;}
|
||||
.settings-nav{position:fixed;top:0;left:0;bottom:0;width:260px;max-width:80vw;min-width:0;z-index:600;transform:translateX(-100%);transition:transform .2s cubic-bezier(0.4,0,0.2,1);border-right:1px solid var(--border);box-shadow:4px 0 24px rgba(0,0,0,.4);padding-top:8px;}
|
||||
.settings-nav.nav-open{transform:translateX(0);}
|
||||
.settings-nav-item{padding:10px 16px;}
|
||||
.settings-nav-backdrop{display:block;position:fixed;inset:0;background:rgba(0,0,0,.5);z-index:599;}
|
||||
.settings-content{padding:56px 16px 16px;}
|
||||
.settings-close{top:8px;right:8px;width:44px;height:44px;background:var(--bg-tertiary);}
|
||||
.setting-row{flex-wrap:wrap;}
|
||||
.setting-control{margin-left:0;width:100%;}
|
||||
.prov-grid{grid-template-columns:1fr;}
|
||||
.avatar-section{gap:10px;}
|
||||
}
|
||||
|
After Width: | Height: | Size: 4.1 KiB |
@@ -1,4 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
|
||||
<rect width="32" height="32" rx="6" fill="#2383E2"/>
|
||||
<text x="16" y="22" text-anchor="middle" font-family="Arial,sans-serif" font-size="16" font-weight="bold" fill="#fff">FD</text>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 253 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 999 B After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 92 KiB |
|
Before Width: | Height: | Size: 624 B After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 767 B After Width: | Height: | Size: 5.9 KiB |
|
After Width: | Height: | Size: 64 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 5.3 KiB |
@@ -40,7 +40,7 @@
|
||||
if (window.Alpine) window.Alpine.__fdIconPicker = true;
|
||||
|
||||
Alpine.store('fdIconPicker', {
|
||||
open: false, x: 0, y: 0, tab: 'emoji', query: '', category: 'people',
|
||||
open: false, x: 0, y: 0, tab: 'emoji', query: '', category: 'people', title: '',
|
||||
skinTone: 0, toneOpen: false, recent: [], custom: [], customLoaded: false,
|
||||
customModal: false, customName: '', customPreview: '', customFile: null, customBusy: false,
|
||||
onPick: null, onRemove: null, _cx: 0, _cy: 0,
|
||||
@@ -50,6 +50,9 @@
|
||||
opts = opts || {};
|
||||
this.onPick = opts.onPick || null;
|
||||
this.onRemove = opts.onRemove || null;
|
||||
// v7.64 : mode « réaction » — en-tête = texte sélectionné, emoji only
|
||||
this.title = opts.title || '';
|
||||
if (this.title) { this.tab = 'emoji'; this.category = 'people'; }
|
||||
this.query = '';
|
||||
this.toneOpen = false;
|
||||
this.customModal = false;
|
||||
@@ -78,6 +81,7 @@
|
||||
|
||||
close() {
|
||||
this.open = false;
|
||||
this.title = '';
|
||||
this.customModal = false;
|
||||
this.toneOpen = false;
|
||||
this.onPick = null;
|
||||
|
||||
@@ -32,6 +32,30 @@
|
||||
{cmd:'/livrable', icon:'📨', desc:'email / compte-rendu / message Slack',
|
||||
template:'Rédige un livrable professionnel (email, compte-rendu ou message Slack) sur [sujet / destinataire / contexte].'}
|
||||
];
|
||||
// ── Menu + (v7.51.0) : sections à deux niveaux. `soon` = section pas encore
|
||||
// livrée → affichée mais non cliquable (le menu ne promet rien que le code ne fait).
|
||||
var FD_PLUS_MENU = [
|
||||
{key:'files', icon:'📎', label:'Ajouter des fichiers ou répertoires',
|
||||
sub:'Rechercher ou parcourir le workspace', action:'files', chev:true},
|
||||
{key:'skills', icon:'✨', label:'Compétences-skills',
|
||||
sub:'Deep research, Skill-creator… · Gérer · Parcourir', action:'skills', chev:true},
|
||||
{key:'connectors', icon:'🔌', label:'Connecteurs',
|
||||
sub:'Parcourir les connecteurs · ajouter un personnalisé', action:'connectors', chev:true},
|
||||
{key:'canvases', icon:'🎨', label:'Design System – Canevas',
|
||||
sub:'Galerie de canevas : créer, insérer, enregistrer', action:'canvases', chev:true},
|
||||
{key:'plugins', icon:'🧩', label:'Add plugins',
|
||||
sub:'Modules on/off — effet réel : routes, UI, outils', action:'plugins', chev:true},
|
||||
{key:'memory', icon:'🧠', label:'Mémoire (on/off)',
|
||||
sub:'Résumés des échanges injectés à chaque run', action:'memory'}
|
||||
];
|
||||
var FD_PLUS_FILES = [
|
||||
{key:'f-search', icon:'🔍', label:'Rechercher…',
|
||||
sub:'Documents, bases, pages par nom', action:'search', chev:true},
|
||||
{key:'f-browse', icon:'📁', label:'Parcourir…',
|
||||
sub:'Dossiers et fichiers du workspace', action:'browse', chev:true}
|
||||
];
|
||||
// Libellés affichés des skills builtin (le slug /commande reste inchangé).
|
||||
var FD_SKILL_ALIAS = {'research': 'Deep research', 'create-new-skill': 'Skill-creator'};
|
||||
|
||||
function agentPanel(){
|
||||
return {
|
||||
@@ -45,6 +69,14 @@
|
||||
contextChips: [], skills: [], gallery: [],
|
||||
mentionOpen: false, mentionItems: [], mentionQuery: '', mentionLoad: false,
|
||||
mentionFocus: -1, _mentionFrom: null, _mentionTimer: null, _atNode: null,
|
||||
plusOpen: false, plusSection: 'root', plusFocus: -1, plusLoading: false,
|
||||
plusBrowse: [], plusCrumb: [],
|
||||
skillForm: {id: null, name: '', description: '', prompt_template: ''},
|
||||
galleryFilter: '',
|
||||
canvases: [], canvas: null,
|
||||
connectors: [], connector: null, plugins: [],
|
||||
connectorForm: {name: '', url: '', secret: '', kind: 'custom',
|
||||
auth: 'bearer', hint: ''},
|
||||
cmdFocus: -1, slashDismiss: false,
|
||||
toastMsg: '', toastErr: false, _toastTimer: null,
|
||||
_livePh: null,
|
||||
@@ -55,6 +87,18 @@
|
||||
init(){
|
||||
var self = this;
|
||||
var el = document.getElementById('fd-agent-panel');
|
||||
// Retour du flux OAuth (Google / M365) : signaler le résultat puis nettoyer l'URL.
|
||||
try{
|
||||
var qs = new URLSearchParams(window.location.search);
|
||||
if(qs.get('oauth') || qs.get('oauth_error')){
|
||||
this.toast(qs.get('oauth_error')
|
||||
? 'Connexion du connecteur refusée : ' + qs.get('oauth_error')
|
||||
: 'Connecteur connecté.', !!qs.get('oauth_error'));
|
||||
qs.delete('oauth'); qs.delete('oauth_error');
|
||||
window.history.replaceState(null, '', window.location.pathname
|
||||
+ (qs.toString() ? '?' + qs.toString() : '') + window.location.hash);
|
||||
}
|
||||
}catch{ /* volontaire */ }
|
||||
|
||||
function applyState(){
|
||||
if(el){ if(self.open){ el.classList.add('open'); el.setAttribute('aria-hidden','false'); } else { el.classList.remove('open'); el.setAttribute('aria-hidden','true'); } }
|
||||
@@ -469,7 +513,8 @@
|
||||
var pin = {key:'skill-'+id, kind:'skill', icon: icon || '✨',
|
||||
label: String(name || '').replace(/^\//, ''), token:'skill:'+id, skillId:id};
|
||||
this.contextChips.push(pin);
|
||||
this.clearComposer();
|
||||
// Ne jamais effacer un message déjà tapé (le token s'ajoute à la fin).
|
||||
if(!this.composerText().trim()) this.clearComposer();
|
||||
this._insertToken({token:pin.token, label:pin.label, icon:pin.icon, kind:'skill'});
|
||||
this.toast('Skill épinglé — décrivez votre demande, il sera appliqué à l\u2019envoi.');
|
||||
},
|
||||
@@ -616,7 +661,8 @@
|
||||
if(self.llmModel) body.model = self.llmModel;
|
||||
fetch('/api/agent/conversations', {method:'POST', headers:{'X-CSRF-Token': getCsrf(), 'Content-Type':'application/json'}, body: JSON.stringify(body)})
|
||||
.then(function(r){return r.json()}).then(function(d){
|
||||
var conv = {id:d.id, title:d.title, updated_at:new Date().toISOString()};
|
||||
var conv = {id:d.id, title:d.title, memory_enabled:d.memory_enabled,
|
||||
updated_at:new Date().toISOString()};
|
||||
self.conversations.unshift(conv); self.currentConv = conv;
|
||||
self.messages = []; self.errorMsg=''; self.notice=''; self.tab='chat';
|
||||
self.contextChips = []; self.mentionOpen = false;
|
||||
@@ -633,7 +679,8 @@
|
||||
self._ensuring = fetch('/api/agent/conversations', {
|
||||
method:'POST', headers:{'X-CSRF-Token': getCsrf(), 'Content-Type':'application/json'}, body: JSON.stringify(body)
|
||||
}).then(function(r){return r.json()}).then(function(d){
|
||||
var conv = {id:d.id, title:d.title, updated_at:new Date().toISOString()};
|
||||
var conv = {id:d.id, title:d.title, memory_enabled:d.memory_enabled,
|
||||
updated_at:new Date().toISOString()};
|
||||
self.conversations.unshift(conv); self.currentConv = conv;
|
||||
self.messages = []; self.errorMsg=''; self.notice=''; self.tab='chat';
|
||||
self.contextChips = []; self.mentionOpen = false;
|
||||
@@ -1070,12 +1117,659 @@
|
||||
this._toastTimer = setTimeout(function(){ self.toastMsg = ''; self.toastErr = false; }, 3200);
|
||||
},
|
||||
|
||||
// ── Mentions & contexte épinglé (@ / +) ──
|
||||
// ── Menu + (sections) & mentions (@ / recherche) ──
|
||||
toggleAddPicker(){
|
||||
if(this.mentionOpen && this._mentionFrom === '+'){ this.mentionOpen = false; this.mentionQuery = ''; return; }
|
||||
this.openMentionPicker('+');
|
||||
if(this.mentionOpen){
|
||||
this.mentionOpen = false; this.mentionQuery = '';
|
||||
this._mentionFrom = null; this._atNode = null;
|
||||
}
|
||||
if(this.plusOpen){ this.closePlus(); return; }
|
||||
this.plusOpen = true;
|
||||
this.plusSection = 'root';
|
||||
this.plusFocus = 0;
|
||||
},
|
||||
closePlus(){
|
||||
this.plusOpen = false;
|
||||
this.plusSection = 'root';
|
||||
this.plusCrumb = [];
|
||||
this.plusBrowse = [];
|
||||
this.plusFocus = -1;
|
||||
},
|
||||
get plusTitle(){
|
||||
var s = this.plusSection;
|
||||
if(s === 'files') return 'Fichiers & répertoires';
|
||||
if(s === 'browse') return 'Parcourir le workspace';
|
||||
if(s === 'skills') return 'Compétences-skills';
|
||||
if(s === 'skills-manage') return 'Gérer les compétences';
|
||||
if(s === 'skills-gallery') return 'Parcourir les compétences';
|
||||
if(s === 'skills-edit') return this.skillForm.id ? 'Modifier le skill' : 'Nouveau skill';
|
||||
if(s === 'connectors') return 'Connecteurs';
|
||||
if(s === 'connector') return this.connector ? this.connector.name : 'Connecteur';
|
||||
if(s === 'connector-new') return 'Ajouter un connecteur';
|
||||
if(s === 'canvases') return 'Design System – Canevas';
|
||||
if(s === 'canvas') return this.canvas ? this.canvas.name : 'Canevas';
|
||||
if(s === 'plugins') return 'Add plugins';
|
||||
return 'Ajouter au contexte';
|
||||
},
|
||||
get plusItems(){
|
||||
var s = this.plusSection;
|
||||
if(s === 'files') return FD_PLUS_FILES;
|
||||
if(s === 'browse') return this.plusBrowse;
|
||||
if(s === 'skills') return this._skillsItems();
|
||||
if(s === 'skills-manage') return this._manageItems();
|
||||
if(s === 'skills-gallery') return this._galleryItems();
|
||||
if(s === 'skills-edit') return []; // formulaire, pas de liste
|
||||
if(s === 'connectors') return this._connectorItems();
|
||||
if(s === 'connector') return this._connectorActionItems();
|
||||
if(s === 'connector-new') return [];
|
||||
if(s === 'canvases') return this._canvasItems();
|
||||
if(s === 'canvas') return this._canvasActionItems();
|
||||
if(s === 'plugins') return this._pluginItems();
|
||||
if(s === 'root'){
|
||||
// l'entrée Mémoire reflète l'état réel du toggle de la conversation
|
||||
var on = this.memoryOn;
|
||||
return FD_PLUS_MENU.map(function(it){
|
||||
if(it.key !== 'memory') return it;
|
||||
return {key:'memory', icon: on ? '🧠' : '💭', label:'Mémoire (on/off)',
|
||||
sub: on ? 'Activée — résumés des échanges injectés à chaque run'
|
||||
: 'Désactivée — contexte strict du run courant',
|
||||
action:'memory'};
|
||||
});
|
||||
}
|
||||
return FD_PLUS_MENU;
|
||||
},
|
||||
// État du toggle mémoire de la conversation courante (défaut : activée).
|
||||
get memoryOn(){
|
||||
if(!this.currentConv) return true;
|
||||
var v = this.currentConv.memory_enabled;
|
||||
return v === undefined || v === null ? true : !!Number(v);
|
||||
},
|
||||
// Bascule le toggle mémoire (PATCH /api/agent/conversations/{id}).
|
||||
toggleMemory(){
|
||||
var self = this, conv = this.currentConv;
|
||||
if(!conv || !conv.id){
|
||||
this.toast('Ouvrez une conversation pour activer la mémoire.', true);
|
||||
return;
|
||||
}
|
||||
var next = this.memoryOn ? 0 : 1;
|
||||
fetch('/api/agent/conversations/' + conv.id, {
|
||||
method: 'PATCH', headers: {'X-CSRF-Token': getCsrf(), 'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({memory_enabled: next})
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok: r.ok, d: d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Bascule impossible.', true); return; }
|
||||
conv.memory_enabled = next;
|
||||
self.toast(next ? 'Mémoire activée — résumés injectés à chaque run.'
|
||||
: 'Mémoire désactivée — contexte strict du run courant.');
|
||||
}).catch(function(){ self.toast('Bascule impossible (réseau).', true); });
|
||||
},
|
||||
// Sous-menu Compétences : builtin (alias affiché) + installés, puis les 2 actions.
|
||||
_skillsItems(){
|
||||
var out = [];
|
||||
FD_SKILLS.forEach(function(c){
|
||||
var slug = String(c.cmd).replace(/^\//, '');
|
||||
out.push({key:'bi-'+slug, icon:c.icon, label:FD_SKILL_ALIAS[slug] || c.cmd,
|
||||
sub:c.desc, action:'skill',
|
||||
suggestion:{key:'bi-'+slug, cmd:c.cmd, icon:c.icon, template:c.template, _type:'builtin'}});
|
||||
});
|
||||
(this.skills || []).forEach(function(sk){
|
||||
out.push({key:'db-'+sk.id, icon:'✨', label:sk.name,
|
||||
sub:sk.description || 'Skill enregistré', action:'skill',
|
||||
suggestion:{key:'db-'+sk.id, cmd:'/'+sk.name, icon:'✨', _type:'db', skillId:sk.id}});
|
||||
});
|
||||
out.push({key:'sep-actions', _sep:'Gérer / parcourir'});
|
||||
out.push({key:'a-manage', icon:'🛠️', label:'Gérer les compétences',
|
||||
sub:'Créer, modifier, supprimer, exporter / importer', action:'skills-manage', chev:true});
|
||||
out.push({key:'a-browse', icon:'🗂️', label:'Parcourir les compétences',
|
||||
sub:'Galerie de presets installables en 1 clic', action:'skills-gallery', chev:true});
|
||||
return out;
|
||||
},
|
||||
// Sous-section Gérer : liste des skills + création + import.
|
||||
_manageItems(){
|
||||
var out = [];
|
||||
(this.skills || []).forEach(function(sk){
|
||||
out.push({key:'m-'+sk.id, icon:'✨', label:sk.name,
|
||||
sub:sk.description || 'Cliquer pour modifier', action:'skill-edit', chev:true, skillId:sk.id});
|
||||
});
|
||||
if(!out.length) out.push({key:'m-none', _sep:'Aucun skill enregistré'});
|
||||
out.push({key:'m-new', icon:'+', label:'Nouveau skill',
|
||||
sub:'Nom, description, prompt', action:'skill-new', chev:true});
|
||||
out.push({key:'m-sep', _sep:'Import'});
|
||||
out.push({key:'m-import', icon:'📥', label:'Importer un skill (JSON)',
|
||||
sub:'Document exporté depuis une autre instance', action:'skill-import'});
|
||||
return out;
|
||||
},
|
||||
// Sous-section Parcourir : presets de la galerie, filtrables.
|
||||
_galleryItems(){
|
||||
var f = String(this.galleryFilter || '').toLowerCase();
|
||||
var out = [];
|
||||
(this.gallery || []).forEach(function(g){
|
||||
var hay = (String(g.name || '') + ' ' + (g.description || '') + ' ' + (g.slug || '')).toLowerCase();
|
||||
if(f && hay.indexOf(f) < 0) return;
|
||||
out.push({key:'g-'+g.slug, icon:g.icon || '📦', label:g.name,
|
||||
sub:g.description || 'Preset de la galerie', action:'skill-install',
|
||||
slug:g.slug, skillName:g.name});
|
||||
});
|
||||
if(!out.length) out.push({key:'g-none', _sep: f ? 'Aucun résultat' : 'Galerie vide'});
|
||||
return out;
|
||||
},
|
||||
// ── Connecteurs (v7.55.0) ──
|
||||
fetchConnectors(){
|
||||
var self = this;
|
||||
fetch('/api/agent/connectors').then(function(r){ return r.json(); })
|
||||
.then(function(d){
|
||||
self.connectors = d.connectors || [];
|
||||
// garde la fiche ouverte alignée sur la liste rafraîchie
|
||||
var sel = self.connector;
|
||||
if(sel){
|
||||
var found = null;
|
||||
self.connectors.forEach(function(c){
|
||||
if((sel.id != null && c.id === sel.id) || (sel.id == null && c.kind === sel.kind)) found = c;
|
||||
});
|
||||
self.connector = found;
|
||||
}
|
||||
}).catch(function(){ self.connectors = []; });
|
||||
},
|
||||
_connectorStatus(c){
|
||||
var mark = c.status === 'ok' ? '✓ ' : (c.status === 'error' ? '✗ '
|
||||
: (c.status === 'missing' ? '⚠ ' : '? '));
|
||||
var tools = (c.kind === 'mcp' && c.tools_count) ? ' · ' + c.tools_count + ' outil(s)' : '';
|
||||
return mark + (c.detail || c.status) + tools + (c.enabled ? '' : ' · désactivé');
|
||||
},
|
||||
// ── Plugins de l'instance (v7.58.0) ──
|
||||
fetchPlugins(){
|
||||
var self = this;
|
||||
fetch('/api/agent/plugins').then(function(r){ return r.json(); })
|
||||
.then(function(d){ self.plugins = (d && d.plugins) || []; })
|
||||
.catch(function(){ self.plugins = []; });
|
||||
},
|
||||
_pluginItems(){
|
||||
var out = (this.plugins || []).map(function(pl){
|
||||
return {key:'pl-' + pl.slug, icon: pl.enabled ? '✅' : '⛔',
|
||||
label: pl.name,
|
||||
sub: (pl.enabled ? 'Activé' : 'Désactivé') + ' — ' + pl.description,
|
||||
action:'plugin-toggle', slug: pl.slug};
|
||||
});
|
||||
if(!out.length) out.push({key:'pl-none', _sep:'Aucun plugin'});
|
||||
out.push({key:'pl-hint', _sep:
|
||||
'OFF = routes refusées, UI masquée, outils retirés'});
|
||||
return out;
|
||||
},
|
||||
pluginToggle(slug){
|
||||
var self = this;
|
||||
var pl = (this.plugins || []).filter(function(x){ return x.slug === slug; })[0];
|
||||
if(!pl) return;
|
||||
fetch('/api/agent/plugins/' + encodeURIComponent(slug), {
|
||||
method:'PATCH', headers:{'X-CSRF-Token': getCsrf(), 'Content-Type':'application/json'},
|
||||
body: JSON.stringify({enabled: !pl.enabled})
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok:r.ok, d:d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Bascule impossible.', true); return; }
|
||||
self.toast(res.d.enabled ? 'Plugin activé.' : 'Plugin désactivé.');
|
||||
self.fetchPlugins();
|
||||
}).catch(function(){ self.toast('Bascule impossible (réseau).', true); });
|
||||
},
|
||||
_connectorItems(){
|
||||
var self = this;
|
||||
var out = (this.connectors || []).map(function(c){
|
||||
return {key:'cn-' + (c.id != null ? c.id : c.kind), icon: c.builtin ? '🌐' : '🔌',
|
||||
label: c.name, sub: self._connectorStatus(c),
|
||||
action:'connector', connector:c, chev:true};
|
||||
});
|
||||
if(!out.length) out.push({key:'cn-none', _sep:'Aucun connecteur'});
|
||||
out.push({key:'cn-sep', _sep:'Ajout'});
|
||||
out.push({key:'cn-new', icon:'+', label:'Ajouter un connecteur personnalisé',
|
||||
sub:'URL publique + clé API', action:'connector-new', chev:true});
|
||||
return out;
|
||||
},
|
||||
_connectorActionItems(){
|
||||
var c = this.connector;
|
||||
if(!c) return [];
|
||||
var items = [
|
||||
{key:'cn-meta', _sep: (c.builtin ? 'Connecteur natif · ' : 'Connecteur · ') + c.name},
|
||||
{key:'cn-probe', icon:'↻', label:'Tester le connecteur',
|
||||
sub:'Appel de contrôle — status + détail', action:'connector-probe'}
|
||||
];
|
||||
if(c.oauth){
|
||||
var connected = c.status === 'ok';
|
||||
items.push({key:'cn-oauth', icon: connected ? '🔓' : '🔑',
|
||||
label: connected ? 'Déconnecter' : 'Se connecter',
|
||||
sub: connected ? 'Retire les autorisations de ce compte'
|
||||
: 'Ouvre la page de connexion du fournisseur',
|
||||
action: connected ? 'connector-disconnect' : 'connector-connect'});
|
||||
}
|
||||
if(!c.builtin){
|
||||
items.push({key:'cn-toggle', icon: c.enabled ? '⏸' : '▶',
|
||||
label: c.enabled ? 'Désactiver' : 'Activer',
|
||||
sub:'Désactivé = lecture refusée par l\u2019outil', action:'connector-toggle'});
|
||||
items.push({key:'cn-del', icon:'🗑️', label:'Supprimer le connecteur',
|
||||
sub:'Supprime aussi sa clé', action:'connector-delete'});
|
||||
}
|
||||
return items;
|
||||
},
|
||||
_connectorRef(c){
|
||||
c = c || this.connector;
|
||||
return c ? (c.id != null ? String(c.id) : c.kind) : '';
|
||||
},
|
||||
connectorProbe(){
|
||||
var self = this;
|
||||
fetch('/api/agent/connectors/probe', {
|
||||
method:'POST', headers:{'X-CSRF-Token': getCsrf(), 'Content-Type':'application/json'},
|
||||
body: JSON.stringify({connector: this._connectorRef()})
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok:r.ok, d:d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Test impossible.', true); return; }
|
||||
self.toast('Connecteur : ' + res.d.status + ' — ' + (res.d.detail || ''));
|
||||
self.fetchConnectors();
|
||||
}).catch(function(){ self.toast('Test impossible (réseau).', true); });
|
||||
},
|
||||
connectorToggle(){
|
||||
var self = this, c = this.connector;
|
||||
if(!c || c.builtin || c.id == null) return;
|
||||
fetch('/api/agent/connectors/' + c.id, {
|
||||
method:'PATCH', headers:{'X-CSRF-Token': getCsrf(), 'Content-Type':'application/json'},
|
||||
body: JSON.stringify({enabled: !c.enabled})
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok:r.ok, d:d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast('Bascule impossible.', true); return; }
|
||||
self.toast(res.d.enabled ? 'Connecteur activé.' : 'Connecteur désactivé.');
|
||||
self.fetchConnectors();
|
||||
}).catch(function(){ self.toast('Bascule impossible (réseau).', true); });
|
||||
},
|
||||
// ── Connexion OAuth Google / M365 (v7.56.0) ──
|
||||
connectorConnect(){
|
||||
var self = this, c = this.connector;
|
||||
if(!c || !c.oauth) return;
|
||||
fetch('/api/agent/connectors/oauth/' + c.kind + '/authorize', {
|
||||
method:'POST', headers:{'X-CSRF-Token': getCsrf()}
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok:r.ok, d:d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Connexion impossible.', true); return; }
|
||||
window.location.href = res.d.url; // → fournisseur → callback → retour ici
|
||||
}).catch(function(){ self.toast('Connexion impossible (réseau).', true); });
|
||||
},
|
||||
connectorDisconnect(){
|
||||
var self = this, c = this.connector;
|
||||
if(!c || !c.oauth) return;
|
||||
fetch('/api/agent/connectors/oauth/' + c.kind + '/disconnect', {
|
||||
method:'POST', headers:{'X-CSRF-Token': getCsrf()}
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok:r.ok, d:d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast('Déconnexion impossible.', true); return; }
|
||||
self.toast('Connecteur déconnecté.');
|
||||
self.fetchConnectors();
|
||||
}).catch(function(){ self.toast('Déconnexion impossible (réseau).', true); });
|
||||
},
|
||||
connectorDelete(){
|
||||
var self = this, c = this.connector;
|
||||
if(!c || c.builtin || c.id == null) return;
|
||||
if(!window.confirm('Supprimer le connecteur « ' + c.name + ' » ?')) return;
|
||||
fetch('/api/agent/connectors/' + c.id, {method:'DELETE', headers:{'X-CSRF-Token': getCsrf()}})
|
||||
.then(function(r){ return r.json().then(function(d){ return {ok:r.ok, d:d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast('Suppression impossible.', true); return; }
|
||||
self.toast('Connecteur supprimé.');
|
||||
self.connector = null;
|
||||
self.plusSection = 'connectors'; self.plusFocus = 0;
|
||||
self.fetchConnectors();
|
||||
}).catch(function(){ self.toast('Suppression impossible (réseau).', true); });
|
||||
},
|
||||
// Type choisi dans le formulaire → URL / schéma d'auth / aide pré-remplis.
|
||||
connectorPreset(){
|
||||
var f = this.connectorForm;
|
||||
var presets = {
|
||||
custom: {url:'', auth:'bearer', hint:'URL publique de votre API (hôtes privés refusés)'},
|
||||
discord: {url:'https://discord.com/api/v10', auth:'bot',
|
||||
hint:'Discord Developers → Bot Token (jeton en Authorization)'},
|
||||
telegram:{url:'https://api.telegram.org/bot{secret}', auth:'none',
|
||||
hint:'BotFather → Bot Token ({secret} complète l\u2019URL)'},
|
||||
mcp: {url:'', auth:'bearer', hint:'URL du endpoint MCP (streamable HTTP)'}
|
||||
};
|
||||
var p = presets[f.kind] || presets.custom;
|
||||
f.url = p.url; f.auth = p.auth; f.hint = p.hint;
|
||||
},
|
||||
connectorCreate(){
|
||||
var self = this, f = this.connectorForm;
|
||||
if(!(f.name || '').trim() || !(f.url || '').trim()){
|
||||
this.toast('Nom et URL requis.', true); return;
|
||||
}
|
||||
fetch('/api/agent/connectors', {
|
||||
method:'POST', headers:{'X-CSRF-Token': getCsrf(), 'Content-Type':'application/json'},
|
||||
body: JSON.stringify({name: f.name, url: f.url, secret: f.secret || '',
|
||||
kind: f.kind || 'custom', auth: f.auth || 'bearer'})
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok:r.ok, d:d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Création impossible.', true); return; }
|
||||
self.toast('Connecteur « ' + res.d.name + ' » ajouté.');
|
||||
self.connectorForm = {name:'', url:'', secret:''};
|
||||
self.plusSection = 'connectors'; self.plusFocus = 0;
|
||||
self.fetchConnectors();
|
||||
}).catch(function(){ self.toast('Création impossible (réseau).', true); });
|
||||
},
|
||||
// ── Design System – Canevas (v7.53.0) ──
|
||||
fetchCanvases(){
|
||||
var self = this;
|
||||
fetch('/board/api/page-templates').then(function(r){ return r.json(); })
|
||||
.then(function(d){ self.canvases = d.templates || []; })
|
||||
.catch(function(){ self.canvases = []; });
|
||||
},
|
||||
_canvasItems(){
|
||||
return (this.canvases || []).map(function(t){
|
||||
return {key: 'cv-' + (t.builtin ? ('b-' + t.key) : ('u-' + t.id)),
|
||||
icon: t.icon || '📄', label: t.name,
|
||||
sub: (t.description || (t.builtin ? 'Canevas intégré' : 'Canevas personnel')),
|
||||
action: 'canvas', canvas: t, chev: true};
|
||||
});
|
||||
},
|
||||
_canvasActionItems(){
|
||||
var c = this.canvas;
|
||||
if(!c) return [];
|
||||
var pageId = this._openPageId();
|
||||
return [
|
||||
{key:'cv-meta', _sep: (c.builtin ? 'Canevas intégré · ' : 'Canevas personnel · ') + c.name},
|
||||
{key:'cv-create', icon:'+', label:'Créer une page à partir du canevas',
|
||||
sub:'Nouvelle page dans le workspace courant', action:'canvas-create'},
|
||||
{key:'cv-insert', icon:'⇩', label:'Insérer dans le document ouvert',
|
||||
sub: pageId ? 'Ajoute les blocs en fin de page' : 'Aucun document éditable ouvert',
|
||||
action:'canvas-insert', disabled: !pageId},
|
||||
{key:'cv-save', icon:'⭐', label:'Enregistrer le document ouvert comme canevas',
|
||||
sub: pageId ? 'Réutilisable depuis ce menu' : 'Aucun document ouvert',
|
||||
action:'canvas-save', disabled: !pageId}
|
||||
];
|
||||
},
|
||||
// Id de la page ouverte dans l'éditeur (refId du contexte, sinon l'URL).
|
||||
_openPageId(){
|
||||
try{
|
||||
var c = window.FlowDeckCtx && window.FlowDeckCtx.current();
|
||||
if(c && c.kind === 'page' && c.refId != null && /^\d+$/.test(String(c.refId))) return String(c.refId);
|
||||
}catch{ /* volontaire */ }
|
||||
var m = /\/pages\/(\d+)/.exec(window.location.pathname);
|
||||
return m ? m[1] : null;
|
||||
},
|
||||
_canvasUrl(suffix, t){
|
||||
t = t || this.canvas;
|
||||
return t.builtin
|
||||
? ('/board/api/page-templates/0/' + suffix + '?key=' + encodeURIComponent(t.key))
|
||||
: ('/board/api/page-templates/' + t.id + '/' + suffix);
|
||||
},
|
||||
canvasCreate(){
|
||||
var self = this, c = this.canvas;
|
||||
if(!c) return;
|
||||
// le builtin se choisit par `key` DANS LE BODY (route /use), pas en query
|
||||
fetch(this._canvasUrl('use'), {
|
||||
method: 'POST', headers: {'X-CSRF-Token': getCsrf(), 'Content-Type': 'application/json'},
|
||||
body: JSON.stringify(c.builtin ? {key: c.key} : {})
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok: r.ok, d: d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Création impossible.', true); return; }
|
||||
self.toast('Page créée : « ' + ((res.d && res.d.title) || c.name) + ' » (Workspace).');
|
||||
self.plusSection = 'canvases'; self.plusFocus = 0;
|
||||
}).catch(function(){ self.toast('Création impossible (réseau).', true); });
|
||||
},
|
||||
canvasInsert(){
|
||||
var self = this, c = this.canvas;
|
||||
if(!c) return;
|
||||
fetch(this._canvasUrl('blocks')).then(function(r){ return r.json(); })
|
||||
.then(function(d){
|
||||
var E = window.E;
|
||||
if(!E || !E.blocks || !d || !Array.isArray(d.blocks)){
|
||||
self.toast('Aucun document éditable ouvert.', true); return;
|
||||
}
|
||||
if(window.ensureBlockIds) window.ensureBlockIds(d.blocks);
|
||||
try{
|
||||
if(E.sync) E.sync();
|
||||
var empty = E.blocks.length === 1 && E.blocks[0].type === 'paragraph'
|
||||
&& !(E.blocks[0].content || '').trim();
|
||||
E.blocks = empty ? d.blocks : E.blocks.concat(d.blocks);
|
||||
E.dirty = true;
|
||||
if(E.autoSave) E.autoSave();
|
||||
if(E.render) E.render();
|
||||
self.toast('Canevas inséré dans le document.');
|
||||
}catch{ self.toast('Insertion impossible.', true); }
|
||||
}).catch(function(){ self.toast('Lecture du canevas impossible.', true); });
|
||||
},
|
||||
canvasSave(){
|
||||
var self = this, c = this.canvas;
|
||||
var pageId = this._openPageId();
|
||||
if(!c || !pageId) return;
|
||||
var def = (this.activeContext && this.activeContext.label) || c.name || 'Mon canevas';
|
||||
var name = window.prompt('Nom du canevas à enregistrer :', def);
|
||||
if(!name || !name.trim()) return;
|
||||
name = name.trim();
|
||||
fetch('/board/api/page-templates', {
|
||||
method: 'POST', headers: {'X-CSRF-Token': getCsrf(), 'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({name: name, page_id: Number(pageId)})
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok: r.ok, d: d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Enregistrement impossible.', true); return; }
|
||||
self.toast('Canevas enregistré : « ' + name + ' »');
|
||||
self.fetchCanvases();
|
||||
}).catch(function(){ self.toast('Enregistrement impossible (réseau).', true); });
|
||||
},
|
||||
_plusSelectable(){
|
||||
var out = [];
|
||||
this.plusItems.forEach(function(it, i){ if(!it.disabled && !it._sep) out.push(i); });
|
||||
return out;
|
||||
},
|
||||
movePlusFocus(delta){
|
||||
var sel = this._plusSelectable();
|
||||
if(!sel.length) return;
|
||||
var idx = sel.indexOf(this.plusFocus);
|
||||
if(idx < 0) idx = delta > 0 ? -1 : 0;
|
||||
this.plusFocus = sel[(idx + delta + sel.length) % sel.length];
|
||||
this._scrollPlusItem();
|
||||
},
|
||||
_scrollPlusItem(){
|
||||
var menu = this.$refs && this.$refs.plusMenu;
|
||||
if(!menu) return;
|
||||
var el = menu.querySelector('.fd-mention-item.focus');
|
||||
if(el && el.scrollIntoView){ menu.scrollTop = el.offsetTop - menu.clientHeight / 2 + el.clientHeight / 2; }
|
||||
},
|
||||
plusAction(it){
|
||||
if(!it || it.disabled || it._sep) return;
|
||||
if(it.action === 'files'){ this.plusSection = 'files'; this.plusFocus = 0; return; }
|
||||
if(it.action === 'search'){ this.closePlus(); this.openMentionPicker('+'); return; }
|
||||
if(it.action === 'browse'){
|
||||
this.plusSection = 'browse'; this.plusCrumb = []; this.plusLoadBrowse(null); return;
|
||||
}
|
||||
// ── Compétences (v7.52.0) ──
|
||||
if(it.action === 'memory'){ this.toggleMemory(); return; }
|
||||
if(it.action === 'skills'){ this.plusSection = 'skills'; this.plusFocus = 0; return; }
|
||||
if(it.action === 'skill'){ this.closePlus(); this.useSuggestion(it.suggestion); return; }
|
||||
if(it.action === 'skills-manage'){
|
||||
this.plusSection = 'skills-manage'; this.plusFocus = 0; return;
|
||||
}
|
||||
if(it.action === 'skills-gallery'){
|
||||
this.galleryFilter = ''; this.fetchSkills();
|
||||
this.plusSection = 'skills-gallery'; this.plusFocus = 0; return;
|
||||
}
|
||||
if(it.action === 'skill-new'){
|
||||
this.skillForm = {id:null, name:'', description:'', prompt_template:''};
|
||||
this.plusSection = 'skills-edit'; this.plusFocus = -1; return;
|
||||
}
|
||||
if(it.action === 'skill-edit'){
|
||||
var sk = null, wanted = it.skillId;
|
||||
(this.skills || []).forEach(function(x){ if(x.id === wanted) sk = x; });
|
||||
if(!sk) return;
|
||||
this.skillForm = {id: sk.id, name: sk.name, description: sk.description || '',
|
||||
prompt_template: sk.prompt_template || ''};
|
||||
this.plusSection = 'skills-edit'; this.plusFocus = -1; return;
|
||||
}
|
||||
if(it.action === 'skill-install'){
|
||||
this.installGallerySkill(it.slug, it.icon, it.skillName); return;
|
||||
}
|
||||
if(it.action === 'skill-import'){
|
||||
if(this.$refs.skillImport) this.$refs.skillImport.click();
|
||||
return;
|
||||
}
|
||||
// ── Connecteurs (v7.55.0) ──
|
||||
if(it.action === 'connectors'){
|
||||
this.fetchConnectors(); this.plusSection = 'connectors'; this.plusFocus = 0; return;
|
||||
}
|
||||
if(it.action === 'connector'){
|
||||
this.connector = it.connector; this.plusSection = 'connector'; this.plusFocus = 0; return;
|
||||
}
|
||||
if(it.action === 'connector-new'){
|
||||
this.connectorForm = {name:'', url:'', secret:'', kind:'custom',
|
||||
auth:'bearer', hint:''};
|
||||
this.plusSection = 'connector-new'; this.plusFocus = -1; return;
|
||||
}
|
||||
if(it.action === 'plugins'){
|
||||
this.fetchPlugins(); this.plusSection = 'plugins'; this.plusFocus = 0; return;
|
||||
}
|
||||
if(it.action === 'plugin-toggle'){ this.pluginToggle(it.slug); return; }
|
||||
if(it.action === 'connector-probe'){ this.connectorProbe(); return; }
|
||||
if(it.action === 'connector-toggle'){ this.connectorToggle(); return; }
|
||||
if(it.action === 'connector-delete'){ this.connectorDelete(); return; }
|
||||
if(it.action === 'connector-connect'){ this.connectorConnect(); return; }
|
||||
if(it.action === 'connector-disconnect'){ this.connectorDisconnect(); return; }
|
||||
// ── Design System – Canevas (v7.53.0) ──
|
||||
if(it.action === 'canvases'){
|
||||
this.fetchCanvases(); this.plusSection = 'canvases'; this.plusFocus = 0; return;
|
||||
}
|
||||
if(it.action === 'canvas'){
|
||||
this.canvas = it.canvas; this.plusSection = 'canvas'; this.plusFocus = 0; return;
|
||||
}
|
||||
if(it.action === 'canvas-create'){ this.canvasCreate(); return; }
|
||||
if(it.action === 'canvas-insert'){ this.canvasInsert(); return; }
|
||||
if(it.action === 'canvas-save'){ this.canvasSave(); return; }
|
||||
if(it._folder){ // entrer dans un sous-dossier
|
||||
this.plusCrumb.push({id: it._folder, name: it.label});
|
||||
this.plusLoadBrowse(it._folder);
|
||||
return;
|
||||
}
|
||||
if(it.token){ this._mentionFrom = null; this._atNode = null; this.closePlus(); this.pickMention(it); return; }
|
||||
this.closePlus(); // sections futures (phases 2-8)
|
||||
},
|
||||
plusBack(){
|
||||
var sec = this.plusSection;
|
||||
if(sec === 'browse' && this.plusCrumb.length){
|
||||
this.plusCrumb.pop();
|
||||
this.plusLoadBrowse(this.plusCrumb.length ? this.plusCrumb[this.plusCrumb.length - 1].id : null);
|
||||
return;
|
||||
}
|
||||
if(sec === 'skills-edit'){ this.plusSection = 'skills-manage'; this.plusFocus = 0; return; }
|
||||
if(sec === 'skills-manage' || sec === 'skills-gallery'){
|
||||
this.plusSection = 'skills'; this.plusFocus = 0; return;
|
||||
}
|
||||
if(sec === 'canvas'){ this.plusSection = 'canvases'; this.plusFocus = 0; return; }
|
||||
if(sec === 'connector' || sec === 'connector-new'){
|
||||
this.plusSection = 'connectors'; this.plusFocus = 0; return;
|
||||
}
|
||||
this.plusSection = 'root';
|
||||
this.plusFocus = 0;
|
||||
},
|
||||
plusGoto(i){ // fil d'Ariane : -1 = racine
|
||||
this.plusCrumb = i < 0 ? [] : this.plusCrumb.slice(0, i + 1);
|
||||
this.plusLoadBrowse(i < 0 ? null : this.plusCrumb[this.plusCrumb.length - 1].id);
|
||||
},
|
||||
plusLoadBrowse(parentId){
|
||||
// Un niveau par appel : /api/nav/menu (dossier = icon 'folder').
|
||||
var self = this;
|
||||
this.plusLoading = true;
|
||||
fetch('/api/nav/menu' + (parentId ? ('?parent_id=' + parentId) : ''))
|
||||
.then(function(r){ return r.json(); })
|
||||
.then(function(d){
|
||||
var items = [];
|
||||
// icon de /api/nav/menu = nom SVG ('folder'|'edit'|'image'|'file') → emoji
|
||||
var ICONS = {folder:'📁', edit:'📄', image:'🖼️', file:'📎'};
|
||||
(d.items || []).forEach(function(x){
|
||||
var isFolder = x.icon === 'folder';
|
||||
items.push({
|
||||
key: 'br-' + x.id, icon: ICONS[x.icon] || '📄',
|
||||
label: x.name, sub: isFolder ? 'Dossier — ouvrir' : 'Document — épingler',
|
||||
token: (isFolder ? 'folder:' : 'document:') + x.id,
|
||||
type: isFolder ? 'folder' : 'document', id: x.id,
|
||||
_folder: isFolder ? x.id : null
|
||||
});
|
||||
});
|
||||
if(self.plusCrumb.length){
|
||||
var cur = self.plusCrumb[self.plusCrumb.length - 1];
|
||||
items.unshift({key: 'pin', icon: '📌',
|
||||
label: 'Épingler le dossier « ' + cur.name + ' »',
|
||||
sub: 'Ajoute le dossier entier au contexte',
|
||||
token: 'folder:' + cur.id, type: 'folder', id: cur.id});
|
||||
}
|
||||
self.plusBrowse = items;
|
||||
self.plusLoading = false;
|
||||
self.plusFocus = items.length ? 0 : -1;
|
||||
self.$nextTick(function(){ self._scrollPlusItem(); });
|
||||
})
|
||||
.catch(function(){ self.plusBrowse = []; self.plusLoading = false; self.plusFocus = -1; });
|
||||
},
|
||||
// ── Gérer les compétences : CRUD / export / import (v7.52.0) ──
|
||||
saveSkill(){
|
||||
var self = this, f = this.skillForm;
|
||||
if(!(f.name || '').trim()){ this.toast('Le nom est requis.', true); return; }
|
||||
fetch(f.id ? '/api/agent/skills/' + f.id : '/api/agent/skills', {
|
||||
method: f.id ? 'PATCH' : 'POST',
|
||||
headers: {'X-CSRF-Token': getCsrf(), 'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({name: f.name, description: f.description || '',
|
||||
prompt_template: f.prompt_template || ''})
|
||||
}).then(function(r){
|
||||
return r.json().then(function(d){ return {ok: r.ok, d: d}; });
|
||||
}).then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Enregistrement impossible.', true); return; }
|
||||
self.toast('Skill enregistré.');
|
||||
self.fetchSkills();
|
||||
self.plusSection = 'skills-manage'; self.plusFocus = 0;
|
||||
}).catch(function(){ self.toast('Enregistrement impossible (réseau).', true); });
|
||||
},
|
||||
deleteSkill(){
|
||||
var self = this, f = this.skillForm;
|
||||
if(!f.id) return;
|
||||
if(!window.confirm('Supprimer le skill « ' + f.name + ' » ?')) return;
|
||||
fetch('/api/agent/skills/' + f.id, {method: 'DELETE', headers: {'X-CSRF-Token': getCsrf()}})
|
||||
.then(function(r){ return r.json().then(function(d){ return {ok: r.ok, d: d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Suppression impossible.', true); return; }
|
||||
self.toast('Skill supprimé.');
|
||||
// le chip épinglé ne doit pas survivre au skill
|
||||
self.contextChips = self.contextChips.filter(function(ch){
|
||||
return !(ch.kind === 'skill' && ch.skillId === f.id);
|
||||
});
|
||||
self.skillForm = {id: null, name: '', description: '', prompt_template: ''};
|
||||
self.fetchSkills();
|
||||
self.plusSection = 'skills-manage'; self.plusFocus = 0;
|
||||
}).catch(function(){ self.toast('Suppression impossible (réseau).', true); });
|
||||
},
|
||||
exportSkill(){
|
||||
var self = this, f = this.skillForm;
|
||||
if(!f.id) return;
|
||||
fetch('/api/agent/skills/' + f.id + '/export')
|
||||
.then(function(r){ return r.json(); })
|
||||
.then(function(doc){
|
||||
var blob = new Blob([JSON.stringify(doc, null, 2)], {type: 'application/json'});
|
||||
var a = document.createElement('a');
|
||||
a.href = URL.createObjectURL(blob);
|
||||
a.download = String((doc && doc.name) || 'skill').replace(/[^\w.-]+/g, '-') + '.json';
|
||||
document.body.appendChild(a); a.click(); document.body.removeChild(a);
|
||||
setTimeout(function(){ URL.revokeObjectURL(a.href); }, 1000);
|
||||
}).catch(function(){ self.toast('Export impossible.', true); });
|
||||
},
|
||||
importSkillFile(ev){
|
||||
var self = this;
|
||||
var input = ev.target, file = input.files && input.files[0];
|
||||
if(!file) return;
|
||||
file.text().then(function(txt){
|
||||
var payload;
|
||||
try{ payload = JSON.parse(txt); }
|
||||
catch{ self.toast('Fichier JSON invalide.', true); return; }
|
||||
return fetch('/api/agent/skills/import', {
|
||||
method: 'POST', headers: {'X-CSRF-Token': getCsrf(), 'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({payload: payload, overwrite: true})
|
||||
}).then(function(r){ return r.json().then(function(d){ return {ok: r.ok, d: d}; }); })
|
||||
.then(function(res){
|
||||
if(!res.ok){ self.toast((res.d && res.d.detail) || 'Import impossible.', true); return; }
|
||||
self.toast('Skill importé : ' + ((res.d && res.d.name) || '') + ' (pas de doublon).');
|
||||
self.fetchSkills();
|
||||
self.plusSection = 'skills-manage'; self.plusFocus = 0;
|
||||
});
|
||||
}).catch(function(){ self.toast('Lecture du fichier impossible.', true); })
|
||||
.finally(function(){ input.value = ''; });
|
||||
},
|
||||
openMentionPicker(from){
|
||||
this.plusOpen = false;
|
||||
this.mentionOpen = true;
|
||||
this._mentionFrom = from || '+';
|
||||
this.mentionQuery = '';
|
||||
@@ -1177,6 +1871,7 @@
|
||||
onInput(){
|
||||
this.resizeInput();
|
||||
this.slashDismiss = false;
|
||||
if(this.plusOpen) this.closePlus(); // tape = on écrit le message, le menu se referme
|
||||
var text = this.composerText();
|
||||
this.input = text;
|
||||
var cmdNow = /^\s*\//.test(text);
|
||||
@@ -1249,16 +1944,29 @@
|
||||
}catch { /* volontaire */ }
|
||||
}
|
||||
if(key === 'Escape'){
|
||||
if(this.plusOpen){ e.preventDefault(); e.stopPropagation(); this.closePlus(); return; }
|
||||
if(this.mentionOpen){ e.preventDefault(); e.stopPropagation(); this.mentionOpen = false; this._mentionFrom = null; this._atNode = null; return; }
|
||||
if(this.commandOpen){ e.preventDefault(); e.stopPropagation(); this.slashDismiss = true; this.cmdFocus = -1; return; }
|
||||
return; // laisse fermer le panneau
|
||||
}
|
||||
if(key === 'ArrowDown' || key === 'ArrowUp'){
|
||||
var delta = key === 'ArrowDown' ? 1 : -1;
|
||||
if(this.plusOpen){ e.preventDefault(); this.movePlusFocus(delta); return; }
|
||||
if(this.mentionOpen && this.mentionItems.length){ e.preventDefault(); this.moveMentionFocus(delta); return; }
|
||||
if(this.commandOpen && !this.slashDismiss && this._slashItems().length){ e.preventDefault(); this.moveSlashFocus(delta); return; }
|
||||
return;
|
||||
}
|
||||
// Entrée / Tab avec le menu + ouvert
|
||||
if(this.plusOpen){
|
||||
if(key === 'Enter' || key === 'Tab'){
|
||||
e.preventDefault();
|
||||
var psel = this._plusSelectable();
|
||||
if(!psel.length) return;
|
||||
var pidx = psel.indexOf(this.plusFocus) >= 0 ? this.plusFocus : psel[0];
|
||||
this.plusAction(this.plusItems[pidx]);
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Entrée / Tab avec un menu ouvert (skills / mentions)
|
||||
if(this.mentionOpen){
|
||||
var mSel = this._selectableMentionItems();
|
||||
|
||||
@@ -84,19 +84,32 @@
|
||||
|
||||
// Tooltip system
|
||||
document.addEventListener('mouseover', function(e) {
|
||||
const target = e.target.closest('[data-tooltip]');
|
||||
const target = e.target.closest('[data-tooltip], [data-tooltip-html]');
|
||||
if (!target) return;
|
||||
const tip = document.getElementById('tooltip');
|
||||
if (!tip) return;
|
||||
tip.textContent = target.getAttribute('data-tooltip');
|
||||
const html = target.getAttribute('data-tooltip-html');
|
||||
if (html) tip.innerHTML = html;
|
||||
else tip.textContent = target.getAttribute('data-tooltip') || '';
|
||||
// v7.62 : éléments du menu de sélection → info-bulle claire à droite (façon Notion)
|
||||
const inToolbar = !!target.closest('.format-toolbar');
|
||||
tip.classList.toggle('tooltip-light', inToolbar);
|
||||
tip.style.display = 'block';
|
||||
const rect = target.getBoundingClientRect();
|
||||
tip.style.left = rect.left + 'px';
|
||||
tip.style.top = (rect.bottom + 4) + 'px';
|
||||
if (inToolbar) {
|
||||
tip.style.left = (rect.right + 8) + 'px';
|
||||
tip.style.top = Math.max(8, rect.top + rect.height / 2 - tip.offsetHeight / 2) + 'px';
|
||||
if (rect.right + 8 + tip.offsetWidth > window.innerWidth) {
|
||||
tip.style.left = Math.max(8, rect.left - tip.offsetWidth - 8) + 'px';
|
||||
}
|
||||
} else {
|
||||
tip.style.left = rect.left + 'px';
|
||||
tip.style.top = (rect.bottom + 4) + 'px';
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('mouseout', function(e) {
|
||||
const target = e.target.closest('[data-tooltip]');
|
||||
const target = e.target.closest('[data-tooltip], [data-tooltip-html]');
|
||||
if (!target) return;
|
||||
const tip = document.getElementById('tooltip');
|
||||
if (tip) tip.style.display = 'none';
|
||||
|
||||
@@ -1283,72 +1283,86 @@ const DB_CONFIG=(()=>{try{const el=document.getElementById('db-config');const v=
|
||||
}
|
||||
|
||||
// ── Side peek : panneau latéral des lignes de base (vanilla JS) ──
|
||||
// Le panneau vit dans _database_table.html (page de base ET bases
|
||||
// embarquées inline). Il doit être câblé SUR le document, jamais via
|
||||
// container.__x : le conteneur n'a pas de x-data (les bindings Alpine
|
||||
// du panneau restaient inertes — clic sur une ligne = rien).
|
||||
var peekEl = document.getElementById('db-side-peek');
|
||||
// Sans panneau (collections embarquées inline dans l'éditeur), le clic ne
|
||||
// doit pas lever de ReferenceError : repli discret, comme l'ancien code.
|
||||
if (!peekEl) window.openPageInSidePeek = function() {};
|
||||
if (peekEl) {
|
||||
// Le panneau vit dans _database_table.html (page de base). Une base
|
||||
// EMBARQUÉE dans un document n'a pas ce markup : on le crée à la demande
|
||||
// (comme mt-peek de My Tasks), sinon l'icône Open de fin de ligne était
|
||||
// un no-op silencieux. Il doit être câblé SUR le document, jamais via
|
||||
// container.__x : le conteneur n'a pas de x-data.
|
||||
var PEEK_HTML =
|
||||
'<div class="peek-resize-handle" title="Glisser pour redimensionner — cliquer pour fermer"></div>' +
|
||||
'<div class="db-side-peek-header">' +
|
||||
'<button id="db-side-peek-close" title="Close"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg></button>' +
|
||||
'<div class="db-side-peek-title" id="db-side-peek-title"></div>' +
|
||||
'<button id="db-side-peek-full" title="Open full page"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 13v6a2 2 0 01-2 2H5a2 2 0 01-2-2V8a2 2 0 012-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg></button>' +
|
||||
'</div>' +
|
||||
'<div class="db-side-peek-body">' +
|
||||
'<div class="db-side-peek-loading" id="db-side-peek-loading">Chargement…</div>' +
|
||||
'<iframe id="db-side-peek-iframe" src="about:blank" title="Document" style="width:100%;height:100%;border:none;flex:1;min-height:0;"></iframe>' +
|
||||
'</div>';
|
||||
function ensureDbPeek() {
|
||||
var p = document.getElementById('db-side-peek');
|
||||
if (p) return p;
|
||||
p = document.createElement('div');
|
||||
p.id = 'db-side-peek';
|
||||
p.className = 'db-side-peek';
|
||||
p.innerHTML = PEEK_HTML;
|
||||
document.body.appendChild(p);
|
||||
document.getElementById('db-side-peek-close').addEventListener('click', closeDbPeek);
|
||||
document.getElementById('db-side-peek-full').addEventListener('click', function () {
|
||||
var f = document.getElementById('db-side-peek-iframe');
|
||||
// `dataset.page` et non `iframe.src` : le src porte `?embed=1`,
|
||||
// la pleine page doit garder sa sidebar et sa barre.
|
||||
if (f && f.dataset.page) window.location.href = '/pages/' + f.dataset.page;
|
||||
});
|
||||
if (window.fdWirePeekResize) window.fdWirePeekResize(p, p.querySelector('.peek-resize-handle'), closeDbPeek);
|
||||
return p;
|
||||
}
|
||||
function closeDbPeek() {
|
||||
var p = document.getElementById('db-side-peek');
|
||||
if (!p) return;
|
||||
p.classList.remove('open');
|
||||
document.getElementById('db-side-peek-iframe').src='about:blank';
|
||||
var t = document.getElementById('db-side-peek-title');
|
||||
if (t) t.textContent = '';
|
||||
}
|
||||
window.openPageInSidePeek = function(pageId) {
|
||||
if (!pageId) return;
|
||||
var peekEl = ensureDbPeek();
|
||||
var peekFrame = document.getElementById('db-side-peek-iframe');
|
||||
var peekTitle = document.getElementById('db-side-peek-title');
|
||||
var peekLoading = document.getElementById('db-side-peek-loading');
|
||||
function closeDbPeek() {
|
||||
peekEl.classList.remove('open');
|
||||
document.getElementById('db-side-peek-iframe').src='about:blank';
|
||||
if (peekTitle) { peekTitle.textContent = ''; }
|
||||
}
|
||||
window.openPageInSidePeek = function(pageId) {
|
||||
if (!pageId) return;
|
||||
peekEl.classList.add('open');
|
||||
if (peekLoading) peekLoading.style.display = '';
|
||||
var iframe = document.getElementById('db-side-peek-iframe');
|
||||
if (iframe) iframe.src='about:blank';
|
||||
if (peekTitle) peekTitle.textContent = '';
|
||||
resolveRowContentPage(pageId).then(function(pid){
|
||||
if (!peekEl.classList.contains('open')) return;
|
||||
if (peekTitle) peekTitle.textContent = '';
|
||||
if (peekLoading) peekLoading.style.display = 'none';
|
||||
if (iframe) iframe.src = '/pages/'+pid;
|
||||
})
|
||||
.catch(function(){
|
||||
// L'échec est rendu DANS le panneau (srcdoc) : sous le build
|
||||
// CSP d'Alpine les toasts ne s'affichent pas partout.
|
||||
if (iframe) {
|
||||
iframe.srcdoc = '<p style="font-family:sans-serif;color:#888;padding:40px;text-align:center">Impossible d’ouvrir le contenu de cette ligne</p>';
|
||||
}
|
||||
peekEl.classList.add('open');
|
||||
toast('Impossible d’ouvrir le contenu de cette ligne', 'error');
|
||||
});
|
||||
};
|
||||
var pc = document.getElementById('db-side-peek-close');
|
||||
if (pc) pc.addEventListener('click', closeDbPeek);
|
||||
var pf = document.getElementById('db-side-peek-full');
|
||||
if (pf) pf.addEventListener('click', function() {
|
||||
if (peekFrame && peekFrame.src && peekFrame.src !== 'about:blank') {
|
||||
window.location.href = peekFrame.src;
|
||||
}
|
||||
});
|
||||
document.addEventListener('keydown', function(e) {
|
||||
if (e.key === 'Escape' && peekEl.classList.contains('open')) closeDbPeek();
|
||||
});
|
||||
document.addEventListener('pointerdown', function(e) {
|
||||
peekEl.classList.add('open');
|
||||
if (peekLoading) peekLoading.style.display = '';
|
||||
if (peekFrame) peekFrame.src = 'about:blank';
|
||||
if (peekTitle) peekTitle.textContent = '';
|
||||
resolveRowContentPage(pageId).then(function(pid){
|
||||
if (!peekEl.classList.contains('open')) return;
|
||||
if (peekEl.contains(e.target)) return;
|
||||
if (e.target.closest('#db-table-container, .database-table-container, [id^="inline-db-"]')) return;
|
||||
closeDbPeek();
|
||||
});
|
||||
function wireDbPeekResize() {
|
||||
if (window.fdWirePeekResize) {
|
||||
window.fdWirePeekResize(peekEl, peekEl.querySelector('.peek-resize-handle'), closeDbPeek);
|
||||
} else if (document.readyState === 'loading') {
|
||||
document.addEventListener('DOMContentLoaded', wireDbPeekResize);
|
||||
if (peekLoading) peekLoading.style.display = 'none';
|
||||
// `?embed=1` : uniquement le document edite, pas l'habillage
|
||||
// (sidebar + barre) — la pleine page reste via le bouton « full ».
|
||||
if (peekFrame) { peekFrame.dataset.page = pid; peekFrame.src = '/pages/'+pid+'?embed=1'; }
|
||||
})
|
||||
.catch(function(){
|
||||
// L'échec est rendu DANS le panneau (srcdoc) : sous le build
|
||||
// CSP d'Alpine les toasts ne s'affichent pas partout.
|
||||
if (peekFrame) {
|
||||
peekFrame.srcdoc = '<p style="font-family:sans-serif;color:#888;padding:40px;text-align:center">Impossible d’ouvrir le contenu de cette ligne</p>';
|
||||
}
|
||||
}
|
||||
wireDbPeekResize();
|
||||
}
|
||||
peekEl.classList.add('open');
|
||||
toast('Impossible d’ouvrir le contenu de cette ligne', 'error');
|
||||
});
|
||||
};
|
||||
document.addEventListener('keydown', function(e) {
|
||||
var p = document.getElementById('db-side-peek');
|
||||
if (e.key === 'Escape' && p && p.classList.contains('open')) closeDbPeek();
|
||||
});
|
||||
document.addEventListener('pointerdown', function(e) {
|
||||
var p = document.getElementById('db-side-peek');
|
||||
if (!p || !p.classList.contains('open')) return;
|
||||
if (p.contains(e.target)) return;
|
||||
if (e.target.closest('#db-table-container, .database-table-container, [id^="inline-db-"]')) return;
|
||||
closeDbPeek();
|
||||
});
|
||||
|
||||
function resolveRowContentPage(rowId){
|
||||
return fetch('/db/pages/'+rowId+'/open/api')
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
if (!window.__fdHelpScriptLoaded) {
|
||||
window.__fdHelpScriptLoaded = true;
|
||||
// Alpine.data register (CSP build ne résout pas les globales window)
|
||||
if (window.Alpine) { Alpine.data('helpInit', helpInit); fdRefreshXData('helpInit'); } else document.addEventListener('alpine:init', function () { Alpine.data('helpInit', helpInit); });
|
||||
function helpInit() {
|
||||
return {
|
||||
section: 'start',
|
||||
navOpen: false,
|
||||
closeNavOnMobile() { this.navOpen = false; },
|
||||
// Bouton ✕ (haut droite, visible aussi en mobile) : ferme l'aide.
|
||||
close() {
|
||||
if (document.referrer && document.referrer !== location.href) { history.back(); }
|
||||
else { location.href = '/workspaces'; }
|
||||
},
|
||||
go(sec) {
|
||||
this.section = sec;
|
||||
this.navOpen = false;
|
||||
var c = document.querySelector('.settings-content');
|
||||
if (c) c.scrollTop = 0;
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -979,9 +979,9 @@ _renderIcon(item) {
|
||||
if (loading) loading.style.display = '';
|
||||
frame.onload = function () { if (loading) loading.style.display = 'none'; };
|
||||
frame.src = 'about:blank';
|
||||
// `/pages/{id}` sans `?embed=1` : le peek affiche le MÊME éditeur que la
|
||||
// page pleine (sidebar, barre, actions compris), pas une variante.
|
||||
frame.src = '/pages/' + item.id;
|
||||
// `?embed=1` : le peek affiche SEULEMENT le document en mode édition
|
||||
// (ni sidebar ni barre de navigation) — le cadre du panneau suffit.
|
||||
frame.src = '/pages/' + item.id + '?embed=1';
|
||||
},
|
||||
|
||||
closePeek() {
|
||||
|
||||
@@ -395,12 +395,12 @@ const _wsInitData = (function() { // lexical : NON propriété globalThis →
|
||||
window.showToast('Failed to copy', 'error');
|
||||
});
|
||||
};
|
||||
// Load the full-screen editor in the iframe (no `?embed=1`: the peek
|
||||
// shows the same editor as the page itself). `about:blank` first, so
|
||||
// opening another document really reloads the frame instead of keeping
|
||||
// the previous one when the URL happens to be identical.
|
||||
// Load ONLY the editable document in the iframe (`?embed=1`: no
|
||||
// sidebar, no navbar). `about:blank` first, so opening another
|
||||
// document really reloads the frame instead of keeping the previous
|
||||
// one when the URL happens to be identical.
|
||||
var iframe = document.getElementById('ws-preview-iframe');
|
||||
if (iframe) { iframe.src = 'about:blank'; iframe.src = '/pages/' + node.id; }
|
||||
if (iframe) { iframe.src = 'about:blank'; iframe.src = '/pages/' + node.id + '?embed=1'; }
|
||||
// Show panel
|
||||
panel.style.display = 'flex';
|
||||
requestAnimationFrame(function() {
|
||||
|
||||
@@ -152,9 +152,10 @@ function flowDeckMyTasks() {
|
||||
f.style.display = '';
|
||||
// `about:blank` d'abord : ouvrir une autre tâche doit REcharger
|
||||
// l'éditeur, sinon l'URL identique laisse le document précédent
|
||||
// affiché. `/pages/{id}` sans `?embed=1` = l'éditeur plein écran.
|
||||
// affiché. `?embed=1` = le document en édition seule, sans
|
||||
// sidebar ni barre de navigation (le cadre du panneau suffit).
|
||||
f.src = 'about:blank';
|
||||
f.src = '/pages/' + pid;
|
||||
f.src = '/pages/' + pid + '?embed=1';
|
||||
}).catch(function (e) {
|
||||
if (loading) {
|
||||
loading.textContent = 'Impossible d’ouvrir le contenu : ' + e.message;
|
||||
@@ -389,6 +390,7 @@ function flowDeckMyTasks() {
|
||||
h += '<div class="mt-card" draggable="true" data-id="' + t.id + '">' +
|
||||
'<span class="mt-icon">' + esc(rowIcon(t.icon)) + '</span>' +
|
||||
'<span class="mt-card-title">' + esc(t.title) + '</span>' +
|
||||
openButton(t) +
|
||||
(t.due ? '<span class="mt-card-due mt-due-' + esc(t.due_state) + '">📅 ' +
|
||||
esc(t.due) + '</span>' : '') +
|
||||
'<span class="mt-card-src">' + esc(t.collection_icon) + ' ' +
|
||||
@@ -878,17 +880,21 @@ function flowDeckMyTasks() {
|
||||
var t = e.target;
|
||||
|
||||
if (t.id === 'mt-new-btn') { openNewModal(); return; }
|
||||
if (t.dataset && t.dataset.openRow) {
|
||||
var opener = t.closest ? t.closest('[data-open-row]') : null;
|
||||
if (opener) {
|
||||
// `closest` : dans le calendrier le bouton ne contient que son
|
||||
// SVG — un clic sur l'icone donnait `e.target` = <svg> sans
|
||||
// dataset, et le bouton ne faisait rien.
|
||||
e.preventDefault();
|
||||
// Le titre vient de l'attribut : il est disponible aussi bien dans
|
||||
// le tableau que dans le calendrier ou la vue Jour.
|
||||
var label = t.dataset.openTitle;
|
||||
var label = opener.dataset.openTitle;
|
||||
if (!label) {
|
||||
var row = t.closest('.mt-row');
|
||||
var row = opener.closest('.mt-row');
|
||||
var cell = row && row.querySelector('.mt-title-text');
|
||||
label = cell ? cell.textContent : '';
|
||||
}
|
||||
openRowContent(Number(t.dataset.openRow), label);
|
||||
openRowContent(Number(opener.dataset.openRow), label);
|
||||
return;
|
||||
}
|
||||
if (t.dataset && t.dataset.fixSource) {
|
||||
|
||||
@@ -18,6 +18,9 @@ function settingsInit() {
|
||||
fmtAuditDate(e) { return new Date(e.at).toLocaleString(); },
|
||||
|
||||
activeSection: 'account',
|
||||
// Mobile side-navigation drawer for the settings panel (hamburger in topbar)
|
||||
navOpen: false,
|
||||
closeNavOnMobile() { this.navOpen = false; },
|
||||
allTags: [],
|
||||
newTagName: '',
|
||||
newTagColor: '#787774',
|
||||
@@ -1212,26 +1215,27 @@ function settingsInit() {
|
||||
finally { this.backupRunning = false; }
|
||||
},
|
||||
closeSettings() {
|
||||
if (window.opener && !window.opener.closed) {
|
||||
window.opener.location.reload();
|
||||
window.close();
|
||||
return;
|
||||
}
|
||||
// If navigated directly to settings, redirect to workspaces (forces refresh)
|
||||
if (!document.referrer || document.referrer === window.location.href) {
|
||||
window.location.href = '/workspaces?ts=' + Date.now();
|
||||
return;
|
||||
}
|
||||
// Go back and force refresh
|
||||
// v7.69.4 — « ça ferme mais ça reste ouvert » quand Settings est ouvert
|
||||
// depuis le menu utilisateur : `shouldIntercept()` accepte `/settings`,
|
||||
// donc ce clic passe par fdLoad() (htmx + history.pushState) SANS
|
||||
// rechargement de page. L'ancien history.back() déclenchait alors un
|
||||
// popstate → swap PARTIEL de .main-wrapper, et le panneau `position:
|
||||
// fixed` restait peint au-dessus. Depuis /workspaces c'est un
|
||||
// chargement complet, d'où l'absence de symptôme.
|
||||
// → navigation explicite et déterministe : une seule requête, tout le
|
||||
// document est détruit, aucun chemin ne peut se terminer sans bouger.
|
||||
var prev = document.referrer;
|
||||
if (prev && prev.includes('/settings')) {
|
||||
// Came from another settings tab — go back two steps then refresh
|
||||
history.go(-2);
|
||||
setTimeout(function() { window.location.reload(); }, 100);
|
||||
} else {
|
||||
history.back();
|
||||
setTimeout(function() { window.location.reload(); }, 100);
|
||||
if (window.opener && !window.opener.closed) {
|
||||
// fermeture au mieux — on ne peut PAS vérifier qu'elle a réussi,
|
||||
// donc on enchaîne toujours sur la navigation ci-dessous.
|
||||
try { window.opener.location.reload(); } catch (e) { /* opener cross-origin */ }
|
||||
try { window.close(); } catch (e) { /* ignoré */ }
|
||||
}
|
||||
var back = '/workspaces';
|
||||
if (prev && prev.indexOf(location.origin) === 0 && prev.indexOf('/settings') < 0) {
|
||||
back = prev.split('#')[0];
|
||||
}
|
||||
location.replace(back + (back.indexOf('?') >= 0 ? '&' : '?') + 'ts=' + Date.now());
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ const PRECACHE_URLS = [
|
||||
'/static/js/katex.min.js?v=0.16.11',
|
||||
'/static/js/prism.min.js',
|
||||
// Icônes & métadonnées
|
||||
'/static/favicon.svg',
|
||||
'/static/favicon.ico',
|
||||
'/static/manifest.json',
|
||||
'/static/icons/icon-192x192.png',
|
||||
'/static/icons/icon-512x512.png',
|
||||
|
||||
@@ -89,6 +89,21 @@ def test_llm_client_providers_listed(client):
|
||||
assert name in PROVIDERS
|
||||
|
||||
|
||||
def test_mistral_defaults_are_tier_safe(client):
|
||||
"""La clé Mistral plan basique → 403 « tier_not_allowed » sur mistral-large/pixtral-large.
|
||||
Le modèle par défaut et le premier de la liste du test de connexion doivent
|
||||
être des modèles servis par tous les plans."""
|
||||
from app.services.llm_client import PROVIDER_MODELS, PROVIDERS
|
||||
tier_blocked = {"mistral-large-latest", "pixtral-large-latest"}
|
||||
assert PROVIDERS["mistral"][1] not in tier_blocked
|
||||
assert PROVIDER_MODELS["mistral"][0] not in tier_blocked
|
||||
# le fallback du modèle retiré (PROVIDERS default) est présent dans la liste
|
||||
assert PROVIDERS["mistral"][1] in PROVIDER_MODELS["mistral"]
|
||||
# et la liste des modèles Mistral est validée chat à chaque fetch (403 exclus)
|
||||
from app.services.llm_config import _CHAT_VALIDATED_PROVIDERS
|
||||
assert "mistral" in _CHAT_VALIDATED_PROVIDERS
|
||||
|
||||
|
||||
def test_llm_client_openai_compatible_bases(client):
|
||||
"""Providers that need an OpenAI-compatible surface must point at it.
|
||||
|
||||
|
||||
@@ -1388,13 +1388,35 @@ def test_library_peek_iframe_is_not_inside_the_x_if_template():
|
||||
assert at > html.index("</template>"), "l'iframe doit être hors du x-if"
|
||||
|
||||
|
||||
def test_library_peek_loads_the_full_screen_editor():
|
||||
"""Le peek charge `/pages/{id}` SANS `?embed=1` : exactement l'éditeur
|
||||
de la page entière (le mode embed masquait sidebar, barre et actions)."""
|
||||
def test_library_peek_loads_the_embed_editor_only():
|
||||
"""Le peek charge `/pages/{id}?embed=1` : le document en mode édition
|
||||
SEUL — le cadre du panneau suffit, ni sidebar ni barre de navigation."""
|
||||
body = _js_func(_library_js(), "openPeek(item) {")
|
||||
|
||||
assert "frame.src = '/pages/' + item.id" in body
|
||||
assert "embed=1" not in _strip_js_comments(body)
|
||||
assert "frame.src = '/pages/' + item.id + '?embed=1'" in body
|
||||
|
||||
|
||||
def test_library_peek_body_has_no_inset_padding():
|
||||
"""Le corps du peek de Library est nu (padding 0, overflow hidden) :
|
||||
l'iframe doit remplir le panneau comme dans local-workspace, sans double
|
||||
scrollbar ni bande grise autour du document."""
|
||||
from pathlib import Path
|
||||
|
||||
html = Path("app/templates/library.html").read_text(encoding="utf-8")
|
||||
rule = html.split(".peek-body{")[1].split("}")[0]
|
||||
assert "padding:0" in rule
|
||||
assert "overflow-y:auto" not in rule
|
||||
|
||||
|
||||
def test_every_side_peek_loads_the_embed_editor_only():
|
||||
"""Library, My Tasks, bases et workspace local : le peek ne montre QUE le
|
||||
document éditable (`?embed=1`), jamais l'habillage pleine page."""
|
||||
from pathlib import Path
|
||||
|
||||
for name in ("library.js", "my_tasks.js", "database_table.js",
|
||||
"local_workspace.js"):
|
||||
src = _strip_js_comments((Path("static/js") / name).read_text(encoding="utf-8"))
|
||||
assert "?embed=1" in src, name
|
||||
|
||||
|
||||
def test_library_peek_reloads_when_switching_documents():
|
||||
@@ -1419,16 +1441,6 @@ def test_close_peek_unloads_the_editor_iframe():
|
||||
assert "frame.onload = null" in body
|
||||
|
||||
|
||||
def test_every_side_peek_loads_the_plain_page_url():
|
||||
"""Library, My Tasks, bases et workspace local : même éditeur partout."""
|
||||
from pathlib import Path
|
||||
|
||||
for name in ("library.js", "my_tasks.js", "database_table.js",
|
||||
"local_workspace.js"):
|
||||
src = (Path("static/js") / name).read_text(encoding="utf-8")
|
||||
assert "?embed=1" not in _strip_js_comments(src), name
|
||||
|
||||
|
||||
def test_calendar_offers_five_views():
|
||||
"""Mois / Année / Semaine / Jour / Planning."""
|
||||
js = _my_tasks_js()
|
||||
@@ -1451,6 +1463,56 @@ def test_calendar_events_have_a_side_peek_icon():
|
||||
assert "data-open-title=" in body
|
||||
|
||||
|
||||
def test_open_buttons_resolve_with_closest_not_target():
|
||||
"""Le gestionnaire de clic lit `data-open-row` via `closest` : les boutons
|
||||
du calendrier et du Kanban ne contiennent que leur SVG — un clic sur
|
||||
l'icone (e.target = <svg>, sans dataset) doit ouvrir le peek aussi."""
|
||||
js = _my_tasks_js()
|
||||
i = js.index("app.addEventListener('click'")
|
||||
block = js[i:i + 900]
|
||||
assert "closest('[data-open-row]')" in block
|
||||
|
||||
|
||||
def test_kanban_cards_have_the_open_button():
|
||||
"""Les tuiles du Kanban portent le même bouton « Open » que les lignes
|
||||
du tableau (parité avec la page d'origine : même peek latéral)."""
|
||||
body = _js_func(_my_tasks_js(), "function viewBoard(")
|
||||
|
||||
assert "openButton(t)" in body
|
||||
# Le bouton est révélé au survol de la tuile (overlay, la carte est une
|
||||
# colonne flex — pas de place en flux).
|
||||
css = _my_tasks_css()
|
||||
assert ".mt-card:hover .mt-hover-only" in css
|
||||
|
||||
|
||||
def test_base_page_collection_renders_the_table_when_embedded():
|
||||
"""`/pages/{id}?embed=1` sur une page de base garde le TABLEAU (template
|
||||
collection) — le peek d'une base ouvre le tableau sans sidebar ni barre,
|
||||
pas l'éditeur de blocs vide."""
|
||||
from pathlib import Path
|
||||
|
||||
src = Path("app/routers/dashboard/pages_html.py").read_text(encoding="utf-8")
|
||||
i = src.index('content_format") == "collection"')
|
||||
branch = src[i:i + 220]
|
||||
assert "not embed" not in branch.split("template")[0]
|
||||
|
||||
|
||||
def test_embed_editor_can_render_inline_databases():
|
||||
"""Le peek (`page_editor_embed.html`) doit charger database_table.js :
|
||||
sans lui, une base embarquée restait bloquée à « Loading database… » et
|
||||
l'icône Open de fin de ligne ne faisait rien. Le panneau #db-side-peek
|
||||
est créé à la demande par database_table.js (markup unique)."""
|
||||
from pathlib import Path
|
||||
|
||||
html = Path("app/templates/page_editor_embed.html").read_text(encoding="utf-8")
|
||||
assert "_database_table_scripts.html" in html
|
||||
js = Path("static/js/database_table.js").read_text(encoding="utf-8")
|
||||
assert "ensureDbPeek" in js
|
||||
# Pas de second markup statique du panneau (source unique).
|
||||
tbl = Path("app/templates/_database_table.html").read_text(encoding="utf-8")
|
||||
assert 'id="db-side-peek"' not in tbl
|
||||
|
||||
|
||||
def test_open_button_carries_its_title_as_attribute():
|
||||
"""Le titre est lu depuis `dataset.openTitle` : disponible aussi dans le
|
||||
calendrier et la vue Jour, où il n'y a pas de ligne `.mt-row`."""
|
||||
@@ -1520,4 +1582,6 @@ def test_db_side_peek_reports_resolution_failure_in_the_panel():
|
||||
|
||||
assert "srcdoc" in block, "erreur rendue dans le panneau"
|
||||
assert "Impossible d’ouvrir le contenu" in block
|
||||
assert block.index("srcdoc") < block.index("panel.style.display = 'flex'")
|
||||
# Le panneau (révélé par `classList.add('open')` depuis la réécriture
|
||||
# vanilla JS de v7.49.0) doit s'afficher APRÈS l'injection du message.
|
||||
assert block.index("srcdoc") < block.index("classList.add('open')")
|
||||
|
||||
@@ -10,8 +10,10 @@ Covers the five roadmap points:
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import ipaddress
|
||||
import json
|
||||
import secrets
|
||||
import socket
|
||||
from pathlib import Path
|
||||
|
||||
import httpx
|
||||
@@ -209,7 +211,27 @@ _OG_HTML = """<!doctype html><html><head>
|
||||
</head><body>hi</body></html>"""
|
||||
|
||||
|
||||
#: IP publique factice — TestOGParser ne doit dépendre ni du réseau HTTP
|
||||
#: (MockTransport) ni du DNS : `_is_public_host` résout l'hôte pour décider si
|
||||
#: l'IP est publique, et cette résolution échoue sous `pytest -n auto` (même
|
||||
#: piège que test_agent_web_tools.stub_dns — d'où un flake récurrent ici).
|
||||
PUBLIC_IP = "93.184.216.34"
|
||||
|
||||
|
||||
class TestOGParser:
|
||||
@pytest.fixture(autouse=True)
|
||||
def stub_dns(self, monkeypatch):
|
||||
real = socket.getaddrinfo
|
||||
|
||||
def fake_getaddrinfo(host, *args, **kwargs):
|
||||
try:
|
||||
ipaddress.ip_address(host)
|
||||
except ValueError:
|
||||
return [(socket.AF_INET, socket.SOCK_STREAM, 6, "", (PUBLIC_IP, 0))]
|
||||
return real(host, *args, **kwargs)
|
||||
|
||||
monkeypatch.setattr(socket, "getaddrinfo", fake_getaddrinfo)
|
||||
|
||||
def test_parse_og_handles_attribute_order(self):
|
||||
from app.services.og_fetcher import parse_og
|
||||
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
"""v7.51.0 — Menu + de l'assistant : sections, parcours fichiers/répertoires,
|
||||
jeton ``folder:<id>`` résolu par ContextBuilder."""
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
from app.db import get_conn
|
||||
from app.services.context_builder import ContextBuilder
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
JS_PATH = ROOT / "static" / "js" / "agent_panel_2.js"
|
||||
|
||||
|
||||
def _uid() -> int:
|
||||
with get_conn() as conn:
|
||||
row = conn.execute("SELECT id FROM users LIMIT 1").fetchone()
|
||||
return row["id"] if row else 1
|
||||
|
||||
|
||||
def _folder_with_children(n_children: int = 2, body: str = "Contenu enfant.") -> int:
|
||||
with get_conn() as conn:
|
||||
cur = conn.execute(
|
||||
"INSERT INTO pages (workspace, title, content, content_format, parent_section) "
|
||||
"VALUES ('ws', 'Dossier Specs', '', 'blocks', 'Workspace')"
|
||||
)
|
||||
fid = cur.lastrowid
|
||||
for i in range(n_children):
|
||||
conn.execute(
|
||||
"INSERT INTO pages (workspace, title, content, content_format, "
|
||||
"parent_section, parent_id) VALUES ('ws', ?, ?, 'markdown', 'Private', ?)",
|
||||
(f"Spec {i}", body * 10 if i else body, fid),
|
||||
)
|
||||
conn.commit()
|
||||
return fid
|
||||
|
||||
|
||||
def test_folder_mention_resolves_children(client):
|
||||
"""folder:<id> = titre du dossier + contenu de ses documents directs."""
|
||||
fid = _folder_with_children()
|
||||
ctx = ContextBuilder(_uid()).build(mentions=[f"folder:{fid}"])
|
||||
assert "Dossier Specs" in ctx
|
||||
assert "Contenu enfant." in ctx
|
||||
|
||||
|
||||
def test_folder_mention_truncates_on_budget(client):
|
||||
"""Le contenu d'un dossier est borné (~12k) : un gros dossier n'explose pas le prompt."""
|
||||
fid = _folder_with_children(n_children=12, body="X" * 800)
|
||||
ctx = ContextBuilder(_uid()).build(mentions=[f"folder:{fid}"])
|
||||
assert "tronqué" in ctx
|
||||
assert len(ctx) < 20000
|
||||
|
||||
|
||||
def test_folder_mention_unknown_id(client):
|
||||
ctx = ContextBuilder(_uid()).build(mentions=["folder:999999"])
|
||||
assert "introuvable" in ctx
|
||||
|
||||
|
||||
def test_browse_contract_nav_menu(client):
|
||||
"""Contrat que le parcours du menu + consomme : dossier = icon 'folder',
|
||||
un niveau par appel via parent_id."""
|
||||
with get_conn() as conn:
|
||||
conn.execute("INSERT OR IGNORE INTO users (id, login) VALUES (1, 'tester')")
|
||||
cur = conn.execute("INSERT INTO workspaces (name, owner_id) VALUES ('BrowseWS', 1)")
|
||||
ws_id = cur.lastrowid
|
||||
cur = conn.execute(
|
||||
"INSERT INTO pages (workspace, workspace_id, title, content, content_format, "
|
||||
"parent_section, parent_id) VALUES ('BrowseWS', ?, 'Dossier A', '', 'blocks', "
|
||||
"'Workspace', NULL)",
|
||||
(ws_id,),
|
||||
)
|
||||
folder_id = cur.lastrowid
|
||||
conn.execute(
|
||||
"INSERT INTO pages (workspace, workspace_id, title, content, content_format, "
|
||||
"parent_section, parent_id) VALUES ('BrowseWS', ?, 'Note enfant', '', 'markdown', "
|
||||
"'Private', ?)",
|
||||
(ws_id, folder_id),
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
root = client.get(f"/api/nav/menu?workspace_id={ws_id}").json()["items"]
|
||||
names = {i["name"]: i for i in root}
|
||||
assert names["Dossier A"]["icon"] == "folder"
|
||||
|
||||
kids = client.get(f"/api/nav/menu?workspace_id={ws_id}&parent_id={folder_id}").json()["items"]
|
||||
kid = {i["name"]: i for i in kids}["Note enfant"]
|
||||
assert kid["icon"] != "folder"
|
||||
assert kid["url"] == f"/pages/{kid['id']}"
|
||||
|
||||
|
||||
def test_agent_panel_renders_plus_menu(client):
|
||||
"""La page rend bien le menu + (markup + bouton)."""
|
||||
resp = client.get("/accounts")
|
||||
assert resp.status_code == 200
|
||||
html = resp.text
|
||||
assert "fd-ap-plus-menu" in html
|
||||
assert "fd-ap-add" in html
|
||||
assert "Menu d'ajout au contexte" in html
|
||||
|
||||
|
||||
def test_plus_menu_sections_and_disabled_states():
|
||||
"""Les 6 sections du menu + existent ; seules les sections déjà livrées sont
|
||||
actives (le menu ne promet rien que le code ne fait)."""
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
root = src.split("var FD_PLUS_MENU = [", 1)[1].split("];", 1)[0]
|
||||
for key in ("'files'", "'skills'", "'connectors'", "'canvases'", "'plugins'", "'memory'"):
|
||||
assert f"key:{key}" in root, key
|
||||
assert "action:'files'" in root and "action:'skills'" in root
|
||||
# v7.58.0 : menu complet — plus aucune section « bientôt » (plugins vivant)
|
||||
assert root.count("disabled:true") == 0
|
||||
|
||||
files = src.split("var FD_PLUS_FILES = [", 1)[1].split("];", 1)[0]
|
||||
assert "action:'search'" in files and "action:'browse'" in files
|
||||
assert "folder:" in src and "document:" in src
|
||||
|
||||
|
||||
def test_folder_chip_token_reaches_run_payload():
|
||||
"""Le jeton folder:<id> épinglé part dans payload.mentions (contrat front→agent)."""
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
# composerMentions() pioche dans contextChips[].token : le parcours doit
|
||||
# produire des items avec token folder:/document:.
|
||||
assert "token: 'folder:' + cur.id" in src
|
||||
assert "token: (isFolder ? 'folder:' : 'document:') + x.id" in src
|
||||
# ... et le backend sait les résoudre.
|
||||
cb = (ROOT / "app" / "services" / "context_builder.py").read_text(
|
||||
encoding="utf-8"
|
||||
)
|
||||
assert 'm.startswith("folder:")' in cb
|
||||
assert "def _single_folder" in cb
|
||||
@@ -0,0 +1,114 @@
|
||||
"""v7.52.0 — Menu + : Compétences-skills (« Gérer » + « Parcourir »).
|
||||
|
||||
Couvre le nouveau ``PATCH /api/agent/skills/{id}``, l'import sans doublon et le
|
||||
câblage du sous-menu (sections, alias affichés, formulaire)."""
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
from conftest import anon_csrf
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
JS_PATH = ROOT / "static" / "js" / "agent_panel_2.js"
|
||||
PANEL_HTML = ROOT / "app" / "templates" / "agent_panel.html"
|
||||
|
||||
NEW_SKILL = {
|
||||
"name": "synthese-reunion",
|
||||
"description": "Synthèse de réunion",
|
||||
"prompt_template": "Résume cette réunion en décisions et actions.",
|
||||
}
|
||||
|
||||
|
||||
def _create(client, **overrides):
|
||||
body = {**NEW_SKILL, **overrides}
|
||||
r = client.post("/api/agent/skills", json=body)
|
||||
assert r.status_code == 200, r.text
|
||||
return r.json()["id"]
|
||||
|
||||
|
||||
def test_skill_patch_updates_fields(client):
|
||||
sid = _create(client)
|
||||
r = client.patch(f"/api/agent/skills/{sid}", json={
|
||||
"name": "synthese-v2", "description": "Version 2",
|
||||
"prompt_template": "Résume en 5 points.",
|
||||
})
|
||||
assert r.status_code == 200, r.text
|
||||
assert r.json()["status"] == "updated"
|
||||
|
||||
skills = {s["id"]: s for s in client.get("/api/agent/skills").json()["skills"]}
|
||||
assert skills[sid]["name"] == "synthese-v2"
|
||||
assert skills[sid]["description"] == "Version 2"
|
||||
assert skills[sid]["prompt_template"] == "Résume en 5 points."
|
||||
|
||||
|
||||
def test_skill_patch_partial_and_validation(client):
|
||||
sid = _create(client)
|
||||
# mise à jour partielle : un seul champ ne touche pas les autres
|
||||
assert client.patch(f"/api/agent/skills/{sid}", json={"description": "Seul champ"}).status_code == 200
|
||||
skills = {s["id"]: s for s in client.get("/api/agent/skills").json()["skills"]}
|
||||
assert skills[sid]["description"] == "Seul champ"
|
||||
assert skills[sid]["prompt_template"] == NEW_SKILL["prompt_template"]
|
||||
|
||||
assert client.patch(f"/api/agent/skills/{sid}", json={}).status_code == 400
|
||||
assert client.patch(f"/api/agent/skills/{sid}", json={"name": " "}).status_code == 400
|
||||
assert client.patch("/api/agent/skills/999999", json={"name": "ghost"}).status_code == 404
|
||||
|
||||
|
||||
def test_skill_patch_requires_session(client):
|
||||
sid = _create(client)
|
||||
anon_csrf(client) # CSRF valide mais plus de session → on veut le 401 de la route
|
||||
assert client.patch(f"/api/agent/skills/{sid}", json={"name": "pirate"}).status_code == 401
|
||||
|
||||
|
||||
def test_import_skill_has_no_duplicate(client):
|
||||
payload = {"name": "skill-importe", "prompt_template": "Fais X.", "description": "import"}
|
||||
first = client.post("/api/agent/skills/import", json={"payload": payload})
|
||||
assert first.status_code == 200 and first.json()["status"] == "imported"
|
||||
|
||||
# même payload, sans overwrite → 409 (pas de doublon silencieux)
|
||||
again = client.post("/api/agent/skills/import", json={"payload": payload})
|
||||
assert again.status_code == 409
|
||||
# avec overwrite → mise à jour de la même ligne
|
||||
over = client.post("/api/agent/skills/import", json={"payload": payload, "overwrite": True})
|
||||
assert over.status_code == 200 and over.json()["status"] == "updated"
|
||||
|
||||
names = [s["name"] for s in client.get("/api/agent/skills").json()["skills"]]
|
||||
assert names.count("skill-importe") == 1
|
||||
|
||||
|
||||
def test_export_then_roundtrip_import(client):
|
||||
sid = _create(client)
|
||||
doc = client.get(f"/api/agent/skills/{sid}/export").json()
|
||||
client.delete(f"/api/agent/skills/{sid}")
|
||||
back = client.post("/api/agent/skills/import", json={"payload": doc, "overwrite": True})
|
||||
assert back.status_code == 200, back.text
|
||||
assert back.json()["name"] == NEW_SKILL["name"]
|
||||
|
||||
|
||||
def test_skills_menu_sections_enabled(client):
|
||||
"""Sous-menu Compétences actif : alias affichés, Gérer + Parcourir, CRUD branché."""
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
root = src.split("var FD_PLUS_MENU = [", 1)[1].split("];", 1)[0]
|
||||
assert "action:'skills'" in root
|
||||
assert "bientôt (phase 2)" not in root
|
||||
|
||||
alias = src.split("var FD_SKILL_ALIAS = ", 1)[1].split(";", 1)[0]
|
||||
assert "research" in alias and "Deep research" in alias
|
||||
assert "create-new-skill" in alias and "Skill-creator" in alias
|
||||
|
||||
for action in ("'skills-manage'", "'skills-gallery'", "'skill-new'",
|
||||
"'skill-edit'", "'skill-install'", "'skill-import'"):
|
||||
assert action in src, action
|
||||
for method in ("saveSkill()", "deleteSkill()", "exportSkill()", "importSkillFile"):
|
||||
assert method in src, method
|
||||
# PATCH utilisé pour l'édition (pas de POST qui recréerait la ligne)
|
||||
assert "method: f.id ? 'PATCH' : 'POST'" in src
|
||||
|
||||
|
||||
def test_skills_menu_markup_rendered(client):
|
||||
html = PANEL_HTML.read_text(encoding="utf-8")
|
||||
assert "fd-plus-form" in html
|
||||
assert 'x-ref="skillImport"' in html
|
||||
assert "Gérer les compétences" in JS_PATH.read_text(encoding="utf-8")
|
||||
resp = client.get("/accounts")
|
||||
assert resp.status_code == 200
|
||||
assert "fd-plus-form" in resp.text
|
||||
@@ -0,0 +1,72 @@
|
||||
"""v7.53.0 — Menu + : Design System – Canevas (créer / insérer / enregistrer)."""
|
||||
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
from app.db import get_conn
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
JS_PATH = ROOT / "static" / "js" / "agent_panel_2.js"
|
||||
|
||||
|
||||
def test_canvases_list_includes_design_system(client):
|
||||
tpl = {t["key"]: t for t in client.get("/board/api/page-templates").json()["templates"] if t.get("builtin")}
|
||||
assert "design_system" in tpl
|
||||
assert tpl["design_system"]["name"] == "Design System"
|
||||
assert tpl["design_system"]["icon"] == "🎨"
|
||||
|
||||
|
||||
def test_blocks_route_builtin(client):
|
||||
r = client.get("/board/api/page-templates/0/blocks", params={"key": "design_system"})
|
||||
assert r.status_code == 200, r.text
|
||||
blocks = r.json()["blocks"]
|
||||
assert isinstance(blocks, list) and blocks
|
||||
assert blocks[0]["type"] == "heading_1" and blocks[0]["content"] == "Design System"
|
||||
# les builtins sont livrés sans id : le front appelle ensureBlockIds()
|
||||
assert "id" not in blocks[0]
|
||||
|
||||
assert client.get("/board/api/page-templates/0/blocks", params={"key": "nope"}).status_code == 404
|
||||
empty = client.get("/board/api/page-templates/0/blocks", params={"key": "empty"})
|
||||
assert empty.status_code == 200 and empty.json()["blocks"]
|
||||
|
||||
|
||||
def test_blocks_route_user_template(client):
|
||||
blocks = [{"type": "heading_1", "content": "Mon canevas"},
|
||||
{"type": "paragraph", "content": "Contenu."}]
|
||||
created = client.post("/board/api/page-templates", json={"name": "Mon canevas", "blocks": blocks})
|
||||
assert created.status_code == 200, created.text
|
||||
tid = created.json()["id"]
|
||||
|
||||
got = client.get(f"/board/api/page-templates/{tid}/blocks")
|
||||
assert got.status_code == 200
|
||||
assert [b["content"] for b in got.json()["blocks"]] == ["Mon canevas", "Contenu."]
|
||||
|
||||
assert client.get("/board/api/page-templates/999999/blocks").status_code == 404
|
||||
|
||||
|
||||
def test_use_design_system_creates_page(client):
|
||||
r = client.post("/board/api/page-templates/0/use", json={"key": "design_system"})
|
||||
assert r.status_code == 200, r.text
|
||||
page_id = r.json()["id"]
|
||||
with get_conn() as conn:
|
||||
row = conn.execute(
|
||||
"SELECT content, content_format FROM pages WHERE id=?", (page_id,)
|
||||
).fetchone()
|
||||
assert row["content_format"] == "blocks"
|
||||
blocks = json.loads(row["content"])
|
||||
texts = [b.get("content", "") for b in blocks]
|
||||
assert "Design System" in texts
|
||||
# les ids sont assignés côté serveur (_ensure_block_ids)
|
||||
assert all(b.get("id") for b in blocks)
|
||||
|
||||
|
||||
def test_canvases_menu_wired(client):
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
root = src.split("var FD_PLUS_MENU = [", 1)[1].split("];", 1)[0]
|
||||
assert "action:'canvases'" in root
|
||||
assert root.count("disabled:true") == 0 # v7.58.0 : menu complet
|
||||
for action in ("'canvas'", "'canvas-create'", "'canvas-insert'", "'canvas-save'"):
|
||||
assert action in src, action
|
||||
# piège /use : la clé builtin part DANS LE BODY, pas en query string
|
||||
assert "body: JSON.stringify(c.builtin ? {key: c.key} : {})" in src
|
||||
assert "ensureBlockIds" in src
|
||||
@@ -0,0 +1,137 @@
|
||||
"""v7.54.0 — Mémoire de l'agent : toggle par conversation, injection au contexte."""
|
||||
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
|
||||
from app.db import get_conn
|
||||
from app.services import agent_memory
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
JS_PATH = ROOT / "static" / "js" / "agent_panel_2.js"
|
||||
ENGINE = ROOT / "app" / "services" / "agent_engine.py"
|
||||
|
||||
|
||||
def _conv(client) -> tuple[int, dict]:
|
||||
r = client.post("/api/agent/conversations", json={"title": "mémoire"})
|
||||
assert r.status_code == 200, r.text
|
||||
return r.json()["id"], r.json()
|
||||
|
||||
|
||||
def test_migration_created_column_and_table(client):
|
||||
with get_conn() as conn:
|
||||
cols = {r[1] for r in conn.execute("PRAGMA table_info(agent_conversations)")}
|
||||
assert "memory_enabled" in cols
|
||||
tbl = conn.execute(
|
||||
"SELECT name FROM sqlite_master WHERE type='table' AND name='agent_memory'"
|
||||
).fetchone()
|
||||
assert tbl is not None
|
||||
|
||||
|
||||
def test_create_conversation_defaults_to_memory_on(client):
|
||||
_, created = _conv(client)
|
||||
assert created["memory_enabled"] == 1 # settings.agent_memory_default
|
||||
|
||||
|
||||
def test_patch_conversation_toggles_memory_persisted(client):
|
||||
cid, _ = _conv(client)
|
||||
assert client.patch(f"/api/agent/conversations/{cid}", json={"memory_enabled": 0}).status_code == 200
|
||||
rows = {c["id"]: c for c in client.get("/api/agent/conversations").json()["conversations"]}
|
||||
assert rows[cid]["memory_enabled"] == 0
|
||||
|
||||
client.patch(f"/api/agent/conversations/{cid}", json={"memory_enabled": 1})
|
||||
rows = {c["id"]: c for c in client.get("/api/agent/conversations").json()["conversations"]}
|
||||
assert rows[cid]["memory_enabled"] == 1
|
||||
|
||||
|
||||
def test_context_for_on_off_and_persistence(client):
|
||||
cid, _ = _conv(client)
|
||||
agent_memory.remember(cid, "Où en est le design system ?", "Les tokens sont dans design-tokens.css.")
|
||||
ctx = agent_memory.context_for(cid)
|
||||
assert "Mémoire de la conversation" in ctx
|
||||
assert "design-tokens.css" in ctx
|
||||
|
||||
# OFF → plus rien n'est lu ni écrit
|
||||
client.patch(f"/api/agent/conversations/{cid}", json={"memory_enabled": 0})
|
||||
assert agent_memory.context_for(cid) == ""
|
||||
agent_memory.remember(cid, "Effacé ?", "Ne doit pas apparaître.")
|
||||
assert agent_memory.context_for(cid) == ""
|
||||
|
||||
# ON à nouveau → la mémoire écrite avant le OFF est toujours là (persistée)
|
||||
client.patch(f"/api/agent/conversations/{cid}", json={"memory_enabled": 1})
|
||||
assert "design-tokens.css" in agent_memory.context_for(cid)
|
||||
assert "Ne doit pas apparaître" not in agent_memory.context_for(cid)
|
||||
|
||||
|
||||
def test_memory_budget_and_note_lines_bounded(client):
|
||||
cid, _ = _conv(client)
|
||||
for i in range(30):
|
||||
agent_memory.remember(cid, f"question {i} " + "x" * 300, "réponse " + "y" * 900)
|
||||
ctx = agent_memory.context_for(cid)
|
||||
header = "## Mémoire de la conversation (échanges précédents)"
|
||||
assert ctx.startswith(header)
|
||||
assert len(ctx) <= agent_memory.INJECT_BUDGET + len(header) + 60
|
||||
with get_conn() as conn:
|
||||
content = conn.execute(
|
||||
"SELECT content FROM agent_memory WHERE conversation_id=?", (cid,)
|
||||
).fetchone()["content"]
|
||||
assert content.count("\n") + 1 <= agent_memory.NOTE_LINES
|
||||
|
||||
|
||||
async def _drain(engine, cid, objective):
|
||||
"""Consomme le générateur SSE de engine.run()."""
|
||||
return [ev async for ev in engine.run(cid, objective)]
|
||||
|
||||
|
||||
class _Resp:
|
||||
def __init__(self, text=""):
|
||||
self.text = text
|
||||
self.tool_calls = []
|
||||
self.usage = {}
|
||||
|
||||
|
||||
class _RecorderLLM:
|
||||
def __init__(self):
|
||||
self.last_user = ""
|
||||
|
||||
async def complete(self, messages, *, model=None, tools=None, stream=False):
|
||||
self.last_user = next(m["content"] for m in messages if m["role"] == "user")
|
||||
return _Resp("C'est noté.")
|
||||
|
||||
|
||||
def test_engine_run_injects_memory_when_on(client):
|
||||
"""Le run réel pousse la mémoire dans le prompt utilisateur (toggle ON)."""
|
||||
from app.services.agent_engine import AgentEngine
|
||||
|
||||
cid, _ = _conv(client)
|
||||
agent_memory.remember(cid, "Priorité du sprint", "Livrer le menu + en priorité.")
|
||||
fake = _RecorderLLM()
|
||||
engine = AgentEngine(1, llm=fake)
|
||||
asyncio.run(_drain(engine, cid, "Quelle est la priorité ?"))
|
||||
assert "Mémoire de la conversation" in fake.last_user
|
||||
assert "menu +" in fake.last_user
|
||||
|
||||
|
||||
def test_engine_run_omits_memory_when_off(client):
|
||||
from app.services.agent_engine import AgentEngine
|
||||
|
||||
cid, _ = _conv(client)
|
||||
agent_memory.remember(cid, "Secret", "ne pas injecter")
|
||||
client.patch(f"/api/agent/conversations/{cid}", json={"memory_enabled": 0})
|
||||
fake = _RecorderLLM()
|
||||
engine = AgentEngine(1, llm=fake)
|
||||
asyncio.run(_drain(engine, cid, "Bonjour"))
|
||||
assert "Mémoire de la conversation" not in fake.last_user
|
||||
assert "ne pas injecter" not in fake.last_user
|
||||
|
||||
|
||||
def test_memory_menu_toggle_wired():
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
root = src.split("var FD_PLUS_MENU = [", 1)[1].split("];", 1)[0]
|
||||
assert "action:'memory'" in root
|
||||
assert "bientôt (phase 4)" not in root
|
||||
assert root.count("disabled:true") == 0 # v7.58.0 : menu complet
|
||||
assert "toggleMemory()" in src
|
||||
assert "memory_enabled: next" in src
|
||||
engine = ENGINE.read_text(encoding="utf-8")
|
||||
assert "agent_memory.context_for(" in engine
|
||||
assert "agent_memory.remember(" in engine
|
||||
@@ -0,0 +1,172 @@
|
||||
"""v7.55.0 — Connecteurs de l'agent : catalogue, CRUD, SSRF, statut, outil LLM."""
|
||||
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
from conftest import anon_csrf
|
||||
|
||||
from app.db import get_conn
|
||||
from app.services import connectors
|
||||
from app.services.sso_provisioning import decrypt_secret
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
JS_PATH = ROOT / "static" / "js" / "agent_panel_2.js"
|
||||
PANEL_HTML = ROOT / "app" / "templates" / "agent_panel.html"
|
||||
|
||||
PUBLIC_URL = "https://example.com/api"
|
||||
|
||||
|
||||
def _create(client, **kw):
|
||||
body = {"name": "Conn perso", "url": PUBLIC_URL, "secret": "sk-live-abc", **kw}
|
||||
r = client.post("/api/agent/connectors", json=body)
|
||||
assert r.status_code == 200, r.text
|
||||
return r.json()
|
||||
|
||||
|
||||
def test_native_connectors_always_listed(client):
|
||||
rows = client.get("/api/agent/connectors").json()["connectors"]
|
||||
native = {r["kind"]: r for r in rows if r["builtin"]}
|
||||
assert set(native) == {"gitea", "github", "web", "google", "ms365"}
|
||||
for r in native.values():
|
||||
assert r["id"] is None
|
||||
assert r["status"] in ("ok", "missing")
|
||||
assert r["enabled"] is True
|
||||
assert native["web"]["status"] == "ok"
|
||||
# les connecteurs OAuth n'existent que si configurés (client_id/secret)
|
||||
assert native["google"]["oauth"] is True
|
||||
assert native["google"]["status"] == "missing"
|
||||
|
||||
|
||||
def test_create_custom_connector_never_returns_secret(client):
|
||||
row = _create(client)
|
||||
assert row["kind"] == "custom" and row["builtin"] is False
|
||||
assert row["has_secret"] is True
|
||||
assert "sk-live-abc" not in str(row) # jamais en clair dans la réponse
|
||||
with get_conn() as conn:
|
||||
stored = conn.execute(
|
||||
"SELECT secret_encrypted FROM agent_connectors WHERE id=?", (row["id"],)
|
||||
).fetchone()["secret_encrypted"]
|
||||
assert stored and "sk-live-abc" not in stored # chiffré (Fernet)
|
||||
assert decrypt_secret(stored) == "sk-live-abc"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("bad", [
|
||||
"http://localhost/secret",
|
||||
"http://127.0.0.1:8080/admin",
|
||||
"http://169.254.169.254/latest/meta-data/",
|
||||
"ftp://exemple.com/api",
|
||||
"file:///etc/passwd",
|
||||
])
|
||||
def test_create_rejects_non_public_urls(client, bad):
|
||||
r = client.post("/api/agent/connectors", json={"name": "interne", "url": bad})
|
||||
assert r.status_code == 400, r.text
|
||||
|
||||
|
||||
def test_patch_toggle_and_delete(client):
|
||||
row = _create(client)
|
||||
cid = row["id"]
|
||||
off = client.patch(f"/api/agent/connectors/{cid}", json={"enabled": False})
|
||||
assert off.status_code == 200 and off.json()["enabled"] is False
|
||||
|
||||
listed = {r["id"]: r for r in client.get("/api/agent/connectors").json()["connectors"]}
|
||||
assert listed[cid]["enabled"] is False
|
||||
|
||||
assert client.delete(f"/api/agent/connectors/{cid}").status_code == 200
|
||||
assert client.delete(f"/api/agent/connectors/{cid}").status_code == 404
|
||||
assert client.patch(f"/api/agent/connectors/{cid}", json={"enabled": True}).status_code == 404
|
||||
|
||||
|
||||
def test_connectors_require_session(client):
|
||||
anon_csrf(client)
|
||||
assert client.get("/api/agent/connectors").status_code == 401
|
||||
assert client.post("/api/agent/connectors",
|
||||
json={"name": "x", "url": PUBLIC_URL}).status_code == 401
|
||||
|
||||
|
||||
def test_probe_persists_status(client, monkeypatch):
|
||||
row = _create(client)
|
||||
cid = row["id"]
|
||||
|
||||
async def ok_get(url, headers=None):
|
||||
assert url.startswith("https://example.com") # URL du connecteur
|
||||
assert (headers or {}).get("Authorization") == "Bearer sk-live-abc" # clé déchiffrée
|
||||
return 200, "{}"
|
||||
|
||||
monkeypatch.setattr(connectors, "_get", ok_get)
|
||||
res = _probe(client, str(cid))
|
||||
assert res["status"] == "ok", res
|
||||
with get_conn() as conn:
|
||||
st = conn.execute("SELECT status FROM agent_connectors WHERE id=?", (cid,)).fetchone()
|
||||
assert st["status"] == "ok"
|
||||
|
||||
|
||||
def _probe(client, target):
|
||||
r = client.post("/api/agent/connectors/probe", json={"connector": target})
|
||||
assert r.status_code == 200, r.text
|
||||
return r.json()
|
||||
|
||||
|
||||
def test_probe_error_is_persisted(client, monkeypatch):
|
||||
row = _create(client)
|
||||
cid = row["id"]
|
||||
|
||||
async def boom(url, headers=None):
|
||||
raise ValueError("Hôte non autorisé")
|
||||
|
||||
monkeypatch.setattr(connectors, "_get", boom)
|
||||
res = _probe(client, str(cid))
|
||||
assert res["status"] == "error"
|
||||
assert "Hôte non autorisé" in res["detail"]
|
||||
with get_conn() as conn:
|
||||
st = conn.execute("SELECT status, detail FROM agent_connectors WHERE id=?",
|
||||
(cid,)).fetchone()
|
||||
assert st["status"] == "error"
|
||||
|
||||
|
||||
def test_connector_fetch_tool_registered_and_works(client, monkeypatch):
|
||||
from app.services.tool_registry import ToolRegistry
|
||||
|
||||
reg = ToolRegistry()
|
||||
schema = {t["name"]: t for t in reg.schema()}
|
||||
assert "connector_fetch" in schema
|
||||
assert schema["connector_fetch"]["parameters"]["required"] == ["connector"]
|
||||
|
||||
row = _create(client)
|
||||
|
||||
async def ok_get(url, headers=None):
|
||||
return 200, '{"ok": true, "source": "exemple"}'
|
||||
|
||||
monkeypatch.setattr(connectors, "_get", ok_get)
|
||||
res = asyncio.run(reg.execute("connector_fetch", {"connector": str(row["id"]),
|
||||
"path": "/status"}))
|
||||
assert res.status == "success"
|
||||
assert "exemple" in res.data["text"]
|
||||
|
||||
# connecteur désactivé → refusé
|
||||
client.patch(f"/api/agent/connectors/{row['id']}", json={"enabled": False})
|
||||
res2 = asyncio.run(reg.execute("connector_fetch", {"connector": str(row["id"])}))
|
||||
assert res2.status == "error"
|
||||
assert "désactivé" in res2.message.lower()
|
||||
|
||||
# connecteur inconnu → erreur outil (pas d'exception qui casse le run)
|
||||
res3 = asyncio.run(reg.execute("connector_fetch", {"connector": "999999"}))
|
||||
assert res3.status == "error"
|
||||
|
||||
|
||||
def test_connectors_menu_wired(client):
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
root = src.split("var FD_PLUS_MENU = [", 1)[1].split("];", 1)[0]
|
||||
assert "action:'connectors'" in root
|
||||
assert root.count("disabled:true") == 0 # v7.58.0 : menu complet
|
||||
for action in ("'connector'", "'connector-new'", "'connector-probe'",
|
||||
"'connector-toggle'", "'connector-delete'"):
|
||||
assert action in src, action
|
||||
for fn in ("fetchConnectors()", "connectorCreate()", "connectorProbe()",
|
||||
"connectorToggle()", "connectorDelete()"):
|
||||
assert fn in src, fn
|
||||
html = PANEL_HTML.read_text(encoding="utf-8")
|
||||
assert "plusSection==='connector-new'" in html
|
||||
assert 'type="password"' in html # la clé n'est pas en clair à l'écran
|
||||
resp = client.get("/accounts")
|
||||
assert resp.status_code == 200 and "connectorForm" in resp.text
|
||||
@@ -0,0 +1,231 @@
|
||||
"""v7.56.0 — Connecteurs OAuth Google / Microsoft 365 (PKCE, tokens, refresh)."""
|
||||
|
||||
import asyncio
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
from conftest import anon_csrf
|
||||
|
||||
from app.db import get_conn
|
||||
from app.services import oauth_connectors
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
JS_PATH = ROOT / "static" / "js" / "agent_panel_2.js"
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def configured(monkeypatch):
|
||||
"""Clients OAuth fictifs (aucune clé réelle nécessaire pour les tests)."""
|
||||
from app.config import settings
|
||||
monkeypatch.setattr(settings, "google_client_id", "gid-test")
|
||||
monkeypatch.setattr(settings, "google_client_secret", "gsec-test")
|
||||
monkeypatch.setattr(settings, "ms_client_id", "mid-test")
|
||||
monkeypatch.setattr(settings, "ms_client_secret", "msec-test")
|
||||
monkeypatch.setattr(settings, "app_base_url", "https://flowdeck.example")
|
||||
return settings
|
||||
|
||||
|
||||
def _begin(client, kind="google"):
|
||||
r = client.post(f"/api/agent/connectors/oauth/{kind}/authorize")
|
||||
assert r.status_code == 200, r.text
|
||||
return r.json()
|
||||
|
||||
|
||||
def test_authorize_url_has_pkce_scope_and_state(client, configured):
|
||||
data = _begin(client)
|
||||
url = data["url"]
|
||||
assert url.startswith("https://accounts.google.com/o/oauth2/v2/auth?")
|
||||
assert "client_id=gid-test" in url
|
||||
assert "code_challenge=" in url and "code_challenge_method=S256" in url
|
||||
assert "drive.readonly" in url and "gmail.readonly" in url and "calendar.readonly" in url
|
||||
assert "state=" in url
|
||||
assert "redirect_uri=" in url and "api%2Fagent%2Fconnectors%2Foauth%2Fgoogle%2Fcallback" in url
|
||||
# les cookies d'état partent avec la réponse (10 min, HttpOnly)
|
||||
for key in ("fd_oauth_state_google", "fd_oauth_verifier_google", "fd_oauth_next_google"):
|
||||
assert key in client.cookies
|
||||
|
||||
|
||||
def test_authorize_without_client_config_is_400(client):
|
||||
r = client.post("/api/agent/connectors/oauth/google/authorize")
|
||||
assert r.status_code == 400
|
||||
assert "non configuré" in r.json()["detail"]
|
||||
|
||||
|
||||
def test_callback_saves_tokens_encrypted_and_redirects(client, configured, monkeypatch):
|
||||
_begin(client)
|
||||
state = client.cookies["fd_oauth_state_google"]
|
||||
|
||||
async def fake_post(url, form=None, **kw):
|
||||
assert url == "https://oauth2.googleapis.com/token"
|
||||
assert form["grant_type"] == "authorization_code"
|
||||
assert form["code"] == "abc123"
|
||||
assert form["code_verifier"] == client.cookies["fd_oauth_verifier_google"]
|
||||
return {"access_token": "at-1", "refresh_token": "rt-1",
|
||||
"expires_in": 3600, "scope": "openid email"}
|
||||
|
||||
monkeypatch.setattr(oauth_connectors, "_post_form", fake_post)
|
||||
resp = client.get(
|
||||
"/api/agent/connectors/oauth/google/callback",
|
||||
params={"code": "abc123", "state": state},
|
||||
follow_redirects=False,
|
||||
)
|
||||
assert resp.status_code == 302
|
||||
assert "oauth=connected" in resp.headers["location"]
|
||||
|
||||
with get_conn() as conn:
|
||||
row = conn.execute("SELECT tokens_enc FROM connector_tokens").fetchone()
|
||||
assert row and "at-1" not in row["tokens_enc"] # chiffré
|
||||
assert oauth_connectors.tokens("google", 1)["access_token"] == "at-1"
|
||||
|
||||
status = client.get("/api/agent/connectors/oauth/google/status").json()
|
||||
assert status["connected"] is True and status["configured"] is True
|
||||
|
||||
|
||||
def test_callback_rejects_state_mismatch(client, configured, monkeypatch):
|
||||
called = []
|
||||
|
||||
async def fake_post(url, form=None, **kw):
|
||||
called.append(form)
|
||||
return {"access_token": "at"}
|
||||
|
||||
monkeypatch.setattr(oauth_connectors, "_post_form", fake_post)
|
||||
resp = client.get(
|
||||
"/api/agent/connectors/oauth/google/callback",
|
||||
params={"code": "abc", "state": "forged"}, # != cookie
|
||||
follow_redirects=False,
|
||||
)
|
||||
assert resp.status_code == 302 and "oauth_error=state" in resp.headers["location"]
|
||||
assert called == []
|
||||
assert not oauth_connectors.is_connected("google", 1)
|
||||
|
||||
|
||||
def test_callback_without_session_redirects(client, configured, monkeypatch):
|
||||
_begin(client)
|
||||
state = client.cookies["fd_oauth_state_google"]
|
||||
|
||||
async def fake_post(url, form=None, **kw):
|
||||
return {"access_token": "at"}
|
||||
|
||||
monkeypatch.setattr(oauth_connectors, "_post_form", fake_post)
|
||||
# on retire la SEULE session (anon_csrf effacerait aussi le cookie d'état OAuth)
|
||||
client.cookies.delete("flowdeck_session")
|
||||
client.auth = None
|
||||
resp = client.get(
|
||||
"/api/agent/connectors/oauth/google/callback",
|
||||
params={"code": "abc", "state": state},
|
||||
follow_redirects=False,
|
||||
)
|
||||
assert resp.status_code == 302 and "oauth_error=session" in resp.headers["location"]
|
||||
|
||||
|
||||
def test_refresh_token_flow(client, configured, monkeypatch):
|
||||
oauth_connectors.save("google", 1, {
|
||||
"access_token": "old", "refresh_token": "rt-keep",
|
||||
"expires_at": int(time.time()) - 10, "scope": "openid",
|
||||
})
|
||||
calls = []
|
||||
|
||||
async def fake_post(url, form=None, **kw):
|
||||
calls.append(form)
|
||||
return {"access_token": "new", "expires_in": 3600} # pas de refresh_token
|
||||
|
||||
monkeypatch.setattr(oauth_connectors, "_post_form", fake_post)
|
||||
access = asyncio.run(oauth_connectors.access_token("google", 1))
|
||||
assert access == "new"
|
||||
assert calls[0]["grant_type"] == "refresh_token"
|
||||
assert calls[0]["refresh_token"] == "rt-keep"
|
||||
stored = oauth_connectors.tokens("google", 1)
|
||||
assert stored["refresh_token"] == "rt-keep" # conservé si absent de la réponse
|
||||
assert stored["expires_at"] > time.time()
|
||||
|
||||
|
||||
def test_api_get_bearer_and_refuses_absolute_url(client, configured, monkeypatch):
|
||||
oauth_connectors.save("google", 1, {"access_token": "at", "refresh_token": "",
|
||||
"expires_at": int(time.time()) + 3600,
|
||||
"scope": "openid"})
|
||||
seen = []
|
||||
|
||||
async def fake_get(url, headers=None):
|
||||
seen.append((url, headers))
|
||||
return 200, '{"emails": 3}'
|
||||
|
||||
monkeypatch.setattr(oauth_connectors, "_api_get", fake_get)
|
||||
res = asyncio.run(oauth_connectors.api_get("google", 1, "/gmail/v1/users/me/profile"))
|
||||
assert res["status"] == "ok"
|
||||
assert seen[0][0].startswith("https://www.googleapis.com/gmail/v1/")
|
||||
assert seen[0][1]["Authorization"] == "Bearer at"
|
||||
|
||||
# une URL absolue dans `path` ne doit pas dévier (hôte fixe + validation)
|
||||
res2 = asyncio.run(oauth_connectors.api_get("google", 1, "https://evil.example/x"))
|
||||
assert res2["status"] == "error"
|
||||
assert len(seen) == 1 # aucun appel réseau
|
||||
|
||||
|
||||
def test_api_get_requires_connection(client, configured):
|
||||
res = asyncio.run(oauth_connectors.api_get("google", 1, "/me"))
|
||||
assert res["status"] == "error" and "non connecté" in res["text"]
|
||||
|
||||
|
||||
def test_disconnect_clears_tokens(client, configured):
|
||||
oauth_connectors.save("ms365", 1, {"access_token": "at", "expires_at": 1, "scope": ""})
|
||||
assert oauth_connectors.is_connected("ms365", 1)
|
||||
r = client.post("/api/agent/connectors/oauth/ms365/disconnect")
|
||||
assert r.status_code == 200 and r.json()["status"] == "disconnected"
|
||||
assert not oauth_connectors.is_connected("ms365", 1)
|
||||
|
||||
|
||||
def test_catalogue_marks_oauth_connectors(client, configured):
|
||||
rows = client.get("/api/agent/connectors").json()["connectors"]
|
||||
by_kind = {r["kind"]: r for r in rows if r["builtin"]}
|
||||
assert "google" in by_kind and "ms365" in by_kind
|
||||
assert by_kind["google"]["oauth"] is True
|
||||
assert by_kind["google"]["status"] == "missing" # configuré mais pas connecté
|
||||
assert "non connecté" in by_kind["google"]["detail"]
|
||||
|
||||
oauth_connectors.save("google", 1, {"access_token": "at", "expires_at": 9_999_999_999,
|
||||
"scope": "openid email drive"})
|
||||
rows = client.get("/api/agent/connectors").json()["connectors"]
|
||||
g = {r["kind"]: r for r in rows if r["builtin"]}["google"]
|
||||
assert g["status"] == "ok" and "connecté" in g["detail"]
|
||||
|
||||
|
||||
def test_tool_dispatches_to_oauth_api(client, configured, monkeypatch):
|
||||
from app.services.tool_registry import ToolRegistry
|
||||
|
||||
oauth_connectors.save("google", 1, {"access_token": "at", "refresh_token": "",
|
||||
"expires_at": int(time.time()) + 3600,
|
||||
"scope": "openid"})
|
||||
|
||||
async def fake_get(url, headers=None):
|
||||
assert url.startswith("https://www.googleapis.com/")
|
||||
assert headers["Authorization"] == "Bearer at"
|
||||
return 200, '{"name": "Bruno"}'
|
||||
|
||||
monkeypatch.setattr(oauth_connectors, "_api_get", fake_get)
|
||||
res = asyncio.run(ToolRegistry().execute(
|
||||
"connector_fetch", {"connector": "google", "path": "/oauth2/v3/userinfo"},
|
||||
user_id=1))
|
||||
assert res.status == "success"
|
||||
assert "Bruno" in res.data["text"]
|
||||
|
||||
|
||||
def test_oauth_routes_require_session(client):
|
||||
anon_csrf(client)
|
||||
assert client.get("/api/agent/connectors/oauth/google/status").status_code == 401
|
||||
assert client.post("/api/agent/connectors/oauth/google/authorize").status_code == 401
|
||||
assert client.post("/api/agent/connectors/oauth/google/disconnect").status_code == 401
|
||||
# kind inconnu → 404 même authentifié
|
||||
assert client.post("/api/agent/connectors/oauth/dropbox/authorize").status_code == 404
|
||||
|
||||
|
||||
def test_oauth_menu_wired():
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
for token in ("'connector-connect'", "'connector-disconnect'",
|
||||
"connectorConnect()", "connectorDisconnect()",
|
||||
"qs.get('oauth_error')", "Connecteur connecté."):
|
||||
assert token in src, token
|
||||
assert "c.oauth" in src
|
||||
# le fournisseur revient avec `oauth=connected` (côté route)
|
||||
router = (ROOT / "app" / "routers" / "agent.py").read_text(encoding="utf-8")
|
||||
assert "oauth=connected" in router
|
||||
@@ -0,0 +1,209 @@
|
||||
"""v7.57.0 — Discord / Telegram (presets) + serveurs MCP (outils dynamiques)."""
|
||||
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
from conftest import anon_csrf
|
||||
|
||||
from app.db import get_conn
|
||||
from app.services import connectors, mcp_client
|
||||
from app.services.tool_registry import ToolRegistry
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
JS_PATH = ROOT / "static" / "js" / "agent_panel_2.js"
|
||||
PANEL_HTML = ROOT / "app" / "templates" / "agent_panel.html"
|
||||
|
||||
|
||||
def _create(client, **kw):
|
||||
body = {"name": "Conn", "url": "https://example.com/v1", "secret": "sk-1", **kw}
|
||||
r = client.post("/api/agent/connectors", json=body)
|
||||
assert r.status_code == 200, r.text
|
||||
return r.json()
|
||||
|
||||
|
||||
# ── Presets Discord / Telegram ──────────────────────────────────────────────
|
||||
|
||||
def test_discord_preset_uses_bot_auth(client):
|
||||
row = _create(client, name="Discord", url="https://discord.com/api/v10",
|
||||
auth="bot", kind="discord")
|
||||
assert row["kind"] == "discord" and row["auth"] == "bot"
|
||||
assert connectors._headers(row["id"])["Authorization"].startswith("Bot ")
|
||||
|
||||
|
||||
def test_telegram_secret_lives_in_url_not_in_db(client, monkeypatch):
|
||||
row = _create(client, name="Telegram", kind="telegram", auth="none",
|
||||
url="https://api.telegram.org/bot{secret}", secret="123456:abc")
|
||||
with get_conn() as conn:
|
||||
stored = conn.execute("SELECT url FROM agent_connectors WHERE id=?",
|
||||
(row["id"],)).fetchone()["url"]
|
||||
assert "{secret}" in stored and "123456" not in stored # jamais en clair
|
||||
|
||||
seen = []
|
||||
|
||||
async def fake_get(url, headers=None):
|
||||
seen.append((url, headers))
|
||||
return 200, '{"ok": true}'
|
||||
|
||||
monkeypatch.setattr(connectors, "_get", fake_get)
|
||||
asyncio.run(connectors.connector_fetch(str(row["id"]), path="getMe"))
|
||||
assert seen[0][0] == "https://api.telegram.org/bot123456:abc/getMe"
|
||||
assert "Authorization" not in seen[0][1] # auth=none
|
||||
|
||||
|
||||
def test_secret_placeholder_requires_key_and_valid_kinds(client):
|
||||
no_key = client.post("/api/agent/connectors",
|
||||
json={"name": "TG", "url": "https://api.telegram.org/bot{secret}"})
|
||||
assert no_key.status_code == 400 and "secret" in no_key.json()["detail"]
|
||||
bad_kind = client.post("/api/agent/connectors",
|
||||
json={"name": "X", "url": "https://example.com/x", "kind": "slack"})
|
||||
assert bad_kind.status_code == 400 and "kind" in bad_kind.json()["detail"]
|
||||
bad_auth = client.post("/api/agent/connectors",
|
||||
json={"name": "X", "url": "https://example.com/x", "auth": "digest"})
|
||||
assert bad_auth.status_code == 400 and "auth" in bad_auth.json()["detail"]
|
||||
|
||||
|
||||
# ── MCP : handshake, cache, outils dynamiques ───────────────────────────────
|
||||
|
||||
def _mcp_server(client) -> int:
|
||||
return _create(client, name="Demo Server", kind="mcp", url="https://example.com/mcp")["id"]
|
||||
|
||||
|
||||
def _fake_rpc_factory(calls):
|
||||
async def fake_rpc(url, payload, headers=None):
|
||||
assert url.startswith("https://example.com/mcp") # SSRF: hôte public fixe
|
||||
calls.append(payload.get("method"))
|
||||
method = payload.get("method")
|
||||
if method == "initialize":
|
||||
return {"result": {"protocolVersion": "2024-11-05",
|
||||
"serverInfo": {"name": "demo"}}}
|
||||
if method == "tools/list":
|
||||
return {"result": {"tools": [
|
||||
{"name": "search_docs", "description": "Cherche dans les notes",
|
||||
"inputSchema": {"type": "object", "properties": {"q": {"type": "string"}},
|
||||
"required": ["q"]}},
|
||||
{"name": "Echo", "description": "Répète"},
|
||||
]}}
|
||||
if method == "tools/call":
|
||||
return {"result": {"content": [{"type": "text", "text": "résultat utile"}]}}
|
||||
return {}
|
||||
return fake_rpc
|
||||
|
||||
|
||||
def test_mcp_probe_handshakes_and_caches_tools(client, monkeypatch):
|
||||
sid = _mcp_server(client)
|
||||
calls = []
|
||||
monkeypatch.setattr(mcp_client, "_rpc", _fake_rpc_factory(calls))
|
||||
|
||||
res = asyncio.run(connectors.probe(str(sid)))
|
||||
assert res["status"] == "ok", res
|
||||
assert "2 outil(s)" in res["detail"]
|
||||
assert calls == ["initialize", "notifications/initialized", "tools/list"]
|
||||
|
||||
with get_conn() as conn:
|
||||
tools = conn.execute("SELECT tools_json FROM agent_connectors WHERE id=?",
|
||||
(sid,)).fetchone()["tools_json"]
|
||||
assert "mcp_demo_server_search_docs" in tools # nom LLM calculé
|
||||
rows = client.get("/api/agent/connectors").json()["connectors"]
|
||||
me = {r["id"]: r for r in rows if r["id"] == sid}[sid]
|
||||
assert me["kind"] == "mcp" and me["tools_count"] == 2
|
||||
|
||||
|
||||
def test_dynamic_tools_reach_the_llm_schema_and_execute(client, monkeypatch):
|
||||
sid = _mcp_server(client)
|
||||
monkeypatch.setattr(mcp_client, "_rpc", _fake_rpc_factory([]))
|
||||
asyncio.run(connectors.probe(str(sid)))
|
||||
|
||||
reg = ToolRegistry()
|
||||
schema = {t["name"]: t for t in reg.schema()}
|
||||
assert "mcp_demo_server_search_docs" in schema
|
||||
assert schema["mcp_demo_server_search_docs"]["parameters"]["required"] == ["q"]
|
||||
assert "mcp_demo_server_echo" in schema
|
||||
|
||||
res = asyncio.run(reg.execute("mcp_demo_server_search_docs", {"q": "notes"}))
|
||||
assert res.status == "success"
|
||||
assert "résultat utile" in res.data["text"]
|
||||
|
||||
|
||||
def test_disabled_mcp_server_hides_its_tools(client, monkeypatch):
|
||||
sid = _mcp_server(client)
|
||||
monkeypatch.setattr(mcp_client, "_rpc", _fake_rpc_factory([]))
|
||||
asyncio.run(connectors.probe(str(sid)))
|
||||
assert "mcp_demo_server_echo" in {t["name"] for t in ToolRegistry().schema()}
|
||||
|
||||
client.patch(f"/api/agent/connectors/{sid}", json={"enabled": False})
|
||||
assert "mcp_demo_server_echo" not in {t["name"] for t in ToolRegistry().schema()}
|
||||
# hors du registre → refus explicite plutôt qu'un appel réseau raté
|
||||
res = asyncio.run(ToolRegistry().execute("mcp_demo_server_echo", {}))
|
||||
assert res.status == "error" and "inconnu" in res.message.lower()
|
||||
|
||||
|
||||
def test_mcp_rpc_errors_become_probe_errors(client, monkeypatch):
|
||||
sid = _mcp_server(client)
|
||||
|
||||
async def bad_rpc(url, payload, headers=None):
|
||||
if payload.get("method") == "initialize":
|
||||
raise ValueError("MCP -32000 : handshake refusé")
|
||||
return {}
|
||||
|
||||
monkeypatch.setattr(mcp_client, "_rpc", bad_rpc)
|
||||
res = asyncio.run(connectors.probe(str(sid)))
|
||||
assert res["status"] == "error" and "handshake" in res["detail"]
|
||||
# les outils restent absents : pas de cache partiel
|
||||
with get_conn() as conn:
|
||||
tools = conn.execute("SELECT tools_json FROM agent_connectors WHERE id=?",
|
||||
(sid,)).fetchone()["tools_json"]
|
||||
assert tools == "[]"
|
||||
|
||||
|
||||
def test_parse_body_handles_sse_and_rpc_errors():
|
||||
sse = mcp_client.parse_body(
|
||||
"text/event-stream; charset=utf-8",
|
||||
": keep-alive\nevent: message\ndata: {\"result\": {\"ok\": 1}}\n\n", 200)
|
||||
assert sse == {"result": {"ok": 1}}
|
||||
assert mcp_client.parse_body("application/json", '{"result": {}}', 200) == {"result": {}}
|
||||
with pytest.raises(ValueError, match="illisible"):
|
||||
mcp_client.parse_body("text/html", "<html>gateway</html>", 502)
|
||||
with pytest.raises(ValueError, match="-32601"):
|
||||
mcp_client.parse_body("application/json",
|
||||
'{"error": {"code": -32601, "message": "Method not found"}}', 200)
|
||||
|
||||
|
||||
def test_tool_name_slug():
|
||||
assert mcp_client.tool_name("Demo Server", "search-docs") == "mcp_demo_server_search_docs"
|
||||
assert mcp_client.tool_name("!!", "Echo") == "mcp_echo"
|
||||
|
||||
|
||||
# ── Teams + câblage ─────────────────────────────────────────────────────────
|
||||
|
||||
def test_ms365_scopes_include_teams_messages():
|
||||
from app.services.oauth_connectors import PROVIDERS
|
||||
assert "ChannelMessage.Read.All" in PROVIDERS["ms365"]["scopes"]
|
||||
assert "Files.Read" in PROVIDERS["ms365"]["scopes"]
|
||||
|
||||
|
||||
def test_connectors_menu_wired_for_presets(client):
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
for token in ("connectorPreset()", "kind: f.kind || 'custom'",
|
||||
"auth: f.auth || 'bearer'",
|
||||
"https://discord.com/api/v10",
|
||||
"https://api.telegram.org/bot{secret}", "presets[f.kind]"):
|
||||
assert token in src, token
|
||||
html = PANEL_HTML.read_text(encoding="utf-8")
|
||||
assert "fd-plus-cn-kind" in html
|
||||
for token in ('value="discord"', 'value="telegram"', 'value="mcp"',
|
||||
'connectorForm.kind'):
|
||||
assert token in html, token
|
||||
# v7.58.0 : plus aucune section « bientôt » (plugins rendu vivant)
|
||||
root = src.split("var FD_PLUS_MENU = [", 1)[1].split("];", 1)[0]
|
||||
assert root.count("disabled:true") == 0
|
||||
resp = client.get("/accounts")
|
||||
assert resp.status_code == 200 and "connectorPreset" in resp.text
|
||||
|
||||
|
||||
def test_mcp_routes_require_session(client):
|
||||
anon_csrf(client)
|
||||
assert client.get("/api/agent/connectors").status_code == 401
|
||||
assert client.post("/api/agent/connectors",
|
||||
json={"name": "x", "url": "https://example.com/x",
|
||||
"kind": "mcp"}).status_code == 401
|
||||
@@ -0,0 +1,142 @@
|
||||
"""v7.58.0 — Add plugins : registre persistant + on/off à effet réel."""
|
||||
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
|
||||
from conftest import anon_csrf
|
||||
|
||||
from app.services import plugins
|
||||
from app.services.tool_registry import ToolRegistry
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
JS_PATH = ROOT / "static" / "js" / "agent_panel_2.js"
|
||||
PANEL_HTML = ROOT / "app" / "templates" / "agent_panel.html"
|
||||
SETTINGS_HTML = ROOT / "app" / "templates" / "settings.html"
|
||||
AUTOMATIONS_PY = ROOT / "app" / "services" / "automations.py"
|
||||
|
||||
|
||||
def _set(client, slug: str, enabled: bool) -> dict:
|
||||
r = client.patch(f"/api/agent/plugins/{slug}", json={"enabled": enabled})
|
||||
assert r.status_code == 200, r.text
|
||||
return r.json()
|
||||
|
||||
|
||||
# ── Catalogue ───────────────────────────────────────────────────────────────
|
||||
|
||||
def test_catalog_lists_the_three_wired_plugins(client):
|
||||
data = client.get("/api/agent/plugins").json()["plugins"]
|
||||
assert [p["slug"] for p in data] == ["web-tools", "web-clipper", "automations"]
|
||||
assert all(p["enabled"] for p in data)
|
||||
assert all(p["name"] and p["description"] for p in data)
|
||||
|
||||
|
||||
def test_unknown_slug_is_404(client):
|
||||
assert client.patch("/api/agent/plugins/nope",
|
||||
json={"enabled": False}).status_code == 404
|
||||
|
||||
|
||||
def test_toggle_persists_in_db(client):
|
||||
_set(client, "web-clipper", False)
|
||||
assert plugins.is_enabled("web-clipper") is False # relu depuis la base
|
||||
_set(client, "web-clipper", True)
|
||||
assert plugins.is_enabled("web-clipper") is True
|
||||
|
||||
|
||||
# ── Effet réel : routes refusées ────────────────────────────────────────────
|
||||
|
||||
def test_automations_routes_refused_when_plugin_off(client):
|
||||
# 404 hors /api = redirection vers /workspaces (handler unifié de main.py)
|
||||
def get():
|
||||
return client.get("/workspace/automations", follow_redirects=False)
|
||||
|
||||
assert get().status_code == 200
|
||||
_set(client, "automations", False)
|
||||
assert get().status_code == 302
|
||||
assert get().headers["location"] == "/workspaces"
|
||||
assert client.post("/workspace/automations", json={},
|
||||
follow_redirects=False).status_code == 302
|
||||
assert plugins.is_enabled("automations") is False
|
||||
_set(client, "automations", True)
|
||||
assert get().status_code == 200
|
||||
|
||||
|
||||
def test_scheduler_tick_guarded_when_automations_off(client):
|
||||
# le scheduler doit vérifier le plugin avant chaque tick ( effet réel, pas un
|
||||
# drapeau lu nulle part )
|
||||
src = AUTOMATIONS_PY.read_text(encoding="utf-8")
|
||||
assert 'plugins.is_enabled("automations")' in src
|
||||
_set(client, "automations", False)
|
||||
assert plugins.is_enabled("automations") is False
|
||||
|
||||
|
||||
def test_web_clipper_api_and_page_refused_when_plugin_off(client):
|
||||
def page():
|
||||
return client.get("/extensions", follow_redirects=False)
|
||||
|
||||
assert client.get("/api/v2/web-clipper/status").status_code == 200
|
||||
assert page().status_code == 200
|
||||
_set(client, "web-clipper", False)
|
||||
assert client.get("/api/v2/web-clipper/status").status_code == 404
|
||||
assert client.post("/api/v2/web-clipper/clip", json={}).status_code == 404
|
||||
assert page().status_code == 302 and page().headers["location"] == "/workspaces"
|
||||
_set(client, "web-clipper", True)
|
||||
assert client.get("/api/v2/web-clipper/status").status_code == 200
|
||||
assert page().status_code == 200
|
||||
|
||||
|
||||
# ── Effet réel : outils de l'agent ──────────────────────────────────────────
|
||||
|
||||
def test_web_tools_leaves_the_llm_registry_when_plugin_off(client):
|
||||
names = {t["name"] for t in ToolRegistry().schema()}
|
||||
assert {"web_search", "fetch_url"} <= names
|
||||
|
||||
_set(client, "web-tools", False)
|
||||
names = {t["name"] for t in ToolRegistry().schema()}
|
||||
assert not ({"web_search", "fetch_url"} & names)
|
||||
res = asyncio.run(ToolRegistry().execute("fetch_url",
|
||||
{"url": "https://example.com"}))
|
||||
assert res.status == "error" and "inconnu" in res.message.lower()
|
||||
|
||||
_set(client, "web-tools", True)
|
||||
names = {t["name"] for t in ToolRegistry().schema()}
|
||||
assert {"web_search", "fetch_url"} <= names
|
||||
|
||||
|
||||
# ── UI : settings rendu côté serveur + menu + ──────────────────────────────
|
||||
|
||||
def test_settings_hides_disabled_plugins(client):
|
||||
html = client.get("/settings").text
|
||||
assert "navTo('extensions')" in html and "navTo('automations')" in html # ON
|
||||
|
||||
_set(client, "automations", False)
|
||||
_set(client, "web-clipper", False)
|
||||
html = client.get("/settings").text
|
||||
assert "navTo('automations')" not in html # nav retirée
|
||||
assert "navTo('extensions')" not in html
|
||||
assert "x-show=\"false && activeSection==='automations'\"" in html
|
||||
|
||||
_set(client, "automations", True)
|
||||
_set(client, "web-clipper", True)
|
||||
html = client.get("/settings").text
|
||||
assert "navTo('automations')" in html and "navTo('extensions')" in html
|
||||
|
||||
|
||||
def test_menu_catalogue_is_live(client):
|
||||
src = JS_PATH.read_text(encoding="utf-8")
|
||||
for token in ("action:'plugins'", "_pluginItems()", "pluginToggle(slug)",
|
||||
"/api/agent/plugins", "Add plugins"):
|
||||
assert token in src, token
|
||||
# la section n'est plus une coquille « bientôt »
|
||||
root = src.split("var FD_PLUS_MENU = [", 1)[1].split("];", 1)[0]
|
||||
assert "disabled:true" not in root
|
||||
panel = PANEL_HTML.read_text(encoding="utf-8")
|
||||
assert "plusSection!=='root'" in panel # en-tête/rétour génériques
|
||||
settings = SETTINGS_HTML.read_text(encoding="utf-8")
|
||||
assert settings.count("plugin_enabled(") >= 4
|
||||
|
||||
|
||||
def test_plugins_routes_require_session(client):
|
||||
anon_csrf(client)
|
||||
assert client.get("/api/agent/plugins").status_code == 401
|
||||
assert client.patch("/api/agent/plugins/automations",
|
||||
json={"enabled": False}).status_code == 401
|
||||
@@ -0,0 +1,100 @@
|
||||
"""7.59.2 — corrections : bouton ✕ de l'aide, « Insert below » qui perd le
|
||||
format, listes numérotées invisibles (agent + /numbered list)."""
|
||||
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
HELP_HTML = ROOT / "app" / "templates" / "help.html"
|
||||
HELP_JS = ROOT / "static" / "js" / "help.js"
|
||||
EDITOR_JS = ROOT / "static" / "js" / "page_editor_scripts.js"
|
||||
APP_CSS = ROOT / "static" / "css" / "app.css"
|
||||
SETTINGS_CSS = ROOT / "static" / "css" / "settings.css"
|
||||
|
||||
|
||||
# ── 1. Aide : fermeture en haut à droite (mobile compris) ───────────────────
|
||||
|
||||
def test_help_page_has_close_button():
|
||||
html = HELP_HTML.read_text(encoding="utf-8")
|
||||
js = HELP_JS.read_text(encoding="utf-8")
|
||||
css = SETTINGS_CSS.read_text(encoding="utf-8")
|
||||
assert 'class="settings-close"' in html # bouton ✕ présent
|
||||
assert '@click="close()"' in html
|
||||
assert "close()" in js and "history.back()" in js # méthode réelle
|
||||
assert ".settings-close{" in css # style partagé (32/44px)
|
||||
assert "position:relative" in css.split(".settings-panel{")[1][:40]
|
||||
|
||||
|
||||
# ── 2. Insert below : on insère le MARKDOWN, pas le texte du HTML rendu ─────
|
||||
|
||||
def test_ai_insert_below_keeps_source_markdown():
|
||||
src = EDITOR_JS.read_text(encoding="utf-8")
|
||||
assert "self._md=String(text||'')" in src # source conservée
|
||||
assert "String(this._md||'').trim()||this._resultText()" in src # md d'abord
|
||||
assert src.count("this._md='';") >= 2 # close() + _err()
|
||||
# l'ancien chemin (texte extrait du DOM rendu) n'est plus que le repli
|
||||
assert "_resultText(){ const el=this.ROOT&&this.ROOT.querySelector('.aici-result')" in src
|
||||
|
||||
|
||||
# ── 3. Listes numérotées : numéros réellement affichés ──────────────────────
|
||||
|
||||
def test_numbered_list_renders_its_number():
|
||||
src = EDITOR_JS.read_text(encoding="utf-8")
|
||||
css = APP_CSS.read_text(encoding="utf-8")
|
||||
assert "let numAttr=''" in src and "data-num=" in src # rangée contiguë → rang
|
||||
assert ".block-numbered[data-num]::before" in css
|
||||
assert 'content: attr(data-num) ". "' in css
|
||||
# md2b accepte « 1. » et « 1) » (CommonMark) pour l'insertion agent
|
||||
assert r"/^\d+[.)] /" in src
|
||||
|
||||
|
||||
def test_slash_query_typed_in_block_is_synced_to_filter():
|
||||
src = EDITOR_JS.read_text(encoding="utf-8")
|
||||
# « /numbered list » tapé dans le bloc → répercuté dans l'entrée du menu
|
||||
assert "SM._in.value=q" in src
|
||||
assert "SM.flt();" in src
|
||||
|
||||
|
||||
# ── md2b : test comportemental sur la source réelle (node) ──────────────────
|
||||
|
||||
def _md2b_source() -> str:
|
||||
src = EDITOR_JS.read_text(encoding="utf-8")
|
||||
i = src.index("md2b(md){")
|
||||
j = src.index("return bl;},", i) + len("return bl;},")
|
||||
snippet = src[i:j].rstrip().rstrip(",") # « md2b(md){…} »
|
||||
return snippet
|
||||
|
||||
|
||||
def test_md2b_converts_numbered_lists_for_real():
|
||||
node = shutil.which("node")
|
||||
if not node:
|
||||
pytest.skip("node absent : test comportemental md2b ignoré")
|
||||
md = ("# Titre\n"
|
||||
"1. premier\n"
|
||||
"2. second\n"
|
||||
"3) troisième\n"
|
||||
"- puce\n"
|
||||
"- [ ] à faire\n"
|
||||
"> citation\n")
|
||||
script = (
|
||||
"function _tblIsData(){return false;}\n"
|
||||
"function _tblSplitLine(){return [];}\n"
|
||||
"const editor={mkB(t,c,e){const o={type:t,content:c||''};"
|
||||
"if(e)Object.assign(o,e);return o;},\n"
|
||||
f"{_md2b_source()}}};\n"
|
||||
f"console.log(JSON.stringify(editor.md2b({json.dumps(md)})));\n"
|
||||
)
|
||||
out = subprocess.run([node, "-e", script], capture_output=True, text=True,
|
||||
timeout=30, encoding="utf-8")
|
||||
assert out.returncode == 0, out.stderr
|
||||
blocks = json.loads(out.stdout)
|
||||
assert [b["type"] for b in blocks] == [
|
||||
"heading_1",
|
||||
"numbered_list", "numbered_list", "numbered_list", # 1. 2. 3)
|
||||
"bulleted_list", "to_do", "quote",
|
||||
]
|
||||
assert [b["content"] for b in blocks[1:4]] == ["premier", "second", "troisième"]
|
||||
@@ -0,0 +1,82 @@
|
||||
"""7.59.3 — « Turn into » du menu contextuel : garde cassée + texte conservé."""
|
||||
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
EDITOR_JS = ROOT / "static" / "js" / "page_editor_scripts.js"
|
||||
SRC = EDITOR_JS.read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def _slice(start: str, end: str) -> str:
|
||||
i = SRC.index(start)
|
||||
j = SRC.index(end, i)
|
||||
return SRC[i:j].rstrip()
|
||||
|
||||
|
||||
def test_turn_into_guard_matches_objects_not_strings():
|
||||
# BUG : indexOf() sur un tableau d'objets → toujours -1 → retour immédiat.
|
||||
assert "_BLOCK_TURN_TYPES.indexOf(type)" not in SRC
|
||||
assert "_BLOCK_TURN_TYPES.some(t=>t.id===type)" in SRC
|
||||
|
||||
|
||||
def test_turn_into_menu_wiring():
|
||||
# menu ⋮⋮ → « Turn into » → sous-menu → choix de type
|
||||
assert "_blockMenuItem('submenu','↩','Turn into',{sub:'turn'})" in SRC
|
||||
assert "'turn-type'" in SRC # construit par _blockMenuItem
|
||||
assert "act==='turn-type'" in SRC
|
||||
assert "_blockTurnMenuOpen(" in SRC
|
||||
|
||||
|
||||
def test_turn_into_keeps_text_for_to_do_and_toggle():
|
||||
# Convertir un texte en To-do / Toggle ne doit plus effacer le contenu.
|
||||
line = [ln for ln in SRC.splitlines()
|
||||
if ln.strip().startswith("turnInto(idx,type")][0]
|
||||
assert "type!=='to_do'&&type!=='toggle'" not in line
|
||||
assert "if(keep&&['image','embed','meeting','divider'" in line
|
||||
|
||||
|
||||
# ── Comportement réel : la méthode extraite de la source, exécutée sous node ─
|
||||
|
||||
def test_turn_into_converts_blocks_for_real():
|
||||
node = shutil.which("node")
|
||||
if not node:
|
||||
pytest.skip("node absent : test comportemental turnInto ignoré")
|
||||
types = _slice("const _BLOCK_TURN_TYPES=[", "];")
|
||||
method = _slice("turnInto(idx,type", "setBlockColor(idx,key,val){")
|
||||
script = f"""
|
||||
function _rtSync(){{}}
|
||||
function _selClear(){{}}
|
||||
{types}];
|
||||
const E = {{
|
||||
blocks: [{{id:'b1',type:'paragraph',content:'Bonjour'}}],
|
||||
_blockTargets(i){{return [i];}},
|
||||
sync(){{}}, pushHistory(){{}}, dirty:false,
|
||||
autoSave(){{}}, render(){{}}, getEl(){{return null;}},
|
||||
{method}
|
||||
}};
|
||||
E.turnInto(0,'heading_2');
|
||||
const heading = {{type:E.blocks[0].type, content:E.blocks[0].content}};
|
||||
E.turnInto(0,'to_do');
|
||||
const to_do = {{type:E.blocks[0].type, content:E.blocks[0].content, checked:E.blocks[0].checked}};
|
||||
E.turnInto(0,'button'); // type sans texte → contenu vidé
|
||||
const button = {{type:E.blocks[0].type, content:E.blocks[0].content}};
|
||||
console.log(JSON.stringify({{heading:heading, to_do:to_do, button:button}}));
|
||||
"""
|
||||
out = subprocess.run([node, "-e", script], capture_output=True, text=True,
|
||||
timeout=30, encoding="utf-8")
|
||||
assert out.returncode == 0, out.stderr
|
||||
res = json.loads(out.stdout)
|
||||
|
||||
# 1) le changement de format a lieu (avant la correction : aucune conversion)
|
||||
assert res["heading"] == {"type": "heading_2", "content": "Bonjour"}
|
||||
|
||||
# 2) To-do : texte conservé comme étiquette, case décochée
|
||||
assert res["to_do"] == {"type": "to_do", "content": "Bonjour", "checked": False}
|
||||
|
||||
# 3) Button (type sans texte) → contenu vidé
|
||||
assert res["button"] == {"type": "button", "content": ""}
|
||||
@@ -0,0 +1,29 @@
|
||||
"""7.60.0 — bouton + à gauche du handle : ajoute un bloc sous le courant."""
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
EDITOR_JS = (ROOT / "static" / "js" / "page_editor_scripts.js").read_text(encoding="utf-8")
|
||||
APP_CSS = (ROOT / "static" / "css" / "app.css").read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def test_button_rendered_left_of_the_handle():
|
||||
# le + est émis AVANT le handle dans le wrapper du bloc
|
||||
i_btn = EDITOR_JS.index("class=\"block-insert-btn\"")
|
||||
i_handle = EDITOR_JS.index("<div class=\"block-handle\">", i_btn)
|
||||
assert i_btn < i_handle
|
||||
# clic → insertion sous le bloc courant (mécanisme déjà existant)
|
||||
assert 'class="block-insert-btn" title="Add block below" aria-label="Add block below" onclick="E.addAfter(${idx})"' in EDITOR_JS
|
||||
# réservé aux blocs de premier niveau (idx valide), comme .block-actions
|
||||
assert "const insertBtn=idx>=0?" in EDITOR_JS
|
||||
assert "addAfter(idx,type){return this.addAt(idx+1,type);}" in EDITOR_JS
|
||||
|
||||
|
||||
def test_button_style_and_visibility():
|
||||
assert ".block-insert-btn {" in APP_CSS
|
||||
assert "left: -64px;" in APP_CSS # gouttière .blocks-container (64px)
|
||||
assert ".block-wrapper:hover .block-insert-btn," in APP_CSS
|
||||
assert ".block-insert-btn:hover {" in APP_CSS
|
||||
# suit le handle quand la gouttière passe à 32px, masqué partout où il l'est
|
||||
assert ".block-insert-btn { left: -56px; }" in APP_CSS
|
||||
assert APP_CSS.count(".block-insert-btn { display: none; }") == 2
|
||||
@@ -0,0 +1,172 @@
|
||||
"""7.61.0 — menu contextuel de bloc refondu façon Notion (actions + raccourcis)."""
|
||||
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
SRC = (ROOT / "static" / "js" / "page_editor_scripts.js").read_text(encoding="utf-8")
|
||||
CSS = (ROOT / "static" / "css" / "app.css").read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def _slice(start: str, end: str) -> str:
|
||||
i = SRC.index(start)
|
||||
j = SRC.index(end, i)
|
||||
return SRC[i:j].rstrip()
|
||||
|
||||
|
||||
# ── Panneau de gauche ───────────────────────────────────────────────────────
|
||||
|
||||
def test_left_panel_matches_spec():
|
||||
# recherche, groupe « Text », les 10 actions dans l'ordre, pied métadonnées
|
||||
assert 'placeholder="Search actions..."' in SRC
|
||||
assert "'<div class=\"bm-group\">Text</div>'" in SRC
|
||||
order = ["'↩','Turn into'", "'🎨','Color'", "'🔗','Copy link to block'",
|
||||
"'▣','Duplicate'", "'↪','Move to…'", "'✕','Delete'",
|
||||
"'💬','Comment'", "'✎','Suggest edits'", "'✨','Ask AI'",
|
||||
"'📚','Skills'"]
|
||||
chunk = SRC[src_index("d.innerHTML='<input"):src_index("+_blockMenuMeta(b);")]
|
||||
positions = [chunk.index(o) for o in order]
|
||||
assert positions == sorted(positions), positions
|
||||
# pied de page : auteur / heure / taille
|
||||
meta = _slice("function _blockMenuMeta(", "\n function blockMenuOpen(")
|
||||
for token in ("Last edited by ", "word", "character", "Today at ",
|
||||
".um-name", "updatedAt"):
|
||||
assert token in meta, token
|
||||
|
||||
|
||||
def src_index(needle: str) -> int:
|
||||
return SRC.index(needle)
|
||||
|
||||
|
||||
def test_actions_are_all_dispatched():
|
||||
dispatch = _slice("function _blockMenuClick(", "\n function _blockMenuItem(")
|
||||
for act in ("submenu", "duplicate", "copy-link", "move-to", "delete",
|
||||
"comment", "suggest", "ai", "skill", "color", "turn-type"):
|
||||
assert f"act==='{act}'" in dispatch, act
|
||||
# méthodes réelles côté éditeur
|
||||
# v7.62 : « askAI(idx) » renommé askAIBlock(idx) — « askAI() » l'écrasait
|
||||
for m in ("commentBlock(idx)", "askAIBlock(idx)", "suggestEdit(idx)",
|
||||
"runSkill(idx,tpl)", "applyLastColor(idx)",
|
||||
"copyBlockLink(bid)", "deleteSelected(idx)", "duplicateBlock("):
|
||||
assert m in SRC, m
|
||||
# menu : pas d'entrée « copier/couper/coller les blocs » (raccourcis conservés)
|
||||
assert "act==='copy-blocks'" not in dispatch
|
||||
|
||||
|
||||
# ── Sous-menus ──────────────────────────────────────────────────────────────
|
||||
|
||||
def test_turn_into_submenu():
|
||||
# v7.63 : le générateur d'items a été extrait (_blockTurnItems) pour être
|
||||
# réutilisé par la feuille mobile — le test vise le générateur.
|
||||
turn = _slice("function _blockTurnItems(", "\n function _blockColorItems(")
|
||||
assert "_BLOCK_TURN_MENU" in turn and "check:on" in turn # ✓ du type actuel
|
||||
assert "'<span class=\"bm-check\">✓</span>'" in SRC
|
||||
for name in ("Text", "Heading 1", "Heading 4", "Bulleted list",
|
||||
"Numbered list", "To-do list", "Toggle list", "Code", "Quote",
|
||||
"Callout", "Block equation", "Synced block",
|
||||
"2 columns", "5 columns"):
|
||||
assert f"'{name}'" in SRC, name
|
||||
assert "Create '+t.cols+' columns of blocks" in SRC # info-bulle
|
||||
assert "data-cols" in SRC and "cols>=2" in SRC # 2..5 colonnes
|
||||
# Page / Page in / Toggle heading : types inexistants dans FlowDeck → absents
|
||||
assert "'Page in'" not in SRC and "'Toggle heading 1'" not in SRC
|
||||
|
||||
|
||||
def test_color_submenu():
|
||||
color = _slice("function _blockColorItems(", "\n function _blockSkillsMenuOpen(")
|
||||
for group in ("Last used", "Text color", "Background color"):
|
||||
assert f">{group}</div>" in color, group
|
||||
names = ["'Default'", "'Gray'", "'Brown'", "'Orange'", "'Yellow'",
|
||||
"'Green'", "'Blue'", "'Purple'", "'Pink'", "'Red'"]
|
||||
arr = _slice("const _BLOCK_COLOR_NAMES=", "];")
|
||||
for n in names:
|
||||
assert n in arr, n
|
||||
assert "bm-dot" in color # carré de couleur (fond)
|
||||
assert "_BM_SHORTCUTS.color" in color # raccourci « Last used »
|
||||
assert "fdLastBlockColor" in SRC # mémoire de la dernière couleur
|
||||
|
||||
|
||||
def test_skills_submenu_uses_real_skills():
|
||||
skills = _slice("function _blockSkillsMenuOpen(", "\n function _rtMac(")
|
||||
assert "fetch('/api/agent/skills'" in skills
|
||||
assert "act==='skill'" in SRC or "'skill'" in skills
|
||||
assert "prompt_template" in skills
|
||||
assert "_aiWritingRun('write',idx" in SRC # exécution réelle via l'IA
|
||||
|
||||
|
||||
# ── Survol / fermeture ──────────────────────────────────────────────────────
|
||||
|
||||
def test_hover_submenus_and_close():
|
||||
for token in ("_blockSubOpen(kind,bid,anchor)", "data-sub",
|
||||
"closest('[data-sub]')", "mouseleave", "_blockSubCloseLater",
|
||||
"function _blockMenuClose()", "_blockDocDown"):
|
||||
assert token in SRC, token
|
||||
assert "si.focus()" in SRC # recherche focalisée à l'ouverture
|
||||
|
||||
|
||||
# ── Raccourcis ──────────────────────────────────────────────────────────────
|
||||
|
||||
def test_shortcuts_implemented():
|
||||
keys = _slice("// ── v7.61 : raccourcis du menu contextuel de bloc ──",
|
||||
"document.addEventListener('keydown', function (e) {\n if (!(e.ctrlKey || e.metaKey)")
|
||||
combos = {
|
||||
"k === 'j'": "Ctrl+J (Ask AI)",
|
||||
"k === 'h'": "Ctrl+⇧+H (dernière couleur)",
|
||||
"k === 'm'": "Ctrl+⇧+M (commenter)",
|
||||
"k === 'x'": "Ctrl+⇧+Alt+X (suggest edits)",
|
||||
"k === 'l'": "Alt+⇧+L (copier le lien)",
|
||||
"k === 'p'": "Ctrl+⇧+P (déplacer vers…)",
|
||||
"k === 'd'": "Ctrl+D (dupliquer)",
|
||||
"k === 'delete'": "Del (supprimer, menu ouvert uniquement)",
|
||||
"k === 'escape'": "Échap (fermer)",
|
||||
}
|
||||
for token, label in combos.items():
|
||||
assert token in keys, label
|
||||
# Del n'agit jamais pendant la saisie
|
||||
assert "tgt.isContentEditable" in keys
|
||||
# le libellé affiché dans le menu correspond aux combinaisons réelles
|
||||
shortcuts = _slice("const _BM_SHORTCUTS=", ";")
|
||||
for hint in ("Alt+⇧+L", "Ctrl+D", "Ctrl+⇧+P", "Del", "Ctrl+⇧+M",
|
||||
"Ctrl+⇧+Alt+X", "Ctrl+J", "Ctrl+⇧+H"):
|
||||
assert hint in shortcuts, hint
|
||||
|
||||
|
||||
# ── Comportement réel : conversion en colonnes (node) ───────────────────────
|
||||
|
||||
def test_turn_into_columns_creates_children_for_real():
|
||||
node = shutil.which("node")
|
||||
if not node:
|
||||
pytest.skip("node absent : test comportemental ignoré")
|
||||
types = _slice("const _BLOCK_TURN_TYPES=[", "];")
|
||||
method = _slice("turnInto(idx,type", "setBlockColor(idx,key,val){")
|
||||
script = f"""
|
||||
function _rtSync(){{}}
|
||||
function _selClear(){{}}
|
||||
var _n=0; function genId(){{return 'g'+(++_n);}}
|
||||
{types}];
|
||||
const E = {{
|
||||
blocks:[{{id:'b1',type:'paragraph',content:'Titre'}}],
|
||||
_blockTargets(i){{return [i];}}, sync(){{}}, pushHistory(){{}}, dirty:false,
|
||||
autoSave(){{}}, render(){{}}, getEl(){{return null;}}, _pickSyncedBlock(){{}},
|
||||
{method}
|
||||
}};
|
||||
E.turnInto(0,'columns',3);
|
||||
console.log(JSON.stringify({{type:E.blocks[0].type, kids:E.blocks[0].children.length}}));
|
||||
"""
|
||||
out = subprocess.run([node, "-e", script], capture_output=True, text=True,
|
||||
timeout=30, encoding="utf-8")
|
||||
assert out.returncode == 0, out.stderr
|
||||
assert json.loads(out.stdout) == {"type": "columns", "kids": 3}
|
||||
|
||||
|
||||
# ── Styles ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_menu_styles():
|
||||
for sel in (".block-menu .bm-group {", ".block-menu .bm-foot {",
|
||||
".block-menu .bm-check {", ".block-menu .bm-dot {",
|
||||
".block-menu-sub { min-width: 230px; max-height: 60vh;"):
|
||||
assert sel in CSS, sel
|
||||