fix(ai): creation dossier+fichier en mode agent (BUG-050)
CI / lint (push) Successful in 1m32s
CI / security (push) Successful in 1m7s
CI / test (push) Successful in 3m6s
CI / build (push) Successful in 55s
CI / e2e (push) Successful in 10m48s

This commit is contained in:
2026-09-16 21:10:38 -04:00
parent 0d4f43a8bf
commit 634d10cdd4
18 changed files with 168 additions and 22 deletions
+30 -1
View File
@@ -109,6 +109,30 @@ def _assistant_tool_message(content: str | None, tool_calls: list[Any]) -> dict[
}
def _deferred_tool_message(call: Any) -> dict[str, Any]:
"""Answer a tool call that was not reached because the run paused.
A single LLM response may carry several tool calls. When one of them is
mutating and pauses the run for confirmation, the assistant message already
lists *all* of them, so every ``tool_call_id`` must get a tool result before
the next LLM call (the OpenAI tool protocol rejects dangling ids). The calls
that were not reached get a synthetic ``deferred`` result; the model
re-issues them once the confirmed call has been applied (BUG-050).
"""
return {
"role": "tool",
"tool_call_id": call.id,
"name": call.name,
"content": json.dumps({
"status": "deferred",
"reason": (
"Not executed: the run paused to confirm an earlier tool call. "
"Re-issue this call if it is still needed."
),
}, ensure_ascii=False),
}
def _execute_confirmed(
ctx: ToolContext,
confirm_pending: dict[str, Any],
@@ -248,7 +272,7 @@ async def run_agent(
_emit_note(response.content or "")
convo.append(_assistant_tool_message(response.content, response.tool_calls))
for call in response.tool_calls:
for index, call in enumerate(response.tool_calls):
if quota is not None and len(executed) >= quota:
logger.warning(f"Agent reached the tool-call quota ({quota})")
return AgentResult(
@@ -268,6 +292,11 @@ async def run_agent(
pending = e.to_dict()
# Include the tool-call id so the client can echo it back.
pending["error"]["id"] = call.id
# BUG-050: the assistant message lists every tool call of this
# batch, so answer the ones we did not reach to keep the
# conversation valid for the resumed turn.
for skipped in response.tool_calls[index + 1:]:
convo.append(_deferred_tool_message(skipped))
return AgentResult(
content=response.content or "",
messages=convo,
+5 -2
View File
@@ -478,7 +478,9 @@ def build_system_prompt(context: dict[str, Any], scope: str = "directory", vault
f"\n\nCes documents appartiennent au vault « {vault_name} ». Quand tu utilises un outil "
"d'écriture (`append_to_file`, `edit_file`, `create_file`), passe TOUJOURS "
f"exactement `\"vault\": \"{vault_name}\"` (jamais un nom inventé) et un `path` "
"relatif au vault, identique à celui affiché ci-dessus."
"relatif au vault, identique à celui affiché ci-dessus. Pour créer un fichier "
"dans un nouveau dossier, un seul `create_file` avec le chemin complet suffit "
"(les dossiers parents sont créés automatiquement)."
)
return prompt
@@ -490,7 +492,7 @@ Tes deux rôles :
1. **Aider sur l'application** : expliquer la navigation, la recherche (full-text, filtres `tag:`, `created:`, `path:`), l'éditeur (CodeMirror, autosave, raccourcis), les onglets et le split view, les sauvegardes et la restauration, le partage public, l'export (HTML/Markdown/ePub/PDF), Mermaid, Excalidraw, les plugins, les thèmes, le mode hors-ligne, le MFA, etc.
2. **Proposer des actions concrètes** : créer un fichier ou un dossier dans un vault.
Quand l'utilisateur demande explicitement de créer un fichier, inclus EXACTEMENT un bloc de ce type dans ta réponse (et rien d'autre à l'intérieur du bloc) :
Quand l'utilisateur demande explicitement de créer un fichier, inclus un bloc de ce type dans ta réponse (un bloc par fichier, et rien d'autre à l'intérieur du bloc) :
```obsigate-action
{"action": "create_file", "vault": "<nom du vault>", "path": "<chemin/relatif.md>", "content": "<contenu markdown>"}
@@ -506,6 +508,7 @@ Règles :
- Ne propose une action que si l'utilisateur la demande explicitement.
- Explique en une phrase ce que fait l'action avant le bloc.
- Utilise un chemin relatif se terminant par `.md` pour un fichier.
- Pour créer un fichier dans un nouveau dossier, utilise **un seul** bloc `create_file` avec le chemin complet (ex. `"path": "Dossier/fichier.md"`) : les dossiers parents sont créés automatiquement, inutile d'émettre un `create_directory` séparé.
- N'invente jamais un nom de vault : utilise l'un des vaults disponibles listés ci-dessous.
- Réponds dans la langue de l'utilisateur, de façon concise et structurée (Markdown).
"""
+17 -2
View File
@@ -131,18 +131,33 @@ def create_file(
return {"success": True, "vault": vault_name, "path": rel_path, "size": len(content)}
def create_directory(vault_name: str, path: str) -> dict[str, Any]:
def create_directory(vault_name: str, path: str, *, exist_ok: bool = False) -> dict[str, Any]:
"""Create a directory (and its parents) in a vault.
Args:
vault_name: Name of the vault.
path: Vault-relative path of the new directory.
exist_ok: When True, an existing directory is a success (idempotent)
instead of raising ``already_exists``. Used by the AI tool layer so
a "create folder then create file" plan does not fail when the
folder is already there (``create_file`` creates parents anyway).
Raises:
ServiceError: ``not_found`` (404), ``read_only`` (403) or
``already_exists`` (409).
``already_exists`` (409) when *exist_ok* is False.
"""
root = get_vault_root(vault_name)
_ensure_writable(root)
dir_path = resolve_safe_path(root, path)
if dir_path.exists():
if exist_ok and dir_path.is_dir():
return {
"success": True,
"vault": vault_name,
"path": _rel(root, dir_path),
"existed": True,
}
raise ServiceError(
f"Directory already exists: {path}",
code="already_exists",
+13 -4
View File
@@ -355,7 +355,12 @@ def list_recent(ctx: ToolContext, params: ListRecentInput) -> dict[str, Any]:
@tool(
name="create_file",
description="Create a new text file in a vault with optional initial content.",
description=(
"Create a new text file in a vault with optional initial content. "
"Parent directories are created automatically, so a single call with a "
"nested path (e.g. 'Folder/note.md') is enough to create a file inside "
"a new folder."
),
input_model=CreateFileInput,
risk=ToolRisk.WRITE,
requires_vault=True,
@@ -367,14 +372,18 @@ def create_file(ctx: ToolContext, params: CreateFileInput) -> dict[str, Any]:
@tool(
name="create_directory",
description="Create a new directory (and parents) in a vault.",
description=(
"Create a new directory (and parents) in a vault. Succeeds if it "
"already exists. Optional when creating a file: create_file already "
"creates parent directories."
),
input_model=CreateDirectoryInput,
risk=ToolRisk.WRITE,
requires_vault=True,
)
def create_directory(ctx: ToolContext, params: CreateDirectoryInput) -> dict[str, Any]:
"""Create a vault directory."""
return _create_directory(params.vault, params.path)
"""Create a vault directory (idempotent)."""
return _create_directory(params.vault, params.path, exist_ok=True)
@tool(