jake/Lumotia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agent: code-atomiser-fix — main-window guard on extract_content_tags_cmd (Trust-4)

Browse Source 
`extract_content_tags_cmd` was the only LLM command in `commands/llm.rs`
that did not call `ensure_main_window`. Every sibling (`load_llm_model`,
`unload_llm_model`, `delete_llm_model`, `test_llm_model`,
`cleanup_transcript_text_cmd`, `download_llm_model`) gates on it.
Without the guard a secondary-window webview could trigger a multi-
second llama.cpp inference run, blocking the LLM engine for the main
window and leaking model-inferred tags out of the History page's trust
boundary.

This change:

- adds a `window: tauri::WebviewWindow` parameter (Tauri injects it
  automatically — `HistoryPage.svelte`'s `invoke("extract_content_tags_cmd",
  …)` call site is unchanged and `npm run check` is clean);
- calls `ensure_main_window(&window)?` before the engine check so the
  rejection is fast and the cap mirrors the rest of the surface.

Behaviour is otherwise identical: same engine path, same spawn_blocking,
same App-Nap power assertion.

The shared `ensure_main_window_label` test in `commands::security`
already covers the secondary-window rejection behaviour; no
command-level scaffolding for handler-style tests exists in this
codebase, so introducing one for a single new line was out of scope.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jake
2026-05-13 18:02:23 +01:00
parent 50d0715488
commit f7af7b07bb
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src-tauri/src/commands/llm.rs
View File

@@ -412,11 +412,19 @@ pub async fn cleanup_transcript_text_cmd(
/// synchronous llama-cpp inference) is wrapped in spawn_blocking so it /// synchronous llama-cpp inference) is wrapped in spawn_blocking so it
/// does not stall the Tauri runtime, with the same App-Nap power /// does not stall the Tauri runtime, with the same App-Nap power
/// assertion the other LLM commands use. /// assertion the other LLM commands use.
///
/// Trust-4 (conf 85, code-atomiser-fix 2026-05-12): added the
/// `ensure_main_window` guard that every other command in this file
/// already enforces. The `window: tauri::WebviewWindow` parameter is
/// injected by Tauri automatically — frontend invoke call sites
/// (HistoryPage) do not need updating.
#[tauri::command] #[tauri::command]
pub async fn extract_content_tags_cmd( pub async fn extract_content_tags_cmd(
window: tauri::WebviewWindow,
state: State<'_, AppState>, state: State<'_, AppState>,
transcript: String, transcript: String,
) -> Result<ContentTags, String> { ) -> Result<ContentTags, String> {
ensure_main_window(&window)?;
if !state.llm_engine.is_loaded() { if !state.llm_engine.is_loaded() {
return Err("LLM not loaded. Download an AI model in Settings.".to_string()); return Err("LLM not loaded. Download an AI model in Settings.".to_string());
} }