CI & Build / Python lint (push) Successful in 3s
CI & Build / Plugin hooks (push) Successful in 15s
CI & Build / TypeScript typecheck (push) Successful in 54s
CI & Build / integration (push) Successful in 1m6s
CI & Build / Python tests (push) Successful in 1m50s
CI & Build / Build & push image (push) Successful in 43s
A System gains path_patterns: globs relative to the repo root (* within one directory, ** across any depth, a plain directory covering everything under it). One service validates them for every door, so the web UI and MCP refuse the same bad pattern with the same message. systems_for_paths resolves paths to every active System that covers them, which step 4 (#4757) uses to deliver an area's rulings when its files are touched. - schema: systems.path_patterns JSONB NOT NULL default [] (migration 0113) - service: normalize_path_patterns, path_matches, systems_for_paths - routes + MCP create_system/update_system accept it; [] clears - web UI: a Files field in the create and edit forms, patterns on the card - backup carries it through export and restore - using-scribe reflex 7: tagging work keeps a System's files current Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
539 lines
22 KiB
Python
539 lines
22 KiB
Python
"""System management + record<->system associations.
|
|
|
|
A System is a per-project, reusable, self-describing subsystem/area. Access is
|
|
governed by the project's permission via services/access.py (multi-user ACL
|
|
rule) — never a bare owner filter. Records (notes/tasks/issues) link to systems
|
|
many-to-many through record_systems, mutable over time.
|
|
"""
|
|
import logging
|
|
from datetime import datetime, timezone
|
|
from pathlib import PurePosixPath
|
|
|
|
from sqlalchemy import delete, func, select
|
|
|
|
from scribe.models import async_session
|
|
from scribe.models.note import Note
|
|
from scribe.models.system import RecordSystem, System
|
|
from scribe.services import access
|
|
from scribe.services import canonical_systems as canonical_systems_svc
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def local_name_key(name: str) -> str:
|
|
"""The within-project uniqueness key: case and spacing, nothing else.
|
|
|
|
Deliberately weaker than `canonical_slug`. This one answers "is this the
|
|
same System I already have here", where the operator's own spelling is the
|
|
thing being compared; the canonical slug answers "is this the same AREA as
|
|
some other project's System", where spelling is exactly what must be
|
|
ignored.
|
|
"""
|
|
return " ".join(name.split()).lower()
|
|
|
|
|
|
# Bounds on what one System may claim. Generous for a real area — a handful of
|
|
# directories and the odd stray file — and small enough that a pasted file
|
|
# listing is refused rather than stored as the area's definition.
|
|
MAX_PATH_PATTERNS = 50
|
|
MAX_PATH_PATTERN_LENGTH = 300
|
|
|
|
|
|
def normalize_repo_path(path: str) -> str:
|
|
"""A path as the patterns see it: relative to the repo root, `/`-separated.
|
|
|
|
Shared by the patterns and the paths matched against them, so the two can
|
|
never disagree about whether `./src/x.py` and `src/x.py` are one file.
|
|
"""
|
|
out = (path or "").strip().replace("\\", "/")
|
|
while out.startswith("./"):
|
|
out = out[2:]
|
|
out = out.lstrip("/")
|
|
while len(out) > 1 and out.endswith("/"):
|
|
out = out[:-1]
|
|
return out
|
|
|
|
|
|
def normalize_path_patterns(patterns) -> list[str]:
|
|
"""Validate and tidy a System's path patterns; ValueError says what is wrong.
|
|
|
|
Blank entries are dropped and repeats collapse, keeping the first-written
|
|
order. A pattern that climbs out of the repo (`..`) is refused rather than
|
|
dropped: it can never match, and storing it would read as coverage.
|
|
"""
|
|
if patterns is None:
|
|
return []
|
|
if isinstance(patterns, str) or not isinstance(patterns, (list, tuple)):
|
|
raise ValueError("path_patterns must be a list of glob strings")
|
|
out: list[str] = []
|
|
for raw in patterns:
|
|
if not isinstance(raw, str):
|
|
raise ValueError("path_patterns must be a list of glob strings")
|
|
pattern = normalize_repo_path(raw)
|
|
if not pattern:
|
|
continue
|
|
if len(pattern) > MAX_PATH_PATTERN_LENGTH:
|
|
raise ValueError(
|
|
f"path pattern longer than {MAX_PATH_PATTERN_LENGTH} characters: "
|
|
f"{pattern[:60]}…"
|
|
)
|
|
if ".." in pattern.split("/"):
|
|
raise ValueError(
|
|
f"path pattern {pattern!r} leaves the repo — patterns are "
|
|
"relative to the repo root"
|
|
)
|
|
if pattern not in out:
|
|
out.append(pattern)
|
|
if len(out) > MAX_PATH_PATTERNS:
|
|
raise ValueError(
|
|
f"{len(out)} path patterns; a System takes at most "
|
|
f"{MAX_PATH_PATTERNS} — name directories with `**` rather than "
|
|
"listing their files"
|
|
)
|
|
return out
|
|
|
|
|
|
def path_matches(pattern: str, path: str) -> bool:
|
|
"""Whether a repo-relative path falls under one pattern.
|
|
|
|
Glob semantics are `PurePosixPath.full_match`: `*` stays inside one path
|
|
segment, `**` spans any number of them, and case counts. A pattern with
|
|
no wildcard that names a directory covers everything under it, so
|
|
`src/billing` means the directory the way a person writing it means it.
|
|
"""
|
|
path = normalize_repo_path(path)
|
|
if not path or not pattern:
|
|
return False
|
|
candidate = PurePosixPath(path)
|
|
return candidate.full_match(pattern) or candidate.full_match(f"{pattern}/**")
|
|
|
|
|
|
def matching_patterns(patterns, path: str) -> list[str]:
|
|
"""The patterns among `patterns` that `path` falls under, in their order."""
|
|
return [p for p in (patterns or []) if path_matches(p, path)]
|
|
|
|
|
|
async def assess_system_name(user_id: int, project_id: int, name: str) -> dict:
|
|
"""What BOTH doors must know before minting a System name (milestone 307).
|
|
|
|
Lived in the MCP tool alone until now, which is how the web UI shipped
|
|
without a gate the agent surface enforced (#2482). One service function, so
|
|
the two doors cannot answer the same question differently (rule 33).
|
|
|
|
Returns `{"duplicate": …|None, "canonical": …|None}`:
|
|
|
|
- `duplicate` — this project already has a System by that name. A hard stop
|
|
for the caller: a second one splits the area's records across two piles.
|
|
- `canonical` — the global catalog covers this area, with a `basis`.
|
|
`exact` is mechanical and safe to apply on the spot; `overlap` is a
|
|
judgment call and must be OFFERED, never applied. Neither ever blocks:
|
|
an unmatched name is a project-specific area, which is legitimate.
|
|
|
|
Fails open on both arms — a naming aid must never break a create.
|
|
"""
|
|
out: dict = {"duplicate": None, "canonical": None}
|
|
key = local_name_key(name)
|
|
if not key:
|
|
return out
|
|
try:
|
|
for existing in await list_systems(user_id, project_id, include_archived=True):
|
|
if local_name_key(existing.name) == key:
|
|
out["duplicate"] = {"id": existing.id, "name": existing.name}
|
|
return out
|
|
except Exception:
|
|
logger.debug("system name assessment: local scan failed", exc_info=True)
|
|
return out
|
|
try:
|
|
exact = await canonical_systems_svc.find_by_name(name)
|
|
if exact is not None:
|
|
out["canonical"] = {
|
|
"id": exact.id, "name": exact.name, "basis": "exact",
|
|
}
|
|
return out
|
|
# No exact hit: fall back to the same overlap scoring the review
|
|
# surface uses, so a create-time offer and a later proposal never
|
|
# disagree about which area a name resembles.
|
|
near = await canonical_systems_svc.best_overlap(name)
|
|
if near is not None:
|
|
out["canonical"] = near
|
|
except Exception:
|
|
logger.debug("system name assessment: catalog lookup failed", exc_info=True)
|
|
return out
|
|
|
|
|
|
async def standard_systems() -> list[tuple[str, str]]:
|
|
"""The standard cross-project vocabulary (#2798) as (name, charter) pairs.
|
|
|
|
Reads the GLOBAL canonical catalog (milestone 307). This was a tuple
|
|
constant in this module until the catalog became a table: a constant
|
|
cannot be a foreign key, so nothing outside a project could reference an
|
|
area, and the list only ever applied on the inception-seed path — which is
|
|
how three spellings of "CI & Release" reached one instance anyway.
|
|
"""
|
|
return [(entry.name, entry.description or "") for entry in
|
|
await canonical_systems_svc.list_canonical_systems()]
|
|
|
|
|
|
async def seed_standard_systems(user_id: int, project_id: int) -> list[System]:
|
|
"""Mint the standard starter set for a project that has NO Systems yet
|
|
(milestone 297). Idempotent: a project with any System — the vocabulary
|
|
already started, standard or not — gets nothing; the duplicate gate and
|
|
the project's own judgment take it from there. [] without write access.
|
|
|
|
Seeded Systems are mapped to their catalog entry as they are created, so a
|
|
project born this way needs no reconciliation pass later."""
|
|
if await list_systems(user_id, project_id, include_archived=True):
|
|
return []
|
|
out: list[System] = []
|
|
for index, entry in enumerate(await canonical_systems_svc.list_canonical_systems()):
|
|
system = await create_system(
|
|
user_id, project_id, entry.name, description=entry.description,
|
|
order_index=index, canonical_id=entry.id,
|
|
)
|
|
if system is None:
|
|
break
|
|
out.append(system)
|
|
return out
|
|
|
|
|
|
def embed_system(system) -> None:
|
|
"""Refresh a System's charter vectors, fire-and-forget (#4251).
|
|
|
|
The twin of `notes.embed_note`, and here for the same reason (#2056): at
|
|
the service, so every door gets it by construction rather than each route
|
|
and tool remembering. A charter edited through one door and not another
|
|
would stay findable by what it used to say, and nothing would report it.
|
|
|
|
Not called on delete. `delete_system` is a SOFT delete and the search joins
|
|
through `System`, so a deleted System's vectors are already unreachable —
|
|
and leaving them means a restore is findable again immediately instead of
|
|
waiting for the next startup backfill.
|
|
|
|
Import is lazy so importing this module doesn't pull in the embedding
|
|
model; a missing event loop (unit tests, scripts) is ordinary, not an
|
|
error; exceptions are swallowed because a System that saved must not fail
|
|
on its index refresh.
|
|
"""
|
|
try:
|
|
import asyncio
|
|
|
|
from scribe.services.embeddings import upsert_system_embedding
|
|
|
|
asyncio.create_task(
|
|
upsert_system_embedding(system.id, system.name, system.description)
|
|
)
|
|
except RuntimeError:
|
|
pass # no running loop — a sync caller, not a failure
|
|
except Exception: # noqa: BLE001 - never let indexing break a write
|
|
logger.exception("embedding refresh failed for system %s", system.id)
|
|
|
|
|
|
async def create_system(
|
|
user_id: int,
|
|
project_id: int,
|
|
name: str,
|
|
description: str | None = None,
|
|
color: str | None = None,
|
|
order_index: int = 0,
|
|
canonical_id: int | None = None,
|
|
path_patterns: list[str] | None = None,
|
|
) -> System | None:
|
|
"""Create a System. None if the user can't write the project.
|
|
|
|
`canonical_id` maps the new System onto the global catalog; leaving it None
|
|
is fine — an unmapped System is fully usable, and the mapping can be
|
|
proposed later (services/canonical_systems.propose_mappings).
|
|
|
|
`path_patterns` are validated here, so every door refuses the same bad
|
|
pattern with the same message (ValueError).
|
|
"""
|
|
patterns = normalize_path_patterns(path_patterns)
|
|
if not await access.can_write_project(user_id, project_id):
|
|
return None
|
|
async with async_session() as session:
|
|
system = System(
|
|
user_id=user_id,
|
|
project_id=project_id,
|
|
name=name.strip(),
|
|
description=description,
|
|
color=color,
|
|
order_index=order_index,
|
|
canonical_id=canonical_id,
|
|
path_patterns=patterns,
|
|
)
|
|
session.add(system)
|
|
await session.commit()
|
|
await session.refresh(system)
|
|
embed_system(system)
|
|
return system
|
|
|
|
|
|
async def get_system(user_id: int, system_id: int) -> System | None:
|
|
"""Fetch a System if the user can read its project."""
|
|
async with async_session() as session:
|
|
system = await session.get(System, system_id)
|
|
if system is None or system.deleted_at is not None:
|
|
return None
|
|
if not await access.can_read_project(user_id, system.project_id):
|
|
return None
|
|
return system
|
|
|
|
|
|
async def list_systems(
|
|
user_id: int, project_id: int, include_archived: bool = False
|
|
) -> list[System]:
|
|
"""A project's systems (active by default). [] if no read access."""
|
|
if not await access.can_read_project(user_id, project_id):
|
|
return []
|
|
async with async_session() as session:
|
|
query = select(System).where(
|
|
System.project_id == project_id,
|
|
System.deleted_at.is_(None),
|
|
)
|
|
if not include_archived:
|
|
query = query.where(System.status == "active")
|
|
query = query.order_by(System.order_index.asc(), System.created_at.asc())
|
|
result = await session.execute(query)
|
|
return list(result.scalars().all())
|
|
|
|
|
|
async def systems_for_paths(
|
|
user_id: int, project_id: int, paths: list[str],
|
|
) -> list[tuple[System, list[str]]]:
|
|
"""The project's active Systems whose patterns cover any of `paths`.
|
|
|
|
Each comes with the paths it matched, in the order given. A path can match
|
|
several Systems — areas overlap, and every one it belongs to answers for
|
|
it — so nothing here picks a winner. Systems with no patterns never match:
|
|
an area that has not named its files is not claiming all of them.
|
|
"""
|
|
wanted = [p for p in (normalize_repo_path(x) for x in paths or []) if p]
|
|
if not wanted:
|
|
return []
|
|
out: list[tuple[System, list[str]]] = []
|
|
for system in await list_systems(user_id, project_id):
|
|
patterns = system.path_patterns or []
|
|
if not patterns:
|
|
continue
|
|
hit = [p for p in wanted if matching_patterns(patterns, p)]
|
|
if hit:
|
|
out.append((system, hit))
|
|
return out
|
|
|
|
async def update_system(user_id: int, system_id: int, **fields: object) -> System | None:
|
|
"""Update a System if the user can write its project."""
|
|
# canonical_id is deliberately NOT settable here: canonical_systems.
|
|
# set_system_canonical is its single writer, because it also validates the
|
|
# catalog entry is live. Two entry points onto one column is the drift this
|
|
# table exists to end.
|
|
allowed = {"name", "description", "color", "status", "order_index", "path_patterns"}
|
|
# Validated before anything is read, so a refused pattern changes nothing.
|
|
# `[]` is a value here, not "leave unchanged": it clears the paths.
|
|
if fields.get("path_patterns") is not None:
|
|
fields["path_patterns"] = normalize_path_patterns(fields["path_patterns"])
|
|
async with async_session() as session:
|
|
system = await session.get(System, system_id)
|
|
if system is None or system.deleted_at is not None:
|
|
return None
|
|
if not await access.can_write_project(user_id, system.project_id):
|
|
return None
|
|
for key, value in fields.items():
|
|
if key in allowed and value is not None:
|
|
setattr(system, key, value)
|
|
system.updated_at = datetime.now(timezone.utc)
|
|
await session.commit()
|
|
await session.refresh(system)
|
|
embed_system(system)
|
|
return system
|
|
|
|
|
|
async def archive_system(user_id: int, system_id: int) -> System | None:
|
|
return await update_system(user_id, system_id, status="archived")
|
|
|
|
|
|
async def delete_system(user_id: int, system_id: int) -> bool:
|
|
"""Soft-delete a System (recoverable). Requires project write access."""
|
|
async with async_session() as session:
|
|
system = await session.get(System, system_id)
|
|
if system is None or system.deleted_at is not None:
|
|
return False
|
|
if not await access.can_write_project(user_id, system.project_id):
|
|
return False
|
|
system.deleted_at = datetime.now(timezone.utc)
|
|
await session.commit()
|
|
return True
|
|
|
|
|
|
# --- record <-> system associations (many-to-many, mutable) ---
|
|
|
|
async def set_record_systems(
|
|
user_id: int, note_id: int, system_ids: list[int]
|
|
) -> list[int] | None:
|
|
"""Replace a record's system associations with `system_ids` (set semantics).
|
|
|
|
Returns the resulting associated system ids, or None if the user can't write
|
|
the record. Silently drops ids that don't exist or the user can't read —
|
|
associations only link accessible systems.
|
|
"""
|
|
if not await access.can_write_note(user_id, note_id):
|
|
return None
|
|
async with async_session() as session:
|
|
wanted: list[int] = []
|
|
for sid in dict.fromkeys(system_ids): # de-dup, preserve order
|
|
system = await session.get(System, sid)
|
|
if system is None or system.deleted_at is not None:
|
|
continue
|
|
if not await access.can_read_project(user_id, system.project_id):
|
|
continue
|
|
wanted.append(sid)
|
|
|
|
existing = set(
|
|
(
|
|
await session.execute(
|
|
select(RecordSystem.system_id).where(RecordSystem.note_id == note_id)
|
|
)
|
|
).scalars().all()
|
|
)
|
|
wanted_set = set(wanted)
|
|
|
|
to_remove = existing - wanted_set
|
|
if to_remove:
|
|
await session.execute(
|
|
delete(RecordSystem).where(
|
|
RecordSystem.note_id == note_id,
|
|
RecordSystem.system_id.in_(to_remove),
|
|
)
|
|
)
|
|
for sid in wanted:
|
|
if sid not in existing:
|
|
session.add(RecordSystem(note_id=note_id, system_id=sid))
|
|
await session.commit()
|
|
return wanted
|
|
|
|
|
|
async def list_record_systems(user_id: int, note_id: int) -> list[System]:
|
|
"""Systems associated with a record (if the user can read it)."""
|
|
if not await access.can_read_note(user_id, note_id):
|
|
return []
|
|
async with async_session() as session:
|
|
result = await session.execute(
|
|
select(System)
|
|
.join(RecordSystem, RecordSystem.system_id == System.id)
|
|
.where(RecordSystem.note_id == note_id, System.deleted_at.is_(None))
|
|
.order_by(System.order_index.asc(), System.name.asc())
|
|
)
|
|
return list(result.scalars().all())
|
|
|
|
|
|
async def system_names_for(note_ids: set[int]) -> dict[int, list[str]]:
|
|
"""{note_id: [system name, …]} in one query, for records ALREADY read.
|
|
|
|
For decorating a result set the caller was allowed to see — an injected
|
|
menu line says which part of the project a record is about, so the reader
|
|
can place it without opening it (#4364). No access check here for that
|
|
reason: the ids come from a search that applied one, and a system name is
|
|
metadata of the record, not a record of its own.
|
|
|
|
Fails soft, like `access.owner_names_for`: a menu without its system labels
|
|
is a cosmetic downgrade, and failing the whole injection over one is not.
|
|
"""
|
|
if not note_ids:
|
|
return {}
|
|
try:
|
|
async with async_session() as session:
|
|
rows = (
|
|
await session.execute(
|
|
select(RecordSystem.note_id, System.name)
|
|
.join(System, System.id == RecordSystem.system_id)
|
|
.where(RecordSystem.note_id.in_(note_ids), System.deleted_at.is_(None))
|
|
.order_by(System.order_index.asc(), System.name.asc())
|
|
)
|
|
).all()
|
|
except Exception:
|
|
logger.warning("System-name lookup failed; menu lines go unlabelled", exc_info=True)
|
|
return {}
|
|
out: dict[int, list[str]] = {}
|
|
for note_id, name in rows:
|
|
out.setdefault(int(note_id), []).append(name)
|
|
return out
|
|
|
|
|
|
async def list_records_for_system(
|
|
user_id: int, system_id: int, kind: str | None = None, open_only: bool = False
|
|
) -> list[Note]:
|
|
"""Records associated with a System. `kind` filters task_kind (e.g. 'issue');
|
|
`open_only` limits to tasks not done/cancelled. [] if no read access."""
|
|
system = await get_system(user_id, system_id)
|
|
if system is None:
|
|
return []
|
|
async with async_session() as session:
|
|
query = (
|
|
select(Note)
|
|
.join(RecordSystem, RecordSystem.note_id == Note.id)
|
|
.where(RecordSystem.system_id == system_id, Note.deleted_at.is_(None))
|
|
)
|
|
if kind:
|
|
query = query.where(Note.task_kind == kind)
|
|
if open_only:
|
|
query = query.where(Note.status.not_in(["done", "cancelled"]))
|
|
query = query.order_by(Note.updated_at.desc())
|
|
result = await session.execute(query)
|
|
return list(result.scalars().all())
|
|
|
|
|
|
async def count_open_issues(user_id: int, project_id: int) -> int:
|
|
"""Count open (not done/cancelled) issues in a project. 0 if no read access."""
|
|
if not await access.can_read_project(user_id, project_id):
|
|
return 0
|
|
async with async_session() as session:
|
|
result = await session.execute(
|
|
select(func.count(Note.id)).where(
|
|
Note.project_id == project_id,
|
|
Note.task_kind == "issue",
|
|
Note.status.isnot(None),
|
|
Note.status.not_in(["done", "cancelled"]),
|
|
Note.deleted_at.is_(None),
|
|
)
|
|
)
|
|
return int(result.scalar() or 0)
|
|
|
|
|
|
async def open_issue_counts_by_system(user_id: int, project_id: int) -> dict[int, int]:
|
|
"""{system_id: open-issue count} for all systems in a project, in one query.
|
|
{} if no read access."""
|
|
if not await access.can_read_project(user_id, project_id):
|
|
return {}
|
|
async with async_session() as session:
|
|
rows = await session.execute(
|
|
select(RecordSystem.system_id, func.count(Note.id))
|
|
.join(Note, Note.id == RecordSystem.note_id)
|
|
.join(System, System.id == RecordSystem.system_id)
|
|
.where(
|
|
System.project_id == project_id,
|
|
Note.task_kind == "issue",
|
|
Note.status.isnot(None),
|
|
Note.status.not_in(["done", "cancelled"]),
|
|
Note.deleted_at.is_(None),
|
|
)
|
|
.group_by(RecordSystem.system_id)
|
|
)
|
|
return {sid: cnt for sid, cnt in rows.fetchall()}
|
|
|
|
|
|
async def list_issues(user_id: int, project_id: int, open_only: bool = True) -> list[Note]:
|
|
"""Issues in a project (open by default), newest first. [] if no read access."""
|
|
if not await access.can_read_project(user_id, project_id):
|
|
return []
|
|
async with async_session() as session:
|
|
query = select(Note).where(
|
|
Note.project_id == project_id,
|
|
Note.task_kind == "issue",
|
|
Note.status.isnot(None),
|
|
Note.deleted_at.is_(None),
|
|
)
|
|
if open_only:
|
|
query = query.where(Note.status.not_in(["done", "cancelled"]))
|
|
query = query.order_by(Note.updated_at.desc())
|
|
result = await session.execute(query)
|
|
return list(result.scalars().all())
|