Zeren Wang a58ab484a6
feat(projects): Projects MVP Phase 2 — instructions, document shelf, promotion, trash (#5443)
* feat(projects): Projects MVP Phase 2 — instructions, document shelf, promotion, trash

Implements docs/superpowers/specs/2026-09-12-projects-mvp-phase2-design.md
(issue #5160, tracker #5129) in the slice order of the spec's §16.

Slices:
- A: ProjectsConfig + write-time 422 UTF-8 byte cap; PROJECT_CONTEXT_KEY
  admission pinning (both server-owned sets + worker hoist); latest-only
  request-scoped <project> block via DynamicContextMiddleware
  wrap_model_call/awrap_model_call (idempotent reassembly, reserved ID
  prefix + marker + provenance, never persisted); journal audit
  fingerprints; Instructions tab.
- B: ProjectDocumentRow + migration 0023; ProjectDocumentRepository with
  locked check-and-set; hash-qualified immutable shelf storage with
  Paths helpers; upload/list/content/delete-to-trash routes; project
  delete trashes the shelf in-transaction; request-scoped bounded
  <documents> index with honest count/shown + actionable overflow note;
  list_project_documents/read_project_document tools registered only on
  pinned runs; PAT allowlist + drift guards; blocking-IO anchors.
- C: shared thread-upload ingestion service (uploads router refactored to
  parity); POST from-thread with provenance; attach-to-thread with
  lock-staged copy (archived source allowed); read-only thread-files
  view with per-group truncation reporting.
- D: restore (restored/merged/not_found/no_target/content_missing; no
  file moves), purge (continuous row lock across unlink/delete/commit,
  retryable on FS errors), retention sweep (lazy + startup, 24h orphan
  guard, row-side reconciliation never deletes).
- E: Documents tab (shelf + conversation-files browser, provenance,
  archived banner, content-missing rows), /workspace/trash route,
  sidebar entry, composer attach handoff, i18n (en-US/zh-CN), e2e mocks
  + specs.

Review hardening folded in (10 rounds, all with tests):
- force active shelf content (HTML/XML family) to download; nosniff on
  artifact + content responses; unified unsandboxed-iframe PDF preview
  (fixes the pre-existing Chromium sandbox blank in the artifact viewer)
- scope document trash to the URL project under the document lock
- atomic no-overwrite filename reservation for ALL ingestion (seeded
  claims + os.link commit with suffix retry; same-name re-upload now
  unique-names instead of replacing); hidden staging only, no visible
  placeholders; lease cleanup on setup failure
- serialize conversion under the document lock with post-lock active
  revalidation; drain locked filesystem work on cancellation; preserve
  bytes when an insert's commit state is uncertain (including trashed
  rows)
- original-integrity checks before serving text or cached conversions;
  content_missing surfaced in list responses (UI reads the flag, no
  409-probe); downloads always serve original bytes
- bounded streaming document reads with cached char counts; shelf limits
  declared in middleware release identity
- thread-root confinement for from-thread sources; config fallback
  rejects fractional/infinite values; composer counts staged
  attachments; pending attachments persist until submission or removal;
  in-flight instruction/rename edits survive save refetches; shelf and
  trash pagination; conversation-file and thread-files pages stay
  subscribed to refetches

Docs: README/README_zh, backend API.md/ARCHITECTURE.md, AGENTS.md
contracts, config.example.yaml projects block.

Review follow-ups (head b4807477 → this revision):
- The trash retention sweep is split so repeated lazy triggers stay
  bounded: the indexed expiry purge still runs on every trigger
  (GET /api/trash/documents, POST /api/trash/purge) while the
  O(all rows + all files) reconciliation is throttled to one run per
  user per 15 minutes (process-local, per-user window). The startup
  sweep now runs as a background task instead of blocking gateway
  readiness, and shutdown awaits it (bounded).
- The export scrub (stripInternalMarkers) is fence- and indentation-aware
  like the render path, so a pasted, fenced <project>/<documents> snippet
  survives markdown export while real injected blocks (never fenced) are
  still removed. Fence regexes moved to a dependency-free leaf module to
  avoid the messages↔streamdown import cycle.
- The artifact viewer's PDF iframe no longer carries an added title
  attribute (the upstream e2e contract locates it via :not([title])), and
  the upstream artifact-preview spec now pins the new contract: PDFs
  render unsandboxed, images keep sandbox="".

* fix(projects): round-2 review — cancel an overrun trash sweep, restore the PDF frame title

- Shutdown cancelled only the shield around the background startup sweep,
  so an all-users reconciliation that outlived the 5s budget kept walking
  rows and files while the document repo and DB engine were disposed
  underneath it. The wait now lives in `_shutdown_startup_trash_sweep`,
  which cancels the task and drains it before worker exit: the shield
  keeps the wait bounded, the cancel makes it final (CancelledError lands
  at the sweep's next await, and `_run_startup_trash_sweep` only catches
  `Exception`, so nothing swallows it).
- The browser-preview iframe lost `title={getFileName(filepath)}` in the
  previous fix round, leaving the PDF frame without an accessible name
  while its siblings keep theirs. Restore it (WCAG frame titles), assert
  it in the DOM test, and anchor the e2e on `iframe[title="report.pdf"]`
  instead of `iframe:not([title])`.

* fix(projects): round-3 review — report the sweep's late finish, not a phantom cancel

`Task.cancel()` returns False when the sweep already finished inside the
window between the deadline firing and the cancel, so the shutdown log
claimed a cancellation that never happened. Branch on that outcome: the
warning stays for a real cancel, a late finish is logged at info, and both
paths still reap the task before worker exit.

* fix(projects): round-4 review — make Empty trash delete what it confirms

`POST /api/trash/purge` only ran the retention sweep, and the sweep's
candidate selection is age-gated, so a freshly trashed document survived
"Empty trash" even though the confirmation promises that every listed
document is permanently deleted. With one trashed row the route answered
`{"purged": 0}` and left it in place; `GET /api/trash/documents` sweeps
expired rows before listing, so the visible rows were normally ineligible
for the action by construction.

Empty trash now drives `purge_all_trashed`: the caller's trashed rows
(`list_all_trashed`, no age filter) each go through the same guarded,
row-locked `purge` as the single-document delete — bytes first, then the
row, in one transaction — so a row restored mid-flight is skipped instead of
force-deleted, and an unlink failure rolls that row back and answers 500 with
a retryable message. Retention expiry stays where it was: the sweep's
`purge_candidates` is now the only age-gated selection, and the lazy
retention sweep still runs on the listing and at startup.

Tests: the router suite replaces the retention-gated expectation with the
reviewer's repro (fresh row purged, bytes unlinked, shelf and other users'
trash untouched, a failing unlink stays retryable and 500); a blocking-I/O
anchor drives the new entry point through the offload; the mocked e2e covers
the action end to end; a new real-backend spec performs it against the real
gateway and re-reads `GET /api/trash/documents`. README, API, ARCHITECTURE
and the phase-2 design docs (en+zh) state the age-independent contract.
2026-09-16 18:46:18 +08:00

245 lines
9.8 KiB
Python

"""Trash API (Projects Phase 2 Slice D): recoverable shelf deletion.
Routes under ``/api/trash``: list trashed documents (lazily triggering the
retention sweep first, §8.3), restore one into an active project, purge one
permanently, and empty the trash (purge every trashed row of the caller,
regardless of age — retention expiry is the sweep's job alone). Fail closed
everywhere: a missing or foreign document/project is a 404 (never a 403 that
leaks existence), restoring into an archived or foreign target is the same
404 (§8.4), and a memory-backend deployment answers 503 ``"Projects"`` through
the shared ``_require`` accessor convention (§11). Purge carries no
confirmation parameter — the "this cannot be undone" step is a UI contract,
not a server-enforced handshake (§11).
"""
from __future__ import annotations
import logging
import time
from typing import Literal
from fastapi import APIRouter, HTTPException, Query, Request
from pydantic import BaseModel
from app.gateway.authz import require_permission
from app.gateway.deps import get_project_document_repo, get_project_repo
from app.gateway.routers.project_documents import ProjectDocumentResponse, _to_response
from deerflow.config.paths import get_paths
from deerflow.config.projects_config import ProjectsConfig
from deerflow.projects.trash import make_purge_file_remover, purge_all_trashed, restore_document, run_trash_retention_sweep
from deerflow.runtime.user_context import get_effective_user_id
logger = logging.getLogger(__name__)
router = APIRouter(prefix="/api/trash", tags=["trash"])
# The reconciliation half of the retention sweep walks every row and every
# file of the caller (``list_all_for_sweep`` + a stat per row + a walk of
# ``projects/**``), while the expiry purge is an indexed candidate scan. Since
# reconciliation only bounds external interference and orphaned staging — both
# already behind the 24-hour guard — the lazy listing trigger throttles it to
# one run per user per interval. The retention guarantee is unaffected: expiry
# purging still runs on every trigger, and the startup sweep reconciles
# unconditionally.
_RECONCILIATION_MIN_INTERVAL_SECONDS = 900
_LAST_RECONCILIATION: dict[str, float] = {}
def _reconciliation_due(user_key: str) -> bool:
now = time.monotonic()
last = _LAST_RECONCILIATION.get(user_key)
if last is not None and now - last < _RECONCILIATION_MIN_INTERVAL_SECONDS:
return False
_LAST_RECONCILIATION[user_key] = now
return True
class TrashOrigin(BaseModel):
"""``{project_id, project_name}`` snapshot taken when the row was trashed."""
project_id: str
project_name: str
class TrashDocumentResponse(BaseModel):
"""One trashed shelf row plus its trash-tier display fields (§6.5)."""
id: str
name: str
size_bytes: int
sha256: str
source_thread_id: str | None = None
source_kind: str | None = None
source_name: str | None = None
created_at: str
updated_at: str
trashed_at: str
trash_origin: TrashOrigin | None = None
class TrashListResponse(BaseModel):
documents: list[TrashDocumentResponse]
total: int
limit: int
offset: int
class RestoreRequest(BaseModel):
"""Optional target; required only when the origin project is gone/archived."""
project_id: str | None = None
class RestoreResponse(BaseModel):
"""``merged`` when the target already served identical bytes: the trash row
is gone and ``document`` is the surviving active row (§8.2)."""
outcome: Literal["restored", "merged"]
document: ProjectDocumentResponse
class PurgeResponse(BaseModel):
purged: int
def _projects_config() -> ProjectsConfig:
"""Projects config, falling back to defaults when the app config is unavailable."""
from deerflow.config.app_config import get_app_config
try:
return get_app_config().projects
except Exception:
return ProjectsConfig()
def _not_found() -> HTTPException:
# Fail closed: foreign documents/projects are indistinguishable from missing.
return HTTPException(status_code=404, detail="Trash document not found")
def _to_trash_response(row: dict) -> TrashDocumentResponse:
origin = row.get("trash_origin") or None
return TrashDocumentResponse(
id=row["id"],
name=row.get("name", ""),
size_bytes=row.get("size_bytes", 0),
sha256=row.get("sha256", ""),
source_thread_id=row.get("source_thread_id"),
source_kind=row.get("source_kind"),
source_name=row.get("source_name"),
created_at=row.get("created_at", ""),
updated_at=row.get("updated_at", ""),
trashed_at=row.get("trashed_at", ""),
trash_origin=TrashOrigin(project_id=origin["project_id"], project_name=origin["project_name"]) if origin else None,
)
@router.get("/documents", response_model=TrashListResponse)
@require_permission("projects", "read")
async def list_trash_documents(
request: Request,
limit: int = Query(default=100, ge=1, le=1000),
offset: int = Query(default=0, ge=0),
) -> TrashListResponse:
"""List the caller's trashed documents (most recently trashed first).
Triggers the retention sweep lazily before listing (§8.3); a sweep
failure is logged and never blocks the listing.
"""
repo = get_project_document_repo(request)
user_id = get_effective_user_id()
try:
await run_trash_retention_sweep(
repo,
get_paths(),
retention_days=_projects_config().trash_retention_days,
user_id=user_id,
include_reconciliation=_reconciliation_due(user_id),
)
except Exception:
logger.warning("Lazy trash retention sweep failed; listing trash anyway", exc_info=True)
rows = await repo.list_trashed(limit=limit, offset=offset)
total = await repo.count_trashed()
return TrashListResponse(
documents=[_to_trash_response(row) for row in rows],
total=total,
limit=limit,
offset=offset,
)
@router.post("/documents/{document_id}/restore", response_model=RestoreResponse)
@require_permission("projects", "write")
async def restore_trash_document(document_id: str, request: Request, body: RestoreRequest | None = None) -> RestoreResponse:
"""Restore one trashed document into an active project (§8.2).
Target = the body's ``project_id``, else ``trash_origin.project_id`` when
that project still exists, is owned, and is active; otherwise 404 (the UI
offers the project picker). A foreign or archived target is the same 404
as a missing one. A merge into an active row with identical bytes reports
``merged``; missing or size-mismatched content answers 409
``content_missing`` and leaves the row trashed (§11).
"""
repo = get_project_document_repo(request)
user_id = get_effective_user_id()
target = body.project_id if body is not None else None
if not target:
# Read-only probe for the origin hint; restore revalidates everything
# under its locks, so this decides nothing (§15.5).
row = await repo.get(document_id, include_trashed=True)
if row is None:
raise _not_found()
origin_id = (row.get("trash_origin") or {}).get("project_id")
if origin_id:
origin = await get_project_repo(request).get(origin_id)
if origin is not None and origin.get("status") == "active":
target = origin_id
if not target:
raise _not_found()
outcome, restored = await restore_document(repo, get_paths(), user_id=user_id, document_id=document_id, target_project_id=target)
if outcome in ("not_found", "no_target"):
raise _not_found()
if outcome == "content_missing":
raise HTTPException(status_code=409, detail="content_missing")
assert restored is not None
return RestoreResponse(outcome=outcome, document=_to_response(restored))
@router.post("/documents/{document_id}/purge", status_code=204)
@require_permission("projects", "delete")
async def purge_trash_document(document_id: str, request: Request) -> None:
"""Permanently purge one trashed document: bytes first, then the row (§8.3).
A file-cleanup failure other than already-absent content rolls the
transaction back, keeps the trashed row, and answers 500 with a retryable
message (§11); ``False`` from the repository is the fail-closed 404.
"""
repo = get_project_document_repo(request)
try:
purged = await repo.purge(document_id, remove_files=make_purge_file_remover(get_paths(), user_id=get_effective_user_id()))
except OSError as exc:
raise HTTPException(status_code=500, detail="Purge failed during file cleanup; the document remains in trash and the purge can be retried") from exc
if not purged:
raise _not_found()
@router.post("/purge", response_model=PurgeResponse)
@require_permission("projects", "delete")
async def empty_trash(request: Request) -> PurgeResponse:
"""Empty the trash: purge every trashed document of the caller (§8.3).
Age-independent by design — the confirmation covers the whole listing, so
the retention cutoff plays no part here; the retention sweep (the lazy one
on ``GET /api/trash/documents`` and the startup one) stays the only
age-gated purge. Removals go through the same guarded per-row transaction
as a single delete: bytes first, then the row. A filesystem failure other
than already-absent content answers 500 with a retryable message; that row
and every row not yet visited stay trashed.
"""
repo = get_project_document_repo(request)
try:
purged = await purge_all_trashed(repo, get_paths(), user_id=get_effective_user_id())
except OSError as exc:
raise HTTPException(status_code=500, detail="Purge failed during file cleanup; the remaining documents stay in trash and the purge can be retried") from exc
return PurgeResponse(purged=purged)