MetaList 0.7.1__tar.gz → 0.7.3__tar.gz

{metalist-0.7.1 → metalist-0.7.3}/MANIFEST.in

@@ -1,4 +1,6 @@
 recursive-include app/static *
 recursive-include app/templates *.html
+prune evals
+prune tests
 prune app/__pycache__
 global-exclude .DS_Store

{metalist-0.7.1/metalist.egg-info → metalist-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metalist
-Version: 0.7.1
+Version: 0.7.3
 Summary: A minimalist single-user note-taking app with SSR, fast in-memory tree operations, and efficient sync.
 Project-URL: Homepage, https://github.com/evolvingstuff/metalist
 Project-URL: Repository, https://github.com/evolvingstuff/metalist
@@ -48,6 +48,19 @@ A minimalist single-user note-taking app focused on server-side rendering (SSR),
 - Multi-tab search contexts with server-persisted scroll/search state (survives browser restarts)
 - Manual namespace backups/restores to a user-selected backup folder with retention controls
 
+## Changes in 0.7.3
+
+- Windows updates use a private verified uv release when an older installer is vulnerable to the reported PE-resource access-denied failure. A standalone repair ZIP can bootstrap installations whose existing updater cannot update itself.
+- Release candidates now run the complete test and installed-package matrix on Windows, macOS, and Linux across Python 3.10–3.14. Real Chrome and Firefox exercise repeated cold loads and encrypted login on every operating system; Windows also checks Edge over verified LAN HTTPS and the repair path from a published older release.
+
+## Changes in 0.7.2
+
+- Login, hydration, and workspace requests share one initialized browser-tab identity. Losing the `sessionStorage` copy while opening the workspace no longer causes the reported missing-tab-ID crash. The external trigger for that storage loss remains unconfirmed.
+- AI chat preserves the edited note and includes its permitted tree, tags, and cached URL titles. Search redaction and cloud privacy restrictions apply to every node; blocked selections expose only their availability reason.
+- Added on-demand AI help and menu actions, privacy previews, and Copy Response throughout assistant message bubbles. OpenAI is the supported inference provider.
+- LLM regressions use current production prompts, default to five trials with cache-aware parallel scheduling, and can run only cases affected by prompt or skill changes.
+- Improved Grammarly edit preservation and search suggestions that match the complete active clause.
+
 ## Changes in 0.6.3
 
 - Restored HTTPS connection reuse and aligned the pending accept queue with the existing worker capacity, so a browser’s six-connection startup burst is admitted.
@@ -139,6 +152,8 @@ metalist update
 ```
 The updater checks the installed version against the latest PyPI release first. If MetaList is already current, it reports the installed version and leaves all running namespaces untouched. When an update is available, it checks installer prerequisites and uses uv to install the candidate into a disposable tool environment with the current base Python interpreter. It checks dependencies and starts a temporary namespace to verify HTTP readiness, version, and runtime assets. A failed preflight leaves the current installation and running namespaces unchanged. After preflight succeeds, it stops running namespaces, and creates and verifies a new backup of every namespace before installation can begin. Each archive includes the complete notes/settings database, the attachments database when present, and any legacy search-history database. Locked namespaces are backed up with their encrypted data and key metadata intact, without requiring a password.
 
+On Windows, the updater checks uv before installing packages. Versions older than 0.12.13 use a temporary PE-resource editing operation that can fail with `uv-trampoline.exe: Access is denied`. This checkout selects a private, checksum-verified uv 0.12.17 for those installations, keeping the same installer through preflight and final installation. It does not replace global uv. Already-installed MetaList releases retain their own updater code; the standalone repair launcher described in [recovery](docs/security/recovery.md#windows-updater-pe-resource-failure) supplies the compatible installer to that existing updater.
+
 Backups are saved to `~/MetaList/namespaces/<namespace>/backups/<namespace>-<timestamp>.metalist-backup.tar.gz`; the updater prints each verified path. Existing backups remain unchanged and are not pruned. If any backup fails, the update aborts with the current installation intact; run `metalist` to restart the stopped servers after resolving the failure.
 
 Only after all backups pass does the updater hand off to an external PowerShell process on Windows or `/bin/sh` on macOS/Linux so the installed environment can unlock. It delegates installation to uv, pinning the current base interpreter and the exact tested package/dependency versions, using the cache populated during preflight with network access disabled. It then launches MetaList again, and reports the installed version (for example, `MetaList updated to v0.5.0.`). This protection requires an installed version containing the backup safeguard and applies to `metalist update` and the in-app update action; direct pip/uv install commands do not run it.

{metalist-0.7.1 → metalist-0.7.3}/README.md

@@ -12,6 +12,19 @@ A minimalist single-user note-taking app focused on server-side rendering (SSR),
 - Multi-tab search contexts with server-persisted scroll/search state (survives browser restarts)
 - Manual namespace backups/restores to a user-selected backup folder with retention controls
 
+## Changes in 0.7.3
+
+- Windows updates use a private verified uv release when an older installer is vulnerable to the reported PE-resource access-denied failure. A standalone repair ZIP can bootstrap installations whose existing updater cannot update itself.
+- Release candidates now run the complete test and installed-package matrix on Windows, macOS, and Linux across Python 3.10–3.14. Real Chrome and Firefox exercise repeated cold loads and encrypted login on every operating system; Windows also checks Edge over verified LAN HTTPS and the repair path from a published older release.
+
+## Changes in 0.7.2
+
+- Login, hydration, and workspace requests share one initialized browser-tab identity. Losing the `sessionStorage` copy while opening the workspace no longer causes the reported missing-tab-ID crash. The external trigger for that storage loss remains unconfirmed.
+- AI chat preserves the edited note and includes its permitted tree, tags, and cached URL titles. Search redaction and cloud privacy restrictions apply to every node; blocked selections expose only their availability reason.
+- Added on-demand AI help and menu actions, privacy previews, and Copy Response throughout assistant message bubbles. OpenAI is the supported inference provider.
+- LLM regressions use current production prompts, default to five trials with cache-aware parallel scheduling, and can run only cases affected by prompt or skill changes.
+- Improved Grammarly edit preservation and search suggestions that match the complete active clause.
+
 ## Changes in 0.6.3
 
 - Restored HTTPS connection reuse and aligned the pending accept queue with the existing worker capacity, so a browser’s six-connection startup burst is admitted.
@@ -103,6 +116,8 @@ metalist update
 ```
 The updater checks the installed version against the latest PyPI release first. If MetaList is already current, it reports the installed version and leaves all running namespaces untouched. When an update is available, it checks installer prerequisites and uses uv to install the candidate into a disposable tool environment with the current base Python interpreter. It checks dependencies and starts a temporary namespace to verify HTTP readiness, version, and runtime assets. A failed preflight leaves the current installation and running namespaces unchanged. After preflight succeeds, it stops running namespaces, and creates and verifies a new backup of every namespace before installation can begin. Each archive includes the complete notes/settings database, the attachments database when present, and any legacy search-history database. Locked namespaces are backed up with their encrypted data and key metadata intact, without requiring a password.
 
+On Windows, the updater checks uv before installing packages. Versions older than 0.12.13 use a temporary PE-resource editing operation that can fail with `uv-trampoline.exe: Access is denied`. This checkout selects a private, checksum-verified uv 0.12.17 for those installations, keeping the same installer through preflight and final installation. It does not replace global uv. Already-installed MetaList releases retain their own updater code; the standalone repair launcher described in [recovery](docs/security/recovery.md#windows-updater-pe-resource-failure) supplies the compatible installer to that existing updater.
+
 Backups are saved to `~/MetaList/namespaces/<namespace>/backups/<namespace>-<timestamp>.metalist-backup.tar.gz`; the updater prints each verified path. Existing backups remain unchanged and are not pruned. If any backup fails, the update aborts with the current installation intact; run `metalist` to restart the stopped servers after resolving the failure.
 
 Only after all backups pass does the updater hand off to an external PowerShell process on Windows or `/bin/sh` on macOS/Linux so the installed environment can unlock. It delegates installation to uv, pinning the current base interpreter and the exact tested package/dependency versions, using the cache populated during preflight with network access disabled. It then launches MetaList again, and reports the installed version (for example, `MetaList updated to v0.5.0.`). This protection requires an installed version containing the backup safeguard and applies to `metalist update` and the in-app update action; direct pip/uv install commands do not run it.

{metalist-0.7.1 → metalist-0.7.3}/app/api/routes/ai.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
 import json
 import math
 from collections.abc import AsyncIterator
@@ -27,7 +26,6 @@ from app.services.agent.cloud_privacy import cloud_privacy_evaluator
 from app.services.agent.cloud_privacy import resolve_cloud_privacy_boundary
 from app.services.agent.inference import InferenceAdapter
 from app.services.agent.model_policy import SingleModelPolicy
-from app.services.agent.ollama_inference import OllamaInferenceAdapter
 from app.services.agent.openai_inference import OPENAI_API_BASE_URL
 from app.services.agent.openai_inference import OPENAI_MODELS
 from app.services.agent.openai_inference import OpenAIInferenceAdapter
@@ -50,15 +48,10 @@ from app.services.agent.skill_settings import resolve_agent_skill_set
 from app.services.agent.token_estimation import estimate_input_tokens
 from app.services.agent.tools import read_only_agent_tools
 from app.services.agent.trace import agent_trace_store
+from app.services.agent.menu_actions import MenuResult, menu_action_store
 from app.services.client_state_service import load_client_preferences
 from app.services.markdown_rendering import render_markdown_to_html
-from app.services.managed_ollama_runtime import ManagedOllamaRuntimeError
-from app.services.managed_ollama_runtime import managed_ollama_runtime
 from app.services.note_store import store as note_store
-from app.services.ollama_provider import OllamaProviderError
-from app.services.ollama_provider import ollama_provider
-from app.services.ollama_provider import resolve_ollama_think_value
-from app.services.ollama_provider import validate_ollama_model
 from app.services.openai_credentials import OpenAICredentialInputError
 from app.services.openai_credentials import openai_credential_store
 from app.services.openai_credentials import validate_openai_api_key
@@ -89,17 +82,10 @@ def _agent_runtime(*, inference: InferenceAdapter) -> AgentRuntime:
     )
 
 
-agent_runtime = _agent_runtime(
-    inference=OllamaInferenceAdapter(provider=ollama_provider)
-)
-
-
-
-
 class AiModelsRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    provider: Literal["ollama", "openai"]
+    provider: Literal["openai"]
 
 
 class AiModelsResponse(BaseModel):
@@ -128,7 +114,7 @@ class OpenAICostResponse(BaseModel):
 class CloudPrivacyPreviewRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    provider: Literal["ollama", "openai"]
+    provider: Literal["openai"]
     note_ids: list[str] = Field(..., max_length=20_000)
 
     @field_validator("note_ids")
@@ -163,27 +149,16 @@ class AiPromptDefaultsResponse(BaseModel):
     skills: list[AiSkillDefaultResponse]
 
 
-class AiModelPullRequest(BaseModel):
-    model_config = ConfigDict(extra="forbid")
-
-    provider: Literal["ollama"]
-    model: str
-
-    @field_validator("model")
-    @classmethod
-    def validate_model(cls, value: str) -> str:
-        return validate_ollama_model(value)
-
-
 class AiChatRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    provider: Literal["ollama", "openai"]
+    provider: Literal["openai"]
     model: str
     thinking_level: Literal["off", "low", "medium", "high"]
     show_diagnostics: bool
     message: str = Field(..., max_length=32_000)
     scope: AgentScopeDescriptor
+    selected_note_id: str = Field(..., max_length=128, pattern=r"^(?:\S+)?$")
 
     @field_validator("model")
     @classmethod
@@ -202,14 +177,7 @@ class AiChatRequest(BaseModel):
 
     @model_validator(mode="after")
     def validate_thinking_level_for_model(self) -> Self:
-        if self.provider == "ollama":
-            validate_ollama_model(self.model)
-            resolve_ollama_think_value(
-                model=self.model,
-                thinking_level=self.thinking_level,
-            )
-        else:
-            validate_openai_model(self.model)
+        validate_openai_model(self.model)
         return self
 
 
@@ -239,7 +207,7 @@ class AiChatMessage(BaseModel):
     rendered_thinking: str
     status: Literal["complete", "streaming", "error"]
     error: str
-    provider: Literal["ollama", "openai"]
+    provider: Literal["openai"]
     model: str
     activities: list[AiChatActivity]
 
@@ -308,15 +276,8 @@ async def list_ai_models(
     payload: AiModelsRequest,
     token: Annotated[str, Depends(require_request_auth_token)],
 ) -> AiModelsResponse:
-    del token
-    if payload.provider == "openai":
-        return AiModelsResponse(models=list(OPENAI_MODELS))
-    try:
-        runtime_info = await asyncio.to_thread(managed_ollama_runtime.ensure_running)
-        models = await ollama_provider.list_models(base_url=runtime_info.base_url)
-    except (ManagedOllamaRuntimeError, OllamaProviderError) as exc:
-        raise HTTPException(status_code=502, detail=str(exc)) from exc
-    return AiModelsResponse(models=models)
+    del token, payload
+    return AiModelsResponse(models=list(OPENAI_MODELS))
 
 
 @router.get(
@@ -476,38 +437,6 @@ def preview_cloud_privacy(
     )
 
 
-@router.post("/models/pull")
-@transactional_route
-def pull_ai_model(
-    payload: AiModelPullRequest,
-    token: Annotated[str, Depends(require_request_auth_token)],
-) -> StreamingResponse:
-    del token
-
-    async def stream_events() -> AsyncIterator[str]:
-        try:
-            runtime_info = await asyncio.to_thread(managed_ollama_runtime.ensure_running)
-            async for event in ollama_provider.stream_pull(
-                base_url=runtime_info.base_url,
-                model=payload.model,
-            ):
-                yield f"{json.dumps(event, separators=(',', ':'))}\n"
-        # lint: allow-PY001 rationale="pull errors must be delivered after response headers are sent"
-        except (ManagedOllamaRuntimeError, OllamaProviderError) as exc:
-            error_event = {"type": "error", "message": str(exc)}
-            yield f"{json.dumps(error_event, separators=(',', ':'))}\n"
-
-    return StreamingResponse(
-        stream_events(),
-        media_type="application/x-ndjson",
-        headers={
-            "X-Accel-Buffering": "no",
-            "Cache-Control": "no-store",
-            "Content-Encoding": "identity",
-        },
-    )
-
-
 @router.get("/session", response_model=AiSessionResponse)
 def get_ai_session(
     response: Response,
@@ -589,6 +518,17 @@ def get_ai_debug_snapshot(
     )
 
 
+@router.get("/history")
+def get_ai_history(
+    response: Response,
+    token: Annotated[str, Depends(require_request_auth_token)],
+) -> list:
+    response.headers["Cache-Control"] = "no-store"
+    return agent_trace_store.export_history(
+        session_key=token_service.get_session_key(token)
+    )
+
+
 @router.put("/debug", response_model=AiDebugSnapshotResponse)
 @transactional_route
 def put_ai_debug_details(
@@ -666,21 +606,19 @@ def stream_ai_chat(
     token: Annotated[str, Depends(require_request_auth_token)],
 ) -> StreamingResponse:
     session_key = token_service.get_session_key(token)
-    openai_api_key = ""
-    if payload.provider == "openai":
-        credential_status = openai_credential_store.status(
-            token=token,
-            session_key=session_key,
-        )
-        if not credential_status.configured:
-            raise HTTPException(
-                status_code=409,
-                detail="OpenAI API key is not configured",
-            )
-        openai_api_key = openai_credential_store.resolve(
-            token=token,
-            session_key=session_key,
+    credential_status = openai_credential_store.status(
+        token=token,
+        session_key=session_key,
+    )
+    if not credential_status.configured:
+        raise HTTPException(
+            status_code=409,
+            detail="OpenAI API key is not configured",
         )
+    openai_api_key = openai_credential_store.resolve(
+        token=token,
+        session_key=session_key,
+    )
     preferences = load_client_preferences(token=token)
     prompts = resolve_agent_prompt_set(preferences=preferences)
     skills = resolve_agent_skill_set(preferences=preferences)
@@ -704,6 +642,11 @@ def stream_ai_chat(
     authoritative_sort_mode = tab_state_store.get_sort_mode(
         tab_id=payload.scope.scope_tab_id
     )
+    active_search_query = authoritative_search_query
+    active_sort_mode = authoritative_sort_mode
+    if payload.selected_note_id and payload.scope.active_tab_id != payload.scope.scope_tab_id:
+        active_search_query = tab_state_store.get_search_query(tab_id=authoritative_active_tab_id)
+        active_sort_mode = tab_state_store.get_sort_mode(tab_id=authoritative_active_tab_id)
     frozen_scope = scoped_search_snapshot_factory.freeze(
         descriptor=payload.scope,
         authoritative_search_query=authoritative_search_query,
@@ -711,6 +654,9 @@ def stream_ai_chat(
         run_id=str(uuid4()),
         session_key=session_key,
         privacy_boundary=privacy_boundary,
+        selected_note_id=payload.selected_note_id,
+        authoritative_active_search_query=active_search_query,
+        authoritative_active_sort_mode=active_sort_mode,
     )
     tagging_run = TaggingRun(token=token, snapshot=frozen_scope, preferences=preferences, sync_uuid=get_current_sync_uuid(),
         batch_tokens=resolve_tagging_batch_tokens(preferences, payload.provider))
@@ -758,18 +704,9 @@ async def _stream_runtime_events(
     action, start_label = 'provider_runtime', 'Connecting to OpenAI API'
     ready_label = 'OpenAI API ready · 1,050,000-token context'
     base_url = OPENAI_API_BASE_URL
-    if payload.provider == 'ollama':
-        action = 'ollama_runtime'
-        start_label = 'Starting MetaList-managed Ollama · 32,768-token context'
-        runtime = agent_runtime
-    else:
-        runtime = _agent_runtime(inference=OpenAIInferenceAdapter(api_key=openai_api_key, cost_tracker=openai_cost_tracker))
+    runtime = _agent_runtime(inference=OpenAIInferenceAdapter(api_key=openai_api_key, cost_tracker=openai_cost_tracker))
     yield dict(type='action_status', action=action, status='started', label=start_label,
                approx_input_tokens=initial_input_tokens, output_tokens_received=0, duration_ms=0.0)
-    if payload.provider == 'ollama':
-        runtime_info = await asyncio.to_thread(managed_ollama_runtime.ensure_running)
-        base_url = runtime_info.base_url
-        ready_label = f'MetaList-managed Ollama ready · {runtime_info.context_tokens:,}-token context'
     yield dict(type='action_status', action=action, status='completed', label=ready_label,
                approx_input_tokens=initial_input_tokens, output_tokens_received=0, duration_ms=0.0)
     events = runtime.stream_scoped(session_key=session_key, base_url=base_url,
@@ -783,6 +720,18 @@ async def _stream_runtime_events(
         await events.aclose()
 
 
+@router.post("/menu-result")
+@transactional_route
+async def acknowledge_menu_result(payload: MenuResult, token: Annotated[str, Depends(require_request_auth_token)]):
+    # lint: allow-PY001 rationale="browser acknowledgments can be stale or belong to another session"
+    try:
+        menu_action_store.acknowledge(session_key=token_service.get_session_key(token), result=payload)
+    # lint: allow-PY001 rationale="reject invalid external menu acknowledgment with a conflict response"
+    except ValueError as exc:
+        raise HTTPException(status_code=409, detail=str(exc)) from exc
+    return {"acknowledged": True}
+
+
 class BulkAnswerRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
     question_id: str = Field(..., min_length=1)

{metalist-0.7.1 → metalist-0.7.3}/app/config.py

@@ -114,9 +114,9 @@ if TEST_MODE:
     # Delete existing test.db if it exists
     if test_database_path.exists():
         test_database_path.unlink()
-        print("🧪 Deleted existing test.db")
+        print("Deleted existing test.db")
 
-    print("🧪 Running in TEST MODE - using test.db")
+    print("Running in TEST MODE - using test.db")
 else:
     # Use production database
     DEFAULT_DB_PATH = str(resolve_default_database_path())

{metalist-0.7.1 → metalist-0.7.3}/app/db/live_recovery.py

@@ -44,7 +44,10 @@ def _sync_directory(path: Path) -> None:
 
 
 def _sync_file(path: Path) -> None:
-    with path.open('rb') as handle:
+    # Windows' CRT rejects fsync/_commit on a read-only descriptor with EBADF.
+    # These are live or recovery files owned by this transaction, so open them
+    # without truncation using a descriptor that every supported OS can flush.
+    with path.open('r+b') as handle:
         os.fsync(handle.fileno())
 
 

{metalist-0.7.1 → metalist-0.7.3}/app/exception_boundaries.py

@@ -112,16 +112,6 @@ CAPTURE_BOUNDARIES = {
     # Handle expected external I/O, provider, image or LaTeX parsing failure.
     'app/services/link_titles.py:fetch_link_title:target_capture': ('_LinkTitleTargetRejected',),
     # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_acquire_startup_lock:lock_capture': ('FileExistsError',),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_is_process_running:process_capture': ('ProcessLookupError', 'PermissionError'),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_probe_ollama_version:probe_capture': ('HTTPError', 'JSONDecodeError'),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_remove_stale_lock:missing_capture': ('FileNotFoundError',),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_remove_stale_lock:read_capture': ('FileNotFoundError',),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
     'app/services/namespace_deletion_worker.py:_is_process_running:kill_capture': ('ProcessLookupError', 'PermissionError'),
     # Handle expected external I/O, provider, image or LaTeX parsing failure.
     'app/services/namespace_deletion_worker.py:_send_signal_if_running:signal_capture': ('ProcessLookupError',),

{metalist-0.7.1 → metalist-0.7.3}/app/models/database.py

@@ -124,15 +124,8 @@ class SafeSession:
         _configure_sql_logging(anchor)
         cls._memory_anchor = anchor
         print("\n" + "=" * 50)
-        print(
-            """
-🧪 SWITCHING TO TEST MODE 🧪
-┌──────────────────────────┐
-│   IN-MEMORY DATABASE     │
-│  *All Data is Temporary  │
-└──────────────────────────┘
-        """
-        )
+        print("TEST MODE: IN-MEMORY DATABASE")
+        print("All data is temporary")
         print("=" * 50 + "\n")
         return {"status": "ok", "message": "Using in-memory database"}
 
@@ -159,15 +152,7 @@ class SafeSession:
         _configure_sql_logging(conn)
         conn.close()
         print("\n" + "=" * 50)
-        print(
-            """
-📝 RETURNING TO PRODUCTION MODE 📝
-┌──────────────────────────┐
-│      PROD DATABASE       │
-│                          │
-└──────────────────────────┘
-        """
-        )
+        print("PRODUCTION MODE: FILE DATABASE")
         print("=" * 50 + "\n")
         return {"status": "ok", "message": "Using file database"}
 

{metalist-0.7.1 → metalist-0.7.3}/app/services/agent/actions.py

@@ -2,73 +2,13 @@
 
 from __future__ import annotations
 
-import re
-from collections.abc import Iterator
-from contextlib import contextmanager
-from contextvars import ContextVar
-from dataclasses import dataclass
 from typing import Annotated, Literal, Union
 
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter, field_validator, model_validator
 from typing_extensions import Self
 
 from app.services.search_query import parse_search_query
-
-
-@dataclass(frozen=True, slots=True)
-class ScopedRouteConstraints:
-    explicit_saved_notes_request: bool
-
-    def __post_init__(self) -> None:
-        if not isinstance(self.explicit_saved_notes_request, bool):
-            raise TypeError("explicit_saved_notes_request must be bool")
-
-
-_SCOPED_ROUTE_CONSTRAINTS: ContextVar[ScopedRouteConstraints | None] = ContextVar(
-    "scoped_route_constraints",
-    default=None,
-)
-
-_EXPLICIT_SAVED_NOTES_PATTERNS = (
-    re.compile(r"\b(?:my|our)\s+(?:saved\s+)?notes?\b", re.IGNORECASE),
-    re.compile(
-        r"\b(?:summari[sz]e|search|find|review|read|inspect|analy[sz]e|"
-        r"synthesi[sz]e)\b(?:\W+\w+){0,12}\W+notes?\b",
-        re.IGNORECASE,
-    ),
-)
-_SAVED_NOTES_EXCLUSION_PATTERN = re.compile(
-    r"\b(?:without|do\s+not|don't|dont)\b.{0,48}"
-    r"\b(?:use|using|search|read|consult|reference)\b.{0,48}"
-    r"\b(?:my|our)?\s*(?:saved\s+)?notes?\b",
-    re.IGNORECASE,
-)
-
-
-def request_explicitly_requires_saved_notes(user_message: str) -> bool:
-    if not isinstance(user_message, str):
-        raise TypeError("user_message must be a string")
-    if user_message.strip() == "":
-        raise ValueError("user_message must not be blank")
-    if _SAVED_NOTES_EXCLUSION_PATTERN.search(user_message) is not None:
-        return False
-    return any(
-        pattern.search(user_message) is not None
-        for pattern in _EXPLICIT_SAVED_NOTES_PATTERNS
-    )
-
-
-@contextmanager
-def bind_scoped_route_constraints(
-    constraints: ScopedRouteConstraints,
-) -> Iterator[None]:
-    if not isinstance(constraints, ScopedRouteConstraints):
-        raise TypeError("constraints must be ScopedRouteConstraints")
-    token = _SCOPED_ROUTE_CONSTRAINTS.set(constraints)
-    try:
-        yield
-    finally:
-        _SCOPED_ROUTE_CONSTRAINTS.reset(token)
+from app.services.agent.help_catalog import HelpTopic
 
 
 def _validate_agent_search_query(value: str) -> str:
@@ -163,10 +103,11 @@ class ScopedRouteEnvelope(BaseModel):
 
     model_config = ConfigDict(extra="forbid")
 
-    kind: Literal["respond", "investigate_current_scope", "tag_proposals"] = Field(
+    kind: Literal["respond", "investigate_current_scope", "tag_proposals", "metalist_help"] = Field(
         ...,
         description=(
-            "respond for requests answerable without the user's notes; "
+            "metalist_help for MetaList product questions or opening menus, with relevant help_topics; "
+            "respond for requests answerable from the supplied selected note tree alone or without note evidence; "
             "investigate_current_scope only when the answer depends on evidence "
             "inside the frozen active MetaList result scope. "
             "tag_proposals ONLY for an explicit current user request to generate, "
@@ -174,6 +115,16 @@ class ScopedRouteEnvelope(BaseModel):
             "hypotheticals, and unrelated requests must never select tag_proposals."
         ),
     )
+    help_topics: list[HelpTopic] = Field(..., max_length=10, description="Relevant product-help topics for metalist_help; empty for other routes.")
+
+    @model_validator(mode="after")
+    def validate_help_topics(self) -> Self:
+        if len(set(self.help_topics)) != len(self.help_topics):
+            raise ValueError("Help topics must be unique")
+        if (self.kind == "metalist_help") != bool(self.help_topics):
+            raise ValueError("Only metalist_help requires nonempty help_topics")
+        return self
+
     reason: str = Field(..., min_length=1, max_length=4_000)
 
     @field_validator("reason")
@@ -183,20 +134,6 @@ class ScopedRouteEnvelope(BaseModel):
             raise ValueError("Scoped route reason must not be blank")
         return value
 
-    @model_validator(mode="after")
-    def enforce_explicit_saved_notes_request(self) -> Self:
-        constraints = _SCOPED_ROUTE_CONSTRAINTS.get()
-        if (
-            constraints is not None
-            and constraints.explicit_saved_notes_request
-            and self.kind not in {"investigate_current_scope", "tag_proposals"}
-        ):
-            raise ValueError(
-                "The user explicitly requests evidence from saved notes; choose "
-                "investigate_current_scope, not respond"
-            )
-        return self
-
 
 AgentAction = Annotated[
     Union[SearchNotesAction, ReadNotesByIdAction, RespondAction],

{metalist-0.7.1 → metalist-0.7.3}/app/services/agent/cloud_privacy.py

@@ -16,7 +16,7 @@ from app.utils.text_utils import strip_html
 
 CLOUD_PRIVACY_POLICY_PREFERENCE_KEY = "pref.ai.cloud_privacy_policy"
 _CLOUD_PROVIDERS = frozenset({"openai"})
-_SUPPORTED_PROVIDERS = frozenset({"ollama", "openai"})
+_SUPPORTED_PROVIDERS = frozenset({"openai"})
 _MAX_POLICY_ENTRIES_PER_LIST = 200
 _MAX_POLICY_TAG_LENGTH = 256
 _MAX_POLICY_PHRASE_LENGTH = 500
@@ -261,16 +261,38 @@ class CloudPrivacyEvaluator:
         note_id: str,
         match_plan: _CloudPrivacyMatchPlan,
     ) -> bool:
+        return self._direct_exclusion_reason(note_id=note_id, match_plan=match_plan) != ""
+
+    def exclusion_reason(self, *, note_id: str, boundary: CloudPrivacyBoundary) -> str:
+        """Return a content-free reason, including restrictions on ancestors."""
+        match_plan = self._match_plan(boundary)
+        reasons = set()
+        seen = set()
+        current_id = note_id
+        while True:
+            assert current_id not in seen, "Hierarchy cycle in disclosure boundary"
+            seen.add(current_id)
+            reasons.add(self._direct_exclusion_reason(note_id=current_id, match_plan=match_plan))
+            parent_id = self._notes.get_note(current_id).parent_id
+            if parent_id is None:
+                break
+            current_id = parent_id
+        for reason in ("password_protected", "blacklisted", "not_whitelisted"):
+            if reason in reasons:
+                return reason
+        return ""
+
+    def _direct_exclusion_reason(self, *, note_id: str, match_plan: _CloudPrivacyMatchPlan) -> str:
         record = self._notes.get_note(note_id)
         effective_tags_casefold = {
             tag.casefold() for tag in self._effective_tags_provider(note_id)
         }
         if "@password" in effective_tags_casefold:
-            return True
+            return "password_protected"
         if not match_plan.apply_cloud_policy:
-            return False
+            return ""
         if effective_tags_casefold & match_plan.blacklist_tags:
-            return True
+            return "blacklisted"
         needs_plaintext = any(
             (match_plan.blacklist_phrases, match_plan.whitelist_phrases)
         )
@@ -280,14 +302,16 @@ class CloudPrivacyEvaluator:
         if any(
             phrase in plaintext_casefold for phrase in match_plan.blacklist_phrases
         ):
-            return True
+            return "blacklisted"
         if not match_plan.has_whitelist:
-            return False
+            return ""
         if effective_tags_casefold & match_plan.whitelist_tags:
-            return False
-        return not any(
+            return ""
+        if any(
             phrase in plaintext_casefold for phrase in match_plan.whitelist_phrases
-        )
+        ):
+            return ""
+        return "not_whitelisted"
 
     @staticmethod
     def _match_plan(boundary: CloudPrivacyBoundary) -> _CloudPrivacyMatchPlan: