mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-10-15 19:32:21 +02:00
Compare commits
19
Commits
@@ -10,6 +10,10 @@
|
||||
entrypoint.sh text eol=lf
|
||||
docker/entrypoint.sh text eol=lf
|
||||
|
||||
# Maintained frontend modules and this lane's byte-identical deployment output.
|
||||
frontend/src/** text eol=lf
|
||||
static/js/actionMenuOrder.js text eol=lf
|
||||
|
||||
# Windows-native scripts stay CRLF.
|
||||
*.ps1 text eol=crlf
|
||||
*.cmd text eol=crlf
|
||||
@@ -32,3 +36,7 @@ static/lib/** -whitespace linguist-vendored
|
||||
*.ico binary
|
||||
*.woff binary
|
||||
*.woff2 binary
|
||||
|
||||
# Notes reference deployment modules.
|
||||
static/js/features/notes/** text eol=lf
|
||||
static/js/shared/ui/confetti.js text eol=lf
|
||||
|
||||
@@ -81,6 +81,8 @@ jobs:
|
||||
python-version: "3.11"
|
||||
# Byte-compile sources — catches syntax errors without installing deps.
|
||||
- run: python -m compileall -q app.py core routes src services scripts tests
|
||||
- name: Check committed frontend deployment modules
|
||||
run: python scripts/build_frontend.py --check
|
||||
|
||||
node-syntax:
|
||||
name: JS syntax (node --check)
|
||||
@@ -92,13 +94,19 @@ jobs:
|
||||
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
|
||||
with:
|
||||
node-version: "20"
|
||||
- run: npm ci --ignore-scripts --no-audit --no-fund
|
||||
- name: Check frontend architecture
|
||||
run: node scripts/check_frontend.mjs
|
||||
# Syntax-check our own JS (skip vendored libs in static/lib).
|
||||
- name: node --check
|
||||
run: |
|
||||
shopt -s globstar nullglob
|
||||
for f in static/app.js static/js/**/*.js; do
|
||||
for f in static/app.js static/js/**/*.js frontend/src/**/*.js; do
|
||||
node --check "$f"
|
||||
done
|
||||
node --check scripts/check_frontend.mjs
|
||||
- name: Test frontend architecture gates and stateless proof
|
||||
run: node --test tests/frontendArchitecture.test.mjs
|
||||
|
||||
python-tests:
|
||||
name: Python tests (pytest ${{ matrix.shard }})
|
||||
|
||||
@@ -21,3 +21,17 @@ regexes = [
|
||||
'''^inherits_2\.0\.1$''',
|
||||
'''^inherits_2\.0\.3$''',
|
||||
]
|
||||
|
||||
|
||||
[[allowlists]]
|
||||
description = "Reviewed Skills OpenAPI baseline SHA-256 digest"
|
||||
targetRules = ["generic-api-key"]
|
||||
condition = "AND"
|
||||
paths = [
|
||||
'''(?:^|/)tests/fixtures/skills_api_baseline\.json$''',
|
||||
'''(?:^|/)docs/skills-audit-architecture\.md$''',
|
||||
]
|
||||
regexTarget = "secret"
|
||||
regexes = [
|
||||
'''^7abc5b334a6c3c52dd3eba15d8bc516da728a67f14fb7f56d0bb5992d89a16ca$''',
|
||||
]
|
||||
|
||||
@@ -74,15 +74,33 @@ Odysseus is a self-hosted workspace with powerful local tools. Keep auth enabled
|
||||
|
||||
Deployment details are in the [setup guide](website/setup.md#security-notes).
|
||||
|
||||
## Star History
|
||||
## Community & Growth
|
||||
|
||||
<a href="https://star-history.dera.page/#odysseus-dev/odysseus&type=date&legend=top-left">
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)" srcset="https://star-history.dera.page/svg?repos=odysseus-dev/odysseus&type=date&theme=dark&legend=top-left" />
|
||||
<source media="(prefers-color-scheme: light)" srcset="https://star-history.dera.page/svg?repos=odysseus-dev/odysseus&type=date&legend=top-left" />
|
||||
<img alt="Star History Chart" src="https://star-history.dera.page/svg?repos=odysseus-dev/odysseus&type=date&legend=top-left" />
|
||||
</picture>
|
||||
</a>
|
||||
<p align="center">
|
||||
<a href="https://trendshift.io/repositories/43167">
|
||||
<a href="https://trendshift.io/repositories/43167?utm_source=trendshift-badge&utm_medium=badge&utm_campaign=badge-trendshift-43167" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/trendshift/repositories/43167/monthly" alt="odysseus-dev%2Fodysseus | Trendshift" width="230"/></a>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://star-history.dera.page/#odysseus-dev/odysseus&type=date&legend=top-left">
|
||||
<picture>
|
||||
<source
|
||||
media="(prefers-color-scheme: dark)"
|
||||
srcset="https://star-history.dera.page/svg?repos=odysseus-dev/odysseus&type=date&theme=dark&legend=top-left"
|
||||
/>
|
||||
<source
|
||||
media="(prefers-color-scheme: light)"
|
||||
srcset="https://star-history.dera.page/svg?repos=odysseus-dev/odysseus&type=date&legend=top-left"
|
||||
/>
|
||||
<img
|
||||
src="https://star-history.dera.page/svg?repos=odysseus-dev/odysseus&type=date&legend=top-left"
|
||||
alt="Odysseus GitHub star history"
|
||||
width="100%"
|
||||
/>
|
||||
</picture>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
## License
|
||||
|
||||
|
||||
@@ -178,6 +178,14 @@ app.add_middleware(SecurityHeadersMiddleware)
|
||||
import asyncio as _asyncio
|
||||
from starlette.middleware.base import BaseHTTPMiddleware as _BaseHTTPMiddleware
|
||||
from starlette.responses import JSONResponse as _JSONResponse
|
||||
import anyio as _anyio
|
||||
from starlette.requests import ClientDisconnect as _ClientDisconnect
|
||||
|
||||
# SSE endpoints (e.g. /api/editor/bridge/events) end/abort mid-stream when the
|
||||
# browser disconnects; Starlette's BaseHTTPMiddleware surfaces that as
|
||||
# anyio.EndOfStream (and sometimes ClientDisconnect). Those are client-side
|
||||
# events, not server errors, so we map them to a 499 instead of a 500 traceback.
|
||||
_STREAM_CLIENT_EXC = (_anyio.EndOfStream, _ClientDisconnect)
|
||||
|
||||
REQUEST_HARD_TIMEOUT = float(os.getenv("REQUEST_HARD_TIMEOUT", "45"))
|
||||
_TIMEOUT_EXEMPT_PREFIXES = (
|
||||
@@ -190,6 +198,7 @@ _TIMEOUT_EXEMPT_PREFIXES = (
|
||||
"/api/cookbook/setup", # remote pacman/apt installs
|
||||
"/api/upload", # large files
|
||||
"/api/image", # diffusion proxies (inpaint/harmonize/upscale/etc.) — own 120s httpx timeout
|
||||
"/api/editor", # editor agent/bridge: generative steps can take 30-110s (SAM + local diffusion)
|
||||
"/api/memory/audit", # retains own 120s LLM inactivity timeout
|
||||
)
|
||||
|
||||
@@ -225,15 +234,43 @@ class _InteractiveActivityMiddleware(_BaseHTTPMiddleware):
|
||||
return await call_next(request)
|
||||
|
||||
|
||||
# Heavy image ops that can run 30-150 s; a deploy restart must not cut these off.
|
||||
_HEAVY_IMAGE_OP_PREFIXES = (
|
||||
"/api/image/inpaint",
|
||||
"/api/image/replace-background",
|
||||
"/api/image/outpaint",
|
||||
"/api/image/extend",
|
||||
"/api/image/remove-bg",
|
||||
"/api/image/mask",
|
||||
"/api/image/upscale-local",
|
||||
"/api/image/denoise",
|
||||
"/api/image/enhance-face",
|
||||
"/api/gallery/ai-upscale",
|
||||
"/api/gallery/style-transfer",
|
||||
"/api/editor/agent",
|
||||
)
|
||||
|
||||
|
||||
class _SlowRequestLogMiddleware(_BaseHTTPMiddleware):
|
||||
async def dispatch(self, request, call_next):
|
||||
from src import activity
|
||||
path = request.url.path or ""
|
||||
heavy = any(path.startswith(p) for p in _HEAVY_IMAGE_OP_PREFIXES)
|
||||
if heavy:
|
||||
activity.begin_image_op(path)
|
||||
start = time.perf_counter()
|
||||
status = 500
|
||||
try:
|
||||
response = await call_next(request)
|
||||
status = getattr(response, "status_code", 0) or 0
|
||||
return response
|
||||
except _STREAM_CLIENT_EXC:
|
||||
# Client disconnected / SSE stream ended — not a server error.
|
||||
status = 499
|
||||
return _JSONResponse({"detail": "client disconnected"}, status_code=499)
|
||||
finally:
|
||||
if heavy:
|
||||
activity.end_image_op(path)
|
||||
elapsed = time.perf_counter() - start
|
||||
try:
|
||||
threshold = float(os.getenv("ODYSSEUS_SLOW_REQUEST_LOG_SECONDS", "0.75") or "0.75")
|
||||
@@ -516,28 +553,69 @@ app.mount("/static", _RevalidatingStatic(directory=STATIC_DIR), name="static")
|
||||
@app.get("/api/generated-image/{filename}")
|
||||
async def serve_generated_image(filename: str, request: Request):
|
||||
"""Serve generated images from the data directory."""
|
||||
img_path = resolve_generated_image_path(filename)
|
||||
# SECURITY: filename is the only key, so anyone who knows / guesses a
|
||||
# 12-hex content hash could pull another user's image bytes. Require
|
||||
# auth and verify ownership via the gallery row (when one exists).
|
||||
try:
|
||||
from src.auth_helpers import get_current_user
|
||||
from core.database import SessionLocal as _SL, GalleryImage as _GI
|
||||
_user = get_current_user(request)
|
||||
if _user:
|
||||
_db = _SL()
|
||||
# 1. Validate filename syntax upfront, rejecting malformed requests (400)
|
||||
# without probing the filesystem or database.
|
||||
from src.generated_images import GENERATED_IMAGE_RE
|
||||
if not isinstance(filename, str) or not GENERATED_IMAGE_RE.fullmatch(filename):
|
||||
raise HTTPException(status_code=400, detail="Invalid filename")
|
||||
|
||||
# 2. Ownership verification:
|
||||
# If auth is enabled, verify caller identity and ownership BEFORE probing disk,
|
||||
# preventing existence oracles during outages or unauthorized requests.
|
||||
from src.auth_helpers import auth_disabled, effective_user
|
||||
if not auth_disabled():
|
||||
_user = effective_user(request)
|
||||
if not _user:
|
||||
raise HTTPException(status_code=401, detail="Not authenticated")
|
||||
|
||||
from src.generated_images import get_registered_image_owner
|
||||
_reg_owner = get_registered_image_owner(filename)
|
||||
if _reg_owner is not None:
|
||||
if _reg_owner != _user:
|
||||
raise HTTPException(status_code=404, detail="Image not found")
|
||||
else:
|
||||
try:
|
||||
_row = _db.query(_GI).filter(_GI.filename == filename).first()
|
||||
# Generated-but-not-yet-imported images have no row → allow.
|
||||
# Row exists with a different owner → 404 (don't confirm existence).
|
||||
if _row is not None and _row.owner and _row.owner != _user:
|
||||
raise HTTPException(status_code=404, detail="Image not found")
|
||||
finally:
|
||||
_db.close()
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as _e:
|
||||
logger.warning("Image ownership verification failed for %r", filename, exc_info=_e)
|
||||
from core.database import (
|
||||
SessionLocal as _SL,
|
||||
GalleryImage as _GI,
|
||||
Session as _DbSession,
|
||||
ChatMessage as _CM,
|
||||
)
|
||||
_db = _SL()
|
||||
try:
|
||||
_row = _db.query(_GI).filter(_GI.filename == filename).first()
|
||||
if _row is not None:
|
||||
if _row.owner:
|
||||
if _row.owner != _user:
|
||||
raise HTTPException(status_code=404, detail="Image not found")
|
||||
elif _row.session_id:
|
||||
_sess = _db.query(_DbSession).filter(_DbSession.id == _row.session_id).first()
|
||||
if not _sess or not _sess.owner or _sess.owner != _user:
|
||||
raise HTTPException(status_code=404, detail="Image not found")
|
||||
else:
|
||||
# Gallery record has no owner or session link -> fail closed
|
||||
raise HTTPException(status_code=404, detail="Image not found")
|
||||
else:
|
||||
# Rowless image: check if referenced in a chat session owned by this user
|
||||
_chat_ref = (
|
||||
_db.query(_CM.id)
|
||||
.join(_DbSession, _CM.session_id == _DbSession.id)
|
||||
.filter(_DbSession.owner == _user, _CM.meta_data.like(f"%{filename}%"))
|
||||
.first()
|
||||
)
|
||||
if not _chat_ref:
|
||||
raise HTTPException(status_code=404, detail="Image not found")
|
||||
finally:
|
||||
_db.close()
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as _e:
|
||||
logger.warning("Image ownership verification failed for %r", filename, exc_info=_e)
|
||||
raise HTTPException(status_code=503, detail="Ownership verification unavailable")
|
||||
|
||||
# 3. Resolve confined path and verify existence on disk
|
||||
img_path = resolve_generated_image_path(filename)
|
||||
|
||||
ext = filename.rsplit('.', 1)[-1].lower()
|
||||
mime = {
|
||||
"png": "image/png", "jpg": "image/jpeg", "jpeg": "image/jpeg",
|
||||
@@ -545,10 +623,6 @@ async def serve_generated_image(filename: str, request: Request):
|
||||
"mp4": "video/mp4", "mov": "video/quicktime", "webm": "video/webm",
|
||||
"mkv": "video/x-matroska", "m4v": "video/mp4",
|
||||
}.get(ext, "application/octet-stream")
|
||||
# Generated-image filenames are content hashes → the bytes for a given
|
||||
# filename never change. Cache them hard so the gallery doesn't
|
||||
# re-download every full-size image each time it's opened. `immutable`
|
||||
# tells the browser it never needs to revalidate within the max-age.
|
||||
return FileResponse(
|
||||
str(img_path),
|
||||
media_type=mime,
|
||||
@@ -784,6 +858,10 @@ app.include_router(setup_gallery_routes())
|
||||
from routes.editor_draft_routes import setup_editor_draft_routes
|
||||
app.include_router(setup_editor_draft_routes())
|
||||
|
||||
# Natural-language editor planning (planner wired to the configured chat model)
|
||||
from routes.editor_agent_routes import setup_editor_agent_routes
|
||||
app.include_router(setup_editor_agent_routes())
|
||||
|
||||
# Scheduled tasks + event bus
|
||||
from src.task_scheduler import TaskScheduler
|
||||
task_scheduler = TaskScheduler(session_manager)
|
||||
@@ -955,12 +1033,21 @@ async def serve_login(request: Request):
|
||||
@app.get("/api/version")
|
||||
async def get_version():
|
||||
from core.constants import APP_BUILD_VERSION, APP_SOURCE_COMMIT, APP_VERSION
|
||||
from src import activity
|
||||
return {
|
||||
"version": APP_VERSION,
|
||||
"build": APP_BUILD_VERSION,
|
||||
"source_commit": APP_SOURCE_COMMIT,
|
||||
"busy_image_ops": activity.heavy_image_ops_active(),
|
||||
}
|
||||
|
||||
|
||||
@app.get("/api/busy")
|
||||
async def get_busy():
|
||||
"""Report in-flight heavy work so a deploy can wait instead of dropping it."""
|
||||
from src import activity
|
||||
return activity.activity()
|
||||
|
||||
@app.get("/api/health")
|
||||
async def health_check() -> Dict[str, str]:
|
||||
return {"status": "healthy", "timestamp": datetime.now(timezone.utc).isoformat()}
|
||||
@@ -1399,4 +1486,35 @@ if __name__ == "__main__":
|
||||
bind_host = os.getenv("APP_BIND", "127.0.0.1")
|
||||
bind_port = int(os.getenv("APP_PORT", "7011"))
|
||||
|
||||
uvicorn.run(app, host=bind_host, port=bind_port, log_level="info")
|
||||
# Give in-flight requests time to finish on SIGTERM instead of being cut
|
||||
# off mid-flight. Diffusion edits run 60-120 s; outpaint/extend can run up
|
||||
# to ~330 s (provider cap 900 s), so default the graceful window to 900 s.
|
||||
# systemd's TimeoutStopSec must exceed this (see the graceful-stop drop-in).
|
||||
#
|
||||
# We hook uvicorn's signal handler so a SIGTERM also flips src.shutdown:
|
||||
# SSE / streaming generators check it and end promptly, so an open browser
|
||||
# stream cannot stall a restart for the whole window. The long window stays
|
||||
# a safety net for genuine in-flight image ops.
|
||||
from src import shutdown as _shutdown
|
||||
|
||||
config = uvicorn.Config(
|
||||
app,
|
||||
host=bind_host,
|
||||
port=bind_port,
|
||||
log_level="info",
|
||||
timeout_graceful_shutdown=int(os.getenv("ODYSSEUS_GRACEFUL_SHUTDOWN_TIMEOUT", "900") or 900),
|
||||
)
|
||||
server = uvicorn.Server(config)
|
||||
|
||||
# uvicorn's capture_signals() wires SIGINT/SIGTERM to self.handle_exit, so
|
||||
# wrapping that method lets us set the shutdown flag before the normal exit
|
||||
# path runs (this uvicorn version has no install_signal_handlers kwarg).
|
||||
_uvicorn_handle_exit = server.handle_exit
|
||||
|
||||
def _handle_shutdown_signal(signum, frame):
|
||||
_shutdown.request_shutdown()
|
||||
_uvicorn_handle_exit(signum, frame)
|
||||
|
||||
server.handle_exit = _handle_shutdown_signal
|
||||
|
||||
server.run()
|
||||
|
||||
@@ -131,7 +131,11 @@ services:
|
||||
ports:
|
||||
- "${CHROMADB_BIND:-127.0.0.1}:8100:8000"
|
||||
volumes:
|
||||
- chromadb-data:/chroma/chroma
|
||||
# The image runs `chroma run /config.yaml`, whose persist_path is "/data".
|
||||
# It declares no VOLUME, so anything written outside a mount lives in the
|
||||
# container's writable layer and dies with it. /chroma/chroma is where
|
||||
# pre-1.0 images kept the store; mounting there now catches nothing.
|
||||
- chromadb-data:/data
|
||||
environment:
|
||||
- ANONYMIZED_TELEMETRY=FALSE
|
||||
restart: unless-stopped
|
||||
|
||||
@@ -134,7 +134,11 @@ services:
|
||||
ports:
|
||||
- "${CHROMADB_BIND:-127.0.0.1}:8100:8000"
|
||||
volumes:
|
||||
- chromadb-data:/chroma/chroma
|
||||
# The image runs `chroma run /config.yaml`, whose persist_path is "/data".
|
||||
# It declares no VOLUME, so anything written outside a mount lives in the
|
||||
# container's writable layer and dies with it. /chroma/chroma is where
|
||||
# pre-1.0 images kept the store; mounting there now catches nothing.
|
||||
- chromadb-data:/data
|
||||
environment:
|
||||
- ANONYMIZED_TELEMETRY=FALSE
|
||||
restart: unless-stopped
|
||||
|
||||
+5
-1
@@ -112,7 +112,11 @@ services:
|
||||
ports:
|
||||
- "${CHROMADB_BIND:-127.0.0.1}:8100:8000"
|
||||
volumes:
|
||||
- chromadb-data:/chroma/chroma
|
||||
# The image runs `chroma run /config.yaml`, whose persist_path is "/data".
|
||||
# It declares no VOLUME, so anything written outside a mount lives in the
|
||||
# container's writable layer and dies with it. /chroma/chroma is where
|
||||
# pre-1.0 images kept the store; mounting there now catches nothing.
|
||||
- chromadb-data:/data
|
||||
environment:
|
||||
- ANONYMIZED_TELEMETRY=FALSE
|
||||
restart: unless-stopped
|
||||
|
||||
@@ -0,0 +1,201 @@
|
||||
# Editor Agent API
|
||||
|
||||
How an agent (LLM or script) drives the PhotoCraft editor. There are three layers:
|
||||
|
||||
1. **Control API** — `window.geEditorControl`, a stable in-page command surface.
|
||||
2. **NL planner** — `window.geEditorAI`, turns a prompt into control-API steps (LLM or basic mode).
|
||||
3. **Bridge** — server-mediated SSE channel so a *server-side* agent can drive an **open** editor.
|
||||
|
||||
All three are owner-scoped by the app session; nothing is exposed to unauthenticated users.
|
||||
|
||||
---
|
||||
|
||||
## 1. Control API (`window.geEditorControl`)
|
||||
|
||||
Installed when the editor opens. Version `EDITOR_CONTROL_VERSION`.
|
||||
|
||||
```js
|
||||
await window.geEditorControl.invoke(op, params) // { ok, op, result } | { ok:false, op, error }
|
||||
await window.geEditorControl.run([{op, params}]) // sequential, stops on first failure
|
||||
window.geEditorControl.list() // [{op, description}]
|
||||
```
|
||||
|
||||
`invoke` is async. Every op that mutates the document pushes **one** undo entry via
|
||||
`_saveState`, so a single op is one undo step.
|
||||
|
||||
### Op catalog
|
||||
|
||||
| Op | Params | Notes |
|
||||
| --- | --- | --- |
|
||||
| `document.info` | – | size, layers, mode |
|
||||
| `document.importImage` | `{dataUrl,name,raster}` | load a raster image as a new layer |
|
||||
| `layers.list` | – | top-most first |
|
||||
| `layers.select` | `{id\|index\|name}` | index is top-most-first |
|
||||
| `layers.addRaster` | – | new empty pixel layer |
|
||||
| `layers.addAdjustment` | `{type,params}` | adjustment layer |
|
||||
| `layers.duplicate` / `layers.delete` | – | on the active/selected layer(s) |
|
||||
| `layers.setOpacity` | `{id?,opacity 0-1}` | |
|
||||
| `layers.setBlend` | `{id?,blendMode\|mode}` | |
|
||||
| `layers.group` / `layers.ungroup` | – | |
|
||||
| `selection.selectAll` / `deselect` / `invert` | – | |
|
||||
| `selection.rectangle` / `selection.ellipse` | `{x,y,w,h}` | document space |
|
||||
| `selection.subject` | `{label}` | SAM text grounding (falls back to a centred rect) |
|
||||
| `selection.face` | – | SAM "face" (falls back to an upper-centre ellipse) |
|
||||
| `selection.sky` | – | SAM "sky" (falls back to a top-band colour range) |
|
||||
| `selection.background` | `{fuzziness}` | border colour union |
|
||||
| `selection.samText` | `{text}` | SAM text grounding only (throws without SAM) |
|
||||
| `selection.colorRange` | `{color,fuzziness}` | |
|
||||
| `selection.hasMask` | – | `{active, space}` |
|
||||
| `adjustments.apply` | `{type,params}` | adjustment layer; camelCase types accepted |
|
||||
| `adjustments.applyMasked` | `{brightness,contrast,saturation,warmth,invert}` | pixel pass, masked if a selection exists else whole layer |
|
||||
| `filters.apply` | `{id}` | opens the slider dialog and applies |
|
||||
| `filters.applyMasked` | `{id,radius,amount,invert}` | `id`: blur-gaussian, sharpen, unsharp-mask |
|
||||
| `transform.start` / `transform.apply` / `transform.cancel` | – | |
|
||||
| `text.add` | `{text,x,y,color,size,font,align}` | |
|
||||
| `history.undo` / `history.redo` | – | |
|
||||
| `history.mark` | – | returns current undo depth (for grouping) |
|
||||
| `history.collapse` | `{mark,label}` | collapses entries above `mark` into one |
|
||||
| `export.png` | – | `{dataUrl}` of the flattened document |
|
||||
| `export.gallery` | – | saves a copy back to the gallery |
|
||||
| `screenshot` | – | `{dataUrl,width,height}` of the composited canvas |
|
||||
|
||||
Param conventions the planner must respect:
|
||||
|
||||
- `adjustments.applyMasked`: `brightness`/`contrast`/`warmth` are **-100..100** (0 neutral);
|
||||
`saturation` is a **multiplier** (1 neutral; values >3 are treated as percentages).
|
||||
- `adjustments.apply` `type` aliases are normalised (`blackAndWhite` -> `black-white`).
|
||||
- `color-balance` params are `{shadows:{r,g,b}, midtones:{r,g,b}, highlights:{r,g,b}}`;
|
||||
a bare number is coerced to `{r:n,g:n,b:n}`.
|
||||
- A masked op with **no** active selection degrades to a whole-layer edit (does not throw).
|
||||
|
||||
---
|
||||
|
||||
## 2. NL planner (`window.geEditorAI`)
|
||||
|
||||
```js
|
||||
const res = await window.geEditorAI.execute('blur the background behind the person', { onStep });
|
||||
// exec: window.geEditorAI.execute('blur the background behind the person', { onStep });
|
||||
// res = { ok, prompt, reply, planner, basicMode, steps, trace, failed }
|
||||
```
|
||||
|
||||
Flow (`static/js/editor/nl-edit.js`):
|
||||
|
||||
1. Read document state + a **before** screenshot.
|
||||
2. Ask the **server planner** (`POST /api/editor/plan`) with the prompt, state and
|
||||
screenshot. The client passes its strong guidance via `state.planner_guidance`.
|
||||
If the route is unavailable it falls back to `localPlan` (regex — labelled
|
||||
**"basic mode"** in the UI).
|
||||
3. `sanitizeSteps()`: drop no-op/export steps and, if a masked op has no preceding
|
||||
`selection.*`, insert the region implied by the prompt (face/sky/background/subject).
|
||||
4. `history.mark`, then run each step, screenshotting after each one.
|
||||
5. **Self-check** (server plans only, max 3 rounds): send the after screenshot back in
|
||||
`mode:"check"` with the original intent. If not satisfied, **revert** the previous
|
||||
attempt (undo its history entries) and apply the model's **full corrected** plan.
|
||||
6. `history.collapse` — the whole request becomes a single undoable step.
|
||||
|
||||
UI: the Quick Edit box routes multi-clause / "and ..." prompts to this executor and
|
||||
streams `Step i/n: <op>` into its status line; a `(basic mode)` suffix marks the offline planner.
|
||||
|
||||
### Server route
|
||||
|
||||
`POST /api/editor/plan` (HARNESS, `routes/editor_agent_routes.py`)
|
||||
|
||||
```
|
||||
{ prompt, state, mode?: "plan"|"check", screenshot?: "data:image/..." }
|
||||
-> { reply, planner, steps: [{op, params}], done? }
|
||||
```
|
||||
|
||||
Owner-scoped, authenticated. Uses the configured default/utility model with vision.
|
||||
If the model call is unavailable it returns a deterministic `planner:"fallback"` plan.
|
||||
|
||||
---
|
||||
|
||||
## 3. Bridge (server agent drives an open editor)
|
||||
|
||||
`static/js/editor/editor-bridge.js` subscribes the open editor to the server queue.
|
||||
Enabled automatically when the editor opens (`window.__geEditorBridge`).
|
||||
|
||||
- Subscribe: `GET /api/editor/bridge/events?session=<id>` — SSE, `data: {id,op,params}` (keepalive every 15s).
|
||||
- The page runs the op via the control API and replies:
|
||||
`POST /api/editor/bridge/result {id,ok,result,error,screenshot,ms}`.
|
||||
- Enqueue a command (server side): `POST /api/editor/bridge/command {session, op|steps, wait, timeout}`.
|
||||
With `wait:true` the call blocks and returns the editor's result.
|
||||
|
||||
Round-trip example (authenticated; `<session>` = `window.__geEditorBridge.session`):
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://127.0.0.1:7011/api/editor/bridge/command \
|
||||
-H 'Content-Type: application/json' -b "odysseus_session=$TOKEN" \
|
||||
-d '{"session":"default","op":"layers.addRaster","wait":true,"timeout":8000}'
|
||||
# -> {"id":"...","ok":true,"result":{...},"screenshot":"data:image/png;base64,..."}
|
||||
```
|
||||
|
||||
Session scoping is `owner:session`, so an agent can only drive editors owned by the
|
||||
same user. The bridge is a **browser-only** flow: it requires an editor page to be open.
|
||||
|
||||
---
|
||||
|
||||
## 4. SAM dependency
|
||||
|
||||
`selection.subject` / `selection.face` / `selection.sky` / `selection.samText` use the
|
||||
server SAM mask tool (`POST /api/image/mask`). When the SAM tools are **not installed**
|
||||
the editor raises *"Object mask tools are not installed"* and the control op falls back
|
||||
to a **coarse approximation** (centred rect / upper-centre ellipse / top-band colour range).
|
||||
On a plain background the approximation is acceptable; on real photos it leaks, producing
|
||||
visible rectangular/elliptical artifacts. Install the Cookbook SAM mask dependencies for
|
||||
true subject/face/sky segmentation.
|
||||
|
||||
`selection.colorRange` and `selection.background` never need SAM (pure colour matching),
|
||||
but they are also coarse on busy scenes.
|
||||
|
||||
---
|
||||
|
||||
## 5. Two ways for an agent to use this — pick one
|
||||
|
||||
### Option A — built-in tool (in-process)
|
||||
|
||||
Register an editor-control tool inside the app (same process as the model) that calls the
|
||||
bridge/control API directly. Uses the app's normal login; nothing new is exposed. This is
|
||||
the rejected stdio-MCP design's replacement: a server-side tool that talks to the bridge
|
||||
needs either an internal token (auth-bypass) or to run in-process. **Decision pending (user).**
|
||||
|
||||
### Option B — browser-only flow (works today)
|
||||
|
||||
No new server tool. An external agent drives an open editor purely through the bridge
|
||||
endpoints using the logged-in owner's session. Restricted to the editor the user has open.
|
||||
This is the flow demonstrated above and requires **no** auth-bypass.
|
||||
|
||||
A stdio `photo_editor` MCP server was prototyped and **rejected** because the built-in MCP
|
||||
subprocess has no internal token; wiring it would require expanding an auth bypass.
|
||||
The two viable options above are left for the user to choose.
|
||||
|
||||
---
|
||||
|
||||
## 6. Known limitations / honest grading
|
||||
|
||||
Live run against real 7011 with the server LLM planner (7 prompts): all 7 executed
|
||||
(`planner:"llm"`). Graded by eye:
|
||||
|
||||
- PASS: black & white portrait; warm cinematic; sharper + more vivid; text title.
|
||||
- FAIL (region-masked, SAM-bound): "dramatic sky" (global over-saturation instead of a
|
||||
dramatic, masked sky), "blur the background" (coarse mask leaks; visible rectangle),
|
||||
"brighten the face" (coarse ellipse/rect artifact).
|
||||
|
||||
Whole-image edits are reliable; subject/face/sky region edits need SAM. The self-check
|
||||
loop works (revert-and-replan) but the region cases spend all 3 iterations.
|
||||
|
||||
## 7. Theming (control kit)
|
||||
|
||||
The editor's interactive controls (ranges, number fields, selects, checkboxes) share a
|
||||
single themed kit: `static/js/editor/control-kit.js` adds `.ge-ctl-*` classes scoped to
|
||||
the editor roots (`#gallery-editor-container`, `.ge-adj-popup`, `.ge-filter-overlay`,
|
||||
`.ge-canvas-size-overlay`, `.ge-float-window`, `.ge-transform-popup`), and
|
||||
`static/css/13-image-editor.css` (section "Editor control kit") styles them from the app
|
||||
design tokens (`static/css/00-tokens.css`) to match the app sliders/selects. It keeps
|
||||
range fills in sync and attaches a **scrub-on-label** affordance to numeric fields
|
||||
(drag the field's label to change the value; arrow keys work, Shift = x10).
|
||||
|
||||
**The PhotoCraft editor is dark-only.** `:root.light` flips the global tokens, but
|
||||
`13-image-editor.css` has no `.light` handling and the editor relies on dark surfaces,
|
||||
so light mode renders a garbled mix. Unlike the rest of Odysseus, the editor follows
|
||||
Photoshop and is not offered in a light theme.
|
||||
@@ -0,0 +1,408 @@
|
||||
# ChromaDB Volume Migration — Upgrading from pre-#6166 installs
|
||||
|
||||
> [!IMPORTANT]
|
||||
> This guide is only for Docker-based installs that were deployed before PR #6166
|
||||
> was merged. Native host installs are unaffected (they persist to `data/chroma/`
|
||||
> on the host filesystem, which was always stored correctly).
|
||||
|
||||
---
|
||||
|
||||
## 1. What changed and why
|
||||
|
||||
Before PR #6166, the `chromadb-data` named volume was mounted at `/chroma/chroma` inside
|
||||
the ChromaDB container. However, current `chromadb/chroma` images (version 1.0+) write their
|
||||
database to `/data` — configured by the container image's internal `/config.yaml` (`persist_path: "/data"`).
|
||||
Because the upstream ChromaDB image declares no `VOLUME` directive:
|
||||
|
||||
* **Any vector data written to `/data` accumulated exclusively in the container's writable layer.**
|
||||
* The mounted `chromadb-data` named volume at `/chroma/chroma` remained completely empty.
|
||||
* Any recreation or removal of the container (`docker compose down`, `docker compose up --force-recreate`, `docker rm`)
|
||||
permanently destroys that writable layer and all vector embeddings within it.
|
||||
|
||||
PR #6166 corrects the mount target across all Compose configurations to `chromadb-data:/data`.
|
||||
|
||||
Fresh installations will persist data directly to the named volume automatically. However, for
|
||||
**existing running installations**, the vector store currently resides in the old container's
|
||||
writable layer.
|
||||
|
||||
This guide provides a zero-data-loss, fail-closed operational procedure to quiesce, preserve,
|
||||
back up, verify, seed, and validate that data before performing cutover.
|
||||
|
||||
---
|
||||
|
||||
## 2. Architecture and Safety Principles
|
||||
|
||||
1. **No Live `docker cp`:** ChromaDB uses SQLite (`chroma.sqlite3`) and binary HNSW segment index
|
||||
files (`data_level0.bin`, `header.bin`, `length.bin`, `link_lists.bin`). Taking a file copy while
|
||||
the database engine is running risks capturing torn SQLite pages or out-of-sync HNSW graph segments.
|
||||
Writers must be quiesced and ChromaDB gracefully stopped before copying files.
|
||||
2. **Do Not Trust `docker rename` Alone:** Docker Compose tracks containers by internal metadata labels
|
||||
(`com.docker.compose.project`, `com.docker.compose.service`, `com.docker.compose.container-number`),
|
||||
**not** merely by container name. Renaming a container does not strip its labels; Compose commands
|
||||
can still discover, restart, or recreate it. To guarantee preservation of the writable layer, the
|
||||
stopped container must be committed to an immutable Docker image (`docker commit`).
|
||||
3. **Never Overwrite Existing Volumes:** Named volumes must be positively verified as empty prior to seeding.
|
||||
4. **Staging Validation Before Production Cutover:** The seeded named volume must be independently validated
|
||||
using a disposable ChromaDB instance on an isolated port before touching the production Compose deployment.
|
||||
5. **No Rollback to `/chroma/chroma`:** Rolling back to pre-#6166 Compose files reintroduces the broken
|
||||
mount path where ChromaDB never looks. Rollback procedures must restore data into the corrected `/data` path
|
||||
or redeploy from the immutable backup image.
|
||||
|
||||
---
|
||||
|
||||
## 3. Step-by-Step Migration Procedure
|
||||
|
||||
### Step 0: Identify your project and volume names
|
||||
|
||||
Docker Compose prefixes container and volume names with the project name (usually the root directory name).
|
||||
Identify yours before proceeding:
|
||||
|
||||
```bash
|
||||
# Identify running ChromaDB container
|
||||
docker ps --filter "ancestor=chromadb/chroma" --format "table {{.ID}}\t{{.Status}}\t{{.Names}}"
|
||||
|
||||
# Identify the named volume
|
||||
docker volume ls --filter "name=chromadb"
|
||||
```
|
||||
|
||||
Throughout this guide:
|
||||
* `<project>` represents your Compose project (e.g. `odysseus` or `odysseus-maintainer-preview`).
|
||||
* `<container>` represents the running ChromaDB container (e.g. `<project>-chromadb-1`).
|
||||
* `<volume>` represents the named volume (e.g. `<project>_chromadb-data`).
|
||||
|
||||
Set shell variables for convenience:
|
||||
```bash
|
||||
PROJECT="<project>"
|
||||
CONTAINER="${PROJECT}-chromadb-1"
|
||||
VOLUME="${PROJECT}_chromadb-data"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Step 1: Pre-Migration Collection Inventory (Baseline)
|
||||
|
||||
Establish a baseline of all existing collections and their embedding counts through the live ChromaDB API:
|
||||
|
||||
```bash
|
||||
# List all collections and record counts
|
||||
curl -s http://127.0.0.1:8100/api/v2/tenants/default_tenant/databases/default_database/collections \
|
||||
| python3 -c '
|
||||
import json, sys, urllib.request
|
||||
data = json.load(sys.stdin)
|
||||
print(f"Total collections found: {len(data)}")
|
||||
for col in data:
|
||||
c_id = col["id"]
|
||||
name = col["name"]
|
||||
try:
|
||||
with urllib.request.urlopen(f"http://127.0.0.1:8100/api/v2/tenants/default_tenant/databases/default_database/collections/{c_id}/count") as resp:
|
||||
count = resp.read().decode().strip()
|
||||
except Exception as e:
|
||||
count = f"error: {e}"
|
||||
print(f"Collection: {name} (ID: {c_id}) -> Count: {count}")
|
||||
' | tee pre_migration_inventory.txt
|
||||
```
|
||||
|
||||
Save `pre_migration_inventory.txt` securely. This baseline is used in Step 7 and Step 9 to verify
|
||||
zero data loss.
|
||||
|
||||
---
|
||||
|
||||
### Step 2: Quiesce Writers and Gracefully Stop ChromaDB
|
||||
|
||||
To ensure transactional and referential consistency across SQLite and HNSW segment files:
|
||||
|
||||
1. Stop application writers (Odysseus) to prevent any in-flight requests:
|
||||
```bash
|
||||
docker compose stop odysseus
|
||||
```
|
||||
2. Gracefully stop the ChromaDB service. This permits SQLite to checkpoint the Write-Ahead Log (WAL)
|
||||
and flushes all in-memory vector index segments to disk:
|
||||
```bash
|
||||
docker compose stop chromadb
|
||||
```
|
||||
3. Confirm that the container status is `Exited`:
|
||||
```bash
|
||||
docker ps -a --filter "name=${CONTAINER}" --format "table {{.ID}}\t{{.Status}}\t{{.Names}}"
|
||||
```
|
||||
*Do not proceed if the container is still running.*
|
||||
|
||||
---
|
||||
|
||||
### Step 3: Preserve the Original Container as an Immutable Image
|
||||
|
||||
Because Docker Compose discovers containers via service labels, running `docker compose up` later
|
||||
could recreate and destroy the original container's writable layer.
|
||||
|
||||
Preserve the complete writable layer into an immutable Docker image:
|
||||
```bash
|
||||
BACKUP_IMAGE="${PROJECT}-chromadb-backup:pre-migration-$(date +%Y%m%d-%H%M%S)"
|
||||
docker commit "${CONTAINER}" "${BACKUP_IMAGE}"
|
||||
echo "Committed container writable layer to: ${BACKUP_IMAGE}"
|
||||
```
|
||||
|
||||
Verify the image was created:
|
||||
```bash
|
||||
docker images "${BACKUP_IMAGE}"
|
||||
```
|
||||
|
||||
This image is your ultimate insurance: even if all containers and volumes are deleted, your
|
||||
data remains safely archived in Docker's image store.
|
||||
|
||||
---
|
||||
|
||||
### Step 4: Take a Cold File Backup
|
||||
|
||||
With the container stopped, copy the `/data` directory out to a dedicated host backup directory:
|
||||
|
||||
```bash
|
||||
BACKUP_DIR="./chromadb-backup-$(date +%Y%m%d-%H%M%S)"
|
||||
mkdir -p "${BACKUP_DIR}"
|
||||
|
||||
docker cp "${CONTAINER}:/data/." "${BACKUP_DIR}/"
|
||||
echo "Cold backup created at: ${BACKUP_DIR}"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Step 5: Verify Backup Integrity
|
||||
|
||||
Never proceed to destructive cutover without verifying both SQLite and vector index structures.
|
||||
|
||||
1. **Verify SQLite Database File:**
|
||||
```bash
|
||||
test -s "${BACKUP_DIR}/chroma.sqlite3" || { echo "ERROR: chroma.sqlite3 is missing or 0 bytes"; exit 1; }
|
||||
```
|
||||
2. **Execute SQLite PRAGMA Integrity Check:**
|
||||
```bash
|
||||
INTEGRITY=$(sqlite3 "${BACKUP_DIR}/chroma.sqlite3" "PRAGMA integrity_check;")
|
||||
if [ "${INTEGRITY}" != "ok" ]; then
|
||||
echo "ERROR: SQLite integrity check failed: ${INTEGRITY}"
|
||||
exit 1
|
||||
fi
|
||||
echo "SQLite integrity check: OK"
|
||||
```
|
||||
3. **Verify Collections Table Structure:**
|
||||
```bash
|
||||
sqlite3 "${BACKUP_DIR}/chroma.sqlite3" "SELECT id, name FROM collections;"
|
||||
```
|
||||
4. **Verify HNSW Index Binary Files:**
|
||||
Vector representations are not stored inside SQLite; they are kept in segment directories under `/data`:
|
||||
```bash
|
||||
find "${BACKUP_DIR}" -type f -name "*.bin"
|
||||
```
|
||||
Ensure `.bin` files (`data_level0.bin`, `header.bin`, etc.) exist for indexed collections.
|
||||
|
||||
---
|
||||
|
||||
### Step 6: Verify Destination Volume is Empty and Seed Safely
|
||||
|
||||
The named volume `${VOLUME}` must be empty before seeding. Under no circumstances should
|
||||
migration files be merged into a populated volume.
|
||||
|
||||
1. **Positive Empty Check:**
|
||||
```bash
|
||||
VOL_FILES=$(docker run --rm -v "${VOLUME}:/vol:ro" alpine ls -A /vol)
|
||||
if [ -n "${VOL_FILES}" ]; then
|
||||
echo "ERROR: Named volume ${VOLUME} already contains files: ${VOL_FILES}"
|
||||
echo "Aborting migration to prevent overwriting existing volume data."
|
||||
exit 1
|
||||
fi
|
||||
echo "Volume ${VOLUME} is empty and ready for seeding."
|
||||
```
|
||||
2. **Seed the Volume:**
|
||||
Use a disposable Alpine container to populate the volume with exact ownership and permissions:
|
||||
```bash
|
||||
docker run --rm \
|
||||
-v "${VOLUME}:/target" \
|
||||
-v "$(realpath "${BACKUP_DIR}"):/source:ro" \
|
||||
alpine sh -c "cp -a /source/. /target/ && ls -la /target/"
|
||||
```
|
||||
3. **Verify Seeded Contents:**
|
||||
```bash
|
||||
docker run --rm -v "${VOLUME}:/vol:ro" alpine ls -la /vol
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Step 7: Staging Validation in an Isolated Disposable Container
|
||||
|
||||
Before modifying your production Compose stack, validate that ChromaDB boots successfully from the
|
||||
seeded volume and serves all collections.
|
||||
|
||||
1. **Start Disposable Staging Container:**
|
||||
Run a temporary ChromaDB instance bound to an isolated loopback port (e.g. `127.0.0.1:18199`):
|
||||
```bash
|
||||
docker run -d --name "${PROJECT}-chromadb-staging" \
|
||||
-p 127.0.0.1:18199:8000 \
|
||||
-v "${VOLUME}:/data" \
|
||||
chromadb/chroma:latest
|
||||
|
||||
# Wait for staging ChromaDB to boot
|
||||
sleep 4
|
||||
curl -s http://127.0.0.1:18199/api/v2/heartbeat || { echo "Staging container failed to respond"; exit 1; }
|
||||
```
|
||||
2. **Compare Collection Counts with Baseline:**
|
||||
```bash
|
||||
curl -s http://127.0.0.1:18199/api/v2/tenants/default_tenant/databases/default_database/collections \
|
||||
| python3 -c '
|
||||
import json, sys, urllib.request
|
||||
data = json.load(sys.stdin)
|
||||
print(f"Staging collections verified: {len(data)}")
|
||||
for col in data:
|
||||
c_id = col["id"]
|
||||
name = col["name"]
|
||||
with urllib.request.urlopen(f"http://127.0.0.1:18199/api/v2/tenants/default_tenant/databases/default_database/collections/{c_id}/count") as resp:
|
||||
count = resp.read().decode().strip()
|
||||
print(f" {name}: {count} records")
|
||||
'
|
||||
```
|
||||
*Confirm that the output matches `pre_migration_inventory.txt` from Step 1.*
|
||||
|
||||
3. **Tear Down Staging Container:**
|
||||
```bash
|
||||
docker rm -f "${PROJECT}-chromadb-staging"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Step 8: Apply Updated Compose Files and Perform Production Cutover
|
||||
|
||||
Once the seeded volume is proven healthy:
|
||||
|
||||
1. Update your repository to the revision containing PR #6166:
|
||||
```bash
|
||||
git pull
|
||||
```
|
||||
2. Verify the mount line in your Compose file:
|
||||
```bash
|
||||
grep -E 'chromadb-data:/data' docker-compose.yml
|
||||
```
|
||||
3. Bring up the updated ChromaDB container:
|
||||
```bash
|
||||
docker compose up -d chromadb
|
||||
```
|
||||
Docker Compose will detect the updated mount configuration, replace the stopped container,
|
||||
and attach `${VOLUME}` directly to `/data`.
|
||||
4. Bring up the application stack:
|
||||
```bash
|
||||
docker compose up -d odysseus
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Step 9: Post-Migration Production Verification
|
||||
|
||||
1. **Confirm Mount Point:**
|
||||
```bash
|
||||
docker inspect "${CONTAINER}" --format '{{range .Mounts}}{{.Name}} -> {{.Destination}}{{"\n"}}{{end}}'
|
||||
```
|
||||
Expected output:
|
||||
```
|
||||
<project>_chromadb-data -> /data
|
||||
```
|
||||
2. **Confirm Production Collection Counts:**
|
||||
```bash
|
||||
curl -s http://127.0.0.1:8100/api/v2/tenants/default_tenant/databases/default_database/collections \
|
||||
| python3 -c '
|
||||
import json, sys, urllib.request
|
||||
data = json.load(sys.stdin)
|
||||
print(f"Production collections: {len(data)}")
|
||||
for col in data:
|
||||
c_id = col["id"]
|
||||
name = col["name"]
|
||||
with urllib.request.urlopen(f"http://127.0.0.1:8100/api/v2/tenants/default_tenant/databases/default_database/collections/{c_id}/count") as resp:
|
||||
count = resp.read().decode().strip()
|
||||
print(f" {name}: {count} records")
|
||||
'
|
||||
```
|
||||
3. **Application Verification:**
|
||||
Log in to Odysseus, navigate to **Settings -> Memory**, and confirm that memory items,
|
||||
tool embeddings, and RAG document queries operate normally.
|
||||
|
||||
---
|
||||
|
||||
## 4. Rollback Procedures
|
||||
|
||||
### Scenario A: Failure During Staging (Before Compose Cutover)
|
||||
|
||||
If staging verification in Step 7 fails or reveals discrepancies:
|
||||
1. Remove the staging container:
|
||||
```bash
|
||||
docker rm -f "${PROJECT}-chromadb-staging"
|
||||
```
|
||||
2. Clear the failed destination volume:
|
||||
```bash
|
||||
docker run --rm -v "${VOLUME}:/target" alpine sh -c "rm -rf /target/*"
|
||||
```
|
||||
3. Restart the original production container. Because the original container was only stopped (never recreated),
|
||||
its writable layer remains completely intact:
|
||||
```bash
|
||||
docker compose start chromadb
|
||||
docker compose start odysseus
|
||||
```
|
||||
4. Verify production status on port 8100.
|
||||
|
||||
---
|
||||
|
||||
### Scenario B: Failure After Compose Cutover
|
||||
|
||||
If an issue occurs after `docker compose up -d`:
|
||||
|
||||
> [!CAUTION]
|
||||
> **Do not `git checkout` the pre-#6166 Compose file!**
|
||||
> In the pre-#6166 Compose file, `chromadb-data` was mounted to `/chroma/chroma`.
|
||||
> ChromaDB 1.0+ persists to `/data`, so checking out the old Compose file will cause
|
||||
> ChromaDB to ignore the restored volume and boot with an empty database.
|
||||
|
||||
To restore service:
|
||||
1. **Option 1 — Restore from Verified Host Backup into the `/data` Volume:**
|
||||
If the container failed due to data corruption during startup:
|
||||
```bash
|
||||
docker compose stop chromadb
|
||||
docker run --rm -v "${VOLUME}:/target" alpine sh -c "rm -rf /target/*"
|
||||
docker run --rm \
|
||||
-v "${VOLUME}:/target" \
|
||||
-v "$(realpath "${BACKUP_DIR}"):/source:ro" \
|
||||
alpine cp -a /source/. /target/
|
||||
docker compose up -d chromadb
|
||||
```
|
||||
2. **Option 2 — Fallback to Committed Backup Image:**
|
||||
If Compose cannot start ChromaDB with the volume:
|
||||
```bash
|
||||
docker compose stop chromadb
|
||||
docker run -d --name "${PROJECT}-chromadb-fallback" \
|
||||
-p 127.0.0.1:8100:8000 \
|
||||
"${BACKUP_IMAGE}"
|
||||
```
|
||||
This immediately restores the exact pre-migration container state.
|
||||
|
||||
---
|
||||
|
||||
## 5. Post-Migration Cleanup (Explicit Authorization)
|
||||
|
||||
Retain the host backup directory (`${BACKUP_DIR}`) and the backup Docker image (`${BACKUP_IMAGE}`)
|
||||
for at least 7 days until routine backups have succeeded.
|
||||
|
||||
Once you are completely confident in system stability, manually clean up:
|
||||
```bash
|
||||
# Remove host backup
|
||||
rm -rf ./chromadb-backup-*
|
||||
|
||||
# Remove backup Docker image
|
||||
docker rmi "${BACKUP_IMAGE}"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 6. Re-indexing (Disaster Recovery Only)
|
||||
|
||||
If an installation has already destroyed its pre-#6166 container writable layer (e.g. prior to following
|
||||
this guide), the vector embeddings cannot be restored from disk. In this scenario:
|
||||
|
||||
* **RAG Documents:** Re-upload files under **Settings -> Memory -> RAG**. Odysseus automatically re-chunks
|
||||
and re-indexes documents upon upload.
|
||||
* **Semantic Memories:** Text memory records reside authoritatively in `data/app.db` (SQLite). Vector representations
|
||||
are re-indexed automatically when Odysseus connects to a healthy ChromaDB instance.
|
||||
* **Tool Index:** Rebuilt automatically by Odysseus upon first query.
|
||||
|
||||
Re-indexing is a disaster recovery fallback, not a substitute for preserving existing database state.
|
||||
@@ -0,0 +1,135 @@
|
||||
# ADR 001: Feature-first native ESM with controlled deployment output
|
||||
|
||||
Date: 2026-10-13. Status: implemented F1 proof, proposed for maintainer adoption.
|
||||
Baseline: official `upstream/dev` at `8feb50e89468235cd3e0986da80edbd3acaf2c40`.
|
||||
Scope: source ownership and distribution foundation. Notes implementation is deferred.
|
||||
|
||||
## Decision
|
||||
|
||||
Maintain migrated JavaScript in `frontend/src/`. Publish native ES modules to
|
||||
explicitly registered paths in `static/js/`, and commit source and output together.
|
||||
Use `python scripts/build_frontend.py` to copy bytes without rewriting imports,
|
||||
bundling, minification, source maps, timestamps or generated headers. A checked-in
|
||||
`frontend/modules.json` maps source paths to deployment paths. All other static
|
||||
files remain authored legacy modules or deployment assets until a reviewed slice
|
||||
transfers their ownership. Do not claim that the whole static tree is generated.
|
||||
|
||||
The proof transfers maintenance of the stateless action-menu ordering helper to
|
||||
`frontend/src/shared/actionMenuOrder.js`. Its output remains
|
||||
`/static/js/actionMenuOrder.js`, with the same three exports and identical bytes.
|
||||
All seven current consumers, HTML, service worker and runtime entry points retain
|
||||
their existing URLs. There is no wrapper, extra request or second browser module
|
||||
instance. The source copy is a development input, not a second runtime entry point.
|
||||
|
||||
Use `frontend/src/app/` for composition, `features/<feature>/index.js` for feature
|
||||
public APIs, and responsibility directories only when implementation requires
|
||||
them. The [handbook](handbook.md) defines dependency, ownership and lifecycle rules.
|
||||
F1 creates only the shared proof, without empty application or feature scaffolding.
|
||||
|
||||
## Evidence and alternatives
|
||||
|
||||
Both options were executed against this helper, rather than assumed to work.
|
||||
Measurements are local compatibility observations, not general performance claims.
|
||||
|
||||
| Property | Controlled native ESM copy, selected | esbuild 0.25.12 controlled ESM build |
|
||||
| --- | --- | --- |
|
||||
| Proof output | 1,688 bytes, identical SHA-256 to existing runtime | 1,554 bytes with `--bundle --format=esm --target=es2022 --platform=browser` |
|
||||
| Repeatability | Clean temporary publication and idempotent rerun tested | Two independent compiler invocations emitted identical bytes |
|
||||
| Runtime contract | Existing exports, imports, cache entry and module identity unchanged | Export names, icon and ordering matched in an executed Node import |
|
||||
| Tooling | Python standard library; no production dependency | Compiler and platform binary needed for artifact production |
|
||||
| Local cost | Copy check: 0.03 s, 15,596 KB maximum RSS | Cached `npx` ESM transform: 0.58 s, 114,196 KB maximum RSS |
|
||||
| Incremental migration | Explicit file ownership, preserved module boundaries | Feasible for the stateless leaf; stateful facade/chunk identity still needs a separate graph spike |
|
||||
| Release implications | Commit output; install/startup paths consume existing static assets | Would also need committed or release-produced output plus compiler locking and facade/chunk manifest policy |
|
||||
|
||||
The timing rows measure different tool paths, including `npx` overhead. The
|
||||
compiler's single-leaf success does not establish stateful graph or lazy chunk
|
||||
compatibility. The 134-byte bundle reduction does not justify that additional
|
||||
contract in F1. A future compiler adoption requires a new ADR and graph-level
|
||||
evidence. React, Vue, TypeScript, a global state library, hashed chunks and a
|
||||
development server have no demonstrated necessity here.
|
||||
|
||||
Acorn 8.19.0 is added only as an exact, lockfile-pinned development dependency for
|
||||
architecture checks. A real JavaScript parser is needed to enforce boundaries
|
||||
across multiline imports, re-exports and lazy thunks without treating comments
|
||||
and string literals as executable imports. It is MIT licensed, about 568 KB
|
||||
unpacked, and contributes no deployed JavaScript or runtime dependency.
|
||||
|
||||
## Distribution contract
|
||||
|
||||
1. Source and generated output are reviewed and committed together. CI checks
|
||||
byte parity; it does not silently rebuild and accept drift.
|
||||
2. Native Python startup continues to use `STATIC_DIR` and `/static`, without
|
||||
invoking the publisher. Native installers already obtain tracked static files.
|
||||
3. Docker's current `COPY . .` includes the output. `.dockerignore` excludes
|
||||
`node_modules/`. The Docker runtime and entrypoint require no frontend build.
|
||||
4. `Odysseus.spec` and `build-windows-portable.ps1` already include `static/`.
|
||||
The macOS wrapper uses the Python checkout and its static assets. Neither
|
||||
needs the source tree or frontend tooling to serve the proof.
|
||||
5. A release producer runs the checks before packaging and distributes the
|
||||
entire matching static graph. The publisher is not a transactional deployment
|
||||
mechanism. Partial copying of a new graph into a live deployment is unsupported.
|
||||
6. New output paths must declare LF checkout behavior in `.gitattributes`, as
|
||||
this proof does, so Windows checkout conversion cannot create false byte drift.
|
||||
Before checking parity or writing output, the publisher uses the manifest to
|
||||
require effective `text: set` and `eol: lf` on every source/output path. It asks
|
||||
Git in a temporary repository containing only the applicable repository-owned
|
||||
`.gitattributes` files, including nested rules. Global/local Git overrides
|
||||
cannot supply missing declarations. No blanket legacy-JS rule is introduced.
|
||||
Git is a development/publication prerequisite, not a startup dependency.
|
||||
|
||||
An isolated distribution probe executes the real FastAPI lifespan, shell and
|
||||
static requests after omitting `frontend/` and `node_modules/` and removing Node
|
||||
from the child process search path. It verifies bytes, MIME, CSP, revalidation,
|
||||
source-tree 404 behavior and static path confinement. The same probe runs in an existing Docker image
|
||||
with networking disabled. This is not a claim that a fresh full Docker image or
|
||||
Windows/macOS executable was built; see [validation](validation.md).
|
||||
|
||||
## Imports, identity and offline operation
|
||||
|
||||
New maintained modules use one unversioned deployment URL. Existing legacy URLs,
|
||||
including their version queries, stay unchanged. A copy mapping must preserve
|
||||
the resolution of every literal relative import; the architecture checker rejects
|
||||
a mapping that changes that resolution. Canonical absolute `/static/js/...`
|
||||
imports are also supported. No bare packages or browser imports of `frontend/src`
|
||||
are supported. Existing graph and identity guards continue to cover the runtime.
|
||||
|
||||
Each registered output joins the exact `PRECACHE` or `PANEL_PRECACHE` array. The
|
||||
new checker parses those arrays, rather than accepting a URL mentioned in a
|
||||
comment. Installation fetches do not evaluate lazy modules. Import-time DOM work,
|
||||
timers, state creation and network I/O must be characterized before changing an
|
||||
entry point's load timing. New source dependency cycles are rejected; existing
|
||||
legacy cycles are inventoried and remain outside the new rules.
|
||||
|
||||
The proof already has its exact precache entry, so no SW cache-name or HTML edit
|
||||
is needed. Its first evaluation in a fresh offline browser page passes, and
|
||||
importing the panel registry does not evaluate the editor. The current worker's
|
||||
`/static/` scope cannot control the SPA root. Open PR #6227 addresses that existing
|
||||
limitation; F1 does not fix or mask it. Full root offline reload is not certified.
|
||||
|
||||
## Security and compatibility
|
||||
|
||||
Keep backend authorization and owner scope authoritative. No agent, database,
|
||||
auth, CSP, static mount or API implementation changes belong to this decision.
|
||||
The helper remains same-origin ESM without eval, compiler runtime or external
|
||||
resources. No new source maps or vendored assets are emitted; existing SRI/CSP
|
||||
policy and distribution notices remain unchanged. The publisher validates path
|
||||
containment, symlinks, duplicate ownership and unmapped source before writing.
|
||||
It never deletes unowned static assets. Deleting or retiring outputs is an
|
||||
explicit reviewed migration operation, not automatic cleanup.
|
||||
|
||||
## Rollout, rollback and limits
|
||||
|
||||
Adopt F1 for controlled, reviewed slices after maintainer review. Leave Notes,
|
||||
bootstrap, HTML and service worker unchanged here. Register new files explicitly;
|
||||
update offline manifests only when new runtime dependencies are introduced.
|
||||
F1 rollback can remove the source manifest, proof tooling, gates and documentation
|
||||
without changing runtime bytes. Later rollback restores the complete prior
|
||||
source/output/facade/precache set through an authorized follow-up change.
|
||||
|
||||
Boundary gates cannot prove semantic purity, owner isolation or correct teardown.
|
||||
Domain platform/clock checks are intentionally conservative syntax guards;
|
||||
behavior tests still establish those contracts. Worker URLs, styles and vendored
|
||||
libraries are outside the maintained-JS import gate and need explicit review if
|
||||
a future lane changes them. Legacy exceptions require an exact specifier and a
|
||||
module-scoped reason; there are none in F1. New source is not permission to
|
||||
grandfather new dependency cycles or to replicate broadly shared mutable state.
|
||||
@@ -0,0 +1,127 @@
|
||||
# F1 runtime and architecture assessment
|
||||
|
||||
Assessment date: 2026-10-13. Repository: `odysseus-dev/odysseus`.
|
||||
Worktree: `worktrees/architecture/frontend-foundation`.
|
||||
Branch: `refactor/frontend-architecture-foundation`.
|
||||
HEAD, local `upstream/dev`, and the live GitHub official `dev` commit were all
|
||||
`8feb50e89468235cd3e0986da80edbd3acaf2c40`. The initial worktree was clean.
|
||||
That commit is the merged PR #6495, selected Notes/Todos agent context.
|
||||
`origin` points to the maintainer fork; integration targets official `upstream/dev`.
|
||||
|
||||
Inputs read completely: the 2026-10-13 frontend architecture RFC and coding brief
|
||||
from Downloads, `specs/frontend.md`, repository instructions and existing tests.
|
||||
The current user brief supersedes the coding brief's `origin/dev` wording and
|
||||
defines the Notes state/workflow slice before reminders. The design is self-contained
|
||||
in this directory and does not require access to Downloads.
|
||||
|
||||
Input provenance:
|
||||
|
||||
- RFC SHA-256: `11dedcbb9971f4d787f2721b9c27aa43299baba39ca91066d01507d2d69ac4f8`.
|
||||
- Coding brief SHA-256: `e4882867617b9c732ce4f445e3bc2da0b4ec1315119f8226c1fd8c1acbacf29d`.
|
||||
|
||||
## Module graph and bootstrap
|
||||
|
||||
`node scripts/check_frontend.mjs --inventory` reproduces the parser-based inventory.
|
||||
It excludes vendored `static/lib/` and committed editor build output. At this base
|
||||
it scans 230 JS files, finds 707 static import/re-export edges and 108 literal
|
||||
dynamic import edges, and finds no missing targets. No computed dynamic imports
|
||||
were found in the original parser audit. The earlier existing-regex scan counted
|
||||
814 edges; executable syntax parsing counts 815. Use parser evidence for design
|
||||
and retain the existing regression guard unchanged.
|
||||
|
||||
| Area | Current boundary and implication |
|
||||
| --- | --- |
|
||||
| HTML shell | `static/index.html`: nonce-bearing boot scripts, CSS/preloads, direct ESM script tags, then app/init/a11y. Multiple entry roots mean module identity matters. |
|
||||
| App composition | `static/app.js`: feature imports, globals, route/sidebar composition, session hydration and auth-fetch wiring. It eagerly imports Notes, Calendar, Chat, Documents and Settings. |
|
||||
| Startup | `static/js/startupShell.js`, `sessions.js`, `init.js`: first-paint scheduling, deferred hydration, user-switch storage cleanup and cosmetic permission gates. Preserve boot ordering. |
|
||||
| Lazy loading | `static/js/panels.js`: only `editor` is registered. A memoized import thunk shares successful/in-flight promises and retries failed imports. Do not label all panels lazy. |
|
||||
| Optional libraries | `markdown.js` lazily loads vendored KaTeX/Mermaid. KaTeX and fonts are precached; Mermaid becomes cached after first use. Pyodide has a CDN dependency. |
|
||||
| Feature packages | Settings registry/navigation/finder/lifecycle, Calendar utilities/reminders, Email wrapper/package and editor tools already demonstrate partial decomposition. |
|
||||
|
||||
Highest import fan-in: `ui.js` 77, `spinner.js` 55, `editor/state.js` 39,
|
||||
`escMenuStack.js` 23, and storage/modal/z-order helpers 17 each. The measured
|
||||
static strongly connected components are:
|
||||
|
||||
- Theme and UI.
|
||||
- Email Inbox, compatibility wrapper, package index, AI reply, attachments,
|
||||
body rendering, menus, reader, settings page and unsubscribe.
|
||||
- Cookbook, diagnosis, HW Fit, download, running and serve modules.
|
||||
|
||||
These are existing compatibility constraints, not approved patterns for new
|
||||
source. Dynamic edges connect more features but do not themselves establish
|
||||
initialization cycles. No global legacy dependency rewrite is attempted in F1.
|
||||
|
||||
## State, side effects and ownership
|
||||
|
||||
| Owner | Evidence and architectural treatment |
|
||||
| --- | --- |
|
||||
| Shared configuration | `appConfig.js` owns invalidatable settings/tool request promises and consumes a sessionStorage prefetch once. Retain single identity and writer invalidation. |
|
||||
| Browser persistence | `storage.js` centralizes keys and safe access; feature files also use direct localStorage. `init.js` cleans storage on user changes. Preferences are not an authorization store. |
|
||||
| Feature state | Notes has module variables, selection sets, undo/drafts and reminder state. Email exports a broadly mutable package state object; editor state is imported by 39 modules. Keep ownership explicit; do not expand these into a global store. |
|
||||
| Import-time effects | Notes reads storage/window and schedules reminders. Email state reads localStorage. Theme/UI initialize from DOM readiness; modal manager installs global listeners. Chip/mobile helpers bind at startup. Moving an import can change behavior before any exported function is called. |
|
||||
| Compatibility globals | App exposes controllers on `window`; Notes exposes `window.notesModule`. They are compatibility bridges, not the new inter-feature API convention. |
|
||||
| Async ownership | Session hydration, config invalidation, draft serialized saves and request-generation guards already prevent stale completion. New slices must preserve these rather than only move declarations. |
|
||||
|
||||
Good patterns to retain: narrow zero-state leaves, explicit wrapper export lists,
|
||||
public API tests, retryable memoized lazy imports, shared config invalidation,
|
||||
request-generation checks and source/package-aware regression helpers.
|
||||
|
||||
Patterns to avoid: blanket barrels exposing internals, feature imports from
|
||||
generic helpers, cycles through coordinators, direct writes to another feature's
|
||||
state or DOM, anonymous global listener ownership, import-triggered network/timer
|
||||
initialization in new APIs, and helpers grouped by convenience instead of purpose.
|
||||
|
||||
## Runtime, assets and distribution
|
||||
|
||||
| Contract | Verified source |
|
||||
| --- | --- |
|
||||
| Static URL and revalidation | `app.py`: `register_static_mime_types`, `_RevalidatingStatic`, `/static` mount. JS MIME is `text/javascript`; JS/CSS/HTML have `Cache-Control: no-cache`. |
|
||||
| App paths | `src/constants.py` and `src/runtime_paths.py`: checkout root in native mode, PyInstaller `_MEIPASS` in frozen mode; static assets follow app root, persisted data follows data-directory policy. |
|
||||
| CSP | `core/middleware.py`: same-origin scripts, nonce and jsDelivr allowance; `src/app_helpers.py` injects HTML nonces. No CSP relaxation is needed for the proof. |
|
||||
| Integrity | No `integrity=` attributes were found in the shell. Proof output is byte-identical and emits no source maps; no existing SRI or vendored artifacts change. |
|
||||
| Runtime-generated assets | `/api/generated-image/...` uses a confined data path and owner handling; report/render endpoints, Blob manifests/icons and uploads are runtime concerns outside static source publication. |
|
||||
| Docker | `Dockerfile` copies app code and existing static output; `.dockerignore` excludes node_modules. Node/npm in the image support Browser MCP, not frontend startup. |
|
||||
| Native installers | `setup.py`, `start-macos.sh`, `launch-windows.ps1`, systemd service: Python dependencies/startup consume the checkout. No frontend build is invoked. |
|
||||
| Windows desktop | `Odysseus.spec` and `build-windows-portable.ps1` include the whole static directory. Maintain output here rather than require a new bundle path or compiler. |
|
||||
| macOS | `build-macos-app.sh` creates a launcher around the Python checkout. Static serving follows the existing checkout path. Installer execution was not performed on Linux. |
|
||||
|
||||
## PWA limitations and test coverage
|
||||
|
||||
`static/sw.js` matches exact URLs, including queries. Install fetches each
|
||||
precache entry separately and tolerates failed fetches. It does not discover
|
||||
transitive dependencies. HTML root and JS/CSS handlers are network-first;
|
||||
other static assets are cache-first with background refresh. API and non-GET
|
||||
requests bypass caching. Cache updates need explicit version/manifest review.
|
||||
The older frontend spec's root stale-while-revalidate description is stale.
|
||||
|
||||
Registration in `static/index.html` currently requests no wider scope, so the
|
||||
worker controls `/static/`, not `/`. Root offline reload is therefore a known
|
||||
pre-existing gap. PR #6227 proposes the scope/header correction. F1 tests actual
|
||||
offline ESM loading under the current scope and leaves that separate fix alone.
|
||||
Offline APIs, first-use Mermaid and optional CDN runtimes are not certified.
|
||||
|
||||
Existing coverage includes runtime graph resolution and version parity; editor
|
||||
offline graph coverage and lazy-loader retries; Email API/export/evaluation
|
||||
coverage; Notes autosave, XSS, selection/listener and agent-context regressions;
|
||||
MIME, nonce and runtime paths. Tests use pytest, Node's built-in runner and existing
|
||||
Playwright Chromium. `tests/TESTING_STANDARD.md` requires behavior-first, isolated
|
||||
tests. F1 adds real publication failures, architecture violations and an offline
|
||||
browser proof. It does not replace existing source-sensitive tests.
|
||||
|
||||
## Open PR overlap, checked live on 2026-10-13
|
||||
|
||||
The open-PR listing was fetched through all pages; selected PR file lists were
|
||||
inspected. Refresh this inventory before any later slice.
|
||||
|
||||
| PR | Overlap and disposition |
|
||||
| --- | --- |
|
||||
| [#6470](https://github.com/odysseus-dev/odysseus/pull/6470) | Theme/sidebar redesign touches HTML, SW, shared UI and CSS. F1 changes none of those assets. Future manifest/UI slices need collision review. |
|
||||
| [#6695](https://github.com/odysseus-dev/odysseus/pull/6695) | OXS touches bootstrap, HTML, platform, middleware and other backend boundaries. F1 does not establish an extension API or modify that platform. |
|
||||
| [#6227](https://github.com/odysseus-dev/odysseus/pull/6227) | Root SW scope/header fix. Independent follow-up dependency for broader offline certification. |
|
||||
| [#6394](https://github.com/odysseus-dev/odysseus/pull/6394) | Older CSS extraction touches legacy style/SW assets; requires separate supersession review. |
|
||||
| [#6627](https://github.com/odysseus-dev/odysseus/pull/6627) | npm development-dependency update overlaps package/lock files; reconcile the exact Acorn development entry on integration. |
|
||||
| [#6585](https://github.com/odysseus-dev/odysseus/pull/6585), [#6647](https://github.com/odysseus-dev/odysseus/pull/6647), [#6652](https://github.com/odysseus-dev/odysseus/pull/6652) | Notes optional-field persistence and agent routing/dispatch. Future characterization must reflect their merged state; F1 changes no Notes or backend behavior. |
|
||||
| [#6594](https://github.com/odysseus-dev/odysseus/pull/6594), [#6152](https://github.com/odysseus-dev/odysseus/pull/6152) | Desktop launcher/build and frozen-runtime packaging work. Existing paths stay stable; packaging still needs platform-owner validation. |
|
||||
|
||||
PR titles alone do not establish compatibility. This report records the checked
|
||||
file overlap and relevant dependencies, not approval of those implementations.
|
||||
@@ -0,0 +1,112 @@
|
||||
53dfddd71f02a9a60df42e3fb045bd1a80919d50870c0b77afe18a853f485bea .gitattributes
|
||||
867c6a4b025fefecb6ac4a91a38563a36107d9653599f64685e16a5be4fe7727 frontend/modules.json
|
||||
76de35ac93d72edb5dcd295e85c704af9b3f08c2fe9fdc56e0bcbebd4b322fd8 frontend/src/features/notes/application/agentActions.js
|
||||
37021f9643f6a3299d36b6021783a559e60ad84848ac2b12f0980b5034b6b9c4 frontend/src/features/notes/application/cardOperations.js
|
||||
fe3033db6ef316c6b15c6b01c0f202ee76a61ea2c5b6952b20144660ff17eb54 frontend/src/features/notes/application/checklistOperations.js
|
||||
85fc592724524bb5ff37d7e5e58a68fda9d7e645810b6c87a2d4dd3cb41f9dd5 frontend/src/features/notes/application/deletion.js
|
||||
ce38e7976ee315b198baebffe45f9a1f4e63d87affd9898ed5cf4bde37b903e7 frontend/src/features/notes/application/drafts.js
|
||||
6210915184c30f73911f144fe0d12a9935d6f2ce42cb2aaf6aeaa75614ca51a2 frontend/src/features/notes/application/queries.js
|
||||
0da923790f4036d5fe354df4e529feb4b96e178495cb951f269093c0a8347e4e frontend/src/features/notes/application/reminders.js
|
||||
8f95d086fc2e60beae32b9e9debba41b35448e1c5b4ac78e4989652ef2d44e35 frontend/src/features/notes/application/selection.js
|
||||
4ceb424b3b6e30a5f507804f42051be02390d4ce1f03ef284094e48825cde5c3 frontend/src/features/notes/application/state.js
|
||||
1c5d5af833aab91f71a34c11535885eb7bf9f751de5aa89f79defe0f696f20fb frontend/src/features/notes/application/submission.js
|
||||
1d58ea2d495c8d301c550eb9ba7f627c515a8784bcd105558d941522965e77b0 frontend/src/features/notes/application/workflows.js
|
||||
9ddbfb20e0a5564dd83365ad498286d68ef03fd60d632619ad4d9656e2f73c95 frontend/src/features/notes/domain/noteRules.js
|
||||
946ef7a98b0a2dbe329e8259250af11a11702c74fd997e17fb3aff007fbe40c9 frontend/src/features/notes/domain/recurrence.js
|
||||
25cf3a1cef5dbac0840aef513ffa010a9b08d206de96ce2527e6159a5454b555 frontend/src/features/notes/index.js
|
||||
8b186bbfbb003b8d738c80713e1cbb5c6924ee14119929c5ea65707b46076b0c frontend/src/features/notes/infrastructure/http.js
|
||||
c7552d1f4600ae721437892fc0a1e5a0332abe30082bd943cd13a379c9514fec frontend/src/features/notes/infrastructure/notifications.js
|
||||
ff91a55c55fbdd876c69d9ec10e4e992104c95b6d12d752d9745193fccbc646a frontend/src/features/notes/infrastructure/storage.js
|
||||
4ff6d69d04547a0325041f774c3bf0707d8b67982d59a221127e07dc9b01383c frontend/src/features/notes/ui/cardChecklist.js
|
||||
dd87f1929ef8a5d57fdf1ddb12a0a6be53d95be07946be54f946c6fe31ef80bc frontend/src/features/notes/ui/cardInteractions.js
|
||||
4ff661a65d88e810f346260a354070dba325d6beaa57d1c4e82e8bf09b894538 frontend/src/features/notes/ui/cardRendering.js
|
||||
113d4457f25291d15afb7fb6775ea063f24c9dac51bb0d262787c9e40705235b frontend/src/features/notes/ui/cardReorder.js
|
||||
eecafbd92076209fa41826820125fbe9ffa757d6d1bff018e9acc2ede2a18e72 frontend/src/features/notes/ui/checklist.js
|
||||
155ea3d70e653f38a62ff50fc5be6aee019d42e86d28753da9edb258ac7c93e1 frontend/src/features/notes/ui/checklistReorder.js
|
||||
5462fea63a2aa9d1fc07dca91b462f6ff24f352b05d99ea6feb437469c0e1f3e frontend/src/features/notes/ui/clipboard.js
|
||||
2619e5f8b15eb3057330ef220abe6bc354a496effc0df3d89385cdfef9242c86 frontend/src/features/notes/ui/colors.js
|
||||
11cf24e7e8e8954d764cb58d786fa6f6d71f84f1c6c5ba644d761e28cfdbaedf frontend/src/features/notes/ui/draftEditor.js
|
||||
f55d4eff7f550e183ecf240a45002936063dbb4eae153e11834da4cb6bd13d35 frontend/src/features/notes/ui/drawing.js
|
||||
f85c86e70b3a380449fe3c7ecc7a4e68946de320523f5edc8e33f8eab3f0a02a frontend/src/features/notes/ui/editor.js
|
||||
3946b8324ad8f0212621e526479668308e48b799bf0dbb608e5cd4626f6c1f03 frontend/src/features/notes/ui/filters.js
|
||||
a893d09e96fb98d13db8ae5c3fb8c5e7a040c62031dd961396a18b7ae2a82a38 frontend/src/features/notes/ui/layout.js
|
||||
8d8c62a87d4df134d3b9dd97eaf59d02c52f1a38f6bc2e109e8426081d453a8d frontend/src/features/notes/ui/lifecycle.js
|
||||
62ad9408cb139143168f2c5834ec56b83264c4daed3e84fa9b4b0a281712144c frontend/src/features/notes/ui/mobileEditor.js
|
||||
2a3ccbad103dcc880e4baf2b3aa3ece4df7b73752bd30078185f03227585148f frontend/src/features/notes/ui/mobileReorder.js
|
||||
856fe945cf697278f795b8753704119839fa12bc5e0e69e9dab57c4b4dd6d24e frontend/src/features/notes/ui/panel.js
|
||||
8aa081cb7341d9a67ef46c74da49aebd729e9b53a73d618b81c89566c874b507 frontend/src/features/notes/ui/quickAdd.js
|
||||
8a4f23a013f06876894e6544b49540b288007d0d7e4cddca955978588f47a64a frontend/src/features/notes/ui/reminderDisplay.js
|
||||
cb043be801ab40cf8141af6ff1ad788e69fef57a87960ca992071ad9ad29ad90 frontend/src/features/notes/ui/reminderPicker.js
|
||||
38f12ba7771589aa427f054f48919569dcee9abe0246e02b9767202adb854cdc frontend/src/features/notes/ui/selection.js
|
||||
2634f252b2899e2e70fc9fec37144b0cc9b0ed00724da81bfef74b1acf7c05b6 frontend/src/features/notes/ui/text.js
|
||||
d2655ef163825ce6c40d8ef46bc9dfc63a2aa19fb1a7e10b28002f79cb0db409 frontend/src/features/notes/ui/toolbar.js
|
||||
a0aa203e87814d0eebebb6b049776c3efd576f4a5c6e17e486c8a2893c9c21df frontend/src/features/notes/ui/windowLayout.js
|
||||
68f0cbe07c7b61fcaf92920cd47042c576ab27fd9553c971cff45c595c25d80a frontend/src/shared/ui/confetti.js
|
||||
c16fcde607dce2f10a1afd1f8845403a7d0b97a9d5a67ec7aa329c367ba585e8 scripts/verify_frontend_runtime.py
|
||||
c2e5de2b8ce168220bad4fcefed710e60eeb0dd3e992e76cd980f2c0ca52815a scripts/verify_notes_browser_runtime.py
|
||||
fa31d673c40f973490e9fac52130b4a915b944a7abdd217a9bd8d57e66d57ca6 static/js/compare/vote.js
|
||||
76de35ac93d72edb5dcd295e85c704af9b3f08c2fe9fdc56e0bcbebd4b322fd8 static/js/features/notes/application/agentActions.js
|
||||
37021f9643f6a3299d36b6021783a559e60ad84848ac2b12f0980b5034b6b9c4 static/js/features/notes/application/cardOperations.js
|
||||
fe3033db6ef316c6b15c6b01c0f202ee76a61ea2c5b6952b20144660ff17eb54 static/js/features/notes/application/checklistOperations.js
|
||||
85fc592724524bb5ff37d7e5e58a68fda9d7e645810b6c87a2d4dd3cb41f9dd5 static/js/features/notes/application/deletion.js
|
||||
ce38e7976ee315b198baebffe45f9a1f4e63d87affd9898ed5cf4bde37b903e7 static/js/features/notes/application/drafts.js
|
||||
6210915184c30f73911f144fe0d12a9935d6f2ce42cb2aaf6aeaa75614ca51a2 static/js/features/notes/application/queries.js
|
||||
0da923790f4036d5fe354df4e529feb4b96e178495cb951f269093c0a8347e4e static/js/features/notes/application/reminders.js
|
||||
8f95d086fc2e60beae32b9e9debba41b35448e1c5b4ac78e4989652ef2d44e35 static/js/features/notes/application/selection.js
|
||||
4ceb424b3b6e30a5f507804f42051be02390d4ce1f03ef284094e48825cde5c3 static/js/features/notes/application/state.js
|
||||
1c5d5af833aab91f71a34c11535885eb7bf9f751de5aa89f79defe0f696f20fb static/js/features/notes/application/submission.js
|
||||
1d58ea2d495c8d301c550eb9ba7f627c515a8784bcd105558d941522965e77b0 static/js/features/notes/application/workflows.js
|
||||
9ddbfb20e0a5564dd83365ad498286d68ef03fd60d632619ad4d9656e2f73c95 static/js/features/notes/domain/noteRules.js
|
||||
946ef7a98b0a2dbe329e8259250af11a11702c74fd997e17fb3aff007fbe40c9 static/js/features/notes/domain/recurrence.js
|
||||
25cf3a1cef5dbac0840aef513ffa010a9b08d206de96ce2527e6159a5454b555 static/js/features/notes/index.js
|
||||
8b186bbfbb003b8d738c80713e1cbb5c6924ee14119929c5ea65707b46076b0c static/js/features/notes/infrastructure/http.js
|
||||
c7552d1f4600ae721437892fc0a1e5a0332abe30082bd943cd13a379c9514fec static/js/features/notes/infrastructure/notifications.js
|
||||
ff91a55c55fbdd876c69d9ec10e4e992104c95b6d12d752d9745193fccbc646a static/js/features/notes/infrastructure/storage.js
|
||||
4ff6d69d04547a0325041f774c3bf0707d8b67982d59a221127e07dc9b01383c static/js/features/notes/ui/cardChecklist.js
|
||||
dd87f1929ef8a5d57fdf1ddb12a0a6be53d95be07946be54f946c6fe31ef80bc static/js/features/notes/ui/cardInteractions.js
|
||||
4ff661a65d88e810f346260a354070dba325d6beaa57d1c4e82e8bf09b894538 static/js/features/notes/ui/cardRendering.js
|
||||
113d4457f25291d15afb7fb6775ea063f24c9dac51bb0d262787c9e40705235b static/js/features/notes/ui/cardReorder.js
|
||||
eecafbd92076209fa41826820125fbe9ffa757d6d1bff018e9acc2ede2a18e72 static/js/features/notes/ui/checklist.js
|
||||
155ea3d70e653f38a62ff50fc5be6aee019d42e86d28753da9edb258ac7c93e1 static/js/features/notes/ui/checklistReorder.js
|
||||
5462fea63a2aa9d1fc07dca91b462f6ff24f352b05d99ea6feb437469c0e1f3e static/js/features/notes/ui/clipboard.js
|
||||
2619e5f8b15eb3057330ef220abe6bc354a496effc0df3d89385cdfef9242c86 static/js/features/notes/ui/colors.js
|
||||
11cf24e7e8e8954d764cb58d786fa6f6d71f84f1c6c5ba644d761e28cfdbaedf static/js/features/notes/ui/draftEditor.js
|
||||
f55d4eff7f550e183ecf240a45002936063dbb4eae153e11834da4cb6bd13d35 static/js/features/notes/ui/drawing.js
|
||||
f85c86e70b3a380449fe3c7ecc7a4e68946de320523f5edc8e33f8eab3f0a02a static/js/features/notes/ui/editor.js
|
||||
3946b8324ad8f0212621e526479668308e48b799bf0dbb608e5cd4626f6c1f03 static/js/features/notes/ui/filters.js
|
||||
a893d09e96fb98d13db8ae5c3fb8c5e7a040c62031dd961396a18b7ae2a82a38 static/js/features/notes/ui/layout.js
|
||||
8d8c62a87d4df134d3b9dd97eaf59d02c52f1a38f6bc2e109e8426081d453a8d static/js/features/notes/ui/lifecycle.js
|
||||
62ad9408cb139143168f2c5834ec56b83264c4daed3e84fa9b4b0a281712144c static/js/features/notes/ui/mobileEditor.js
|
||||
2a3ccbad103dcc880e4baf2b3aa3ece4df7b73752bd30078185f03227585148f static/js/features/notes/ui/mobileReorder.js
|
||||
856fe945cf697278f795b8753704119839fa12bc5e0e69e9dab57c4b4dd6d24e static/js/features/notes/ui/panel.js
|
||||
8aa081cb7341d9a67ef46c74da49aebd729e9b53a73d618b81c89566c874b507 static/js/features/notes/ui/quickAdd.js
|
||||
8a4f23a013f06876894e6544b49540b288007d0d7e4cddca955978588f47a64a static/js/features/notes/ui/reminderDisplay.js
|
||||
cb043be801ab40cf8141af6ff1ad788e69fef57a87960ca992071ad9ad29ad90 static/js/features/notes/ui/reminderPicker.js
|
||||
38f12ba7771589aa427f054f48919569dcee9abe0246e02b9767202adb854cdc static/js/features/notes/ui/selection.js
|
||||
2634f252b2899e2e70fc9fec37144b0cc9b0ed00724da81bfef74b1acf7c05b6 static/js/features/notes/ui/text.js
|
||||
d2655ef163825ce6c40d8ef46bc9dfc63a2aa19fb1a7e10b28002f79cb0db409 static/js/features/notes/ui/toolbar.js
|
||||
a0aa203e87814d0eebebb6b049776c3efd576f4a5c6e17e486c8a2893c9c21df static/js/features/notes/ui/windowLayout.js
|
||||
7f1a7961d586767298672fad71a0d627389e185f0fb28792a04d0b987e1d5c5c static/js/notes.js
|
||||
68f0cbe07c7b61fcaf92920cd47042c576ab27fd9553c971cff45c595c25d80a static/js/shared/ui/confetti.js
|
||||
97fd43c17f3cb1928947e24159a3b59dc81ef7dca95862e8a47154e9cb732f88 static/sw.js
|
||||
910cd5777564e9f6338b8a864a772beffea197dc476464171c180e7be96e572d tests/browser/notesNative.mjs
|
||||
ef4bc40a710919c81c582d3b9fe80376d0d5ae66fb9be3c293871a83ee360f97 tests/browser/notesOffline.mjs
|
||||
437ec2e9865b3e066bbec8d7595a0d947f1e503b96e7b4d819ec1bed86c9bb1e tests/browser/notesReference.mjs
|
||||
9af973a5d2fb08a5eed550be0198bef501af56802c3844b5d0bb8e718cc685cf tests/fixtures/notesRecurrenceBaseline.mjs
|
||||
859a5f442dc717f59993891c338cd6ae9d6e5e009392a2ee69ab0e3b063bb572 tests/helpers/notes_source.py
|
||||
739ffc3f20de8e2bdf1d513b17bf485f85821e9906109cdf8ffea04b81b0f1dd tests/notesApplication.test.mjs
|
||||
1946369be43177b19a44cd9ae4f90d64da6558d1a470f8e347b490a2188782be tests/notesCharacterization.test.mjs
|
||||
99f0cd92a30cf01c0ee6814f6684edeb80ebdb9a5ab96583244092865bfb6212 tests/notesDraftAutosave.test.mjs
|
||||
0417205809de16c7c7338ea80ba19ca844603b3e06655987226f5f83d962d18b tests/notesInfrastructure.test.mjs
|
||||
dcf7c2d33de9bb457f96af070354ecc3ab69669002bdc9c7c943bef1b3d2e9bc tests/notesRecurrence.test.mjs
|
||||
dd9a703465dde8f92625a3226ab52d20a02aa5d3415fbcc70609f69a372ccc12 tests/notesReminders.test.mjs
|
||||
5a9112569f226525faaf6603a9867620b47902534f9cd882c08f71f2f96614b2 tests/notesWorkflows.test.mjs
|
||||
35fb2bd1f02757b73188342ec00f1e97253b8ba8dfb577861675872a517bd949 tests/selectedNotesContext.test.mjs
|
||||
c6c64c2b695b84d00f8a80a980be00766175c482548c86484f991ef671ecfbe9 tests/test_notes_document_mutual_minimize.py
|
||||
02c2aeb856798d982e5debcb9c605172933b0216a039cf0d96cdd415b1e2ef83 tests/test_notes_dom_xss_helpers.py
|
||||
5a511c7a2ef5d28463df34f3462db9ce59575d624cf8181577bab2cc371b4f9f tests/test_notes_mobile_checklist_toggle_static.py
|
||||
1db10a0d344818459d64279da807ddefe9b866dfe560ac4b154b486dd1a5efc0 tests/test_notes_reference_browser.py
|
||||
49f466b1a717098aa25439b6ff9ef3ae3d027d9dd976212b165b0b99a582b952 tests/test_notes_reference_contracts_js.py
|
||||
c2d877a11eafcb99b24a1c89111e5df4453a62bc8cf7d26ae1118b25c4a5ace4 tests/test_notes_search_reset_on_reopen_js.py
|
||||
6d95f073421427b5e149ef1e85c8b5749095d00337f05960134552985f73e372 tests/test_notes_select_esc_listener_js.py
|
||||
b3118a4b40fcfcbb26ad9ccbcb332fc6ced873d8cad1160be38a286ad1e664a4 tests/test_notes_sidebar_new_note.py
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
@@ -0,0 +1,231 @@
|
||||
# Odysseus frontend architecture handbook
|
||||
|
||||
Status: F1 merged in PR #6701. The complete Notes reference is implemented as an
|
||||
unpublished review diff on `refactor/notes-reference-decomposition`. Read its
|
||||
[case study](notes-case-study.md), [module inventory](notes-module-inventory.md)
|
||||
and [validation receipts](notes-validation.md). Publication and the recipient's
|
||||
post-integration reproduction remain pending.
|
||||
|
||||
Read the [ADR](ADR-001-source-and-deployment.md), [assessment](assessment.md),
|
||||
[validation report](validation.md) and [Notes roadmap](notes-roadmap.md).
|
||||
The frontend program ends with the Notes reference decomposition and handoff.
|
||||
Calendar, Documents, Email, Chat, Skills, Settings and other later decompositions
|
||||
belong to the designated frontend maintainer; do not start them automatically.
|
||||
|
||||
## Source, ownership and public APIs
|
||||
|
||||
`frontend/src/app/` composes public feature APIs and platform ports. Each
|
||||
`features/<feature>/index.js` is an intentional API, with explicit named exports
|
||||
and a compatibility default only when existing consumers require one. Internals
|
||||
live under `domain/`, `application/`, `infrastructure/` or `ui/` as needed. Do not
|
||||
create empty directories, boilerplate controllers or a framework by convention.
|
||||
Feature names `app` and `shared` are reserved.
|
||||
|
||||
Keep pure business rules in domain; transitions and workflows in application;
|
||||
HTTP/storage/browser services in infrastructure; DOM rendering and lifecycle in
|
||||
UI. The index composes adapters, state and views. Application receives adapters
|
||||
as explicit arguments or constructor ports, rather than importing concrete
|
||||
infrastructure. Views call application operations; infrastructure does not own
|
||||
business decisions. A public API returns data/operations, not mutable stores or
|
||||
private DOM nodes. Importing an API should define capabilities; explicit lifecycle
|
||||
methods activate them. Legacy side effects remain characterized until a reviewed
|
||||
slice safely changes their placement.
|
||||
|
||||
Shared code has a named, proven cross-feature responsibility. `shared/domain/`
|
||||
holds pure primitives, `shared/platform/` holds narrowly scoped platform adapters,
|
||||
and `shared/ui/` holds common DOM capabilities. A named stateless root leaf such
|
||||
as `shared/actionMenuOrder.js` is also allowed and receives domain restrictions.
|
||||
Do not create a central `utils.js` collection or move feature business rules into
|
||||
shared simply to satisfy an import rule.
|
||||
|
||||
## Mechanically checked dependency contract
|
||||
|
||||
| Importer | Permitted maintained-source targets |
|
||||
| --- | --- |
|
||||
| App composition | Other app code, shared code, feature `index.js` APIs |
|
||||
| Feature index | Its own responsibility modules and shared code; other feature public indexes |
|
||||
| Feature domain | Its own domain and shared domain/stateless leaves |
|
||||
| Feature application | Its own application/domain, shared domain, other feature public indexes |
|
||||
| Feature infrastructure | Its own infrastructure/domain, shared domain/platform |
|
||||
| Feature UI | Its own UI/application/domain, shared domain/platform/UI |
|
||||
| Shared domain leaf | Shared domain leaves only |
|
||||
| Shared platform | Shared platform/domain only |
|
||||
| Shared UI | Shared UI/platform/domain only |
|
||||
|
||||
No feature imports app composition. No shared code imports a feature. No external
|
||||
feature imports private responsibility modules. UI and infrastructure communicate
|
||||
with another feature through a supplied application operation/port. Maintained
|
||||
source dependency cycles, including literal lazy imports, fail the architecture
|
||||
gate. If features need bidirectional coordination, app composition injects a
|
||||
callback or adapter instead of creating mutual imports. Prefer this even when a
|
||||
one-way public index import would pass the gate.
|
||||
|
||||
Cross-feature events must document event name, payload, acknowledgement, owner,
|
||||
subscription disposal and delivery timing. Keep them local and specific; F1 adds
|
||||
no global event bus. Preserve `odysseus:notes-context-selected` and its synchronous
|
||||
`accepted` acknowledgement in future Notes work. The server remains authoritative
|
||||
for owner filtering and untrusted selected IDs. Frontend APIs cannot grant access.
|
||||
|
||||
The checker parses executable ESM, forbids computed imports in new source,
|
||||
requires exact precache entries, rejects unresolved/remapped relative imports,
|
||||
and permits only canonical static JS URLs with one unversioned identity for
|
||||
maintained modules. Domain code cannot mention known browser/HTTP/timer globals
|
||||
or an ambient clock; use `now`/clock inputs. This is a conservative vocabulary
|
||||
check, including shadowed names, not a semantic purity proof. Randomness, hidden
|
||||
side effects, authorization and lifecycle behavior require behavioral tests.
|
||||
|
||||
Legacy imports from new source default to forbidden. If an incremental bridge is
|
||||
necessary, declare `legacyImports` on that source's manifest entry as a list of
|
||||
`{ "specifier": "/static/js/example.js?v=existing", "reason": "contract, owner and removal slice" }`.
|
||||
Only feature composition, infrastructure or UI boundaries may use it. Exact
|
||||
specifier/reason and target existence are required; unused exceptions fail.
|
||||
Keep the existing query identity. New domain/application modules receive no
|
||||
legacy exception. F1 has zero exceptions. Do not use exceptions to invent new
|
||||
shared platform dependencies on feature internals.
|
||||
|
||||
## State and lifecycle
|
||||
|
||||
Each feature has one authoritative mutable application-state owner. A transition
|
||||
operation owns writes; UI receives a view/snapshot or subscription. Preserve
|
||||
existing objects and initialization timing when extracting a stateful module.
|
||||
Do not instantiate a new store in both the legacy facade and the feature API.
|
||||
Compatibility facades only forward the same live implementation.
|
||||
|
||||
The Notes reference uses internal read-only live views to preserve captured note
|
||||
identity across existing asynchronous completions. Its state owner supplies all
|
||||
mutations; the public index exposes operations without the store. Notes deliberately
|
||||
retains last-completion fetch ordering. Do not infer request-generation guards from
|
||||
its decomposition. Its page-owned reminders survive panel closure, and panel/editor
|
||||
listeners and observers have separate disposal scopes.
|
||||
|
||||
Document lifecycle scopes: page, authenticated user, session, mounted panel and
|
||||
editor/draft. Name owners of subscriptions, DOM listeners, timers, observers,
|
||||
pending requests and caches. Mounting must be idempotent; disposal releases the
|
||||
resources it owns. Background reminders may outlive an open panel. Closing the
|
||||
panel must not silently stop those reminders during extraction.
|
||||
|
||||
Keep request-generation and selected-session checks around asynchronous
|
||||
completions. Serialize writes where the current contract requires it. Dispose
|
||||
subscriptions explicitly and prevent late updates to a replaced view. Feature
|
||||
state changes on user/session switch must follow current cleanup policy. Browser
|
||||
storage is for preferences/drafts/cache state, never a substitute for backend
|
||||
authorization, credential storage or owner filtering. Define every storage key's
|
||||
owner, retention/reset behavior and compatibility format before moving it.
|
||||
|
||||
## Creating a module or introducing a feature
|
||||
|
||||
1. Identify responsibility, owner, public consumers, side effects and behavioral
|
||||
evidence before editing. Start with a pure leaf when introducing a feature.
|
||||
2. Place only the required source file(s), for example
|
||||
`features/example/domain/calculate.js`. Add an index only when there is a
|
||||
real supported feature API to compose.
|
||||
3. Register each source in `frontend/modules.json`. A typical new mapping is
|
||||
`features/example/domain/calculate.js` to
|
||||
`js/features/example/domain/calculate.js`. Preserve the source/deployment
|
||||
relative graph. The proof's legacy URL mapping is an explicit special case.
|
||||
4. For an extracted leaf, the legacy feature coordinator may import its output
|
||||
as a temporary composition bridge. New maintained features use public indexes;
|
||||
the legacy tree is not globally forced into the new boundary rules in F1.
|
||||
5. Add the exact output URL to the appropriate explicit SW array, retain lazy
|
||||
evaluation timing and bump the cache name when the graph changes. Declare
|
||||
`text eol=lf` for both mapped paths in repository-owned `.gitattributes`
|
||||
files; source-tree or scoped output patterns are allowed. The publisher checks
|
||||
effective Git rules, including nested overrides, and rejects a missing LF rule
|
||||
even if output bytes already match. Do not broaden unrelated legacy checkout
|
||||
rules or automatically rewrite all existing query identities.
|
||||
6. Run the publisher, inspect the source/output diff, then run architecture,
|
||||
identity, graph, offline and focused behavior checks. Include both sides of
|
||||
the mapping in review. Retiring output requires a separate reviewed deletion;
|
||||
the publisher does not clean the static tree.
|
||||
|
||||
```sh
|
||||
python scripts/build_frontend.py
|
||||
python scripts/build_frontend.py --check
|
||||
npm ci --ignore-scripts --no-audit --no-fund
|
||||
node scripts/check_frontend.mjs
|
||||
node scripts/check_frontend.mjs --inventory
|
||||
node --test tests/frontendArchitecture.test.mjs
|
||||
./venv/bin/python -m pytest -q -rs tests/test_frontend_build.py tests/test_frontend_foundation_offline_js.py tests/test_frontend_module_graph.py tests/test_frontend_module_version_parity.py tests/test_panel_loader_js.py
|
||||
./venv/bin/python scripts/verify_frontend_runtime.py
|
||||
```
|
||||
|
||||
Use your actual repository virtualenv path; the F1 environment is recorded in
|
||||
validation. Node 20+ follows current CI. Existing Playwright/browser prerequisites
|
||||
are documented in `tests/README.md` and `tests/KNOWN_FAILURES.md`. Missing Node can
|
||||
skip Python browser wrappers, which is a coverage gap, not a pass. The standalone
|
||||
Node gates require locked development dependencies and fail when missing.
|
||||
|
||||
The publisher validates all inputs before writing and only overwrites owned
|
||||
outputs whose bytes differ. It is idempotent and working-directory independent.
|
||||
Git must be available for publication and `--check`; neither runs at application
|
||||
startup. Attribute evaluation uses a private temporary Git repository and ignores
|
||||
global/local overrides, so checkout consistency is reproducible in CI. It adds
|
||||
no runtime configuration or backend imports. CI checks LF attributes, parity and source
|
||||
syntax in existing jobs; the Node job also runs architecture self-tests. Existing
|
||||
runtime identity tests remain authoritative across legacy imports, HTML and SW.
|
||||
The isolated runtime probe is included in the new pytest publication tests.
|
||||
|
||||
## Review, release and rollback
|
||||
|
||||
Review the source/output mapping and exact exported API, then the owner/dependency
|
||||
contract and behavior tests. Check manifests, URL identities, MIME/CSP, load timing,
|
||||
storage compatibility and disposal. Reject unexplained feature behavior changes.
|
||||
Do not repair unrelated defects under an extraction title.
|
||||
|
||||
Release from a validated revision with committed output. Native startup and
|
||||
packagers consume static files without a compiler. Run parity before producing a
|
||||
Docker or desktop artifact. Test the actual packaged application on its platform;
|
||||
Linux contract probes cannot certify macOS/Windows executables. Deploy matching
|
||||
shell, facades, graph and manifests as a unit. Keep an authorized path to the last
|
||||
complete artifact. Rollback restores the whole matching set, not just an entry
|
||||
file or cache version. Do not delete a facade until its public consumers have
|
||||
migrated and compatibility tests make that decision reviewable.
|
||||
|
||||
## Proposal and PR templates
|
||||
|
||||
For a decomposition proposal, record: baseline; responsibility map; current public
|
||||
API and consumers; state owner; I/O and lifecycle boundaries; planned slice;
|
||||
allowed dependencies/temporary exceptions; preserved behavior; deterministic
|
||||
characterization tests; deployment/offline changes; overlapping PRs; rollback;
|
||||
explicit non-goals and remaining uncertainties.
|
||||
|
||||
For each migration PR, lead with the responsibility moved and resulting boundary.
|
||||
Record source/output paths, API compatibility, state/lifecycle ownership,
|
||||
characterization results, exact validation commands, platform gaps, exception
|
||||
removal plan, upstream dependencies and rollback. Attach a concrete before/after
|
||||
example when needed to establish behavioral equivalence. Preserve the repository
|
||||
PR template and never claim unexecuted checks.
|
||||
|
||||
F1 is an entirely separate foundation-only PR. Deliver the complete Notes
|
||||
decomposition, regression tests, compatibility validation and final reference
|
||||
case study through one draft PR targeting official `dev`, using one Notes branch
|
||||
and worktree after F1 integration. N0 through N6 and the N5 substages are internal
|
||||
engineering checkpoints, not independent PRs or merges. Each checkpoint records
|
||||
focused tests, review evidence, its validated revision or reproducible snapshot,
|
||||
and rollback to the prior matching source/output/facade/precache set. Keep the
|
||||
draft open while those checkpoints progress; mark it ready only after the entire
|
||||
decomposition passes the [roadmap's acceptance gates](notes-roadmap.md).
|
||||
|
||||
Structure the Notes PR description around the final integrated design and link
|
||||
each checkpoint's evidence. The receiving maintainer may use smaller independent
|
||||
PRs for future frontend features at their discretion; the one-PR Notes decision
|
||||
does not impose that delivery size on later work.
|
||||
|
||||
## Program backlog and final handoff
|
||||
|
||||
Priority order: review/integrate F1; resolve root offline certification with the
|
||||
owner of PR #6227; complete the Notes checkpoints and final reference case study
|
||||
within one draft PR following the [roadmap](notes-roadmap.md); integrate the
|
||||
complete Notes PR after its acceptance gates; finalize the recipient handoff.
|
||||
Only then does the receiving maintainer prioritize Calendar, Documents, Email,
|
||||
Chat, Skills and Settings against current behavior and risk. Existing partial
|
||||
packages and high fan-in helpers need assessment, not automatic replacement.
|
||||
|
||||
Final H acceptance requires a designated maintainer, the integrated Notes PR
|
||||
revision and its internal checkpoint receipts, the actual public API/state/lifecycle
|
||||
map and final reference case study included in that PR, validated deployment/offline
|
||||
commands, known exceptions/debt,
|
||||
outstanding PR dependencies, rollback evidence and a reproducible independent
|
||||
setup by the recipient. F1 provides the handbook structure and contracts; it does
|
||||
not claim Notes or the completed handoff have occurred. The initiating architect
|
||||
then returns to separately authorized non-frontend architecture work.
|
||||
@@ -0,0 +1,260 @@
|
||||
# Notes reference decomposition
|
||||
|
||||
Implementation started: 2026-10-13. Final validation: 2026-10-14.
|
||||
Foundation: [PR #6701](https://github.com/odysseus-dev/odysseus/pull/6701),
|
||||
`1cc56cb9d78f3e2399d1d61155b71d771a17b85b`. Branch was safely updated via
|
||||
non-destructive fast-forward to latest official `upstream/dev` at
|
||||
`86b886c611338282af6d4a717246ea4e256f58df`, incorporating PRs #6704 and #6693.
|
||||
Neither changed a file in the Notes diff. The independent AGY audit returned
|
||||
CONDITIONAL PASS; all pre-publication corrective actions (issue template conformance,
|
||||
PR template conformance, visual evidence paths, and em-dash removal) have been completed.
|
||||
|
||||
The entire implementation belongs to one Notes PR. N0 through N6 are internal
|
||||
checkpoints, not separate branches, commits or PRs. The [validation receipts](notes-validation.md),
|
||||
[module inventory](notes-module-inventory.md) and [changed-file inventory](notes-changed-files.md)
|
||||
accompany this case study.
|
||||
|
||||
## Responsibility map and size
|
||||
|
||||
The original `static/js/notes.js` contained 5,471 lines. It mixed mutable Notes
|
||||
data, view preferences, selection, undo, CRUD, date calculations, reminders,
|
||||
browser persistence, editor autosave, rendering, canvas tools and window management.
|
||||
Its import evaluated storage preferences and scheduled reminder initialization.
|
||||
|
||||
| Original responsibility | Maintained owner |
|
||||
| --- | --- |
|
||||
| Completion, tags, recurrence, date labels and serialization | `domain/recurrence.js`, `domain/noteRules.js` |
|
||||
| Notes data and selection/filter/editing state | `application/state.js`, instantiated once in `index.js` |
|
||||
| CRUD, undo and fetch completion ordering | `application/workflows.js`, `cardOperations.js`, `deletion.js` |
|
||||
| Checklist mutations and rollback | `application/checklistOperations.js` |
|
||||
| Editor optimistic submission and recovery | `application/submission.js` |
|
||||
| Serialized autosave and synchronous backup | `application/drafts.js`; form collection in `ui/draftEditor.js` |
|
||||
| Filtering, searching and ordering | `application/queries.js`; controls in `ui/filters.js` and `toolbar.js` |
|
||||
| Selected-note attachment and bulk requests | `application/selection.js`; controls in `ui/selection.js` |
|
||||
| Existing agent-solve workflow | `application/agentActions.js`, through supplied HTTP/session ports |
|
||||
| HTTP, persistence and browser notifications | `infrastructure/http.js`, `storage.js`, `notifications.js` |
|
||||
| Background scheduler and delivery decisions | `application/reminders.js` |
|
||||
| Panel mounting, closing, keyboard handling and navigation | `ui/panel.js` |
|
||||
| Docking, fullscreen bounds and stacking | `ui/windowLayout.js`, using existing shared capabilities |
|
||||
| Cards, card gestures, quick add and masonry | `ui/cardRendering.js`, `cardInteractions.js`, `cardChecklist.js`, `cardReorder.js`, `quickAdd.js`, `layout.js` |
|
||||
| Editor types, colors, reminders and checklists | `ui/editor.js`, `colors.js`, `reminderPicker.js`, `checklist.js` |
|
||||
| Drawing, local drawing undo and PNG upload | `ui/drawing.js` |
|
||||
| Mobile reader/editor and reorder gestures | `ui/mobileEditor.js`, `mobileReorder.js`, `checklistReorder.js` |
|
||||
| Clipboard, safe rendering and reminder display | `ui/clipboard.js`, `text.js`, `reminderDisplay.js` |
|
||||
| Owned document/window listener disposal | `ui/lifecycle.js`, with panel and observer disposal callbacks |
|
||||
| Composition and supported exports | `index.js`; five-line legacy facade at `static/js/notes.js` |
|
||||
|
||||
The feature has 41 maintained modules: two domain, eleven application, three
|
||||
infrastructure, twenty-four UI and one index. Source is counted once, excluding
|
||||
byte-identical deployment copies. Domain has 356 lines, application 826,
|
||||
infrastructure 112, UI 4,628, and composition 518: 6,440 maintained feature lines.
|
||||
The module inventory records final per-file counts. The legacy entry shrank
|
||||
from 5,471 to five lines. Interfaces and explicit composition increase the total
|
||||
source size; reducing total lines was not the architectural objective.
|
||||
|
||||
One 28-line stateless confetti renderer also moved to `shared/ui/confetti.js`.
|
||||
Notes and Compare both use it. Compare retains its existing `spawnConfetti` export,
|
||||
which is the same function as the shared export. This removes Notes' import of
|
||||
Compare's private voting implementation without migrating Compare itself.
|
||||
|
||||
## Dependency graph and composition
|
||||
|
||||
```mermaid
|
||||
flowchart TD
|
||||
Legacy[Legacy Notes URL and window bridge] --> Index[Notes index: one composition]
|
||||
Index --> UI[Notes UI factories]
|
||||
Index --> App[Application workflows and state owner]
|
||||
Index --> Ports[HTTP, persistence and notification adapters]
|
||||
UI --> Rules[Pure domain rules]
|
||||
App --> Rules
|
||||
Index --> Shared[Existing shared UI capabilities and maintained confetti]
|
||||
```
|
||||
|
||||
Application modules receive adapters and feedback operations as arguments. They
|
||||
do not import browser infrastructure or DOM views. Pure domain modules receive
|
||||
the clock at the original read sites. UI consumes a read-only state view and
|
||||
application operations. Composition supplies callbacks between views and workflows;
|
||||
modules do not import the coordinator back. F1 rejects maintained-source cycles.
|
||||
|
||||
There are nine exact legacy-import exceptions, all on the Notes index. They bridge
|
||||
the existing UI, modal, color-picker, drag, tile, dock, stacking, Escape and tour-hint
|
||||
capabilities at their existing URLs. Their removal condition is migration of the
|
||||
corresponding shared responsibility to maintained source with its identity and
|
||||
lifecycle contract verified. No new feature imports another feature's private internals.
|
||||
|
||||
## State and asynchronous ownership
|
||||
|
||||
`createNotesState` is called once. It owns the Notes collection, selection IDs,
|
||||
editing ID, search, filters, archive/view flags, loading and dismissed-reminder time.
|
||||
Neither the facade nor reminders create a second collection. The public feature API
|
||||
does not expose this store.
|
||||
|
||||
Internal views are read-only live views rather than detached snapshots. This choice
|
||||
preserves captured note identity: an existing asynchronous rollback still acts on
|
||||
the same captured note. Array/object writes and selection mutations must use the
|
||||
state owner's operations. Workflow-local undo queues and serialized draft promises,
|
||||
and UI-local canvas undo/gesture state, are not competing Notes stores.
|
||||
|
||||
Fetches retain the original last-completion behavior. An earlier request that
|
||||
finishes later can overwrite a later request's result. Tests pin this behavior;
|
||||
generation guards would be a separate behavioral change. Submission also retains
|
||||
the original first-temporary-note replacement rule. Multiple simultaneous creations
|
||||
need a separately reviewed correlation fix, not a silent change during extraction.
|
||||
|
||||
Archive, unarchive, pin, item edit/remove/add, delete and undo preserve their original
|
||||
optimistic ordering and rollback. Animation callbacks remain view-owned. Drawing
|
||||
save keeps the existing button guard around its asynchronous PNG upload. Draft writes
|
||||
are serialized per editor; a completed older save cannot clear a newer local draft.
|
||||
|
||||
Reminder scans still use the originally loaded Notes collection, not a second
|
||||
all-active cache. An archived-only collection or a failure-cleared list can defer
|
||||
active reminders until an active refresh/reopen. The timer remains alive when the
|
||||
panel closes, but extraction does not redesign this inherited data-availability
|
||||
limitation. Review such a change separately from scheduler/state ownership.
|
||||
|
||||
## Public compatibility
|
||||
|
||||
The import URL remains `/static/js/notes.js?v=20260911notesselectioncancel1`.
|
||||
App, Chat stream updates, Chat note links and Documents continue using their existing
|
||||
imports. Calendar and Documents retain their window bridge calls. HTML and app
|
||||
bootstrap code are unchanged. The service worker retains the exact legacy entry.
|
||||
|
||||
The legacy namespace still exports `openPanel`, `closePanel`, `togglePanel`,
|
||||
`isPanelOpen`, `openNote`, `newNote`, `refreshDueBadge`, `dismissFiredReminderDot`,
|
||||
`openNotes`, `closeNotes`, `isNotesOpen`, and `default`.
|
||||
The default object's ten methods are unchanged; `dismissFiredReminderDot` remains
|
||||
named-only. Aliases refer to the same functions, including those on the default
|
||||
object. `openNote` and `refreshDueBadge` remain async; function arities are pinned.
|
||||
|
||||
`window.notesModule` is exactly the default controller. The canonical unversioned
|
||||
feature index and both tested legacy entry URLs share the same controller and
|
||||
operations. The default object retains its existing mutability. A different legacy
|
||||
URL has its own ESM namespace, as native ESM requires, but creates no second store
|
||||
or scheduler because it forwards to the same canonical index.
|
||||
|
||||
The canonical index additionally exports `startNotesBackground` for explicit
|
||||
activation. The compatibility facade invokes it once through an idempotent start
|
||||
operation. Existing consumers need no change. Remove the facade only after every
|
||||
consumer, global bridge, bootstrap and offline reference has migrated together.
|
||||
|
||||
## Protected selected Notes/Todos integration
|
||||
|
||||
The sender dispatches `odysseus:notes-context-selected` on `window` with
|
||||
`{ noteIds, accepted: false }`. Dispatch and acknowledgement remain synchronous.
|
||||
Chat owns acceptance, its session/pending selection, the context indicator and
|
||||
the `selected_note_ids` send payload. Notes exits selection only after acceptance.
|
||||
Rejected selections stay selected and display the existing feedback.
|
||||
|
||||
No Chat internals were imported or changed. Existing session lifecycle events still
|
||||
transfer a pending selection on materialization, restore selections on chat switches,
|
||||
and reset them for a new chat. Backend ID validation and owner filtering remain
|
||||
authoritative. Unit/backend tests cover these contracts; the real authenticated
|
||||
browser probe verifies rejection, pending-chat acceptance, the actual indicator and
|
||||
new-chat reset. Live model execution is not part of that probe.
|
||||
|
||||
## Persistence and HTTP contracts
|
||||
|
||||
| Key | Preserved format |
|
||||
| --- | --- |
|
||||
| `odysseus-notes-view` | `list` or `grid` |
|
||||
| `odysseus-notes-labels-collapsed` | `1` or `0` |
|
||||
| `odysseus-notes-first-open-hint-v1` | Existing first-open marker |
|
||||
| `odysseus-notes-reminder-fired` | JSON array of IDs |
|
||||
| `odysseus-notes-reminder-glowed` | JSON array of IDs |
|
||||
| `odysseus-notes-reminder-pending-highlight` | JSON array of IDs |
|
||||
| `odysseus-notes-reminder-active-highlight` | JSON array of IDs |
|
||||
| `odysseus-notes-reminder-dismissed-at` | Decimal millisecond timestamp |
|
||||
| `odysseus-note-draft-<id>` and `odysseus-note-draft-__new__` | Existing JSON draft fields and `_ts` |
|
||||
|
||||
CRUD, reorder, upload, reminder firing, default-chat lookup, session creation and
|
||||
chat-stream requests keep their URLs, methods, credentials, payloads and error
|
||||
interpretation. Uploads retain `files` and optional `gallery_id` multipart fields.
|
||||
The agent-solve stream still disables `manage_notes` and drains without switching
|
||||
the user's chat. No backend implementation changed.
|
||||
|
||||
Storage backup failures still warn once; failed network saves keep recoverable
|
||||
drafts, including intentionally empty text. Draft JSON does not serialize a canvas
|
||||
bitmap. A drawing remains ephemeral until its explicit PNG upload, as before.
|
||||
|
||||
## Lifecycle scopes and explicit corrections
|
||||
|
||||
| Scope | Owner and disposal |
|
||||
| --- | --- |
|
||||
| Browser page | One reminder startup timeout and interval; page termination ends them. The reminder factory also has explicit disposal. |
|
||||
| Open panel | Capture/bubble keyboard handlers, reorder listeners and masonry observer; both close paths dispose them. |
|
||||
| Editor/canvas | Local DOM handlers and draft workflow; drawing's window listener is released when its canvas detaches or the panel closes. |
|
||||
| Mobile editor/gesture | Overlay and document touch handlers; owner replacement and panel disposal remove handlers and reset registration flags. |
|
||||
| Menus/hints | Notes portals close with the panel; shared dismiss functions unregister their Escape/tour lifetimes. |
|
||||
| File picker | Existing completion or 30-second cleanup owns the temporary input. |
|
||||
|
||||
Two implementation corrections follow the user's explicit lifecycle requirements.
|
||||
The original close paths canceled the supposedly background reminder interval.
|
||||
The new page-owned interval survives closing/minimizing Notes, while retaining the
|
||||
3-second startup delay, 30-second period and immediate first check. Closing a panel
|
||||
also releases owned observers/listeners, pending hold timers, active Notes gestures
|
||||
and portals; late panel fetch callbacks do
|
||||
not recreate UI on a detached panel. Network completion/state ordering is preserved.
|
||||
|
||||
Shared drag/window utilities continue owning their own active-gesture handlers.
|
||||
They were not moved into Notes. Idle open/close and editor replacement are verified;
|
||||
every possible interleaving with an active shared window drag was not tested.
|
||||
|
||||
## Source and deployment
|
||||
|
||||
Every maintained source is registered in `frontend/modules.json` and copied without
|
||||
rewriting imports. Notes sources map to `static/js/features/notes/` at the same
|
||||
relative paths. Shared confetti maps to `static/js/shared/ui/confetti.js`.
|
||||
Repository-owned LF attributes and byte parity cover all 43 maintained modules,
|
||||
including the unchanged F1 proof. The legacy facade is an authored compatibility
|
||||
entry, not a second implementation.
|
||||
|
||||
All new outputs join exact service-worker precache arrays. A real offline test also
|
||||
found eight previously missing exact legacy URLs in the Notes graph; those entries
|
||||
are now included. The eager Notes graph has 57 exact runtime URLs. Cache naming
|
||||
follows the repository's `odysseus-v659-notes-reference` convention. Root offline
|
||||
reload remains outside certification because the existing worker scope is `/static/`.
|
||||
|
||||
Python startup and Docker serve the committed static graph without maintained
|
||||
source or frontend tooling. The publisher is a development check/copy operation,
|
||||
not a runtime compiler or an atomic deployment system.
|
||||
|
||||
## Checkpoints, rollback and lessons
|
||||
|
||||
[Checkpoint receipts](notes-validation.md#internal-checkpoints) record the actual
|
||||
checks and local snapshot hashes. These intermediate snapshots are engineering
|
||||
evidence, not standalone release artifacts. N5 includes bounded editor, cards,
|
||||
checklist, drawing, mobile, toolbar and window reviews on the same branch.
|
||||
|
||||
The N3 mechanical state rewrite initially confused canvas-local and feature undo
|
||||
bindings. The N5 drawing test found it; the canvas binding was restored and the
|
||||
same drawing/undo interaction was replayed against the original implementation.
|
||||
Use scope-aware transformations and test each stateful UI responsibility before
|
||||
accepting a broad rewrite. Source parsing alone does not prove semantic equivalence.
|
||||
|
||||
For rollback, reconstruct the prior complete artifact from its revision/snapshot
|
||||
in a fresh temporary directory, run parity/graph/behavior checks there, then publish
|
||||
the matching static graph and service worker as a unit through the authorized
|
||||
release process. Restore the whole facade/source/output/manifest set, not just
|
||||
`notes.js`. No schema or storage-key migration needs reversal. Do not reset a dirty
|
||||
worktree or delete unrelated outputs. The validation report gives a non-destructive
|
||||
snapshot reproduction recipe.
|
||||
|
||||
For the next maintainer:
|
||||
|
||||
1. Start with the module inventory and the state/workflow contracts, then reproduce
|
||||
the focused tests, offline test and isolated native browser probe.
|
||||
2. Review the explicit timer/lifecycle corrections separately from unchanged
|
||||
business rules. Inspect both maintained source and byte-identical deployment.
|
||||
3. Resolve or track the reproduced upstream CI failures and the open PR overlaps
|
||||
before authorizing publication. Create/link the dedicated issue, then publish
|
||||
exactly one Notes PR targeting official `dev`.
|
||||
4. Record the integrated revision and independent recipient reproduction to complete
|
||||
H. The designated maintainer can then apply this method to future features.
|
||||
|
||||
For Calendar, Documents, Email and later monoliths, characterize actual exports,
|
||||
URL identities, state writers, clock reads, I/O and lifecycle first. Extract pure
|
||||
rules, then adapters, then a single state owner/workflows. Use explicit callback
|
||||
ports to break coordinator cycles. Split UI by interactions and resource lifetime,
|
||||
not by arbitrary line ranges. Transfer source/output ownership and offline URLs
|
||||
with each boundary, and preserve source-sensitive assertions at their new owner.
|
||||
Those feature migrations are not part of this implementation.
|
||||
@@ -0,0 +1,165 @@
|
||||
# Notes complete changed-file inventory
|
||||
|
||||
Changed files in PR #6713 (`refactor/notes-reference-decomposition`) against
|
||||
`dev`. 121 files: 16 modified and 105 added. No files are deleted. Deployment copies
|
||||
are byte-identical to their registered maintained sources. Image files are review
|
||||
evidence, not production dependencies.
|
||||
|
||||
The unchanged foundation worktree, backend, app bootstrap, HTML, CSS, dependency
|
||||
lockfiles, Dockerfile and CI workflow are outside this diff. The only Compare
|
||||
change delegates its existing stateless confetti export to maintained shared UI.
|
||||
|
||||
## Maintained source (42)
|
||||
|
||||
| Status | File |
|
||||
| --- | --- |
|
||||
| A | [frontend/src/features/notes/application/agentActions.js](../../frontend/src/features/notes/application/agentActions.js) |
|
||||
| A | [frontend/src/features/notes/application/cardOperations.js](../../frontend/src/features/notes/application/cardOperations.js) |
|
||||
| A | [frontend/src/features/notes/application/checklistOperations.js](../../frontend/src/features/notes/application/checklistOperations.js) |
|
||||
| A | [frontend/src/features/notes/application/deletion.js](../../frontend/src/features/notes/application/deletion.js) |
|
||||
| A | [frontend/src/features/notes/application/drafts.js](../../frontend/src/features/notes/application/drafts.js) |
|
||||
| A | [frontend/src/features/notes/application/queries.js](../../frontend/src/features/notes/application/queries.js) |
|
||||
| A | [frontend/src/features/notes/application/reminders.js](../../frontend/src/features/notes/application/reminders.js) |
|
||||
| A | [frontend/src/features/notes/application/selection.js](../../frontend/src/features/notes/application/selection.js) |
|
||||
| A | [frontend/src/features/notes/application/state.js](../../frontend/src/features/notes/application/state.js) |
|
||||
| A | [frontend/src/features/notes/application/submission.js](../../frontend/src/features/notes/application/submission.js) |
|
||||
| A | [frontend/src/features/notes/application/workflows.js](../../frontend/src/features/notes/application/workflows.js) |
|
||||
| A | [frontend/src/features/notes/domain/noteRules.js](../../frontend/src/features/notes/domain/noteRules.js) |
|
||||
| A | [frontend/src/features/notes/domain/recurrence.js](../../frontend/src/features/notes/domain/recurrence.js) |
|
||||
| A | [frontend/src/features/notes/index.js](../../frontend/src/features/notes/index.js) |
|
||||
| A | [frontend/src/features/notes/infrastructure/http.js](../../frontend/src/features/notes/infrastructure/http.js) |
|
||||
| A | [frontend/src/features/notes/infrastructure/notifications.js](../../frontend/src/features/notes/infrastructure/notifications.js) |
|
||||
| A | [frontend/src/features/notes/infrastructure/storage.js](../../frontend/src/features/notes/infrastructure/storage.js) |
|
||||
| A | [frontend/src/features/notes/ui/cardChecklist.js](../../frontend/src/features/notes/ui/cardChecklist.js) |
|
||||
| A | [frontend/src/features/notes/ui/cardInteractions.js](../../frontend/src/features/notes/ui/cardInteractions.js) |
|
||||
| A | [frontend/src/features/notes/ui/cardRendering.js](../../frontend/src/features/notes/ui/cardRendering.js) |
|
||||
| A | [frontend/src/features/notes/ui/cardReorder.js](../../frontend/src/features/notes/ui/cardReorder.js) |
|
||||
| A | [frontend/src/features/notes/ui/checklist.js](../../frontend/src/features/notes/ui/checklist.js) |
|
||||
| A | [frontend/src/features/notes/ui/checklistReorder.js](../../frontend/src/features/notes/ui/checklistReorder.js) |
|
||||
| A | [frontend/src/features/notes/ui/clipboard.js](../../frontend/src/features/notes/ui/clipboard.js) |
|
||||
| A | [frontend/src/features/notes/ui/colors.js](../../frontend/src/features/notes/ui/colors.js) |
|
||||
| A | [frontend/src/features/notes/ui/draftEditor.js](../../frontend/src/features/notes/ui/draftEditor.js) |
|
||||
| A | [frontend/src/features/notes/ui/drawing.js](../../frontend/src/features/notes/ui/drawing.js) |
|
||||
| A | [frontend/src/features/notes/ui/editor.js](../../frontend/src/features/notes/ui/editor.js) |
|
||||
| A | [frontend/src/features/notes/ui/filters.js](../../frontend/src/features/notes/ui/filters.js) |
|
||||
| A | [frontend/src/features/notes/ui/layout.js](../../frontend/src/features/notes/ui/layout.js) |
|
||||
| A | [frontend/src/features/notes/ui/lifecycle.js](../../frontend/src/features/notes/ui/lifecycle.js) |
|
||||
| A | [frontend/src/features/notes/ui/mobileEditor.js](../../frontend/src/features/notes/ui/mobileEditor.js) |
|
||||
| A | [frontend/src/features/notes/ui/mobileReorder.js](../../frontend/src/features/notes/ui/mobileReorder.js) |
|
||||
| A | [frontend/src/features/notes/ui/panel.js](../../frontend/src/features/notes/ui/panel.js) |
|
||||
| A | [frontend/src/features/notes/ui/quickAdd.js](../../frontend/src/features/notes/ui/quickAdd.js) |
|
||||
| A | [frontend/src/features/notes/ui/reminderDisplay.js](../../frontend/src/features/notes/ui/reminderDisplay.js) |
|
||||
| A | [frontend/src/features/notes/ui/reminderPicker.js](../../frontend/src/features/notes/ui/reminderPicker.js) |
|
||||
| A | [frontend/src/features/notes/ui/selection.js](../../frontend/src/features/notes/ui/selection.js) |
|
||||
| A | [frontend/src/features/notes/ui/text.js](../../frontend/src/features/notes/ui/text.js) |
|
||||
| A | [frontend/src/features/notes/ui/toolbar.js](../../frontend/src/features/notes/ui/toolbar.js) |
|
||||
| A | [frontend/src/features/notes/ui/windowLayout.js](../../frontend/src/features/notes/ui/windowLayout.js) |
|
||||
| A | [frontend/src/shared/ui/confetti.js](../../frontend/src/shared/ui/confetti.js) |
|
||||
|
||||
## Deployment copies (42)
|
||||
|
||||
| Status | File |
|
||||
| --- | --- |
|
||||
| A | [static/js/features/notes/application/agentActions.js](../../static/js/features/notes/application/agentActions.js) |
|
||||
| A | [static/js/features/notes/application/cardOperations.js](../../static/js/features/notes/application/cardOperations.js) |
|
||||
| A | [static/js/features/notes/application/checklistOperations.js](../../static/js/features/notes/application/checklistOperations.js) |
|
||||
| A | [static/js/features/notes/application/deletion.js](../../static/js/features/notes/application/deletion.js) |
|
||||
| A | [static/js/features/notes/application/drafts.js](../../static/js/features/notes/application/drafts.js) |
|
||||
| A | [static/js/features/notes/application/queries.js](../../static/js/features/notes/application/queries.js) |
|
||||
| A | [static/js/features/notes/application/reminders.js](../../static/js/features/notes/application/reminders.js) |
|
||||
| A | [static/js/features/notes/application/selection.js](../../static/js/features/notes/application/selection.js) |
|
||||
| A | [static/js/features/notes/application/state.js](../../static/js/features/notes/application/state.js) |
|
||||
| A | [static/js/features/notes/application/submission.js](../../static/js/features/notes/application/submission.js) |
|
||||
| A | [static/js/features/notes/application/workflows.js](../../static/js/features/notes/application/workflows.js) |
|
||||
| A | [static/js/features/notes/domain/noteRules.js](../../static/js/features/notes/domain/noteRules.js) |
|
||||
| A | [static/js/features/notes/domain/recurrence.js](../../static/js/features/notes/domain/recurrence.js) |
|
||||
| A | [static/js/features/notes/index.js](../../static/js/features/notes/index.js) |
|
||||
| A | [static/js/features/notes/infrastructure/http.js](../../static/js/features/notes/infrastructure/http.js) |
|
||||
| A | [static/js/features/notes/infrastructure/notifications.js](../../static/js/features/notes/infrastructure/notifications.js) |
|
||||
| A | [static/js/features/notes/infrastructure/storage.js](../../static/js/features/notes/infrastructure/storage.js) |
|
||||
| A | [static/js/features/notes/ui/cardChecklist.js](../../static/js/features/notes/ui/cardChecklist.js) |
|
||||
| A | [static/js/features/notes/ui/cardInteractions.js](../../static/js/features/notes/ui/cardInteractions.js) |
|
||||
| A | [static/js/features/notes/ui/cardRendering.js](../../static/js/features/notes/ui/cardRendering.js) |
|
||||
| A | [static/js/features/notes/ui/cardReorder.js](../../static/js/features/notes/ui/cardReorder.js) |
|
||||
| A | [static/js/features/notes/ui/checklist.js](../../static/js/features/notes/ui/checklist.js) |
|
||||
| A | [static/js/features/notes/ui/checklistReorder.js](../../static/js/features/notes/ui/checklistReorder.js) |
|
||||
| A | [static/js/features/notes/ui/clipboard.js](../../static/js/features/notes/ui/clipboard.js) |
|
||||
| A | [static/js/features/notes/ui/colors.js](../../static/js/features/notes/ui/colors.js) |
|
||||
| A | [static/js/features/notes/ui/draftEditor.js](../../static/js/features/notes/ui/draftEditor.js) |
|
||||
| A | [static/js/features/notes/ui/drawing.js](../../static/js/features/notes/ui/drawing.js) |
|
||||
| A | [static/js/features/notes/ui/editor.js](../../static/js/features/notes/ui/editor.js) |
|
||||
| A | [static/js/features/notes/ui/filters.js](../../static/js/features/notes/ui/filters.js) |
|
||||
| A | [static/js/features/notes/ui/layout.js](../../static/js/features/notes/ui/layout.js) |
|
||||
| A | [static/js/features/notes/ui/lifecycle.js](../../static/js/features/notes/ui/lifecycle.js) |
|
||||
| A | [static/js/features/notes/ui/mobileEditor.js](../../static/js/features/notes/ui/mobileEditor.js) |
|
||||
| A | [static/js/features/notes/ui/mobileReorder.js](../../static/js/features/notes/ui/mobileReorder.js) |
|
||||
| A | [static/js/features/notes/ui/panel.js](../../static/js/features/notes/ui/panel.js) |
|
||||
| A | [static/js/features/notes/ui/quickAdd.js](../../static/js/features/notes/ui/quickAdd.js) |
|
||||
| A | [static/js/features/notes/ui/reminderDisplay.js](../../static/js/features/notes/ui/reminderDisplay.js) |
|
||||
| A | [static/js/features/notes/ui/reminderPicker.js](../../static/js/features/notes/ui/reminderPicker.js) |
|
||||
| A | [static/js/features/notes/ui/selection.js](../../static/js/features/notes/ui/selection.js) |
|
||||
| A | [static/js/features/notes/ui/text.js](../../static/js/features/notes/ui/text.js) |
|
||||
| A | [static/js/features/notes/ui/toolbar.js](../../static/js/features/notes/ui/toolbar.js) |
|
||||
| A | [static/js/features/notes/ui/windowLayout.js](../../static/js/features/notes/ui/windowLayout.js) |
|
||||
| A | [static/js/shared/ui/confetti.js](../../static/js/shared/ui/confetti.js) |
|
||||
|
||||
## Compatibility and deployment configuration (5)
|
||||
|
||||
| Status | File |
|
||||
| --- | --- |
|
||||
| M | [.gitattributes](../../.gitattributes) |
|
||||
| M | [frontend/modules.json](../../frontend/modules.json) |
|
||||
| M | [static/js/compare/vote.js](../../static/js/compare/vote.js) |
|
||||
| M | [static/js/notes.js](../../static/js/notes.js) |
|
||||
| M | [static/sw.js](../../static/sw.js) |
|
||||
|
||||
## Tests (21)
|
||||
|
||||
| Status | File |
|
||||
| --- | --- |
|
||||
| A | [tests/browser/notesNative.mjs](../../tests/browser/notesNative.mjs) |
|
||||
| A | [tests/browser/notesOffline.mjs](../../tests/browser/notesOffline.mjs) |
|
||||
| A | [tests/browser/notesReference.mjs](../../tests/browser/notesReference.mjs) |
|
||||
| A | [tests/fixtures/notesRecurrenceBaseline.mjs](../../tests/fixtures/notesRecurrenceBaseline.mjs) |
|
||||
| A | [tests/helpers/notes_source.py](../../tests/helpers/notes_source.py) |
|
||||
| A | [tests/notesApplication.test.mjs](../../tests/notesApplication.test.mjs) |
|
||||
| A | [tests/notesCharacterization.test.mjs](../../tests/notesCharacterization.test.mjs) |
|
||||
| M | [tests/notesDraftAutosave.test.mjs](../../tests/notesDraftAutosave.test.mjs) |
|
||||
| A | [tests/notesInfrastructure.test.mjs](../../tests/notesInfrastructure.test.mjs) |
|
||||
| A | [tests/notesRecurrence.test.mjs](../../tests/notesRecurrence.test.mjs) |
|
||||
| A | [tests/notesReminders.test.mjs](../../tests/notesReminders.test.mjs) |
|
||||
| A | [tests/notesWorkflows.test.mjs](../../tests/notesWorkflows.test.mjs) |
|
||||
| M | [tests/selectedNotesContext.test.mjs](../../tests/selectedNotesContext.test.mjs) |
|
||||
| M | [tests/test_notes_document_mutual_minimize.py](../../tests/test_notes_document_mutual_minimize.py) |
|
||||
| M | [tests/test_notes_dom_xss_helpers.py](../../tests/test_notes_dom_xss_helpers.py) |
|
||||
| M | [tests/test_notes_mobile_checklist_toggle_static.py](../../tests/test_notes_mobile_checklist_toggle_static.py) |
|
||||
| A | [tests/test_notes_reference_browser.py](../../tests/test_notes_reference_browser.py) |
|
||||
| A | [tests/test_notes_reference_contracts_js.py](../../tests/test_notes_reference_contracts_js.py) |
|
||||
| M | [tests/test_notes_search_reset_on_reopen_js.py](../../tests/test_notes_search_reset_on_reopen_js.py) |
|
||||
| M | [tests/test_notes_select_esc_listener_js.py](../../tests/test_notes_select_esc_listener_js.py) |
|
||||
| M | [tests/test_notes_sidebar_new_note.py](../../tests/test_notes_sidebar_new_note.py) |
|
||||
|
||||
## Runtime validation (2)
|
||||
|
||||
| Status | File |
|
||||
| --- | --- |
|
||||
| M | [scripts/verify_frontend_runtime.py](../../scripts/verify_frontend_runtime.py) |
|
||||
| A | [scripts/verify_notes_browser_runtime.py](../../scripts/verify_notes_browser_runtime.py) |
|
||||
|
||||
## Documentation and execution receipts (9)
|
||||
|
||||
| Status | File |
|
||||
| --- | --- |
|
||||
| A | [docs/frontend-architecture/evidence/notes/implementation.sha256](../../docs/frontend-architecture/evidence/notes/implementation.sha256) |
|
||||
| A | [docs/frontend-architecture/evidence/notes/native-desktop.png](../../docs/frontend-architecture/evidence/notes/native-desktop.png) |
|
||||
| A | [docs/frontend-architecture/evidence/notes/native-mobile.png](../../docs/frontend-architecture/evidence/notes/native-mobile.png) |
|
||||
| M | [docs/frontend-architecture/handbook.md](../../docs/frontend-architecture/handbook.md) |
|
||||
| A | [docs/frontend-architecture/notes-case-study.md](../../docs/frontend-architecture/notes-case-study.md) |
|
||||
| A | [docs/frontend-architecture/notes-changed-files.md](../../docs/frontend-architecture/notes-changed-files.md) |
|
||||
| A | [docs/frontend-architecture/notes-module-inventory.md](../../docs/frontend-architecture/notes-module-inventory.md) |
|
||||
| M | [docs/frontend-architecture/notes-roadmap.md](../../docs/frontend-architecture/notes-roadmap.md) |
|
||||
| A | [docs/frontend-architecture/notes-validation.md](../../docs/frontend-architecture/notes-validation.md) |
|
||||
|
||||
See [the case study](notes-case-study.md) for ownership and handoff,
|
||||
[the module inventory](notes-module-inventory.md) for line counts, and
|
||||
[the validation report](notes-validation.md) for exact executed checks.
|
||||
@@ -0,0 +1,56 @@
|
||||
# Notes source and deployment inventory
|
||||
|
||||
The feature has 41 maintained modules. The unchanged F1 action-menu proof and
|
||||
shared confetti bring the full manifest to 43. Outputs are copied byte-for-byte;
|
||||
count maintained source once. The legacy entry is a five-line compatibility facade.
|
||||
|
||||
| Source under frontend/src | Deployment under static | Lines | Layer |
|
||||
| --- | --- | ---: | --- |
|
||||
| [features/notes/application/agentActions.js](../../frontend/src/features/notes/application/agentActions.js) | [js/features/notes/application/agentActions.js](../../static/js/features/notes/application/agentActions.js) | 67 | application |
|
||||
| [features/notes/application/cardOperations.js](../../frontend/src/features/notes/application/cardOperations.js) | [js/features/notes/application/cardOperations.js](../../static/js/features/notes/application/cardOperations.js) | 79 | application |
|
||||
| [features/notes/application/checklistOperations.js](../../frontend/src/features/notes/application/checklistOperations.js) | [js/features/notes/application/checklistOperations.js](../../static/js/features/notes/application/checklistOperations.js) | 68 | application |
|
||||
| [features/notes/application/deletion.js](../../frontend/src/features/notes/application/deletion.js) | [js/features/notes/application/deletion.js](../../static/js/features/notes/application/deletion.js) | 51 | application |
|
||||
| [features/notes/application/drafts.js](../../frontend/src/features/notes/application/drafts.js) | [js/features/notes/application/drafts.js](../../static/js/features/notes/application/drafts.js) | 55 | application |
|
||||
| [features/notes/application/queries.js](../../frontend/src/features/notes/application/queries.js) | [js/features/notes/application/queries.js](../../static/js/features/notes/application/queries.js) | 66 | application |
|
||||
| [features/notes/application/reminders.js](../../frontend/src/features/notes/application/reminders.js) | [js/features/notes/application/reminders.js](../../static/js/features/notes/application/reminders.js) | 182 | application |
|
||||
| [features/notes/application/selection.js](../../frontend/src/features/notes/application/selection.js) | [js/features/notes/application/selection.js](../../static/js/features/notes/application/selection.js) | 39 | application |
|
||||
| [features/notes/application/state.js](../../frontend/src/features/notes/application/state.js) | [js/features/notes/application/state.js](../../static/js/features/notes/application/state.js) | 72 | application |
|
||||
| [features/notes/application/submission.js](../../frontend/src/features/notes/application/submission.js) | [js/features/notes/application/submission.js](../../static/js/features/notes/application/submission.js) | 69 | application |
|
||||
| [features/notes/application/workflows.js](../../frontend/src/features/notes/application/workflows.js) | [js/features/notes/application/workflows.js](../../static/js/features/notes/application/workflows.js) | 78 | application |
|
||||
| [features/notes/domain/noteRules.js](../../frontend/src/features/notes/domain/noteRules.js) | [js/features/notes/domain/noteRules.js](../../static/js/features/notes/domain/noteRules.js) | 87 | domain |
|
||||
| [features/notes/domain/recurrence.js](../../frontend/src/features/notes/domain/recurrence.js) | [js/features/notes/domain/recurrence.js](../../static/js/features/notes/domain/recurrence.js) | 269 | domain |
|
||||
| [features/notes/index.js](../../frontend/src/features/notes/index.js) | [js/features/notes/index.js](../../static/js/features/notes/index.js) | 518 | composition |
|
||||
| [features/notes/infrastructure/http.js](../../frontend/src/features/notes/infrastructure/http.js) | [js/features/notes/infrastructure/http.js](../../static/js/features/notes/infrastructure/http.js) | 29 | infrastructure |
|
||||
| [features/notes/infrastructure/notifications.js](../../frontend/src/features/notes/infrastructure/notifications.js) | [js/features/notes/infrastructure/notifications.js](../../static/js/features/notes/infrastructure/notifications.js) | 20 | infrastructure |
|
||||
| [features/notes/infrastructure/storage.js](../../frontend/src/features/notes/infrastructure/storage.js) | [js/features/notes/infrastructure/storage.js](../../static/js/features/notes/infrastructure/storage.js) | 63 | infrastructure |
|
||||
| [features/notes/ui/cardChecklist.js](../../frontend/src/features/notes/ui/cardChecklist.js) | [js/features/notes/ui/cardChecklist.js](../../static/js/features/notes/ui/cardChecklist.js) | 148 | ui |
|
||||
| [features/notes/ui/cardInteractions.js](../../frontend/src/features/notes/ui/cardInteractions.js) | [js/features/notes/ui/cardInteractions.js](../../static/js/features/notes/ui/cardInteractions.js) | 337 | ui |
|
||||
| [features/notes/ui/cardRendering.js](../../frontend/src/features/notes/ui/cardRendering.js) | [js/features/notes/ui/cardRendering.js](../../static/js/features/notes/ui/cardRendering.js) | 244 | ui |
|
||||
| [features/notes/ui/cardReorder.js](../../frontend/src/features/notes/ui/cardReorder.js) | [js/features/notes/ui/cardReorder.js](../../static/js/features/notes/ui/cardReorder.js) | 181 | ui |
|
||||
| [features/notes/ui/checklist.js](../../frontend/src/features/notes/ui/checklist.js) | [js/features/notes/ui/checklist.js](../../static/js/features/notes/ui/checklist.js) | 190 | ui |
|
||||
| [features/notes/ui/checklistReorder.js](../../frontend/src/features/notes/ui/checklistReorder.js) | [js/features/notes/ui/checklistReorder.js](../../static/js/features/notes/ui/checklistReorder.js) | 111 | ui |
|
||||
| [features/notes/ui/clipboard.js](../../frontend/src/features/notes/ui/clipboard.js) | [js/features/notes/ui/clipboard.js](../../static/js/features/notes/ui/clipboard.js) | 82 | ui |
|
||||
| [features/notes/ui/colors.js](../../frontend/src/features/notes/ui/colors.js) | [js/features/notes/ui/colors.js](../../static/js/features/notes/ui/colors.js) | 111 | ui |
|
||||
| [features/notes/ui/draftEditor.js](../../frontend/src/features/notes/ui/draftEditor.js) | [js/features/notes/ui/draftEditor.js](../../static/js/features/notes/ui/draftEditor.js) | 67 | ui |
|
||||
| [features/notes/ui/drawing.js](../../frontend/src/features/notes/ui/drawing.js) | [js/features/notes/ui/drawing.js](../../static/js/features/notes/ui/drawing.js) | 442 | ui |
|
||||
| [features/notes/ui/editor.js](../../frontend/src/features/notes/ui/editor.js) | [js/features/notes/ui/editor.js](../../static/js/features/notes/ui/editor.js) | 518 | ui |
|
||||
| [features/notes/ui/filters.js](../../frontend/src/features/notes/ui/filters.js) | [js/features/notes/ui/filters.js](../../static/js/features/notes/ui/filters.js) | 139 | ui |
|
||||
| [features/notes/ui/layout.js](../../frontend/src/features/notes/ui/layout.js) | [js/features/notes/ui/layout.js](../../static/js/features/notes/ui/layout.js) | 120 | ui |
|
||||
| [features/notes/ui/lifecycle.js](../../frontend/src/features/notes/ui/lifecycle.js) | [js/features/notes/ui/lifecycle.js](../../static/js/features/notes/ui/lifecycle.js) | 36 | ui |
|
||||
| [features/notes/ui/mobileEditor.js](../../frontend/src/features/notes/ui/mobileEditor.js) | [js/features/notes/ui/mobileEditor.js](../../static/js/features/notes/ui/mobileEditor.js) | 257 | ui |
|
||||
| [features/notes/ui/mobileReorder.js](../../frontend/src/features/notes/ui/mobileReorder.js) | [js/features/notes/ui/mobileReorder.js](../../static/js/features/notes/ui/mobileReorder.js) | 214 | ui |
|
||||
| [features/notes/ui/panel.js](../../frontend/src/features/notes/ui/panel.js) | [js/features/notes/ui/panel.js](../../static/js/features/notes/ui/panel.js) | 506 | ui |
|
||||
| [features/notes/ui/quickAdd.js](../../frontend/src/features/notes/ui/quickAdd.js) | [js/features/notes/ui/quickAdd.js](../../static/js/features/notes/ui/quickAdd.js) | 170 | ui |
|
||||
| [features/notes/ui/reminderDisplay.js](../../frontend/src/features/notes/ui/reminderDisplay.js) | [js/features/notes/ui/reminderDisplay.js](../../static/js/features/notes/ui/reminderDisplay.js) | 129 | ui |
|
||||
| [features/notes/ui/reminderPicker.js](../../frontend/src/features/notes/ui/reminderPicker.js) | [js/features/notes/ui/reminderPicker.js](../../static/js/features/notes/ui/reminderPicker.js) | 334 | ui |
|
||||
| [features/notes/ui/selection.js](../../frontend/src/features/notes/ui/selection.js) | [js/features/notes/ui/selection.js](../../static/js/features/notes/ui/selection.js) | 61 | ui |
|
||||
| [features/notes/ui/text.js](../../frontend/src/features/notes/ui/text.js) | [js/features/notes/ui/text.js](../../static/js/features/notes/ui/text.js) | 39 | ui |
|
||||
| [features/notes/ui/toolbar.js](../../frontend/src/features/notes/ui/toolbar.js) | [js/features/notes/ui/toolbar.js](../../static/js/features/notes/ui/toolbar.js) | 78 | ui |
|
||||
| [features/notes/ui/windowLayout.js](../../frontend/src/features/notes/ui/windowLayout.js) | [js/features/notes/ui/windowLayout.js](../../static/js/features/notes/ui/windowLayout.js) | 114 | ui |
|
||||
| [shared/ui/confetti.js](../../frontend/src/shared/ui/confetti.js) | [js/shared/ui/confetti.js](../../static/js/shared/ui/confetti.js) | 28 | shared UI |
|
||||
|
||||
Maintained Notes feature total: 6440 lines. Original entry: 5,471 lines.
|
||||
Legacy facade after decomposition: five lines. Shared confetti: 28 lines.
|
||||
|
||||
See [the case study](notes-case-study.md) for responsibilities and public/state/lifecycle
|
||||
contracts, and [the validation report](notes-validation.md) for executed evidence.
|
||||
@@ -0,0 +1,178 @@
|
||||
# Notes reference decomposition roadmap
|
||||
|
||||
Status: N0 through N6 implemented as an unpublished Notes review diff after F1
|
||||
merged in PR #6701. Actual decisions, interfaces, module ownership, checkpoint
|
||||
receipts and execution limits are in the [case study](notes-case-study.md) and
|
||||
[validation report](notes-validation.md). The proposal below retains the original
|
||||
responsibility map for comparison. Notes integration and the recipient's independent
|
||||
H reproduction remain pending.
|
||||
F1 remains an entirely separate foundation-only PR. The complete Notes
|
||||
decomposition, regression tests, compatibility validation and final reference
|
||||
case study belong to one comprehensive draft PR targeting official `dev`.
|
||||
|
||||
## Verified current responsibility and compatibility map
|
||||
|
||||
Historical assessment baseline: `8feb50e89468235cd3e0986da80edbd3acaf2c40`.
|
||||
The implementation starts from merged F1 at
|
||||
`1cc56cb9d78f3e2399d1d61155b71d771a17b85b`.
|
||||
The module is `static/js/notes.js`, about 5,470 lines, with browser identity
|
||||
`/static/js/notes.js?v=20260911notesselectioncancel1`. Preserve that identity across
|
||||
the app import, HTML, SW and lazy consumers until a separately reviewed migration
|
||||
changes the contract everywhere.
|
||||
|
||||
| Responsibility | Current evidence | Intended owner after its reviewed slice |
|
||||
| --- | --- | --- |
|
||||
| State and CRUD | `_notes`, selection/filter/editing/loading variables, `_undoStack`, `_fetchNotes`, `_saveNote`, `_patchNote`, `_archiveNoteById` | One application state owner and workflow operations; no second reminder/UI copy |
|
||||
| Dates and recurrence | `_normalizeRepeat`, `_advanceRecurring`, `_nthWeekdayOfMonth`, `_lastWeekdayOfMonth`, `_toLocalDatetimeStr`, repeat formatting helpers | Pure domain calculations with explicit clock inputs |
|
||||
| Network and persistence | Notes CRUD/reorder, upload, reminder firing, draft and reminder localStorage keys | Infrastructure adapters preserving request payloads, credentials and error contracts |
|
||||
| Reminders | `_checkReminders`, `_startReminderLoop`, `_initReminders`, notification permission/display and due/fired badge calculations | Application reminder workflow plus injected clock/storage/notification/API ports |
|
||||
| Draft autosave | `_draftKey`, `_collectFormDraft`, `_wireDraftAutosave`, `_applyDraftToNote`, `_commitOpenInPlaceEditor` | Draft workflow with editor view/persistence ports and serialized saves |
|
||||
| UI | `openPanel`, `closePanel`, `_renderNotes`, forms/cards/checklists, masonry, color/photo/drawing, mobile swipe/reorder | Scoped UI modules with explicit mount/dispose and application operations |
|
||||
| Agent context | `#notes-send-agent` handler, selected IDs, `odysseus:notes-context-selected` | Preserve event payload and synchronous acknowledgement; Chat owns attachment/session state |
|
||||
| Agent solve action | `_agentSolveNote`: default-chat lookup, session creation and chat stream | Separate existing workflow; do not conflate with selected-note attachment |
|
||||
| Compatibility coordinator | Default controller, named aliases, `window.notesModule`, delayed reminder startup | Stable legacy facade/composition bridge until consumers safely migrate |
|
||||
|
||||
The default API currently includes `openPanel`, `closePanel`, `togglePanel`,
|
||||
`isPanelOpen`, `openNote`, `newNote`, `openNotes`, `closeNotes`, `isNotesOpen` and
|
||||
`refreshDueBadge`. Named exports also include `dismissFiredReminderDot` and the
|
||||
panel/open aliases. Characterization must pin the complete actual namespace and
|
||||
default object separately, including identity of aliases and the window bridge.
|
||||
|
||||
Consumers include `static/app.js` sidebar/routes/badge polling,
|
||||
`chatStream.js` note tool updates, `chatRenderer.js` note links and
|
||||
`document.js` coordination. `static/index.html` and `static/sw.js` are entry/cache
|
||||
contracts. The shared UI, confetti, modal, color picker, drag, tiling, docking,
|
||||
z-order and Escape helpers are direct dependencies. Those legacy dependencies
|
||||
remain in the coordinator until their ownership is reviewed, rather than moving
|
||||
all UI coupling into domain modules.
|
||||
|
||||
Import-time behavior includes window origin/storage reads and
|
||||
`setTimeout(_initReminders, 3000)`. The successful bootstrap loads Notes and starts
|
||||
a 30-second reminder interval. App composition separately refreshes the badge
|
||||
every five minutes. Panel/editing listeners, draft timers, highlight animations,
|
||||
ResizeObserver and drawing/touch handlers have shorter scopes. Record them before
|
||||
extraction; do not stop background reminders merely because a panel closes.
|
||||
Listener cleanup concerns require characterization, not an unrelated fix hidden
|
||||
inside an extraction.
|
||||
|
||||
Persistence includes `odysseus-notes-view`, label collapse and hint preferences,
|
||||
fired/glowed/pending/active reminder markers, dismissed timestamp, and
|
||||
`odysseus-note-draft-<id>` including `__new__`. Current direct APIs include Notes
|
||||
CRUD/reorder/fire-reminder and upload, plus default-chat/session/chat-stream for
|
||||
the existing solve action. Backend owner isolation and permission handling stay
|
||||
authoritative and are outside this frontend decomposition's implementation scope.
|
||||
|
||||
## PR #6495 contract that every relevant slice preserves
|
||||
|
||||
Notes sends `odysseus:notes-context-selected` with `{ noteIds, accepted: false }`.
|
||||
Chat's synchronous listener accepts only a valid active or pending chat, updates
|
||||
session/pending selection, sets `accepted`, and updates the context indicator.
|
||||
Notes clears select mode only after acceptance. Session lifecycle events
|
||||
`odysseus:session-changed` carry session/materialization information. Chat appends
|
||||
selected IDs as `selected_note_ids` when sending; server parsing validates IDs,
|
||||
filters by owner and treats the resulting prompt context as untrusted.
|
||||
|
||||
Keep selection transfer to a materialized chat, reset on a new chat, rejection
|
||||
when no chat/model can accept it, aliases and indicator behavior. Do not broaden
|
||||
frontend selections into permissions or bypass the backend. See
|
||||
`tests/selectedNotesContext.test.mjs`, `tests/test_selected_notes_context.py`,
|
||||
`static/js/chat.js` selected-context listeners and send payload, and
|
||||
`static/js/sessions.js` lifecycle event producers.
|
||||
|
||||
## One Notes branch, worktree and draft PR
|
||||
|
||||
After F1 integration and authorization to begin Notes, create one worktree and
|
||||
branch, suggested name `refactor/notes-reference-decomposition`, from the latest
|
||||
official `upstream/dev`. N0 through N6 are sequential internal engineering
|
||||
checkpoints on that same branch. No independent GitHub PR is required for a
|
||||
checkpoint or a UI substage. Maintain one draft PR targeting official `dev`, with
|
||||
checkpoint evidence linked from its description. Keep it a draft until the
|
||||
complete decomposition passes all acceptance gates below.
|
||||
|
||||
| Checkpoint | Responsibility | Deliverable and exit evidence |
|
||||
| --- | --- | --- |
|
||||
| N0 | Characterization | Public API/consumer, responsibility, state, lifecycle and network map; deterministic behavior tests; PR-overlap refresh; no extraction |
|
||||
| N1 | Recurrence domain | Only pure date/recurrence rules to `features/notes/domain/recurrence.js`; preserve old wrapper call contracts, time-read position and returned strings; new offline dependency registered |
|
||||
| N2 | Infrastructure | HTTP and storage adapters with exact request/error/key contracts; retain state ownership and backend authorization |
|
||||
| N3 | Application | Single state owner and CRUD/optimistic/undo workflows; UI/reminders call operations; no competing arrays or stores |
|
||||
| N4 | Reminders | Timer/notification/reminder orchestration through explicit ports; characterize startup, catch-up, deduplication, badge and background behavior |
|
||||
| N5 | UI substages | Bounded card/panel, editor/draft, checklist, drawing and mobile reviews within the same PR; explicit listener/observer disposal and the same application operations |
|
||||
| N6 | Compatibility and reference case study | Reduce coordinator; full API/consumer/lifecycle/offline comparison; retain legacy facade unless removal is proven safe; complete the final reference case study in the same PR |
|
||||
|
||||
Do not create the Notes worktree, branch or PR during F1. N5 remains several
|
||||
bounded internal reviews rather than a second monolith move. Every checkpoint
|
||||
and UI substage must have its own focused tests, review evidence, lessons,
|
||||
exceptions and a rollback plan. Record the validated revision or reproducible
|
||||
patch/snapshot, prior known-good checkpoint, exact test commands/results and
|
||||
how to restore its matching source/output/facade/precache set while preserving
|
||||
unrelated work. Checkpoint commits require the applicable maintainer authority;
|
||||
no checkpoint or commit is created by this planning document.
|
||||
|
||||
Advance only after the current checkpoint's required checks and review findings
|
||||
are resolved. A failed checkpoint returns to its prior validated state or receives
|
||||
a bounded correction on the same branch; it does not require a separate PR.
|
||||
If upstream changes require updating the baseline, update the same Notes branch,
|
||||
record that revision and rerun affected checkpoint and compatibility gates.
|
||||
|
||||
## Complete Notes PR acceptance gates
|
||||
|
||||
Before marking the single draft PR ready for review:
|
||||
|
||||
- Complete N0 through N6, including all N5 substages, with their tests, review
|
||||
receipts and reproducible checkpoint/rollback evidence.
|
||||
- Pass the required full Notes regression and compatibility checks on the final
|
||||
combined revision, including PR #6495 selection/context behavior, public APIs,
|
||||
module identities, single state ownership, storage formats, timers and teardown.
|
||||
- Pass source/output parity, LF attribute, architecture, import graph and exact
|
||||
offline manifest gates; verify current bootstrap/lazy behavior and relevant
|
||||
native/packaging contracts. Record platform limits and distinguish preserved
|
||||
offline module behavior from separately certified root offline reload.
|
||||
- Resolve required gate failures and review findings; document unrelated existing
|
||||
failures or coverage gaps explicitly rather than bypassing required checks.
|
||||
- Include the final reference case study in this PR: actual before/after APIs,
|
||||
dependency/state/lifecycle maps, stage decisions and lessons, validation recipes,
|
||||
temporary exceptions, known debt and tested rollback/compatibility procedures.
|
||||
|
||||
These are readiness gates for the complete PR, not separate stage merges.
|
||||
The receiving maintainer may choose smaller independent PRs for future frontend
|
||||
features; this one-PR delivery decision applies to the Notes reference program.
|
||||
|
||||
## N0 and N1 characterization requirements
|
||||
|
||||
Pin recurrence normalization for legacy bare repeat values and explicit values;
|
||||
none/unknown/malformed input; daily/weekly/monthly/yearly advancement; month ends,
|
||||
leap years, nth/last weekdays including absent fifth occurrences; overdue catch-up
|
||||
and the 5,000-step guard; future anchors; local serialization and preserved hours;
|
||||
DST gaps/overlaps under explicit time zones. `_advanceRecurring` currently reads
|
||||
`Date.now()` after its first step. Inject a clock without changing that ordering.
|
||||
Record the existing behavior of invalid dates rather than inventing improvements.
|
||||
|
||||
Characterize request error handling, optimistic rollback/undo, archive/delete,
|
||||
selection/filter/reset, ordering, uploads and notification permission errors.
|
||||
For drafts, preserve synchronous local backup before the 500 ms persistence
|
||||
timer, intentional empty text, checklist type fallback, serialized writes,
|
||||
failure recovery and refusal to clear a newer draft when an older save finishes.
|
||||
|
||||
Use stub clocks/ports and temporary storage for unit behavior; browser tests for
|
||||
public namespace evaluation, DOM lifecycle, selected context and actual offline
|
||||
loading. Run real modules through their output paths. Do not rewrite source-range
|
||||
tests wholesale; migrate each only with its responsible slice and equivalent
|
||||
behavioral assertions. Existing source-sensitive Notes autosave tests currently
|
||||
read `notes.js`, so extraction has an explicit test-maintenance dependency.
|
||||
|
||||
Before a slice, refresh #6585/#6647/#6652 backend behavior and #6470/#6695 shared
|
||||
UI/platform overlaps from the [assessment](assessment.md). Existing fixes may
|
||||
change characterization inputs, but this program does not merge or silently
|
||||
reimplement those PRs. The independent root-SW fix #6227 is required before a
|
||||
claim of full SPA offline reload readiness.
|
||||
|
||||
## H completion and stopping rule
|
||||
|
||||
The final reference case study is completed inside the Notes PR before it becomes
|
||||
ready for review. After that PR is integrated, finalize H with the integrated
|
||||
revision and checkpoint-to-integration receipts, outstanding dependencies and
|
||||
the recipient's independent reproduction. Have the receiving maintainer
|
||||
reproduce setup and validation independently and record that receipt. Transfer
|
||||
future feature ownership explicitly. Do not automatically begin Calendar,
|
||||
Documents, Email, Chat, Skills or Settings; the initiating architect continues
|
||||
with separately approved non-frontend monolith work.
|
||||
@@ -0,0 +1,261 @@
|
||||
# Notes implementation validation and checkpoint receipts
|
||||
|
||||
Implementation baseline: `1cc56cb9d78f3e2399d1d61155b71d771a17b85b`, updated via
|
||||
non-destructive fast-forward to latest official `upstream/dev` at
|
||||
`86b886c611338282af6d4a717246ea4e256f58df` (incorporating PRs #6704 and #6693).
|
||||
Independent AGY audit returned CONDITIONAL PASS. Pre-publication corrective
|
||||
pass verified issue template, PR template, visual evidence paths, and em-dash removal.
|
||||
The official integration branch is `dev`. Tracking issue #6712; PR #6713.
|
||||
|
||||
## Final executed evidence
|
||||
|
||||
| Check | Result |
|
||||
| --- | --- |
|
||||
| Notes Python tests, discovered by filename, plus F1 publication/graph/offline/loader tests | 172 passed, one release-smoke skip without `APP_PORT` |
|
||||
| Node architecture, Notes oracle, domain, infrastructure, application, reminders, drafts, selection and workflow tests | 46 passed |
|
||||
| Native Python lifespan/static distribution probe | Passed for every mapped output, with source/Node absent |
|
||||
| Existing Docker image distribution probe | Passed with networking disabled and candidate files mounted read-only |
|
||||
| Real authenticated native app, desktop and touch-mobile | Passed CRUD persistence, owner identity, actual Chat selected-context indicator/reset and the original release smoke scenario |
|
||||
| Real Chromium first evaluation of Notes offline | Passed; every maintained output cached, facade/canonical API identity shared |
|
||||
| Source/output parity and F1 boundaries | Passed, 43 maintained modules and nine composition-only legacy exceptions |
|
||||
| Foundation-based full pytest execution | 13 failed, 13,909 passed, 60 skipped, six subtests passed, 192 warnings, 517.04 seconds |
|
||||
| Targeted unchanged F1 baseline reproduction | Same 13 failures, 77 passed, six warnings |
|
||||
| Targeted untouched latest `dev` reproduction | Three inherited failures, 87 passed, six warnings |
|
||||
| Final indexed latest `dev` plus Notes overlay, full pytest | Three same-environment baseline failures, 13,923 passed, 60 skipped, six subtests passed, 192 warnings, 512.09 seconds |
|
||||
| Untouched latest `dev` readiness checks, without the prewarm override | Five passed |
|
||||
|
||||
The foundation-based full repository result is not green. Its failures reproduce against
|
||||
the unchanged foundation in a disposable archive, with the same interpreter and
|
||||
closed Chroma port. None was disabled, relabeled or fixed in this Notes change.
|
||||
The focused Notes suite and required source/deployment gates are green. The final
|
||||
code/test overlay is fingerprinted in [implementation.sha256](evidence/notes/implementation.sha256).
|
||||
The only post-full-suite test-source edit removes a terminal
|
||||
blank line from the browser wrapper; its content was compared ignoring terminal
|
||||
whitespace and all three focused contract/browser checks passed again. Raw command
|
||||
outputs are kept out of the repository; the counts above are the record.
|
||||
|
||||
The first full run reported 19 failures. Six were introduced validation issues:
|
||||
the SW cache name did not follow the existing numeric convention; a temporary
|
||||
probe environment input was not registered by the configuration-reference checker;
|
||||
and a Notes source assertion still expected the original default object spelling.
|
||||
The cache name now follows the convention, the probe passes its output list as a
|
||||
command argument, and the assertion verifies the new public binding. All 58 tests
|
||||
in those affected files passed after correction. The foundation-based full run has only the
|
||||
13 reproduced baseline failures below.
|
||||
|
||||
### Reproduced baseline failures
|
||||
|
||||
- `tests/test_aux_llm_owner_scope.py::test_auto_compaction_utility_endpoint_keeps_chat_owner`
|
||||
- `tests/test_chatgpt_reasoning_and_grouping.py::test_history_and_chat_routes_support_reasoning_effort`
|
||||
- `tests/test_containment_enforcement.py::test_namespace_handshake_closes_model_stdin`
|
||||
- `tests/test_containment_enforcement.py::test_execution_environment_cannot_replace_probed_bwrap[False]`
|
||||
- `tests/test_context_compactor.py::TestMaybeCompactFourthMessage::test_does_not_crash_on_none_content_turn`
|
||||
- `tests/test_context_compactor.py::TestMaybeCompactFourthMessage::test_handles_multimodal_list_content`
|
||||
- `tests/test_css_computed_style_snapshot.py::test_computed_styles_match_the_committed_baseline`
|
||||
- `tests/test_history_compact_tool_calls.py::test_manual_compact_tolerates_chatmessage_with_none_content`
|
||||
- `tests/test_history_compact_tool_calls.py::test_manual_compact_tolerates_dict_message_with_none_content`
|
||||
- `tests/test_history_compact_tool_calls.py::test_registered_manual_compact_route_tolerates_none_content`
|
||||
- `tests/test_history_compact_tool_calls.py::test_registered_manual_compact_route_uses_session_owner`
|
||||
- `tests/test_model_helper_owner_scope.py::test_history_compact_resolves_with_owner_scope`
|
||||
- `tests/test_readiness.py::test_tool_index_is_reported_but_not_critical_by_default`
|
||||
|
||||
These cover existing compaction fixtures/source assertions, namespace containment,
|
||||
settings-row CSS baseline drift and readiness expectations. The baseline reproduction used
|
||||
`git archive` into `/tmp/odysseus-notes-baseline-OitxsU`, not another branch/worktree.
|
||||
|
||||
## Reproducible commands
|
||||
|
||||
### Latest integration target
|
||||
|
||||
Final upstream inspection found `86b886c611338282af6d4a717246ea4e256f58df`.
|
||||
PR #6704 repairs ten of the foundation's reproduced failures; PR #6693 adds
|
||||
remote-only skill gating. Neither changes a file owned by the Notes diff.
|
||||
The branch remains on the requested foundation, with no merge or rebase.
|
||||
An archive of that latest target plus the exact final Notes code/test overlay is
|
||||
validated in `/tmp/odysseus-notes-latest-VmZrgC` using the same full-suite command.
|
||||
The fixture has a local Git index, initialized from the latest target and updated
|
||||
with the review files, but no commit. This enables the tracked-publication checks.
|
||||
The first archive-only attempt had one Git-metadata failure and seven checkout-only
|
||||
skips. Both affected files subsequently passed all 19 tests with metadata present;
|
||||
the complete suite was then rerun in that indexed fixture.
|
||||
An untouched archive at `/tmp/odysseus-notes-latest-baseline-mfE4ss` reproduced
|
||||
the remaining two containment failures and the readiness failure: three failed,
|
||||
87 passed.
|
||||
|
||||
These are reproduced local-environment failures, not a claim that official CI is
|
||||
currently failing. The readiness assertion expects prewarming enabled, whereas
|
||||
the full-run safety command explicitly sets `ODYSSEUS_TOOL_INDEX_PREWARM=0`.
|
||||
With that override absent, all five readiness tests pass on untouched latest `dev`.
|
||||
The two namespace tests receive extra `Failed to create stream fd` stderr in this
|
||||
host's contained process output. That same output occurs without the Notes overlay;
|
||||
no backend containment code was changed or a failing assertion weakened.
|
||||
Reproduce those two checks on the supported CI runner before claiming a green
|
||||
full-suite certification.
|
||||
|
||||
In the final indexed full-suite run the only failures are `test_namespace_handshake_closes_model_stdin`,
|
||||
`test_execution_environment_cannot_replace_probed_bwrap[False]`, and
|
||||
`test_tool_index_is_reported_but_not_critical_by_default`. The missing-Git-metadata
|
||||
publication failure and the seven checkout-only skips are absent from this run.
|
||||
No Notes regression was reported. Feature code matched N6 at publication. Later
|
||||
commits on the PR changed `ui/reminderPicker.js` (date input value assigned through
|
||||
the DOM property) and, after review, `index.js`, `ui/layout.js` and
|
||||
`application/state.js`; `implementation.sha256` covers the current files.
|
||||
|
||||
To reproduce the integration rehearsal, extract the latest target with `git archive`
|
||||
into a fresh fixture and copy only files in the changed-file inventory on top.
|
||||
Do not overlay foundation files that are unchanged in this PR. Install the locked
|
||||
development dependencies in the fixture, then run the commands below there.
|
||||
|
||||
While this review diff is uncommitted, this prepares an equivalent Linux fixture
|
||||
without changing either task worktree:
|
||||
|
||||
```sh
|
||||
notes_fixture=$(mktemp -d /tmp/ody-notes-integration-XXXXXX)
|
||||
git archive 86b886c611338282af6d4a717246ea4e256f58df | tar -x -C "$notes_fixture"
|
||||
{ git diff --name-only -z; git ls-files --others --exclude-standard -z; } |
|
||||
tar --null -T - -cf - | tar -xf - -C "$notes_fixture"
|
||||
git -C "$notes_fixture" init -q
|
||||
git -C "$notes_fixture" fetch --no-write-fetch-head "$PWD" 86b886c611338282af6d4a717246ea4e256f58df
|
||||
git -C "$notes_fixture" read-tree 86b886c611338282af6d4a717246ea4e256f58df
|
||||
(cd "$notes_fixture" && npm ci --ignore-scripts --no-audit --no-fund && git add --all)
|
||||
# Run the validation commands below from notes_fixture, using an isolated Python environment.
|
||||
```
|
||||
|
||||
Use a real dependency directory for this recipe; a symlink named `node_modules`
|
||||
can bypass the repository's directory-only ignore pattern. No checkpoint or
|
||||
fixture commit is needed. After integration, validate the actual integrated checkout
|
||||
directly, rather than relying on the uncommitted-diff recipe.
|
||||
|
||||
### Commands
|
||||
|
||||
Use the actual tested interpreter, or install the repository requirements in your
|
||||
own isolated virtualenv. Node development dependencies were installed with the
|
||||
existing lockfile and `npm ci --ignore-scripts --no-audit --no-fund`.
|
||||
|
||||
```sh
|
||||
python3 scripts/build_frontend.py
|
||||
python3 scripts/build_frontend.py --check
|
||||
node scripts/check_frontend.mjs
|
||||
node scripts/check_frontend.mjs --inventory
|
||||
|
||||
ENDPOINT_URL=http://127.0.0.1:1 node --test \
|
||||
tests/frontendArchitecture.test.mjs tests/noteTestOracle.test.mjs \
|
||||
tests/notesDraftAutosave.test.mjs tests/selectedNotesContext.test.mjs \
|
||||
tests/notesCharacterization.test.mjs tests/notesRecurrence.test.mjs \
|
||||
tests/notesInfrastructure.test.mjs tests/notesApplication.test.mjs \
|
||||
tests/notesReminders.test.mjs tests/notesWorkflows.test.mjs
|
||||
|
||||
CHROMADB_HOST=127.0.0.1 CHROMADB_PORT=1 \
|
||||
python -m pytest -q -rs \
|
||||
$(rg --files tests -g 'test_*note*.py') \
|
||||
tests/test_frontend_build.py tests/test_frontend_foundation_offline_js.py \
|
||||
tests/test_frontend_module_graph.py tests/test_frontend_module_version_parity.py \
|
||||
tests/test_panel_loader_js.py
|
||||
|
||||
python scripts/verify_frontend_runtime.py
|
||||
python scripts/verify_notes_browser_runtime.py
|
||||
|
||||
docker run --rm --network none \
|
||||
--mount type=bind,src="$PWD",dst=/candidate,readonly \
|
||||
--workdir /candidate --entrypoint python \
|
||||
<existing-odysseus-image> scripts/verify_frontend_runtime.py
|
||||
|
||||
CHROMADB_HOST=127.0.0.1 CHROMADB_PORT=1 \
|
||||
ODYSSEUS_STARTUP_WARMUPS=0 ODYSSEUS_TOOL_INDEX_PREWARM=0 \
|
||||
python -m pytest -q -rfs
|
||||
|
||||
git diff --check
|
||||
```
|
||||
|
||||
`ENDPOINT_URL` satisfies the existing oracle's import configuration; its endpoint-
|
||||
driving main does not run in these unit tests. Port 1 is the closed loopback target
|
||||
used for pytest; the two runtime scripts reserve their own non-listening Chroma port.
|
||||
The native browser script creates a private distribution/database and a temporary
|
||||
authenticated user, then terminates the server and removes that fixture. It uses
|
||||
the real application and Notes API rather than mocked browser routes.
|
||||
|
||||
The deterministic browser harness uses stub API responses and the real Notes ESM,
|
||||
DOM and stylesheet graph. It verifies namespace/default methods and arities,
|
||||
aliases, remount/search reset, rejected/accepted attachments, draft persistence,
|
||||
drawing/undo and listener/portal cleanup. It also checks larger-touch reorder after
|
||||
re-render, active-drag close cleanup and cancellation of a mobile selection hold.
|
||||
It includes the mobile viewport meta tag,
|
||||
tap-to-read/edit behavior and the existing selection jiggle. The original monolith
|
||||
can be replayed with `NOTES_BASELINE=1`; it is read from the frozen F1 revision.
|
||||
|
||||
## Browser and packaging evidence
|
||||
|
||||
Actual app screenshots: [desktop](evidence/notes/native-desktop.png) and
|
||||
[mobile](evidence/notes/native-mobile.png). These are Chromium screenshots of the
|
||||
disposable authenticated app at 1440 x 1000 and 390 x 844, not rendered mockups.
|
||||
The deterministic before/after fixture had an identical mobile PNG and only 14
|
||||
changed desktop pixels in the header region; no layout/style change was observed.
|
||||
CSS, app bootstrap and HTML have no implementation diff.
|
||||
|
||||
The native and Docker distribution probe serves all manifest outputs without
|
||||
`frontend/`, `node_modules/` or Node on the server path. It checks response bytes,
|
||||
JS MIME, revalidation, CSP, shell startup, static confinement and source-tree 404.
|
||||
Docker used existing image
|
||||
`sha256:cc2d47e2327d573af01c6b027f23d2ab0f2ee9b85d658e9eb8065bd02b9c3515`.
|
||||
This is not a fresh Dockerfile build or deployment.
|
||||
|
||||
Tested locally: Linux, Python 3.14.4, Node 22.23.1 and Playwright/Chromium 1.62.1.
|
||||
CI's exact Python 3.11/Node 20 pair, Firefox/WebKit, macOS/Windows executable builds,
|
||||
live model/email notification delivery and full root offline reload were not run.
|
||||
The Docker runtime uses its own existing dependency versions. Shared active-window
|
||||
gesture interleavings are not exhaustively covered. No broader platform certification
|
||||
is claimed.
|
||||
|
||||
The full-run safety overrides differ from official CI's plain pytest command.
|
||||
For the readiness default-contract check, use
|
||||
`env -u ODYSSEUS_TOOL_INDEX_PREWARM python -m pytest -q tests/test_readiness.py`.
|
||||
Keep explicit warmup/storage isolation on the disposable live-app probes.
|
||||
|
||||
## Internal checkpoints
|
||||
|
||||
Checkpoint snapshots are kept with the maintainer handoff, not in the repository.
|
||||
The hashes below identify them. They contain scoped source/output/facade/manifest/test
|
||||
overlays, not secrets or user data. Each starts from the same frozen baseline; they
|
||||
are not separate PRs or release candidates.
|
||||
|
||||
| Stage | Boundary and executed exit evidence | Snapshot SHA-256 |
|
||||
| --- | --- | --- |
|
||||
| N0 | Public/consumer/state/lifecycle map; 95 baseline Python and 11 Node passes; four new characterization tests; desktop/touch harness; 33 F1 publication/graph checks | `db0a2e6e68fec3442ce350ffb0acf47bcdf2a5266f7c64c2bf910a1c41c4fb62` |
|
||||
| N1 | Pure recurrence/date rules; eight Node and nine focused Python passes; differential oracle in four time zones; parity/boundaries | `fd0638470744706fbbd5787cb47bd2078a93c9b854139f89f8fdc169c1f353c6` |
|
||||
| N2 | HTTP/storage adapters; fourteen Node and seven focused Python passes; exact requests, keys and fallback contracts | `30826fb7972d1b9e3a790f97ee81f66dcb3dc58eb7d23e24d4f46e6d841b7c73` |
|
||||
| N3 | Single state owner and CRUD/undo boundary; ten Node and seven focused Python passes; read-only state and archive rollback | `4bc5293519b8438d0126a61887bea64195dcdb7d59bcfaaba8ed4ae8c38be439` |
|
||||
| N4 | Page-owned reminder workflow; four reminder contract tests and seven focused Python passes; singleton interval, catch-up, markers and fallback | `febb835c4958c8758e4b7c23ce89f3ec8d103c2cc28f89817d258b3791a9fcdf` |
|
||||
| N5 | Complete UI/application integration; 44 Node passes, targeted source guards and actual browser checks; drawing binding correction, read-only state and disposal | `e147f645bdb2161a4b1dc6cf10c36ba6d0c214d8e12fccb478835043eaaf3e94` |
|
||||
| N6 | Final facade, identity, exact offline graph, native/Docker checks, final editor-deletion/reorder ownership review, touch cleanup regression checks and maintainer review package | `c450e91f9fbfe5f0cd805e596b92a76383f22a74e9515ca3e3f6154aebf5f61f` |
|
||||
|
||||
The N6 overlay contained the final code, tests, manifest and attributes at
|
||||
publication, not the evidence directory itself. From the repository root, run
|
||||
`sha256sum -c docs/frontend-architecture/evidence/notes/implementation.sha256`
|
||||
to verify the current implementation files.
|
||||
|
||||
No checkpoint commits were made. To reproduce an overlay, create a fresh temporary
|
||||
directory, extract `git archive 1cc56cb9...` there, then extract the desired
|
||||
snapshot from the handoff on top. Install the locked test dependencies
|
||||
in that fixture and run its relevant commands. Begin from the baseline rather than
|
||||
overlaying snapshots onto a later dirty tree. For live rollback, release a complete
|
||||
matching artifact through the authorized release workflow.
|
||||
|
||||
Temporary mechanical extraction scripts are not part of the supported deliverable.
|
||||
They were archived locally, then removed. The first generated patch accidentally targeted
|
||||
the separate foundation worktree; only those edits were reversed, absolute paths
|
||||
were adopted, and that worktree's clean state was verified afterward.
|
||||
|
||||
## Open PR overlaps and handoff limits
|
||||
|
||||
The following remained open at the read-only GitHub refresh:
|
||||
|
||||
- [#6585](https://github.com/odysseus-dev/odysseus/pull/6585): optional Notes field removal in the backend. Existing null-field behavior is retained here.
|
||||
- [#6647](https://github.com/odysseus-dev/odysseus/pull/6647): read-only Notes intent routing.
|
||||
- [#6652](https://github.com/odysseus-dev/odysseus/pull/6652): `manage_notes` registry dispatch.
|
||||
- [#6470](https://github.com/odysseus-dev/odysseus/pull/6470): shared theme, typography, sidebar and modal changes.
|
||||
- [#6695](https://github.com/odysseus-dev/odysseus/pull/6695): extension system/platform integration.
|
||||
|
||||
Their changes were not merged or reimplemented. Shared UI exceptions, root-SW scope,
|
||||
the original last-completion fetch race, temporary-note correlation and canvas-draft
|
||||
limits are documented in the case study. Backend owner checks and PR #6495 contracts
|
||||
remain authoritative.
|
||||
@@ -0,0 +1,453 @@
|
||||
# F1 implementation and review report
|
||||
|
||||
Date: 2026-10-13. Recommendation: ready for controlled incremental adoption after
|
||||
maintainer review, with the platform/offline limits below. The foundation proof
|
||||
is implemented and tested; Notes decomposition and the completed H handoff are
|
||||
planned only. No commit, push, merge, PR or issue operation was performed.
|
||||
|
||||
## Notes delivery documentation correction
|
||||
|
||||
The maintainer's final delivery decision is one comprehensive Notes draft PR
|
||||
targeting official `dev`, after the separate foundation-only F1 PR is integrated.
|
||||
N0 through N6 are internal engineering checkpoints in one Notes worktree and
|
||||
branch. The complete decomposition, regression tests, compatibility validation
|
||||
and final reference case study belong to that single PR; it stays a draft until
|
||||
the complete acceptance gates pass. Each stage retains its own test results,
|
||||
review receipts and reproducible rollback/checkpoint strategy, without requiring
|
||||
an independent GitHub PR. The receiving maintainer may choose smaller independent
|
||||
PRs for future frontend features.
|
||||
|
||||
This correction updates only `notes-roadmap.md`, `handbook.md` and this report.
|
||||
Implementation and test files retain their pre-correction bytes. All five
|
||||
foundation documents passed link, fence, whitespace, no-em-dash and delivery
|
||||
wording checks. `git diff --check` and the preserved-runtime diff check passed.
|
||||
A before/after snapshot confirmed exactly these three changed documents and
|
||||
15 unchanged existing F1 files. The implementation test results below remain
|
||||
the previous executed evidence; implementation tests were not rerun in this
|
||||
documentation-only pass.
|
||||
|
||||
## Independent review correction
|
||||
|
||||
The maintainer reports that the independent F1 review found no critical
|
||||
architectural defects. This pass preserves the reviewed native ESM architecture
|
||||
and scope. Its correction is to turn the documented LF checkout convention into
|
||||
a manifest-driven publisher/CI requirement. The full independent review text
|
||||
was not supplied; this report records the supplied finding and executed evidence.
|
||||
|
||||
The correction changes only `scripts/build_frontend.py`,
|
||||
`tests/test_frontend_build.py`, the ADR, the handbook and this report. The
|
||||
`.gitattributes` rules, architecture checker, CI workflow, manifest, dependencies
|
||||
and stateless source remain as reviewed. The full F1 inventory below still has
|
||||
18 files, including `.gitattributes`.
|
||||
|
||||
The publisher now evaluates both paths of every manifest entry through Git's
|
||||
actual attribute engine before parity evaluation or any deployment write. It
|
||||
requires `text: set` and `eol: lf` from applicable repository-owned attribute files,
|
||||
including nested overrides. A private temporary repository and isolated Git
|
||||
configuration prevent global attributes, local `.git/info/attributes`, templates
|
||||
or alternate Git directory settings from masking an omitted declaration. Paths
|
||||
are sent through NUL-delimited stdin, preserving spaces and using no shell/path
|
||||
quoting assumptions. The working repository's attributes, index and output are
|
||||
not changed by this check. Git is a publication/development prerequisite; the
|
||||
application does not invoke it to build or check frontend assets at startup.
|
||||
|
||||
The production integration diff is the new `check_lf_attributes(root, paths)`
|
||||
helper, four standard-library imports, this call, and updated CLI help:
|
||||
|
||||
```diff
|
||||
@@ synchronize
|
||||
if unlisted:
|
||||
raise ValueError(f"source modules missing from manifest: {sorted(map(str, unlisted))}")
|
||||
+ check_lf_attributes(root, sources | outputs)
|
||||
stale = []
|
||||
```
|
||||
|
||||
The tests add fixture LF declarations and 14 cases. Ten parameterized cases
|
||||
reject missing LF, CRLF, auto-text and binary-text rules for source/output paths
|
||||
in both publish and check modes, even when bytes already match. The other four
|
||||
cover a future manifest pair failing before any output is published and passing
|
||||
after its LF declaration; nested rules and a spaced path; global/local settings
|
||||
failing to mask an omitted repository rule; and clear failure without development
|
||||
Git. Existing publication, ownership, confinement, parity and runtime tests remain.
|
||||
|
||||
## Exact attributes diff and checkout evidence
|
||||
|
||||
`git diff -- .gitattributes` is unchanged from the reviewed F1 diff:
|
||||
|
||||
```diff
|
||||
diff --git a/.gitattributes b/.gitattributes
|
||||
index 8681aee1..dd49c4a0 100644
|
||||
--- a/.gitattributes
|
||||
+++ b/.gitattributes
|
||||
@@ -10,6 +10,10 @@
|
||||
entrypoint.sh text eol=lf
|
||||
docker/entrypoint.sh text eol=lf
|
||||
|
||||
+# Maintained frontend modules and this lane's byte-identical deployment output.
|
||||
+frontend/src/** text eol=lf
|
||||
+static/js/actionMenuOrder.js text eol=lf
|
||||
+
|
||||
# Windows-native scripts stay CRLF.
|
||||
*.ps1 text eol=crlf
|
||||
*.cmd text eol=crlf
|
||||
```
|
||||
|
||||
Exact command and results:
|
||||
|
||||
```text
|
||||
$ git check-attr text eol -- frontend/src/shared/actionMenuOrder.js static/js/actionMenuOrder.js
|
||||
frontend/src/shared/actionMenuOrder.js: text: set
|
||||
frontend/src/shared/actionMenuOrder.js: eol: lf
|
||||
static/js/actionMenuOrder.js: text: set
|
||||
static/js/actionMenuOrder.js: eol: lf
|
||||
```
|
||||
|
||||
The sampled legacy contracts were also inspected:
|
||||
|
||||
| Path | text | eol |
|
||||
| --- | --- | --- |
|
||||
| `static/js/notes.js` | auto | unspecified |
|
||||
| `static/index.html` | auto | unspecified |
|
||||
| `launch-windows.ps1` | set | crlf |
|
||||
| `start-macos.sh` | set | lf |
|
||||
|
||||
Beyond samples, all 2,479 unrelated tracked paths were compared against HEAD for
|
||||
both attributes and matched. The current Git 2.53.0 supports the diagnostic
|
||||
`--source=HEAD` option; the publisher uses only the longstanding plain
|
||||
`check-attr --stdin` interface, so it does not depend on that newer option.
|
||||
The read-only whole-tree comparison command was:
|
||||
|
||||
```sh
|
||||
python3 - <<'PY'
|
||||
import subprocess
|
||||
paths = subprocess.check_output(['git', 'ls-files', '-z'])
|
||||
def attributes(source):
|
||||
result = subprocess.run(
|
||||
['git', 'check-attr', *source, '-z', '--stdin', 'text', 'eol'],
|
||||
input=paths, capture_output=True, check=True,
|
||||
)
|
||||
fields = result.stdout.decode().split('\0')[:-1]
|
||||
return {(fields[i], fields[i + 1]): fields[i + 2]
|
||||
for i in range(0, len(fields), 3)}
|
||||
before, after = attributes(['--source=HEAD']), attributes([])
|
||||
owned = lambda p: p.startswith('frontend/src/') or p == 'static/js/actionMenuOrder.js'
|
||||
changes = [(p, a, before[(p, a)], value) for (p, a), value in after.items()
|
||||
if not owned(p) and before[(p, a)] != value]
|
||||
assert not changes, changes
|
||||
print(len({p for p, a in after if not owned(p)}), 'unrelated tracked paths unchanged')
|
||||
PY
|
||||
```
|
||||
|
||||
## Ownership enforcement after correction
|
||||
|
||||
| Contract | Enforcement and CI receipt |
|
||||
| --- | --- |
|
||||
| Canonical, contained source/output paths and unique ownership | Publisher validates the whole manifest before writing; `python-syntax` runs its `--check` |
|
||||
| Every maintained JS source is registered | Publisher rejects unlisted source; duplicate sources/outputs also fail |
|
||||
| Reproducible LF checkout of both mapped paths | Publisher queries isolated repository-owned attributes, even for already matching bytes; the same CI `--check` now enforces it |
|
||||
| Committed output equals maintained source | Publisher checks byte parity without rebuilding in CI; normal publication writes only stale owned outputs |
|
||||
| Feature API/layer direction, no new cycles, stable relative resolution and maintained identities | Existing architecture checker and Node self-tests in `node-syntax`; no checker changes needed |
|
||||
| Explicit exact-URL offline coverage | Architecture checker parses the existing SW arrays; real offline browser proof remains green |
|
||||
| Legacy runtime graph/URL identity and behavior | Existing focused pytest guards and the full CI pytest jobs remain in place |
|
||||
|
||||
These gates enforce the documented maintained-JS contract together. They do not
|
||||
retroactively impose source ownership on all legacy static files, clean retired
|
||||
outputs or prove semantic state/lifecycle correctness. Those existing limits and
|
||||
the independent packaging/offline limitations below remain unchanged.
|
||||
|
||||
## Final correction validation
|
||||
|
||||
The full focused pytest command printed below was rerun with the same interpreter
|
||||
and all listed files: **193 passed, 1 skipped, 1 existing SQLAlchemy warning in
|
||||
12.33 s**. It includes all 27 publisher tests and the isolated native startup,
|
||||
static traversal and no-Node distribution probe. The new 14 tests account for
|
||||
the increase from the initial F1 run's 179 passes. No test failed in this pass.
|
||||
|
||||
| Correction check | Actual result |
|
||||
| --- | --- |
|
||||
| Combined focused pytest command below | 193 passed, 1 unavailable-image skip |
|
||||
| `node --test tests/frontendArchitecture.test.mjs` | 10 passed |
|
||||
| Notes oracle/autosave/selected-context command below | 11 passed |
|
||||
| `python3 scripts/build_frontend.py` | Passed, zero output changes, attributes enforced |
|
||||
| `python3 scripts/build_frontend.py --check` | Passed, attributes and byte parity enforced |
|
||||
| `node scripts/check_frontend.mjs` | Passed, one maintained module |
|
||||
| Helper SHA-256 and `git check-attr` | Identical source/output hash; both text=set, eol=lf |
|
||||
| All unrelated tracked attributes versus HEAD | 2,479 paths unchanged |
|
||||
| `git diff --check` and preserved-runtime command below | Passed, no runtime/backend/packaging diff |
|
||||
| `python -m compileall -q scripts/build_frontend.py tests/test_frontend_build.py` | Passed using the recorded virtualenv interpreter |
|
||||
| Isolated Docker runtime command below | Passed, networking disabled; no source tree, node_modules or Node on PATH |
|
||||
| Complete inventory, whitespace and documentation links | All 18 changed files matched the inventory; checks passed |
|
||||
|
||||
The one skip remains the existing test requiring `odysseus-odysseus:latest`.
|
||||
No new skip or waiver was introduced. Windows/macOS executable builds, a fresh
|
||||
full Dockerfile build, the full pytest suite, Firefox/WebKit and CI's exact
|
||||
Python 3.11/Node 20 versions remain unexecuted locally. Native Git semantics,
|
||||
nested overrides, paths with spaces and ignored `core.autocrlf`/global attribute
|
||||
settings are covered by executed Linux tests; actual Windows execution remains a
|
||||
platform-owner check. The existing `/static/` worker scope still prevents a claim
|
||||
of full root offline reload readiness. No service-worker scope change is included.
|
||||
|
||||
The earlier local ChromaDB probe incident remains recorded under failures below.
|
||||
All runtime checks in this correction pass used the isolated distribution probe
|
||||
with reserved non-listening Chroma port and disabled warmups; Docker additionally
|
||||
had networking disabled. This pass performed no new unisolated ChromaDB probe and
|
||||
no attempt to restore or alter the existing local service's tool index.
|
||||
|
||||
## Reviewer-ready PR summary
|
||||
|
||||
Suggested title: `Establish frontend source ownership and native ESM deployment contracts`.
|
||||
|
||||
Maintain a stateless helper under `frontend/src/` while publishing identical bytes
|
||||
at its existing static URL. Add manifest-owned publication, repository-owned LF
|
||||
attribute and byte-parity checks, parsed dependency/API/identity/offline gates,
|
||||
and a self-contained architecture handbook with the Notes decomposition roadmap.
|
||||
Startup and existing feature behavior retain their current runtime contracts.
|
||||
|
||||
Validation: 193 focused Python tests passed with one existing Docker-image skip;
|
||||
10 architecture and 11 Notes compatibility tests passed; source/output parity,
|
||||
LF gates, preserved-runtime diff and isolated native/Docker runtime proofs passed.
|
||||
Desktop executable builds and full root offline reload remain explicit limits.
|
||||
All 18 files are inventoried below. The working diff is ready for review and is
|
||||
uncommitted; commit, push and PR creation require separate authorization.
|
||||
|
||||
## Verified repository state
|
||||
|
||||
Repository: `odysseus-dev/odysseus`. Branch:
|
||||
`refactor/frontend-architecture-foundation`. Worktree:
|
||||
`/home/alteixeira20/Projects/Odysseus/worktrees/architecture/frontend-foundation`.
|
||||
Initial worktree was clean. HEAD and local official `upstream/dev` are
|
||||
`8feb50e89468235cd3e0986da80edbd3acaf2c40`. The live official GitHub `dev` SHA
|
||||
matched at both initial and final verification. This is PR #6495's merge commit.
|
||||
The `origin` remote is the maintainer fork, not the integration target.
|
||||
|
||||
Final changes are uncommitted F1 files only. Runtime JavaScript, Notes, HTML,
|
||||
SW, backend, Dockerfile and desktop startup/packaging implementations have no
|
||||
diff. The stateless source and existing deployed helper are both 1,688 bytes,
|
||||
SHA-256 `e17baec5d6ac381ce6234ab6f028a8208487280dd07d6950a3469f8488809684`.
|
||||
The final publisher run reported zero changed output modules.
|
||||
|
||||
## Decisions and scope
|
||||
|
||||
The [ADR](ADR-001-source-and-deployment.md) compares two executed approaches:
|
||||
controlled native ESM copying and esbuild 0.25.12 ESM compilation/bundling.
|
||||
Native byte copying wins on existing URL/module/cache compatibility and absence
|
||||
of runtime tooling. Commit explicit output beside maintained source, publish
|
||||
only manifest-owned modules and enforce parity in CI. Python startup never builds.
|
||||
|
||||
The [handbook](handbook.md) defines feature public indexes, responsibility layers,
|
||||
state/lifecycle ownership, cross-feature ports/events, shared-code limits, legacy
|
||||
coexistence, module creation, validation, rollback and handoff contracts.
|
||||
The [assessment](assessment.md) records graph/bootstrap/state/storage/security,
|
||||
packaging assumptions and current open-PR overlaps. The
|
||||
[Notes roadmap](notes-roadmap.md) defines N0 through N6 as internal checkpoints
|
||||
for one comprehensive Notes draft PR, with the final reference case study in
|
||||
that PR and H recipient handoff after integration. None is implemented in F1.
|
||||
There is one maintained stateless leaf and zero legacy-import
|
||||
exceptions, with no empty feature scaffolding.
|
||||
|
||||
Acorn 8.19.0 is the sole new, exact-pinned development dependency, used to parse
|
||||
architecture edges accurately. It is not loaded or distributed as runtime JS.
|
||||
esbuild was a pinned one-off spike and is not a project dependency. Existing
|
||||
frameworks, application entry points and backend contracts are unchanged.
|
||||
|
||||
## Exact changed files
|
||||
|
||||
| File | Change |
|
||||
| --- | --- |
|
||||
| `.gitattributes` | LF checkout for maintained source and the registered deployed proof |
|
||||
| `.github/workflows/ci.yml` | Parity check; locked parser install; source syntax and architecture self-tests |
|
||||
| `package.json` | Exact Acorn development dependency |
|
||||
| `package-lock.json` | Acorn lock/integrity entry |
|
||||
| `frontend/modules.json` | Explicit source/deployment ownership mapping |
|
||||
| `frontend/src/package.json` | Native ESM interpretation for source tests, no dependencies |
|
||||
| `frontend/src/shared/actionMenuOrder.js` | Authoritative stateless source, copied verbatim from the existing helper |
|
||||
| `scripts/build_frontend.py` | Validated source publisher with manifest-driven, repository-owned LF enforcement and non-mutating parity check |
|
||||
| `scripts/check_frontend.mjs` | Parsed import/layer/API/cycle/identity/precache guards and graph inventory |
|
||||
| `scripts/verify_frontend_runtime.py` | Isolated current-code distribution/runtime compatibility probe |
|
||||
| `tests/frontendArchitecture.test.mjs` | Behavioral API equivalence and positive/negative architecture gates |
|
||||
| `tests/test_frontend_build.py` | Publication/ownership/drift/runtime coverage plus positive and negative Git attribute enforcement tests |
|
||||
| `tests/test_frontend_foundation_offline_js.py` | Real SW precache, offline first evaluation, canonical namespace identity and lazy registry proof |
|
||||
| `docs/frontend-architecture/ADR-001-source-and-deployment.md` | Decision, alternatives and distribution/rollback contracts |
|
||||
| `docs/frontend-architecture/assessment.md` | Evidence-backed architecture and PR-overlap inventory |
|
||||
| `docs/frontend-architecture/handbook.md` | Permanent foundation and maintainer continuation methodology |
|
||||
| `docs/frontend-architecture/notes-roadmap.md` | Reference decomposition and final handoff plan |
|
||||
| `docs/frontend-architecture/validation.md` | This implementation/review/validation report |
|
||||
|
||||
## Initial F1 validation before the review correction
|
||||
|
||||
Environment: Linux; native Python 3.14.4; pytest 9.1.1; FastAPI 0.143.0;
|
||||
Starlette 1.8.0; Node 22.23.1; Playwright 1.62.1 with installed Chromium.
|
||||
CI remains Python 3.11 and Node 20; that exact interpreter pair was not executed
|
||||
locally. Use the repository virtualenv, not the system Python missing dependencies.
|
||||
The interpreter used here was
|
||||
`/home/alteixeira20/.venvs/odysseus-pr-6495/bin/python`.
|
||||
|
||||
The historical counts below are coordinator-executed checks in this worktree, excluding
|
||||
delegated claims and earlier repeated subsets. Delegation was discontinued on
|
||||
user instruction; no delegated implementation was integrated.
|
||||
|
||||
| Check | Actual result |
|
||||
| --- | --- |
|
||||
| Read-only baseline: graph, identity, helper, loader, MIME, nonce, runtime paths | 54 passed, one existing SQLAlchemy deprecation warning |
|
||||
| Final combined focused pytest command below | 179 passed, 1 skipped, one existing SQLAlchemy warning, 12.62 s |
|
||||
| Final `pytest -q -rs tests/test_frontend_build.py` review rerun | 13 passed, including native startup and encoded static traversal rejection |
|
||||
| `node --test tests/frontendArchitecture.test.mjs` | 10 passed, no skips or failures; rerun after final gate review |
|
||||
| Notes oracle/autosave/selected-context Node command below | 11 passed, no skips or failures |
|
||||
| `python3 scripts/build_frontend.py` and `--check` | Zero output changes; byte parity passed |
|
||||
| `node scripts/check_frontend.mjs` | Passed, one maintained module |
|
||||
| `node scripts/check_frontend.mjs --inventory` | 230 files, 707 static edges, 108 lazy literal edges, no missing targets, three existing static cyclic components |
|
||||
| `npm ci --ignore-scripts --no-audit --no-fund` | Locked development dependency installation succeeded |
|
||||
| Native `scripts/verify_frontend_runtime.py` | Real FastAPI lifespan and shell/static assertions passed without maintained source, node_modules or Node on PATH |
|
||||
| Docker runtime probe below | Same current-code assertions passed with networking disabled and source mount read-only |
|
||||
| esbuild spike | Two identical 1,554-byte bundle outputs; executed exports/icon/ordering equivalence passed |
|
||||
| JS syntax checks and Python compileall below | Passed |
|
||||
| `git diff --check`, preserved-scope diff check, hash/LF checks | Passed; no runtime/backend/packaging source diff |
|
||||
| Foundation documentation links, trailing whitespace and em-dash checks | All five files passed |
|
||||
|
||||
The skipped test is
|
||||
`tests/test_docker_devops_hardening.py:187`, which requires the unavailable
|
||||
`odysseus-odysseus:latest` image. It was not relabeled or bypassed. F1's separate
|
||||
Docker runtime probe used the available `odysseus-maintainer-preview-odysseus:latest`,
|
||||
image ID `sha256:cc2d47e2327d573af01c6b027f23d2ab0f2ee9b85d658e9eb8065bd02b9c3515`,
|
||||
with Python 3.14.7, FastAPI 0.141.1 and Starlette 1.6.0. This proves compatibility
|
||||
of current candidate code/assets with that image's runtime dependencies, not a
|
||||
fresh build of the full repository Dockerfile or a deployment.
|
||||
|
||||
Reproduce the final focused command with the actual tested interpreter:
|
||||
|
||||
```sh
|
||||
/home/alteixeira20/.venvs/odysseus-pr-6495/bin/python -m pytest -q -rs \
|
||||
tests/test_frontend_build.py tests/test_frontend_foundation_offline_js.py \
|
||||
tests/test_frontend_module_graph.py tests/test_frontend_module_version_parity.py \
|
||||
tests/test_action_menu_order.py tests/test_panel_loader_js.py \
|
||||
tests/test_app_static_mime.py tests/test_serve_html_with_nonce.py \
|
||||
tests/test_runtime_paths.py tests/test_ci_authoritative_validation.py \
|
||||
tests/test_selected_notes_context.py tests/test_email_library_module_graph_js.py \
|
||||
tests/test_settings_module_import_paths.py tests/test_app_config_shared_fetch_js.py \
|
||||
tests/test_markdown_lazy_lib_loading_js.py tests/test_startup_shell_js.py \
|
||||
tests/test_static_stylesheet_manifest.py tests/test_notes_dom_xss_helpers.py \
|
||||
tests/test_notes_reminder_temporal_redos.py tests/test_notes_sidebar_new_note.py \
|
||||
tests/test_notes_mobile_checklist_toggle_static.py \
|
||||
tests/test_notes_document_mutual_minimize.py tests/test_docker_devops_hardening.py
|
||||
|
||||
node --test tests/frontendArchitecture.test.mjs
|
||||
ENDPOINT_URL=http://127.0.0.1:1 node --test \
|
||||
tests/noteTestOracle.test.mjs tests/notesDraftAutosave.test.mjs \
|
||||
tests/selectedNotesContext.test.mjs
|
||||
|
||||
python3 scripts/build_frontend.py --check
|
||||
node scripts/check_frontend.mjs
|
||||
/home/alteixeira20/.venvs/odysseus-pr-6495/bin/python scripts/verify_frontend_runtime.py
|
||||
|
||||
docker run --rm --network none \
|
||||
--mount type=bind,src=/home/alteixeira20/Projects/Odysseus/worktrees/architecture/frontend-foundation,dst=/candidate,readonly \
|
||||
--workdir /candidate --entrypoint python \
|
||||
odysseus-maintainer-preview-odysseus:latest scripts/verify_frontend_runtime.py
|
||||
```
|
||||
|
||||
`ENDPOINT_URL` satisfies the existing oracle's import-time configuration requirement.
|
||||
Its unit-test imports exercise pure exported functions; its network-driving main
|
||||
is guarded by the executable-module check and does not run. The closed loopback
|
||||
address is not a live model endpoint. No oracle implementation was changed.
|
||||
|
||||
Syntax commands executed:
|
||||
|
||||
```sh
|
||||
bash -c 'shopt -s globstar nullglob; for f in static/app.js static/js/**/*.js frontend/src/**/*.js scripts/check_frontend.mjs tests/frontendArchitecture.test.mjs; do node --check "$f" || exit; done'
|
||||
/home/alteixeira20/.venvs/odysseus-pr-6495/bin/python -m compileall -q app.py core routes src services scripts tests
|
||||
git diff --check
|
||||
git diff --exit-code -- static app.py Dockerfile .dockerignore Odysseus.spec build-macos-app.sh build-windows-portable.ps1 launcher.py core routes src services
|
||||
git check-attr text eol -- frontend/src/shared/actionMenuOrder.js static/js/actionMenuOrder.js
|
||||
sha256sum frontend/src/shared/actionMenuOrder.js static/js/actionMenuOrder.js
|
||||
```
|
||||
|
||||
Spike compiler invocation, executed twice with equality and Node import assertions:
|
||||
|
||||
```sh
|
||||
npx --yes esbuild@0.25.12 frontend/src/shared/actionMenuOrder.js \
|
||||
--bundle --format=esm --target=es2022 --platform=browser --log-level=error
|
||||
```
|
||||
|
||||
The clean publication proof uses temporary roots in `test_frontend_build.py`,
|
||||
including an initially absent output tree. Real-checkout publication is idempotent.
|
||||
No emitted JS bytes, URLs, boot scripts or cache manifests changed in this lane.
|
||||
|
||||
## Failures encountered and their resolution
|
||||
|
||||
- An early architecture self-test expected an identity diagnostic but got an
|
||||
unresolved source path for a query-bearing relative import. The checker now
|
||||
rejects alternate identity before resolving that source path. All final tests
|
||||
pass; no test requirement was weakened.
|
||||
- The initial Notes oracle command failed during import because `ENDPOINT_URL`
|
||||
was missing. Inspection established that the unit-test path never runs its
|
||||
endpoint-driving main. The explicit closed-address configuration above passed
|
||||
all 11 tests. This prerequisite is recorded for N0 rather than hidden.
|
||||
- The first isolated distribution fixture omitted the existing `companion/`
|
||||
package, so both probes failed with `ModuleNotFoundError`. The fixture now
|
||||
includes that required runtime directory; neither application nor packaging
|
||||
implementation was modified to make the tests pass.
|
||||
- The first exploratory native startup check connected to the existing local
|
||||
ChromaDB and refreshed the built-in tool index. That was unintended. Subsequent
|
||||
probes use a private distribution/data directory, a reserved non-listening
|
||||
Chroma port, disabled existing warmup options and no Node on PATH. Docker also
|
||||
disables networking. No attempt was made to overwrite or restore that service's
|
||||
data; the earlier unisolated probe is not the reproducible validation recipe.
|
||||
|
||||
## Remaining risks and limits
|
||||
|
||||
Root offline reload is not certified: existing SW scope is `/static/`, and open
|
||||
[#6227](https://github.com/odysseus-dev/odysseus/pull/6227) proposes the independent
|
||||
scope/header correction. F1 preserves and tests actual offline module behavior
|
||||
at the current scope. No first-use offline guarantee is claimed for optional
|
||||
CDN libraries, Mermaid or server APIs.
|
||||
|
||||
Windows/macOS packaged executables, a fresh full Dockerfile build, the full pytest
|
||||
suite, Firefox/WebKit offline behavior and CI's exact Python 3.11/Node 20 versions
|
||||
were not executed here. Existing packaging paths are inspected and unchanged;
|
||||
platform owners should run release validation before broader certification.
|
||||
The unavailable-image test remains a coverage gap. Legacy source still has
|
||||
cross-feature coupling, global side effects and static cycles. New boundaries
|
||||
are enforced on maintained source, not retrospectively on the entire legacy tree.
|
||||
|
||||
The publisher intentionally does not clean retired outputs or provide atomic
|
||||
multi-file deployment. Review full source/output/facade/manifest changes and
|
||||
ship a coherent artifact. Domain syntax checks cannot prove all semantic purity
|
||||
or disposal; behavioral characterization remains required. Reconcile the package
|
||||
lock with #6627 and refresh all PR overlaps before integration.
|
||||
|
||||
## Reviewer checklist
|
||||
|
||||
- Verify the base contains #6495 and the official integration target is dev.
|
||||
- Confirm the deployed helper hash and runtime-scope diff are unchanged.
|
||||
- Review the layer matrix, public API rules, single-state ownership and zero
|
||||
current legacy exceptions; verify negative tests actually reject violations.
|
||||
- Review the manifest mapping, byte-parity/LF policy, exact offline precache and
|
||||
source/output relative-resolution guard; verify missing or overridden LF
|
||||
declarations fail publication and CI even when output bytes already match.
|
||||
- Reproduce the focused tests and inspect the skipped-image prerequisite.
|
||||
- Confirm no frontend compiler/runtime dependency is required at startup and
|
||||
inspect the isolated Python/Docker probe's limits.
|
||||
- Review overlap with #6470/#6695/#6227/#6627 and the Notes backend follow-ups.
|
||||
- Treat the ADR as awaiting adoption review, and the Notes/H documents as plans.
|
||||
- Authorize any commit/push/PR action separately. Do not begin Notes on this branch.
|
||||
|
||||
## Required next reviews and continuation
|
||||
|
||||
1. Review this F1 working diff. On explicit authorization, commit and submit only
|
||||
the foundation-only F1 PR to official dev using the normal maintainer workflow.
|
||||
2. Coordinate the existing #6227 offline fix and platform release validation as
|
||||
separate work. Do not bundle that behavioral change into F1.
|
||||
3. After F1 integration and Notes implementation authorization, create one Notes
|
||||
worktree and branch from the latest official dev, preserving any subsequently
|
||||
merged Notes changes. Use one comprehensive draft PR targeting official dev.
|
||||
4. Complete N0 through N6 from the [Notes roadmap](notes-roadmap.md) on that same
|
||||
branch, recording tests, review and rollback evidence at each checkpoint. Include
|
||||
the final reference case study in the same PR and keep it a draft until the full
|
||||
decomposition and regression/compatibility acceptance gates pass. Recurrence
|
||||
extraction follows characterization as an internal stage, not another PR.
|
||||
5. Complete H only after Notes integration and recipient reproduction. Transfer
|
||||
future frontend work to the designated maintainer and stop this program.
|
||||
|
||||
Another maintainer can start at the handbook, run the documented source/parity,
|
||||
architecture, runtime and behavior checks, inspect this report and select the
|
||||
next authorized slice without relying on unwritten architecture decisions.
|
||||
@@ -0,0 +1,379 @@
|
||||
# Skills evaluation and audit architecture
|
||||
|
||||
The Skills backend separates HTTP transport, model evaluation, agent execution,
|
||||
audit orchestration and publication policy. `services/skills/` coordinates those
|
||||
responsibilities; `services/memory/skills.py` remains the canonical persistence
|
||||
and lifecycle owner. The extraction preserves the existing HTTP and Python
|
||||
contracts. [PR #6711](https://github.com/odysseus-dev/odysseus/pull/6711) tracks
|
||||
this boundary change under [issue #6710](https://github.com/odysseus-dev/odysseus/issues/6710).
|
||||
|
||||
## Responsibilities and dependency boundaries
|
||||
|
||||
| Module | Responsibility |
|
||||
| --- | --- |
|
||||
| `routes/skills_routes.py` | FastAPI request models, endpoint declarations, authentication, ownership, HTTP errors, exact approval validation and Python compatibility bindings |
|
||||
| `services/skills/job_coordinator.py` | Transient job creation, continuation after approval validation, candidate selection, public polling projections and cancellation requests |
|
||||
| `services/skills/agent_runner.py` | Manual execution, audit arms, agent loop integration, transcripts, authority propagation, approval pauses and same-task stream closure |
|
||||
| `services/skills/audit_workflow.py` | Per-skill audit sequencing, self-edit retries, teacher escalation, sequential batches and scheduled execution |
|
||||
| `services/skills/evaluation.py` | Model grading, verdict parsing, necessity and retrieval checks, efficiency fields and markdown improvement generation |
|
||||
| `services/skills/publication.py` | Confidence and publishing policy, duplicate rules, batch finalization and markdown updates through SkillsManager |
|
||||
| `services/skills/model_selection.py` | Owner-scoped worker/teacher resolution, utility fallback, endpoint selection and credential lookup |
|
||||
| `services/skills/prompts.py` | Shared task construction and explicitly untrusted skill context |
|
||||
| `services/skills/dependencies.py` | Frozen `AuditDependencies` containing callable bindings and transient registry references |
|
||||
| `services/memory/skills.py` | Canonical skill identity, owner isolation, durable storage, indexing, retrieval and lifecycle state |
|
||||
|
||||
The package initializer identifies the domain without adding a service facade.
|
||||
Evaluation does not schedule jobs or persist skills. Publication computes policy
|
||||
and applies updates through the supplied SkillsManager. Services do not import
|
||||
`routes.skills_routes`. The existing preferences adapter in `publication.py`
|
||||
still imports `routes.prefs_routes`; moving that adapter is a separate change.
|
||||
|
||||
```mermaid
|
||||
flowchart TD
|
||||
HTTP[Authenticated HTTP requests] --> Routes[skills_routes]
|
||||
Builtins[builtin_actions callers] --> Routes
|
||||
Routes --> Jobs[job_coordinator]
|
||||
Routes --> Models[model_selection]
|
||||
Routes --> Evaluation[evaluation]
|
||||
Routes --> Runner[agent_runner]
|
||||
Routes --> Workflow[audit_workflow]
|
||||
Jobs -->|injected calls| Runner
|
||||
Jobs -->|injected calls| Workflow
|
||||
Workflow -->|injected calls| Runner
|
||||
Workflow -->|injected calls| Evaluation
|
||||
Workflow -->|injected calls| Publication[publication]
|
||||
Runner -->|injected calls| Evaluation
|
||||
Runner --> Runtime[Agent runtime and authority enforcement]
|
||||
Runner --> Prompts[prompts and untrusted context]
|
||||
Jobs --> Prompts
|
||||
Workflow --> Prompts
|
||||
Routes --> Manager[Canonical SkillsManager]
|
||||
Runner --> Manager
|
||||
Workflow --> Manager
|
||||
Publication --> Manager
|
||||
Publication --> Preferences[Existing preferences adapter]
|
||||
Models --> Resolver[Endpoint resolver and owner-scoped credentials]
|
||||
```
|
||||
|
||||
Arrows include injected calls, rather than only Python imports. The workflow
|
||||
imports `SkillAuditUnavailable` from the runner. Route wrappers construct
|
||||
`AuditDependencies` on entry from the current route bindings, so existing
|
||||
callers and monkeypatches reach the same collaborators without rebinding shared
|
||||
service globals.
|
||||
|
||||
The manual test registry belongs to `agent_runner.py`; the audit registry belongs
|
||||
to `audit_workflow.py`. Routes expose aliases to those dictionaries. Registries
|
||||
hold process-local job state and are not durable skill stores. All durable
|
||||
metadata, confidence, markdown and publication changes use SkillsManager.
|
||||
Published-only retrieval and local exclusion of `remote-only` skills stay in
|
||||
the manager/index boundary. Service loggers use their module names; the route
|
||||
module retains its own logger. Root handlers supply the existing log output.
|
||||
|
||||
## Execution and publication lifecycle
|
||||
|
||||
1. The HTTP handler authenticates the caller, verifies ownership and validates
|
||||
the request. Manual model choices retain registered-endpoint validation and
|
||||
owner-scoped credential lookup.
|
||||
2. Job coordination creates the owner-keyed transient record and launches the
|
||||
execution coroutine. Replacing a manual test retires its pending approval.
|
||||
Polling exposes only the existing public fields, excluding credentials,
|
||||
private transcripts, continuation state and asyncio tasks.
|
||||
3. The runner uses the originating request authority or the consumed sealed
|
||||
approval authority. It captures the transcript and closes the async stream
|
||||
with `aclosing` inside the task that opened it, including early approval
|
||||
pauses, cancellation and exceptions.
|
||||
4. Manual approval pauses return to the HTTP validation boundary. Continuation
|
||||
reconstructs context from the original untrusted skill and accumulated
|
||||
untrusted transcript. Manual completion records audit metadata and adjusts
|
||||
confidence (pass .95, needs_work .6, fail .4) without publishing.
|
||||
5. An automated audit checks deterministic duplicates, advisory necessity and,
|
||||
when indicated, retrieval precision. It runs skill and no-skill arms on the
|
||||
same task, grades the result, then may self-edit and retry. An optional
|
||||
distinct teacher rewrites the skill; the worker performs the retry.
|
||||
6. Publication applies owner preferences, confidence thresholds, necessity,
|
||||
utility and duplicate rules through SkillsManager. A normal sequential batch
|
||||
finalizes its processed results. Cancellation or infrastructure unavailability
|
||||
skips batch finalization and clears task/current state.
|
||||
|
||||
A clean audit pass sets confidence to .95, a self-edit pass to .85 and a teacher
|
||||
rewrite pass to .8. Continued failure becomes draft at .35. Unknown and
|
||||
inconclusive verdicts preserve publication state. Automatic publishing requires
|
||||
an enabled owner policy, a passing verdict at or above the configured threshold,
|
||||
and no necessity, worse-baseline or duplicate blocker. The default threshold is
|
||||
.85; owner values are clamped to [0, 1]. Markdown edits pin the existing skill name
|
||||
so usage and audit sidecars remain attached to the same identity.
|
||||
|
||||
Per-skill duplicate blocking and batch duplicate finalization have distinct
|
||||
selection rules and must not be consolidated without a behavior proposal.
|
||||
Batch finalization excludes builtins and binned records, changes only processed
|
||||
skills, protects approval-required results, and bins duplicate losers. Duplicate
|
||||
similarity uses the existing .38 threshold and name-suffix grouping.
|
||||
|
||||
Batches run sequentially per owner, retain current/done/results and timestamps,
|
||||
and cap progress logs at 1,000 entries. Ordinary exceptions record inconclusive
|
||||
skill audits. Infrastructure failures stop the batch without inventing a skill
|
||||
verdict. Scheduled execution skips an active owner job, selects existing lifecycle
|
||||
candidates by oldest audit, caps the batch (default eight), and marks model phases
|
||||
as background work. These services retain the existing scheduling and
|
||||
cancellation semantics.
|
||||
|
||||
## Security and approval invariants
|
||||
|
||||
HTTP authentication and owner verification remain at the transport boundary.
|
||||
Manager reads and writes receive the owner. Ownerless builtins retain their
|
||||
existing visibility; an authenticated user cannot access an ownerless ordinary
|
||||
skill. Existing ownerless deployment behavior is preserved.
|
||||
|
||||
The `/test-approval` handler validates the pending job, approval ID, decision,
|
||||
owner and empty session binding, then destructively consumes the sealed approval
|
||||
with `allow_continuation=False` before calling the coordinator. Stale, mismatched
|
||||
or reused approvals fail with 409. The consumed grant authorizes only its exact
|
||||
action. Services do not manufacture approval authority or relax process identity,
|
||||
workspace confinement or request-authority enforcement in the agent runtime.
|
||||
|
||||
Skill markdown and resumed transcripts remain explicitly untrusted context,
|
||||
never trusted system instructions. Audit arms suppress saved skill injection.
|
||||
Unattended runs deny encountered approval records instead of leaving reusable
|
||||
grants. An initial approval-required audit result preserves the skill's publication
|
||||
and confidence and directs the user to manual approval. Retry handling has an
|
||||
inherited gap: an approval pause after a rewrite can still lead to demotion.
|
||||
Same-task stream closure preserves the originating ContextVar cleanup, but manual
|
||||
cancellation can retain private continuation state. These are separate hardening
|
||||
items, not guarantees supplied by the extraction.
|
||||
|
||||
## Model selection and evaluation
|
||||
|
||||
Audit resolution uses an explicit endpoint/model pair when supplied, looking up
|
||||
credentials among enabled owner-visible endpoints. A model-only choice uses the
|
||||
existing owner-scoped model resolver. Otherwise it resolves the utility model,
|
||||
including the resolver's default behavior, then takes the first configured
|
||||
utility fallback if the primary result is incomplete. A missing worker raises
|
||||
`ValueError`. Served-model normalization keeps an exact match, then a basename
|
||||
match, then the first served ID; discovery exceptions keep the resolved choice.
|
||||
|
||||
An enabled teacher resolves separately with the same owner. Its credentials are
|
||||
not borrowed from the worker. Teacher resolution failure logs the existing warning
|
||||
and leaves the teacher absent. Manual tests retain their HTTP endpoint validation
|
||||
and registered fallback credentials.
|
||||
|
||||
Owner reasoning effort is resolved for each evaluation or rewrite call. Workload
|
||||
flags, credentials, retries, prompts and permissive parsing remain unchanged:
|
||||
|
||||
| Phase | Token budget | Timeout in seconds |
|
||||
| --- | --- | --- |
|
||||
| Run review, up to two attempts | 32768 | 180 |
|
||||
| Necessity | 8192 | 120 |
|
||||
| Retrieval precision | 4096 | 90 |
|
||||
| Markdown improvement | 16384 | 180 |
|
||||
|
||||
Review parsing retains think-block stripping, trailing-comma recovery, last
|
||||
usable verdict selection, prose fallback, bounded fields and unknown outcomes.
|
||||
These model outputs are advisory and do not grant execution authority.
|
||||
|
||||
## Public HTTP contract
|
||||
|
||||
All paths below have prefix `/api/skills`. Successful status defaults to 200.
|
||||
Request models and endpoint declaration order remain fixed. A frozen
|
||||
OpenAPI and declaration-order fixture records
|
||||
the baseline contract independently of the extracted implementation.
|
||||
|
||||
| Method and suffix | Successful response | Authorization and errors |
|
||||
| --- | --- | --- |
|
||||
| GET empty | `skills,count` | Owner-filtered load |
|
||||
| GET `/index` | `index,count` | Owner-scoped eligible index |
|
||||
| GET `/slash-catalog` | `skills,count` | Owner-scoped index; sorted slash entries |
|
||||
| GET `/builtin` | `builtin,count` and optional `error` | Existing shared capability text |
|
||||
| GET `/builtin/{name}` | `name,text,default,is_overridden` | 404 missing tool; 500 import failure |
|
||||
| PUT `/builtin/{name}` | `ok,name,is_overridden` | Admin; 404 unknown, 400 missing text |
|
||||
| DELETE `/builtin/{name}` | `ok,name,is_overridden` | Admin |
|
||||
| POST `/import-from-url` | `ok,skill,files` | Admin and current owner; 400 import, 502 HTTP, 500 other failure |
|
||||
| POST `/add` | `ok,deduped,skill` | Current owner passed to manager; unchanged old/new request fields |
|
||||
| POST `/{skill_id}/invoke` | `ok,type,name,command,message` | Eligible owner index only; 404 unavailable/source missing |
|
||||
| GET `/{skill_id}` | Full skill dictionary | Owner load; 404 missing |
|
||||
| GET `/{skill_id}/markdown` | `name,markdown` | Owner verification; 404 missing/source missing |
|
||||
| POST `/{skill_id}/test` | `ok,status,skill,model` | Owner verification, HTTP request authority, registered fallback credentials; 400 missing/invalid model |
|
||||
| POST `/{skill_id}/test-approval` | `ok,status,decision` | User approval request, owner verification, pending ID/owner/empty session match; 400 invalid body/decision, 409 stale/mismatch/consumed |
|
||||
| GET `/{skill_id}/test-status` | `status` or `status,task,model,log,verdict,approval` | Owner-keyed lookup; server continuation/credentials omitted |
|
||||
| POST `/audit-all` | `ok,status,total` plus running `done,model` or empty `results,log` | Owner-keyed singleton; 400 model resolution |
|
||||
| GET `/audit-all/status` | `status` or job progress/result/log/timestamps | Owner-keyed lookup; task and credentials omitted |
|
||||
| POST `/audit-all/cancel` | `ok,status` | Owner-keyed lookup and cancellation |
|
||||
| POST `/{skill_id}/markdown` | `ok,name` | Owner verification; 400 missing/parse, 404 missing, 500 update |
|
||||
| PUT `/{skill_id}` | `ok` | Owner verification and scoped manager update; 404 missing |
|
||||
| DELETE `/{skill_id}` | `ok` | Owner verification and scoped manager deletion; 404 missing |
|
||||
| POST `/search` | `skills,query,count` | Owner-filtered input; 400 empty query |
|
||||
|
||||
Strict owner verification allows an ownerless builtin but denies an ownerless
|
||||
ordinary skill for an authenticated user. The existing ownerless deployment
|
||||
behavior remains. Global auth middleware is unchanged.
|
||||
|
||||
## Python compatibility and frozen contracts
|
||||
|
||||
`app.py` imports `setup_skills_routes`. `src/builtin_actions.py` uses the existing
|
||||
route helpers and audit registry. Route aliases and wrappers preserve the original
|
||||
28 inspectable interfaces, `SkillAuditUnavailable`, registry identity and patchable
|
||||
collaborators. Lazy model/agent imports and route-level effort injection keep
|
||||
existing offline test seams effective.
|
||||
|
||||
The task and message callbacks are bound through `AuditDependencies` at service
|
||||
entry. Patches to route-level test tasks and test/baseline messages reach manual
|
||||
execution, approval continuation, both audit arms, worker retries and scheduled
|
||||
audits. The `_skill_baseline_task` compatibility alias delegates to the current
|
||||
route test-task builder. Execution continues to reuse one task for both arms,
|
||||
as in the original implementation; it does not independently derive a baseline
|
||||
task through that alias.
|
||||
|
||||
`tests/fixtures/skills_api_baseline.json` records declaration order and structural
|
||||
signatures captured from pre-extraction revision
|
||||
`86b886c611338282af6d4a717246ea4e256f58df`. Signature records retain parameter
|
||||
names, order, kinds, defaults, default factories and annotations, including
|
||||
Pydantic constraint metadata. They compare typing origins and arguments instead
|
||||
of Python-version-dependent annotation representations. The expanded records also
|
||||
pin field validation aliases, alias priority, discriminators, `validate_default`,
|
||||
rebuilt field annotations and model configuration. Field order remains visible
|
||||
through the constructor parameter sequence. Only the known builtin factories
|
||||
`list`, `tuple`, `dict`, `set` and `frozenset` are supported. Custom factories,
|
||||
including closures and factories taking validated data, fail closed without being
|
||||
executed. Unsupported metadata/configuration values also raise rather than using
|
||||
unstable representations. This is a structural contract for supported interfaces,
|
||||
not proof of behavioral equivalence for arbitrary validators or Python code.
|
||||
|
||||
The expanded fixture was derived again from the original revision above in a
|
||||
detached scratch worktree, with the updated comparator copied in. Python 3.11
|
||||
and 3.12 produced byte-identical snapshots. The previous parameter/return records,
|
||||
all 28 interface names, all 22 endpoint declarations and the original OpenAPI
|
||||
digest were checked unchanged before accepting the new field records.
|
||||
|
||||
`tests/fixtures/skills_openapi_baseline.json` is the same baseline's complete
|
||||
Skills-router OpenAPI document, generated with a standalone FastAPI application.
|
||||
Sorted keys, ASCII escaping, two-space indentation and a final newline make the
|
||||
fixture deterministic. Tests require exact canonical equality and print a unified
|
||||
diff on mismatch. The redundant digest field and assertions have been removed;
|
||||
they provided no independent compatibility guarantee. The fixture pins model
|
||||
schemas and constraints. CI reads committed fixtures and needs no Git history
|
||||
for these tests. Baseline updates require an intentional compatibility decision, rather
|
||||
than regenerating fixtures from a failing implementation.
|
||||
|
||||
The narrow `.gitleaks.toml` exception remains necessary for the historical public
|
||||
digest in earlier fixture and documentation revisions. It applies to the exact digest,
|
||||
the `generic-api-key` rule and the two named paths. Removing a current copy cannot
|
||||
remove findings from published history. Keep the exception unless the pinned
|
||||
full-history scan proves it unnecessary; do not rewrite history to remove it.
|
||||
The checksum-verified 8.30.1 scan without this exception still reports both
|
||||
historical copies in commit `a547c4d8`; retaining the exception passes the full
|
||||
PR/dev history scan.
|
||||
Reconsider it after squash merge only after verifying the resulting reachable
|
||||
history with the pinned full-history scan.
|
||||
|
||||
The ReDoS source guard scans `services/skills/evaluation.py`, the canonical
|
||||
evaluation parser module, as well as the retained route and memory-extractor
|
||||
locations. Verdict regex runtime tests import the canonical module directly.
|
||||
The source guard must reject reintroducing the lazy think-block expression;
|
||||
the ordinary-input and adversarial-flood runtime tests remain in place. An isolated
|
||||
source mutation reproduced the old guard's false green for the evaluation module.
|
||||
The corrected guard rejected the vulnerable expression in each of the three
|
||||
locations and passed again after restoring the temporary copies. The mutated
|
||||
regex was never executed, and production parser behavior was not changed.
|
||||
|
||||
## Reproducible validation
|
||||
|
||||
From the repository root, use a virtual environment with `requirements-dev.txt`
|
||||
installed and the repository's frontend dependencies available. The examples use
|
||||
`.venv/bin/python`; repeat the contract tests with a Python 3.12 environment as
|
||||
well as Python 3.11. Record interpreter/dependency versions with results.
|
||||
|
||||
```sh
|
||||
.venv/bin/python -m pytest -q \
|
||||
tests/test_skills_audit_characterization.py tests/test_skills_audit_services.py
|
||||
.venv/bin/python -m compileall -q app.py core routes src services scripts tests
|
||||
.venv/bin/python -c 'import routes.skills_routes; import services.skills.agent_runner; import services.skills.audit_workflow'
|
||||
.venv/bin/python scripts/build_frontend.py --check
|
||||
node scripts/check_frontend.mjs
|
||||
node --test tests/skillsApproval.test.mjs tests/frontendArchitecture.test.mjs
|
||||
git diff --check
|
||||
```
|
||||
|
||||
The focused Skills, authority and approval selection is reproducible with:
|
||||
|
||||
```sh
|
||||
.venv/bin/python - <<'PYTHON'
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
files = set()
|
||||
for path in Path("tests").rglob("test_*.py"):
|
||||
text = path.read_text()
|
||||
if ("skill" in path.name or "approval" in path.name
|
||||
or "utility_reasoning" in path.name or "skills_routes" in text
|
||||
or "review_endpoint_credentials" in path.name):
|
||||
files.add(str(path))
|
||||
files.update([
|
||||
"tests/test_request_authority.py",
|
||||
"tests/test_endpoint_registered_authority.py",
|
||||
"tests/test_redos_verdict_continuation.py",
|
||||
"tests/test_redos_residual_python.py",
|
||||
])
|
||||
subprocess.run([sys.executable, "-m", "pytest", "-q", "-rs",
|
||||
"--durations=15", *sorted(files)], check=True)
|
||||
PYTHON
|
||||
```
|
||||
|
||||
The original selection contained 729 cases. Additional characterization cases
|
||||
increase that count without removing the original coverage. For the full suite,
|
||||
remove a development `APP_PORT` and put the environment's tools on PATH:
|
||||
|
||||
```sh
|
||||
env -u APP_PORT PATH="$PWD/.venv/bin:$PATH" \
|
||||
PLAYWRIGHT_BROWSERS_PATH="$PWD/.cache/ms-playwright" \
|
||||
.venv/bin/python -m pytest -q -rs --durations=25
|
||||
```
|
||||
|
||||
Run the checksum-verified Gitleaks binary pinned in
|
||||
`.github/workflows/secret-scan.yml` on full reachable history, including the PR
|
||||
head and fetched official `dev`. The current workflow pins 8.30.1. Its CI command
|
||||
is `gitleaks git --no-banner --redact --verbose .` with a full-history checkout.
|
||||
A local checkout can restrict refs to the relevant histories with
|
||||
`--log-opts='HEAD upstream/dev'`; do not restrict the commit range to just the
|
||||
latest patch. Scan uncommitted fixtures too before committing.
|
||||
|
||||
## Historical evidence and validation limits
|
||||
|
||||
The initial extraction validation at `a547c4d8` reported 42 characterization and
|
||||
service cases, 729 focused cases, 13 relevant Node cases and 17 isolated uvicorn
|
||||
HTTP checks passing. The historical repository-wide run reported 13,959 passed,
|
||||
60 skipped and three failures. These counts describe the extraction validation,
|
||||
not the current revision. The HTTP checks used isolated state and authentication
|
||||
and included second-owner denial, but exercised neither a configured live model
|
||||
nor an external tool action.
|
||||
|
||||
The two containment failures reproduced on unchanged baseline `86b886c6` with
|
||||
extra `Failed to create stream fd: No such file or directory` stderr output:
|
||||
|
||||
- `test_namespace_handshake_closes_model_stdin`
|
||||
- `test_execution_environment_cannot_replace_probed_bwrap[False]`
|
||||
|
||||
`test_legacy_cleanup_against_a_private_real_tmux_server` failed under the original
|
||||
full-suite load and passed isolated reruns. Its cause was not fully diagnosed.
|
||||
These historical failures must be distinguished from new regressions; successful
|
||||
CI and maintainer review remain integration gates. Earlier AST comparisons and
|
||||
the [maintainer review](https://github.com/odysseus-dev/odysseus/pull/6711#issuecomment-6170115749)
|
||||
provide historical extraction evidence, not an independent review of later fixes.
|
||||
|
||||
## Known limitations and follow-up boundaries
|
||||
|
||||
[Issue #6635](https://github.com/odysseus-dev/odysseus/issues/6635) remains open:
|
||||
manual tests without an appropriate workspace can still fail to execute their
|
||||
proposed action. Stream cleanup and exact approvals are preserved, but do not
|
||||
supply a missing workspace.
|
||||
|
||||
Jobs remain process-local and do not survive restarts. Durable jobs, moving the
|
||||
preferences adapter below transport, consolidating storage under the domain
|
||||
package, or changing duplicate/publication policies need separate designs.
|
||||
The canonical manager, skill format/lifecycle modules, provider implementations,
|
||||
agent authority enforcement and frontend contracts remain their existing owners.
|
||||
|
||||
The [second-review correction report](skills-audit-second-review.md) records the
|
||||
restored prompt seams, independently expanded constructor baseline, actual
|
||||
validation results and a separate prioritized plan for the six inherited P2
|
||||
failure paths. Model-controlled lifecycle fields and preference-load failures
|
||||
require maintainer action before automatic rewrite/publication deployment.
|
||||
@@ -0,0 +1,200 @@
|
||||
# Skills PR #6711 second-review corrections
|
||||
|
||||
The correction scope is route prompt compatibility and structural constructor
|
||||
contracts. PR #6711 remains draft. Durable skill ownership stays with
|
||||
`SkillsManager`. No publication policy, authority mechanism, provider runtime,
|
||||
frontend behavior or protected manager/index implementation was changed.
|
||||
|
||||
The reviewed head was `a6a33674ed4facf11f53e7cdd41f882ad0fa8482`. The independent
|
||||
original baseline is `86b886c611338282af6d4a717246ea4e256f58df`. Official `dev`
|
||||
integration was tested against `c3819e3cbf56c4f899eacc66b21115a77d9c570d`.
|
||||
|
||||
## Compatibility corrections
|
||||
|
||||
Service-local imports captured prompt builders outside the route namespace.
|
||||
Patching the public route symbols therefore stopped affecting execution after
|
||||
extraction. `AuditDependencies` now binds the current test-task, test-message and
|
||||
baseline-message builders. Manual execution, exact-approval continuation, initial
|
||||
audits, baseline arms, self/teacher retries and scheduled batches use those
|
||||
bindings. The route `_skill_baseline_task` wrapper again delegates to the current
|
||||
route `_skill_test_task`. Both execution arms still use one shared task, matching
|
||||
the original behavior. No service imports Skills routes.
|
||||
|
||||
The signature checker treated a factory's module/qualified name as its identity
|
||||
and omitted Pydantic settings outside the generated Python signature. Closures
|
||||
with different captured values and default-validation changes were false
|
||||
negatives. New tests additionally demonstrated hidden validation-alias path and
|
||||
model-configuration changes. The checker now records public field validation
|
||||
settings, rebuilt annotations, defaults and inherited model configuration. See
|
||||
the [Pydantic FieldInfo reference](https://docs.pydantic.dev/latest/api/fields/)
|
||||
for the distinction between factories, validation aliases and `validate_default`.
|
||||
|
||||
Only known builtin factories are supported by identity. Custom factories,
|
||||
including factories requiring validated field data, raise `TypeError` without
|
||||
being invoked during comparison. Unsupported metadata/configuration values also
|
||||
fail closed. No bytecode, arbitrary object representations or factory output is
|
||||
serialized. The comparator does not promise equivalence of arbitrary Python
|
||||
validators or factory implementations.
|
||||
|
||||
The expanded fixture was generated from the original baseline in a new detached
|
||||
worktree, with only the revised test comparator copied in. Python 3.11 and 3.12
|
||||
produced byte-identical files. Every previous parameter/return record remains
|
||||
equal. All 28 interfaces and 22 endpoint declarations remain present. The
|
||||
canonical OpenAPI fixture is unchanged, and its original digest is unchanged.
|
||||
Independent native `inspect.signature` snapshots also match original versus
|
||||
corrected implementations on each interpreter.
|
||||
|
||||
## Regression evidence and validation
|
||||
|
||||
The new tests were run before production/comparator edits: 12 failed and four
|
||||
passed, demonstrating the six signature cases and six broken prompt cases. After
|
||||
correction, all 16 added cases pass. The prompt probes capture actual
|
||||
`stream_agent_loop` ingress rather than replacing the runners or coordination.
|
||||
They cover patched and normal execution, guard escaping and taint metadata,
|
||||
owner authority, exact-approval continuation, and worker retries after both
|
||||
self and teacher rewrites. The same ten prompt cases pass on the original
|
||||
implementation. The six signature cases reject custom factories without calling
|
||||
them and detect default validation, alias paths and model validation settings.
|
||||
|
||||
Environments: Python 3.11.17 and 3.12.13, FastAPI 0.143.1, Pydantic 2.14.1,
|
||||
pytest 9.1.1. Python test commands set `FASTEMBED_MODEL=review-disabled` and
|
||||
`HF_HUB_OFFLINE=1` to exercise unavailable optional embeddings without model
|
||||
downloads. They do not validate live providers or embedding quality.
|
||||
|
||||
| Executed scope | Result |
|
||||
| --- | --- |
|
||||
| 53-file Skills, approval, authority and lifecycle selection, Python 3.11 | 757 passed |
|
||||
| Same selection, Python 3.12 | 757 passed |
|
||||
| Both characterization/service files, included above | 70 passed |
|
||||
| Original baseline, available focused selection plus revised characterization | 724 passed |
|
||||
| Original baseline, revised characterization plus prompt probes, each interpreter | 47 passed |
|
||||
| Current-dev combined tree, focused selection plus eight intervening dev test files, each interpreter | 900 passed |
|
||||
| Repository-wide suite, Python 3.11 | 13,991 passed, 60 skipped, two inherited environment failures, six subtests passed |
|
||||
| Frontend publisher and architecture checks | Passed, zero changed modules |
|
||||
| Relevant Node tests | 13 passed |
|
||||
| Compilation, both Python versions | Passed |
|
||||
| Import graph and fresh service-first/route-first imports, both versions | Passed; acyclic; no reverse Skills route import |
|
||||
| Original normalized moved-body comparison | 26 of 26 matched after explicit dependency substitutions |
|
||||
| Pinned/checksum-verified Gitleaks 8.30.1, reachable HEAD and official dev histories | No leaks |
|
||||
| Same Gitleaks, tracked working files | No leaks |
|
||||
| Diff/whitespace and protected-source comparisons | Passed |
|
||||
|
||||
The two repository-wide failures are
|
||||
`tests/test_containment_enforcement.py::test_namespace_handshake_closes_model_stdin`
|
||||
and `test_execution_environment_cannot_replace_probed_bwrap[False]`. Isolated
|
||||
reruns on both original and corrected implementations reproduce the same extra
|
||||
`Failed to create stream fd: No such file or directory` stderr. The independent
|
||||
review traced it to login-profile `im-config` calls to `systemd-cat` inside
|
||||
Bubblewrap without the journal stream socket. These environment failures remain;
|
||||
they were not hidden by excluding tests. A full Python 3.12 suite was not run.
|
||||
|
||||
The combined test tree used the official merge revision `5419ed37`, whose tree
|
||||
exactly matches `git merge-tree --write-tree upstream/dev a6a33674`, with the
|
||||
correction diff applied in a detached scratch worktree. Published history was
|
||||
not rebased, amended, reset or rewritten.
|
||||
|
||||
Local commands, independent fixture captures, baseline reproductions and full
|
||||
logs are retained under `/tmp/skills-6711-corrections/`. The independent review
|
||||
and adversarial probe source remain under `/tmp/skills-6711-second/`. These
|
||||
temporary evidence paths are not portable repository fixtures. CI should read
|
||||
the committed golden fixtures, not regenerate them from the implementation.
|
||||
|
||||
## Separate inherited P2 hardening plan
|
||||
|
||||
All six defects demonstrably exist on the official original baseline. The six
|
||||
safety assertions in `/tmp/skills-6711-second/test_adversarial.py` fail on both
|
||||
the original and corrected trees with the same outcomes. Logs are
|
||||
`inherited-original.log` and `inherited-head.log` in the correction evidence
|
||||
directory. The original/source body comparison also matches these paths after
|
||||
dependency substitutions. There is no demonstrated material worsening from the
|
||||
extraction. That finding does not make their security impact acceptable.
|
||||
|
||||
Priorities below concern a separate hardening change. Items 1 and 2 are release
|
||||
blockers requiring maintainer resolution before deploying automatic skill
|
||||
rewrite/publication workflows. This recommendation is independent of whether
|
||||
the architecture PR is integrated. No tool-authority bypass or cross-owner
|
||||
credential disclosure was demonstrated, and no critical extraction regression
|
||||
was found that requires expanding this compatibility correction.
|
||||
|
||||
1. **Model-controlled lifecycle/provenance fields.** Current source:
|
||||
[publication.py:328](../services/skills/publication.py#L328), especially line
|
||||
342; the bypassed retrieval condition is
|
||||
[skills.py:703](../services/memory/skills.py#L703). Original source:
|
||||
[routes/skills_routes.py:1039](https://github.com/odysseus-dev/odysseus/blob/86b886c611338282af6d4a717246ea4e256f58df/routes/skills_routes.py#L1039).
|
||||
`test_rewrite_cannot_promote_model_text_to_builtin` uses the real manager and
|
||||
saves model markdown with `source: builtin`, `status: published` and
|
||||
`confidence: 1`. Identity/owner remain pinned, but the lifecycle fields persist
|
||||
and the skill becomes retrieval-eligible without a passing audit. Corrective
|
||||
change: allowlist procedure and approved descriptive/retrieval fields during
|
||||
model rewrites; preserve existing owner, provenance, publication, confidence,
|
||||
audit and teacher lifecycle state. Only verified policy may update those
|
||||
fields. Metadata-only fixes must preserve the procedure or trigger a retest.
|
||||
Add real-manager tests for self, teacher and metadata-only rewrites.
|
||||
|
||||
2. **Preference loading fails open for automatic publication.** Current source:
|
||||
[publication.py:13](../services/skills/publication.py#L13) and
|
||||
[skills.py:59](../services/memory/skills.py#L59). Original source:
|
||||
[routes/skills_routes.py:710](https://github.com/odysseus-dev/odysseus/blob/86b886c611338282af6d4a717246ea4e256f58df/routes/skills_routes.py#L710).
|
||||
`test_preferences_read_failure_does_not_enable_auto_publication` makes the
|
||||
loader raise `PermissionError`; automatic publication is enabled rather than
|
||||
preserving the owner's possible opt-out. Corrective change: distinguish a
|
||||
successfully loaded empty preference store from an exception, log the failure
|
||||
and disable automatic publication on exceptions. Align the manager retrieval
|
||||
preference adapter in the separate fix. Test unreadable/malformed existing
|
||||
preference files and the ordinary empty-store default independently.
|
||||
|
||||
3. **Manual cancellation retains private credentials and stale running state.**
|
||||
Current source:
|
||||
[agent_runner.py:125](../services/skills/agent_runner.py#L125) and
|
||||
[job_coordinator.py:49](../services/skills/job_coordinator.py#L49). Original:
|
||||
[routes/skills_routes.py:635](https://github.com/odysseus-dev/odysseus/blob/86b886c611338282af6d4a717246ea4e256f58df/routes/skills_routes.py#L635).
|
||||
`test_manual_cancellation_cleans_sensitive_continuation` suspends and cancels
|
||||
the stream. The stream closes in its originating task, but job status remains
|
||||
running and `_run.headers.Authorization` remains resident. Polling still hides
|
||||
these fields; this is retention, not demonstrated disclosure. Corrective
|
||||
change: handle `CancelledError`, mark cancelled, clear private continuation
|
||||
data, retire only the attached exact approval and re-raise. Preserve state on
|
||||
a normal awaiting-approval return. Retain task handles for coordinated
|
||||
replacement/cancellation and test owner/approval isolation.
|
||||
|
||||
4. **Approval pauses during retries lead to demotion.** Current source:
|
||||
[audit_workflow.py:244](../services/skills/audit_workflow.py#L244), teacher
|
||||
retry at line 280 and demotion at line 303. Original:
|
||||
[routes/skills_routes.py:1448](https://github.com/odysseus-dev/odysseus/blob/86b886c611338282af6d4a717246ea4e256f58df/routes/skills_routes.py#L1448)
|
||||
and lines 1484/1507. `test_retry_approval_preserves_publication_and_confidence`
|
||||
begins published at .9, fails the first grade, then pauses the rewritten test
|
||||
for approval. The result is flagged/draft/.35. The lower-level approval is
|
||||
correctly denied; state handling afterwards is wrong. Corrective change:
|
||||
immediately recognize `approval_required` after every retry, stop escalation
|
||||
and demotion, and preserve the intended pre-pause lifecycle state. Coordinate
|
||||
with item 1 so model rewrites cannot replace that saved state. Test both
|
||||
self/teacher retries, repeated pauses and batch protection.
|
||||
|
||||
5. **Duplicate losers are binned after keeper publication fails.** Current:
|
||||
[publication.py:217](../services/skills/publication.py#L217), including loser
|
||||
writes at line 228. Original:
|
||||
[routes/skills_routes.py:914](https://github.com/odysseus-dev/odysseus/blob/86b886c611338282af6d4a717246ea4e256f58df/routes/skills_routes.py#L914).
|
||||
`test_duplicate_losers_retained_if_keeper_write_fails` raises disk-full during
|
||||
keeper publication and still observes a loser binned. Corrective change:
|
||||
require confirmed keeper persistence before binning losers when automatic
|
||||
publication is enabled. Treat both exceptions and False returns as failure,
|
||||
retain candidates and report recovery information. Preserve existing keeper
|
||||
selection and duplicate scoring rules; add failure/retry tests.
|
||||
|
||||
6. **Reported publication status can disagree with canonical storage.** Current:
|
||||
[publication.py:320](../services/skills/publication.py#L320). Original:
|
||||
[routes/skills_routes.py:1017](https://github.com/odysseus-dev/odysseus/blob/86b886c611338282af6d4a717246ea4e256f58df/routes/skills_routes.py#L1017).
|
||||
`test_publication_does_not_report_unpersisted_success` returns False from the
|
||||
manager update; the helper reports published while the stored skill remains
|
||||
draft. Exceptions are also swallowed by the inspected code. Corrective change:
|
||||
check persistence success, log failures and return reloaded canonical state or
|
||||
an explicit persistence error. Test False/exception outcomes and the job/UI
|
||||
projection. Coordinate this change with item 5 without changing publication
|
||||
thresholds or scoring.
|
||||
|
||||
Maestrum's read-only triage delegation produced no usable result within its
|
||||
usefulness window and was cancelled. Cleanup completed and the session records
|
||||
an interrupted result, not a successful review. The coordinator reclaimed the
|
||||
remaining report work and verified the source references and reproduction logs
|
||||
above. No worker claim was used as proof. No GitHub issue, new PR, maintainer
|
||||
comment or PR-description edit was made.
|
||||
@@ -0,0 +1,215 @@
|
||||
{
|
||||
"version": 1,
|
||||
"modules": [
|
||||
{
|
||||
"source": "shared/actionMenuOrder.js",
|
||||
"deployment": "js/actionMenuOrder.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/domain/recurrence.js",
|
||||
"deployment": "js/features/notes/domain/recurrence.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/infrastructure/http.js",
|
||||
"deployment": "js/features/notes/infrastructure/http.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/infrastructure/storage.js",
|
||||
"deployment": "js/features/notes/infrastructure/storage.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/state.js",
|
||||
"deployment": "js/features/notes/application/state.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/workflows.js",
|
||||
"deployment": "js/features/notes/application/workflows.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/reminders.js",
|
||||
"deployment": "js/features/notes/application/reminders.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/infrastructure/notifications.js",
|
||||
"deployment": "js/features/notes/infrastructure/notifications.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/text.js",
|
||||
"deployment": "js/features/notes/ui/text.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/colors.js",
|
||||
"deployment": "js/features/notes/ui/colors.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/panel.js",
|
||||
"deployment": "js/features/notes/ui/panel.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/reminderDisplay.js",
|
||||
"deployment": "js/features/notes/ui/reminderDisplay.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/selection.js",
|
||||
"deployment": "js/features/notes/ui/selection.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/filters.js",
|
||||
"deployment": "js/features/notes/ui/filters.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/cardRendering.js",
|
||||
"deployment": "js/features/notes/ui/cardRendering.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/layout.js",
|
||||
"deployment": "js/features/notes/ui/layout.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/quickAdd.js",
|
||||
"deployment": "js/features/notes/ui/quickAdd.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/cardInteractions.js",
|
||||
"deployment": "js/features/notes/ui/cardInteractions.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/cardChecklist.js",
|
||||
"deployment": "js/features/notes/ui/cardChecklist.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/cardReorder.js",
|
||||
"deployment": "js/features/notes/ui/cardReorder.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/draftEditor.js",
|
||||
"deployment": "js/features/notes/ui/draftEditor.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/editor.js",
|
||||
"deployment": "js/features/notes/ui/editor.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/reminderPicker.js",
|
||||
"deployment": "js/features/notes/ui/reminderPicker.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/checklist.js",
|
||||
"deployment": "js/features/notes/ui/checklist.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/drawing.js",
|
||||
"deployment": "js/features/notes/ui/drawing.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/clipboard.js",
|
||||
"deployment": "js/features/notes/ui/clipboard.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/mobileEditor.js",
|
||||
"deployment": "js/features/notes/ui/mobileEditor.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/mobileReorder.js",
|
||||
"deployment": "js/features/notes/ui/mobileReorder.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/checklistReorder.js",
|
||||
"deployment": "js/features/notes/ui/checklistReorder.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/queries.js",
|
||||
"deployment": "js/features/notes/application/queries.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/agentActions.js",
|
||||
"deployment": "js/features/notes/application/agentActions.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/deletion.js",
|
||||
"deployment": "js/features/notes/application/deletion.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/domain/noteRules.js",
|
||||
"deployment": "js/features/notes/domain/noteRules.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/index.js",
|
||||
"deployment": "js/features/notes/index.js",
|
||||
"legacyImports": [
|
||||
{
|
||||
"specifier": "/static/js/ui.js?v=20260916largetoolscroll1",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
},
|
||||
{
|
||||
"specifier": "/static/js/modalManager.js",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
},
|
||||
{
|
||||
"specifier": "/static/js/colorPicker.js?v=20260910eyedropper1",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
},
|
||||
{
|
||||
"specifier": "/static/js/windowDrag.js",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
},
|
||||
{
|
||||
"specifier": "/static/js/tileManager.js?v=20260910responsivebounds1",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
},
|
||||
{
|
||||
"specifier": "/static/js/modalSnap.js",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
},
|
||||
{
|
||||
"specifier": "/static/js/toolWindowZOrder.js",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
},
|
||||
{
|
||||
"specifier": "/static/js/escMenuStack.js",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
},
|
||||
{
|
||||
"specifier": "/static/js/tourHintDismiss.js",
|
||||
"reason": "Existing shared UI/platform identity, injected at Notes composition. Remove when that shared responsibility migrates to maintained source."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/submission.js",
|
||||
"deployment": "js/features/notes/application/submission.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/drafts.js",
|
||||
"deployment": "js/features/notes/application/drafts.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/lifecycle.js",
|
||||
"deployment": "js/features/notes/ui/lifecycle.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/cardOperations.js",
|
||||
"deployment": "js/features/notes/application/cardOperations.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/checklistOperations.js",
|
||||
"deployment": "js/features/notes/application/checklistOperations.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/application/selection.js",
|
||||
"deployment": "js/features/notes/application/selection.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/toolbar.js",
|
||||
"deployment": "js/features/notes/ui/toolbar.js"
|
||||
},
|
||||
{
|
||||
"source": "features/notes/ui/windowLayout.js",
|
||||
"deployment": "js/features/notes/ui/windowLayout.js"
|
||||
},
|
||||
{
|
||||
"source": "shared/ui/confetti.js",
|
||||
"deployment": "js/shared/ui/confetti.js"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
/** Create an agent session, link it to a note and drain its background stream. */
|
||||
import { _noteToAgentPrompt } from '../domain/noteRules.js';
|
||||
export function createAgentActions({
|
||||
_patchNote,
|
||||
_renderNotes,
|
||||
api,
|
||||
app,
|
||||
createFormData,
|
||||
state,
|
||||
streamComplete,
|
||||
uiModule
|
||||
}) {
|
||||
async function _agentSolveNote(id) {
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (!note) return;
|
||||
const prompt = _noteToAgentPrompt(note);
|
||||
if (!prompt) { uiModule.showToast('Nothing to solve — note is empty'); return; }
|
||||
try {
|
||||
const dc = await (await api.defaultChat()).json();
|
||||
if (!dc.endpoint_url || !dc.model) { uiModule.showError('No default chat model configured'); return; }
|
||||
|
||||
// 1. Create the session server-side (no UI switch). skip_validation
|
||||
// avoids re-probing : the default-chat endpoint is already known good.
|
||||
const label = (note.title || (Array.isArray(note.items) && note.items[0]?.text) || 'todo').slice(0, 40);
|
||||
const csFd = createFormData();
|
||||
csFd.append('name', 'Agent: ' + label);
|
||||
csFd.append('endpoint_url', dc.endpoint_url);
|
||||
csFd.append('model', dc.model);
|
||||
if (dc.endpoint_id) csFd.append('endpoint_id', dc.endpoint_id);
|
||||
csFd.append('skip_validation', 'true');
|
||||
const csRes = await api.createSession(csFd);
|
||||
if (!csRes.ok) { uiModule.showError('Could not create agent session'); return; }
|
||||
const sess = await csRes.json();
|
||||
const sid = sess.id;
|
||||
|
||||
// 2. Link the session to the note right away so the tag appears.
|
||||
const n = state.notes.find(x => x.id === id);
|
||||
if (n) app.mergeNote(n, { agent_session_id: sid });
|
||||
_renderNotes();
|
||||
_patchNote(id, { agent_session_id: sid }).catch(() => {});
|
||||
|
||||
// 3. Kick off the agent run in the background. POST to chat_stream in
|
||||
// agent mode and drain the SSE so the server runs the loop to
|
||||
// completion + saves : without rendering anything in the chat UI.
|
||||
const fd = createFormData();
|
||||
fd.append('message', prompt);
|
||||
fd.append('session', sid);
|
||||
fd.append('mode', 'agent');
|
||||
fd.append('disabled_tools', JSON.stringify(['manage_notes']));
|
||||
api.startChat(fd)
|
||||
.then(async (res) => {
|
||||
if (!res.ok || !res.body) return;
|
||||
const reader = res.body.getReader();
|
||||
// Drain to completion (server finishes + persists the run).
|
||||
while (true) { const { done } = await reader.read(); if (done) break; }
|
||||
streamComplete(sid);
|
||||
})
|
||||
.catch(() => {});
|
||||
|
||||
uiModule.showToast('Agent working in background — tap the Agent tag when ready');
|
||||
} catch (e) {
|
||||
uiModule.showError('Agent failed: ' + (e.message || e));
|
||||
}
|
||||
}
|
||||
|
||||
return { _agentSolveNote };
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
/** Optimistic card mutations and rollback. Animation completion is a UI-supplied boundary. */
|
||||
export function createCardOperations({
|
||||
app,
|
||||
api,
|
||||
effects,
|
||||
pushUndo,
|
||||
undoArchive
|
||||
}) {
|
||||
const state = app.state;
|
||||
function togglePin(id) {
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (!note) return;
|
||||
const prevPinned = note.pinned, prevSortOrder = note.sort_order;
|
||||
app.mergeNote(note, { pinned: !prevPinned });
|
||||
const patch = { pinned: note.pinned };
|
||||
if (note.pinned) {
|
||||
const minPinned = state.notes.filter(n => n.pinned && n.id !== id).reduce((m, n) => Math.min(m, n.sort_order || 0), 0);
|
||||
app.mergeNote(note, { sort_order: minPinned - 1 });
|
||||
patch.sort_order = note.sort_order;
|
||||
}
|
||||
effects.render();
|
||||
api.patchNote(id, patch).catch(() => {
|
||||
app.mergeNote(note, { pinned: prevPinned, sort_order: prevSortOrder });
|
||||
effects.render(); effects.showError('Failed to pin');
|
||||
});
|
||||
}
|
||||
async function updateColor(id, color) {
|
||||
try {
|
||||
await api.patchNote(id, { color: color || null });
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (note) app.mergeNote(note, { color });
|
||||
} catch { effects.showError('Failed to update color'); }
|
||||
}
|
||||
function stageArchive(id) {
|
||||
const index = state.notes.findIndex(n => n.id === id);
|
||||
if (index < 0) return null;
|
||||
const removed = app.removeNoteAt(index);
|
||||
const undo = () => undoArchive(removed, index);
|
||||
pushUndo({ label: 'archive', run: undo });
|
||||
return () => {
|
||||
effects.render();
|
||||
api.patchNote(id, { archived: true }).then(() => effects.archived(undo)).catch(() => {
|
||||
app.insertNoteAt(index, removed); effects.render(); effects.showError('Failed to archive');
|
||||
});
|
||||
};
|
||||
}
|
||||
function unarchive(id) {
|
||||
const index = state.notes.findIndex(n => n.id === id);
|
||||
if (index < 0) return;
|
||||
const removed = app.removeNoteAt(index);
|
||||
effects.render();
|
||||
api.patchNote(id, { archived: false }).then(() => effects.showToast('Unarchived')).catch(() => {
|
||||
app.insertNoteAt(index, removed); effects.render(); effects.showError('Failed to unarchive');
|
||||
});
|
||||
}
|
||||
function deleteOptimistically(id, toast = false) {
|
||||
const index = state.notes.findIndex(n => n.id === id);
|
||||
if (index < 0) return;
|
||||
const removed = app.removeNoteAt(index);
|
||||
effects.render();
|
||||
const deletion = api.deleteNote(id);
|
||||
const completion = toast ? deletion.then(() => effects.showToast('Deleted')) : deletion;
|
||||
completion.catch(() => {
|
||||
app.insertNoteAt(index, removed); effects.render(); effects.showError('Failed to delete');
|
||||
});
|
||||
}
|
||||
// Desktop deliberately persists without updating local sort_order, as before.
|
||||
function persistOrder(ids) { return api.reorder(ids); }
|
||||
async function commitMobileOrder(ids) {
|
||||
try {
|
||||
await api.reorder(ids);
|
||||
ids.forEach((id, index) => {
|
||||
const note = state.notes.find(note => note.id === id);
|
||||
if (note) app.mergeNote(note, { sort_order: index });
|
||||
});
|
||||
} catch (error) { console.warn('reorder failed', error); }
|
||||
}
|
||||
return { togglePin, updateColor, stageArchive, unarchive, deleteOptimistically, persistOrder, commitMobileOrder };
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
/** Checklist item workflows. Supplied feedback callbacks update the invoking view. */
|
||||
export function createChecklistOperations({
|
||||
app,
|
||||
api,
|
||||
effects,
|
||||
uid
|
||||
}) {
|
||||
const state = app.state;
|
||||
function itemNote(id, index) {
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
return note && Array.isArray(note.items) && note.items[index] ? note : null;
|
||||
}
|
||||
function removeItem(id, index) {
|
||||
const note = itemNote(id, index);
|
||||
if (!note) return;
|
||||
const removed = note.items[index];
|
||||
app.mergeNote(note, { items: note.items.filter((_, i) => i !== index) });
|
||||
effects.render();
|
||||
api.patchNote(id, { items: note.items }).catch(() => {
|
||||
app.spliceItems(note, index, 0, removed); effects.render(); effects.showError('Failed to remove item');
|
||||
});
|
||||
}
|
||||
function editItem(note, index, text) {
|
||||
const oldText = (note.items[index].text || '').trim();
|
||||
if (text === oldText) { effects.render(); return; }
|
||||
const oldItem = note.items[index];
|
||||
if (!text) app.spliceItems(note, index, 1);
|
||||
else app.updateItem(note, index, { text });
|
||||
api.patchNote(note.id, { items: note.items }).catch(() => {
|
||||
if (!text) app.spliceItems(note, index, 0, oldItem);
|
||||
else app.updateItem(note, index, { text: oldText });
|
||||
effects.render(); effects.showError('Failed to update item');
|
||||
});
|
||||
effects.render();
|
||||
}
|
||||
function addItem(id, text, added) {
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (!note) return;
|
||||
const items = Array.isArray(note.items) ? [...note.items] : [];
|
||||
items.push({ id: uid(), text, done: false });
|
||||
app.mergeNote(note, { items });
|
||||
added(); effects.render();
|
||||
return () => api.patchNote(id, { items }).catch(() => {
|
||||
app.mergeNote(note, { items: items.slice(0, -1) }); effects.render(); effects.showError('Failed to add item');
|
||||
});
|
||||
}
|
||||
function toggleItem(id, index, changed, completed) {
|
||||
const note = itemNote(id, index);
|
||||
if (!note) return;
|
||||
const wasDone = note.items.length > 0 && note.items.every(it => it.done);
|
||||
app.updateItem(note, index, { done: !note.items[index].done });
|
||||
changed(note.items[index].done);
|
||||
if (!wasDone && note.items.length > 0 && note.items.every(it => it.done)) completed();
|
||||
api.patchNote(id, { items: note.items }).catch(() => {
|
||||
app.updateItem(note, index, { done: !note.items[index].done }); changed(note.items[index].done);
|
||||
});
|
||||
}
|
||||
async function toggleTodayStep(id, index, changed, completed) {
|
||||
const note = itemNote(id, index);
|
||||
if (!note) return;
|
||||
app.updateItem(note, index, { done: !note.items[index].done }); changed();
|
||||
try {
|
||||
await api.patchNote(id, { items: note.items }); effects.render();
|
||||
if (note.items.every(it => it.done)) completed();
|
||||
} catch { app.updateItem(note, index, { done: !note.items[index].done }); }
|
||||
}
|
||||
return { removeItem, editItem, addItem, toggleItem, toggleTodayStep };
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
/** Confirmed deletion and past-reminder clearing workflows. */
|
||||
export function createDeletion({
|
||||
app,
|
||||
_deleteNoteApi,
|
||||
_fetchNotes,
|
||||
_isPastReminder,
|
||||
_renderNotes,
|
||||
effects,
|
||||
state
|
||||
}) {
|
||||
async function _deleteNote(id) {
|
||||
const ok = effects.styledConfirm
|
||||
? await effects.styledConfirm('Delete this note?', { confirmText: 'Delete', danger: true })
|
||||
: effects.confirm('Delete this note?');
|
||||
if (!ok) return;
|
||||
try { await _deleteNoteApi(id); await _fetchNotes(); _renderNotes(); effects.showToast('Deleted'); }
|
||||
catch (err) { effects.showError(err.message); }
|
||||
}
|
||||
|
||||
async function _clearPastReminders() {
|
||||
const targets = state.notes.filter(n => !n.archived && _isPastReminder(n));
|
||||
if (!targets.length) {
|
||||
effects.showToast?.('No past reminders to clear');
|
||||
return;
|
||||
}
|
||||
const ok = effects.styledConfirm
|
||||
? await effects.styledConfirm(`Delete ${targets.length} past reminder${targets.length === 1 ? '' : 's'}?`, { confirmText: 'Delete', danger: true })
|
||||
: effects.confirm(`Delete ${targets.length} past reminder${targets.length === 1 ? '' : 's'}?`);
|
||||
if (!ok) return;
|
||||
await Promise.all(targets.map(n => _deleteNoteApi(n.id).catch(() => {})));
|
||||
await _fetchNotes();
|
||||
_renderNotes();
|
||||
effects.showToast?.(`Cleared ${targets.length} past reminder${targets.length === 1 ? '' : 's'}`);
|
||||
}
|
||||
|
||||
async function deleteFromEditor(id) {
|
||||
const ok = effects.styledConfirm
|
||||
? await effects.styledConfirm('Delete this note?', { confirmText: 'Delete', danger: true })
|
||||
: effects.confirm('Delete this note?');
|
||||
if (!ok) return;
|
||||
const index = state.notes.findIndex(note => note.id === id);
|
||||
if (index >= 0) app.removeNoteAt(index);
|
||||
app.setEditingId(null);
|
||||
_renderNotes();
|
||||
_deleteNoteApi(id).then(() => effects.showToast('Deleted')).catch(() => {
|
||||
effects.showError('Failed to delete');
|
||||
_fetchNotes().then(() => _renderNotes());
|
||||
});
|
||||
}
|
||||
return { _deleteNote, _clearPastReminders, deleteFromEditor };
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
/** Serialized autosave and synchronous local draft backup. DOM collection is a supplied port. */
|
||||
export function createNotesDrafts({
|
||||
app,
|
||||
api,
|
||||
persistence,
|
||||
scheduler,
|
||||
effects
|
||||
}) {
|
||||
const state = app.state;
|
||||
const { _draftKey, _clearDraft } = persistence;
|
||||
function bindDraft({ collect, id, view }) {
|
||||
let t = null;
|
||||
let pending = Promise.resolve();
|
||||
let stopped = false;
|
||||
let warned = false;
|
||||
const save = () => {
|
||||
const d = collect();
|
||||
// An empty edit can be intentional: don't restore stale server text over it.
|
||||
try { persistence.setItem(_draftKey(id), JSON.stringify(d)); }
|
||||
catch {
|
||||
if (!warned) effects.showError('Draft backup unavailable. Keep this note open until saved.');
|
||||
warned = true;
|
||||
}
|
||||
return d;
|
||||
};
|
||||
const persist = (d) => {
|
||||
if (!id || id === '__new__' || d.note_type === 'draw') return pending;
|
||||
const { _ts, ...payload } = d;
|
||||
payload.label = [...new Set(payload.label.split(/\s+/).map(s => s.replace(/^#+/, '')).filter(Boolean))].join(' ') || null;
|
||||
pending = pending.then(async () => {
|
||||
try {
|
||||
await api.patchNote(id, payload);
|
||||
view.failed = false;
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (note) app.mergeNote(note, payload);
|
||||
if (persistence.getItem(_draftKey(id)) === JSON.stringify(d)) _clearDraft(id);
|
||||
} catch {
|
||||
if (!view.failed) effects.showError('Note not synced. Your edits are kept on this device; retry Save.');
|
||||
view.failed = true;
|
||||
}
|
||||
});
|
||||
return pending;
|
||||
};
|
||||
const flush = () => { scheduler.clearTimeout(t); return save(); };
|
||||
const stop = () => { stopped = true; scheduler.clearTimeout(t); return pending; };
|
||||
const sched = () => {
|
||||
const d = save();
|
||||
if (stopped) return;
|
||||
scheduler.clearTimeout(t);
|
||||
t = scheduler.setTimeout(() => persist(d), 500);
|
||||
};
|
||||
return { flush, stop, schedule: sched };
|
||||
}
|
||||
return { bindDraft };
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
/** Application-owned filtering, searching and note ordering. */
|
||||
import { _noteTags, _visibleNoteTags, _nextGoalStep, _isCalendarReminderNote } from '../domain/noteRules.js';
|
||||
import { _hasTimeComponent } from '../domain/recurrence.js';
|
||||
export function createQueries({
|
||||
_hasActiveReminder,
|
||||
state
|
||||
}) {
|
||||
function _sortedVisibleNotes() {
|
||||
const displayNotes = _userVisibleNotes();
|
||||
let filtered = state.activeLabel ? displayNotes.filter(n => _noteTags(n).includes(state.activeLabel)) : displayNotes;
|
||||
if (state.activeFilter === 'reminders') {
|
||||
filtered = filtered.filter(n => n.due_date && _hasTimeComponent(n.due_date));
|
||||
} else if (state.activeFilter === 'no-reminders') {
|
||||
filtered = filtered.filter(n => !(n.due_date && _hasTimeComponent(n.due_date)));
|
||||
} else if (state.activeFilter === 'default') {
|
||||
filtered = filtered.filter(n => _visibleNoteTags(n).length === 0);
|
||||
} else if (state.activeFilter === 'goals') {
|
||||
filtered = filtered.filter(n => n.note_type === 'goal' && !n.archived);
|
||||
} else if (state.activeFilter === 'today') {
|
||||
// Today view: only goals that still have an unchecked step.
|
||||
filtered = filtered.filter(n => n.note_type === 'goal' && !n.archived && _nextGoalStep(n));
|
||||
}
|
||||
if (state.searchQuery) {
|
||||
filtered = filtered.filter(n => {
|
||||
const q = state.searchQuery;
|
||||
if ((n.title || '').toLowerCase().includes(q)) return true;
|
||||
if ((n.content || '').toLowerCase().includes(q)) return true;
|
||||
if ((n.label || '').toLowerCase().includes(q)) return true;
|
||||
if (Array.isArray(n.items) && n.items.some(it => (it.text || '').toLowerCase().includes(q))) return true;
|
||||
return false;
|
||||
});
|
||||
}
|
||||
const sorted = [...filtered].sort((a, b) => {
|
||||
// In reminders view: sort by due date ascending (soonest first)
|
||||
if (state.activeFilter === 'reminders') {
|
||||
const da = new Date(a.due_date || 0).getTime();
|
||||
const db = new Date(b.due_date || 0).getTime();
|
||||
return da - db;
|
||||
}
|
||||
// Archived view: newest archived first (ignore manual sort_order).
|
||||
if (state.showingArchived) {
|
||||
return new Date(b.updated_at || 0) - new Date(a.updated_at || 0);
|
||||
}
|
||||
if (a.pinned && !b.pinned) return -1;
|
||||
if (!a.pinned && b.pinned) return 1;
|
||||
// Active reminders (due date in the past, not done/archived) rank
|
||||
// immediately under the pinned block.
|
||||
const aActive = _hasActiveReminder(a);
|
||||
const bActive = _hasActiveReminder(b);
|
||||
if (aActive && !bActive) return -1;
|
||||
if (!aActive && bActive) return 1;
|
||||
const so = (a.sort_order || 0) - (b.sort_order || 0);
|
||||
if (so !== 0) return so;
|
||||
return new Date(b.updated_at || 0) - new Date(a.updated_at || 0);
|
||||
});
|
||||
|
||||
|
||||
return sorted;
|
||||
}
|
||||
|
||||
function _userVisibleNotes() {
|
||||
return state.notes.filter(n => !_isCalendarReminderNote(n));
|
||||
}
|
||||
|
||||
return { _sortedVisibleNotes, _userVisibleNotes };
|
||||
}
|
||||
@@ -0,0 +1,182 @@
|
||||
/** Page-owned reminder scheduler and notification delivery workflow. */
|
||||
import { _hasTimeComponent, _isDueTodayOrOverdue, _advanceRecurring } from '../domain/recurrence.js';
|
||||
export function createNotesReminders({
|
||||
app,
|
||||
api,
|
||||
persistence,
|
||||
notifications,
|
||||
clock,
|
||||
scheduler,
|
||||
effects,
|
||||
fetchNotes,
|
||||
isNoteFullyDone,
|
||||
hasItems,
|
||||
dismissedKey
|
||||
}) {
|
||||
const state = app.state;
|
||||
const { _loadFiredReminders, _saveFiredReminders } = persistence;
|
||||
const _patchNote = api.patchNote;
|
||||
const _fetchNotes = fetchNotes;
|
||||
const _isNoteFullyDone = isNoteFullyDone;
|
||||
const _hasItems = hasItems;
|
||||
const REMINDER_DISMISSED_AT_KEY = dismissedKey;
|
||||
const _updateRailBadge = effects.badge;
|
||||
let _reminderTimer = null;
|
||||
let startupTimer = null;
|
||||
let started = false;
|
||||
let disposed = false;
|
||||
function _checkReminders() {
|
||||
if (!state.notes.length) return;
|
||||
const now = clock.now();
|
||||
const fired = _loadFiredReminders();
|
||||
let changed = false;
|
||||
for (const note of state.notes) {
|
||||
if (!note.due_date || note.archived) continue;
|
||||
if (!_hasTimeComponent(note.due_date)) continue;
|
||||
if (fired.has(note.id)) continue;
|
||||
const due = new Date(note.due_date).getTime();
|
||||
if (isNaN(due)) continue;
|
||||
if (due <= now && due > now - 60000) {
|
||||
_fireReminder(note);
|
||||
// Recurring? advance the due_date instead of marking as fired
|
||||
if (note.repeat && note.repeat !== 'none') {
|
||||
const next = _advanceRecurring(note.due_date, note.repeat, clock);
|
||||
if (next) {
|
||||
app.mergeNote(note, { due_date: next });
|
||||
_patchNote(note.id, { due_date: next }).catch(() => {});
|
||||
// Don't add to fired : new due_date is in the future
|
||||
continue;
|
||||
}
|
||||
}
|
||||
fired.add(note.id);
|
||||
changed = true;
|
||||
} else if (due <= now - 60000) {
|
||||
// Past, never seen : silently advance recurring or mark fired
|
||||
if (note.repeat && note.repeat !== 'none') {
|
||||
const next = _advanceRecurring(note.due_date, note.repeat, clock);
|
||||
if (next) {
|
||||
app.mergeNote(note, { due_date: next });
|
||||
_patchNote(note.id, { due_date: next }).catch(() => {});
|
||||
continue;
|
||||
}
|
||||
}
|
||||
fired.add(note.id);
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
if (changed) _saveFiredReminders(fired);
|
||||
// Always refresh badge : fired state may have changed visually without note mutation
|
||||
_updateRailBadge();
|
||||
}
|
||||
|
||||
function _fireReminder(note) {
|
||||
const title = note.title || 'Note reminder';
|
||||
// Include the verbatim note content so the email/notification actually
|
||||
// shows what to do, not just a count. Cap the per-item lines (8 max) and
|
||||
// total length so the body stays inbox-friendly.
|
||||
let rawBody;
|
||||
if (_hasItems(note)) {
|
||||
const pending = (note.items || [])
|
||||
.filter(i => !i.done && !i.checked)
|
||||
.map(i => (i.text || '').trim())
|
||||
.filter(Boolean);
|
||||
if (pending.length) {
|
||||
const shown = pending.slice(0, 8).map(t => `- ${t}`).join('\n');
|
||||
const extra = pending.length > 8 ? `\n…and ${pending.length - 8} more` : '';
|
||||
rawBody = `Pending (${pending.length}):\n${shown}${extra}`;
|
||||
} else {
|
||||
rawBody = `${(note.items || []).length} item${(note.items || []).length === 1 ? '' : 's'}`;
|
||||
}
|
||||
} else {
|
||||
rawBody = (note.content || '').slice(0, 400);
|
||||
}
|
||||
|
||||
// Ask the server to dispatch according to user settings. The server may
|
||||
// return an LLM-written synthesis line and/or send an email. We still show
|
||||
// a local browser notification so the user gets immediate feedback even if
|
||||
// the server path is disabled or slow.
|
||||
const showLocal = body => notifications.show(title, body, note.id);
|
||||
|
||||
// Fire-and-forget server dispatch. If synthesis comes back quickly enough,
|
||||
// use it as the notification body; otherwise the local notification has
|
||||
// already shown with the raw body.
|
||||
let shown = false;
|
||||
const timer = scheduler.setTimeout(() => { if (!shown) { shown = true; showLocal(rawBody); } }, 1500);
|
||||
|
||||
api.fireReminder({ note_id: note.id, title, body: rawBody })
|
||||
.then(r => r.ok ? r.json() : null)
|
||||
.then(data => {
|
||||
scheduler.clearTimeout(timer);
|
||||
if (shown) return;
|
||||
shown = true;
|
||||
const body = (data && data.synthesis) ? data.synthesis : rawBody;
|
||||
showLocal(body);
|
||||
})
|
||||
.catch(() => {
|
||||
scheduler.clearTimeout(timer);
|
||||
if (!shown) { shown = true; showLocal(rawBody); }
|
||||
});
|
||||
|
||||
// Pulse the card if visible; otherwise queue it so the next time the user
|
||||
// opens the notes panel the card gets a brief glow.
|
||||
effects.highlight(note.id);
|
||||
}
|
||||
|
||||
function _startReminderLoop() {
|
||||
if (disposed || _reminderTimer) return;
|
||||
_reminderTimer = scheduler.setInterval(_checkReminders, 30000);
|
||||
_checkReminders(); // run once immediately
|
||||
}
|
||||
|
||||
function _countDueReminders() {
|
||||
return state.notes.filter(n => !n.archived && _isDueTodayOrOverdue(n.due_date, clock) && !_isNoteFullyDone(n)).length;
|
||||
}
|
||||
|
||||
function _countFiredReminders() {
|
||||
// Reminders whose time has actually passed (not just date-today),
|
||||
// and which fired after the last user dismissal.
|
||||
const now = clock.now();
|
||||
return state.notes.filter(n => {
|
||||
if (n.archived || _isNoteFullyDone(n)) return false;
|
||||
if (!n.due_date || !_hasTimeComponent(n.due_date)) return false;
|
||||
const t = new Date(n.due_date).getTime();
|
||||
if (isNaN(t) || t > now) return false;
|
||||
return t > state.firedDotDismissedAt;
|
||||
}).length;
|
||||
}
|
||||
|
||||
function dismissFiredReminderDot() {
|
||||
app.setFiredDotDismissedAt(clock.now());
|
||||
try { persistence.setItem(REMINDER_DISMISSED_AT_KEY, String(state.firedDotDismissedAt)); } catch {}
|
||||
_updateRailBadge();
|
||||
}
|
||||
|
||||
async function refreshDueBadge(opts = {}) {
|
||||
// Usually lightweight, but callers that just created a note reminder can
|
||||
// force a refresh so the background reminder loop sees it immediately.
|
||||
if (opts.force || state.notes.length === 0) {
|
||||
try {
|
||||
const wasArchived = state.showingArchived;
|
||||
app.setShowingArchived(false);
|
||||
await _fetchNotes();
|
||||
app.setShowingArchived(wasArchived);
|
||||
} catch {}
|
||||
}
|
||||
_updateRailBadge();
|
||||
}
|
||||
|
||||
async function _initReminders() {
|
||||
try {
|
||||
const res = await api.listNotes(false);
|
||||
if (res.ok && !disposed) {
|
||||
const data = await res.json();
|
||||
app.replaceNotes(data.notes || data || []);
|
||||
_startReminderLoop();
|
||||
}
|
||||
} catch {}
|
||||
}
|
||||
|
||||
function start() { if (started || disposed) return; started = true; startupTimer = scheduler.setTimeout(_initReminders, 3000); }
|
||||
function dispose() { disposed = true; scheduler.clearTimeout(startupTimer); scheduler.clearInterval(_reminderTimer); _reminderTimer = null; }
|
||||
return { start, dispose, _checkReminders, _fireReminder, _startReminderLoop, _countDueReminders, _countFiredReminders, dismissFiredReminderDot, refreshDueBadge, _initReminders };
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
/** Selected-note attachment retains synchronous acceptance; bulk requests retain partial-failure behavior. */
|
||||
export function createSelectionOperations({
|
||||
app,
|
||||
api,
|
||||
effects,
|
||||
sendContext,
|
||||
exitSelection,
|
||||
fetchNotes
|
||||
}) {
|
||||
const state = app.state;
|
||||
function attachSelected() {
|
||||
const ids = [...state.selectedIds];
|
||||
if (!ids.length) return;
|
||||
const detail = { noteIds: ids, accepted: false };
|
||||
sendContext(detail);
|
||||
if (!detail.accepted) {
|
||||
effects.showToast('Choose a chat or model before attaching notes');
|
||||
return;
|
||||
}
|
||||
exitSelection();
|
||||
}
|
||||
async function archiveSelected() {
|
||||
const ids = [...state.selectedIds];
|
||||
if (!ids.length) return;
|
||||
await Promise.all(ids.map(id => api.patchNote(id, { archived: true }).catch(() => {})));
|
||||
exitSelection(); await fetchNotes(); effects.render(); effects.showToast(`Archived ${ids.length}`);
|
||||
}
|
||||
async function deleteSelected() {
|
||||
const ids = [...state.selectedIds];
|
||||
if (!ids.length) return;
|
||||
if (effects.styledConfirm) {
|
||||
const ok = await effects.styledConfirm(`Delete ${ids.length} note${ids.length === 1 ? '' : 's'}?`, { confirmText: 'Delete', danger: true });
|
||||
if (!ok) return;
|
||||
}
|
||||
await Promise.all(ids.map(id => api.deleteNote(id).catch(() => {})));
|
||||
exitSelection(); await fetchNotes(); effects.render(); effects.showToast(`Deleted ${ids.length}`);
|
||||
}
|
||||
return { attachSelected, archiveSelected, deleteSelected };
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
/** The sole Notes state owner. Views have live read-only access; writes use operations. */
|
||||
export function createNotesState(initial = {}) {
|
||||
const values = {
|
||||
open: false, notes: [], editingId: null, selectedIds: new Set(),
|
||||
activeLabel: null, activeFilter: null, reminderChipNext: 'reminders', searchQuery: '',
|
||||
viewMode: initial.viewMode || 'list', showingArchived: false, selectMode: false,
|
||||
suppressNextNoteTapId: null, labelsCollapsed: !!initial.labelsCollapsed,
|
||||
loading: false, firedDotDismissedAt: initial.firedDotDismissedAt || 0,
|
||||
};
|
||||
// Preserve captured note identity across asynchronous completions without
|
||||
// giving a view a writable reference to the application store.
|
||||
const views = new WeakMap(), targets = new WeakMap();
|
||||
const unwrap = value => targets.get(value) || value;
|
||||
// Copies built from views (spread, filter, map) still hold nested views;
|
||||
// store only raw data so the owner never keeps its own read-only views.
|
||||
function unwrapDeep(value, seen = new WeakSet()) {
|
||||
if (!value || typeof value !== 'object') return value;
|
||||
if (targets.has(value)) return targets.get(value);
|
||||
if (seen.has(value)) return value;
|
||||
seen.add(value);
|
||||
if (Array.isArray(value)) value.forEach((item, index) => { value[index] = unwrapDeep(item, seen); });
|
||||
else if (Object.getPrototypeOf(value) === Object.prototype) for (const key of Object.keys(value)) value[key] = unwrapDeep(value[key], seen);
|
||||
return value;
|
||||
}
|
||||
function readonly(value) {
|
||||
if (!value || typeof value !== 'object') return value;
|
||||
if (targets.has(value)) return value;
|
||||
if (views.has(value)) return views.get(value);
|
||||
const view = new Proxy(value, {
|
||||
get(target, key) {
|
||||
if (target instanceof Set) {
|
||||
if (['add', 'delete', 'clear'].includes(key)) return () => { throw new TypeError('Use Notes selection operations'); };
|
||||
if (key === 'valueOf') return () => views.get(target);
|
||||
if (key === 'forEach') return (callback, thisArg) => target.forEach(value => callback.call(thisArg, value, value, views.get(target)));
|
||||
const member = Reflect.get(target, key, target);
|
||||
return typeof member === 'function' ? member.bind(target) : member;
|
||||
}
|
||||
return readonly(Reflect.get(target, key));
|
||||
},
|
||||
set() { throw new TypeError('Use Notes state operations'); },
|
||||
deleteProperty() { throw new TypeError('Use Notes state operations'); },
|
||||
defineProperty() { throw new TypeError('Use Notes state operations'); },
|
||||
setPrototypeOf() { throw new TypeError('Use Notes state operations'); },
|
||||
preventExtensions() { throw new TypeError('Use Notes state operations'); },
|
||||
getOwnPropertyDescriptor(target, key) {
|
||||
const descriptor = Reflect.getOwnPropertyDescriptor(target, key);
|
||||
if (descriptor && 'value' in descriptor) return { ...descriptor, value: readonly(descriptor.value) };
|
||||
return descriptor;
|
||||
},
|
||||
});
|
||||
views.set(value, view); targets.set(view, value);
|
||||
return view;
|
||||
}
|
||||
const state = Object.freeze(Object.fromEntries(Object.keys(values).map(key => [key, () => readonly(values[key])])));
|
||||
const view = Object.freeze(Object.defineProperties({}, Object.fromEntries(Object.entries(state).map(([key, get]) => [key, { get, enumerable: true }]))));
|
||||
return {
|
||||
state: view,
|
||||
setOpen: value => { values.open = value; },
|
||||
setEditingId: value => { values.editingId = value; },
|
||||
setActiveLabel: value => { values.activeLabel = value; },
|
||||
setActiveFilter: value => { values.activeFilter = value; },
|
||||
setReminderChipNext: value => { values.reminderChipNext = value; },
|
||||
setSearchQuery: value => { values.searchQuery = value; },
|
||||
setViewMode: value => { values.viewMode = value; },
|
||||
setShowingArchived: value => { values.showingArchived = value; },
|
||||
setSelectMode: value => { values.selectMode = value; },
|
||||
setSuppressNextNoteTapId: value => { values.suppressNextNoteTapId = value; },
|
||||
setLabelsCollapsed: value => { values.labelsCollapsed = value; },
|
||||
setLoading: value => { values.loading = value; },
|
||||
setFiredDotDismissedAt: value => { values.firedDotDismissedAt = value; },
|
||||
replaceNotes: notes => { values.notes = notes; },
|
||||
removeNoteAt: index => readonly(values.notes.splice(index, 1)[0]),
|
||||
insertNoteAt: (index, note) => { values.notes.splice(index, 0, unwrapDeep(note)); },
|
||||
prependNote: note => { values.notes.unshift(unwrapDeep(note)); },
|
||||
replaceNoteAt: (index, note) => { values.notes[index] = unwrapDeep(note); },
|
||||
mergeNote: (note, patch) => { for (const [key, value] of Object.entries(patch)) unwrap(note)[key] = unwrapDeep(value); },
|
||||
updateItem: (note, index, patch) => { Object.assign(unwrap(unwrap(note).items[index]), unwrapDeep({ ...patch })); },
|
||||
spliceItems: (note, ...args) => unwrap(unwrap(note).items).splice(...args.map(arg => unwrapDeep(arg))),
|
||||
selectId: id => { values.selectedIds.add(id); },
|
||||
deselectId: id => values.selectedIds.delete(id),
|
||||
clearSelection: () => values.selectedIds.clear(),
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
/** Editor submission ordering, optimistic state, reminder rearming and save recovery. */
|
||||
export function createNotesSubmission({
|
||||
app,
|
||||
api,
|
||||
persistence,
|
||||
clock,
|
||||
uid,
|
||||
effects,
|
||||
fetchNotes
|
||||
}) {
|
||||
const state = app.state;
|
||||
const { _loadFiredReminders, _saveFiredReminders, _loadGlowedReminders, _saveGlowedReminders, _loadDraft, _clearDraft } = persistence;
|
||||
function submitNote(payload, note, isEdit) {
|
||||
// Reset fired reminder if due_date changed (so re-arm works), and also
|
||||
// clear the entry-glow seen flag so the new firing glows again on the
|
||||
// next time the user opens the panel.
|
||||
if (isEdit && note.due_date !== payload.due_date) {
|
||||
const fired = _loadFiredReminders();
|
||||
fired.delete(note.id);
|
||||
_saveFiredReminders(fired);
|
||||
const glowed = _loadGlowedReminders();
|
||||
glowed.delete(note.id);
|
||||
_saveGlowedReminders(glowed);
|
||||
effects.clearGlow(note.id);
|
||||
}
|
||||
// Edited notes move to the top of their section (under pinned). Compute
|
||||
// sort_order = (min unpinned sort_order) - 1 so the saved note sorts above
|
||||
// siblings; the pin block keeps its own ordering above this.
|
||||
if (!payload.pinned) {
|
||||
// Both edits AND newly-created notes anchor above the rest of the
|
||||
// unpinned section. Without this, freshly created notes sit at the
|
||||
// bottom because manually-reordered siblings already carry negative
|
||||
// sort_order values.
|
||||
const minUnpinned = state.notes
|
||||
.filter(n => !n.pinned && (!isEdit || n.id !== note.id))
|
||||
.reduce((m, n) => Math.min(m, n.sort_order || 0), 0);
|
||||
payload.sort_order = minUnpinned - 1;
|
||||
}
|
||||
// Optimistic update : update local state first, render, then save in background
|
||||
app.setEditingId(null);
|
||||
const draftId = isEdit ? note.id : '__new__';
|
||||
const submittedDraft = JSON.stringify(_loadDraft(draftId));
|
||||
if (isEdit) {
|
||||
const idx = state.notes.findIndex(n => n.id === note.id);
|
||||
if (idx >= 0) app.replaceNoteAt(idx, { ...state.notes[idx], ...payload });
|
||||
} else {
|
||||
app.prependNote({ ...payload, id: 'tmp_' + uid(), created_at: new Date(clock.now()).toISOString(), updated_at: new Date(clock.now()).toISOString() });
|
||||
}
|
||||
effects.render();
|
||||
// Background save
|
||||
api.saveNote(payload).then(saved => {
|
||||
if (JSON.stringify(_loadDraft(draftId)) === submittedDraft) _clearDraft(draftId);
|
||||
if (!isEdit && saved && saved.id) {
|
||||
// Replace temp ID with real one from server. AND re-render : the
|
||||
// existing card's `data-note-id="tmp_xxx"` is stale after Object.assign
|
||||
// bumps the in-memory id, so all subsequent clicks (edit, done, copy,
|
||||
// archive, delete) silently fail to find the note in `_notes`.
|
||||
const tmp = state.notes.find(n => n.id.startsWith('tmp_'));
|
||||
if (tmp) app.mergeNote(tmp, saved);
|
||||
effects.render();
|
||||
}
|
||||
}).catch(err => {
|
||||
effects.showError('Save failed: ' + err.message);
|
||||
fetchNotes().then(() => effects.render());
|
||||
});
|
||||
|
||||
}
|
||||
return { submitNote };
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
/** Notes CRUD, optimistic archive and in-memory undo workflows. */
|
||||
export function createNotesWorkflows({
|
||||
app,
|
||||
api,
|
||||
effects
|
||||
}) {
|
||||
const state = app.state;
|
||||
const _undoStack = [];
|
||||
const _renderNotes = effects.render;
|
||||
const _patchNote = api.patchNote;
|
||||
const uiModule = effects;
|
||||
function _pushUndo(entry) {
|
||||
_undoStack.push(entry);
|
||||
if (_undoStack.length > 20) _undoStack.shift();
|
||||
}
|
||||
|
||||
function _popAndRunUndo() {
|
||||
const entry = _undoStack.pop();
|
||||
if (entry) entry.run();
|
||||
return !!entry;
|
||||
}
|
||||
|
||||
function _undoArchive(note, prevIdx) {
|
||||
// Re-insert at original position and clear archived flag on the server.
|
||||
const safeIdx = Math.min(Math.max(prevIdx, 0), state.notes.length);
|
||||
app.insertNoteAt(safeIdx, { ...note, archived: false });
|
||||
_renderNotes();
|
||||
_patchNote(note.id, { archived: false }).catch(() => {
|
||||
// Roll back local insertion if the server refuses
|
||||
const i = state.notes.findIndex(n => n.id === note.id);
|
||||
if (i >= 0) app.removeNoteAt(i);
|
||||
_renderNotes();
|
||||
uiModule.showError('Undo failed');
|
||||
});
|
||||
}
|
||||
|
||||
function _archiveNoteById(id, { card = null, celebrate = false } = {}) {
|
||||
if (!id) return false;
|
||||
const idx = state.notes.findIndex(n => n.id === id);
|
||||
if (idx < 0) return false;
|
||||
const note = state.notes[idx];
|
||||
if (celebrate && card && note) effects.celebrateArchive(note, card);
|
||||
const removed = app.removeNoteAt(idx);
|
||||
app.setEditingId(null);
|
||||
_renderNotes();
|
||||
const undo = () => _undoArchive(removed, idx);
|
||||
_pushUndo({ label: 'archive', run: undo });
|
||||
_patchNote(id, { archived: true }).then(() => {
|
||||
effects.archived(undo);
|
||||
}).catch(() => {
|
||||
app.insertNoteAt(idx, removed);
|
||||
_renderNotes();
|
||||
uiModule.showError('Failed to archive');
|
||||
});
|
||||
return true;
|
||||
}
|
||||
|
||||
async function _fetchNotes() {
|
||||
app.setLoading(true);
|
||||
try {
|
||||
const res = await api.listNotes(state.showingArchived);
|
||||
if (!res.ok) { app.replaceNotes([]); return; }
|
||||
const data = await res.json();
|
||||
app.replaceNotes(data.notes || data || []);
|
||||
} catch (e) {
|
||||
console.error('Failed to fetch notes:', e);
|
||||
app.replaceNotes([]);
|
||||
} finally {
|
||||
app.setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
function _saveNote(note) { return api.saveNote(note); }
|
||||
|
||||
function _deleteNoteApi(id) { return api.deleteNote(id); }
|
||||
|
||||
return { _pushUndo, _popAndRunUndo, _undoArchive, _archiveNoteById, _fetchNotes, _saveNote, _deleteNoteApi, _patchNote, undoCount: () => _undoStack.length };
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
/** Pure Notes completion, tags, reminder and serialization rules. */
|
||||
import { _hasTimeComponent } from './recurrence.js';
|
||||
export function _isCalendarReminderNote(n) {
|
||||
return n && n.source === 'calendar' && n.label === 'calendar';
|
||||
}
|
||||
|
||||
export function _hasActiveReminder(n, clock) {
|
||||
if (!n || n.archived || _isNoteFullyDone(n)) return false;
|
||||
if (!n.due_date) return false;
|
||||
const t = new Date(n.due_date).getTime();
|
||||
return !isNaN(t) && t <= clock.now();
|
||||
}
|
||||
|
||||
export function _isNoteFullyDone(note) {
|
||||
if (_hasItems(note) && Array.isArray(note.items) && note.items.length > 0) {
|
||||
return note.items.every(it => it.done);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
export function _hasItems(note) {
|
||||
return note && (note.note_type === 'todo' || note.note_type === 'goal' || note.note_type === 'checklist');
|
||||
}
|
||||
|
||||
export function _goalProgress(note) {
|
||||
if (!Array.isArray(note?.items) || note.items.length === 0) return '';
|
||||
const done = note.items.filter(it => it.done).length;
|
||||
return ` ${done}/${note.items.length}`;
|
||||
}
|
||||
|
||||
export function _nextGoalStep(note) {
|
||||
if (!Array.isArray(note?.items)) return null;
|
||||
for (let i = 0; i < note.items.length; i++) {
|
||||
if (!note.items[i].done) return { idx: i, item: note.items[i] };
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export function _noteTags(n) {
|
||||
const tags = [];
|
||||
if (n?.label) tags.push(...n.label.trim().split(/\s+/).filter(Boolean));
|
||||
if (n?.due_date && _hasTimeComponent(n.due_date)) tags.push('reminder');
|
||||
return [...new Set(tags.map(t => t.replace(/^#+/, '').trim()).filter(Boolean))];
|
||||
}
|
||||
|
||||
export function _visibleNoteTags(n) {
|
||||
return _noteTags(n).filter(t => t !== 'reminder');
|
||||
}
|
||||
|
||||
export function _isPastReminder(n, clock) {
|
||||
if (!n?.due_date || !_hasTimeComponent(n.due_date)) return false;
|
||||
const due = new Date(n.due_date).getTime();
|
||||
return !isNaN(due) && due <= clock.now();
|
||||
}
|
||||
|
||||
export function _serializeNoteForCopy(note) {
|
||||
const lines = [];
|
||||
if (note.title) lines.push(note.title);
|
||||
if (note.content) lines.push(note.content);
|
||||
if (Array.isArray(note.items) && note.items.length) {
|
||||
if (lines.length) lines.push('');
|
||||
for (const it of note.items) {
|
||||
if (!it || !(it.text || '').trim()) continue;
|
||||
lines.push(`- [${it.done ? 'x' : ' '}] ${(it.text || '').trim()}`);
|
||||
}
|
||||
}
|
||||
return lines.join('\n').trim();
|
||||
}
|
||||
|
||||
export function _noteToAgentPrompt(note) {
|
||||
const parts = [];
|
||||
if ((note.title || '').trim()) parts.push(note.title.trim());
|
||||
if ((note.content || '').trim()) parts.push(note.content.trim());
|
||||
if (Array.isArray(note.items)) {
|
||||
note.items.filter(it => !it.done && (it.text || '').trim())
|
||||
.forEach(it => parts.push('- ' + it.text.trim()));
|
||||
}
|
||||
const body = parts.join('\n');
|
||||
return body ? `Help me get this done:\n\n${body}\n\nThe source note is read-only. Do not edit, replace, or update it.` : '';
|
||||
}
|
||||
|
||||
export function _standardVisualVariant(note) {
|
||||
const source = String(note?.id || note?.title || note?.created_at || 'standard-note');
|
||||
let hash = 0;
|
||||
for (let i = 0; i < source.length; i++) hash = ((hash << 5) - hash + source.charCodeAt(i)) | 0;
|
||||
return Math.abs(hash) % 5;
|
||||
}
|
||||
@@ -0,0 +1,269 @@
|
||||
// Local-time date and recurrence rules. Callers supply the clock at the original read sites.
|
||||
export const _ORDINALS = ['1st', '2nd', '3rd', '4th', '5th'];
|
||||
export const _DAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
|
||||
export function _hasTimeComponent(dateStr) {
|
||||
return typeof dateStr === 'string' && /T\d{2}:\d{2}/.test(dateStr);
|
||||
}
|
||||
|
||||
export function _formatDueDate(dateStr, clock) {
|
||||
if (!dateStr) return '';
|
||||
const d = new Date(dateStr);
|
||||
if (isNaN(d)) return '';
|
||||
const now = new Date(clock.now());
|
||||
const hasTime = _hasTimeComponent(dateStr);
|
||||
const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
|
||||
const due = new Date(d.getFullYear(), d.getMonth(), d.getDate());
|
||||
const diffDays = Math.round((due - today) / 86400000);
|
||||
const timeStr = hasTime ? d.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' }) : '';
|
||||
if (hasTime && d < now) return 'overdue';
|
||||
if (!hasTime && diffDays < 0) return 'overdue';
|
||||
if (diffDays === 0) return hasTime ? timeStr : 'today';
|
||||
if (diffDays === 1) return hasTime ? `tmrw ${timeStr}` : 'tomorrow';
|
||||
const dateLabel = d.toLocaleDateString([], { month: 'short', day: 'numeric' });
|
||||
return hasTime ? `${dateLabel} ${timeStr}` : dateLabel;
|
||||
}
|
||||
|
||||
export function _isDueOverdue(dateStr, clock) {
|
||||
if (!dateStr) return false;
|
||||
const d = new Date(dateStr);
|
||||
if (isNaN(d)) return false;
|
||||
if (_hasTimeComponent(dateStr)) return d < new Date(clock.now());
|
||||
return d < new Date(new Date(clock.now()).toDateString());
|
||||
}
|
||||
|
||||
export function _isDueTodayOrOverdue(dateStr, clock) {
|
||||
if (!dateStr) return false;
|
||||
const d = new Date(dateStr);
|
||||
const now = new Date(clock.now());
|
||||
const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
|
||||
const due = new Date(d.getFullYear(), d.getMonth(), d.getDate());
|
||||
return due <= today;
|
||||
}
|
||||
|
||||
export function _laterTodayDate(clock) {
|
||||
const now = new Date(clock.now());
|
||||
const eight = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 18, 0); // 6pm today
|
||||
// If less than 1 hour before 6pm, push to "in 3 hours" instead
|
||||
if (eight - now < 60 * 60 * 1000) return new Date(now.getTime() + 3 * 60 * 60 * 1000);
|
||||
return eight;
|
||||
}
|
||||
|
||||
export function _tomorrowDate(clock) {
|
||||
const t = new Date(clock.now());
|
||||
t.setDate(t.getDate() + 1);
|
||||
t.setHours(8, 0, 0, 0);
|
||||
return t;
|
||||
}
|
||||
|
||||
export function _nextWeekDate(clock) {
|
||||
const t = new Date(clock.now());
|
||||
const daysUntilMon = (8 - t.getDay()) % 7 || 7;
|
||||
t.setDate(t.getDate() + daysUntilMon);
|
||||
t.setHours(8, 0, 0, 0);
|
||||
return t;
|
||||
}
|
||||
|
||||
export function _toLocalDatetimeStr(d) {
|
||||
// Format as YYYY-MM-DDTHH:MM (local, no TZ)
|
||||
const pad = n => String(n).padStart(2, '0');
|
||||
return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`;
|
||||
}
|
||||
|
||||
export function _formatReminderTag(dateStr, clock) {
|
||||
if (!dateStr) return '';
|
||||
const d = new Date(dateStr);
|
||||
if (isNaN(d)) return '';
|
||||
const now = new Date(clock.now());
|
||||
const sameDay = d.toDateString() === now.toDateString();
|
||||
const tomorrow = new Date(now); tomorrow.setDate(tomorrow.getDate() + 1);
|
||||
const isTomorrow = d.toDateString() === tomorrow.toDateString();
|
||||
const time = d.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' });
|
||||
if (sameDay) return `Today, ${time}`;
|
||||
if (isTomorrow) return `Tomorrow, ${time}`;
|
||||
const dateLabel = d.toLocaleDateString([], { month: 'short', day: 'numeric' });
|
||||
return `${dateLabel}, ${time}`;
|
||||
}
|
||||
|
||||
export function _nthWeekdayLabel(d) {
|
||||
const n = Math.ceil(d.getDate() / 7); // 1..5
|
||||
return `${_ORDINALS[n - 1] || `${n}th`} ${_DAYS[d.getDay()]}`;
|
||||
}
|
||||
|
||||
export function _isLastWeekdayOfMonth(d) {
|
||||
const test = new Date(d);
|
||||
test.setDate(d.getDate() + 7);
|
||||
return test.getMonth() !== d.getMonth();
|
||||
}
|
||||
|
||||
export function _nthWeekdayOfMonth(year, month, weekday, n) {
|
||||
const first = new Date(year, month, 1);
|
||||
const offset = (weekday - first.getDay() + 7) % 7;
|
||||
let day = 1 + offset + (n - 1) * 7;
|
||||
// Last day of month
|
||||
const lastDay = new Date(year, month + 1, 0).getDate();
|
||||
if (day > lastDay) day -= 7;
|
||||
return new Date(year, month, day, 0, 0, 0);
|
||||
}
|
||||
|
||||
export function _lastWeekdayOfMonth(year, month, weekday) {
|
||||
const lastDay = new Date(year, month + 1, 0);
|
||||
const back = (lastDay.getDay() - weekday + 7) % 7;
|
||||
return new Date(year, month, lastDay.getDate() - back, 0, 0, 0);
|
||||
}
|
||||
|
||||
export function _snapToRepeat(currentDate, normRepeat, clock) {
|
||||
const hh = currentDate.getHours();
|
||||
const mm = currentDate.getMinutes();
|
||||
const now = clock.now();
|
||||
const anchor = currentDate.getTime() > now ? currentDate : new Date(clock.now());
|
||||
const parts = normRepeat.split(':');
|
||||
const kind = parts[0];
|
||||
if (kind === 'weekly') {
|
||||
const targetWd = parseInt(parts[1], 10);
|
||||
if (isNaN(targetWd)) return null;
|
||||
const d = new Date(anchor.getFullYear(), anchor.getMonth(), anchor.getDate(), hh, mm, 0, 0);
|
||||
const delta = (targetWd - d.getDay() + 7) % 7;
|
||||
d.setDate(d.getDate() + delta);
|
||||
if (d.getTime() <= now) d.setDate(d.getDate() + 7);
|
||||
return d;
|
||||
}
|
||||
if (kind === 'monthly') {
|
||||
const sub = parts[1];
|
||||
let y = anchor.getFullYear();
|
||||
let m = anchor.getMonth();
|
||||
// Walk forward up to 14 months to find the next matching slot.
|
||||
for (let tries = 0; tries < 14; tries++) {
|
||||
let target;
|
||||
if (sub === 'day') {
|
||||
const wantDay = parseInt(parts[2], 10);
|
||||
if (isNaN(wantDay)) return null;
|
||||
const lastDay = new Date(y, m + 1, 0).getDate();
|
||||
target = new Date(y, m, Math.min(wantDay, lastDay));
|
||||
} else if (sub === 'nth') {
|
||||
const n = parseInt(parts[2], 10);
|
||||
const wd = parseInt(parts[3], 10);
|
||||
if (isNaN(n) || isNaN(wd)) return null;
|
||||
target = _nthWeekdayOfMonth(y, m, wd, n);
|
||||
} else if (sub === 'last') {
|
||||
const wd = parseInt(parts[2], 10);
|
||||
if (isNaN(wd)) return null;
|
||||
target = _lastWeekdayOfMonth(y, m, wd);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
target.setHours(hh, mm, 0, 0);
|
||||
if (target.getTime() > now && target.getTime() >= anchor.getTime()) return target;
|
||||
m++;
|
||||
if (m > 11) { m = 0; y++; }
|
||||
}
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export function _formatRepeatLabel(repeat, originalDate) {
|
||||
if (!repeat || repeat === 'none') return '';
|
||||
const norm = _normalizeRepeat(repeat, originalDate);
|
||||
if (norm === 'daily') return 'Daily';
|
||||
if (norm === 'yearly') return 'Yearly';
|
||||
const parts = norm.split(':');
|
||||
if (parts[0] === 'weekly') {
|
||||
const wd = parseInt(parts[1], 10);
|
||||
if (isNaN(wd)) return 'Weekly';
|
||||
return `Weekly on ${_DAYS[wd]}s`;
|
||||
}
|
||||
if (parts[0] === 'monthly') {
|
||||
if (parts[1] === 'day') return `Monthly on day ${parts[2]}`;
|
||||
if (parts[1] === 'nth') {
|
||||
const n = parseInt(parts[2], 10);
|
||||
const wd = parseInt(parts[3], 10);
|
||||
return `Monthly on ${_ORDINALS[n - 1] || `${n}th`} ${_DAYS[wd]}`;
|
||||
}
|
||||
if (parts[1] === 'last') {
|
||||
const wd = parseInt(parts[2], 10);
|
||||
return `Monthly on last ${_DAYS[wd]}`;
|
||||
}
|
||||
}
|
||||
return norm;
|
||||
}
|
||||
|
||||
export function _normalizeRepeat(repeat, originalDate) {
|
||||
if (!repeat || repeat === 'none') return 'none';
|
||||
if (repeat === 'daily' || repeat === 'yearly') return repeat;
|
||||
if (/^(weekly|monthly):/.test(repeat)) return repeat;
|
||||
// Legacy bare values: derive params from the original date
|
||||
const wd = originalDate.getDay();
|
||||
const n = Math.ceil(originalDate.getDate() / 7);
|
||||
if (repeat === 'weekly') return `weekly:${wd}`;
|
||||
if (repeat === 'monthly') return `monthly:day:${originalDate.getDate()}`;
|
||||
if (repeat === 'monthly_nth_weekday') return `monthly:nth:${n}:${wd}`;
|
||||
if (repeat === 'monthly_last_weekday') return `monthly:last:${wd}`;
|
||||
return repeat;
|
||||
}
|
||||
|
||||
export function _advanceRecurring(dateStr, repeat, clock) {
|
||||
const orig = new Date(dateStr);
|
||||
const hh = orig.getHours();
|
||||
const mm = orig.getMinutes();
|
||||
let d = new Date(orig);
|
||||
const norm = _normalizeRepeat(repeat, orig);
|
||||
if (norm === 'none') return null;
|
||||
|
||||
function step() {
|
||||
if (norm === 'daily') {
|
||||
d.setDate(d.getDate() + 1);
|
||||
return;
|
||||
}
|
||||
if (norm === 'yearly') {
|
||||
d.setFullYear(d.getFullYear() + 1);
|
||||
return;
|
||||
}
|
||||
const parts = norm.split(':');
|
||||
const kind = parts[0];
|
||||
if (kind === 'weekly') {
|
||||
// Snap to the requested weekday in the next 1-7 days
|
||||
const targetWd = parseInt(parts[1], 10);
|
||||
let delta = (targetWd - d.getDay() + 7) % 7;
|
||||
if (delta === 0) delta = 7;
|
||||
d.setDate(d.getDate() + delta);
|
||||
d.setHours(hh, mm, 0, 0);
|
||||
return;
|
||||
}
|
||||
if (kind === 'monthly') {
|
||||
const sub = parts[1];
|
||||
const ny = d.getFullYear() + (d.getMonth() === 11 ? 1 : 0);
|
||||
const nm = (d.getMonth() + 1) % 12;
|
||||
let target;
|
||||
if (sub === 'day') {
|
||||
const wantDay = parseInt(parts[2], 10);
|
||||
const lastDay = new Date(ny, nm + 1, 0).getDate();
|
||||
target = new Date(ny, nm, Math.min(wantDay, lastDay));
|
||||
} else if (sub === 'nth') {
|
||||
const n = parseInt(parts[2], 10);
|
||||
const wd = parseInt(parts[3], 10);
|
||||
target = _nthWeekdayOfMonth(ny, nm, wd, n);
|
||||
} else if (sub === 'last') {
|
||||
const wd = parseInt(parts[2], 10);
|
||||
target = _lastWeekdayOfMonth(ny, nm, wd);
|
||||
} else {
|
||||
d = null; return;
|
||||
}
|
||||
target.setHours(hh, mm, 0, 0);
|
||||
d = target;
|
||||
return;
|
||||
}
|
||||
d = null;
|
||||
}
|
||||
|
||||
step();
|
||||
if (d === null) return null;
|
||||
const now = clock.now();
|
||||
// Cap catch-up to avoid runaway on a malformed/very-old date.
|
||||
let guard = 5000;
|
||||
while (d.getTime() <= now) {
|
||||
if (--guard <= 0) return null;
|
||||
step();
|
||||
if (d === null) return null;
|
||||
}
|
||||
return _toLocalDatetimeStr(d);
|
||||
}
|
||||
@@ -0,0 +1,503 @@
|
||||
/** Notes composition and intentional public API. The legacy entry activates compatibility startup. */
|
||||
import { createSelectionOperations } from './application/selection.js';
|
||||
import { createToolbar } from './ui/toolbar.js';
|
||||
import { createWindowLayout } from './ui/windowLayout.js';
|
||||
import { createCardOperations } from './application/cardOperations.js';
|
||||
import { createChecklistOperations } from './application/checklistOperations.js';
|
||||
import { createNotesSubmission } from './application/submission.js';
|
||||
import { createNotesDrafts } from './application/drafts.js';
|
||||
import { createNotesLifecycle } from './ui/lifecycle.js';
|
||||
import * as noteRules from './domain/noteRules.js';
|
||||
import { createText } from './ui/text.js';
|
||||
import { createColors } from './ui/colors.js';
|
||||
import { createPanel } from './ui/panel.js';
|
||||
import { createReminderDisplay } from './ui/reminderDisplay.js';
|
||||
import { createSelection } from './ui/selection.js';
|
||||
import { createFilters } from './ui/filters.js';
|
||||
import { createCardRendering } from './ui/cardRendering.js';
|
||||
import { createLayout } from './ui/layout.js';
|
||||
import { createQuickAdd } from './ui/quickAdd.js';
|
||||
import { createCardInteractions } from './ui/cardInteractions.js';
|
||||
import { createCardChecklist } from './ui/cardChecklist.js';
|
||||
import { createCardReorder } from './ui/cardReorder.js';
|
||||
import { createDraftEditor } from './ui/draftEditor.js';
|
||||
import { createEditor } from './ui/editor.js';
|
||||
import { createReminderPicker } from './ui/reminderPicker.js';
|
||||
import { createChecklist } from './ui/checklist.js';
|
||||
import { createDrawing } from './ui/drawing.js';
|
||||
import { createClipboard } from './ui/clipboard.js';
|
||||
import { createMobileEditor } from './ui/mobileEditor.js';
|
||||
import { createMobileReorder } from './ui/mobileReorder.js';
|
||||
import { createChecklistReorder } from './ui/checklistReorder.js';
|
||||
import { createQueries } from './application/queries.js';
|
||||
import { createAgentActions } from './application/agentActions.js';
|
||||
import { createDeletion } from './application/deletion.js';
|
||||
import { createNotesReminders } from './application/reminders.js';
|
||||
import { createNotesNotifications } from './infrastructure/notifications.js';
|
||||
import { createNotesState } from './application/state.js';
|
||||
import { createNotesWorkflows } from './application/workflows.js';
|
||||
import { createNotesApi } from './infrastructure/http.js';
|
||||
import { createNotesPersistence, REMINDER_DISMISSED_AT_KEY, NOTES_FIRST_OPEN_HINT_KEY, NOTES_LABELS_COLLAPSED_KEY } from './infrastructure/storage.js';
|
||||
import * as dates from './domain/recurrence.js';
|
||||
import uiModule from '/static/js/ui.js?v=20260916largetoolscroll1';
|
||||
import { spawnConfetti } from '/static/js/shared/ui/confetti.js';
|
||||
import * as Modals from '/static/js/modalManager.js';
|
||||
import { attachColorPicker } from '/static/js/colorPicker.js?v=20260910eyedropper1';
|
||||
import { makeWindowDraggable } from '/static/js/windowDrag.js';
|
||||
import { snapModalToZone } from '/static/js/tileManager.js?v=20260910responsivebounds1';
|
||||
import { applyEdgeDock, clearDockSide } from '/static/js/modalSnap.js';
|
||||
import { topToolWindowZ, topPortalZ } from '/static/js/toolWindowZOrder.js';
|
||||
import { bindMenuDismiss, dismissOrRemove } from '/static/js/escMenuStack.js';
|
||||
import { bindTourHintDismiss } from '/static/js/tourHintDismiss.js';
|
||||
|
||||
const api = createNotesApi({ origin: window.location.origin, request: (...args) => fetch(...args) });
|
||||
const persistence = createNotesPersistence({ storage: typeof localStorage === 'undefined' ? undefined : localStorage });
|
||||
const { _loadPendingHighlights, _loadGlowedReminders, _saveGlowedReminders, _loadActiveHighlights, _saveActiveHighlights, _savePendingHighlights, _loadFiredReminders, _saveFiredReminders, _draftKey, _loadDraft, _clearDraft } = persistence;
|
||||
const clock = { now: () => Date.now() };
|
||||
const app = createNotesState({
|
||||
viewMode: (typeof localStorage !== 'undefined' && localStorage.getItem('odysseus-notes-view')) || 'list',
|
||||
labelsCollapsed: typeof localStorage !== 'undefined' && localStorage.getItem(NOTES_LABELS_COLLAPSED_KEY) === '1',
|
||||
firedDotDismissedAt: (() => { try { const v = parseInt(persistence.getItem(REMINDER_DISMISSED_AT_KEY) || '0', 10); return Number.isFinite(v) && v > 0 ? v : 0; } catch { return 0; } })(),
|
||||
});
|
||||
const state = app.state;
|
||||
const lifecycle = createNotesLifecycle();
|
||||
const scheduler = { setTimeout: (...args) => setTimeout(...args), clearTimeout: id => clearTimeout(id), setInterval: (...args) => setInterval(...args), clearInterval: id => clearInterval(id) };
|
||||
const notifications = createNotesNotifications({ browser: window, notify: window.Notification, openPanel: () => openPanel(), toast: title => uiModule?.showToast?.(title) });
|
||||
const reminders = createNotesReminders({
|
||||
app,
|
||||
api,
|
||||
persistence,
|
||||
notifications,
|
||||
clock,
|
||||
scheduler,
|
||||
fetchNotes: () => _fetchNotes(),
|
||||
isNoteFullyDone: note => _isNoteFullyDone(note),
|
||||
hasItems: note => _hasItems(note),
|
||||
dismissedKey: REMINDER_DISMISSED_AT_KEY,
|
||||
effects: { badge: () => _updateRailBadge(), highlight: id => {
|
||||
_setReminderCardGlow(id, true);
|
||||
const card = document.querySelector(`.note-card[data-note-id="${id}"]`);
|
||||
if (card) { card.classList.add('note-card-reminder-fired'); setTimeout(() => card.classList.remove('note-card-reminder-fired'), 3000); }
|
||||
else _queuePendingHighlight(id);
|
||||
} }
|
||||
});
|
||||
const workflows = createNotesWorkflows({
|
||||
app,
|
||||
api,
|
||||
effects: {
|
||||
render: () => _renderNotes(),
|
||||
showError: (...args) => uiModule.showError(...args),
|
||||
archived: undo => uiModule.showToast('Archived', { duration: 6000, action: 'Undo', actionIcon: _NOTE_UNDO_ICON, onAction: undo, actionHint: 'Ctrl+Z' }),
|
||||
celebrateArchive: (note, card) => { if (_hasItems(note) && !(note.items || []).some(i => !i.done)) { const r = card.getBoundingClientRect(); spawnConfetti(r.left + r.width / 2, r.top + r.height / 2, 80); } },
|
||||
}
|
||||
});
|
||||
const _NOTE_UNDO_ICON = '<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:middle;"><polyline points="9 14 4 9 9 4"/><path d="M4 9h11a5 5 0 0 1 5 5v0a5 5 0 0 1-5 5H9"/></svg>';
|
||||
function _pushUndo(entry) { return workflows._pushUndo(entry); }
|
||||
function _popAndRunUndo() { return workflows._popAndRunUndo(); }
|
||||
function _undoArchive(note, prevIdx) { return workflows._undoArchive(note, prevIdx); }
|
||||
function _archiveNoteById(id, options) { return workflows._archiveNoteById(id, options); }
|
||||
function _fetchNotes() { return workflows._fetchNotes(); }
|
||||
|
||||
function _deleteNoteApi(id) { return workflows._deleteNoteApi(id); }
|
||||
function _patchNote(id, patch) { return workflows._patchNote(id, patch); }
|
||||
function _uid() { return Math.random().toString(36).slice(2, 10); }
|
||||
function _formatDueDate(dateStr) { return dates._formatDueDate(dateStr, clock); }
|
||||
function _isDueOverdue(dateStr) { return dates._isDueOverdue(dateStr, clock); }
|
||||
|
||||
function _laterTodayDate() { return dates._laterTodayDate(clock); }
|
||||
function _tomorrowDate() { return dates._tomorrowDate(clock); }
|
||||
function _nextWeekDate() { return dates._nextWeekDate(clock); }
|
||||
function _formatReminderTag(dateStr) { return dates._formatReminderTag(dateStr, clock); }
|
||||
function _snapToRepeat(currentDate, normRepeat) { return dates._snapToRepeat(currentDate, normRepeat, clock); }
|
||||
function _ensureNotificationPermission() { return notifications.ensurePermission(); }
|
||||
|
||||
function _startReminderLoop() { return reminders._startReminderLoop(); }
|
||||
|
||||
function _countFiredReminders() { return reminders._countFiredReminders(); }
|
||||
|
||||
function _hasActiveReminder(...args) { return noteRules._hasActiveReminder(...args, clock); }
|
||||
const _isNoteFullyDone = noteRules._isNoteFullyDone;
|
||||
const _hasItems = noteRules._hasItems;
|
||||
function _isPastReminder(...args) { return noteRules._isPastReminder(...args, clock); }
|
||||
function _esc(...args) { return text._esc(...args); }
|
||||
|
||||
function _safeImgSrc(...args) { return text._safeImgSrc(...args); }
|
||||
function _linkify(...args) { return text._linkify(...args); }
|
||||
function _isBgImage(...args) { return colors._isBgImage(...args); }
|
||||
|
||||
function _dotBg(...args) { return colors._dotBg(...args); }
|
||||
function _dotIsActive(...args) { return colors._dotIsActive(...args); }
|
||||
function _customColorStyle(...args) { return colors._customColorStyle(...args); }
|
||||
function _pickCustomBgImage(...args) { return colors._pickCustomBgImage(...args); }
|
||||
function _wireFormColors(...args) { return colors._wireFormColors(...args); }
|
||||
|
||||
function openPanel(...args) { return panel.openPanel(...args); }
|
||||
|
||||
function _smoothScrollToNoteCard(...args) { return panel._smoothScrollToNoteCard(...args); }
|
||||
function _clearViewedReminderGlows(...args) { return reminderDisplay._clearViewedReminderGlows(...args); }
|
||||
function _setReminderCardGlow(...args) { return reminderDisplay._setReminderCardGlow(...args); }
|
||||
function _queuePendingHighlight(...args) { return reminderDisplay._queuePendingHighlight(...args); }
|
||||
function _flushPendingHighlights(...args) { return reminderDisplay._flushPendingHighlights(...args); }
|
||||
function _updateRailBadge(...args) { return reminderDisplay._updateRailBadge(...args); }
|
||||
function _enterSelectMode(...args) { return selection._enterSelectMode(...args); }
|
||||
function _exitSelectMode(...args) { return selection._exitSelectMode(...args); }
|
||||
function _updateBulkBar(...args) { return selection._updateBulkBar(...args); }
|
||||
|
||||
function _renderLabelsInto(...args) { return filters._renderLabelsInto(...args); }
|
||||
function _renderLoadingSkeleton(...args) { return cardRendering._renderLoadingSkeleton(...args); }
|
||||
function _renderNotes(...args) { return cardRendering._renderNotes(...args); }
|
||||
function _captureCardPositions(...args) { return layout._captureCardPositions(...args); }
|
||||
function _animateReflow(...args) { return layout._animateReflow(...args); }
|
||||
function _applyMasonry(...args) { return layout._applyMasonry(...args); }
|
||||
function _renderQuickAdd(...args) { return quickAdd._renderQuickAdd(...args); }
|
||||
|
||||
function _editNote(...args) { return quickAdd._editNote(...args); }
|
||||
function _bindCardEvents(...args) { return cardInteractions._bindCardEvents(...args); }
|
||||
function _wireCardChecklist(...args) { return cardChecklist._wireCardChecklist(...args); }
|
||||
function _wireTodayView(...args) { return cardChecklist._wireTodayView(...args); }
|
||||
function _wireCardReorder(...args) { return cardReorder._wireCardReorder(...args); }
|
||||
|
||||
function _wireDraftAutosave(...args) { return draftEditor._wireDraftAutosave(...args); }
|
||||
function _commitOpenInPlaceEditor(...args) { return draftEditor._commitOpenInPlaceEditor(...args); }
|
||||
function _applyDraftToNote(...args) { return draftEditor._applyDraftToNote(...args); }
|
||||
function _buildForm(...args) { return editor._buildForm(...args); }
|
||||
function _wireReminderPicker(...args) { return reminderPicker._wireReminderPicker(...args); }
|
||||
function _buildGoalHtml(...args) { return checklist._buildGoalHtml(...args); }
|
||||
function _wireGoalForm(...args) { return checklist._wireGoalForm(...args); }
|
||||
function _buildChecklistHtml(...args) { return checklist._buildChecklistHtml(...args); }
|
||||
function _wireRow(...args) { return checklist._wireRow(...args); }
|
||||
function _wireChecklist(...args) { return checklist._wireChecklist(...args); }
|
||||
function _collectItems(...args) { return checklist._collectItems(...args); }
|
||||
function _buildDrawHtml(...args) { return drawing._buildDrawHtml(...args); }
|
||||
function _wireCanvas(...args) { return drawing._wireCanvas(...args); }
|
||||
function _uploadCanvasAsPng(...args) { return drawing._uploadCanvasAsPng(...args); }
|
||||
function _openNoteCornerMenu(...args) { return clipboard._openNoteCornerMenu(...args); }
|
||||
function _copyNote(...args) { return clipboard._copyNote(...args); }
|
||||
function _isNotesMobileMode(...args) { return mobileEditor._isNotesMobileMode(...args); }
|
||||
function _openMobileFullscreenEdit(...args) { return mobileEditor._openMobileFullscreenEdit(...args); }
|
||||
function _closeMobileFullscreenEdit(...args) { return mobileEditor._closeMobileFullscreenEdit(...args); }
|
||||
|
||||
function _bindLongPressDrag(...args) { return mobileReorder._bindLongPressDrag(...args); }
|
||||
|
||||
function _wireChecklistTouchReorder(...args) { return checklistReorder._wireChecklistTouchReorder(...args); }
|
||||
|
||||
function _sortedVisibleNotes(...args) { return queries._sortedVisibleNotes(...args); }
|
||||
function _userVisibleNotes(...args) { return queries._userVisibleNotes(...args); }
|
||||
function _agentSolveNote(...args) { return agentActions._agentSolveNote(...args); }
|
||||
|
||||
function _clearPastReminders(...args) { return deletion._clearPastReminders(...args); }
|
||||
const text = createText({
|
||||
uiModule
|
||||
});
|
||||
const colors = createColors({
|
||||
api
|
||||
});
|
||||
const { COLORS, COLOR_HEX } = colors;
|
||||
const windowLayout = createWindowLayout({
|
||||
makeWindowDraggable,
|
||||
snapModalToZone,
|
||||
clearDockSide,
|
||||
applyEdgeDock,
|
||||
topToolWindowZ
|
||||
});
|
||||
const toolbar = createToolbar({
|
||||
app,
|
||||
state,
|
||||
persistence,
|
||||
_renderNotes,
|
||||
_fetchNotes,
|
||||
_applyMasonry
|
||||
});
|
||||
const panel = createPanel({
|
||||
wireToolbar: toolbar.wireToolbar,
|
||||
wireSelectionActions: () => selection.wireSelectionActions(),
|
||||
_wireNotesWindow: windowLayout._wireNotesWindow,
|
||||
_restoreNotesSidebarDock: windowLayout._restoreNotesSidebarDock,
|
||||
_bringNotesToFront: windowLayout._bringNotesToFront,
|
||||
disposeUI: () => { layout.dispose(); mobileReorder.dispose(); checklistReorder.dispose(); lifecycle.dispose(); },
|
||||
lifecycle,
|
||||
Modals,
|
||||
NOTES_FIRST_OPEN_HINT_KEY,
|
||||
REMINDER_DISMISSED_AT_KEY,
|
||||
_clearViewedReminderGlows,
|
||||
_closeMobileFullscreenEdit,
|
||||
_commitOpenInPlaceEditor,
|
||||
_copyNote,
|
||||
_enterSelectMode,
|
||||
_exitSelectMode,
|
||||
_fetchNotes,
|
||||
_flushPendingHighlights,
|
||||
_isNotesMobileMode,
|
||||
_popAndRunUndo,
|
||||
_renderLoadingSkeleton,
|
||||
_renderNotes,
|
||||
_startReminderLoop,
|
||||
app,
|
||||
bindTourHintDismiss,
|
||||
dismissOrRemove,
|
||||
persistence,
|
||||
state,
|
||||
workflows
|
||||
});
|
||||
const reminderDisplay = createReminderDisplay({
|
||||
_countFiredReminders,
|
||||
_hasActiveReminder,
|
||||
_loadActiveHighlights,
|
||||
_loadGlowedReminders,
|
||||
_loadPendingHighlights,
|
||||
_saveActiveHighlights,
|
||||
_saveGlowedReminders,
|
||||
_savePendingHighlights,
|
||||
_smoothScrollToNoteCard,
|
||||
state
|
||||
});
|
||||
const selectionOperations = createSelectionOperations({
|
||||
app,
|
||||
api,
|
||||
fetchNotes: _fetchNotes,
|
||||
exitSelection: _exitSelectMode,
|
||||
sendContext: detail => window.dispatchEvent(new CustomEvent('odysseus:notes-context-selected', { detail })),
|
||||
effects: { render: _renderNotes, styledConfirm: uiModule.styledConfirm, showToast: (...args) => uiModule.showToast(...args) }
|
||||
});
|
||||
const selection = createSelection({
|
||||
operations: selectionOperations,
|
||||
_renderNotes,
|
||||
app,
|
||||
state
|
||||
});
|
||||
const filters = createFilters({
|
||||
NOTES_LABELS_COLLAPSED_KEY,
|
||||
_clearPastReminders,
|
||||
_esc,
|
||||
_isPastReminder,
|
||||
_renderNotes,
|
||||
_userVisibleNotes,
|
||||
app,
|
||||
persistence,
|
||||
state
|
||||
});
|
||||
const cardRendering = createCardRendering({
|
||||
COLORS,
|
||||
COLOR_HEX,
|
||||
_animateReflow,
|
||||
_applyMasonry,
|
||||
_bindCardEvents,
|
||||
_captureCardPositions,
|
||||
_customColorStyle,
|
||||
_dotBg,
|
||||
_dotIsActive,
|
||||
_esc,
|
||||
_formatDueDate,
|
||||
_formatReminderTag,
|
||||
_hasActiveReminder,
|
||||
_isBgImage,
|
||||
_isDueOverdue,
|
||||
_isNotesMobileMode,
|
||||
_linkify,
|
||||
_loadActiveHighlights,
|
||||
_renderLabelsInto,
|
||||
_renderQuickAdd,
|
||||
_safeImgSrc,
|
||||
_sortedVisibleNotes,
|
||||
_updateRailBadge,
|
||||
_wireTodayView,
|
||||
state,
|
||||
uiModule
|
||||
});
|
||||
const layout = createLayout({
|
||||
isOpen: () => state.open
|
||||
});
|
||||
const quickAdd = createQuickAdd({
|
||||
_applyDraftToNote,
|
||||
_applyMasonry,
|
||||
_buildForm,
|
||||
app,
|
||||
openPanel,
|
||||
state,
|
||||
uiModule
|
||||
});
|
||||
const cardOperations = createCardOperations({
|
||||
app,
|
||||
api,
|
||||
pushUndo: _pushUndo,
|
||||
undoArchive: _undoArchive,
|
||||
effects: { render: _renderNotes, showError: (...args) => uiModule.showError(...args), showToast: (...args) => uiModule.showToast(...args), archived: undo => uiModule.showToast('Archived', { duration: 6000, action: 'Undo', actionIcon: _NOTE_UNDO_ICON, onAction: undo, actionHint: 'Ctrl+Z' }) }
|
||||
});
|
||||
const checklistOperations = createChecklistOperations({
|
||||
app,
|
||||
api,
|
||||
uid: _uid,
|
||||
effects: { render: _renderNotes, showError: (...args) => uiModule.showError(...args) }
|
||||
});
|
||||
const cardInteractions = createCardInteractions({
|
||||
cardOperations,
|
||||
COLORS,
|
||||
_archiveNoteById,
|
||||
_bindLongPressDrag,
|
||||
_customColorStyle,
|
||||
_dotBg,
|
||||
_dotIsActive,
|
||||
_editNote,
|
||||
_isBgImage,
|
||||
_isNotesMobileMode,
|
||||
_openMobileFullscreenEdit,
|
||||
_openNoteCornerMenu,
|
||||
_pickCustomBgImage,
|
||||
_renderNotes,
|
||||
_setReminderCardGlow,
|
||||
_smoothScrollToNoteCard,
|
||||
_updateBulkBar,
|
||||
_wireCardChecklist,
|
||||
_wireCardReorder,
|
||||
app,
|
||||
spawnConfetti,
|
||||
state,
|
||||
uiModule
|
||||
});
|
||||
const cardChecklist = createCardChecklist({
|
||||
checklistOperations,
|
||||
_editNote,
|
||||
_renderNotes,
|
||||
app,
|
||||
spawnConfetti,
|
||||
state
|
||||
});
|
||||
const cardReorder = createCardReorder({
|
||||
persistOrder: cardOperations.persistOrder,
|
||||
lifecycle,
|
||||
_isNotesMobileMode,
|
||||
state
|
||||
});
|
||||
const draftEditor = createDraftEditor({
|
||||
bindDraft: (...args) => drafts.bindDraft(...args),
|
||||
_collectItems,
|
||||
_loadDraft
|
||||
});
|
||||
const editor = createEditor({
|
||||
deleteFromEditor: id => deletion.deleteFromEditor(id),
|
||||
submitNote: (...args) => submission.submitNote(...args),
|
||||
COLORS,
|
||||
_applyMasonry,
|
||||
_archiveNoteById,
|
||||
_buildChecklistHtml,
|
||||
_buildDrawHtml,
|
||||
_buildGoalHtml,
|
||||
_collectItems,
|
||||
_customColorStyle,
|
||||
_dotBg,
|
||||
_dotIsActive,
|
||||
_esc,
|
||||
_isBgImage,
|
||||
_renderNotes,
|
||||
_safeImgSrc,
|
||||
_uid,
|
||||
_uploadCanvasAsPng,
|
||||
_wireCanvas,
|
||||
_wireChecklist,
|
||||
_wireDraftAutosave,
|
||||
_wireFormColors,
|
||||
_wireGoalForm,
|
||||
_wireReminderPicker,
|
||||
api,
|
||||
app,
|
||||
state,
|
||||
uiModule
|
||||
});
|
||||
const reminderPicker = createReminderPicker({
|
||||
lifecycle,
|
||||
_ensureNotificationPermission,
|
||||
_esc,
|
||||
_formatReminderTag,
|
||||
_laterTodayDate,
|
||||
_nextWeekDate,
|
||||
_snapToRepeat,
|
||||
_tomorrowDate,
|
||||
bindMenuDismiss,
|
||||
dismissOrRemove
|
||||
});
|
||||
const checklist = createChecklist({
|
||||
_esc,
|
||||
_uid,
|
||||
spawnConfetti
|
||||
});
|
||||
const drawing = createDrawing({
|
||||
lifecycle,
|
||||
_safeImgSrc,
|
||||
api,
|
||||
attachColorPicker
|
||||
});
|
||||
const clipboard = createClipboard({
|
||||
_agentSolveNote,
|
||||
bindMenuDismiss,
|
||||
dismissOrRemove,
|
||||
state,
|
||||
topPortalZ,
|
||||
uiModule
|
||||
});
|
||||
const mobileEditor = createMobileEditor({
|
||||
_applyDraftToNote,
|
||||
_buildForm,
|
||||
_fetchNotes,
|
||||
_linkify,
|
||||
_renderNotes,
|
||||
_uid,
|
||||
_wireChecklistTouchReorder,
|
||||
_wireRow,
|
||||
app,
|
||||
state,
|
||||
uiModule
|
||||
});
|
||||
const mobileReorder = createMobileReorder({
|
||||
commitMobileOrder: cardOperations.commitMobileOrder,
|
||||
lifecycle,
|
||||
_applyMasonry,
|
||||
_enterSelectMode,
|
||||
app
|
||||
});
|
||||
const checklistReorder = createChecklistReorder({
|
||||
lifecycle
|
||||
});
|
||||
const queries = createQueries({
|
||||
_hasActiveReminder,
|
||||
state
|
||||
});
|
||||
const agentActions = createAgentActions({
|
||||
_patchNote,
|
||||
_renderNotes,
|
||||
api,
|
||||
app,
|
||||
createFormData: () => new FormData(),
|
||||
state,
|
||||
streamComplete: sid => { try { window.sessionModule?.markStreamComplete?.(sid); } catch {} },
|
||||
uiModule
|
||||
});
|
||||
const deletion = createDeletion({
|
||||
app,
|
||||
_deleteNoteApi,
|
||||
_fetchNotes,
|
||||
_isPastReminder,
|
||||
_renderNotes,
|
||||
effects: { styledConfirm: uiModule.styledConfirm, confirm: message => confirm(message), showToast: (...args) => uiModule.showToast(...args), showError: (...args) => uiModule.showError(...args) },
|
||||
state
|
||||
});
|
||||
const notesModule = { openPanel: panel.openPanel, closePanel: panel.closePanel, togglePanel: panel.togglePanel, isPanelOpen: panel.isPanelOpen, openNote: panel.openNote, newNote: quickAdd.newNote, openNotes: panel.openPanel, closeNotes: panel.closePanel, isNotesOpen: panel.isPanelOpen, refreshDueBadge: reminders.refreshDueBadge };
|
||||
const publicOpenPanel = panel.openPanel, publicClosePanel = panel.closePanel, publicTogglePanel = panel.togglePanel, publicIsPanelOpen = panel.isPanelOpen, publicOpenNote = panel.openNote, publicNewNote = quickAdd.newNote, publicRefreshDueBadge = reminders.refreshDueBadge, publicDismissFiredReminderDot = reminders.dismissFiredReminderDot;
|
||||
export { publicOpenPanel as openPanel, publicClosePanel as closePanel, publicTogglePanel as togglePanel, publicIsPanelOpen as isPanelOpen, publicOpenNote as openNote, publicNewNote as newNote, publicRefreshDueBadge as refreshDueBadge, publicDismissFiredReminderDot as dismissFiredReminderDot, publicOpenPanel as openNotes, publicClosePanel as closeNotes, publicIsPanelOpen as isNotesOpen };
|
||||
export function startNotesBackground() { reminders.start(); }
|
||||
export default notesModule;
|
||||
const submission = createNotesSubmission({
|
||||
app,
|
||||
api,
|
||||
persistence,
|
||||
clock,
|
||||
uid: _uid,
|
||||
fetchNotes: _fetchNotes,
|
||||
effects: { render: _renderNotes, showError: (...args) => uiModule.showError(...args), clearGlow: id => _setReminderCardGlow(id, false) }
|
||||
});
|
||||
const drafts = createNotesDrafts({
|
||||
app,
|
||||
api,
|
||||
persistence,
|
||||
scheduler,
|
||||
effects: { showError: (...args) => uiModule.showError(...args) }
|
||||
});
|
||||
@@ -0,0 +1,29 @@
|
||||
/** Notes HTTP port. Response interpretation stays with the owning workflow. */
|
||||
export function createNotesApi({ origin, request }) {
|
||||
const json = (method, body) => ({ method, credentials: 'same-origin', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
|
||||
async function saveNote(note) {
|
||||
const response = await request(note.id ? `${origin}/api/notes/${note.id}` : `${origin}/api/notes`, json(note.id ? 'PUT' : 'POST', note));
|
||||
if (!response.ok) throw new Error('Failed to save note');
|
||||
return await response.json();
|
||||
}
|
||||
async function patchNote(id, patch) {
|
||||
const response = await request(`${origin}/api/notes/${id}`, json('PUT', patch));
|
||||
if (!response.ok) throw new Error('Failed to update note');
|
||||
return await response.json();
|
||||
}
|
||||
async function deleteNote(id) {
|
||||
const response = await request(`${origin}/api/notes/${id}`, { method: 'DELETE', credentials: 'same-origin' });
|
||||
if (!response.ok) throw new Error('HTTP ' + response.status);
|
||||
}
|
||||
return {
|
||||
saveNote, patchNote, deleteNote,
|
||||
listNotes: archived => request(`${origin}/api/notes${archived ? '?archived=true' : ''}`, { credentials: 'same-origin' }),
|
||||
reorder: ids => request(`${origin}/api/notes/reorder`, json('POST', { ids })),
|
||||
upload: body => request(`${origin}/api/upload`, { method: 'POST', body, credentials: 'same-origin' }),
|
||||
uploadUrl: id => `${origin}/api/upload/${id}`,
|
||||
fireReminder: body => request('/api/notes/fire-reminder', json('POST', body)),
|
||||
defaultChat: () => request(`${origin}/api/default-chat`, { credentials: 'same-origin' }),
|
||||
createSession: body => request(`${origin}/api/session`, { method: 'POST', body, credentials: 'same-origin' }),
|
||||
startChat: body => request(`${origin}/api/chat_stream`, { method: 'POST', body, credentials: 'same-origin' }),
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
/** Browser notification permission/display port, independent of Notes rendering. */
|
||||
export function createNotesNotifications({ browser, notify, openPanel, toast }) {
|
||||
async function ensurePermission() {
|
||||
if (!('Notification' in browser)) return false;
|
||||
if (notify.permission === 'granted') return true;
|
||||
if (notify.permission === 'denied') return false;
|
||||
try { return await notify.requestPermission() === 'granted'; }
|
||||
catch { return false; }
|
||||
}
|
||||
function show(title, body, noteId) {
|
||||
if ('Notification' in browser && notify.permission === 'granted') {
|
||||
try {
|
||||
const notification = new notify(title, { body, tag: 'note-' + noteId, icon: '/static/favicon.ico' });
|
||||
notification.onclick = () => { browser.focus(); openPanel(); notification.close(); };
|
||||
} catch {}
|
||||
}
|
||||
toast(title);
|
||||
}
|
||||
return { ensurePermission, show };
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
/** Browser persistence and unchanged Notes key/serialization contracts. */
|
||||
export const REMINDER_FIRED_KEY = 'odysseus-notes-reminder-fired';
|
||||
export const REMINDER_GLOWED_KEY = 'odysseus-notes-reminder-glowed';
|
||||
export const REMINDER_PENDING_HIGHLIGHT_KEY = 'odysseus-notes-reminder-pending-highlight';
|
||||
export const REMINDER_ACTIVE_HIGHLIGHT_KEY = 'odysseus-notes-reminder-active-highlight';
|
||||
export const REMINDER_DISMISSED_AT_KEY = 'odysseus-notes-reminder-dismissed-at';
|
||||
export const NOTES_FIRST_OPEN_HINT_KEY = 'odysseus-notes-first-open-hint-v1';
|
||||
export const NOTES_LABELS_COLLAPSED_KEY = 'odysseus-notes-labels-collapsed';
|
||||
export const _DRAFT_PREFIX = 'odysseus-note-draft-';
|
||||
|
||||
export function createNotesPersistence({ storage: localStorage }) {
|
||||
function _loadPendingHighlights() {
|
||||
try { return new Set(JSON.parse(localStorage.getItem(REMINDER_PENDING_HIGHLIGHT_KEY) || '[]')); }
|
||||
catch { return new Set(); }
|
||||
}
|
||||
|
||||
function _loadGlowedReminders() {
|
||||
try { return new Set(JSON.parse(localStorage.getItem(REMINDER_GLOWED_KEY) || '[]')); }
|
||||
catch { return new Set(); }
|
||||
}
|
||||
|
||||
function _saveGlowedReminders(set) {
|
||||
try { localStorage.setItem(REMINDER_GLOWED_KEY, JSON.stringify([...set])); } catch {}
|
||||
}
|
||||
|
||||
function _loadActiveHighlights() {
|
||||
try { return new Set(JSON.parse(localStorage.getItem(REMINDER_ACTIVE_HIGHLIGHT_KEY) || '[]')); }
|
||||
catch { return new Set(); }
|
||||
}
|
||||
|
||||
function _saveActiveHighlights(set) {
|
||||
try { localStorage.setItem(REMINDER_ACTIVE_HIGHLIGHT_KEY, JSON.stringify([...set])); } catch {}
|
||||
}
|
||||
|
||||
function _savePendingHighlights(set) {
|
||||
try { localStorage.setItem(REMINDER_PENDING_HIGHLIGHT_KEY, JSON.stringify([...set])); }
|
||||
catch {}
|
||||
}
|
||||
|
||||
function _loadFiredReminders() {
|
||||
try { return new Set(JSON.parse(localStorage.getItem(REMINDER_FIRED_KEY) || '[]')); }
|
||||
catch { return new Set(); }
|
||||
}
|
||||
|
||||
function _saveFiredReminders(set) {
|
||||
try { localStorage.setItem(REMINDER_FIRED_KEY, JSON.stringify([...set])); }
|
||||
catch {}
|
||||
}
|
||||
|
||||
function _draftKey(id) { return _DRAFT_PREFIX + (id || '__new__'); }
|
||||
|
||||
function _loadDraft(id) {
|
||||
try { return JSON.parse(localStorage.getItem(_draftKey(id)) || 'null'); } catch { return null; }
|
||||
}
|
||||
|
||||
function _clearDraft(id) { try { localStorage.removeItem(_draftKey(id)); } catch {} }
|
||||
|
||||
return { _loadPendingHighlights, _loadGlowedReminders, _saveGlowedReminders, _loadActiveHighlights, _saveActiveHighlights, _savePendingHighlights, _loadFiredReminders, _saveFiredReminders, _draftKey, _loadDraft, _clearDraft,
|
||||
getItem: key => localStorage.getItem(key),
|
||||
setItem: (key, value) => localStorage.setItem(key, value),
|
||||
removeItem: key => localStorage.removeItem(key),
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,148 @@
|
||||
/** Card checklist editing and Today-step interactions. */
|
||||
export function createCardChecklist({
|
||||
checklistOperations,
|
||||
_editNote,
|
||||
_renderNotes,
|
||||
app,
|
||||
spawnConfetti,
|
||||
state
|
||||
}) {
|
||||
function _wireCardChecklist(body) {
|
||||
// Remove a single checklist item (hover X)
|
||||
body.querySelectorAll('.note-checkbox-rm').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
if (state.selectMode) return;
|
||||
const noteId = btn.dataset.noteId;
|
||||
const idx = parseInt(btn.dataset.idx);
|
||||
checklistOperations.removeItem(noteId, idx);
|
||||
});
|
||||
});
|
||||
|
||||
function _startChecklistItemEdit(noteId, idx, span) {
|
||||
if (span.isContentEditable) return;
|
||||
const note = state.notes.find(n => n.id === noteId);
|
||||
if (!note || !Array.isArray(note.items) || !note.items[idx]) return;
|
||||
|
||||
span.textContent = note.items[idx].text || '';
|
||||
span.contentEditable = "true";
|
||||
span.spellcheck = false;
|
||||
span.focus();
|
||||
|
||||
const selection = window.getSelection();
|
||||
const range = document.createRange();
|
||||
range.selectNodeContents(span);
|
||||
selection.removeAllRanges();
|
||||
selection.addRange(range);
|
||||
|
||||
const save = () => {
|
||||
if (!span.isContentEditable) return;
|
||||
span.contentEditable = "false";
|
||||
const newText = span.textContent.trim();
|
||||
checklistOperations.editItem(note, idx, newText);
|
||||
};
|
||||
|
||||
const onKeydown = (e) => {
|
||||
if (e.key === 'Enter') {
|
||||
e.preventDefault();
|
||||
save();
|
||||
} else if (e.key === 'Escape') {
|
||||
e.preventDefault();
|
||||
span.contentEditable = "false";
|
||||
_renderNotes();
|
||||
}
|
||||
};
|
||||
|
||||
span.addEventListener('blur', save, { once: true });
|
||||
span.addEventListener('keydown', onKeydown);
|
||||
}
|
||||
|
||||
// Edit a single checklist item (hover Edit button)
|
||||
body.querySelectorAll('.note-checkbox-edit').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
if (state.selectMode) return;
|
||||
const noteId = btn.dataset.noteId;
|
||||
const idx = parseInt(btn.dataset.idx);
|
||||
const span = btn.parentElement.querySelector('.note-check-text');
|
||||
if (span) _startChecklistItemEdit(noteId, idx, span);
|
||||
});
|
||||
});
|
||||
|
||||
// Prevent clicks from toggling the row while actively editing inline
|
||||
body.querySelectorAll('.note-check-text').forEach(span => {
|
||||
span.addEventListener('click', (e) => {
|
||||
if (span.isContentEditable) {
|
||||
e.stopPropagation();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Quick-add new checklist item (hover input at bottom of todo cards)
|
||||
body.querySelectorAll('.note-cl-quickadd-input').forEach(input => {
|
||||
input.addEventListener('click', (e) => e.stopPropagation());
|
||||
input.addEventListener('keydown', async (e) => {
|
||||
e.stopPropagation();
|
||||
if (e.key !== 'Enter') return;
|
||||
e.preventDefault();
|
||||
const text = input.value.trim();
|
||||
if (!text) return;
|
||||
const noteId = input.dataset.noteId;
|
||||
const persist = checklistOperations.addItem(noteId, text, () => { input.value = ''; });
|
||||
if (!persist) return;
|
||||
// Refocus the input on the same card
|
||||
setTimeout(() => {
|
||||
const next = document.querySelector(`.note-cl-quickadd-input[data-note-id="${noteId}"]`);
|
||||
if (next) next.focus();
|
||||
}, 0);
|
||||
persist();
|
||||
});
|
||||
});
|
||||
|
||||
// Checkboxes (dot toggle, optimistic) : disabled in select mode
|
||||
body.querySelectorAll('.note-checkbox').forEach(el => {
|
||||
el.addEventListener('click', (e) => {
|
||||
if (state.selectMode) return; // let card-level handler take over
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
const noteId = el.dataset.noteId;
|
||||
const idx = parseInt(el.dataset.idx);
|
||||
checklistOperations.toggleItem(noteId, idx, done => el.classList.toggle('done', done), () => {
|
||||
const card = el.closest('.note-card');
|
||||
if (card) { const r = card.getBoundingClientRect(); spawnConfetti(r.left + r.width / 2, r.top + r.height / 2, 60); }
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
function _wireTodayView(body) {
|
||||
body.querySelectorAll('.notes-today-row .note-check-dot').forEach(dot => {
|
||||
dot.addEventListener('click', async (e) => {
|
||||
e.stopPropagation();
|
||||
const id = dot.dataset.noteId;
|
||||
const idx = parseInt(dot.dataset.idx);
|
||||
const row = dot.closest('.notes-today-row');
|
||||
await checklistOperations.toggleTodayStep(id, idx, () => row?.classList.add('done'), () => {
|
||||
const r = (row || dot).getBoundingClientRect();
|
||||
spawnConfetti(r.left + r.width / 2, r.top + r.height / 2, 60);
|
||||
});
|
||||
});
|
||||
});
|
||||
body.querySelectorAll('.notes-today-title').forEach(el => {
|
||||
el.addEventListener('click', () => {
|
||||
const id = el.dataset.noteId;
|
||||
if (!id) return;
|
||||
// Drop the Today filter first so the regular card list is rendered;
|
||||
// _editNote needs to find a .note-card in the DOM to replace with
|
||||
// the editor form.
|
||||
app.setActiveFilter(null);
|
||||
_renderNotes();
|
||||
_editNote(id);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
return { _wireCardChecklist, _wireTodayView };
|
||||
}
|
||||
@@ -0,0 +1,337 @@
|
||||
/** Card taps, pin/color controls, menus and archive animation. */
|
||||
export function createCardInteractions({
|
||||
cardOperations,
|
||||
COLORS,
|
||||
_archiveNoteById,
|
||||
_bindLongPressDrag,
|
||||
_customColorStyle,
|
||||
_dotBg,
|
||||
_dotIsActive,
|
||||
_editNote,
|
||||
_isBgImage,
|
||||
_isNotesMobileMode,
|
||||
_openMobileFullscreenEdit,
|
||||
_openNoteCornerMenu,
|
||||
_pickCustomBgImage,
|
||||
_renderNotes,
|
||||
_setReminderCardGlow,
|
||||
_smoothScrollToNoteCard,
|
||||
_updateBulkBar,
|
||||
_wireCardChecklist,
|
||||
_wireCardReorder,
|
||||
app,
|
||||
spawnConfetti,
|
||||
state,
|
||||
uiModule
|
||||
}) {
|
||||
function _bindCardEvents(body) {
|
||||
// Skip completed leading rows so the first unfinished checklist item is
|
||||
// visible when a note preview has its own scroll area.
|
||||
requestAnimationFrame(() => {
|
||||
body.querySelectorAll('.note-checklist-preview').forEach(preview => {
|
||||
const firstPending = preview.querySelector('.note-checkbox:not(.done)');
|
||||
if (firstPending) preview.scrollTop = Math.max(0, firstPending.offsetTop - 4);
|
||||
});
|
||||
});
|
||||
const tapToEditOrSelect = (cardEl) => {
|
||||
const id = cardEl.dataset.noteId;
|
||||
// A long-press enters select mode and re-renders the card. Ignore the
|
||||
// synthetic click that mobile browsers emit when that same touch ends.
|
||||
if (state.suppressNextNoteTapId === id) {
|
||||
app.setSuppressNextNoteTapId(null);
|
||||
return;
|
||||
}
|
||||
if (state.selectMode) {
|
||||
const cb = cardEl.querySelector('.note-card-cb');
|
||||
if (cb) {
|
||||
cb.checked = !cb.checked;
|
||||
cb.dispatchEvent(new Event('change'));
|
||||
}
|
||||
} else if (_isNotesMobileMode()) {
|
||||
// Mobile: open the per-note fullscreen edit overlay instead of the
|
||||
// in-place form. Tiles on mobile are read-only previews.
|
||||
_openMobileFullscreenEdit(id, cardEl);
|
||||
} else {
|
||||
_editNote(id);
|
||||
}
|
||||
};
|
||||
// Mobile: long-press anywhere on a note card → enter Select mode and
|
||||
// select that card. Cancelled by movement (so it doesn't interfere with
|
||||
// vertical scrolling) or by lifting the finger before the timer fires.
|
||||
if (_isNotesMobileMode()) {
|
||||
body.querySelectorAll('.note-card').forEach(card => _bindLongPressDrag(card));
|
||||
}
|
||||
body.querySelectorAll('.note-card.note-card-reminder-fired-sticky').forEach(card => {
|
||||
card.addEventListener('click', () => _setReminderCardGlow(card.dataset.noteId, false), true);
|
||||
});
|
||||
// Click title : edit, or toggle select in select mode
|
||||
body.querySelectorAll('.note-card-title[data-action="edit"]').forEach(el => {
|
||||
el.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
_smoothScrollToNoteCard(el.closest('.note-card'));
|
||||
tapToEditOrSelect(el.closest('.note-card'));
|
||||
});
|
||||
});
|
||||
// Click content : edit, or toggle select in select mode
|
||||
body.querySelectorAll('.note-content-preview').forEach(el => {
|
||||
el.addEventListener('click', (e) => { e.stopPropagation(); tapToEditOrSelect(el.closest('.note-card')); });
|
||||
});
|
||||
// A saved drawing is the note's primary content. Open its editor directly
|
||||
// when the preview is clicked, matching title/content preview behavior.
|
||||
body.querySelectorAll('.note-card-drawing .note-card-image').forEach(el => {
|
||||
el.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
tapToEditOrSelect(el.closest('.note-card'));
|
||||
});
|
||||
});
|
||||
// Click empty area of checklist preview (not on checkbox/X) : edit
|
||||
body.querySelectorAll('.note-checklist-preview').forEach(el => {
|
||||
el.addEventListener('wheel', (e) => {
|
||||
const atTop = el.scrollTop <= 0;
|
||||
const atBottom = el.scrollTop + el.clientHeight >= el.scrollHeight - 1;
|
||||
if ((e.deltaY < 0 && atTop) || (e.deltaY > 0 && atBottom)) {
|
||||
const pane = el.closest('.notes-pane-body');
|
||||
if (pane) {
|
||||
pane.scrollTop += e.deltaY;
|
||||
e.preventDefault();
|
||||
}
|
||||
}
|
||||
}, { passive: false });
|
||||
el.addEventListener('click', (e) => {
|
||||
if (e.target.closest('.note-checkbox, .note-checkbox-rm, .note-cl-quickadd, input')) return;
|
||||
e.stopPropagation();
|
||||
tapToEditOrSelect(el.closest('.note-card'));
|
||||
});
|
||||
});
|
||||
// Clicking todo item text now toggles its checkbox : let the click bubble
|
||||
// up to the parent .note-checkbox row handler. To open the editor, the
|
||||
// user clicks the pencil corner.
|
||||
// (No-op block kept as a marker : removing the listener entirely means
|
||||
// clicks naturally bubble to the row toggle below.)
|
||||
// In select mode, clicking anywhere on the card toggles selection
|
||||
if (state.selectMode) {
|
||||
body.querySelectorAll('.note-card').forEach(card => {
|
||||
card.addEventListener('click', (e) => {
|
||||
if (e.target.closest('.note-card-cb')) return; // checkbox handles itself
|
||||
e.stopPropagation();
|
||||
tapToEditOrSelect(card);
|
||||
});
|
||||
});
|
||||
}
|
||||
// Mobile, non-select: tapping anywhere on the card body (not on an
|
||||
// interactive child : buttons, pin, checkbox, color dot, reminder pill,
|
||||
// agent tag, links) opens the fullscreen editor. Previously only the
|
||||
// title / content preview triggered edit, so padding + empty gutters were
|
||||
// dead zones that felt broken on mobile.
|
||||
if (_isNotesMobileMode() && !state.selectMode) {
|
||||
const _INTERACTIVE = 'button, a, input, label, .note-card-color-dot, .note-checkbox, .note-checkbox-rm, .note-cl-quickadd, .note-agent-tag, .note-card-pin, .note-card-corner-trash, .note-card-corner-menu, .note-card-corner-unarchive, .note-card-edit-corner, .note-card-reminder, .note-card-cb';
|
||||
body.querySelectorAll('.note-card').forEach(card => {
|
||||
card.addEventListener('click', (e) => {
|
||||
if (e.target.closest(_INTERACTIVE)) return;
|
||||
e.stopPropagation();
|
||||
tapToEditOrSelect(card);
|
||||
});
|
||||
});
|
||||
}
|
||||
// Multi-select checkbox (only in select mode)
|
||||
body.querySelectorAll('.note-card-cb').forEach(cb => {
|
||||
cb.addEventListener('click', (e) => e.stopPropagation());
|
||||
cb.addEventListener('change', () => {
|
||||
const id = cb.dataset.noteId;
|
||||
if (cb.checked) app.selectId(id);
|
||||
else app.deselectId(id);
|
||||
cb.closest('.note-card').classList.toggle('note-card-selected', cb.checked);
|
||||
_updateBulkBar();
|
||||
});
|
||||
});
|
||||
// Pin toggle (optimistic)
|
||||
body.querySelectorAll('.note-card-pin').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
cardOperations.togglePin(id);
|
||||
});
|
||||
});
|
||||
// Color picker
|
||||
const _applyCardColor = async (card, id, newColor) => {
|
||||
const isBg = _isBgImage(newColor);
|
||||
COLORS.forEach(c => { if (c.value && c.value !== 'custom') card.classList.remove('note-color-' + c.value); });
|
||||
if (newColor && !isBg) card.classList.add('note-color-' + newColor);
|
||||
if (isBg) card.setAttribute('style', _customColorStyle(newColor));
|
||||
else card.removeAttribute('style');
|
||||
card.querySelectorAll('.note-card-color-dot').forEach(d => {
|
||||
d.classList.toggle('active', _dotIsActive(d.dataset.color, newColor));
|
||||
d.style.background = _dotBg(d.dataset.color, newColor);
|
||||
});
|
||||
await cardOperations.updateColor(id, newColor);
|
||||
};
|
||||
body.querySelectorAll('.note-card-color-dot').forEach(dot => {
|
||||
dot.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const card = dot.closest('.note-card');
|
||||
const id = card.dataset.noteId;
|
||||
if (dot.dataset.color === 'custom') {
|
||||
_pickCustomBgImage().then(url => { if (url) _applyCardColor(card, id, 'bg:' + url); });
|
||||
return;
|
||||
}
|
||||
_applyCardColor(card, id, dot.dataset.color);
|
||||
});
|
||||
});
|
||||
// Plain pencil corner → open editor. The unarchive corner shares the
|
||||
// .note-card-edit-corner class for styling, so :not() keeps the edit
|
||||
// handler off it.
|
||||
body.querySelectorAll('.note-card-edit-corner:not(.note-card-unarchive-corner)').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
if (id) _editNote(id);
|
||||
});
|
||||
});
|
||||
// Copy corner : bottom-right, just left of the Done check. Shared with
|
||||
// the Ctrl/Cmd+C shortcut wired further down so both code paths run the
|
||||
// same serializer + feedback flash.
|
||||
// ⋯ corner menu : Copy + Agent (solve-this-todo).
|
||||
body.querySelectorAll('.note-card-corner-menu').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
_openNoteCornerMenu(btn);
|
||||
});
|
||||
});
|
||||
body.querySelectorAll('.note-card-label-chip').forEach(chip => {
|
||||
chip.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
const label = chip.dataset.noteLabelFilter;
|
||||
if (!label) return;
|
||||
if (state.activeLabel === label && state.activeFilter === null) {
|
||||
app.setActiveLabel(null);
|
||||
} else {
|
||||
app.setActiveFilter(null);
|
||||
app.setActiveLabel(label);
|
||||
}
|
||||
_renderNotes();
|
||||
});
|
||||
});
|
||||
// Done (✓) at bottom-right : only visible on hover for active notes.
|
||||
body.querySelectorAll('.note-card-done').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
const card = btn.closest('.note-card');
|
||||
const idx = state.notes.findIndex(n => n.id === id);
|
||||
if (idx < 0) return;
|
||||
// Celebrate completion : same confetti shower the bulk-archive uses.
|
||||
if (card) {
|
||||
const r = card.getBoundingClientRect();
|
||||
spawnConfetti(r.left + r.width / 2, r.top + r.height / 2, 80);
|
||||
}
|
||||
const finish = cardOperations.stageArchive(id);
|
||||
if (!finish) return;
|
||||
if (card) {
|
||||
card.classList.add('note-card-sliding-out');
|
||||
let done = false;
|
||||
const once = () => { if (done) return; done = true; finish(); };
|
||||
card.addEventListener('transitionend', once, { once: true });
|
||||
setTimeout(once, 400);
|
||||
} else {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
});
|
||||
// Unarchive corner : only visible in archive view.
|
||||
body.querySelectorAll('.note-card-corner-unarchive').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
cardOperations.unarchive(id);
|
||||
});
|
||||
});
|
||||
// Trash corner : archive view only. Permanent delete, no confirmation.
|
||||
body.querySelectorAll('.note-card-corner-trash').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
cardOperations.deleteOptimistically(id, true);
|
||||
});
|
||||
});
|
||||
|
||||
body.querySelectorAll('.note-card-archive').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
if (!id) return;
|
||||
const card = btn.closest('.note-card');
|
||||
let done = false;
|
||||
const finishRemove = () => {
|
||||
if (done) return;
|
||||
done = true;
|
||||
_archiveNoteById(id, { card, celebrate: true });
|
||||
};
|
||||
if (card) {
|
||||
card.classList.add('note-card-sliding-out');
|
||||
card.addEventListener('transitionend', finishRemove, { once: true });
|
||||
setTimeout(finishRemove, 400);
|
||||
} else {
|
||||
finishRemove();
|
||||
}
|
||||
});
|
||||
});
|
||||
// Unarchive (optimistic) : only present in archive view
|
||||
body.querySelectorAll('.note-card-unarchive').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
cardOperations.unarchive(id);
|
||||
});
|
||||
});
|
||||
// Delete (optimistic)
|
||||
body.querySelectorAll('.note-card-delete, .note-card-x').forEach(btn => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
cardOperations.deleteOptimistically(id);
|
||||
});
|
||||
});
|
||||
// Copy entire checklist (title + items, markdown-style)
|
||||
body.querySelectorAll('.note-card-copy').forEach(btn => {
|
||||
btn.addEventListener('click', async (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
e.stopImmediatePropagation();
|
||||
const id = btn.dataset.noteId;
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (!note) return;
|
||||
const lines = [];
|
||||
if (note.title) lines.push(note.title);
|
||||
if (note.content) lines.push(note.content);
|
||||
if (lines.length) lines.push('');
|
||||
for (const it of (note.items || [])) {
|
||||
if (!it || !(it.text || '').trim()) continue;
|
||||
lines.push(`- [${it.done ? 'x' : ' '}] ${(it.text || '').trim()}`);
|
||||
}
|
||||
const text = lines.join('\n').trim();
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
uiModule.showToast?.(`Copied ${(note.items || []).filter(i => (i?.text || '').trim()).length} items`);
|
||||
} catch {
|
||||
// Fallback for browsers blocking the async API
|
||||
const ta = document.createElement('textarea');
|
||||
ta.value = text;
|
||||
ta.style.position = 'fixed'; ta.style.left = '-9999px';
|
||||
document.body.appendChild(ta);
|
||||
ta.select();
|
||||
try { document.execCommand('copy'); uiModule.showToast?.('Copied'); }
|
||||
catch { uiModule.showError?.('Copy failed'); }
|
||||
ta.remove();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
_wireCardChecklist(body);
|
||||
_wireCardReorder(body);
|
||||
|
||||
}
|
||||
|
||||
return { _bindCardEvents };
|
||||
}
|
||||
@@ -0,0 +1,244 @@
|
||||
/** Render note cards from application queries and read-only state. */
|
||||
import { _nextGoalStep, _goalProgress, _hasItems, _standardVisualVariant, _visibleNoteTags } from '../domain/noteRules.js';
|
||||
import { _hasTimeComponent, _formatRepeatLabel } from '../domain/recurrence.js';
|
||||
export function createCardRendering({
|
||||
COLORS,
|
||||
COLOR_HEX,
|
||||
_animateReflow,
|
||||
_applyMasonry,
|
||||
_bindCardEvents,
|
||||
_captureCardPositions,
|
||||
_customColorStyle,
|
||||
_dotBg,
|
||||
_dotIsActive,
|
||||
_esc,
|
||||
_formatDueDate,
|
||||
_formatReminderTag,
|
||||
_hasActiveReminder,
|
||||
_isBgImage,
|
||||
_isDueOverdue,
|
||||
_isNotesMobileMode,
|
||||
_linkify,
|
||||
_loadActiveHighlights,
|
||||
_renderLabelsInto,
|
||||
_renderQuickAdd,
|
||||
_safeImgSrc,
|
||||
_sortedVisibleNotes,
|
||||
_updateRailBadge,
|
||||
_wireTodayView,
|
||||
state,
|
||||
uiModule
|
||||
}) {
|
||||
function _renderLoadingSkeleton() {
|
||||
const body = document.querySelector('#notes-pane .notes-pane-body');
|
||||
if (!body) return;
|
||||
body.innerHTML = '';
|
||||
_renderLabelsInto(body);
|
||||
_renderQuickAdd(body);
|
||||
const skel = document.createElement('div');
|
||||
skel.className = 'notes-skeleton';
|
||||
skel.innerHTML = `
|
||||
<div class="notes-skeleton-card"></div>
|
||||
<div class="notes-skeleton-card"></div>
|
||||
<div class="notes-skeleton-card short"></div>
|
||||
<div class="notes-skeleton-card"></div>
|
||||
`;
|
||||
body.appendChild(skel);
|
||||
}
|
||||
|
||||
function _renderNotes() {
|
||||
_updateRailBadge();
|
||||
const body = document.querySelector('#notes-pane .notes-pane-body');
|
||||
if (!body) return;
|
||||
const prevPositions = _captureCardPositions();
|
||||
const activeReminderHighlights = _loadActiveHighlights();
|
||||
|
||||
const sorted = _sortedVisibleNotes();
|
||||
|
||||
let html = '';
|
||||
// Today view: render a compact card listing the next-unchecked step from
|
||||
// each active goal. Tapping a step toggles it done (same idx-based wiring
|
||||
// as regular checkboxes). Tapping the title opens the goal note for full
|
||||
// editing.
|
||||
if (state.activeFilter === 'today') {
|
||||
body.innerHTML = '';
|
||||
_renderLabelsInto(body);
|
||||
_renderQuickAdd(body);
|
||||
if (sorted.length === 0) {
|
||||
body.insertAdjacentHTML('beforeend', `<div class="notes-empty">All caught up — no pending goal steps right now.</div>`);
|
||||
} else {
|
||||
let todayHtml = `<div class="notes-today-wrap">
|
||||
<div class="notes-today-header">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg>
|
||||
<span>Today · one step per goal</span>
|
||||
</div>
|
||||
<div class="notes-today-list">`;
|
||||
for (const note of sorted) {
|
||||
const next = _nextGoalStep(note);
|
||||
if (!next) continue;
|
||||
const progress = _goalProgress(note).trim();
|
||||
todayHtml += `<div class="notes-today-row" data-note-id="${note.id}">
|
||||
<span class="note-check-dot" data-note-id="${note.id}" data-idx="${next.idx}" title="Mark step done"></span>
|
||||
<div class="notes-today-text">
|
||||
<div class="notes-today-title" data-action="edit" data-note-id="${note.id}">${_esc(note.title || '(untitled goal)')}</div>
|
||||
<div class="notes-today-step">${_linkify(next.item.text || '')}</div>
|
||||
</div>
|
||||
<span class="notes-today-progress">${_esc(progress)}</span>
|
||||
</div>`;
|
||||
}
|
||||
todayHtml += `</div></div>`;
|
||||
body.insertAdjacentHTML('beforeend', todayHtml);
|
||||
}
|
||||
_wireTodayView(body);
|
||||
return;
|
||||
}
|
||||
for (const note of sorted) {
|
||||
if (state.editingId === note.id) continue; // skip : form is shown instead
|
||||
const borderColor = COLOR_HEX[note.color || ''] || 'var(--border)';
|
||||
const dueFmt = _formatDueDate(note.due_date);
|
||||
const overdue = _isDueOverdue(note.due_date);
|
||||
|
||||
let contentHtml = '';
|
||||
if (_hasItems(note) && Array.isArray(note.items)) {
|
||||
// Goal notes can carry a free-form description above the step list :
|
||||
// todos rarely do, but the same render works for both.
|
||||
if (note.note_type === 'goal' && (note.content || '').trim()) {
|
||||
const fullText = note.content || '';
|
||||
const preview = fullText.length > 300 ? fullText.slice(0, 300) + '…' : fullText;
|
||||
contentHtml += `<div class="note-goal-desc">${_esc(preview)}</div>`;
|
||||
}
|
||||
contentHtml += '<div class="note-checklist-preview">';
|
||||
// Show ALL items : the preview container is scrollable (CSS caps
|
||||
// its max-height + overflow-y:auto), so there's no need to truncate.
|
||||
for (let i = 0; i < note.items.length; i++) {
|
||||
const item = note.items[i];
|
||||
const doneClass = item.done ? ' done' : '';
|
||||
const indent = Math.min(item.indent || 0, 3);
|
||||
contentHtml += `<div class="note-checkbox${doneClass}" data-note-id="${note.id}" data-idx="${i}" style="padding-left:${indent * 16}px">
|
||||
<span class="note-check-dot" title="Mark done"></span>
|
||||
<span class="note-check-text">${_linkify(item.text)}</span>
|
||||
<button class="note-checkbox-edit" data-note-id="${note.id}" data-idx="${i}" title="Edit item">
|
||||
<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"/></svg>
|
||||
</button>
|
||||
<button class="note-checkbox-rm" data-note-id="${note.id}" data-idx="${i}" title="Delete item">
|
||||
<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
</div>`;
|
||||
}
|
||||
contentHtml += '</div>';
|
||||
} else {
|
||||
const fullText = note.content || '';
|
||||
const preview = fullText.length > 600 ? fullText.slice(0, 600) + '…' : fullText;
|
||||
// _linkify already calls _esc internally, so URLs become clickable
|
||||
// anchors (used by e.g. the "remind me to reply" email deep-link).
|
||||
contentHtml = preview ? `<div class="note-content-preview">${_linkify(preview)}</div>` : '';
|
||||
}
|
||||
|
||||
const isBg = _isBgImage(note.color);
|
||||
const cc = (note.color && !isBg) ? ' note-color-' + note.color : '';
|
||||
const cardStyle = isBg ? ` style="${_customColorStyle(note.color)}"` : '';
|
||||
const isStandard = !note.note_type || note.note_type === 'note';
|
||||
const visualClass = isStandard && !note.color ? ` note-standard note-standard-v${_standardVisualVariant(note)}` : '';
|
||||
const sel = state.selectedIds.has(note.id) ? ' note-card-selected' : '';
|
||||
const reminderTagHtml = note.due_date && _hasTimeComponent(note.due_date)
|
||||
? `<div class="note-card-reminder${overdue ? ' overdue' : ''}">
|
||||
<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"/><path d="M13.73 21a2 2 0 0 1-3.46 0"/></svg>
|
||||
<span>${_esc(_formatReminderTag(note.due_date))}${note.repeat && note.repeat !== 'none' ? ' · ' + _esc(_formatRepeatLabel(note.repeat, new Date(note.due_date))) : ''}</span>
|
||||
</div>`
|
||||
: '';
|
||||
const noteTags = _visibleNoteTags(note);
|
||||
const dueBadge = dueFmt && !_hasTimeComponent(note.due_date) ? `<span class="note-due-inline${overdue ? ' note-due-overdue' : ''}">${dueFmt}</span>` : '';
|
||||
const colorDots = COLORS.map(c => `<span class="note-card-color-dot${_dotIsActive(c.value, note.color) ? ' active' : ''}" data-color="${c.value}" style="background:${_dotBg(c.value, note.color)}" title="${c.name || 'default'}"></span>`).join('');
|
||||
const goalClass = note.note_type === 'goal' ? ' note-card-goal' : '';
|
||||
const reminderGlowClass = activeReminderHighlights.has(note.id) && _hasActiveReminder(note) ? ' note-card-reminder-fired-sticky' : '';
|
||||
const goalPill = note.note_type === 'goal'
|
||||
? `<span class="note-goal-pill" title="AI-broken-down goal">
|
||||
<svg width="10" height="10" viewBox="0 0 24 24" fill="currentColor"><path d="M12 0L14.59 8.41L23 12L14.59 15.59L12 24L9.41 15.59L1 12L9.41 8.41Z"/></svg>
|
||||
Goal${_goalProgress(note)}
|
||||
</span>`
|
||||
: '';
|
||||
const drawingClass = note.note_type === 'draw' ? ' note-card-drawing' : '';
|
||||
html += `<div class="note-card${note.pinned ? ' note-card-pinned' : ''}${cc}${visualClass}${sel}${goalClass}${drawingClass}${reminderGlowClass}${state.selectMode ? ' note-card-selectmode' : ''}" draggable="${(state.selectMode || _isNotesMobileMode()) ? 'false' : 'true'}" data-note-id="${note.id}"${cardStyle}>
|
||||
${state.selectMode ? `<input type="checkbox" class="memory-select-cb note-card-cb" data-note-id="${note.id}" ${state.selectedIds.has(note.id) ? 'checked' : ''} />` : ''}
|
||||
${goalPill}
|
||||
<button class="note-card-pin${note.pinned ? ' active' : ''}" data-note-id="${note.id}" title="${note.pinned ? 'Unpin' : 'Pin'}">
|
||||
<svg width="16" height="16" viewBox="0 0 24 28" fill="${note.pinned ? 'currentColor' : 'none'}" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"${note.pinned ? ' style="color:var(--accent,var(--red));"' : ''}><g transform="rotate(${note.pinned ? 0 : 45} 12 14)" style="transition:transform 0.2s ease;"><line x1="12" y1="17" x2="12" y2="27"/><path d="M5 17h14v-1.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V6h1a2 2 0 0 0 0-4H8a2 2 0 0 0 0 4h1v4.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24V17z"/></g></svg>
|
||||
</button>
|
||||
${state.showingArchived
|
||||
? `<button class="note-card-corner-trash" data-note-id="${note.id}" title="Delete forever" aria-label="Delete forever">
|
||||
<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><line x1="10" y1="11" x2="10" y2="17"/><line x1="14" y1="11" x2="14" y2="17"/></svg>
|
||||
</button>
|
||||
<button class="note-card-corner-unarchive" data-note-id="${note.id}" title="Unarchive" aria-label="Unarchive note">
|
||||
<svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 14l-5-5 5-5"/><path d="M4 9h11a5 5 0 0 1 5 5v0a5 5 0 0 1-5 5H9"/></svg>
|
||||
</button>`
|
||||
: `<button class="note-card-done" data-note-id="${note.id}" title="Mark done" aria-label="Mark done">
|
||||
<svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg>
|
||||
</button>
|
||||
${_hasItems(note) ? `<button class="note-card-copy note-card-copy-corner" data-note-id="${note.id}" title="Copy all items" aria-label="Copy all items">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
|
||||
</button>` : ''}`}
|
||||
<div class="note-card-header">
|
||||
<div class="note-card-title${note.title ? '' : ' empty'}" data-action="edit">${_esc(note.title || '')}</div>
|
||||
${dueBadge}
|
||||
</div>
|
||||
${_safeImgSrc(note.image_url) ? `<img class="note-card-image" src="${_esc(_safeImgSrc(note.image_url))}" alt="" draggable="false" />` : ''}
|
||||
${contentHtml}
|
||||
${_hasItems(note) ? `<div class="note-cl-quickadd"><input type="text" class="note-cl-quickadd-input" placeholder="+ Add item" data-note-id="${note.id}" /></div>` : ''}
|
||||
${reminderTagHtml}
|
||||
${noteTags.length ? `<div class="note-card-label">${noteTags.map(t => `<button type="button" class="note-card-label-chip" data-note-label-filter="${_esc(t)}" title="Filter #${_esc(t)}">#${_esc(t)}</button>`).join(' ')}</div>` : ''}
|
||||
<div class="note-card-actions">
|
||||
<div class="note-card-colors">${colorDots}</div>
|
||||
<span style="flex:1"></span>
|
||||
${state.showingArchived ? `
|
||||
<button class="note-card-action note-card-delete" data-note-id="${note.id}" title="Delete permanently">
|
||||
<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><line x1="10" y1="11" x2="10" y2="17"/><line x1="14" y1="11" x2="14" y2="17"/></svg>
|
||||
</button>
|
||||
<button class="note-card-action note-card-unarchive" data-note-id="${note.id}" title="Unarchive">
|
||||
<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 1 0 3-6.7"/><polyline points="3 4 3 10 9 10"/></svg>
|
||||
</button>` : `
|
||||
${_hasItems(note) ? `
|
||||
<button class="note-card-action note-card-copy" data-note-id="${note.id}" title="Copy all items">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
|
||||
</button>` : ''}
|
||||
<button class="note-card-action note-card-archive" data-note-id="${note.id}" title="Save (archive)">
|
||||
<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
|
||||
</button>
|
||||
<button class="note-card-action note-card-delete" data-note-id="${note.id}" title="Delete">
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
<button class="note-card-action note-card-corner-menu" data-note-id="${note.id}" title="More" aria-label="More actions">
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor"><circle cx="5" cy="12" r="1.7"/><circle cx="12" cy="12" r="1.7"/><circle cx="19" cy="12" r="1.7"/></svg>
|
||||
</button>`}
|
||||
</div>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
// Always render quick-add at top (collapsed unless user is typing)
|
||||
const existingForm = body.querySelector('.note-form');
|
||||
if (existingForm && state.editingId === '__new__') {
|
||||
// Keep the expanded form, replace cards after it
|
||||
const next = [...body.children].filter(c => c !== existingForm);
|
||||
next.forEach(c => c.remove());
|
||||
if (sorted.length === 0) {
|
||||
body.insertAdjacentHTML('beforeend', '<div class="notes-empty-msg">No notes <span style="vertical-align:-3px;margin-left:4px;">' + uiModule.emptyStateIcon('smiley') + '</span></div>');
|
||||
} else {
|
||||
existingForm.insertAdjacentHTML('afterend', html);
|
||||
}
|
||||
} else {
|
||||
body.innerHTML = '';
|
||||
_renderLabelsInto(body);
|
||||
_renderQuickAdd(body);
|
||||
if (sorted.length === 0) {
|
||||
body.insertAdjacentHTML('beforeend', '<div class="notes-empty-msg">No notes yet <span style="vertical-align:-3px;margin-left:4px;">' + uiModule.emptyStateIcon('smiley') + '</span></div>');
|
||||
} else {
|
||||
body.insertAdjacentHTML('beforeend', html);
|
||||
}
|
||||
}
|
||||
|
||||
_bindCardEvents(body);
|
||||
_animateReflow(prevPositions);
|
||||
_applyMasonry(body);
|
||||
}
|
||||
|
||||
return { _renderLoadingSkeleton, _renderNotes };
|
||||
}
|
||||
@@ -0,0 +1,181 @@
|
||||
/** Desktop and large-touch-device card reorder gestures. */
|
||||
export function createCardReorder({
|
||||
lifecycle,
|
||||
_isNotesMobileMode,
|
||||
persistOrder,
|
||||
state
|
||||
}) {
|
||||
function _wireCardReorder(body) {
|
||||
lifecycle.release(body);
|
||||
// Drag-reorder notes on pointer/mouse devices. Mobile uses the custom
|
||||
// placeholder sorter below `_bindLongPressDrag`; native HTML5 dragging is
|
||||
// unreliable on touch browsers and can compete with the long-press flow.
|
||||
if (!_isNotesMobileMode()) {
|
||||
body.querySelectorAll('.note-card').forEach(card => {
|
||||
card.addEventListener('dragstart', (e) => {
|
||||
if (e.target.closest('.note-checkbox, .note-card-x, .note-card-select, .note-card-pin, .note-card-action, .note-card-color-dot, .note-card-title, .note-card-edit, .note-card-edit-corner, .note-card-done, .note-card-corner-menu, .note-agent-tag, .note-card-label-chip')) {
|
||||
e.preventDefault();
|
||||
return;
|
||||
}
|
||||
card.classList.add('dragging');
|
||||
body.classList.add('drag-active');
|
||||
e.dataTransfer.effectAllowed = 'move';
|
||||
try { e.dataTransfer.setData('text/plain', card.dataset.noteId); } catch {}
|
||||
});
|
||||
card.addEventListener('dragend', async () => {
|
||||
card.classList.remove('dragging');
|
||||
body.classList.remove('drag-active');
|
||||
body.querySelectorAll('.drop-before, .drop-after').forEach(el => el.classList.remove('drop-before', 'drop-after'));
|
||||
const ids = [...body.querySelectorAll('.note-card')].map(c => c.dataset.noteId);
|
||||
try { await persistOrder(ids); }
|
||||
catch {}
|
||||
});
|
||||
});
|
||||
}
|
||||
// Track which card we last swapped with so a single hover-over triggers
|
||||
// one swap, not a jitter as the pointer keeps moving inside the same card.
|
||||
let _lastSwapId = null;
|
||||
function _maybeSwap(dragging, clientX, clientY) {
|
||||
const target = document.elementFromPoint(clientX, clientY)?.closest('.note-card');
|
||||
if (!target || target === dragging || !body.contains(target)) return;
|
||||
const id = target.dataset.noteId;
|
||||
if (id === _lastSwapId) return;
|
||||
// FLIP across ALL siblings. In list view only `target` moves visually, but
|
||||
// in grid view (2-col) and when the pinned-section grid-column-start rule
|
||||
// shifts, several cards reflow at once. Capture every card's pre-swap rect,
|
||||
// do the DOM swap, then animate any that actually moved. The dragging card
|
||||
// is excluded : it's already finger-tracked via translate3d.
|
||||
const cards = [...body.querySelectorAll('.note-card')].filter(c => c !== dragging);
|
||||
const prevRects = new Map(cards.map(c => [c, c.getBoundingClientRect()]));
|
||||
const draggingNext = dragging.nextSibling === target ? dragging : dragging.nextSibling;
|
||||
body.insertBefore(dragging, target);
|
||||
body.insertBefore(target, draggingNext);
|
||||
for (const c of cards) {
|
||||
const prev = prevRects.get(c);
|
||||
const next = c.getBoundingClientRect();
|
||||
const dx = prev.left - next.left;
|
||||
const dy = prev.top - next.top;
|
||||
if (Math.abs(dx) < 0.5 && Math.abs(dy) < 0.5) continue;
|
||||
c.style.transition = 'none';
|
||||
c.style.transform = `translate(${dx}px, ${dy}px)`;
|
||||
requestAnimationFrame(() => {
|
||||
c.style.transition = 'transform 0.22s cubic-bezier(0.34, 1.2, 0.64, 1)';
|
||||
c.style.transform = '';
|
||||
c.addEventListener('transitionend', () => { c.style.transition = ''; }, { once: true });
|
||||
});
|
||||
}
|
||||
_lastSwapId = id;
|
||||
}
|
||||
lifecycle.listen(body, body, 'dragover', (e) => {
|
||||
e.preventDefault();
|
||||
const dragging = body.querySelector('.note-card.dragging');
|
||||
if (!dragging) return;
|
||||
_maybeSwap(dragging, e.clientX, e.clientY);
|
||||
});
|
||||
lifecycle.listen(body, body, 'dragend', () => { _lastSwapId = null; });
|
||||
|
||||
// Legacy touch drag for larger touch devices only. Phone-sized Notes uses
|
||||
// the placeholder sorter wired by `_bindLongPressDrag`; running both flows
|
||||
// makes one press start two independent drag sessions.
|
||||
if (!_isNotesMobileMode() && 'ontouchstart' in window) {
|
||||
let dragCard = null;
|
||||
let isDragging = false;
|
||||
let longPressTimer = null;
|
||||
let startX = 0, startY = 0;
|
||||
const LONG_PRESS_MS = 350;
|
||||
const MOVE_THRESHOLD_PX = 8;
|
||||
const _selectorSkip = '.note-checkbox, .note-card-x, .note-card-select, .note-card-pin, .note-card-action, .note-card-color-dot, .note-card-title, .note-card-edit, .note-card-edit-corner, .note-card-done, .note-card-corner-menu, .note-agent-tag, .note-card-label-chip, input, textarea, button, a';
|
||||
|
||||
// Anchor for the finger-follow transform. Recomputed after every swap so
|
||||
// the card stays under the finger across reorderings.
|
||||
let anchorX = 0, anchorY = 0;
|
||||
const _follow = (clientX, clientY) => {
|
||||
if (!dragCard) return;
|
||||
const dx = clientX - anchorX;
|
||||
const dy = clientY - anchorY;
|
||||
// Compose with the CSS .dragging transform (scale + rotate).
|
||||
dragCard.style.transform = `translate3d(${dx}px, ${dy}px, 0) scale(1.03) rotate(-0.6deg)`;
|
||||
};
|
||||
const _reanchor = (clientX, clientY) => {
|
||||
if (!dragCard) return;
|
||||
// Clear any prior translate so the card resettles in its natural slot,
|
||||
// then anchor at the finger's current position. Subsequent _follow calls
|
||||
// translate by (finger - anchor), keeping the finger at the same relative
|
||||
// spot on the card it had when we re-anchored.
|
||||
dragCard.style.transform = '';
|
||||
anchorX = clientX;
|
||||
anchorY = clientY;
|
||||
};
|
||||
|
||||
const _endDrag = (committed) => {
|
||||
clearTimeout(longPressTimer);
|
||||
longPressTimer = null;
|
||||
if (dragCard) {
|
||||
dragCard.classList.remove('dragging');
|
||||
dragCard.style.transform = '';
|
||||
}
|
||||
body.classList.remove('drag-active');
|
||||
_lastSwapId = null;
|
||||
if (isDragging) {
|
||||
document.documentElement.style.touchAction = '';
|
||||
if (committed) {
|
||||
const ids = [...body.querySelectorAll('.note-card')].map(c => c.dataset.noteId);
|
||||
persistOrder(ids).catch(() => {});
|
||||
}
|
||||
}
|
||||
dragCard = null;
|
||||
isDragging = false;
|
||||
};
|
||||
lifecycle.onDispose(body, () => _endDrag(false));
|
||||
|
||||
lifecycle.listen(body, body, 'touchstart', (e) => {
|
||||
if (state.selectMode) return;
|
||||
const card = e.target.closest('.note-card');
|
||||
if (!card) return;
|
||||
if (e.target.closest(_selectorSkip)) return;
|
||||
const t = e.touches[0];
|
||||
startX = t.clientX; startY = t.clientY;
|
||||
dragCard = card;
|
||||
longPressTimer = setTimeout(() => {
|
||||
if (!dragCard) return;
|
||||
isDragging = true;
|
||||
dragCard.classList.add('dragging');
|
||||
body.classList.add('drag-active');
|
||||
document.documentElement.style.touchAction = 'none';
|
||||
_reanchor(startX, startY);
|
||||
try { if (navigator.vibrate) navigator.vibrate(15); } catch {}
|
||||
}, LONG_PRESS_MS);
|
||||
}, { passive: true });
|
||||
|
||||
lifecycle.listen(body, body, 'touchmove', (e) => {
|
||||
if (!dragCard) return;
|
||||
const t = e.touches[0];
|
||||
if (!isDragging) {
|
||||
// Movement before long-press fires = user is scrolling; cancel pickup.
|
||||
if (Math.abs(t.clientX - startX) > MOVE_THRESHOLD_PX || Math.abs(t.clientY - startY) > MOVE_THRESHOLD_PX) {
|
||||
clearTimeout(longPressTimer);
|
||||
longPressTimer = null;
|
||||
dragCard = null;
|
||||
}
|
||||
return;
|
||||
}
|
||||
e.preventDefault();
|
||||
// Live-follow the finger first, then check for a swap. After a swap the
|
||||
// card's natural slot moves, so we re-anchor and re-apply the offset.
|
||||
_follow(t.clientX, t.clientY);
|
||||
const before = dragCard.parentNode && [...dragCard.parentNode.children].indexOf(dragCard);
|
||||
_maybeSwap(dragCard, t.clientX, t.clientY);
|
||||
const after = dragCard.parentNode && [...dragCard.parentNode.children].indexOf(dragCard);
|
||||
if (before !== after) {
|
||||
_reanchor(t.clientX, t.clientY);
|
||||
_follow(t.clientX, t.clientY);
|
||||
}
|
||||
}, { passive: false });
|
||||
|
||||
lifecycle.listen(body, body, 'touchend', () => _endDrag(true));
|
||||
lifecycle.listen(body, body, 'touchcancel', () => _endDrag(false));
|
||||
}
|
||||
}
|
||||
|
||||
return { _wireCardReorder };
|
||||
}
|
||||
@@ -0,0 +1,190 @@
|
||||
/** Checklist rows, goal forms, keyboard input and item collection. */
|
||||
export function createChecklist({
|
||||
_esc,
|
||||
_uid,
|
||||
spawnConfetti
|
||||
}) {
|
||||
function _buildGoalHtml(note, items) {
|
||||
const desc = (note?.content || '').toString();
|
||||
return `
|
||||
<div class="note-form-goal">
|
||||
<textarea class="note-form-goal-desc" placeholder="Description (optional)" rows="3">${_esc(desc)}</textarea>
|
||||
${_buildChecklistHtml(items)}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function _wireGoalForm(form, container) {
|
||||
if (!container) return;
|
||||
// _wireHashtag is a closure inside _buildForm : out of scope here. Inline
|
||||
// the same behavior (type "#foo " in the description → tag added to the
|
||||
// form's label input) so editing a goal note doesn't ReferenceError.
|
||||
const desc = container.querySelector('.note-form-goal-desc');
|
||||
const labelInput = form?.querySelector('.note-form-label');
|
||||
if (desc && labelInput) {
|
||||
const tagRe = /(^|\s)#([A-Za-z0-9][\w-]*)\s$/;
|
||||
desc.addEventListener('input', () => {
|
||||
const m = tagRe.exec(desc.value);
|
||||
if (!m) return;
|
||||
const tag = m[2];
|
||||
// Same dedup-after-stripping fix as the plain note hashtag handler.
|
||||
const existing = labelInput.value.trim().split(/\s+/).filter(Boolean);
|
||||
const stripped = existing.map(t => t.replace(/^#+/, ''));
|
||||
if (!stripped.includes(tag)) {
|
||||
existing.push('#' + tag);
|
||||
labelInput.value = existing.join(' ');
|
||||
labelInput.classList.add('flash-once');
|
||||
setTimeout(() => labelInput.classList.remove('flash-once'), 600);
|
||||
}
|
||||
const cut = desc.value.length - m[0].length + m[1].length;
|
||||
desc.value = desc.value.slice(0, cut);
|
||||
});
|
||||
}
|
||||
// Always wire the checklist. The previous gate on a `note-form-goal-fresh`
|
||||
// class was dead code : nothing ever set that class, so the editor never
|
||||
// hooked up add/drag/Tab.
|
||||
_wireChecklist(container);
|
||||
}
|
||||
|
||||
function _buildChecklistHtml(items) {
|
||||
let html = '<div class="note-checklist-inputs">';
|
||||
for (const item of items) {
|
||||
const indent = Math.min(item.indent || 0, 3);
|
||||
html += `<div class="note-cl-row${item.done ? ' done' : ''}" draggable="true" data-item-id="${item.id || _uid()}" data-indent="${indent}" style="padding-left:${indent * 16}px">
|
||||
<span class="note-cl-grip" title="Drag to reorder">⋮⋮</span>
|
||||
<span class="note-cl-dot"></span>
|
||||
<input type="text" class="note-cl-text" value="${_esc(item.text)}" placeholder="Item..." />
|
||||
<button type="button" class="note-cl-rm">×</button>
|
||||
</div>`;
|
||||
}
|
||||
// `type="button"` matters on mobile : without it some browsers treat
|
||||
// bare <button> as form-submit and the click handler never fires inside
|
||||
// certain containers. Also bumped tap target so fingers don't miss.
|
||||
html += `<button type="button" class="note-cl-add">+ Add</button></div>`;
|
||||
return html;
|
||||
}
|
||||
|
||||
function _wireRow(row, container) {
|
||||
row.querySelector('.note-cl-rm')?.addEventListener('click', () => row.remove());
|
||||
row.querySelector('.note-cl-dot')?.addEventListener('click', () => {
|
||||
const wasDone = row.classList.contains('done');
|
||||
row.classList.toggle('done');
|
||||
// The custom dot has no native input/change event. Notify the form so
|
||||
// mobile edit mode switches its action from Archive back to Update.
|
||||
container.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
const becameDone = !wasDone; // we just flipped it
|
||||
const dot = row.querySelector('.note-cl-dot');
|
||||
const dRect = (dot || row).getBoundingClientRect();
|
||||
// Small confetti burst on each fresh check so the user gets a
|
||||
// "well done" beat per item, not just the grand-finale on all-done.
|
||||
if (becameDone) {
|
||||
spawnConfetti(dRect.left + dRect.width / 2, dRect.top + dRect.height / 2, 16);
|
||||
}
|
||||
// Bigger burst when the whole list is now done.
|
||||
const rows = [...container.querySelectorAll('.note-cl-row')];
|
||||
const hasText = rows.some(r => (r.querySelector('.note-cl-text')?.value || '').trim().length > 0);
|
||||
if (hasText && rows.every(r => r.classList.contains('done') || !(r.querySelector('.note-cl-text')?.value || '').trim())) {
|
||||
spawnConfetti(dRect.left + dRect.width / 2, dRect.top + dRect.height / 2, 60);
|
||||
}
|
||||
});
|
||||
const txt = row.querySelector('.note-cl-text');
|
||||
txt?.addEventListener('keydown', (e) => {
|
||||
if (e.key === 'Enter') { e.preventDefault(); container.querySelector('.note-cl-add')?.click(); }
|
||||
else if (e.key === 'Tab') {
|
||||
e.preventDefault();
|
||||
const cur = parseInt(row.dataset.indent || '0');
|
||||
const next = e.shiftKey ? Math.max(0, cur - 1) : Math.min(3, cur + 1);
|
||||
row.dataset.indent = String(next);
|
||||
row.style.paddingLeft = (next * 16) + 'px';
|
||||
} else if (e.key === 'Backspace' && txt.value === '') {
|
||||
e.preventDefault();
|
||||
const prev = row.previousElementSibling;
|
||||
row.remove();
|
||||
if (prev && prev.classList.contains('note-cl-row')) prev.querySelector('.note-cl-text')?.focus();
|
||||
}
|
||||
});
|
||||
// Drag handlers
|
||||
row.addEventListener('dragstart', (e) => {
|
||||
row.classList.add('dragging');
|
||||
e.dataTransfer.effectAllowed = 'move';
|
||||
try { e.dataTransfer.setData('text/plain', row.dataset.itemId); } catch {}
|
||||
});
|
||||
row.addEventListener('dragend', () => {
|
||||
row.classList.remove('dragging');
|
||||
container.querySelectorAll('.drop-before, .drop-after').forEach(el => el.classList.remove('drop-before', 'drop-after'));
|
||||
});
|
||||
}
|
||||
|
||||
function _wireChecklist(container) {
|
||||
if (!container) return;
|
||||
// Delegate the + Add click off the container so re-renders + mobile
|
||||
// touch quirks don't leave the button dead. The previous direct
|
||||
// `addEventListener` on the button silently broke on mobile when
|
||||
// _wireChecklist ran more than once (or before the button was in DOM).
|
||||
if (!container._addDelegated) {
|
||||
container._addDelegated = true;
|
||||
container.addEventListener('click', (ev) => {
|
||||
const addBtn = ev.target.closest('.note-cl-add');
|
||||
if (!addBtn || !container.contains(addBtn)) return;
|
||||
ev.preventDefault();
|
||||
ev.stopPropagation();
|
||||
const inputs = container.querySelector('.note-checklist-inputs');
|
||||
if (!inputs) return;
|
||||
const row = document.createElement('div');
|
||||
row.className = 'note-cl-row';
|
||||
row.draggable = true;
|
||||
row.dataset.itemId = _uid();
|
||||
row.dataset.indent = '0';
|
||||
row.innerHTML = `<span class="note-cl-grip" title="Drag">⋮⋮</span><span class="note-cl-dot"></span><input type="text" class="note-cl-text" placeholder="Item..." /><button type="button" class="note-cl-rm">×</button>`;
|
||||
inputs.insertBefore(row, addBtn);
|
||||
row.querySelector('.note-cl-text').focus();
|
||||
_wireRow(row, container);
|
||||
});
|
||||
}
|
||||
container.querySelectorAll('.note-cl-row').forEach(row => _wireRow(row, container));
|
||||
|
||||
// Drag-over handler on the inputs container
|
||||
const inputs = container.querySelector('.note-checklist-inputs');
|
||||
if (inputs) {
|
||||
inputs.addEventListener('dragover', (e) => {
|
||||
e.preventDefault();
|
||||
const dragging = inputs.querySelector('.note-cl-row.dragging');
|
||||
if (!dragging) return;
|
||||
inputs.querySelectorAll('.drop-before, .drop-after').forEach(el => el.classList.remove('drop-before', 'drop-after'));
|
||||
const rows = [...inputs.querySelectorAll('.note-cl-row:not(.dragging)')];
|
||||
const after = rows.find(r => {
|
||||
const box = r.getBoundingClientRect();
|
||||
return e.clientY < box.top + box.height / 2;
|
||||
});
|
||||
if (after) {
|
||||
after.classList.add('drop-before');
|
||||
inputs.insertBefore(dragging, after);
|
||||
} else if (rows.length) {
|
||||
rows[rows.length - 1].classList.add('drop-after');
|
||||
inputs.insertBefore(dragging, container.querySelector('.note-cl-add'));
|
||||
}
|
||||
});
|
||||
inputs.addEventListener('dragleave', (e) => {
|
||||
if (!inputs.contains(e.relatedTarget)) {
|
||||
inputs.querySelectorAll('.drop-before, .drop-after').forEach(el => el.classList.remove('drop-before', 'drop-after'));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function _collectItems(form) {
|
||||
const items = [];
|
||||
form.querySelectorAll('.note-cl-row').forEach(row => {
|
||||
const text = row.querySelector('.note-cl-text')?.value?.trim();
|
||||
if (text) items.push({
|
||||
id: row.dataset.itemId || _uid(),
|
||||
text,
|
||||
done: row.classList.contains('done'),
|
||||
indent: parseInt(row.dataset.indent || '0'),
|
||||
});
|
||||
});
|
||||
return items;
|
||||
}
|
||||
|
||||
return { _buildGoalHtml, _wireGoalForm, _buildChecklistHtml, _wireRow, _wireChecklist, _collectItems };
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
/** Mobile checklist grip dragging and document listener ownership. */
|
||||
export function createChecklistReorder({
|
||||
lifecycle
|
||||
}) {
|
||||
let _clDrag = null;
|
||||
|
||||
let _clDocBound = false;
|
||||
let _clOwner = null;
|
||||
|
||||
function _wireChecklistTouchReorder(form) {
|
||||
const container = form.querySelector('.note-checklist-inputs');
|
||||
if (!container) return;
|
||||
container.querySelectorAll('.note-cl-grip').forEach(grip => {
|
||||
if (grip.dataset.touchBound === '1') return;
|
||||
grip.dataset.touchBound = '1';
|
||||
grip.addEventListener('touchstart', (e) => {
|
||||
if (e.touches.length !== 1) return;
|
||||
e.preventDefault();
|
||||
const row = grip.closest('.note-cl-row');
|
||||
if (!row) return;
|
||||
_beginChecklistGrab(row, container, e.touches[0]);
|
||||
}, { passive: false });
|
||||
});
|
||||
if (!_clDocBound || _clOwner !== form) {
|
||||
if (_clOwner) lifecycle.release(_clOwner);
|
||||
_clOwner = form;
|
||||
lifecycle.listen(form, document, 'touchmove', _onClTouchMove, { passive: false });
|
||||
lifecycle.listen(form, document, 'touchend', _onClTouchEnd, { passive: true });
|
||||
lifecycle.listen(form, document, 'touchcancel', _onClTouchEnd, { passive: true });
|
||||
_clDocBound = true;
|
||||
}
|
||||
}
|
||||
|
||||
function _beginChecklistGrab(row, container, touch) {
|
||||
if (_clDrag) return;
|
||||
const rect = row.getBoundingClientRect();
|
||||
const placeholder = document.createElement('div');
|
||||
placeholder.className = 'note-cl-row-placeholder';
|
||||
placeholder.style.height = rect.height + 'px';
|
||||
container.insertBefore(placeholder, row);
|
||||
|
||||
row.classList.add('note-cl-row-dragging');
|
||||
row.style.position = 'fixed';
|
||||
row.style.left = rect.left + 'px';
|
||||
row.style.top = rect.top + 'px';
|
||||
row.style.width = rect.width + 'px';
|
||||
row.style.zIndex = '10002';
|
||||
row.style.pointerEvents = 'none';
|
||||
|
||||
_clDrag = {
|
||||
row, placeholder, container,
|
||||
grabOffsetX: touch.clientX - rect.left,
|
||||
grabOffsetY: touch.clientY - rect.top,
|
||||
};
|
||||
try { navigator.vibrate?.(8); } catch {}
|
||||
}
|
||||
|
||||
function _onClTouchMove(e) {
|
||||
if (!_clDrag) return;
|
||||
if (e.touches.length !== 1) return;
|
||||
e.preventDefault();
|
||||
const t = e.touches[0];
|
||||
const { row, placeholder, container } = _clDrag;
|
||||
row.style.left = (t.clientX - _clDrag.grabOffsetX) + 'px';
|
||||
row.style.top = (t.clientY - _clDrag.grabOffsetY) + 'px';
|
||||
|
||||
const under = document.elementFromPoint(t.clientX, t.clientY);
|
||||
const target = under && under.closest
|
||||
? under.closest('.note-cl-row:not(.note-cl-row-dragging)')
|
||||
: null;
|
||||
if (!target || target === row) return;
|
||||
if (target.parentNode !== container) return;
|
||||
|
||||
const tRect = target.getBoundingClientRect();
|
||||
const targetMidY = tRect.top + tRect.height / 2;
|
||||
if (t.clientY < targetMidY) {
|
||||
if (placeholder.nextElementSibling !== target) {
|
||||
container.insertBefore(placeholder, target);
|
||||
}
|
||||
} else {
|
||||
if (target.nextElementSibling !== placeholder) {
|
||||
container.insertBefore(placeholder, target.nextElementSibling);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function _onClTouchEnd() {
|
||||
if (!_clDrag) return;
|
||||
const { row, placeholder } = _clDrag;
|
||||
_clDrag = null;
|
||||
const phRect = placeholder.getBoundingClientRect();
|
||||
row.style.transition = 'left 0.18s ease, top 0.18s ease';
|
||||
row.style.left = phRect.left + 'px';
|
||||
row.style.top = phRect.top + 'px';
|
||||
setTimeout(() => {
|
||||
placeholder.parentNode.insertBefore(row, placeholder);
|
||||
placeholder.remove();
|
||||
row.classList.remove('note-cl-row-dragging');
|
||||
row.style.cssText = '';
|
||||
// Order is persisted as part of the form's normal save (rows are
|
||||
// re-serialized in DOM order via _collectItems).
|
||||
}, 200);
|
||||
}
|
||||
|
||||
function dispose() {
|
||||
if (_clDrag) _onClTouchEnd();
|
||||
_clDocBound = false;
|
||||
_clOwner = null;
|
||||
}
|
||||
return { dispose, _wireChecklistTouchReorder, _beginChecklistGrab, _onClTouchMove, _onClTouchEnd };
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
/** Note clipboard feedback and the Copy/Agent corner menu. */
|
||||
import { _serializeNoteForCopy } from '../domain/noteRules.js';
|
||||
export function createClipboard({
|
||||
_agentSolveNote,
|
||||
bindMenuDismiss,
|
||||
dismissOrRemove,
|
||||
state,
|
||||
topPortalZ,
|
||||
uiModule
|
||||
}) {
|
||||
function _openNoteCornerMenu(btn) {
|
||||
document.querySelectorAll('.note-corner-menu-dropdown').forEach(dismissOrRemove);
|
||||
const id = btn.dataset.noteId;
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (!note) return;
|
||||
const menu = document.createElement('div');
|
||||
menu.className = 'note-corner-menu-dropdown';
|
||||
menu.innerHTML = `
|
||||
<button type="button" class="ncm-item" data-act="copy">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
|
||||
<span>Copy</span>
|
||||
</button>
|
||||
<button type="button" class="ncm-item" data-act="agent">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 8V4H8"/><rect x="4" y="8" width="16" height="12" rx="2"/><path d="M2 14h2M20 14h2M15 13v2M9 13v2"/></svg>
|
||||
<span>${note.agent_session_id ? 'Re-run agent' : 'Agent: solve this'}</span>
|
||||
</button>`;
|
||||
document.body.appendChild(menu);
|
||||
const r = btn.getBoundingClientRect();
|
||||
// Right-align to the ⋯ button, clamped to the viewport.
|
||||
const mw = 168;
|
||||
let left = Math.min(r.right - mw, window.innerWidth - mw - 8);
|
||||
left = Math.max(8, left);
|
||||
// Drop down by default; flip up if there isn't room below (the button
|
||||
// sits at the card's bottom edge now).
|
||||
const mh = menu.offsetHeight || 96;
|
||||
const below = window.innerHeight - r.bottom;
|
||||
const top = (below < mh + 8 && r.top > mh + 8) ? (r.top - mh - 4) : (r.bottom + 4);
|
||||
menu.style.cssText += `position:fixed;z-index:${topPortalZ()};top:${Math.round(top)}px;left:${Math.round(left)}px;`;
|
||||
const close = bindMenuDismiss(menu, () => { menu.remove(); });
|
||||
menu.querySelector('[data-act="copy"]').addEventListener('click', () => { close(); _copyNote(id, btn); });
|
||||
menu.querySelector('[data-act="agent"]').addEventListener('click', () => { close(); _agentSolveNote(id); });
|
||||
}
|
||||
|
||||
async function _copyNote(noteId, btnEl) {
|
||||
const note = state.notes.find(n => n.id === noteId);
|
||||
if (!note) return false;
|
||||
const text = _serializeNoteForCopy(note);
|
||||
if (!text) return false;
|
||||
let ok = false;
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
ok = true;
|
||||
} catch {
|
||||
const ta = document.createElement('textarea');
|
||||
ta.value = text;
|
||||
ta.style.position = 'fixed'; ta.style.left = '-9999px';
|
||||
document.body.appendChild(ta);
|
||||
ta.select();
|
||||
try { ok = document.execCommand('copy'); } catch { ok = false; }
|
||||
ta.remove();
|
||||
}
|
||||
if (ok) {
|
||||
if (btnEl && !btnEl._copyFlashing) {
|
||||
const original = btnEl.innerHTML;
|
||||
btnEl._copyFlashing = true;
|
||||
btnEl.innerHTML = '<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg>';
|
||||
btnEl.classList.add('copied');
|
||||
setTimeout(() => {
|
||||
btnEl.innerHTML = original;
|
||||
btnEl.classList.remove('copied');
|
||||
btnEl._copyFlashing = false;
|
||||
}, 1200);
|
||||
}
|
||||
uiModule.showToast?.('Copied');
|
||||
} else {
|
||||
uiModule.showError?.('Copy failed');
|
||||
}
|
||||
return ok;
|
||||
}
|
||||
|
||||
return { _openNoteCornerMenu, _copyNote };
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
/** Note colors, custom background selection and form color controls. */
|
||||
export function createColors({
|
||||
api
|
||||
}) {
|
||||
const COLORS = [
|
||||
{ name: 'none', value: '' },
|
||||
{ name: 'red', value: 'red' },
|
||||
{ name: 'orange', value: 'orange' },
|
||||
{ name: 'yellow', value: 'yellow' },
|
||||
{ name: 'green', value: 'green' },
|
||||
{ name: 'blue', value: 'blue' },
|
||||
{ name: 'purple', value: 'purple' },
|
||||
{ name: 'custom', value: 'custom' }, // sentinel : clicking opens native color picker
|
||||
];
|
||||
|
||||
const COLOR_HEX = {
|
||||
'': 'var(--border)',
|
||||
// Pale/pastel palette : matches the calendar event color picker.
|
||||
red: '#f0b5ba',
|
||||
orange: '#e8ccb2',
|
||||
yellow: '#f2dfbd',
|
||||
green: '#cce0bc',
|
||||
blue: '#b0d7f7',
|
||||
purple: '#e2bcee',
|
||||
};
|
||||
|
||||
const _CUSTOM_GRADIENT = 'conic-gradient(from 0deg, #e06c75, #d19a66, #e5c07b, #98c379, #61afef, #c678dd, #e06c75)';
|
||||
|
||||
function _isBgImage(c) { return typeof c === 'string' && c.startsWith('bg:'); }
|
||||
|
||||
function _bgImageUrl(c) { return _isBgImage(c) ? c.slice(3) : ''; }
|
||||
|
||||
function _dotBg(value, noteColor) {
|
||||
if (value === 'custom') {
|
||||
const url = _bgImageUrl(noteColor);
|
||||
return url ? `center/cover no-repeat url('${url}')` : _CUSTOM_GRADIENT;
|
||||
}
|
||||
return COLOR_HEX[value];
|
||||
}
|
||||
|
||||
function _dotIsActive(value, noteColor) {
|
||||
if (value === 'custom') return _isBgImage(noteColor);
|
||||
return value === (noteColor || '');
|
||||
}
|
||||
|
||||
function _customColorStyle(c) {
|
||||
if (!_isBgImage(c)) return '';
|
||||
const url = _bgImageUrl(c);
|
||||
return `background-image: linear-gradient(color-mix(in srgb, var(--panel) 60%, transparent), color-mix(in srgb, var(--panel) 60%, transparent)), url('${url}'); background-size: cover; background-position: center; border-color: color-mix(in srgb, var(--fg) 25%, var(--border));`;
|
||||
}
|
||||
|
||||
function _pickCustomBgImage() {
|
||||
return new Promise(resolve => {
|
||||
const input = document.createElement('input');
|
||||
input.type = 'file';
|
||||
input.accept = 'image/*';
|
||||
input.style.cssText = 'position:fixed; left:-9999px; top:-9999px;';
|
||||
document.body.appendChild(input);
|
||||
let done = false;
|
||||
const finish = (v) => { if (done) return; done = true; input.remove(); resolve(v); };
|
||||
input.addEventListener('change', async () => {
|
||||
const file = input.files?.[0];
|
||||
if (!file) return finish(null);
|
||||
const fd = new FormData();
|
||||
fd.append('files', file);
|
||||
try {
|
||||
const res = await api.upload(fd);
|
||||
const data = await res.json();
|
||||
const fileId = data.files?.[0]?.id;
|
||||
if (!fileId) throw new Error('Upload failed');
|
||||
finish(api.uploadUrl(fileId));
|
||||
} catch { finish(null); }
|
||||
});
|
||||
// Best-effort cleanup if user dismisses the dialog.
|
||||
setTimeout(() => { if (!done && !input.files?.length) finish(null); }, 30000);
|
||||
input.click();
|
||||
});
|
||||
}
|
||||
|
||||
function _wireFormColors(form, setColor) {
|
||||
// Color dots : apply to entire form immediately
|
||||
const _applyFormColor = (newColor) => {
|
||||
const currentColor = newColor || '';
|
||||
setColor(currentColor);
|
||||
form.dataset.noteColor = currentColor;
|
||||
const isBg = _isBgImage(currentColor);
|
||||
COLORS.forEach(c => { if (c.value && c.value !== 'custom') form.classList.remove('note-color-' + c.value); });
|
||||
if (currentColor && !isBg) form.classList.add('note-color-' + currentColor);
|
||||
if (isBg) form.setAttribute('style', _customColorStyle(currentColor));
|
||||
else form.removeAttribute('style');
|
||||
form.querySelectorAll('.note-color-dot').forEach(d => {
|
||||
d.classList.toggle('active', _dotIsActive(d.dataset.color, currentColor));
|
||||
d.style.background = _dotBg(d.dataset.color, currentColor);
|
||||
});
|
||||
form.dispatchEvent(new Event('change', { bubbles: true }));
|
||||
};
|
||||
form.querySelectorAll('.note-color-dot').forEach(dot => {
|
||||
dot.addEventListener('click', () => {
|
||||
if (dot.dataset.color === 'custom') {
|
||||
_pickCustomBgImage().then(url => { if (url) _applyFormColor('bg:' + url); });
|
||||
return;
|
||||
}
|
||||
_applyFormColor(dot.dataset.color);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
return { COLORS, COLOR_HEX, _isBgImage, _bgImageUrl, _dotBg, _dotIsActive, _customColorStyle, _pickCustomBgImage, _wireFormColors };
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
/** Collect editor drafts, restore them and wire the autosave workflow. */
|
||||
export function createDraftEditor({
|
||||
bindDraft,
|
||||
_collectItems,
|
||||
_loadDraft
|
||||
}) {
|
||||
function _collectFormDraft(form) {
|
||||
if (!form) return null;
|
||||
const type = form.querySelector('.note-form-type-pill.active')?.dataset.type || form.dataset.noteType || 'note';
|
||||
const d = {
|
||||
_ts: Date.now(),
|
||||
note_type: type,
|
||||
color: form.dataset.noteColor || '',
|
||||
title: form.querySelector('.note-form-title')?.value || '',
|
||||
label: form.querySelector('.note-form-label')?.value || '',
|
||||
due_date: form.querySelector('.note-form-due')?.value || null,
|
||||
repeat: form.querySelector('.note-form-repeat')?.value || 'none',
|
||||
};
|
||||
if (type === 'note') d.content = form.querySelector('.note-form-content')?.value || '';
|
||||
else if (type === 'goal') { d.content = form.querySelector('.note-form-goal-desc')?.value || ''; d.items = _collectItems(form); }
|
||||
else d.items = _collectItems(form);
|
||||
return d;
|
||||
}
|
||||
|
||||
function _isDraftEmpty(d) {
|
||||
if (!d) return true;
|
||||
if ((d.title || '').trim()) return false;
|
||||
if ((d.content || '').trim()) return false;
|
||||
if (Array.isArray(d.items) && d.items.some(it => (it.text || '').trim())) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
function _wireDraftAutosave(form, id) {
|
||||
const view = {
|
||||
get failed() { return form._autosaveFailed; },
|
||||
set failed(value) { form._autosaveFailed = value; },
|
||||
};
|
||||
const draft = bindDraft({ collect: () => _collectFormDraft(form), id, view });
|
||||
form._flushDraft = draft.flush;
|
||||
form._stopDraftAutosave = draft.stop;
|
||||
form.addEventListener('input', draft.schedule);
|
||||
form.addEventListener('change', draft.schedule);
|
||||
form.addEventListener('click', event => {
|
||||
if (event.target.closest('.note-cl-dot, .note-cl-rm')) draft.schedule();
|
||||
});
|
||||
}
|
||||
|
||||
function _commitOpenInPlaceEditor() {
|
||||
const form = document.querySelector('#notes-pane .note-form');
|
||||
if (!form) return;
|
||||
const d = _collectFormDraft(form);
|
||||
if (_isDraftEmpty(d)) { form.querySelector('.note-form-cancel')?.click(); return; }
|
||||
form.querySelector('.note-form-save')?.click();
|
||||
}
|
||||
|
||||
function _applyDraftToNote(note, id) {
|
||||
const d = _loadDraft(id);
|
||||
if (!d) return { note, restored: false };
|
||||
const merged = { ...(note || {}) };
|
||||
['note_type', 'color', 'title', 'label', 'due_date', 'repeat', 'content', 'items'].forEach(k => {
|
||||
if (d[k] !== undefined) merged[k] = d[k];
|
||||
});
|
||||
return { note: merged, restored: true };
|
||||
}
|
||||
|
||||
return { _collectFormDraft, _isDraftEmpty, _wireDraftAutosave, _commitOpenInPlaceEditor, _applyDraftToNote };
|
||||
}
|
||||
@@ -0,0 +1,442 @@
|
||||
/** Canvas drawing tools, local drawing undo and PNG uploads. */
|
||||
export function createDrawing({
|
||||
lifecycle,
|
||||
_safeImgSrc,
|
||||
api,
|
||||
attachColorPicker
|
||||
}) {
|
||||
function _buildDrawHtml() {
|
||||
return `
|
||||
<div class="note-form-draw-wrap">
|
||||
<canvas class="note-form-canvas" width="600" height="320"></canvas>
|
||||
<div class="note-form-draw-toolbar">
|
||||
<input type="color" class="note-form-draw-color" title="Stroke color" value="#222222" />
|
||||
<label class="note-form-draw-tool note-form-draw-size-wrap" title="Stroke size">
|
||||
<input type="range" class="note-form-draw-size" min="1" max="24" value="3" />
|
||||
</label>
|
||||
<div class="note-form-draw-be" role="group">
|
||||
<button type="button" class="note-form-draw-be-btn note-form-draw-brush active" data-mode="pen" title="Brush">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9.06 11.9l8.07-8.06a2.85 2.85 0 1 1 4.03 4.03l-8.06 8.08"/><path d="M7.07 14.94c-1.66 0-3 1.35-3 3.02 0 1.33-2.5 1.52-2 2.02 1.08 1.1 2.49 2.02 4 2.02 2.2 0 4-1.8 4-4.04 0-1.67-1.34-3.02-3-3.02z"/></svg>
|
||||
</button>
|
||||
<button type="button" class="note-form-draw-be-btn note-form-draw-eraser" data-mode="eraser" title="Eraser">
|
||||
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="m7 21-4.3-4.3c-1-1-1-2.5 0-3.4l9.6-9.6c1-1 2.5-1 3.4 0l5.6 5.6c1 1 1 2.5 0 3.4L13 21"/><path d="M22 21H7"/><path d="m5 11 9 9"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
<button type="button" class="note-form-draw-undo" title="Undo" aria-label="Undo">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 14 4 9 9 4"></polyline><path d="M4 9h11a5 5 0 0 1 5 5v0a5 5 0 0 1-5 5H9"></path></svg>
|
||||
</button>
|
||||
<button type="button" class="note-form-draw-text" title="Add text — click to cycle size" aria-label="Add text">T<span class="note-form-draw-text-badge"></span></button>
|
||||
<button type="button" class="note-form-draw-line" title="Line — click to cycle size">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="4" y1="20" x2="20" y2="4"/></svg>
|
||||
<span class="note-form-draw-shape-badge"></span>
|
||||
</button>
|
||||
<button type="button" class="note-form-draw-circle" title="Circle — click to cycle size">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="9"/></svg>
|
||||
<span class="note-form-draw-shape-badge"></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function _wireCanvas(container, initialImageUrl) {
|
||||
const canvas = container.querySelector('.note-form-canvas');
|
||||
if (!canvas) return;
|
||||
const resolveThemeColor = (expression, fallback) => {
|
||||
const probe = document.createElement('span');
|
||||
probe.style.color = expression;
|
||||
probe.style.position = 'fixed';
|
||||
probe.style.visibility = 'hidden';
|
||||
document.body.appendChild(probe);
|
||||
const resolved = getComputedStyle(probe).color || fallback;
|
||||
probe.remove();
|
||||
return resolved;
|
||||
};
|
||||
const colorToHex = (color, fallback) => {
|
||||
try {
|
||||
const probe = document.createElement('canvas');
|
||||
probe.width = probe.height = 1;
|
||||
const probeCtx = probe.getContext('2d');
|
||||
probeCtx.fillStyle = color;
|
||||
probeCtx.fillRect(0, 0, 1, 1);
|
||||
const [r, g, b] = probeCtx.getImageData(0, 0, 1, 1).data;
|
||||
return `#${[r, g, b].map(v => v.toString(16).padStart(2, '0')).join('')}`;
|
||||
} catch { return fallback; }
|
||||
};
|
||||
const surfaceColor = resolveThemeColor('var(--panel, var(--bg))', '#282c34');
|
||||
const surfaceColorHex = colorToHex(surfaceColor, '#282c34');
|
||||
const highlightColor = colorToHex(
|
||||
resolveThemeColor('var(--accent, var(--red))', '#e06c75'),
|
||||
'#e06c75',
|
||||
);
|
||||
const colorInput = container.querySelector('.note-form-draw-color');
|
||||
if (colorInput) colorInput.value = highlightColor;
|
||||
// Bump the backing-store resolution for retina displays so strokes stay
|
||||
// crisp. Set only style.width : leaving style.height to auto so the canvas
|
||||
// scales uniformly via its intrinsic aspect ratio. If both CSS dimensions
|
||||
// are pinned, max-width:100% shrinks the width only, leaving rasterized
|
||||
// glyphs visibly stretched relative to their on-screen input.
|
||||
const dpr = Math.min(window.devicePixelRatio || 1, 2);
|
||||
const cssW = canvas.width;
|
||||
const cssH = canvas.height;
|
||||
// Fill the container up to the logical width (don't pin a hard 600px,
|
||||
// which on a narrow phone forces the card wider than the viewport and
|
||||
// pushes the drawing outside the note). _pos() scales pointer coords by
|
||||
// the actual displayed width, so accuracy is preserved at any size.
|
||||
canvas.style.width = '100%';
|
||||
canvas.style.maxWidth = cssW + 'px';
|
||||
canvas.style.height = 'auto';
|
||||
canvas.style.aspectRatio = cssW + ' / ' + cssH;
|
||||
canvas.width = cssW * dpr;
|
||||
canvas.height = cssH * dpr;
|
||||
const ctx = canvas.getContext('2d');
|
||||
ctx.scale(dpr, dpr);
|
||||
ctx.fillStyle = surfaceColor;
|
||||
ctx.fillRect(0, 0, cssW, cssH);
|
||||
ctx.lineCap = 'round';
|
||||
ctx.lineJoin = 'round';
|
||||
|
||||
// Load prior drawing as starting point so consecutive edits compose.
|
||||
const safeInitialImageUrl = _safeImgSrc(initialImageUrl);
|
||||
if (safeInitialImageUrl) {
|
||||
const img = new Image();
|
||||
img.crossOrigin = 'anonymous';
|
||||
img.onload = () => { try { ctx.drawImage(img, 0, 0, cssW, cssH); } catch {} };
|
||||
img.src = safeInitialImageUrl;
|
||||
// Float an X over the canvas so the user can blank it out and go back to
|
||||
// a clean draw surface. Removes itself once clicked.
|
||||
const wrap = container.querySelector('.note-form-draw-wrap');
|
||||
if (wrap && !wrap.querySelector('.note-form-draw-bg-rm')) {
|
||||
const rm = document.createElement('button');
|
||||
rm.type = 'button';
|
||||
rm.className = 'note-form-draw-bg-rm';
|
||||
rm.title = 'Clear photo (regular draw)';
|
||||
rm.innerHTML = '×';
|
||||
rm.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
ctx.fillStyle = surfaceColor;
|
||||
ctx.fillRect(0, 0, cssW, cssH);
|
||||
rm.remove();
|
||||
});
|
||||
wrap.appendChild(rm);
|
||||
}
|
||||
}
|
||||
|
||||
// Swap the native browser color dialog for the in-house HSV picker
|
||||
// (same one used by Themes + the gallery editor). Existing `input` event
|
||||
// listeners + .value reads keep working : see colorPicker.js.
|
||||
if (colorInput) attachColorPicker(colorInput);
|
||||
const sizeInput = container.querySelector('.note-form-draw-size');
|
||||
const beSeg = container.querySelector('.note-form-draw-be');
|
||||
const brushBtn = container.querySelector('.note-form-draw-brush');
|
||||
const eraserBtn = container.querySelector('.note-form-draw-eraser');
|
||||
const textBtn = container.querySelector('.note-form-draw-text');
|
||||
const lineBtn = container.querySelector('.note-form-draw-line');
|
||||
const circleBtn = container.querySelector('.note-form-draw-circle');
|
||||
const undoBtn = container.querySelector('.note-form-draw-undo');
|
||||
// Single source of truth for what clicks/drags do. Other booleans are
|
||||
// derived from this so we never end up with conflicting "eraser AND text"
|
||||
// states (the bug that made T appear broken after using the eraser).
|
||||
// Modes: 'pen' | 'eraser' | 'text-s' | 'text-m' | 'text-l' | 'line' | 'circle'
|
||||
let mode = 'pen';
|
||||
let drawing = false;
|
||||
let last = null;
|
||||
// The text tool has three preset sizes (CSS px font-size).
|
||||
const TEXT_SIZES = { 's': 16, 'm': 26, 'l': 40 };
|
||||
// Line / circle stroke widths in logical pixels : three crisp options.
|
||||
const SHAPE_WIDTHS = { 's': 2, 'm': 5, 'l': 10 };
|
||||
// Snapshot taken at the start of a shape drag so the preview can repaint
|
||||
// cleanly on each move without accumulating intermediate strokes.
|
||||
let _shapeSnapshot = null;
|
||||
|
||||
// Per-canvas undo stack. We snapshot the bitmap (as ImageData) BEFORE each
|
||||
// operation : stroke, text commit, or future operations : and pop+restore
|
||||
// on Undo. Cap to 30 to keep memory bounded.
|
||||
const _undoStack = [];
|
||||
const UNDO_LIMIT = 30;
|
||||
const _syncUndoButton = () => {
|
||||
const available = _undoStack.length > 0;
|
||||
undoBtn?.classList.toggle('has-undo', available);
|
||||
undoBtn?.toggleAttribute('disabled', !available);
|
||||
undoBtn?.setAttribute('aria-disabled', available ? 'false' : 'true');
|
||||
};
|
||||
const _markCanvasDirty = () => container.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
const _snapshot = () => {
|
||||
try {
|
||||
const w = canvas.width, h = canvas.height;
|
||||
_undoStack.push(ctx.getImageData(0, 0, w, h));
|
||||
if (_undoStack.length > UNDO_LIMIT) _undoStack.shift();
|
||||
_syncUndoButton();
|
||||
} catch {}
|
||||
};
|
||||
const _undo = () => {
|
||||
const prev = _undoStack.pop();
|
||||
if (!prev) { _syncUndoButton(); return; }
|
||||
// Restore against the raw backing store: temporarily reset the active
|
||||
// ctx scale, paint the snapshot 1:1, then reapply our standard transform.
|
||||
ctx.save();
|
||||
ctx.setTransform(1, 0, 0, 1, 0, 0);
|
||||
ctx.putImageData(prev, 0, 0);
|
||||
ctx.restore();
|
||||
_markCanvasDirty();
|
||||
_syncUndoButton();
|
||||
};
|
||||
|
||||
const _pos = (e) => {
|
||||
// CSS can shrink the canvas (max-width:100%) without changing its logical
|
||||
// size, so compute the displayed-to-logical scale per axis. Pointer coords
|
||||
// are in CSS pixels; the dpr-scaled ctx expects logical (cssW × cssH).
|
||||
const r = canvas.getBoundingClientRect();
|
||||
const sx = cssW / r.width;
|
||||
const sy = cssH / r.height;
|
||||
const t = e.touches ? e.touches[0] : e;
|
||||
return { x: (t.clientX - r.left) * sx, y: (t.clientY - r.top) * sy };
|
||||
};
|
||||
const _begin = (e) => {
|
||||
if (mode.startsWith('text-')) {
|
||||
// Stop the event so the browser doesn't synthesize a follow-up click
|
||||
// that would blur the input we're about to create.
|
||||
e.preventDefault?.();
|
||||
e.stopPropagation?.();
|
||||
_openTextInput(e);
|
||||
return;
|
||||
}
|
||||
_snapshot();
|
||||
last = _pos(e);
|
||||
drawing = true;
|
||||
if (mode.startsWith('line-') || mode.startsWith('circle-')) {
|
||||
// Capture the backing pixels so the preview can replay each move from
|
||||
// the same starting state (otherwise live shapes accumulate).
|
||||
try { _shapeSnapshot = ctx.getImageData(0, 0, canvas.width, canvas.height); } catch {}
|
||||
return;
|
||||
}
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(last.x, last.y);
|
||||
};
|
||||
|
||||
// Drop an HTML input at the click position so the user can type, then
|
||||
// rasterize the text onto the canvas at blur/Enter. Mirrors how PDF form
|
||||
// annotations work in our doc editor.
|
||||
let _activeTextInput = null;
|
||||
const _openTextInput = (e) => {
|
||||
// Commit any prior pending input before starting a new one : otherwise
|
||||
// the first click leaves an orphaned input the user thinks "didn't work".
|
||||
if (_activeTextInput) { try { _activeTextInput.blur(); } catch {} }
|
||||
const r = canvas.getBoundingClientRect();
|
||||
const t = e.touches ? e.touches[0] : e;
|
||||
// Position is anchored to the wrap, not the canvas; since the canvas is
|
||||
// the first child of the wrap and the wrap has no padding, they share an
|
||||
// origin, so we offset from the canvas rect directly.
|
||||
const px = t.clientX - r.left;
|
||||
const py = t.clientY - r.top;
|
||||
const logical = _pos(e);
|
||||
// Size is decided by which T variant is active (S/M/L), not the stroke
|
||||
// slider : those are independent dials.
|
||||
const sizeKey = mode.startsWith('text-') ? mode.slice(-1) : 'm';
|
||||
const sizeCss = TEXT_SIZES[sizeKey] || TEXT_SIZES.m;
|
||||
const wrap = container.querySelector('.note-form-draw-wrap');
|
||||
if (!wrap) return;
|
||||
if (getComputedStyle(wrap).position === 'static') wrap.style.position = 'relative';
|
||||
const input = document.createElement('input');
|
||||
input.type = 'text';
|
||||
input.className = 'note-form-draw-textinput';
|
||||
input.placeholder = 'type then Enter';
|
||||
const color = colorInput?.value || '#222';
|
||||
const maxW = Math.max(120, Math.floor(r.width - px - 4));
|
||||
input.style.cssText = [
|
||||
'position:absolute',
|
||||
`left:${px}px`,
|
||||
`top:${Math.max(0, py - sizeCss * 0.7)}px`,
|
||||
`font:${sizeCss}px Arial, sans-serif`,
|
||||
`color:${color}`,
|
||||
'background:#ffffff',
|
||||
'border:2px solid var(--accent)',
|
||||
'border-radius:4px',
|
||||
'outline:none',
|
||||
'padding:2px 6px',
|
||||
'min-width:120px',
|
||||
`max-width:${maxW}px`,
|
||||
'z-index:1000',
|
||||
'box-shadow:0 2px 8px rgba(0,0,0,0.25)',
|
||||
'pointer-events:auto',
|
||||
].join(';');
|
||||
wrap.appendChild(input);
|
||||
_activeTextInput = input;
|
||||
// Focus synchronously so the call still counts as inside the user gesture
|
||||
// on iOS / Android, then re-focus on the next frame in case a competing
|
||||
// synthetic event (touch → click) moved focus away.
|
||||
input.focus();
|
||||
requestAnimationFrame(() => { if (document.activeElement !== input) input.focus(); });
|
||||
let committed = false;
|
||||
const commit = () => {
|
||||
if (committed) return;
|
||||
committed = true;
|
||||
const text = input.value;
|
||||
if (_activeTextInput === input) _activeTextInput = null;
|
||||
input.remove();
|
||||
if (!text) return;
|
||||
// Snapshot BEFORE rasterizing so Undo removes the text in one step.
|
||||
_snapshot();
|
||||
ctx.save();
|
||||
ctx.globalCompositeOperation = 'source-over';
|
||||
ctx.fillStyle = color;
|
||||
// Canvas now scales uniformly (style.height: auto), so a single ratio
|
||||
// suffices for picking the logical font size that matches what the
|
||||
// user just saw in the HTML input.
|
||||
const sx = cssW / r.width;
|
||||
const logicalSize = sizeCss * sx;
|
||||
ctx.font = `${logicalSize}px sans-serif`;
|
||||
ctx.textBaseline = 'top';
|
||||
ctx.fillText(text, logical.x, logical.y - logicalSize * 0.7);
|
||||
ctx.restore();
|
||||
_markCanvasDirty();
|
||||
};
|
||||
input.addEventListener('blur', commit);
|
||||
input.addEventListener('keydown', (ev) => {
|
||||
if (ev.key === 'Enter') { ev.preventDefault(); input.blur(); }
|
||||
else if (ev.key === 'Escape') { input.value = ''; input.blur(); }
|
||||
});
|
||||
};
|
||||
const _move = (e) => {
|
||||
if (!drawing) return;
|
||||
e.preventDefault?.();
|
||||
const p = _pos(e);
|
||||
if (mode.startsWith('line-') || mode.startsWith('circle-')) {
|
||||
// Restore the pre-shape bitmap, then redraw the preview shape from
|
||||
// anchor → current pointer.
|
||||
if (_shapeSnapshot) {
|
||||
ctx.save();
|
||||
ctx.setTransform(1, 0, 0, 1, 0, 0);
|
||||
ctx.putImageData(_shapeSnapshot, 0, 0);
|
||||
ctx.restore();
|
||||
}
|
||||
ctx.globalCompositeOperation = 'source-over';
|
||||
ctx.strokeStyle = colorInput?.value || '#222';
|
||||
const sizeKey = mode.slice(-1);
|
||||
ctx.lineWidth = SHAPE_WIDTHS[sizeKey] || SHAPE_WIDTHS.m;
|
||||
ctx.beginPath();
|
||||
if (mode.startsWith('line-')) {
|
||||
ctx.moveTo(last.x, last.y);
|
||||
ctx.lineTo(p.x, p.y);
|
||||
} else {
|
||||
const dx = p.x - last.x;
|
||||
const dy = p.y - last.y;
|
||||
const radius = Math.hypot(dx, dy);
|
||||
ctx.arc(last.x, last.y, radius, 0, Math.PI * 2);
|
||||
}
|
||||
ctx.stroke();
|
||||
return;
|
||||
}
|
||||
const erasing = mode === 'eraser';
|
||||
ctx.globalCompositeOperation = 'source-over';
|
||||
ctx.strokeStyle = erasing ? surfaceColor : (colorInput?.value || highlightColor);
|
||||
ctx.lineWidth = Number(sizeInput?.value || 3) * (erasing ? 2.5 : 1);
|
||||
ctx.lineTo(p.x, p.y);
|
||||
ctx.stroke();
|
||||
last = p;
|
||||
};
|
||||
const _end = () => {
|
||||
if (drawing) _markCanvasDirty();
|
||||
drawing = false; last = null; _shapeSnapshot = null;
|
||||
};
|
||||
|
||||
canvas.addEventListener('mousedown', _begin);
|
||||
canvas.addEventListener('mousemove', _move);
|
||||
lifecycle.listen(canvas, window, 'mouseup', _end);
|
||||
// Non-passive so text mode can preventDefault : otherwise the synthetic
|
||||
// mousedown/click that follows a touch can blur the freshly-created text
|
||||
// input on iOS Safari, making T look like a no-op.
|
||||
canvas.addEventListener('touchstart', (e) => { if (mode.startsWith('text-')) e.preventDefault(); _begin(e); }, { passive: false });
|
||||
canvas.addEventListener('touchmove', _move, { passive: false });
|
||||
canvas.addEventListener('touchend', _end);
|
||||
canvas.addEventListener('touchcancel', _end);
|
||||
|
||||
// Single mode setter : keeps the toolbar, swatch, and cursor in sync, and
|
||||
// makes sure exiting the eraser restores the user's chosen color whether
|
||||
// they exit by clicking another tool or by toggling eraser off.
|
||||
let _preEraseColor = null;
|
||||
const _setMode = (next) => {
|
||||
const wasEraser = mode === 'eraser';
|
||||
mode = next;
|
||||
const isEraser = next === 'eraser';
|
||||
const isPen = next === 'pen';
|
||||
const isText = next.startsWith('text-');
|
||||
// Swatch: theme surface while erasing, restored when leaving that mode.
|
||||
if (isEraser && !wasEraser && colorInput) {
|
||||
_preEraseColor = colorInput.value;
|
||||
colorInput.value = surfaceColorHex;
|
||||
} else if (!isEraser && wasEraser && colorInput && _preEraseColor) {
|
||||
colorInput.value = _preEraseColor;
|
||||
_preEraseColor = null;
|
||||
}
|
||||
// Brush/Eraser segmented pill : slides to the active side. When a non-
|
||||
// pen/eraser tool (T / line / circle) is active, neither half is
|
||||
// highlighted, but the pill still indicates which side the user was on
|
||||
// last so they can return with one click.
|
||||
const isLine = next.startsWith('line-');
|
||||
const isCircle = next.startsWith('circle-');
|
||||
beSeg?.classList.toggle('is-eraser', isEraser);
|
||||
brushBtn?.classList.toggle('active', isPen);
|
||||
eraserBtn?.classList.toggle('active', isEraser);
|
||||
textBtn?.classList.toggle('active', isText);
|
||||
lineBtn?.classList.toggle('active', isLine);
|
||||
circleBtn?.classList.toggle('active', isCircle);
|
||||
// Per-button size badges (S/M/L), driven off the mode suffix.
|
||||
const tBadge = textBtn?.querySelector('.note-form-draw-text-badge');
|
||||
if (tBadge) tBadge.textContent = isText ? next.slice(-1).toUpperCase() : '';
|
||||
const lBadge = lineBtn?.querySelector('.note-form-draw-shape-badge');
|
||||
if (lBadge) lBadge.textContent = isLine ? next.slice(-1).toUpperCase() : '';
|
||||
const cBadge = circleBtn?.querySelector('.note-form-draw-shape-badge');
|
||||
if (cBadge) cBadge.textContent = isCircle ? next.slice(-1).toUpperCase() : '';
|
||||
// Reflect the chosen size in the icon itself : thicker line/circle stroke
|
||||
// for M+L, larger T glyph for M+L. CSS rules read `.size-s/.size-m/.size-l`.
|
||||
const _sz = next.slice(-1);
|
||||
[textBtn, lineBtn, circleBtn].forEach(b => b?.classList.remove('size-s', 'size-m', 'size-l'));
|
||||
if (isText && /[sml]/.test(_sz)) textBtn?.classList.add('size-' + _sz);
|
||||
if (isLine && /[sml]/.test(_sz)) lineBtn?.classList.add('size-' + _sz);
|
||||
if (isCircle && /[sml]/.test(_sz)) circleBtn?.classList.add('size-' + _sz);
|
||||
canvas.style.cursor = isText ? 'text' : 'crosshair';
|
||||
};
|
||||
brushBtn?.addEventListener('click', () => _setMode('pen'));
|
||||
eraserBtn?.addEventListener('click', () => _setMode('eraser'));
|
||||
// T / Line / Circle: each cycles its own three sizes, then back to pen.
|
||||
const _cycle = (prefix) => {
|
||||
const seq = ['s', 'm', 'l'];
|
||||
if (!mode.startsWith(prefix)) return prefix + 's';
|
||||
const cur = mode.slice(-1);
|
||||
const next = seq[seq.indexOf(cur) + 1];
|
||||
return next ? prefix + next : 'pen';
|
||||
};
|
||||
textBtn?.addEventListener('click', () => _setMode(_cycle('text-')));
|
||||
lineBtn?.addEventListener('click', () => _setMode(_cycle('line-')));
|
||||
circleBtn?.addEventListener('click', () => _setMode(_cycle('circle-')));
|
||||
undoBtn?.addEventListener('click', () => _undo());
|
||||
_syncUndoButton();
|
||||
|
||||
// Stash so the save handler can read it later without re-resolving DOM.
|
||||
canvas._cssW = cssW;
|
||||
canvas._cssH = cssH;
|
||||
return canvas;
|
||||
}
|
||||
|
||||
async function _uploadCanvasAsPng(canvas, galleryId = null) {
|
||||
if (!canvas) return null;
|
||||
const blob = await new Promise(r => canvas.toBlob(r, 'image/png'));
|
||||
if (!blob) return null;
|
||||
const fd = new FormData();
|
||||
fd.append('files', blob, 'drawing.png');
|
||||
if (galleryId) fd.append('gallery_id', galleryId);
|
||||
try {
|
||||
const res = await api.upload(fd);
|
||||
const data = await res.json();
|
||||
const id = data.files?.[0]?.id;
|
||||
return id ? {
|
||||
url: api.uploadUrl(id),
|
||||
galleryId: data.files?.[0]?.gallery_id || null,
|
||||
} : null;
|
||||
} catch { return null; }
|
||||
}
|
||||
|
||||
return { _buildDrawHtml, _wireCanvas, _uploadCanvasAsPng };
|
||||
}
|
||||
@@ -0,0 +1,518 @@
|
||||
/** Build and wire note, checklist, goal and drawing editor forms. */
|
||||
export function createEditor({
|
||||
deleteFromEditor,
|
||||
submitNote,
|
||||
COLORS,
|
||||
_applyMasonry,
|
||||
_archiveNoteById,
|
||||
_buildChecklistHtml,
|
||||
_buildDrawHtml,
|
||||
_buildGoalHtml,
|
||||
_collectItems,
|
||||
_customColorStyle,
|
||||
_dotBg,
|
||||
_dotIsActive,
|
||||
_esc,
|
||||
_isBgImage,
|
||||
_renderNotes,
|
||||
_safeImgSrc,
|
||||
_uid,
|
||||
_uploadCanvasAsPng,
|
||||
_wireCanvas,
|
||||
_wireChecklist,
|
||||
_wireDraftAutosave,
|
||||
_wireFormColors,
|
||||
_wireGoalForm,
|
||||
_wireReminderPicker,
|
||||
api,
|
||||
app,
|
||||
state,
|
||||
uiModule
|
||||
}) {
|
||||
function _buildForm(note = null) {
|
||||
const isEdit = note && note.id;
|
||||
const type = note?.note_type === 'checklist' ? 'todo' : (note?.note_type || 'note');
|
||||
const color = note?.color || '';
|
||||
const items = note?.items || [{ id: _uid(), text: '', done: false }];
|
||||
|
||||
const form = document.createElement('div');
|
||||
form.className = 'note-form';
|
||||
form.dataset.noteType = type;
|
||||
form.dataset.noteColor = color || '';
|
||||
if (color && !_isBgImage(color)) form.classList.add('note-color-' + color);
|
||||
if (_isBgImage(color)) form.setAttribute('style', _customColorStyle(color));
|
||||
let currentImageUrl = _safeImgSrc(note?.image_url || '');
|
||||
form.innerHTML = `
|
||||
<div class="note-form-header">
|
||||
<input type="text" class="note-form-title" placeholder="Title" value="${_esc(note?.title || '')}" />
|
||||
<button type="button" class="note-form-icon-btn note-form-remind-btn${note?.due_date ? ' has-date' : ''}" title="Remind me">
|
||||
<svg width="31" height="31" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"/><path d="M13.73 21a2 2 0 0 1-3.46 0"/></svg>
|
||||
</button>
|
||||
<input type="hidden" class="note-form-due" value="${note?.due_date || ''}" />
|
||||
<input type="hidden" class="note-form-repeat" value="${note?.repeat || 'none'}" />
|
||||
</div>
|
||||
${currentImageUrl && type !== 'draw' ? `<div class="note-form-image-wrap"><img class="note-form-image" src="${_esc(currentImageUrl)}" draggable="false" /><button class="note-form-image-rm" title="Remove">×</button></div>` : ''}
|
||||
<div class="note-form-body">
|
||||
${type === 'note'
|
||||
? `<textarea class="note-form-content" placeholder="Take a note..." rows="4">${_esc(note?.content || '')}</textarea>`
|
||||
: type === 'draw'
|
||||
? _buildDrawHtml()
|
||||
: type === 'goal'
|
||||
? _buildGoalHtml(note, items)
|
||||
: _buildChecklistHtml(items)}
|
||||
</div>
|
||||
<div class="note-form-reminder-tags"></div>
|
||||
<div class="note-form-meta">
|
||||
<div class="note-form-type-seg${type === 'todo' ? ' is-todo' : type === 'draw' ? ' is-draw' : ''}" role="group">
|
||||
<button type="button" class="note-form-type-pill${type === 'note' ? ' active' : ''}" data-type="note">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="4" y1="6" x2="20" y2="6"/><line x1="4" y1="12" x2="20" y2="12"/><line x1="4" y1="18" x2="14" y2="18"/></svg>
|
||||
<span>Note</span>
|
||||
</button>
|
||||
<button type="button" class="note-form-type-pill${type === 'todo' ? ' active' : ''}" data-type="todo">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 11 12 14 22 4"/><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"/></svg>
|
||||
<span>Todo</span>
|
||||
</button>
|
||||
<button type="button" class="note-form-type-pill${type === 'draw' ? ' active' : ''}" data-type="draw">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19l7-7 3 3-7 7-3-3z"/><path d="M18 13l-1.5-7.5L2 2l3.5 14.5L13 18l5-5z"/><path d="M2 2l7.586 7.586"/><circle cx="11" cy="11" r="2"/></svg>
|
||||
<span>Draw</span>
|
||||
</button>
|
||||
</div>
|
||||
<button class="note-form-photo-btn" title="Attach photo">
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="8.5" cy="8.5" r="1.5"/><polyline points="21 15 16 10 5 21"/></svg>
|
||||
</button>
|
||||
<input type="file" class="note-form-photo-input" accept="image/*" capture="environment" style="display:none" />
|
||||
<div class="note-color-picker">
|
||||
${COLORS.map(c => `<span class="note-color-dot${_dotIsActive(c.value, color) ? ' active' : ''}" data-color="${c.value}" style="background:${_dotBg(c.value, color)}" title="${c.name || 'default'}"></span>`).join('')}
|
||||
</div>
|
||||
<input type="text" class="note-form-label" value="${_esc(note?.label || '')}" placeholder="#tag1 #tag2" title="Tag(s) — space-separated" />
|
||||
<div class="note-form-actions-group">
|
||||
${isEdit ? `
|
||||
<button type="button" class="note-form-text-btn note-form-archive-btn note-form-collapsible" title="Archive">
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="5" rx="1"/><path d="M4 8v11a2 2 0 002 2h12a2 2 0 002-2V8"/><path d="M10 12h4"/></svg><span class="nft-label">Archive</span>
|
||||
</button>
|
||||
<button type="button" class="note-form-text-btn note-form-delete-btn note-form-collapsible danger" title="Delete">
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><line x1="10" y1="11" x2="10" y2="17"/><line x1="14" y1="11" x2="14" y2="17"/></svg><span class="nft-label">Delete</span>
|
||||
</button>
|
||||
` : ''}
|
||||
<span class="note-form-actions-spacer"></span>
|
||||
<button class="note-form-cancel note-form-text-btn note-form-collapsible" title="Close (keep changes)">
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg><span class="nft-label">Close</span>
|
||||
</button>
|
||||
<button class="note-form-save note-form-text-btn" title="${isEdit ? 'Update' : 'Save'}">
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg><span class="nft-label">${isEdit ? 'Update' : 'Save'}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
let currentType = type;
|
||||
let currentColor = color;
|
||||
// Stash original-form values so round-trips (Note→Todo→Note) restore the
|
||||
// user's hand-formatted text instead of a join of generated items. Same the
|
||||
// other way: if you started in todo, switch to note, switch back, items
|
||||
// come back unchanged.
|
||||
let _stashedNoteText = (type === 'note') ? (note?.content || '') : null;
|
||||
let _stashedTodoItems = (type === 'todo' && Array.isArray(note?.items)) ? note.items.slice() : null;
|
||||
// Goal mode kept its own pair of stashes (description + steps) so a
|
||||
// Todo→Goal→Todo round-trip wouldn't lose either side. The Goal pill in
|
||||
// the type picker was later removed, so the only entry point now is
|
||||
// *editing* an existing goal-typed note : but the switch handler still
|
||||
// accepts Goal→Todo/Note transitions (downgrading legacy goals), so
|
||||
// these stashes still earn their keep.
|
||||
let _stashedGoalDesc = (type === 'goal') ? (note?.content || '') : null;
|
||||
let _stashedGoalItems = (type === 'goal' && Array.isArray(note?.items)) ? note.items.slice() : null;
|
||||
|
||||
// Drawing also stashes the saved image URL so it survives Note↔Draw flips.
|
||||
let _stashedDrawUrl = (type === 'draw') ? (_safeImgSrc(note?.image_url) || null) : null;
|
||||
const _refreshFormLayout = () => {
|
||||
const body = form.closest('.notes-pane-body');
|
||||
if (!body) return;
|
||||
_applyMasonry(body);
|
||||
requestAnimationFrame(() => {
|
||||
_applyMasonry(body);
|
||||
requestAnimationFrame(() => _applyMasonry(body));
|
||||
});
|
||||
};
|
||||
|
||||
// Type segmented control : Note | Todo | Draw
|
||||
form.querySelectorAll('.note-form-type-pill').forEach(pill => {
|
||||
pill.addEventListener('click', () => {
|
||||
const newType = pill.dataset.type;
|
||||
if (newType === currentType) return;
|
||||
const bodyEl = form.querySelector('.note-form-body');
|
||||
// Stash whatever the user has in the current mode before swapping it
|
||||
// out, so a subsequent flip back restores their work.
|
||||
if (currentType === 'note') {
|
||||
_stashedNoteText = form.querySelector('.note-form-content')?.value || '';
|
||||
} else if (currentType === 'todo') {
|
||||
_stashedTodoItems = _collectItems(form);
|
||||
} else if (currentType === 'goal') {
|
||||
_stashedGoalDesc = form.querySelector('.note-form-goal-desc')?.value || '';
|
||||
_stashedGoalItems = _collectItems(form);
|
||||
} else if (currentType === 'draw') {
|
||||
const c = form.querySelector('.note-form-canvas');
|
||||
if (c) { try { _stashedDrawUrl = c.toDataURL('image/png'); } catch {} }
|
||||
}
|
||||
// Render the new mode's body and re-wire its inputs.
|
||||
if (newType === 'todo') {
|
||||
let nextItems;
|
||||
if (_stashedTodoItems && _stashedTodoItems.length) {
|
||||
nextItems = _stashedTodoItems;
|
||||
} else if (_stashedGoalItems && _stashedGoalItems.length) {
|
||||
// Going Goal→Todo keeps the AI-generated steps as a plain checklist.
|
||||
nextItems = _stashedGoalItems;
|
||||
} else if (_stashedNoteText) {
|
||||
const lines = _stashedNoteText.split('\n').map(s => s.trim()).filter(Boolean);
|
||||
nextItems = lines.length ? lines.map(t => ({ id: _uid(), text: t, done: false })) : [{ id: _uid(), text: '', done: false }];
|
||||
} else {
|
||||
nextItems = [{ id: _uid(), text: '', done: false }];
|
||||
}
|
||||
bodyEl.innerHTML = _buildChecklistHtml(nextItems);
|
||||
_wireChecklist(bodyEl);
|
||||
} else if (newType === 'draw') {
|
||||
bodyEl.innerHTML = _buildDrawHtml();
|
||||
// If the user just attached a photo (via the photo button) and then
|
||||
// toggled to Draw, paint that photo onto the canvas so they can draw
|
||||
// on top of it. _stashedDrawUrl wins if they were drawing earlier in
|
||||
// the same edit session.
|
||||
_wireCanvas(bodyEl, _stashedDrawUrl || currentImageUrl || _safeImgSrc(note?.image_url) || null);
|
||||
} else {
|
||||
const text = (_stashedNoteText !== null && _stashedNoteText !== undefined && _stashedNoteText !== '')
|
||||
? _stashedNoteText
|
||||
: (_stashedGoalDesc && _stashedGoalDesc)
|
||||
|| (_stashedTodoItems || _stashedGoalItems || []).map(i => i.text).join('\n');
|
||||
bodyEl.innerHTML = `<textarea class="note-form-content" placeholder="Take a note..." rows="4">${_esc(text)}</textarea>`;
|
||||
_wireHashtag(bodyEl.querySelector('.note-form-content'));
|
||||
}
|
||||
const focusEl = newType === 'note'
|
||||
? bodyEl.querySelector('.note-form-content')
|
||||
: newType === 'todo'
|
||||
? bodyEl.querySelector('.note-cl-text')
|
||||
: null;
|
||||
if (focusEl) {
|
||||
requestAnimationFrame(() => {
|
||||
focusEl.focus({ preventScroll: true });
|
||||
try {
|
||||
const end = focusEl.value.length;
|
||||
focusEl.setSelectionRange(end, end);
|
||||
} catch {}
|
||||
});
|
||||
}
|
||||
currentType = newType;
|
||||
const seg = form.querySelector('.note-form-type-seg');
|
||||
seg?.classList.toggle('is-todo', newType === 'todo');
|
||||
seg?.classList.toggle('is-draw', newType === 'draw');
|
||||
form.querySelectorAll('.note-form-type-pill').forEach(p => p.classList.toggle('active', p.dataset.type === newType));
|
||||
// The standalone image preview (form-image-wrap) and the canvas would
|
||||
// otherwise both show the same image_url when editing a drawn note.
|
||||
// Hide it in draw mode, restore it when leaving draw mode.
|
||||
const imgWrap = form.querySelector('.note-form-image-wrap');
|
||||
if (imgWrap) imgWrap.style.display = (newType === 'draw') ? 'none' : '';
|
||||
// The background-color dots set the note card's bg : they make no sense
|
||||
// for a drawn note (the canvas image IS the card content), so hide them.
|
||||
const bgPicker = form.querySelector('.note-color-picker');
|
||||
if (bgPicker) bgPicker.style.display = (newType === 'draw') ? 'none' : '';
|
||||
if (form.closest('.notes-pane.notes-view-grid') && window.matchMedia('(max-width: 768px)').matches) {
|
||||
form.style.gridColumn = '1 / -1';
|
||||
form.style.gridRowEnd = newType === 'draw' ? 'span 152' : 'span 64';
|
||||
}
|
||||
_refreshFormLayout();
|
||||
});
|
||||
});
|
||||
|
||||
// Slide a finger across the Note/Todo/Draw control to switch modes (mobile).
|
||||
// On touchmove we find the pill under the finger and click it : reusing the
|
||||
// pill click handler above, so the body re-renders + content stashing all
|
||||
// work. Only fires when crossing into a *different* pill.
|
||||
const _typeSeg = form.querySelector('.note-form-type-seg');
|
||||
if (_typeSeg) {
|
||||
let _sliding = false;
|
||||
const _activateAt = (x, y) => {
|
||||
const pill = document.elementFromPoint(x, y)?.closest?.('.note-form-type-pill');
|
||||
if (pill && !pill.classList.contains('active')) pill.click();
|
||||
};
|
||||
_typeSeg.addEventListener('touchstart', () => { _sliding = true; }, { passive: true });
|
||||
_typeSeg.addEventListener('touchmove', (e) => {
|
||||
if (_sliding && e.touches[0]) _activateAt(e.touches[0].clientX, e.touches[0].clientY);
|
||||
}, { passive: true });
|
||||
_typeSeg.addEventListener('touchend', () => { _sliding = false; });
|
||||
_typeSeg.addEventListener('touchcancel', () => { _sliding = false; });
|
||||
}
|
||||
|
||||
_wireFormColors(form, value => { currentColor = value; });
|
||||
|
||||
if (currentType === 'todo') _wireChecklist(form.querySelector('.note-form-body'));
|
||||
if (currentType === 'goal') _wireGoalForm(form, form.querySelector('.note-form-body'));
|
||||
if (currentType === 'draw') {
|
||||
_wireCanvas(form.querySelector('.note-form-body'), _safeImgSrc(note?.image_url) || null);
|
||||
// Same hides we apply on type-switch : keep them consistent on initial open.
|
||||
const _ip = form.querySelector('.note-form-image-wrap'); if (_ip) _ip.style.display = 'none';
|
||||
const _cp = form.querySelector('.note-color-picker'); if (_cp) _cp.style.display = 'none';
|
||||
}
|
||||
|
||||
// Auto-grow the plain-note textarea so editing longer notes is
|
||||
// comfortable : it expands with the content (up to a cap) instead of
|
||||
// staying a cramped 4-row box. The user can still drag-resize too.
|
||||
const _contentTa = form.querySelector('.note-form-content');
|
||||
if (_contentTa) {
|
||||
const _grow = () => {
|
||||
_contentTa.style.height = 'auto';
|
||||
// Inline form: cap at ~50vh so a huge note doesn't push the action
|
||||
// buttons off-screen. Fullscreen mobile overlay: the body scrolls and
|
||||
// there are no inline buttons crowding, so allow nearly the full height
|
||||
// : capping at 50vh there clipped longer notes ("part disappears").
|
||||
const inFullscreen = !!_contentTa.closest('.note-fullscreen-overlay');
|
||||
const max = Math.round(window.innerHeight * (inFullscreen ? 0.9 : 0.5));
|
||||
_contentTa.style.height = Math.min(_contentTa.scrollHeight, max) + 'px';
|
||||
};
|
||||
_contentTa.addEventListener('input', _grow);
|
||||
// Grow on open so existing content is fully visible. Run again after the
|
||||
// fullscreen overlay's open animation settles : measuring mid-animation
|
||||
// (the overlay starts scaled/transitioning) can under-size the box.
|
||||
setTimeout(_grow, 0);
|
||||
setTimeout(_grow, 360);
|
||||
}
|
||||
|
||||
_wireReminderPicker(form);
|
||||
|
||||
// Photo upload
|
||||
const photoBtn = form.querySelector('.note-form-photo-btn');
|
||||
const photoInput = form.querySelector('.note-form-photo-input');
|
||||
if (photoBtn && photoInput) {
|
||||
photoBtn.addEventListener('click', () => photoInput.click());
|
||||
photoInput.addEventListener('change', async () => {
|
||||
const file = photoInput.files?.[0];
|
||||
if (!file) return;
|
||||
const fd = new FormData();
|
||||
fd.append('files', file);
|
||||
try {
|
||||
const res = await api.upload(fd);
|
||||
const data = await res.json();
|
||||
const fileId = data.files?.[0]?.id;
|
||||
if (!fileId) throw new Error('Upload failed');
|
||||
currentImageUrl = api.uploadUrl(fileId);
|
||||
// Only ever keep the latest attached photo : drop any existing wrap
|
||||
// before inserting a fresh one. Picking a second photo replaces the
|
||||
// first instead of stacking.
|
||||
form.querySelector('.note-form-image-wrap')?.remove();
|
||||
const wrap = document.createElement('div');
|
||||
wrap.className = 'note-form-image-wrap';
|
||||
wrap.innerHTML = `<img class="note-form-image" draggable="false" /><button class="note-form-image-rm" title="Remove">×</button>`;
|
||||
// Insert AFTER the whole header (a flex-row), not after the
|
||||
// title input itself : otherwise the image lands as a sibling
|
||||
// of the title inside the header and flex puts them side-by-side.
|
||||
form.querySelector('.note-form-header').after(wrap);
|
||||
wrap.querySelector('.note-form-image-rm').addEventListener('click', () => { wrap.remove(); currentImageUrl = ''; });
|
||||
wrap.querySelector('img').src = currentImageUrl;
|
||||
} catch (err) { uiModule.showError('Image upload failed'); }
|
||||
photoInput.value = '';
|
||||
});
|
||||
}
|
||||
// Existing image remove
|
||||
form.querySelector('.note-form-image-rm')?.addEventListener('click', () => {
|
||||
form.querySelector('.note-form-image-wrap')?.remove();
|
||||
currentImageUrl = '';
|
||||
});
|
||||
|
||||
// Title Enter -> focus body (textarea or first checklist item)
|
||||
form.querySelector('.note-form-title').addEventListener('keydown', (e) => {
|
||||
if (e.key === 'Enter' && !e.shiftKey && !e.ctrlKey && !e.metaKey) {
|
||||
e.preventDefault();
|
||||
const ta = form.querySelector('.note-form-content');
|
||||
if (ta) { ta.focus(); return; }
|
||||
const firstItem = form.querySelector('.note-cl-text');
|
||||
if (firstItem) firstItem.focus();
|
||||
}
|
||||
});
|
||||
|
||||
// Hashtag → label: typing "#foo " in title/content appends "foo" to the
|
||||
// space-separated tag list. Repeats are deduplicated, so #foo #foo only
|
||||
// keeps one. Tags already present in the label field are left alone.
|
||||
const labelInput = form.querySelector('.note-form-label');
|
||||
const _hashtagRe = /(^|\s)#([A-Za-z0-9][\w-]*)\s$/;
|
||||
function _wireHashtag(el) {
|
||||
if (!el || !labelInput) return;
|
||||
el.addEventListener('input', () => {
|
||||
const m = _hashtagRe.exec(el.value);
|
||||
if (!m) return;
|
||||
const tag = m[2];
|
||||
// Dedup against the stripped form : labelInput may already hold `#tag`
|
||||
// (after Enter normalised), so includes(tag) on the raw split would
|
||||
// miss the duplicate and append a bare `tag` next to `#tag`.
|
||||
const existing = labelInput.value.trim().split(/\s+/).filter(Boolean);
|
||||
const stripped = existing.map(t => t.replace(/^#+/, ''));
|
||||
if (!stripped.includes(tag)) {
|
||||
existing.push('#' + tag);
|
||||
labelInput.value = existing.join(' ');
|
||||
labelInput.classList.add('flash-once');
|
||||
setTimeout(() => labelInput.classList.remove('flash-once'), 600);
|
||||
}
|
||||
const cut = el.value.length - m[0].length + m[1].length;
|
||||
el.value = el.value.slice(0, cut);
|
||||
});
|
||||
}
|
||||
_wireHashtag(form.querySelector('.note-form-title'));
|
||||
_wireHashtag(form.querySelector('.note-form-content'));
|
||||
// Pressing Enter in the tag field commits the current word as its own tag
|
||||
// and parks the cursor after a trailing space, so the next word becomes a
|
||||
// separate tag rather than overwriting the previous one.
|
||||
labelInput?.addEventListener('keydown', (e) => {
|
||||
if (e.key !== 'Enter' || e.shiftKey || e.ctrlKey || e.metaKey) return;
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
// Strip any leading #s the user typed, dedupe, then re-prepend exactly
|
||||
// one #. So typing "foo" or "#foo" both end up as "#foo " in the input;
|
||||
// the save handler keeps stripping #s before storing so DB stays clean.
|
||||
const tags = [...new Set(labelInput.value.split(/\s+/).map(t => t.replace(/^#+/, '').trim()).filter(Boolean))];
|
||||
if (!tags.length) return;
|
||||
labelInput.value = tags.map(t => '#' + t).join(' ') + ' ';
|
||||
labelInput.setSelectionRange(labelInput.value.length, labelInput.value.length);
|
||||
labelInput.classList.add('flash-once');
|
||||
setTimeout(() => labelInput.classList.remove('flash-once'), 600);
|
||||
});
|
||||
|
||||
// Shift+Enter (or Cmd/Ctrl+Enter) anywhere in the form -> save
|
||||
// Escape -> cancel edit
|
||||
form.addEventListener('keydown', (e) => {
|
||||
if (e.key === 'Enter' && (e.shiftKey || e.ctrlKey || e.metaKey)) {
|
||||
e.preventDefault();
|
||||
form.querySelector('.note-form-save')?.click();
|
||||
} else if (e.key === 'Escape') {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
form.querySelector('.note-form-cancel')?.click();
|
||||
}
|
||||
});
|
||||
|
||||
// Save. Prevent the button from stealing focus on press: on mobile, the
|
||||
// first tap would otherwise just blur the focused textarea/input (closing
|
||||
// the keyboard and shifting layout), so the tap never reached the button and
|
||||
// you had to tap "Done" twice. mousedown preventDefault keeps focus put while
|
||||
// still letting the click fire.
|
||||
const _saveBtnEl0 = form.querySelector('.note-form-save');
|
||||
_saveBtnEl0.addEventListener('mousedown', (e) => e.preventDefault());
|
||||
_saveBtnEl0.addEventListener('click', async () => {
|
||||
// Guard against spam-clicks: the drawing save AWAITS a canvas upload before
|
||||
// the optimistic re-render removes the form, so without this a slow upload
|
||||
// let repeated clicks create duplicate notes.
|
||||
const _saveBtn = form.querySelector('.note-form-save');
|
||||
if (_saveBtn._saving) return;
|
||||
// Mobile: when an existing note is opened and closed without edits, the
|
||||
// Update (✓) button morphs into Archive (set up below). Route the click
|
||||
// directly through the archive flow. Using a DOM .click() proxy here was
|
||||
// fragile on mobile because the real archive button can move from the
|
||||
// footer to the fullscreen header.
|
||||
if (_saveBtn.classList.contains('archive-mode')) {
|
||||
_archiveNoteById(note?.id);
|
||||
return;
|
||||
}
|
||||
_saveBtn._saving = true; _saveBtn.disabled = true; _saveBtn.style.opacity = '0.5';
|
||||
try {
|
||||
form._flushDraft?.();
|
||||
await form._stopDraftAutosave?.();
|
||||
form._flushDraft?.();
|
||||
const title = form.querySelector('.note-form-title').value.trim();
|
||||
// Normalize tag input: split on whitespace, strip leading #s, dedupe,
|
||||
// re-join with single spaces. Empty → null.
|
||||
const _rawLabel = form.querySelector('.note-form-label')?.value || '';
|
||||
const _tags = [...new Set(_rawLabel.split(/\s+/).map(t => t.replace(/^#+/, '').trim()).filter(Boolean))];
|
||||
if (form.querySelector('.note-form-due').value && !_tags.includes('reminder')) _tags.push('reminder');
|
||||
const labelVal = _tags.length ? _tags.join(' ') : null;
|
||||
const payload = {
|
||||
title,
|
||||
note_type: currentType,
|
||||
color: currentColor,
|
||||
label: labelVal,
|
||||
due_date: form.querySelector('.note-form-due').value || null,
|
||||
repeat: form.querySelector('.note-form-repeat')?.value || 'none',
|
||||
image_url: currentImageUrl || null,
|
||||
};
|
||||
if (currentType === 'note') {
|
||||
payload.content = form.querySelector('.note-form-content')?.value || '';
|
||||
} else if (currentType === 'draw') {
|
||||
// Upload the canvas PNG before saving so image_url points to a
|
||||
// persistent file. We block the save until upload completes : drawings
|
||||
// can't be re-rendered later without the URL.
|
||||
const canvas = form.querySelector('.note-form-canvas');
|
||||
const upload = await _uploadCanvasAsPng(canvas, note?.gallery_id || null);
|
||||
if (!upload?.url) { uiModule.showError('Failed to save drawing'); return; }
|
||||
payload.image_url = upload.url;
|
||||
if (upload.galleryId) payload.gallery_id = upload.galleryId;
|
||||
} else if (currentType === 'goal') {
|
||||
// Legacy: existing goal-type notes still edit through this branch.
|
||||
// No AI involvement : save as a normal note with description + items.
|
||||
payload.content = form.querySelector('.note-form-goal-desc')?.value || '';
|
||||
payload.items = _collectItems(form);
|
||||
} else {
|
||||
payload.items = _collectItems(form);
|
||||
}
|
||||
if (isEdit) payload.id = note.id;
|
||||
submitNote(payload, note, isEdit);
|
||||
} finally {
|
||||
// Re-enable on early returns / errors. On success the form is removed by
|
||||
// the optimistic re-render, so re-enabling the detached button is a no-op.
|
||||
_saveBtn._saving = false; _saveBtn.disabled = false; _saveBtn.style.opacity = '';
|
||||
}
|
||||
});
|
||||
|
||||
// Mobile-only: when editing an existing note, the Update (✓) button starts in
|
||||
// archive-mode (visually + behaviorally) and flips to Update on the first
|
||||
// edit. Lets the user tap a note to skim, then tap ✓ to archive without ever
|
||||
// touching a separate Archive button.
|
||||
if (isEdit && window.innerWidth <= 768) {
|
||||
const _saveLabelEl = _saveBtnEl0.querySelector('.nft-label');
|
||||
const _isFinishedTodo = () => {
|
||||
if (currentType !== 'todo') return false;
|
||||
const rows = [...form.querySelectorAll('.note-cl-row')];
|
||||
const withText = rows.filter(row => (row.querySelector('.note-cl-text')?.value || '').trim());
|
||||
return withText.length > 0 && withText.every(row => row.classList.contains('done'));
|
||||
};
|
||||
const _enterArchive = () => {
|
||||
_saveBtnEl0.classList.add('archive-mode');
|
||||
const label = _isFinishedTodo() ? 'Finish' : 'Archive';
|
||||
if (_saveLabelEl) _saveLabelEl.textContent = label;
|
||||
_saveBtnEl0.title = label;
|
||||
};
|
||||
const _enterUpdate = () => {
|
||||
if (!_saveBtnEl0.classList.contains('archive-mode')) return;
|
||||
_saveBtnEl0.classList.remove('archive-mode');
|
||||
if (_saveLabelEl) _saveLabelEl.textContent = 'Update';
|
||||
_saveBtnEl0.title = 'Update';
|
||||
};
|
||||
_enterArchive();
|
||||
form.addEventListener('input', _enterUpdate, true);
|
||||
form.addEventListener('change', _enterUpdate, true);
|
||||
// Checklist dots use a custom control and dispatch their update before
|
||||
// this click bubbles. Re-evaluate afterward so a fully completed todo
|
||||
// offers Finish (which archives/removes it from the active list).
|
||||
form.addEventListener('click', (event) => {
|
||||
if (!event.target.closest('.note-cl-dot')) return;
|
||||
setTimeout(() => {
|
||||
if (_isFinishedTodo()) _enterArchive();
|
||||
else _enterUpdate();
|
||||
}, 0);
|
||||
}, true);
|
||||
}
|
||||
|
||||
// Cancel
|
||||
form.querySelector('.note-form-cancel').addEventListener('click', () => { form._flushDraft?.(); app.setEditingId(null); _renderNotes(); });
|
||||
|
||||
// Archive / Delete : edit-mode-only buttons, mirror the (now-hidden) card actions.
|
||||
form.querySelector('.note-form-archive-btn')?.addEventListener('click', () => {
|
||||
if (!isEdit) return;
|
||||
_archiveNoteById(note.id);
|
||||
});
|
||||
form.querySelector('.note-form-delete-btn')?.addEventListener('click', () => {
|
||||
if (!isEdit) return;
|
||||
return deleteFromEditor(note.id);
|
||||
});
|
||||
|
||||
// Autosave a draft to persistence on every change so unsaved edits
|
||||
// survive connection loss / reload / accidental close.
|
||||
_wireDraftAutosave(form, isEdit ? note.id : '__new__');
|
||||
|
||||
return form;
|
||||
}
|
||||
|
||||
return { _buildForm };
|
||||
}
|
||||
@@ -0,0 +1,139 @@
|
||||
/** Label chips, reminder/goal filters and collapsed tag-strip rendering. */
|
||||
import { _visibleNoteTags, _nextGoalStep } from '../domain/noteRules.js';
|
||||
import { _hasTimeComponent } from '../domain/recurrence.js';
|
||||
export function createFilters({
|
||||
NOTES_LABELS_COLLAPSED_KEY,
|
||||
_clearPastReminders,
|
||||
_esc,
|
||||
_isPastReminder,
|
||||
_renderNotes,
|
||||
_userVisibleNotes,
|
||||
app,
|
||||
persistence,
|
||||
state
|
||||
}) {
|
||||
function _renderLabels(root = document) {
|
||||
const bar = root.querySelector?.('.notes-labels-bar') || document.querySelector('.notes-labels-bar');
|
||||
if (!bar) return;
|
||||
if (state.labelsCollapsed) {
|
||||
bar.innerHTML = '';
|
||||
bar.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
const visibleNotes = _userVisibleNotes();
|
||||
const labels = new Set();
|
||||
for (const n of visibleNotes) for (const t of _visibleNoteTags(n)) labels.add(t);
|
||||
const sortedLabels = [...labels].sort();
|
||||
// Count active reminders (not archived, has datetime due_date)
|
||||
const reminderCount = visibleNotes.filter(n => !n.archived && n.due_date && _hasTimeComponent(n.due_date)).length;
|
||||
const pastReminderCount = visibleNotes.filter(n => !n.archived && _isPastReminder(n)).length;
|
||||
const defaultCount = visibleNotes.filter(n => !n.archived && _visibleNoteTags(n).length === 0).length;
|
||||
// Active goals = non-archived goal notes. Today view lists pending steps
|
||||
// from each, so we surface the count next to the chip.
|
||||
const goalCount = visibleNotes.filter(n => n.note_type === 'goal' && !n.archived).length;
|
||||
const todayCount = visibleNotes.filter(n => n.note_type === 'goal' && !n.archived && _nextGoalStep(n)).length;
|
||||
const hasUsefulFilters = sortedLabels.length > 0 || reminderCount > 0 || goalCount > 0;
|
||||
const hasActiveFilter = state.activeLabel !== null || state.activeFilter !== null;
|
||||
if (!hasUsefulFilters && !hasActiveFilter) {
|
||||
bar.innerHTML = '';
|
||||
bar.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
bar.style.display = '';
|
||||
const allActive = state.activeLabel === null && state.activeFilter === null;
|
||||
let html = `<button class="notes-label-chip${allActive ? ' active' : ''}" data-action="all">All</button>`;
|
||||
html += `<button class="notes-label-chip${state.activeFilter === 'default' ? ' active' : ''}" data-action="default" title="Show notes without tags">Default <span class="notes-label-chip-count">${defaultCount}</span></button>`;
|
||||
if (todayCount > 0) {
|
||||
const isOn = state.activeFilter === 'today';
|
||||
const icon = '<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-1px;margin-right:2px"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg>';
|
||||
html += `<button class="notes-label-chip notes-label-chip-today${isOn ? ' active' : ''}" data-action="today" title="Next step from every goal">${icon}Today <span class="notes-label-chip-count">${todayCount}</span></button>`;
|
||||
}
|
||||
if (goalCount > 0) {
|
||||
const isOn = state.activeFilter === 'goals';
|
||||
const icon = '<svg width="10" height="10" viewBox="0 0 24 24" fill="currentColor" style="vertical-align:-1px;margin-right:2px"><path d="M12 0L14.59 8.41L23 12L14.59 15.59L12 24L9.41 15.59L1 12L9.41 8.41Z"/></svg>';
|
||||
html += `<button class="notes-label-chip notes-label-chip-goals${isOn ? ' active' : ''}" data-action="goals" title="Show only goals">${icon}Goals <span class="notes-label-chip-count">${goalCount}</span></button>`;
|
||||
}
|
||||
const isReminderOn = state.activeFilter === 'reminders';
|
||||
const isReminderOff = state.activeFilter === 'no-reminders';
|
||||
const reminderCls = `notes-label-chip notes-label-chip-reminders${isReminderOn ? ' active' : ''}${isReminderOff ? ' active negated' : ''}`;
|
||||
const reminderIcon = isReminderOff
|
||||
// bell-off icon
|
||||
? '<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-1px;margin-right:2px"><path d="M13.73 21a2 2 0 0 1-3.46 0"/><path d="M18.63 13A17.89 17.89 0 0 1 18 8"/><path d="M6.26 6.26A5.86 5.86 0 0 0 6 8c0 7-3 9-3 9h14"/><path d="M18 8a6 6 0 0 0-9.33-5"/><line x1="1" y1="1" x2="23" y2="23"/></svg>'
|
||||
: '<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-1px;margin-right:2px"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"/><path d="M13.73 21a2 2 0 0 1-3.46 0"/></svg>';
|
||||
html += `<button class="${reminderCls}" data-action="reminders" title="${isReminderOn ? 'Showing only reminders — click to show all' : isReminderOff ? 'Hiding reminders — click to show only reminders' : 'Click to filter reminders'}">${reminderIcon}Reminders <span class="notes-label-chip-count">${reminderCount}</span></button>`;
|
||||
const showingReminders = state.activeFilter === 'reminders';
|
||||
if (showingReminders && pastReminderCount > 0) {
|
||||
html += `<button class="notes-label-chip notes-label-clear-past" data-action="clear-past-reminders" title="Delete reminders whose time has passed"><svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg>Clear past <span class="notes-label-chip-count">${pastReminderCount}</span></button>`;
|
||||
}
|
||||
for (const lbl of sortedLabels) {
|
||||
html += `<button class="notes-label-chip${state.activeLabel === lbl ? ' active' : ''}" data-label="${_esc(lbl)}">#${_esc(lbl)}</button>`;
|
||||
}
|
||||
bar.innerHTML = html;
|
||||
bar.querySelectorAll('.notes-label-chip').forEach(chip => {
|
||||
chip.addEventListener('click', () => {
|
||||
if (chip.dataset.action === 'all') {
|
||||
app.setActiveLabel(null);
|
||||
app.setActiveFilter(null);
|
||||
} else if (chip.dataset.action === 'today') {
|
||||
app.setActiveLabel(null);
|
||||
app.setActiveFilter((state.activeFilter === 'today') ? null : 'today');
|
||||
} else if (chip.dataset.action === 'goals') {
|
||||
app.setActiveLabel(null);
|
||||
app.setActiveFilter((state.activeFilter === 'goals') ? null : 'goals');
|
||||
} else if (chip.dataset.action === 'default') {
|
||||
app.setActiveLabel(null);
|
||||
app.setActiveFilter((state.activeFilter === 'default') ? null : 'default');
|
||||
} else if (chip.dataset.action === 'reminders') {
|
||||
app.setActiveLabel(null);
|
||||
// Cycle: null → reminders → null → no-reminders → null → reminders → ...
|
||||
if (state.activeFilter === null) {
|
||||
app.setActiveFilter(state.reminderChipNext);
|
||||
app.setReminderChipNext((state.reminderChipNext === 'reminders') ? 'no-reminders' : 'reminders');
|
||||
} else {
|
||||
app.setActiveFilter(null);
|
||||
}
|
||||
} else if (chip.dataset.action === 'clear-past-reminders') {
|
||||
_clearPastReminders();
|
||||
return;
|
||||
} else {
|
||||
app.setActiveFilter(null);
|
||||
app.setActiveLabel(chip.dataset.label || null);
|
||||
}
|
||||
_renderNotes();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function _renderLabelsInto(_body) {
|
||||
if (!_body) return;
|
||||
const pane = _body.closest('.notes-pane');
|
||||
const toggleHost = pane?.querySelector('.notes-search-bar') || _body;
|
||||
let toggle = toggleHost.querySelector(':scope > .notes-label-toggle');
|
||||
if (!toggle) {
|
||||
toggle = document.createElement('button');
|
||||
toggle.type = 'button';
|
||||
toggle.className = 'notes-label-toggle cal-filter-toggle';
|
||||
toggle.addEventListener('click', () => {
|
||||
app.setLabelsCollapsed(!state.labelsCollapsed);
|
||||
try { persistence.setItem(NOTES_LABELS_COLLAPSED_KEY, state.labelsCollapsed ? '1' : '0'); } catch {}
|
||||
_renderNotes();
|
||||
});
|
||||
const selectButton = toggleHost.querySelector('#notes-select-btn');
|
||||
toggleHost.insertBefore(toggle, selectButton || null);
|
||||
}
|
||||
toggle.textContent = state.labelsCollapsed ? '+ Tags' : '− Tags';
|
||||
toggle.title = state.labelsCollapsed ? 'Show tags' : 'Hide tags';
|
||||
toggle.setAttribute('aria-expanded', state.labelsCollapsed ? 'false' : 'true');
|
||||
|
||||
// The shared chip scroller wraps this row once it is mounted.
|
||||
let bar = _body.querySelector('.notes-labels-bar');
|
||||
if (!bar) {
|
||||
bar = document.createElement('div');
|
||||
bar.className = 'notes-labels-bar';
|
||||
_body.appendChild(bar);
|
||||
}
|
||||
_renderLabels(_body);
|
||||
}
|
||||
|
||||
return { _renderLabels, _renderLabelsInto };
|
||||
}
|
||||
@@ -0,0 +1,123 @@
|
||||
/** Card reflow animation and the owned masonry resize observer. */
|
||||
export function createLayout({ isOpen = () => true } = {}) {
|
||||
function _captureCardPositions() {
|
||||
const body = document.querySelector('#notes-pane .notes-pane-body');
|
||||
if (!body) return null;
|
||||
const positions = new Map();
|
||||
body.querySelectorAll('.note-card').forEach(card => {
|
||||
const id = card.dataset.noteId;
|
||||
if (id) positions.set(id, card.getBoundingClientRect());
|
||||
});
|
||||
return positions;
|
||||
}
|
||||
|
||||
function _animateReflow(prevPositions) {
|
||||
if (!prevPositions || !prevPositions.size) return;
|
||||
const body = document.querySelector('#notes-pane .notes-pane-body');
|
||||
if (!body || !body.isConnected) return;
|
||||
body.querySelectorAll('.note-card').forEach(card => {
|
||||
const id = card.dataset.noteId;
|
||||
const prev = prevPositions.get(id);
|
||||
if (!prev) return;
|
||||
const next = card.getBoundingClientRect();
|
||||
const dx = prev.left - next.left;
|
||||
const dy = prev.top - next.top;
|
||||
if (Math.abs(dx) < 1 && Math.abs(dy) < 1) return;
|
||||
// Invert: jump back to old position
|
||||
card.style.transition = 'none';
|
||||
card.style.transform = `translate(${dx}px, ${dy}px)`;
|
||||
// Play: animate to 0
|
||||
requestAnimationFrame(() => {
|
||||
card.style.transition = 'transform 0.25s cubic-bezier(0.34, 1.2, 0.64, 1)';
|
||||
card.style.transform = '';
|
||||
card.addEventListener('transitionend', () => {
|
||||
card.style.transition = '';
|
||||
}, { once: true });
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function _applyMasonry(body) {
|
||||
if (!body || !body.isConnected) return;
|
||||
const pane = body.closest('.notes-pane');
|
||||
const isGrid = pane?.classList.contains('notes-view-grid');
|
||||
const isMobileGrid = isGrid && window.matchMedia('(max-width: 768px)').matches;
|
||||
// Tear down any prior observer (defensive : _renderNotes wipes body.innerHTML).
|
||||
if (_masonryObserver) { try { _masonryObserver.disconnect(); } catch {} _masonryObserver = null; }
|
||||
// A save that resolves after close re-renders the leaving pane; don't
|
||||
// re-create the observer that panel teardown already disposed.
|
||||
if (!isOpen()) return;
|
||||
if (!isGrid) {
|
||||
// Clear any leftover inline spans so list view lays out normally.
|
||||
body.querySelectorAll('.note-card, .notes-label-toggle, .notes-labels-bar, .notes-quick-add, .note-form, .doclib-chip-scroll-frame:has(> .notes-labels-bar)').forEach(c => { c.style.gridRowEnd = ''; });
|
||||
return;
|
||||
}
|
||||
const ROW_PX = 4;
|
||||
const spanForHeight = (h) => Math.max(1, Math.ceil(h / ROW_PX));
|
||||
const recomputeFullRows = () => {
|
||||
const quickAdd = body.querySelector('.notes-quick-add');
|
||||
const labelsToggle = body.querySelector('.notes-label-toggle');
|
||||
const labelsBar = body.querySelector('.notes-labels-bar');
|
||||
const labelsLayout = labelsBar?.parentElement?.classList.contains('doclib-chip-scroll-frame')
|
||||
? labelsBar.parentElement
|
||||
: labelsBar;
|
||||
if (labelsToggle && getComputedStyle(labelsToggle).display !== 'none') {
|
||||
labelsToggle.style.gridRowEnd = `span ${Math.max(1, spanForHeight(labelsToggle.scrollHeight))}`;
|
||||
}
|
||||
if (labelsLayout && getComputedStyle(labelsLayout).display !== 'none') {
|
||||
const shave = isMobileGrid ? 4 : 0;
|
||||
labelsLayout.style.gridRowEnd = `span ${Math.max(1, spanForHeight(labelsLayout.scrollHeight) - shave)}`;
|
||||
}
|
||||
if (quickAdd) {
|
||||
const shave = isMobileGrid ? 4 : 0;
|
||||
quickAdd.style.gridRowEnd = `span ${Math.max(1, spanForHeight(quickAdd.scrollHeight + 10) - shave)}`;
|
||||
}
|
||||
body.querySelectorAll('.note-form').forEach(form => {
|
||||
form.style.gridColumn = '1 / -1';
|
||||
const isDrawForm = !!form.querySelector('.note-form-type-seg.is-draw');
|
||||
const minSpan = isMobileGrid ? (isDrawForm ? 104 : 64) : 1;
|
||||
const renderedHeight = form.getBoundingClientRect?.().height || 0;
|
||||
const drawReserve = isDrawForm && isMobileGrid ? 12 : 12;
|
||||
const measuredHeight = Math.max(form.scrollHeight, renderedHeight) + drawReserve;
|
||||
form.style.gridRowEnd = `span ${Math.max(minSpan, spanForHeight(measuredHeight))}`;
|
||||
});
|
||||
};
|
||||
const recompute = (card) => {
|
||||
// scrollHeight returns the natural content height : card.getBoundingClientRect()
|
||||
// would return the grid cell height (collapsed to 4px until the span is set,
|
||||
// which is the value we're trying to compute).
|
||||
const h = card.scrollHeight + (isMobileGrid ? 6 : 8);
|
||||
if (h <= 0) return;
|
||||
card.style.gridRowEnd = `span ${spanForHeight(h)}`;
|
||||
};
|
||||
recomputeFullRows();
|
||||
body.querySelectorAll('.note-card').forEach(recompute);
|
||||
// Watch masonry participants : content can grow (image load, todo edits,
|
||||
// quick-add/form expansion), and stale spans are what cause visual merging.
|
||||
if ('ResizeObserver' in window) {
|
||||
_masonryObserver = new ResizeObserver(entries => {
|
||||
let fullRowsChanged = false;
|
||||
for (const e of entries) {
|
||||
if (e.target.classList.contains('note-card')) recompute(e.target);
|
||||
else fullRowsChanged = true;
|
||||
}
|
||||
if (fullRowsChanged) recomputeFullRows();
|
||||
});
|
||||
body.querySelectorAll('.note-card').forEach(c => _masonryObserver.observe(c));
|
||||
body.querySelectorAll('.notes-label-toggle, .notes-quick-add, .note-form').forEach(c => _masonryObserver.observe(c));
|
||||
const labelsBar = body.querySelector('.notes-labels-bar');
|
||||
const labelsLayout = labelsBar?.parentElement?.classList.contains('doclib-chip-scroll-frame')
|
||||
? labelsBar.parentElement
|
||||
: labelsBar;
|
||||
if (labelsLayout) _masonryObserver.observe(labelsLayout);
|
||||
}
|
||||
}
|
||||
|
||||
let _masonryObserver = null;
|
||||
|
||||
function dispose() {
|
||||
_masonryObserver?.disconnect();
|
||||
_masonryObserver = null;
|
||||
}
|
||||
return { dispose, _captureCardPositions, _animateReflow, _applyMasonry };
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
/** Notes-owned document/window listeners. Detached editor/menu owners release their resources. */
|
||||
export function createNotesLifecycle() {
|
||||
const owners = new Map();
|
||||
let observer = null;
|
||||
function release(owner) {
|
||||
const entry = owners.get(owner);
|
||||
if (!entry) return;
|
||||
owners.delete(owner);
|
||||
for (const remove of entry.removers) remove();
|
||||
if (!owners.size) { observer?.disconnect(); observer = null; }
|
||||
}
|
||||
function onDispose(owner, remove) {
|
||||
if (!owner) throw new Error('Notes listener needs a lifecycle owner');
|
||||
let entry = owners.get(owner);
|
||||
if (!entry) {
|
||||
entry = { connected: owner.isConnected, removers: [] };
|
||||
owners.set(owner, entry);
|
||||
}
|
||||
entry.removers.push(remove);
|
||||
if (!observer) {
|
||||
observer = new MutationObserver(() => {
|
||||
for (const [node, scope] of owners) {
|
||||
if (node.isConnected) scope.connected = true;
|
||||
else if (scope.connected) release(node);
|
||||
}
|
||||
});
|
||||
observer.observe(document.body, { childList: true, subtree: true });
|
||||
}
|
||||
}
|
||||
function listen(owner, target, event, listener, options) {
|
||||
onDispose(owner, () => target.removeEventListener(event, listener, options));
|
||||
target.addEventListener(event, listener, options);
|
||||
}
|
||||
function dispose() { for (const owner of [...owners.keys()]) release(owner); }
|
||||
return { listen, onDispose, release, dispose };
|
||||
}
|
||||
@@ -0,0 +1,257 @@
|
||||
/** Mobile fullscreen editing, link reader mode and return to the panel. */
|
||||
export function createMobileEditor({
|
||||
_applyDraftToNote,
|
||||
_buildForm,
|
||||
_fetchNotes,
|
||||
_linkify,
|
||||
_renderNotes,
|
||||
_uid,
|
||||
_wireChecklistTouchReorder,
|
||||
_wireRow,
|
||||
app,
|
||||
state,
|
||||
uiModule
|
||||
}) {
|
||||
function _isNotesMobileMode() {
|
||||
return ('ontouchstart' in window) && window.innerWidth <= 768;
|
||||
}
|
||||
|
||||
let _mobileFsOverlay = null;
|
||||
|
||||
let _mobileFsNoteId = null;
|
||||
|
||||
function _openMobileFullscreenEdit(id, fromCard) {
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (!note) return;
|
||||
// Tear down any previous overlay (defensive).
|
||||
_closeMobileFullscreenEdit({ save: false });
|
||||
_mobileFsNoteId = id;
|
||||
app.setEditingId(id);
|
||||
|
||||
const overlay = document.createElement('div');
|
||||
overlay.className = 'note-fullscreen-overlay';
|
||||
overlay.innerHTML = `
|
||||
<div class="note-fullscreen-header">
|
||||
<button type="button" class="note-fullscreen-back" title="Back">
|
||||
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><polyline points="15 18 9 12 15 6"></polyline></svg>
|
||||
</button>
|
||||
<div class="note-fullscreen-actions"></div>
|
||||
</div>
|
||||
<div class="note-fullscreen-body"></div>
|
||||
`;
|
||||
const body = overlay.querySelector('.note-fullscreen-body');
|
||||
// Reuse the same edit form the in-place flow builds. Save buttons,
|
||||
// checklist toggles, etc. all work as-is. Restore any unsaved draft.
|
||||
const { note: _n, restored } = _applyDraftToNote(note, id);
|
||||
const form = _buildForm(_n);
|
||||
body.appendChild(form);
|
||||
if (restored) uiModule.showToast('Restored unsaved changes');
|
||||
document.body.appendChild(overlay);
|
||||
_mobileFsOverlay = overlay;
|
||||
|
||||
// Animate up from the tapped tile's position so the transition reads
|
||||
// as a zoom rather than a hard cut.
|
||||
if (fromCard) {
|
||||
const r = fromCard.getBoundingClientRect();
|
||||
const vw = window.innerWidth, vh = window.innerHeight;
|
||||
overlay.style.transformOrigin =
|
||||
`${((r.left + r.width / 2) / vw) * 100}% ${((r.top + r.height / 2) / vh) * 100}%`;
|
||||
}
|
||||
overlay.classList.add('opening');
|
||||
requestAnimationFrame(() => overlay.classList.add('open'));
|
||||
|
||||
// Wire the back button : saves whatever the form has and closes.
|
||||
// mousedown preventDefault so it doesn't blur the input on first tap (which
|
||||
// would eat the tap and require a second one).
|
||||
const _backBtn = overlay.querySelector('.note-fullscreen-back');
|
||||
_backBtn.addEventListener('mousedown', (e) => e.preventDefault());
|
||||
_backBtn.addEventListener('click', () => {
|
||||
_closeMobileFullscreenEdit({ save: true });
|
||||
});
|
||||
|
||||
// The form's built-in Cancel only resets the in-place edit state; in
|
||||
// the overlay context it does nothing visible. Replace its handler so
|
||||
// Cancel actually dismisses the overlay without saving.
|
||||
const cancelBtn = form.querySelector('.note-form-cancel');
|
||||
if (cancelBtn) {
|
||||
const fresh = cancelBtn.cloneNode(true);
|
||||
cancelBtn.parentNode.replaceChild(fresh, cancelBtn);
|
||||
fresh.addEventListener('mousedown', (e) => e.preventDefault());
|
||||
fresh.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
_closeMobileFullscreenEdit({ save: false });
|
||||
});
|
||||
}
|
||||
// The built-in Save handler does the API call + refresh, but doesn't
|
||||
// dismiss our overlay. Augment it (do NOT replace : the original is
|
||||
// async and we'd lose the API call) to schedule a close once the
|
||||
// save+render has had time to complete.
|
||||
const saveBtn = form.querySelector('.note-form-save');
|
||||
if (saveBtn) {
|
||||
saveBtn.addEventListener('click', () => {
|
||||
setTimeout(() => _closeMobileFullscreenEdit({ save: false }), 350);
|
||||
});
|
||||
}
|
||||
// Make the checklist row drag handle (⋮⋮) actually work on touch.
|
||||
// The form's default uses HTML5 native draggable which never fires
|
||||
// on iOS/Android. Wire touch-based reorder for any row inside the
|
||||
// overlay's checklist.
|
||||
_wireChecklistTouchReorder(form);
|
||||
|
||||
// For each todo row whose text contains a URL, swap the bare <input>
|
||||
// for a linkified <span> so URLs are tappable. Tapping anywhere that
|
||||
// ISN'T a link flips back to the input for editing.
|
||||
form.querySelectorAll('.note-cl-row').forEach(_addRowReadMode);
|
||||
|
||||
// Move only Delete from the form's footer actions row into the header.
|
||||
// Archive intentionally stays out of the header: the footer Update button
|
||||
// already morphs into the mobile Archive action for an untouched note.
|
||||
const headerActions = overlay.querySelector('.note-fullscreen-actions');
|
||||
const archiveBtn = form.querySelector('.note-form-archive-btn');
|
||||
const deleteBtn = form.querySelector('.note-form-delete-btn');
|
||||
if (headerActions && deleteBtn) {
|
||||
deleteBtn.classList.remove('note-form-collapsible');
|
||||
headerActions.appendChild(deleteBtn);
|
||||
}
|
||||
// The built-in archive/delete handlers re-render the notes grid but
|
||||
// leave THIS overlay sitting in front of it : looks like nothing
|
||||
// happened. Add follow-up listeners that close the overlay so the
|
||||
// user sees the action take effect.
|
||||
if (archiveBtn) {
|
||||
archiveBtn.addEventListener('click', () => {
|
||||
setTimeout(() => _closeMobileFullscreenEdit({ save: false }), 200);
|
||||
});
|
||||
}
|
||||
if (deleteBtn) {
|
||||
deleteBtn.addEventListener('click', () => {
|
||||
// Delete shows a styled confirm : give it room to resolve before
|
||||
// we try to dismiss the overlay.
|
||||
setTimeout(() => _closeMobileFullscreenEdit({ save: false }), 500);
|
||||
});
|
||||
}
|
||||
|
||||
// Tuck the tags input into the bottom actions row (Cancel / Update),
|
||||
// pinned to the LEFT. Frees the meta row of an extra wrapping line
|
||||
// and groups all the "exit" controls together.
|
||||
const actionsGroup = form.querySelector('.note-form-actions-group');
|
||||
const tagsInput = form.querySelector('.note-form-label');
|
||||
if (actionsGroup && tagsInput) {
|
||||
actionsGroup.insertBefore(tagsInput, actionsGroup.firstChild);
|
||||
}
|
||||
|
||||
// For checklist-type notes, move the photo (attach image) button into
|
||||
// the same row as the + Add button (right side) : keeps the meta row
|
||||
// tidy and puts the camera within thumb-reach of the active edit.
|
||||
const addBtn = form.querySelector('.note-cl-add');
|
||||
const photoBtn = form.querySelector('.note-form-photo-btn');
|
||||
if (addBtn && photoBtn) {
|
||||
const addRow = document.createElement('div');
|
||||
addRow.className = 'note-cl-add-row';
|
||||
addBtn.parentNode.insertBefore(addRow, addBtn);
|
||||
addRow.appendChild(addBtn);
|
||||
addRow.appendChild(photoBtn);
|
||||
// Tapping anywhere on the row (the empty gap, the dashed border,
|
||||
// the "+ Add" label) triggers add. The photo button keeps its own
|
||||
// click target so attach-image isn't ambushed.
|
||||
addRow.addEventListener('click', (e) => {
|
||||
if (e.target.closest('.note-form-photo-btn')) return;
|
||||
if (e.target === addBtn || addBtn.contains(e.target)) return;
|
||||
addBtn.click();
|
||||
});
|
||||
// The form's delegated "+ Add" handler does
|
||||
// inputs.insertBefore(newRow, addBtn)
|
||||
// : but addBtn is no longer a direct child of `.note-checklist-inputs`
|
||||
// now that we wrapped it. Bind a fresh handler that does the same
|
||||
// thing but inserts before the WRAPPING row, and stop propagation
|
||||
// so the broken delegate never runs.
|
||||
addBtn.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
const inputs = form.querySelector('.note-checklist-inputs');
|
||||
if (!inputs) return;
|
||||
const newRow = document.createElement('div');
|
||||
newRow.className = 'note-cl-row';
|
||||
newRow.draggable = true;
|
||||
newRow.dataset.itemId = _uid();
|
||||
newRow.dataset.indent = '0';
|
||||
newRow.innerHTML = '<span class="note-cl-grip" title="Drag">⋮⋮</span><span class="note-cl-dot"></span><input type="text" class="note-cl-text" placeholder="Item..." /><button type="button" class="note-cl-rm">×</button>';
|
||||
inputs.insertBefore(newRow, addRow);
|
||||
_wireRow(newRow, inputs);
|
||||
// Touch reorder on the freshly-added row's grip.
|
||||
_wireChecklistTouchReorder(form);
|
||||
newRow.querySelector('.note-cl-text')?.focus();
|
||||
}, { capture: true });
|
||||
}
|
||||
|
||||
// Read-mode overlay for plain notes: render the content as a div with
|
||||
// clickable hyperlinks, layered above the textarea. Tapping anywhere
|
||||
// in the overlay that ISN'T a link hides the overlay and focuses the
|
||||
// textarea so the user can start editing. Tapping a link opens it.
|
||||
const ta = form.querySelector('.note-form-content');
|
||||
if (ta && (note.content || '').trim()) {
|
||||
const reader = document.createElement('div');
|
||||
reader.className = 'note-form-content-reader';
|
||||
reader.innerHTML = _linkify(note.content || '');
|
||||
ta.style.display = 'none';
|
||||
ta.insertAdjacentElement('beforebegin', reader);
|
||||
reader.addEventListener('click', (e) => {
|
||||
if (e.target.closest('a')) return; // let links open normally
|
||||
reader.remove();
|
||||
ta.style.display = '';
|
||||
// Let the browser place the cursor naturally : forcing
|
||||
// setSelectionRange right after focus() raced with the underlying
|
||||
// tap event and produced inconsistent cursor positions on mobile.
|
||||
ta.focus({ preventScroll: true });
|
||||
});
|
||||
}
|
||||
|
||||
// Opening an EXISTING note → read mode, no keyboard pop. Only a
|
||||
// brand-new note (created via the + button) should auto-focus an
|
||||
// input field. The user can tap the content to switch to edit.
|
||||
// (New-note creation flows through _createNote, not this function.)
|
||||
}
|
||||
|
||||
function _closeMobileFullscreenEdit(opts = {}) {
|
||||
if (!_mobileFsOverlay) return;
|
||||
const overlay = _mobileFsOverlay;
|
||||
overlay.querySelector('.note-form')?._flushDraft?.();
|
||||
_mobileFsOverlay = null;
|
||||
// If the form has a Save button, click it on close so edits aren't lost
|
||||
// when the user uses the back arrow instead of an explicit Save.
|
||||
if (opts.save) {
|
||||
const saveBtn = overlay.querySelector('.note-form-save, [data-action="save"]');
|
||||
if (saveBtn) try { saveBtn.click(); } catch {}
|
||||
}
|
||||
overlay.classList.remove('open');
|
||||
overlay.classList.add('closing');
|
||||
setTimeout(() => {
|
||||
if (overlay.parentNode) overlay.parentNode.removeChild(overlay);
|
||||
_mobileFsNoteId = null;
|
||||
app.setEditingId(null);
|
||||
// Refresh the grid so any save the user made is reflected.
|
||||
if (opts.save !== false) { _fetchNotes().then(_renderNotes).catch(() => {}); }
|
||||
}, 220);
|
||||
}
|
||||
|
||||
function _addRowReadMode(row) {
|
||||
const txt = row.querySelector('.note-cl-text');
|
||||
if (!txt) return;
|
||||
const val = txt.value || '';
|
||||
if (!/(https?:\/\/|www\.)/i.test(val)) return;
|
||||
if (row.querySelector('.note-cl-text-reader')) return; // already wired
|
||||
const span = document.createElement('span');
|
||||
span.className = 'note-cl-text-reader';
|
||||
span.innerHTML = _linkify(val);
|
||||
txt.style.display = 'none';
|
||||
txt.insertAdjacentElement('beforebegin', span);
|
||||
span.addEventListener('click', (e) => {
|
||||
if (e.target.closest('a')) return; // let the link open
|
||||
span.remove();
|
||||
txt.style.display = '';
|
||||
txt.focus({ preventScroll: true });
|
||||
});
|
||||
}
|
||||
|
||||
return { _isNotesMobileMode, _openMobileFullscreenEdit, _closeMobileFullscreenEdit, _addRowReadMode };
|
||||
}
|
||||
@@ -0,0 +1,214 @@
|
||||
/** Mobile card long press, placeholder drag and reorder persistence. */
|
||||
export function createMobileReorder({
|
||||
lifecycle,
|
||||
_applyMasonry,
|
||||
_enterSelectMode,
|
||||
commitMobileOrder,
|
||||
app,
|
||||
}) {
|
||||
function _bindLongPressDrag(card) {
|
||||
let pressTimer = null;
|
||||
let startX = 0, startY = 0;
|
||||
let armed = false;
|
||||
const CANCEL_PX = 8;
|
||||
const HOLD_MS = 450;
|
||||
|
||||
card.addEventListener('touchstart', (e) => {
|
||||
// Don't fight scroll on touchpoints over real interactive children
|
||||
// (in mobile-mode they're CSS-hidden anyway, but be defensive).
|
||||
if (e.target.closest('button, input, a, .note-form')) return;
|
||||
if (e.touches.length !== 1) return;
|
||||
armed = true;
|
||||
startX = e.touches[0].clientX;
|
||||
startY = e.touches[0].clientY;
|
||||
pressTimer = setTimeout(() => {
|
||||
if (!armed) return;
|
||||
try { navigator.vibrate?.(15); } catch {}
|
||||
app.setSuppressNextNoteTapId(card.dataset.noteId);
|
||||
_enterSelectMode(card.dataset.noteId);
|
||||
}, HOLD_MS);
|
||||
}, { passive: true });
|
||||
card.addEventListener('touchmove', (e) => {
|
||||
if (!armed) return;
|
||||
const t = e.touches[0];
|
||||
if (Math.abs(t.clientX - startX) > CANCEL_PX || Math.abs(t.clientY - startY) > CANCEL_PX) {
|
||||
armed = false;
|
||||
if (pressTimer) { clearTimeout(pressTimer); pressTimer = null; }
|
||||
}
|
||||
}, { passive: true });
|
||||
const cancel = () => {
|
||||
armed = false;
|
||||
if (pressTimer) { clearTimeout(pressTimer); pressTimer = null; }
|
||||
};
|
||||
lifecycle.onDispose(card, cancel);
|
||||
card.addEventListener('touchend', cancel, { passive: true });
|
||||
card.addEventListener('touchcancel', cancel, { passive: true });
|
||||
}
|
||||
|
||||
let _dragState = null;
|
||||
|
||||
let _docDragHandlersBound = false;
|
||||
|
||||
function _enterDragMode(initialCard, initialTouch) {
|
||||
document.body.classList.add('notes-drag-mode');
|
||||
document.querySelectorAll('.note-card').forEach(_setupDragForCard);
|
||||
if (!_docDragHandlersBound) {
|
||||
lifecycle.listen(document.getElementById('notes-pane'), document, 'touchmove', _onDocTouchMove, { passive: false });
|
||||
lifecycle.listen(document.getElementById('notes-pane'), document, 'touchend', _onDocTouchEnd, { passive: true });
|
||||
lifecycle.listen(document.getElementById('notes-pane'), document, 'touchcancel', _onDocTouchEnd, { passive: true });
|
||||
_docDragHandlersBound = true;
|
||||
}
|
||||
// Auto-grab the card the user long-pressed : they're already holding
|
||||
// their finger on it, so begin the drag straight away. Releasing
|
||||
// (touchend) commits the reorder AND exits drag mode in one motion.
|
||||
if (initialCard && initialTouch) {
|
||||
_beginGrab(initialCard, initialTouch);
|
||||
}
|
||||
}
|
||||
|
||||
function _exitDragMode() {
|
||||
document.body.classList.remove('notes-drag-mode');
|
||||
if (_dragState) {
|
||||
// Defensive: if exit fires while a drag is in flight, snap the card back.
|
||||
_onDocTouchEnd();
|
||||
}
|
||||
// Leave _docDragHandlersBound true so re-entering drag mode reuses them.
|
||||
}
|
||||
|
||||
function _setupDragForCard(card) {
|
||||
if (card.dataset.dragBound === '1') return;
|
||||
card.dataset.dragBound = '1';
|
||||
card.addEventListener('touchstart', (e) => {
|
||||
if (!document.body.classList.contains('notes-drag-mode')) return;
|
||||
if (e.touches.length !== 1) return;
|
||||
if (_dragState) return;
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
_beginGrab(card, e.touches[0]);
|
||||
}, { passive: false });
|
||||
}
|
||||
|
||||
function _beginGrab(card, touch) {
|
||||
const rect = card.getBoundingClientRect();
|
||||
const prevStyle = card.getAttribute('style') || '';
|
||||
// Placeholder fills the card's old slot so the grid layout doesn't reflow.
|
||||
const placeholder = document.createElement('div');
|
||||
placeholder.className = 'note-card-placeholder';
|
||||
placeholder.style.width = rect.width + 'px';
|
||||
placeholder.style.height = rect.height + 'px';
|
||||
placeholder.style.margin = getComputedStyle(card).margin;
|
||||
if (card.style.gridRowEnd) placeholder.style.gridRowEnd = card.style.gridRowEnd;
|
||||
const grid = card.parentNode;
|
||||
grid.insertBefore(placeholder, card);
|
||||
|
||||
// Detach the card visually : fixed-position, anchored to the finger.
|
||||
card.classList.add('note-card-dragging');
|
||||
card.style.position = 'fixed';
|
||||
card.style.left = rect.left + 'px';
|
||||
card.style.top = rect.top + 'px';
|
||||
card.style.width = rect.width + 'px';
|
||||
card.style.height = rect.height + 'px';
|
||||
card.style.margin = '0';
|
||||
card.style.zIndex = '10001';
|
||||
// pointer-events:none so elementFromPoint sees the card BENEATH the finger
|
||||
card.style.pointerEvents = 'none';
|
||||
|
||||
_dragState = {
|
||||
card, placeholder, grid, prevStyle,
|
||||
grabOffsetX: touch.clientX - rect.left,
|
||||
grabOffsetY: touch.clientY - rect.top,
|
||||
};
|
||||
try { navigator.vibrate?.(8); } catch {}
|
||||
}
|
||||
|
||||
function _onDocTouchMove(e) {
|
||||
if (!_dragState) return;
|
||||
if (e.touches.length !== 1) return;
|
||||
e.preventDefault();
|
||||
const touch = e.touches[0];
|
||||
const { card, placeholder, grid } = _dragState;
|
||||
card.style.left = (touch.clientX - _dragState.grabOffsetX) + 'px';
|
||||
const quickAdd = grid.querySelector('.notes-quick-add');
|
||||
const minTop = quickAdd ? quickAdd.getBoundingClientRect().bottom + 4 : grid.getBoundingClientRect().top;
|
||||
const maxTop = Math.max(minTop, window.innerHeight - card.getBoundingClientRect().height - 8);
|
||||
const nextTop = Math.max(minTop, Math.min(maxTop, touch.clientY - _dragState.grabOffsetY));
|
||||
card.style.top = nextTop + 'px';
|
||||
|
||||
const hitY = Math.max(minTop + 1, Math.min(window.innerHeight - 1, touch.clientY));
|
||||
const under = document.elementFromPoint(touch.clientX, hitY);
|
||||
const target = under && under.closest
|
||||
? under.closest('.note-card:not(.note-card-dragging)')
|
||||
: null;
|
||||
if (!target || target === card) return;
|
||||
if (target.parentNode !== grid) return;
|
||||
|
||||
// Move the PLACEHOLDER (not the card) above or below the target depending
|
||||
// on which half of the target the finger is in. This is the hysteresis
|
||||
// that stops the oscillation : once the placeholder moves past a card,
|
||||
// the cursor has to cross THAT card's midpoint in the other direction
|
||||
// to swap back.
|
||||
const tRect = target.getBoundingClientRect();
|
||||
const targetMidY = tRect.top + tRect.height / 2;
|
||||
if (touch.clientY < targetMidY) {
|
||||
if (placeholder.nextElementSibling !== target) {
|
||||
grid.insertBefore(placeholder, target);
|
||||
}
|
||||
} else {
|
||||
if (target.nextElementSibling !== placeholder) {
|
||||
grid.insertBefore(placeholder, target.nextElementSibling);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function _onDocTouchEnd() {
|
||||
if (!_dragState) return;
|
||||
const { card, placeholder, grid, prevStyle } = _dragState;
|
||||
_dragState = null;
|
||||
// Animate the card from its current fixed position to where the
|
||||
// placeholder sits, then re-parent and clear inline styles. Drag
|
||||
// mode auto-exits once the snap finishes : release = done.
|
||||
const phRect = placeholder.getBoundingClientRect();
|
||||
card.style.transition = 'left 0.2s ease, top 0.2s ease';
|
||||
card.style.left = phRect.left + 'px';
|
||||
card.style.top = phRect.top + 'px';
|
||||
setTimeout(() => {
|
||||
placeholder.parentNode.insertBefore(card, placeholder);
|
||||
placeholder.remove();
|
||||
card.classList.remove('note-card-dragging');
|
||||
// Restore the card's pre-drag inline styles. Mobile masonry stores
|
||||
// grid-row-end inline, and custom backgrounds use inline style too; wiping
|
||||
// cssText made dropped cards collapse into neighboring notes in grid view.
|
||||
if (prevStyle) card.setAttribute('style', prevStyle);
|
||||
else card.removeAttribute('style');
|
||||
_applyMasonry(grid);
|
||||
_commitNoteReorder();
|
||||
// One drag, one exit : release ends the rearrange session entirely.
|
||||
if (document.body.classList.contains('notes-drag-mode')) {
|
||||
document.body.classList.remove('notes-drag-mode');
|
||||
}
|
||||
}, 210);
|
||||
}
|
||||
|
||||
async function _commitNoteReorder() {
|
||||
const grid = document.querySelector('#notes-pane .notes-pane-body');
|
||||
if (!grid) return;
|
||||
const ids = Array.from(grid.querySelectorAll('.note-card')).map(c => c.dataset.noteId).filter(Boolean);
|
||||
if (!ids.length) return;
|
||||
await commitMobileOrder(ids);
|
||||
}
|
||||
|
||||
function dispose() {
|
||||
if (_dragState) {
|
||||
const { card, placeholder, prevStyle } = _dragState;
|
||||
_dragState = null;
|
||||
placeholder.parentNode?.insertBefore(card, placeholder);
|
||||
placeholder.remove();
|
||||
card.classList.remove('note-card-dragging');
|
||||
if (prevStyle) card.setAttribute('style', prevStyle);
|
||||
else card.removeAttribute('style');
|
||||
}
|
||||
document.body.classList.remove('notes-drag-mode');
|
||||
_docDragHandlersBound = false;
|
||||
}
|
||||
return { dispose, _bindLongPressDrag, _enterDragMode, _exitDragMode, _setupDragForCard, _beginGrab, _onDocTouchMove, _onDocTouchEnd, _commitNoteReorder };
|
||||
}
|
||||
@@ -0,0 +1,506 @@
|
||||
/** Panel mounting, keyboard handlers, minimization and note navigation. */
|
||||
export function createPanel({
|
||||
wireToolbar,
|
||||
wireSelectionActions,
|
||||
_wireNotesWindow,
|
||||
_restoreNotesSidebarDock,
|
||||
_bringNotesToFront,
|
||||
disposeUI,
|
||||
lifecycle,
|
||||
Modals,
|
||||
NOTES_FIRST_OPEN_HINT_KEY,
|
||||
REMINDER_DISMISSED_AT_KEY,
|
||||
_clearViewedReminderGlows,
|
||||
_closeMobileFullscreenEdit,
|
||||
_commitOpenInPlaceEditor,
|
||||
_copyNote,
|
||||
_enterSelectMode,
|
||||
_exitSelectMode,
|
||||
_fetchNotes,
|
||||
_flushPendingHighlights,
|
||||
_isNotesMobileMode,
|
||||
_popAndRunUndo,
|
||||
_renderLoadingSkeleton,
|
||||
_renderNotes,
|
||||
_startReminderLoop,
|
||||
app,
|
||||
bindTourHintDismiss,
|
||||
dismissOrRemove,
|
||||
persistence,
|
||||
state,
|
||||
workflows
|
||||
}) {
|
||||
function _forceCloseNotesPanel() {
|
||||
app.setOpen(false);
|
||||
app.setEditingId(null);
|
||||
try { _commitOpenInPlaceEditor(); } catch {}
|
||||
try { _closeMobileFullscreenEdit({ save: true }); } catch {}
|
||||
try { _clearViewedReminderGlows(); } catch {}
|
||||
if (_notesKeydownHandler) {
|
||||
document.removeEventListener('keydown', _notesKeydownHandler);
|
||||
_notesKeydownHandler = null;
|
||||
}
|
||||
if (_notesSelectEscHandler) {
|
||||
document.removeEventListener('keydown', _notesSelectEscHandler, true);
|
||||
_notesSelectEscHandler = null;
|
||||
}
|
||||
disposeOwnedPortals();
|
||||
disposeUI();
|
||||
document.body.classList.remove('notes-view', 'notes-mobile-mode', 'notes-drag-mode');
|
||||
document.getElementById('tool-notes-btn')?.classList.remove('active');
|
||||
try { Modals.unregister('notes-panel'); } catch {}
|
||||
try { document.getElementById('notes-pane')?.remove(); } catch {}
|
||||
try { document.getElementById('notes-pane-backdrop')?.remove(); } catch {}
|
||||
try { window._restoreSidebarIfRouteCollapsed?.(); } catch {}
|
||||
}
|
||||
|
||||
function _showNotesFirstOpenHint(pane) {
|
||||
if (!pane || typeof persistence === 'undefined') return;
|
||||
try {
|
||||
if (persistence.getItem(NOTES_FIRST_OPEN_HINT_KEY)) return;
|
||||
persistence.setItem(NOTES_FIRST_OPEN_HINT_KEY, '1');
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
|
||||
dismissOrRemove(document.getElementById('notes-first-open-hint'));
|
||||
const hint = document.createElement('div');
|
||||
hint.id = 'notes-first-open-hint';
|
||||
hint.className = 'tour-hint';
|
||||
hint.innerHTML = `
|
||||
<div class="tour-hint-text"><b>Notes</b> is your basic todo list, and also where reminders are managed.</div>
|
||||
<button type="button" class="tour-hint-dismiss">OK</button>
|
||||
`;
|
||||
document.body.appendChild(hint);
|
||||
|
||||
const place = () => {
|
||||
const r = pane.getBoundingClientRect();
|
||||
const hw = hint.offsetWidth || 260;
|
||||
hint.style.top = Math.max(12, r.top + 58) + 'px';
|
||||
hint.style.left = Math.min(window.innerWidth - hw - 12, Math.max(12, r.left + 18)) + 'px';
|
||||
};
|
||||
requestAnimationFrame(() => {
|
||||
place();
|
||||
hint.classList.add('tour-hint-in');
|
||||
});
|
||||
lifecycle.listen(hint, window, 'resize', place);
|
||||
bindTourHintDismiss(hint, {
|
||||
timeout: 6500,
|
||||
fade: 180,
|
||||
onDismiss: () => window.removeEventListener('resize', place),
|
||||
});
|
||||
}
|
||||
|
||||
function _ensureNotesChipRegistered() {
|
||||
if (Modals.isRegistered('notes-panel')) return;
|
||||
Modals.register('notes-panel', {
|
||||
railBtnId: 'rail-notes',
|
||||
sidebarBtnId: 'tool-notes-btn',
|
||||
restoreFn: () => { openPanel(); },
|
||||
closeFn: () => { _forceCloseNotesPanel(); },
|
||||
});
|
||||
}
|
||||
|
||||
function openPanel() {
|
||||
if (state.open) {
|
||||
_bringNotesToFront();
|
||||
return;
|
||||
}
|
||||
// Notes and the document editor occupy the same primary workspace. Preserve
|
||||
// an open document as a dock chip instead of allowing the two panes to stack
|
||||
// into a broken layout (or closing the user's document outright).
|
||||
try {
|
||||
if (window.documentModule?.isPanelOpen?.()) {
|
||||
window.documentModule.closePanel('down');
|
||||
}
|
||||
} catch (_) {}
|
||||
app.setOpen(true);
|
||||
app.setEditingId(null);
|
||||
app.setSearchQuery('');
|
||||
_clearViewedReminderGlows();
|
||||
app.setFiredDotDismissedAt(Date.now());
|
||||
try { persistence.setItem(REMINDER_DISMISSED_AT_KEY, String(state.firedDotDismissedAt)); } catch {}
|
||||
|
||||
const container = document.getElementById('chat-container');
|
||||
if (!container) return;
|
||||
|
||||
document.body.classList.add('notes-view');
|
||||
|
||||
// On mobile the notes panel takes the whole screen : auto-close the
|
||||
// sidebar so the panel isn't cropped underneath it.
|
||||
if (window.innerWidth <= 768) {
|
||||
const sb = document.getElementById('sidebar');
|
||||
if (sb) sb.classList.add('hidden');
|
||||
document.body.classList.add('sidebar-collapsed');
|
||||
}
|
||||
// Mobile mode: tiles become read-only previews (no inline checkbox /
|
||||
// edit / archive / etc.), tap opens a fullscreen edit overlay,
|
||||
// long-press enters drag-to-reorder mode. See _bindCardEvents +
|
||||
// .notes-mobile-mode CSS rules.
|
||||
if (_isNotesMobileMode()) document.body.classList.add('notes-mobile-mode');
|
||||
|
||||
// Toggle button state
|
||||
const btn = document.getElementById('tool-notes-btn');
|
||||
if (btn) btn.classList.add('active');
|
||||
|
||||
// Create panel
|
||||
const pane = document.createElement('div');
|
||||
pane.id = 'notes-pane';
|
||||
pane.className = 'notes-pane';
|
||||
pane.innerHTML = `
|
||||
<div class="notes-mobile-grabber" id="notes-mobile-grabber" aria-hidden="true"></div>
|
||||
<div class="notes-pane-header">
|
||||
<h4 class="notes-pane-title"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-2.5px;margin-right:6px"><path d="M5 3h10l4 4v14H5z"/><path d="M15 3v5h5"/><path d="M8 17.5 15.5 10l2.5 2.5L10.5 20H8z"/></svg>Notes</h4>
|
||||
<span style="flex:1"></span>
|
||||
<button id="notes-archive-toggle" class="doc-action-icon-btn notes-header-text-btn" title="View archive" style="opacity:0.8;gap:5px;">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="5" rx="1"/><path d="M4 8v11a2 2 0 002 2h12a2 2 0 002-2V8"/><path d="M10 12h4"/></svg>
|
||||
<span class="notes-header-btn-label">Archive</span>
|
||||
</button>
|
||||
<button id="notes-view-toggle" class="doc-action-icon-btn notes-header-text-btn" title="Toggle view" style="opacity:0.8;gap:5px;">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
|
||||
<span class="notes-header-btn-label">Toggle</span>
|
||||
</button>
|
||||
<button id="notes-minimize-btn" class="modal-minimize-btn" title="Minimize" aria-label="Minimize notes" style="position:relative;left:2px;"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="18" x2="18" y2="18"/></svg></button>
|
||||
</div>
|
||||
<div class="notes-search-bar">
|
||||
<input type="text" id="notes-search" class="memory-search-input" placeholder="Search notes…" autocomplete="off" />
|
||||
<button id="notes-select-btn" class="notes-select-trigger" type="button">Select</button>
|
||||
</div>
|
||||
<div id="notes-bulk-bar" class="memory-bulk-bar hidden">
|
||||
<label class="memory-bulk-check-all"><input type="checkbox" id="notes-select-all" /> All</label>
|
||||
<span id="notes-selected-count">0 Selected</span>
|
||||
<span style="flex:1"></span>
|
||||
<button id="notes-send-agent" class="memory-toolbar-btn" disabled><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-2px;margin-right:5px;opacity:0.6"><path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z"></path></svg>Send to Agent</button>
|
||||
<button id="notes-bulk-archive" class="memory-toolbar-btn" disabled>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-2px;margin-right:4px;"><rect x="2" y="3" width="20" height="5" rx="1"/><path d="M4 8v11a2 2 0 002 2h12a2 2 0 002-2V8"/><path d="M10 12h4"/></svg>Archive
|
||||
</button>
|
||||
<button id="notes-bulk-delete" class="memory-toolbar-btn danger" disabled>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-2px;margin-right:4px;"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><line x1="10" y1="11" x2="10" y2="17"/><line x1="14" y1="11" x2="14" y2="17"/></svg>Delete
|
||||
</button>
|
||||
<button id="notes-bulk-cancel" class="memory-toolbar-btn active" title="Cancel selection" aria-label="Cancel selection">
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
<div class="notes-pane-body"></div>
|
||||
`;
|
||||
|
||||
// On mobile open as a full-screen bottom sheet (slide up), not the desktop
|
||||
// side panel. Set inline so it wins over the base .notes-pane rule regardless
|
||||
// of cascade specifics (the CSS @media override wasn't reliably applying,
|
||||
// which left it as a side panel squeezing the chat).
|
||||
if (window.innerWidth <= 768) {
|
||||
pane.style.position = 'fixed';
|
||||
pane.style.inset = '0';
|
||||
pane.style.width = '100%';
|
||||
pane.style.maxWidth = '100%';
|
||||
pane.style.zIndex = '170';
|
||||
pane.style.borderRadius = '14px 14px 0 0';
|
||||
pane.style.animation = 'sheet-enter 0.25s cubic-bezier(0.2, 0.8, 0.2, 1) both';
|
||||
pane.style.transformOrigin = 'bottom center';
|
||||
}
|
||||
|
||||
// Mount on body so Notes can behave like the other draggable windows. On
|
||||
// desktop it is immediately docked to the right by _restoreNotesSidebarDock.
|
||||
const backdrop = document.createElement('div');
|
||||
backdrop.className = 'notes-pane-backdrop';
|
||||
backdrop.id = 'notes-pane-backdrop';
|
||||
backdrop.addEventListener('click', (ev) => {
|
||||
if (ev.target === backdrop) closePanel('down');
|
||||
});
|
||||
backdrop.appendChild(pane);
|
||||
document.body.appendChild(backdrop);
|
||||
_wireNotesWindow(pane);
|
||||
_restoreNotesSidebarDock(pane);
|
||||
_bringNotesToFront(pane);
|
||||
|
||||
// Events
|
||||
// (Close chevron removed : swipe down on mobile, tool-rail toggle on desktop.)
|
||||
|
||||
// Mobile: swipe the grab handle / header down to dismiss (minimise to chip).
|
||||
// Mirrors the document sheet gesture : finger-following, velocity-based
|
||||
// dismiss, rubber-band on up-drag, spring snap-back.
|
||||
_wireNotesSwipeDismiss(pane.querySelector('.notes-mobile-grabber'), pane);
|
||||
_wireNotesSwipeDismiss(pane.querySelector('.notes-pane-header'), pane);
|
||||
|
||||
pane.addEventListener('pointerdown', () => _bringNotesToFront(pane), true);
|
||||
pane.addEventListener('focusin', () => _bringNotesToFront(pane), true);
|
||||
|
||||
const minBtn = document.getElementById('notes-minimize-btn');
|
||||
if (minBtn) minBtn.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
closePanel('down');
|
||||
});
|
||||
wireToolbar(pane);
|
||||
// Select mode
|
||||
document.getElementById('notes-select-btn').addEventListener('click', () => {
|
||||
if (state.selectMode) _exitSelectMode(); else _enterSelectMode();
|
||||
});
|
||||
// Esc cancels select mode. Notes uses a toggle "Select" button rather
|
||||
// than a *-bulk-cancel button, so the global Esc-cancel handler in
|
||||
// keyboard-shortcuts.js can't reach it : handle it here. Capture phase
|
||||
// + stopPropagation so Esc cancels select instead of closing the panel.
|
||||
if (_notesSelectEscHandler) {
|
||||
document.removeEventListener('keydown', _notesSelectEscHandler, true);
|
||||
}
|
||||
_notesSelectEscHandler = (e) => {
|
||||
if (e.key === 'Escape' && state.selectMode) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
_exitSelectMode();
|
||||
}
|
||||
};
|
||||
document.addEventListener('keydown', _notesSelectEscHandler, true);
|
||||
wireSelectionActions();
|
||||
// Escape: exit select mode first (if active), otherwise close the panel.
|
||||
// Skip when the user is editing a form field : those have their own
|
||||
// ESC-to-cancel handlers and we don't want to nuke the whole panel
|
||||
// mid-edit.
|
||||
// Idempotent: remove any previous handler from a prior openPanel so
|
||||
// re-opening doesn't stack multiple handlers.
|
||||
if (_notesKeydownHandler) {
|
||||
document.removeEventListener('keydown', _notesKeydownHandler);
|
||||
_notesKeydownHandler = null;
|
||||
}
|
||||
_notesKeydownHandler = (e) => {
|
||||
if (!state.open) return;
|
||||
const t = e.target;
|
||||
const inField = t && (t.tagName === 'INPUT' || t.tagName === 'TEXTAREA' || t.isContentEditable);
|
||||
// Ctrl/Cmd+Z anywhere in the panel : undo the last note action. Skip when
|
||||
// typing in a field so the browser's normal text-undo still works.
|
||||
if ((e.ctrlKey || e.metaKey) && (e.key === 'z' || e.key === 'Z') && !e.shiftKey) {
|
||||
if (inField) return;
|
||||
if (workflows.undoCount() === 0) return;
|
||||
e.preventDefault();
|
||||
_popAndRunUndo();
|
||||
return;
|
||||
}
|
||||
// Ctrl/Cmd+C while hovering a note card → copy that note. Skip when the
|
||||
// user is editing or has an active text selection (let the browser handle
|
||||
// a real text copy in that case).
|
||||
if ((e.ctrlKey || e.metaKey) && (e.key === 'c' || e.key === 'C') && !e.shiftKey && !e.altKey) {
|
||||
if (inField) return;
|
||||
const sel = window.getSelection?.();
|
||||
if (sel && sel.toString && sel.toString().length > 0) return;
|
||||
const hovered = document.querySelector('.note-card:hover');
|
||||
if (!hovered) return;
|
||||
const id = hovered.dataset.noteId;
|
||||
if (!id) return;
|
||||
e.preventDefault();
|
||||
// Flash the ⋯ menu button (copy now lives in that menu).
|
||||
const btn = hovered.querySelector('.note-card-corner-menu');
|
||||
_copyNote(id, btn);
|
||||
return;
|
||||
}
|
||||
if (e.key !== 'Escape') return;
|
||||
if (inField) return;
|
||||
if (state.selectMode) { _exitSelectMode(); return; }
|
||||
if (state.showingArchived) {
|
||||
// Mirror the archive toggle button: flip back to active notes.
|
||||
document.getElementById('notes-archive-toggle')?.click();
|
||||
return;
|
||||
}
|
||||
_forceCloseNotesPanel();
|
||||
};
|
||||
document.addEventListener('keydown', _notesKeydownHandler);
|
||||
|
||||
// Load : show skeleton immediately, then fetch
|
||||
_renderLoadingSkeleton();
|
||||
// Defer the highlight flush to the next frame so it runs *after* the cards
|
||||
// are committed to the DOM (and any FLIP animations have settled), giving
|
||||
// the querySelector lookups inside something to find.
|
||||
_fetchNotes().then(() => {
|
||||
if (!pane.isConnected || !state.open) { _startReminderLoop(); return; }
|
||||
_renderNotes();
|
||||
requestAnimationFrame(() => _flushPendingHighlights());
|
||||
_startReminderLoop();
|
||||
_showNotesFirstOpenHint(pane);
|
||||
});
|
||||
}
|
||||
|
||||
function closePanel(direction) {
|
||||
if (!state.open) return;
|
||||
app.setOpen(false);
|
||||
app.setEditingId(null);
|
||||
_clearViewedReminderGlows();
|
||||
const _minimize = direction === 'down';
|
||||
if (_minimize) {
|
||||
_ensureNotesChipRegistered();
|
||||
} else if (Modals.isRegistered('notes-panel')) {
|
||||
Modals.unregister('notes-panel');
|
||||
}
|
||||
|
||||
// Drop panel-owned keydown listeners. The reminder interval is page-owned.
|
||||
if (_notesKeydownHandler) {
|
||||
document.removeEventListener('keydown', _notesKeydownHandler);
|
||||
_notesKeydownHandler = null;
|
||||
}
|
||||
if (_notesSelectEscHandler) {
|
||||
document.removeEventListener('keydown', _notesSelectEscHandler, true);
|
||||
_notesSelectEscHandler = null;
|
||||
}
|
||||
|
||||
disposeOwnedPortals();
|
||||
disposeUI();
|
||||
document.body.classList.remove('notes-view');
|
||||
document.body.classList.remove('notes-mobile-mode');
|
||||
document.body.classList.remove('notes-drag-mode');
|
||||
// Closing the panel should PRESERVE in-progress edits, not drop them.
|
||||
// Commit any open in-place editor, and close the mobile fullscreen
|
||||
// overlay with save=true so the note is persisted.
|
||||
try { _commitOpenInPlaceEditor(); } catch {}
|
||||
_closeMobileFullscreenEdit({ save: true });
|
||||
// /notes route may have collapsed the wide sidebar to a rail; restore.
|
||||
try { window._restoreSidebarIfRouteCollapsed?.(); } catch (_) {}
|
||||
|
||||
const btn = document.getElementById('tool-notes-btn');
|
||||
if (btn) btn.classList.remove('active');
|
||||
|
||||
const pane = document.getElementById('notes-pane');
|
||||
const backdrop = document.getElementById('notes-pane-backdrop');
|
||||
if (pane) {
|
||||
// Scale-out + fade. Match the enter animation duration so close feels
|
||||
// like the same gesture played backwards.
|
||||
pane.classList.add('notes-pane-leaving');
|
||||
const _cleanup = () => {
|
||||
try { pane.remove(); } catch {}
|
||||
try { backdrop?.remove(); } catch {}
|
||||
};
|
||||
pane.addEventListener('animationend', _cleanup, { once: true });
|
||||
// Belt-and-braces: if animation is skipped (reduced motion / detached
|
||||
// tab) the listener won't fire; remove after the expected duration.
|
||||
setTimeout(_cleanup, 220);
|
||||
} else if (backdrop) {
|
||||
backdrop.remove();
|
||||
}
|
||||
// Show the dock chip for a swipe-down minimize (tap it to reopen).
|
||||
if (_minimize) { try { Modals.minimize('notes-panel'); } catch {} }
|
||||
}
|
||||
|
||||
function togglePanel() {
|
||||
if (state.open) closePanel();
|
||||
else openPanel();
|
||||
}
|
||||
|
||||
function isPanelOpen() { return state.open; }
|
||||
|
||||
async function openNote(noteId) {
|
||||
const wasOpen = !!(isPanelOpen && isPanelOpen());
|
||||
app.setShowingArchived(false);
|
||||
app.setActiveLabel(null);
|
||||
app.setActiveFilter(null);
|
||||
app.setSearchQuery('');
|
||||
if (!wasOpen) {
|
||||
openPanel();
|
||||
} else {
|
||||
_bringNotesToFront();
|
||||
const searchEl = document.getElementById('notes-search');
|
||||
if (searchEl) searchEl.value = '';
|
||||
const pane = document.getElementById('notes-pane');
|
||||
if (pane) pane.classList.remove('notes-pane-archive');
|
||||
const archiveBtn = document.getElementById('notes-archive-toggle');
|
||||
if (archiveBtn) archiveBtn.classList.remove('active');
|
||||
await _fetchNotes();
|
||||
_renderNotes();
|
||||
}
|
||||
// openPanel() kicks off _fetchNotes() asynchronously, so the cards for
|
||||
// newly-created notes may not be in the DOM yet. Poll until the card exists.
|
||||
if (!noteId) return;
|
||||
let tries = 0;
|
||||
const findAndFlash = () => {
|
||||
const card = document.querySelector(`.note-card[data-note-id="${noteId}"]`)
|
||||
|| document.querySelector(`.note-card[data-note-id^="${noteId.slice(0, 8)}"]`);
|
||||
if (card) {
|
||||
_smoothScrollToNoteCard(card);
|
||||
card.classList.add('note-card-flash');
|
||||
setTimeout(() => card.classList.remove('note-card-flash'), 1600);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
const tryNext = () => {
|
||||
if (findAndFlash()) return;
|
||||
if (++tries < 20) setTimeout(tryNext, 200);
|
||||
};
|
||||
setTimeout(tryNext, 120);
|
||||
}
|
||||
|
||||
let _notesKeydownHandler = null;
|
||||
|
||||
let _notesSelectEscHandler = null;
|
||||
|
||||
function _wireNotesSwipeDismiss(el, pane) {
|
||||
if (!el || !pane) return;
|
||||
const DISMISS_THRESHOLD = 50, VELOCITY_THRESHOLD = 0.3, RUBBER = 0.35;
|
||||
let startY = 0, startX = 0, lastY = 0, lastT = 0, velocity = 0;
|
||||
let dragging = false, cancelled = false;
|
||||
|
||||
el.addEventListener('touchstart', (e) => {
|
||||
if (window.innerWidth > 768 || e.touches.length !== 1) return;
|
||||
if (e.target.closest('button, input, select, label, textarea')) return;
|
||||
const t = e.touches[0];
|
||||
startY = t.clientY; startX = t.clientX; lastY = startY; lastT = e.timeStamp;
|
||||
velocity = 0; dragging = false; cancelled = false;
|
||||
}, { passive: true });
|
||||
|
||||
el.addEventListener('touchmove', (e) => {
|
||||
if (cancelled || window.innerWidth > 768) return;
|
||||
const t = e.touches[0];
|
||||
const dx = Math.abs(t.clientX - startX);
|
||||
const dy = t.clientY - startY;
|
||||
if (!dragging) {
|
||||
if (dx > 40 && dx > Math.abs(dy) * 2) { cancelled = true; return; }
|
||||
if (Math.abs(dy) > 8) {
|
||||
dragging = true;
|
||||
pane.style.animation = 'none';
|
||||
pane.style.transition = 'none';
|
||||
pane.style.willChange = 'transform';
|
||||
} else return;
|
||||
}
|
||||
const dt = e.timeStamp - lastT;
|
||||
if (dt > 0) velocity = velocity * 0.6 + ((t.clientY - lastY) / dt) * 0.4;
|
||||
lastY = t.clientY; lastT = e.timeStamp;
|
||||
e.preventDefault();
|
||||
pane.style.transform = dy > 0 ? `translateY(${dy}px)` : `translateY(${dy * RUBBER}px)`;
|
||||
}, { passive: false });
|
||||
|
||||
const endSwipe = () => {
|
||||
if (!dragging) return;
|
||||
dragging = false;
|
||||
pane.style.willChange = '';
|
||||
const dy = lastY - startY;
|
||||
if (dy > DISMISS_THRESHOLD || (dy > 20 && velocity > VELOCITY_THRESHOLD)) {
|
||||
// Slide fully off-screen, then minimise. Keep it translated down (don't
|
||||
// reset) so it doesn't flash back before closePanel removes it.
|
||||
pane.style.transition = 'transform 0.2s cubic-bezier(0.2, 0, 0.4, 1)';
|
||||
pane.style.transform = 'translateY(100%)';
|
||||
setTimeout(() => closePanel('down'), 200);
|
||||
} else {
|
||||
pane.style.transition = 'transform 0.25s cubic-bezier(0.2, 0.9, 0.3, 1.05)';
|
||||
pane.style.transform = '';
|
||||
setTimeout(() => { pane.style.transition = ''; }, 260);
|
||||
}
|
||||
};
|
||||
el.addEventListener('touchend', endSwipe, { passive: true });
|
||||
el.addEventListener('touchcancel', endSwipe, { passive: true });
|
||||
}
|
||||
|
||||
function _smoothScrollToNoteCard(card) {
|
||||
if (!card) return;
|
||||
const scroller = card.closest('.notes-pane-body');
|
||||
if (!scroller) {
|
||||
try { card.scrollIntoView({ block: 'center', behavior: 'smooth' }); } catch (_) {}
|
||||
return;
|
||||
}
|
||||
const scrollerRect = scroller.getBoundingClientRect();
|
||||
const cardRect = card.getBoundingClientRect();
|
||||
const delta = (cardRect.top - scrollerRect.top) - (scroller.clientHeight - cardRect.height) / 2;
|
||||
scroller.scrollTo({ top: Math.max(0, scroller.scrollTop + delta), behavior: 'smooth' });
|
||||
}
|
||||
|
||||
function disposeOwnedPortals() {
|
||||
document.querySelectorAll('.note-reminder-menu, .note-corner-menu-dropdown, #notes-first-open-hint').forEach(dismissOrRemove);
|
||||
}
|
||||
|
||||
return { _forceCloseNotesPanel, openPanel, closePanel, togglePanel, isPanelOpen, openNote, _smoothScrollToNoteCard };
|
||||
}
|
||||
@@ -0,0 +1,170 @@
|
||||
/** Quick-add expansion, draft restoration and opening inline editors. */
|
||||
export function createQuickAdd({
|
||||
_applyDraftToNote,
|
||||
_applyMasonry,
|
||||
_buildForm,
|
||||
app,
|
||||
openPanel,
|
||||
state,
|
||||
uiModule
|
||||
}) {
|
||||
function _renderQuickAdd(body) {
|
||||
const wrap = document.createElement('div');
|
||||
wrap.className = 'notes-quick-add';
|
||||
// 2-pill Note/Todo toggle mirrors the full form's type-seg (minus Draw :
|
||||
// drawing happens in the expanded form). The pill that's active steers
|
||||
// both the placeholder and the type the form opens in.
|
||||
wrap.innerHTML = `
|
||||
<div class="notes-quick-type-seg is-todo" role="group" aria-label="New item type">
|
||||
<button type="button" class="notes-quick-type-pill" data-type="note" aria-label="Note" aria-pressed="false" title="Note">
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="4" y1="6" x2="20" y2="6"/><line x1="4" y1="12" x2="20" y2="12"/><line x1="4" y1="18" x2="14" y2="18"/></svg>
|
||||
</button>
|
||||
<button type="button" class="notes-quick-type-pill active" data-type="todo" aria-label="To-do" aria-pressed="true" title="To-do">
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="9 11 12 14 22 4"/><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
<input type="text" class="notes-quick-input" placeholder="Add a to-do…" />
|
||||
<button class="notes-quick-icon" data-action="photo" title="Attach photo">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="8.5" cy="8.5" r="1.5"/><polyline points="21 15 16 10 5 21"/></svg>
|
||||
</button>
|
||||
`;
|
||||
body.appendChild(wrap);
|
||||
|
||||
const input = wrap.querySelector('.notes-quick-input');
|
||||
const seg = wrap.querySelector('.notes-quick-type-seg');
|
||||
let currentType = 'todo';
|
||||
const setType = (t) => {
|
||||
if (t !== 'note' && t !== 'todo') return;
|
||||
currentType = t;
|
||||
seg.classList.toggle('is-todo', t === 'todo');
|
||||
seg.classList.toggle('is-note', t === 'note');
|
||||
seg.querySelectorAll('.notes-quick-type-pill').forEach(p => {
|
||||
const on = p.dataset.type === t;
|
||||
p.classList.toggle('active', on);
|
||||
p.setAttribute('aria-pressed', on ? 'true' : 'false');
|
||||
});
|
||||
input.placeholder = t === 'note' ? 'Add a note…' : 'Add a to-do…';
|
||||
};
|
||||
seg.querySelectorAll('.notes-quick-type-pill').forEach(p => {
|
||||
p.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
setType(p.dataset.type);
|
||||
});
|
||||
});
|
||||
// Click input or type → expand to full form
|
||||
const expandToForm = (initialType = 'note', initialText = '') => {
|
||||
app.setEditingId('__new__');
|
||||
const form = _buildForm({ note_type: initialType });
|
||||
form.classList.add('note-form-new');
|
||||
if (initialText) {
|
||||
const titleEl = form.querySelector('.note-form-title');
|
||||
if (titleEl) titleEl.value = initialText;
|
||||
}
|
||||
const mobileGrid = body.closest('.notes-pane')?.classList.contains('notes-view-grid')
|
||||
&& window.matchMedia('(max-width: 768px)').matches;
|
||||
if (mobileGrid) {
|
||||
form.style.gridColumn = '1 / -1';
|
||||
form.style.gridRowEnd = 'span 64';
|
||||
}
|
||||
wrap.replaceWith(form);
|
||||
_applyMasonry(body);
|
||||
requestAnimationFrame(() => _applyMasonry(body));
|
||||
const titleEl = form.querySelector('.note-form-title');
|
||||
if (titleEl) {
|
||||
titleEl.focus();
|
||||
// Move caret to end
|
||||
titleEl.setSelectionRange(titleEl.value.length, titleEl.value.length);
|
||||
}
|
||||
};
|
||||
// Expand only on real intent: a click directly on the input, or actual
|
||||
// typing. Focus alone : including focus stolen from a missed nearby
|
||||
// click : no longer creates an empty form.
|
||||
input.addEventListener('click', () => expandToForm(currentType, input.value));
|
||||
input.addEventListener('input', () => expandToForm(currentType, input.value));
|
||||
wrap.querySelector('[data-action="photo"]').addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
expandToForm(currentType);
|
||||
// Trigger photo input on the new form
|
||||
setTimeout(() => document.querySelector('.note-form-photo-btn')?.click(), 50);
|
||||
});
|
||||
}
|
||||
|
||||
function _createNote(type = 'todo') {
|
||||
const body = document.querySelector('#notes-pane .notes-pane-body');
|
||||
if (!body || state.editingId === '__new__') return;
|
||||
app.setEditingId('__new__');
|
||||
// Restore an unsaved new-note draft if one survived a prior close/loss.
|
||||
const { note: _n, restored } = _applyDraftToNote({ note_type: type }, '__new__');
|
||||
const form = _buildForm(_n);
|
||||
form.classList.add('note-form-new');
|
||||
body.prepend(form);
|
||||
const initialField = type === 'note'
|
||||
? form.querySelector('.note-form-content')
|
||||
: form.querySelector('.note-cl-text, .note-form-title');
|
||||
initialField?.focus();
|
||||
if (restored) uiModule.showToast('Restored unsaved note');
|
||||
}
|
||||
|
||||
function newNote() {
|
||||
if (!state.open) openPanel();
|
||||
requestAnimationFrame(() => _createNote('note'));
|
||||
}
|
||||
|
||||
function _editNote(id) {
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (!note) return;
|
||||
app.setEditingId(id);
|
||||
const card = document.querySelector(`.note-card[data-note-id="${id}"]`);
|
||||
if (!card) return;
|
||||
// Restore an unsaved draft (from a prior connection loss / close) over
|
||||
// the saved note so the user picks up where they left off.
|
||||
const { note: _n, restored } = _applyDraftToNote(note, id);
|
||||
const form = _buildForm(_n);
|
||||
card.replaceWith(form);
|
||||
if (restored) uiModule.showToast('Restored unsaved changes');
|
||||
// Pinned notes live in the first masonry column : the edit form has
|
||||
// column-span:all, which can leave the form rendered above the fold or
|
||||
// visually buried under neighboring pinned cards. Bring it into view
|
||||
// (and onto a higher stacking context) so editing a pinned note always
|
||||
// pops to the top.
|
||||
form.style.position = 'relative';
|
||||
form.style.zIndex = '5';
|
||||
// Grid view: the form keeps the CSS default `grid-row-end: span 16` (64px)
|
||||
// after replaceWith, which is much shorter than the actual form. Recompute
|
||||
// masonry so the form gets the correct row span and cards below stop
|
||||
// overlapping it. ResizeObserver inside _applyMasonry keeps it in sync as
|
||||
// the user types / adds checklist items.
|
||||
const _body = form.closest('.notes-pane-body');
|
||||
if (_body) {
|
||||
_applyMasonry(_body);
|
||||
requestAnimationFrame(() => _applyMasonry(_body));
|
||||
}
|
||||
requestAnimationFrame(() => {
|
||||
try { form.scrollIntoView({ block: 'center', behavior: 'smooth' }); }
|
||||
catch { form.scrollIntoView(); }
|
||||
});
|
||||
// Pick the most useful field to focus. On phones especially, the user
|
||||
// taps Edit to type : landing in the title when there's already a title
|
||||
// (and likely a body to extend) loses momentum. Prefer the body textarea
|
||||
// for plain notes, the first checklist item for todos, fall back to title.
|
||||
const _focusBest = () => {
|
||||
if (note.note_type === 'note' || !note.note_type) {
|
||||
const ta = form.querySelector('.note-form-content');
|
||||
if (ta) { ta.focus(); try { ta.setSelectionRange(ta.value.length, ta.value.length); } catch {} return; }
|
||||
}
|
||||
if (note.note_type === 'todo' || note.note_type === 'goal' || note.note_type === 'checklist') {
|
||||
// Last non-empty checklist row, or the first row if all empty.
|
||||
const rows = form.querySelectorAll('.note-cl-row .note-cl-text');
|
||||
let target = null;
|
||||
for (const inp of rows) { if ((inp.value || '').trim()) target = inp; }
|
||||
target = target || rows[0];
|
||||
if (target) { target.focus(); try { target.setSelectionRange(target.value.length, target.value.length); } catch {} return; }
|
||||
}
|
||||
const titleEl = form.querySelector('.note-form-title');
|
||||
if (titleEl) titleEl.focus();
|
||||
};
|
||||
_focusBest();
|
||||
}
|
||||
|
||||
return { _renderQuickAdd, _createNote, newNote, _editNote };
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
/** Reminder badges, sticky card highlights and entry scrolling. */
|
||||
import { _isNoteFullyDone } from '../domain/noteRules.js';
|
||||
import { _hasTimeComponent } from '../domain/recurrence.js';
|
||||
export function createReminderDisplay({
|
||||
_countFiredReminders,
|
||||
_hasActiveReminder,
|
||||
_loadActiveHighlights,
|
||||
_loadGlowedReminders,
|
||||
_loadPendingHighlights,
|
||||
_saveActiveHighlights,
|
||||
_saveGlowedReminders,
|
||||
_savePendingHighlights,
|
||||
_smoothScrollToNoteCard,
|
||||
state
|
||||
}) {
|
||||
function _clearViewedReminderGlows() {
|
||||
const active = _loadActiveHighlights();
|
||||
if (!active.size) return;
|
||||
_saveActiveHighlights(new Set());
|
||||
document.querySelectorAll('.note-card-reminder-fired-sticky').forEach(card => {
|
||||
card.classList.remove('note-card-reminder-fired-sticky');
|
||||
});
|
||||
}
|
||||
|
||||
function _setReminderCardGlow(noteId, on = true) {
|
||||
if (!noteId) return;
|
||||
const active = _loadActiveHighlights();
|
||||
if (on) active.add(noteId);
|
||||
else active.delete(noteId);
|
||||
_saveActiveHighlights(active);
|
||||
document.querySelectorAll(`.note-card[data-note-id="${noteId}"]`).forEach(card => {
|
||||
card.classList.toggle('note-card-reminder-fired-sticky', on);
|
||||
});
|
||||
}
|
||||
|
||||
function _queuePendingHighlight(noteId) {
|
||||
const set = _loadPendingHighlights();
|
||||
set.add(noteId);
|
||||
_savePendingHighlights(set);
|
||||
}
|
||||
|
||||
function _flushPendingHighlights() {
|
||||
// Fresh firings (queued by the background loop while the panel was closed)
|
||||
// glow unconditionally : a notification just told the user something
|
||||
// happened, so we always point at the note even if it was glowed before.
|
||||
const queued = _loadPendingHighlights();
|
||||
const glowed = _loadGlowedReminders();
|
||||
const toGlow = new Set(queued);
|
||||
// For notes that are merely overdue at open time (no fresh firing event),
|
||||
// only glow the ones we haven't already shown : otherwise reopening the
|
||||
// panel keeps lighting up old reminders forever.
|
||||
for (const n of state.notes) {
|
||||
if (!_hasActiveReminder(n) || !_hasTimeComponent(n.due_date)) continue;
|
||||
if (queued.has(n.id) || !glowed.has(n.id)) toGlow.add(n.id);
|
||||
}
|
||||
// Always consume the queue.
|
||||
_savePendingHighlights(new Set());
|
||||
if (!toGlow.size) return;
|
||||
let firstCard = null;
|
||||
for (const id of toGlow) {
|
||||
const card = document.querySelector(`.note-card[data-note-id="${id}"]`);
|
||||
if (!card) continue;
|
||||
_setReminderCardGlow(id, true);
|
||||
if (!firstCard) firstCard = card;
|
||||
glowed.add(id);
|
||||
}
|
||||
_saveGlowedReminders(glowed);
|
||||
// Bring the first one into view so it can't get buried below the fold.
|
||||
if (firstCard) {
|
||||
requestAnimationFrame(() => {
|
||||
_smoothScrollToNoteCard(firstCard);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function _updateRailBadge() {
|
||||
const fired = _countFiredReminders();
|
||||
// Rail (mini sidebar) : only show the count when reminders have ACTUALLY
|
||||
// fired since the last dismissal (i.e. you haven't opened notes yet).
|
||||
// Showing every overdue note forever made the badge feel permanent.
|
||||
const railBtn = document.getElementById('rail-notes');
|
||||
if (railBtn) {
|
||||
let badge = railBtn.querySelector('.rail-notes-badge');
|
||||
if (fired > 0) {
|
||||
if (!badge) {
|
||||
badge = document.createElement('span');
|
||||
badge.className = 'rail-notes-badge';
|
||||
railBtn.appendChild(badge);
|
||||
}
|
||||
badge.textContent = fired > 99 ? '99+' : String(fired);
|
||||
badge.classList.add('fired');
|
||||
} else if (badge) {
|
||||
badge.remove();
|
||||
}
|
||||
}
|
||||
// Main sidebar button
|
||||
const sidebarBtn = document.getElementById('tool-notes-btn');
|
||||
if (sidebarBtn) {
|
||||
let dot = sidebarBtn.querySelector('.tool-notes-dot');
|
||||
if (fired > 0) {
|
||||
if (!dot) {
|
||||
dot = document.createElement('span');
|
||||
dot.className = 'tool-notes-dot';
|
||||
const newNoteBtn = sidebarBtn.querySelector('#notes-new-note-btn');
|
||||
sidebarBtn.insertBefore(dot, newNoteBtn || null);
|
||||
}
|
||||
} else if (dot) {
|
||||
dot.remove();
|
||||
}
|
||||
}
|
||||
// Individual note cards : pulse ones with fired reminders
|
||||
document.querySelectorAll('.note-card').forEach(card => {
|
||||
const id = card.dataset.noteId;
|
||||
const note = state.notes.find(n => n.id === id);
|
||||
if (!note || note.archived || _isNoteFullyDone(note)) {
|
||||
card.classList.remove('note-card-reminder-due');
|
||||
return;
|
||||
}
|
||||
if (note.due_date && _hasTimeComponent(note.due_date)) {
|
||||
const t = new Date(note.due_date).getTime();
|
||||
card.classList.toggle('note-card-reminder-due', !isNaN(t) && t <= Date.now());
|
||||
} else {
|
||||
card.classList.remove('note-card-reminder-due');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return { _clearViewedReminderGlows, _setReminderCardGlow, _queuePendingHighlight, _flushPendingHighlights, _updateRailBadge };
|
||||
}
|
||||
@@ -0,0 +1,335 @@
|
||||
/** Reminder date presets and recurrence picker interactions. */
|
||||
import { _formatRepeatLabel, _toLocalDatetimeStr, _normalizeRepeat, _DAYS, _ORDINALS } from '../domain/recurrence.js';
|
||||
export function createReminderPicker({
|
||||
lifecycle,
|
||||
_ensureNotificationPermission,
|
||||
_esc,
|
||||
_formatReminderTag,
|
||||
_laterTodayDate,
|
||||
_nextWeekDate,
|
||||
_snapToRepeat,
|
||||
_tomorrowDate,
|
||||
bindMenuDismiss,
|
||||
dismissOrRemove
|
||||
}) {
|
||||
function _wireReminderPicker(form) {
|
||||
// Reminder bell : opens dropdown menu
|
||||
const remindBtn = form.querySelector('.note-form-remind-btn');
|
||||
const dueInput = form.querySelector('.note-form-due');
|
||||
const repeatInput = form.querySelector('.note-form-repeat');
|
||||
const tagsEl = form.querySelector('.note-form-reminder-tags');
|
||||
|
||||
function _renderReminderTag() {
|
||||
if (!tagsEl) return;
|
||||
const v = dueInput.value;
|
||||
const rep = repeatInput.value || 'none';
|
||||
if (!v) { tagsEl.innerHTML = ''; return; }
|
||||
const label = _formatReminderTag(v);
|
||||
const repLabel = rep !== 'none' ? ` · ${_formatRepeatLabel(rep, new Date(v))}` : '';
|
||||
tagsEl.innerHTML = `<button class="note-reminder-tag" type="button" title="Edit reminder">
|
||||
<svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"/><path d="M13.73 21a2 2 0 0 1-3.46 0"/></svg>
|
||||
<span>${_esc(label)}${_esc(repLabel)}</span>
|
||||
<span class="note-reminder-tag-x" title="Remove">×</span>
|
||||
</button>`;
|
||||
tagsEl.querySelector('.note-reminder-tag').addEventListener('click', (e) => {
|
||||
if (e.target.classList.contains('note-reminder-tag-x')) {
|
||||
dueInput.value = '';
|
||||
repeatInput.value = 'none';
|
||||
_renderReminderTag();
|
||||
return;
|
||||
}
|
||||
_openReminderMenu(remindBtn || tagsEl, true);
|
||||
});
|
||||
}
|
||||
|
||||
function _openReminderMenu(anchor, isEdit = false) {
|
||||
// Close any existing menu
|
||||
document.querySelectorAll('.note-reminder-menu').forEach(m => m.remove());
|
||||
const menu = document.createElement('div');
|
||||
menu.className = 'note-reminder-menu';
|
||||
document.body.appendChild(menu);
|
||||
|
||||
const presetItems = [
|
||||
{ label: 'Later today', sub: _laterTodayDate().toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' }), action: () => _setReminder(_toLocalDatetimeStr(_laterTodayDate())) },
|
||||
{ label: 'Tomorrow', sub: _tomorrowDate().toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' }), action: () => _setReminder(_toLocalDatetimeStr(_tomorrowDate())) },
|
||||
{ label: 'Next week', sub: _nextWeekDate().toLocaleDateString([], { weekday: 'short' }) + ' ' + _nextWeekDate().toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' }), action: () => _setReminder(_toLocalDatetimeStr(_nextWeekDate())) },
|
||||
{ label: 'Select date and time', sub: '', action: () => _pickCustomDate() },
|
||||
];
|
||||
|
||||
// Sub-page state for the repeat picker. null = top page.
|
||||
// 'weekly' | 'monthly' | 'monthly_nth'
|
||||
let subMode = null;
|
||||
// Temporary state for monthly_nth so user can click N then weekday (or vice versa)
|
||||
// before committing.
|
||||
let nthDraft = { n: 0, w: -1 };
|
||||
|
||||
const DAY_SHORT = ['S', 'M', 'T', 'W', 'T', 'F', 'S'];
|
||||
|
||||
function getNorm() {
|
||||
if (!dueInput.value) return 'none';
|
||||
return _normalizeRepeat(repeatInput.value || 'none', new Date(dueInput.value));
|
||||
}
|
||||
|
||||
function commit(val) {
|
||||
repeatInput.value = val;
|
||||
_renderReminderTag();
|
||||
menu.remove();
|
||||
}
|
||||
|
||||
// Like commit, but first snaps dueInput.value forward to the next matching
|
||||
// slot for the chosen recurrence. Use for weekly/monthly variants where the
|
||||
// current due date may not match the chosen pattern (e.g. user picks
|
||||
// "weekly on Mondays" while the date is a Wednesday).
|
||||
function snapAndCommit(val) {
|
||||
if (dueInput.value) {
|
||||
const cur = new Date(dueInput.value);
|
||||
const norm = _normalizeRepeat(val, cur);
|
||||
const snapped = _snapToRepeat(cur, norm);
|
||||
if (snapped) {
|
||||
dueInput.value = _toLocalDatetimeStr(snapped);
|
||||
if (remindBtn) remindBtn.classList.add('has-date');
|
||||
}
|
||||
}
|
||||
commit(val);
|
||||
}
|
||||
|
||||
function reposition() {
|
||||
const rect = anchor.getBoundingClientRect();
|
||||
const vw = window.innerWidth;
|
||||
const vh = window.innerHeight;
|
||||
const mw = menu.offsetWidth || 220;
|
||||
const mh = menu.offsetHeight || 280;
|
||||
let top = rect.bottom + 4;
|
||||
let left = rect.left;
|
||||
if (top + mh > vh - 8) top = Math.max(8, rect.top - mh - 4);
|
||||
if (left + mw > vw - 8) left = Math.max(8, vw - mw - 8);
|
||||
if (left < 8) left = 8;
|
||||
menu.style.top = top + 'px';
|
||||
menu.style.left = left + 'px';
|
||||
}
|
||||
|
||||
function render() {
|
||||
let html = '';
|
||||
|
||||
if (subMode === null) {
|
||||
html += '<div class="note-reminder-menu-title">Remind me later</div>';
|
||||
for (let i = 0; i < presetItems.length; i++) {
|
||||
const it = presetItems[i];
|
||||
html += `<button class="note-reminder-menu-item" data-action="preset" data-i="${i}"><span>${it.label}</span><span class="note-reminder-menu-sub">${it.sub}</span></button>`;
|
||||
}
|
||||
if (isEdit && dueInput.value) {
|
||||
const norm = getNorm();
|
||||
html += '<div class="note-reminder-menu-divider"></div>';
|
||||
html += '<div class="note-reminder-menu-title">Repeat</div>';
|
||||
// None
|
||||
html += `<button class="note-reminder-menu-item${norm === 'none' ? ' active' : ''}" data-action="set" data-val="none"><span>Doesn't repeat</span>${norm === 'none' ? '<span class="note-reminder-menu-check">✓</span>' : ''}</button>`;
|
||||
// Daily
|
||||
html += `<button class="note-reminder-menu-item${norm === 'daily' ? ' active' : ''}" data-action="set" data-val="daily"><span>Daily</span>${norm === 'daily' ? '<span class="note-reminder-menu-check">✓</span>' : ''}</button>`;
|
||||
// Weekly →
|
||||
{
|
||||
const isW = norm.startsWith('weekly:');
|
||||
const wd = isW ? parseInt(norm.split(':')[1], 10) : null;
|
||||
const sub = isW && !isNaN(wd) ? `<span class="note-reminder-menu-sub">${_DAYS[wd]}</span>` : '';
|
||||
html += `<button class="note-reminder-menu-item${isW ? ' active' : ''}" data-action="sub" data-sub="weekly"><span>Weekly</span>${sub}<span class="note-reminder-menu-arrow">›</span></button>`;
|
||||
}
|
||||
// Monthly →
|
||||
{
|
||||
const isM = norm.startsWith('monthly:');
|
||||
const sub = isM ? `<span class="note-reminder-menu-sub">${_monthlyShortDescriptor(norm)}</span>` : '';
|
||||
html += `<button class="note-reminder-menu-item${isM ? ' active' : ''}" data-action="sub" data-sub="monthly"><span>Monthly</span>${sub}<span class="note-reminder-menu-arrow">›</span></button>`;
|
||||
}
|
||||
// Yearly
|
||||
html += `<button class="note-reminder-menu-item${norm === 'yearly' ? ' active' : ''}" data-action="set" data-val="yearly"><span>Yearly</span>${norm === 'yearly' ? '<span class="note-reminder-menu-check">✓</span>' : ''}</button>`;
|
||||
}
|
||||
} else if (subMode === 'weekly') {
|
||||
const norm = getNorm();
|
||||
const curWd = norm.startsWith('weekly:') ? parseInt(norm.split(':')[1], 10) : -1;
|
||||
html += `<button class="note-reminder-menu-back" data-action="back"><span class="note-reminder-menu-arrow-back">‹</span> Repeat</button>`;
|
||||
html += '<div class="note-reminder-menu-title">Weekly on…</div>';
|
||||
html += '<div class="note-reminder-weekday-row">';
|
||||
for (let i = 0; i < 7; i++) {
|
||||
html += `<button class="note-reminder-day-chip${curWd === i ? ' active' : ''}" data-action="weekly-pick" data-wd="${i}" title="${_DAYS[i]}">${DAY_SHORT[i]}</button>`;
|
||||
}
|
||||
html += '</div>';
|
||||
} else if (subMode === 'monthly') {
|
||||
const norm = getNorm();
|
||||
const dueDate = new Date(dueInput.value);
|
||||
const dayN = dueDate.getDate();
|
||||
html += `<button class="note-reminder-menu-back" data-action="back"><span class="note-reminder-menu-arrow-back">‹</span> Repeat</button>`;
|
||||
html += '<div class="note-reminder-menu-title">Monthly on…</div>';
|
||||
// Day N : uses the chosen date's day. Always offered.
|
||||
const dayVal = `monthly:day:${dayN}`;
|
||||
html += `<button class="note-reminder-menu-item${norm === dayVal ? ' active' : ''}" data-action="set" data-val="${dayVal}"><span>Day ${dayN} every month</span>${norm === dayVal ? '<span class="note-reminder-menu-check">✓</span>' : ''}</button>`;
|
||||
// Nth weekday →
|
||||
{
|
||||
const isNth = norm.startsWith('monthly:nth:');
|
||||
const sub = isNth ? `<span class="note-reminder-menu-sub">${_monthlyShortDescriptor(norm)}</span>` : '';
|
||||
html += `<button class="note-reminder-menu-item${isNth ? ' active' : ''}" data-action="sub" data-sub="monthly_nth"><span>Nth weekday</span>${sub}<span class="note-reminder-menu-arrow">›</span></button>`;
|
||||
}
|
||||
} else if (subMode === 'monthly_nth') {
|
||||
// Pick ordinal (1..4) and weekday (0..6); commit when both chosen.
|
||||
html += `<button class="note-reminder-menu-back" data-action="back-monthly"><span class="note-reminder-menu-arrow-back">‹</span> Monthly</button>`;
|
||||
html += '<div class="note-reminder-menu-title">Nth weekday of month</div>';
|
||||
html += '<div class="note-reminder-menu-sublabel">Which one</div>';
|
||||
html += '<div class="note-reminder-weekday-row">';
|
||||
for (let i = 1; i <= 4; i++) {
|
||||
html += `<button class="note-reminder-day-chip wide${nthDraft.n === i ? ' active' : ''}" data-action="nth-n" data-n="${i}">${_ORDINALS[i - 1]}</button>`;
|
||||
}
|
||||
html += '</div>';
|
||||
html += '<div class="note-reminder-menu-sublabel">Weekday</div>';
|
||||
html += '<div class="note-reminder-weekday-row">';
|
||||
for (let i = 0; i < 7; i++) {
|
||||
html += `<button class="note-reminder-day-chip${nthDraft.w === i ? ' active' : ''}" data-action="nth-w" data-wd="${i}" title="${_DAYS[i]}">${DAY_SHORT[i]}</button>`;
|
||||
}
|
||||
html += '</div>';
|
||||
html += '<div class="note-reminder-menu-divider"></div>';
|
||||
const ready = nthDraft.n > 0 && nthDraft.w >= 0;
|
||||
const lbl = ready ? `Save: ${_ORDINALS[nthDraft.n - 1]} ${_DAYS[nthDraft.w]}` : 'Pick week and weekday';
|
||||
html += `<button class="note-reminder-menu-item note-reminder-menu-confirm${ready ? '' : ' disabled'}" data-action="nth-save" ${ready ? '' : 'disabled'}><span>${lbl}</span></button>`;
|
||||
}
|
||||
|
||||
menu.innerHTML = html;
|
||||
reposition();
|
||||
wire();
|
||||
}
|
||||
|
||||
function wire() {
|
||||
menu.querySelectorAll('[data-action]').forEach(el => {
|
||||
el.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
const a = el.dataset.action;
|
||||
if (a === 'preset') {
|
||||
const it = presetItems[parseInt(el.dataset.i, 10)];
|
||||
it.action();
|
||||
menu.remove();
|
||||
} else if (a === 'set') {
|
||||
snapAndCommit(el.dataset.val);
|
||||
} else if (a === 'sub') {
|
||||
subMode = el.dataset.sub;
|
||||
// Seed nth draft from saved value only on first entry : preserve
|
||||
// in-progress picks across back-trips (Nth → back → Nth again).
|
||||
if (subMode === 'monthly_nth' && nthDraft.n === 0 && nthDraft.w === -1) {
|
||||
const norm = getNorm();
|
||||
const m = norm.match(/^monthly:nth:(\d):(\d)$/);
|
||||
if (m) nthDraft = { n: parseInt(m[1], 10), w: parseInt(m[2], 10) };
|
||||
}
|
||||
render();
|
||||
} else if (a === 'back') {
|
||||
subMode = null;
|
||||
render();
|
||||
} else if (a === 'back-monthly') {
|
||||
subMode = 'monthly';
|
||||
render();
|
||||
} else if (a === 'weekly-pick') {
|
||||
snapAndCommit(`weekly:${el.dataset.wd}`);
|
||||
} else if (a === 'nth-n') {
|
||||
nthDraft.n = parseInt(el.dataset.n, 10);
|
||||
render();
|
||||
} else if (a === 'nth-w') {
|
||||
nthDraft.w = parseInt(el.dataset.wd, 10);
|
||||
render();
|
||||
} else if (a === 'nth-save') {
|
||||
if (nthDraft.n > 0 && nthDraft.w >= 0) {
|
||||
snapAndCommit(`monthly:nth:${nthDraft.n}:${nthDraft.w}`);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
render();
|
||||
// Click outside to close (single global handler attached after first paint)
|
||||
setTimeout(() => {
|
||||
const close = (e) => {
|
||||
if (!menu.isConnected) { document.removeEventListener('click', close); return; }
|
||||
if (!menu.contains(e.target)) { menu.remove(); document.removeEventListener('click', close); }
|
||||
};
|
||||
if (menu.isConnected) lifecycle.listen(menu, document, 'click', close);
|
||||
}, 0);
|
||||
}
|
||||
|
||||
function _monthlyShortDescriptor(norm) {
|
||||
const parts = norm.split(':');
|
||||
if (parts[1] === 'day') return `Day ${parts[2]}`;
|
||||
if (parts[1] === 'nth') {
|
||||
const n = parseInt(parts[2], 10);
|
||||
const wd = parseInt(parts[3], 10);
|
||||
return `${_ORDINALS[n - 1] || `${n}th`} ${_DAYS[wd].slice(0, 3)}`;
|
||||
}
|
||||
if (parts[1] === 'last') {
|
||||
const wd = parseInt(parts[2], 10);
|
||||
return `Last ${_DAYS[wd].slice(0, 3)}`;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
function _setReminder(datetimeLocalStr) {
|
||||
dueInput.value = datetimeLocalStr;
|
||||
if (remindBtn) {
|
||||
remindBtn.classList.add('has-date');
|
||||
// Jingle the bell. CSS handles the animation; remove + reflow + re-add
|
||||
// so it replays every time the user sets/changes a reminder.
|
||||
const _bell = remindBtn.querySelector('svg');
|
||||
if (_bell) {
|
||||
_bell.classList.remove('jingling');
|
||||
void _bell.offsetWidth;
|
||||
_bell.classList.add('jingling');
|
||||
setTimeout(() => _bell.classList.remove('jingling'), 700);
|
||||
}
|
||||
}
|
||||
_renderReminderTag();
|
||||
_ensureNotificationPermission();
|
||||
}
|
||||
|
||||
function _pickCustomDate() {
|
||||
// Replace the dropdown menu with a small inline picker
|
||||
document.querySelectorAll('.note-reminder-menu').forEach(dismissOrRemove);
|
||||
const menu = document.createElement('div');
|
||||
menu.className = 'note-reminder-menu';
|
||||
const initial = dueInput.value || _toLocalDatetimeStr(_tomorrowDate());
|
||||
menu.innerHTML = `
|
||||
<div class="note-reminder-menu-title">Pick date and time</div>
|
||||
<div class="note-reminder-menu-picker">
|
||||
<input type="datetime-local" class="note-reminder-date-input" />
|
||||
</div>
|
||||
<div class="note-reminder-menu-divider"></div>
|
||||
<button class="note-reminder-menu-item note-reminder-menu-confirm">
|
||||
<span>Save</span>
|
||||
</button>
|
||||
`;
|
||||
document.body.appendChild(menu);
|
||||
// Position next to the bell button
|
||||
const anchor = remindBtn || form.querySelector('.note-form-reminder-tags');
|
||||
const rect = anchor.getBoundingClientRect();
|
||||
const vw = window.innerWidth;
|
||||
const vh = window.innerHeight;
|
||||
const mw = menu.offsetWidth || 240;
|
||||
const mh = menu.offsetHeight || 200;
|
||||
let top = rect.bottom + 4;
|
||||
let left = rect.left;
|
||||
if (top + mh > vh - 8) top = Math.max(8, rect.top - mh - 4);
|
||||
if (left + mw > vw - 8) left = Math.max(8, vw - mw - 8);
|
||||
if (left < 8) left = 8;
|
||||
menu.style.top = top + 'px';
|
||||
menu.style.left = left + 'px';
|
||||
const dInput = menu.querySelector('.note-reminder-date-input');
|
||||
dInput.value = initial;
|
||||
dInput.focus();
|
||||
if (typeof dInput.showPicker === 'function') {
|
||||
try { dInput.showPicker(); } catch {}
|
||||
}
|
||||
const close = bindMenuDismiss(menu, () => { menu.remove(); });
|
||||
menu.querySelector('.note-reminder-menu-confirm').addEventListener('click', () => {
|
||||
if (dInput.value) _setReminder(dInput.value);
|
||||
close();
|
||||
});
|
||||
}
|
||||
|
||||
if (remindBtn) remindBtn.addEventListener('click', (e) => { e.stopPropagation(); _openReminderMenu(remindBtn, !!dueInput.value); });
|
||||
_renderReminderTag();
|
||||
|
||||
|
||||
}
|
||||
|
||||
return { _wireReminderPicker };
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
/** Selection controls and view feedback for accepted attachments. */
|
||||
export function createSelection({
|
||||
operations,
|
||||
_renderNotes,
|
||||
app,
|
||||
state
|
||||
}) {
|
||||
function _enterSelectMode(initialId = null) {
|
||||
app.setSelectMode(true);
|
||||
app.clearSelection();
|
||||
if (initialId) app.selectId(initialId);
|
||||
const bar = document.getElementById('notes-bulk-bar');
|
||||
const btn = document.getElementById('notes-select-btn');
|
||||
if (bar) bar.classList.remove('hidden');
|
||||
if (btn) { btn.classList.add('active'); btn.textContent = 'Cancel'; }
|
||||
_renderNotes();
|
||||
_updateBulkBar();
|
||||
}
|
||||
|
||||
function _exitSelectMode() {
|
||||
app.setSelectMode(false);
|
||||
app.clearSelection();
|
||||
const bar = document.getElementById('notes-bulk-bar');
|
||||
const btn = document.getElementById('notes-select-btn');
|
||||
const all = document.getElementById('notes-select-all');
|
||||
if (bar) bar.classList.add('hidden');
|
||||
if (btn) { btn.classList.remove('active'); btn.textContent = 'Select'; }
|
||||
if (all) all.checked = false;
|
||||
_renderNotes();
|
||||
}
|
||||
|
||||
function _updateBulkBar() {
|
||||
const count = state.selectedIds.size;
|
||||
const countEl = document.getElementById('notes-selected-count');
|
||||
const sendAgentBtn = document.getElementById('notes-send-agent');
|
||||
const archiveBtn = document.getElementById('notes-bulk-archive');
|
||||
const deleteBtn = document.getElementById('notes-bulk-delete');
|
||||
const allEl = document.getElementById('notes-select-all');
|
||||
if (countEl) countEl.textContent = `${count} Selected`;
|
||||
if (sendAgentBtn) sendAgentBtn.disabled = count === 0;
|
||||
if (archiveBtn) archiveBtn.disabled = count === 0;
|
||||
if (deleteBtn) deleteBtn.disabled = count === 0;
|
||||
if (allEl) allEl.checked = state.notes.length > 0 && state.notes.every(n => state.selectedIds.has(n.id));
|
||||
// Toggle select-mode class so todo dots don't react to hover
|
||||
const pane = document.getElementById('notes-pane');
|
||||
if (pane) pane.classList.toggle('notes-select-mode', count > 0);
|
||||
}
|
||||
|
||||
function wireSelectionActions() {
|
||||
document.getElementById('notes-select-all').addEventListener('change', e => {
|
||||
if (e.target.checked) state.notes.forEach(n => app.selectId(n.id));
|
||||
else app.clearSelection();
|
||||
_renderNotes(); _updateBulkBar();
|
||||
});
|
||||
document.getElementById('notes-send-agent').addEventListener('click', operations.attachSelected);
|
||||
document.getElementById('notes-bulk-archive').addEventListener('click', operations.archiveSelected);
|
||||
document.getElementById('notes-bulk-delete').addEventListener('click', operations.deleteSelected);
|
||||
document.getElementById('notes-bulk-cancel').addEventListener('click', _exitSelectMode);
|
||||
}
|
||||
return { wireSelectionActions, _enterSelectMode, _exitSelectMode, _updateBulkBar };
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
/** Escaping, safe image sources and link rendering. */
|
||||
export function createText({
|
||||
uiModule
|
||||
}) {
|
||||
function _esc(s) { return uiModule.esc ? uiModule.esc(s || '') : (s || '').replace(/</g, '<').replace(/>/g, '>'); }
|
||||
|
||||
function _attrEsc(s) {
|
||||
return String(s || '')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/`/g, '`');
|
||||
}
|
||||
|
||||
function _safeImgSrc(s) {
|
||||
const v = (s || '').trim();
|
||||
if (!v) return '';
|
||||
if (v.startsWith('/') || v.startsWith('./') || v.startsWith('../')) return v;
|
||||
if (/^https?:\/\//i.test(v) || /^data:image\/(?:png|jpe?g|gif|webp);base64,/i.test(v)) return v;
|
||||
return '';
|
||||
}
|
||||
|
||||
function _linkify(s) {
|
||||
const escaped = _esc(s);
|
||||
const urlRe = /\b((?:https?:\/\/|www\.)[^\s<>"']+[^\s<>"'.,;:!?\]])/g;
|
||||
return escaped.replace(urlRe, (m) => {
|
||||
let url = m;
|
||||
// Trim a trailing ')' that doesn't have a matching '(' inside the URL
|
||||
if (url.endsWith(')') && (url.match(/\(/g) || []).length < (url.match(/\)/g) || []).length) {
|
||||
url = url.slice(0, -1);
|
||||
}
|
||||
const href = url.startsWith('www.') ? `https://${url}` : url;
|
||||
return `<a href="${_attrEsc(href)}" class="note-link" target="_blank" rel="noopener noreferrer" onclick="event.stopPropagation()">${url}</a>` + (url !== m ? m.slice(url.length) : '');
|
||||
});
|
||||
}
|
||||
|
||||
return { _esc, _attrEsc, _safeImgSrc, _linkify };
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
/** Panel search, archive and list/grid controls. */
|
||||
export function createToolbar({
|
||||
app,
|
||||
state,
|
||||
persistence,
|
||||
_renderNotes,
|
||||
_fetchNotes,
|
||||
_applyMasonry
|
||||
}) {
|
||||
function wireToolbar(pane) {
|
||||
// Search
|
||||
const searchEl = document.getElementById('notes-search');
|
||||
if (searchEl) {
|
||||
searchEl.addEventListener('input', () => {
|
||||
app.setSearchQuery(searchEl.value.trim().toLowerCase());
|
||||
_renderNotes();
|
||||
});
|
||||
}
|
||||
|
||||
// View toggle
|
||||
const archiveBtn = document.getElementById('notes-archive-toggle');
|
||||
if (archiveBtn) {
|
||||
const ARCHIVE_ICON = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="5" rx="1"/><path d="M4 8v11a2 2 0 002 2h12a2 2 0 002-2V8"/><path d="M10 12h4"/></svg><span class="notes-header-btn-label">Archive</span>';
|
||||
const CLOSE_ICON = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg><span class="notes-header-btn-label">Archive</span>';
|
||||
const syncArchiveBtn = () => {
|
||||
archiveBtn.classList.toggle('active', state.showingArchived);
|
||||
archiveBtn.title = state.showingArchived ? 'Exit archive' : 'View archive';
|
||||
archiveBtn.style.opacity = state.showingArchived ? '1' : '0.8';
|
||||
// Swap to an X while in archive view so it doubles as a close-back-
|
||||
// to-active-notes toggle.
|
||||
archiveBtn.innerHTML = state.showingArchived ? CLOSE_ICON : ARCHIVE_ICON;
|
||||
// Tint the whole pane so it's obvious you're not in the active list.
|
||||
pane.classList.toggle('notes-pane-archive', state.showingArchived);
|
||||
};
|
||||
syncArchiveBtn();
|
||||
archiveBtn.addEventListener('click', async () => {
|
||||
app.setShowingArchived(!state.showingArchived);
|
||||
app.clearSelection();
|
||||
syncArchiveBtn();
|
||||
// Brief fade so the body content swap doesn't snap : the bg-tint
|
||||
// change is already eased by CSS transitions on .notes-pane*.
|
||||
const _bodyEl = document.querySelector('#notes-pane .notes-pane-body');
|
||||
if (_bodyEl) {
|
||||
_bodyEl.style.transition = 'opacity 0.18s ease';
|
||||
_bodyEl.style.opacity = '0.25';
|
||||
}
|
||||
await _fetchNotes();
|
||||
_renderNotes();
|
||||
if (_bodyEl) {
|
||||
requestAnimationFrame(() => {
|
||||
_bodyEl.style.opacity = '';
|
||||
_bodyEl.addEventListener('transitionend', () => { _bodyEl.style.transition = ''; }, { once: true });
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
const viewBtn = document.getElementById('notes-view-toggle');
|
||||
if (viewBtn) {
|
||||
pane.classList.toggle('notes-view-grid', state.viewMode === 'grid');
|
||||
// Label shows what you'll switch TO : "Grid" while in list, "List" while in grid.
|
||||
const _setViewLabel = () => {
|
||||
const lbl = viewBtn.querySelector('.notes-header-btn-label');
|
||||
if (lbl) lbl.textContent = state.viewMode === 'grid' ? 'List' : 'Grid';
|
||||
};
|
||||
_setViewLabel();
|
||||
requestAnimationFrame(() => _applyMasonry(document.querySelector('#notes-pane .notes-pane-body')));
|
||||
viewBtn.addEventListener('click', () => {
|
||||
app.setViewMode(state.viewMode === 'grid' ? 'list' : 'grid');
|
||||
try { persistence.setItem('odysseus-notes-view', state.viewMode); } catch {}
|
||||
pane.classList.toggle('notes-view-grid', state.viewMode === 'grid');
|
||||
_setViewLabel();
|
||||
requestAnimationFrame(() => _applyMasonry(document.querySelector('#notes-pane .notes-pane-body')));
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
return { wireToolbar };
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
/** Shared-window integration: safe fullscreen bounds, docking and stacking. */
|
||||
export function createWindowLayout({
|
||||
makeWindowDraggable,
|
||||
snapModalToZone,
|
||||
clearDockSide,
|
||||
applyEdgeDock,
|
||||
topToolWindowZ
|
||||
}) {
|
||||
function _notesFullscreenSafeRect() {
|
||||
const vw = window.innerWidth || document.documentElement.clientWidth || 0;
|
||||
const vh = window.innerHeight || document.documentElement.clientHeight || 0;
|
||||
let left = 0;
|
||||
let right = vw;
|
||||
|
||||
const sidebar = document.getElementById('sidebar');
|
||||
const rail = document.getElementById('icon-rail');
|
||||
const hamburgerRight = document.body.classList.contains('hamburger-right')
|
||||
|| sidebar?.classList.contains('right-side')
|
||||
|| rail?.classList.contains('right-side');
|
||||
|
||||
const reserve = (el) => {
|
||||
if (!el || getComputedStyle(el).display === 'none') return;
|
||||
const rect = el.getBoundingClientRect();
|
||||
if (rect.width <= 0 || rect.height <= 0) return;
|
||||
if (hamburgerRight) right = Math.min(right, rect.left);
|
||||
else left = Math.max(left, rect.right);
|
||||
};
|
||||
|
||||
if (sidebar && !sidebar.classList.contains('hidden')) reserve(sidebar);
|
||||
reserve(rail);
|
||||
|
||||
// The fixed hamburger can remain visible even when the rail/sidebar is
|
||||
// collapsed. Reserve its strip too so fullscreen Notes does not sit beneath it.
|
||||
const hamburger = document.getElementById('hamburger-btn');
|
||||
if (hamburger && getComputedStyle(hamburger).display !== 'none') {
|
||||
const rect = hamburger.getBoundingClientRect();
|
||||
const pad = 8;
|
||||
if (hamburgerRight) right = Math.min(right, rect.left - pad);
|
||||
else left = Math.max(left, rect.right + pad);
|
||||
}
|
||||
|
||||
left = Math.max(0, Math.min(left, vw - 80));
|
||||
right = Math.max(left + 80, Math.min(right, vw));
|
||||
return { left, top: 0, width: right - left, height: vh };
|
||||
}
|
||||
|
||||
function _wireNotesWindow(pane) {
|
||||
if (!pane || pane.dataset.windowDragWired === '1') return;
|
||||
const header = pane.querySelector('.notes-pane-header');
|
||||
if (!header) return;
|
||||
pane.dataset.windowDragWired = '1';
|
||||
makeWindowDraggable(pane, {
|
||||
content: pane,
|
||||
header,
|
||||
fsClass: 'notes-window-fullscreen',
|
||||
skipSelector: 'button, input, select, textarea, label, .notes-mobile-grabber',
|
||||
enableDock: true,
|
||||
enableLeftDock: true,
|
||||
onEnterFullscreen: () => {
|
||||
pane.classList.add('notes-window-fullscreen');
|
||||
snapModalToZone(pane, {
|
||||
name: 'fullscreen',
|
||||
rect: _notesFullscreenSafeRect(),
|
||||
});
|
||||
},
|
||||
onExitFullscreen: () => {
|
||||
_restoreNotesSidebarDock(pane);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function _clearNotesSnapStyles(pane) {
|
||||
if (!pane) return;
|
||||
const hadLeft = pane.classList.contains('modal-left-docked');
|
||||
const hadRight = pane.classList.contains('modal-right-docked');
|
||||
pane.classList.remove('notes-window-fullscreen', 'modal-left-docked', 'modal-right-docked');
|
||||
if (hadLeft) clearDockSide('left', pane);
|
||||
if (hadRight) clearDockSide('right', pane);
|
||||
['position', 'left', 'top', 'right', 'bottom', 'width', 'max-width', 'height',
|
||||
'max-height', 'margin', 'transform', 'border-radius']
|
||||
.forEach((prop) => pane.style.removeProperty(prop));
|
||||
delete pane.dataset._tilePreSnap;
|
||||
delete pane.dataset._tileZone;
|
||||
delete pane._preDockSnapshot;
|
||||
delete pane._dockSide;
|
||||
delete pane._dockSuspended;
|
||||
}
|
||||
|
||||
function _restoreNotesSidebarDock(pane) {
|
||||
if (!pane || window.innerWidth <= 768) return;
|
||||
_clearNotesSnapStyles(pane);
|
||||
if (!pane.isConnected) return;
|
||||
applyEdgeDock(pane, 'right');
|
||||
}
|
||||
|
||||
function _topToolWindowZ(exclude = null) {
|
||||
return topToolWindowZ({ exclude });
|
||||
}
|
||||
|
||||
function _bringNotesToFront(pane = document.getElementById('notes-pane')) {
|
||||
if (!pane) return;
|
||||
const backdrop = document.getElementById('notes-pane-backdrop') || pane.parentElement;
|
||||
const z = _topToolWindowZ(backdrop) + 1;
|
||||
if (backdrop) backdrop.style.setProperty('z-index', String(z), 'important');
|
||||
try {
|
||||
window.dispatchEvent(new CustomEvent('odysseus:modal-opened', {
|
||||
detail: { id: 'notes-panel', modal: pane },
|
||||
}));
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
|
||||
return { _wireNotesWindow, _restoreNotesSidebarDock, _bringNotesToFront };
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"private": true,
|
||||
"type": "module"
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
/** Stable semantic ordering for item-level action menus. */
|
||||
const COMMON_ACTION_ORDER = [
|
||||
{ rank: 200, pattern: /^(rename|change name)\b/i },
|
||||
{ rank: 650, pattern: /^select\b/i },
|
||||
{ rank: 400, pattern: /^(favorite|unfavorite|favourite|unfavourite|pin|unpin)\b/i },
|
||||
{ rank: 500, pattern: /^(copy|clone|duplicate)\b/i },
|
||||
{ rank: 550, pattern: /^(export|download)\b/i },
|
||||
{ rank: 900, pattern: /^(delete|remove|hide|dismiss|clear from list|move to trash|move to spam)\b/i },
|
||||
{ rank: 700, pattern: /^(move to archive|archive|unarchive|restore)\b/i },
|
||||
{ rank: 600, pattern: /^(move(?! to (?:archive|trash|spam)\b)|add to folder)\b/i },
|
||||
{ rank: 1000, pattern: /^cancel\b/i },
|
||||
];
|
||||
|
||||
// Canonical Select glyph for item-level menus. Toolbar toggles may use the
|
||||
// smaller version, but dropdown rows should all use this exact SVG.
|
||||
export const SELECT_MENU_ICON = '<svg class="memory-select-btn-icon" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="12" r="3" fill="currentColor" stroke="none"/></svg>';
|
||||
|
||||
export function actionMenuRank(item) {
|
||||
if (Number.isFinite(item?.menuOrder)) return item.menuOrder;
|
||||
const value = String(typeof item?.action === 'string' ? item.action : (item?.label || '')).trim();
|
||||
return COMMON_ACTION_ORDER.find(entry => entry.pattern.test(value))?.rank ?? 100;
|
||||
}
|
||||
|
||||
export function orderActionMenuItems(items) {
|
||||
return items
|
||||
.map((item, index) => ({ item, index, rank: actionMenuRank(item) }))
|
||||
.sort((a, b) => a.rank - b.rank || a.index - b.index)
|
||||
.map(entry => entry.item);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
/** Stateless celebration renderer shared by Notes and Compare. */
|
||||
export function spawnConfetti(cx, cy, count) {
|
||||
const colors = ['#ffd700', '#ff6b6b', '#5b8def', '#51cf66', '#ff922b', '#cc5de8', '#22b8cf', '#fff'];
|
||||
for (let i = 0; i < count; i++) {
|
||||
const el = document.createElement('div');
|
||||
el.className = 'confetti-piece';
|
||||
const color = colors[Math.floor(Math.random() * colors.length)];
|
||||
const size = 5 + Math.random() * 8;
|
||||
const isCircle = Math.random() > 0.5;
|
||||
el.style.width = size + 'px';
|
||||
el.style.height = (isCircle ? size : size * 0.6) + 'px';
|
||||
el.style.background = color;
|
||||
el.style.borderRadius = isCircle ? '50%' : '2px';
|
||||
el.style.left = cx + 'px';
|
||||
el.style.top = cy + 'px';
|
||||
const angle = Math.random() * Math.PI * 2;
|
||||
const speed = 60 + Math.random() * 160;
|
||||
const dx = Math.cos(angle) * speed;
|
||||
const dy = Math.sin(angle) * speed - 100;
|
||||
const duration = 1.0 + Math.random() * 1.0;
|
||||
el.animate([
|
||||
{ transform: 'translate(0, 0) rotate(0deg) scale(1)', opacity: 1 },
|
||||
{ transform: `translate(${dx}px, ${dy + 200}px) rotate(${400 + Math.random() * 400}deg) scale(0)`, opacity: 0 }
|
||||
], { duration: duration * 1000, easing: 'cubic-bezier(0.15, 0.6, 0.35, 1)', fill: 'forwards' });
|
||||
document.body.appendChild(el);
|
||||
setTimeout(() => el.remove(), duration * 1000 + 50);
|
||||
}
|
||||
}
|
||||
@@ -139,6 +139,7 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
|
||||
# Save to gallery
|
||||
try:
|
||||
from src.database import SessionLocal, GalleryImage
|
||||
owner = str(arguments.get("_odysseus_owner") or "").strip() or None
|
||||
db = SessionLocal()
|
||||
db.add(GalleryImage(
|
||||
id=str(uuid.uuid4()),
|
||||
@@ -147,9 +148,16 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
|
||||
model=model_id,
|
||||
size=size,
|
||||
quality=payload.get("quality", "medium"),
|
||||
owner=owner,
|
||||
))
|
||||
db.commit()
|
||||
db.close()
|
||||
if owner:
|
||||
try:
|
||||
from src.generated_images import register_generated_image
|
||||
register_generated_image(filename, owner)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
Generated
+15
-1
@@ -7,7 +7,8 @@
|
||||
"name": "odysseus",
|
||||
"devDependencies": {
|
||||
"@antithesishq/bombadil": "^0.7.0",
|
||||
"@playwright/test": "^1.62.1"
|
||||
"@playwright/test": "^1.62.1",
|
||||
"acorn": "8.19.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@antithesishq/bombadil": {
|
||||
@@ -36,6 +37,19 @@
|
||||
"node": ">=20"
|
||||
}
|
||||
},
|
||||
"node_modules/acorn": {
|
||||
"version": "8.19.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.19.0.tgz",
|
||||
"integrity": "sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"acorn": "bin/acorn"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/fsevents": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||
|
||||
+2
-1
@@ -13,6 +13,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antithesishq/bombadil": "^0.7.0",
|
||||
"@playwright/test": "^1.62.1"
|
||||
"@playwright/test": "^1.62.1",
|
||||
"acorn": "8.19.0"
|
||||
}
|
||||
}
|
||||
|
||||
+25
-25
@@ -15,6 +15,7 @@ from pathlib import Path
|
||||
from core.atomic_io import atomic_write_json, atomic_write_text
|
||||
from core.auth import AuthManager, RESERVED_USERNAMES, SetAdminResult, TOKEN_TTL
|
||||
from src.constants import DEEP_RESEARCH_DIR, MEMORY_FILE, PASSWORD_MIN_LENGTH, SKILLS_DIR
|
||||
from src.auth_helpers import _auth_disabled
|
||||
from src.rate_limiter import RateLimiter
|
||||
from src.settings_scrub import scrub_settings
|
||||
from src.settings import (
|
||||
@@ -129,6 +130,21 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
token = request.cookies.get(SESSION_COOKIE)
|
||||
return auth_manager.get_username_for_token(token)
|
||||
|
||||
def _require_admin_user(request: Request) -> Optional[str]:
|
||||
"""Resolve the current user, enforcing admin access.
|
||||
|
||||
Honors AUTH_ENABLED=false the same way core.middleware.require_admin
|
||||
does: when the operator has explicitly disabled auth (e.g. behind a
|
||||
reverse proxy that handles login), there is no session user, and
|
||||
admin-gated app configuration must stay reachable.
|
||||
"""
|
||||
user = _get_current_user(request)
|
||||
if _auth_disabled():
|
||||
return user
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
return user
|
||||
|
||||
@router.post("/setup")
|
||||
async def first_run_setup(body: SetupRequest, request: Request):
|
||||
"""Create initial admin account. Only works if no accounts exist."""
|
||||
@@ -718,9 +734,7 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
@router.post("/features")
|
||||
async def set_features(request: Request):
|
||||
"""Admin only: update feature toggles."""
|
||||
user = _get_current_user(request)
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
_require_admin_user(request)
|
||||
body = await request.json()
|
||||
current = _load_features()
|
||||
for key in current:
|
||||
@@ -738,16 +752,14 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
for keybinds + TTS prefs, so it stays callable without admin."""
|
||||
user = _get_current_user(request)
|
||||
settings = without_retired_settings(_load_settings())
|
||||
if user and auth_manager.is_admin(user):
|
||||
if _auth_disabled() or (user and auth_manager.is_admin(user)):
|
||||
return settings
|
||||
return scrub_settings(settings)
|
||||
|
||||
@router.post("/settings")
|
||||
async def set_settings(request: Request):
|
||||
"""Admin only: update app settings."""
|
||||
user = _get_current_user(request)
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
_require_admin_user(request)
|
||||
body = await request.json()
|
||||
current = _load_settings()
|
||||
# Per-key validation for numeric settings: coerce to int and clamp to a
|
||||
@@ -780,9 +792,7 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
file: UploadFile = File(...),
|
||||
):
|
||||
"""Infer the general prose style from one user-supplied document."""
|
||||
user = _get_current_user(request)
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
user = _require_admin_user(request)
|
||||
filename = Path(file.filename or "sample.txt").name
|
||||
suffix = Path(filename).suffix.lower()
|
||||
allowed = {
|
||||
@@ -861,9 +871,7 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
@router.get("/integrations")
|
||||
async def list_integrations_route(request: Request):
|
||||
"""List all integrations (admin only, keys masked)."""
|
||||
user = _get_current_user(request)
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
_require_admin_user(request)
|
||||
items = load_integrations()
|
||||
# Mask API keys for frontend display
|
||||
safe = [mask_integration_secret(item) for item in items]
|
||||
@@ -877,9 +885,7 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
@router.post("/integrations")
|
||||
async def create_integration(request: Request):
|
||||
"""Create a new integration (admin only)."""
|
||||
user = _get_current_user(request)
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
_require_admin_user(request)
|
||||
body = await request.json()
|
||||
item = add_integration(body)
|
||||
return {"ok": True, "integration": mask_integration_secret(item)}
|
||||
@@ -887,9 +893,7 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
@router.put("/integrations/{integration_id}")
|
||||
async def update_integration_route(integration_id: str, request: Request):
|
||||
"""Update an existing integration (admin only)."""
|
||||
user = _get_current_user(request)
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
_require_admin_user(request)
|
||||
body = await request.json()
|
||||
item = update_integration(integration_id, body)
|
||||
if not item:
|
||||
@@ -899,9 +903,7 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
@router.delete("/integrations/{integration_id}")
|
||||
async def delete_integration_route(integration_id: str, request: Request):
|
||||
"""Delete an integration (admin only)."""
|
||||
user = _get_current_user(request)
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
_require_admin_user(request)
|
||||
ok = delete_integration(integration_id)
|
||||
if not ok:
|
||||
raise HTTPException(404, "Integration not found")
|
||||
@@ -910,9 +912,7 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
|
||||
@router.post("/integrations/{integration_id}/test")
|
||||
async def test_integration_route(integration_id: str, request: Request):
|
||||
"""Test connectivity to an integration (admin only)."""
|
||||
user = _get_current_user(request)
|
||||
if not user or not auth_manager.is_admin(user):
|
||||
raise HTTPException(403, "Admin only")
|
||||
_require_admin_user(request)
|
||||
integ = get_integration(integration_id)
|
||||
if not integ:
|
||||
raise HTTPException(404, "Integration not found")
|
||||
|
||||
@@ -551,6 +551,7 @@ async def auto_name_session(session_manager, sess):
|
||||
try:
|
||||
from src.llm_core import llm_call_async
|
||||
from src.task_endpoint import resolve_task_endpoint
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
# Find first user message
|
||||
first_msg = ""
|
||||
@@ -603,6 +604,7 @@ async def auto_name_session(session_manager, sess):
|
||||
max_tokens=64,
|
||||
headers=t_headers,
|
||||
timeout=15,
|
||||
reasoning_effort=effort_for_call(t_url, t_model, owner, sess),
|
||||
)
|
||||
|
||||
title = title.strip().strip('"\'').strip()
|
||||
@@ -1010,6 +1012,7 @@ async def build_chat_context(
|
||||
chat_processor,
|
||||
message: str,
|
||||
session_id: str,
|
||||
selected_notes_context: str | None = None,
|
||||
preset_id=None,
|
||||
att_ids: list = None,
|
||||
use_web=None,
|
||||
@@ -1182,6 +1185,23 @@ async def build_chat_context(
|
||||
if search_context and allow_tool_preprocessing and not casual_low_signal:
|
||||
preface.append(untrusted_context_message("prefetched search context", search_context))
|
||||
|
||||
# Inject selected notes as context
|
||||
if selected_notes_context:
|
||||
selected_notes_context = (
|
||||
"The following selected notes and todos are reference context explicitly chosen "
|
||||
"by the user. Use them directly when relevant to the user's request. Do not "
|
||||
"ask for permission to use this context, and do not call note-management "
|
||||
"tools just to retrieve the same notes; use those tools only for a requested "
|
||||
"change or when this context is insufficient.\n\n"
|
||||
+ selected_notes_context
|
||||
)
|
||||
preface.append(
|
||||
untrusted_context_message(
|
||||
"Selected notes and todos",
|
||||
selected_notes_context,
|
||||
)
|
||||
)
|
||||
|
||||
# YouTube transcripts
|
||||
for transcript in preprocessed.youtube_transcripts:
|
||||
preface.append(untrusted_context_message("youtube transcript", transcript))
|
||||
|
||||
+82
-1
@@ -58,7 +58,7 @@ from src.auth_helpers import (
|
||||
from routes.session_routes import _verify_session_owner
|
||||
from routes.document_helpers import _owner_session_filter
|
||||
from core.database import SessionLocal, get_session_mode, set_session_mode
|
||||
from core.database import Session as DBSession, ChatMessage as DBChatMessage
|
||||
from core.database import Session as DBSession, ChatMessage as DBChatMessage, Note
|
||||
from core.database import Document as DBDocument, ModelEndpoint
|
||||
from core.log_safety import redact_url
|
||||
from routes.research_routes import _resolve_research_endpoint
|
||||
@@ -2153,6 +2153,68 @@ def _set_user_time_from_request(request: Request) -> None:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def _parse_selected_note_ids(raw) -> list[str]:
|
||||
"""Validate user-selected Note IDs before passing them to SQLAlchemy."""
|
||||
if raw is None or raw == "":
|
||||
return []
|
||||
if not isinstance(raw, str) or len(raw) > 8192:
|
||||
raise HTTPException(400, "Invalid selected_note_ids payload")
|
||||
try:
|
||||
parsed = json.loads(raw)
|
||||
except (TypeError, ValueError) as exc:
|
||||
raise HTTPException(400, "Invalid selected_note_ids JSON") from exc
|
||||
if (
|
||||
not isinstance(parsed, list)
|
||||
or len(parsed) > 50
|
||||
or any(
|
||||
not isinstance(note_id, str)
|
||||
or not note_id.strip()
|
||||
or len(note_id) > 128
|
||||
for note_id in parsed
|
||||
)
|
||||
):
|
||||
raise HTTPException(400, "selected_note_ids must be an array of up to 50 non-empty string IDs")
|
||||
return list(dict.fromkeys(parsed))
|
||||
|
||||
|
||||
def _format_selected_notes_context(notes) -> str:
|
||||
"""Format selected Notes/Todos as reference context for the model."""
|
||||
sections = []
|
||||
|
||||
for index, note in enumerate(notes, start=1):
|
||||
lines = [
|
||||
f"--- Selected Note {index} ---",
|
||||
f"Title: {note.title or '(untitled)'}",
|
||||
f"Type: {note.note_type or 'note'}",
|
||||
]
|
||||
|
||||
if note.content:
|
||||
lines.extend([
|
||||
"Content:",
|
||||
str(note.content),
|
||||
])
|
||||
|
||||
if note.items:
|
||||
try:
|
||||
items = json.loads(note.items)
|
||||
except (TypeError, json.JSONDecodeError):
|
||||
items = []
|
||||
|
||||
if isinstance(items, list):
|
||||
lines.append("Items:")
|
||||
for item in items:
|
||||
if not isinstance(item, dict):
|
||||
continue
|
||||
|
||||
status = "done" if item.get("done") else "pending"
|
||||
text = str(item.get("text") or "").strip()
|
||||
|
||||
if text:
|
||||
lines.append(f"- [{status}] {text}")
|
||||
|
||||
sections.append("\n".join(lines))
|
||||
|
||||
return "\n\n".join(sections)
|
||||
|
||||
def _resolve_prompt_thinking_mode(explicit_mode, preset_id, preset_manager):
|
||||
"""Use an explicit request override, then fall back to the active preset."""
|
||||
@@ -2423,6 +2485,8 @@ def setup_chat_routes(
|
||||
form_data = await request.form()
|
||||
message = form_data.get("message")
|
||||
session = form_data.get("session")
|
||||
selected_note_ids = _parse_selected_note_ids(form_data.get("selected_note_ids"))
|
||||
|
||||
attachments = form_data.get("attachments")
|
||||
use_web = form_data.get("use_web")
|
||||
use_research = form_data.get("use_research")
|
||||
@@ -2730,6 +2794,22 @@ def setup_chat_routes(
|
||||
current_rejected=workspace_rejected,
|
||||
)
|
||||
owner = effective_user(request)
|
||||
selected_notes = []
|
||||
if selected_note_ids:
|
||||
notes_db = SessionLocal()
|
||||
try:
|
||||
selected_notes = (
|
||||
notes_db.query(Note)
|
||||
.filter(
|
||||
Note.id.in_(selected_note_ids),
|
||||
Note.owner == owner,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
finally:
|
||||
notes_db.close()
|
||||
selected_notes_context = _format_selected_notes_context(selected_notes)
|
||||
|
||||
if tool_approval_id:
|
||||
_reject_delegated_tool_approval(request)
|
||||
from src.agent_runtime.authority import require_user_approval_request
|
||||
@@ -3001,6 +3081,7 @@ def setup_chat_routes(
|
||||
sess, request, chat_handler, chat_processor,
|
||||
message=message,
|
||||
session_id=session,
|
||||
selected_notes_context=selected_notes_context,
|
||||
preset_id=preset_id,
|
||||
att_ids=att_ids,
|
||||
use_web=use_web,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+19
-153
@@ -17,8 +17,6 @@ import base64
|
||||
import time
|
||||
import imaplib
|
||||
import smtplib
|
||||
import socket
|
||||
import ssl
|
||||
import email as email_mod
|
||||
import email.header
|
||||
import email.utils
|
||||
@@ -38,7 +36,6 @@ from typing import Optional, List
|
||||
|
||||
from src.auth_helpers import _auth_disabled, get_current_user
|
||||
from src.secret_storage import decrypt as _decrypt
|
||||
from src.url_safety import OutboundAddressBlocked, connect_outbound_tcp
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -163,94 +160,6 @@ def _smtp_security_mode(cfg: dict) -> str:
|
||||
return "ssl"
|
||||
|
||||
|
||||
# Raised when a mail host resolves into a denied range (see _mail_private_blocked).
|
||||
MailServerAddressBlocked = OutboundAddressBlocked
|
||||
|
||||
|
||||
def _mail_private_blocked(owner: str | None) -> bool:
|
||||
"""Whether private/loopback/shared mail destinations are denied for *owner*.
|
||||
|
||||
Link-local (cloud metadata), multicast, reserved and unspecified addresses
|
||||
are always denied (src/url_safety.py). Private ranges are where a mail
|
||||
tester or saved account becomes an internal-network probe, so they are
|
||||
only allowed for an admin or in single-user mode (AUTH_ENABLED=false), the
|
||||
same principals trusted with host-level tools. Operators of multi-user
|
||||
deployments with a LAN mail server opt in with EMAIL_ALLOW_PRIVATE_IPS=true;
|
||||
EMAIL_BLOCK_PRIVATE_IPS=true denies private ranges for everyone.
|
||||
"""
|
||||
if os.getenv("EMAIL_BLOCK_PRIVATE_IPS", "").strip().lower() == "true":
|
||||
return True
|
||||
if os.getenv("EMAIL_ALLOW_PRIVATE_IPS", "").strip().lower() == "true":
|
||||
return False
|
||||
from src.tool_security import owner_is_admin_or_single_user
|
||||
|
||||
return not owner_is_admin_or_single_user((owner or "").strip() or None)
|
||||
|
||||
|
||||
def _mail_socket_timeout(timeout):
|
||||
return socket._GLOBAL_DEFAULT_TIMEOUT if timeout is None else timeout
|
||||
|
||||
|
||||
class _PolicyIMAP4(imaplib.IMAP4):
|
||||
"""IMAP4 whose socket comes from connect_outbound_tcp.
|
||||
|
||||
The mail host is resolved once and connected to only at the addresses the
|
||||
address policy approved, so DNS rebinding between check and connect is
|
||||
impossible. STARTTLS still verifies against ``self.host``.
|
||||
"""
|
||||
|
||||
def __init__(self, host, port, *, block_private: bool, timeout=None):
|
||||
self._block_private = block_private
|
||||
super().__init__(host, port, timeout=timeout)
|
||||
|
||||
def _create_socket(self, timeout):
|
||||
if timeout is not None and not timeout:
|
||||
raise ValueError("Non-blocking socket (timeout=0) is not supported")
|
||||
return connect_outbound_tcp(
|
||||
self.host, self.port, timeout=_mail_socket_timeout(timeout), block_private=self._block_private,
|
||||
)
|
||||
|
||||
|
||||
class _PolicyIMAP4_SSL(imaplib.IMAP4_SSL):
|
||||
"""IMAP4_SSL over a policy-checked socket; TLS SNI/verification use the hostname."""
|
||||
|
||||
def __init__(self, host, port, *, block_private: bool, timeout=None, ssl_context=None):
|
||||
self._block_private = block_private
|
||||
super().__init__(host, port, ssl_context=ssl_context, timeout=timeout)
|
||||
|
||||
def _create_socket(self, timeout):
|
||||
sock = _PolicyIMAP4._create_socket(self, timeout)
|
||||
return self.ssl_context.wrap_socket(sock, server_hostname=self.host)
|
||||
|
||||
|
||||
class _PolicySMTP(smtplib.SMTP):
|
||||
"""SMTP whose socket comes from connect_outbound_tcp (see _PolicyIMAP4)."""
|
||||
|
||||
def __init__(self, host="", port=0, *, block_private: bool, **kwargs):
|
||||
self._block_private = block_private
|
||||
super().__init__(host, port, **kwargs)
|
||||
|
||||
def _get_socket(self, host, port, timeout):
|
||||
if timeout is not None and not timeout:
|
||||
raise ValueError("Non-blocking socket (timeout=0) is not supported")
|
||||
return connect_outbound_tcp(
|
||||
host, port, timeout=timeout, block_private=self._block_private,
|
||||
source_address=self.source_address,
|
||||
)
|
||||
|
||||
|
||||
class _PolicySMTP_SSL(smtplib.SMTP_SSL):
|
||||
"""SMTP_SSL over a policy-checked socket; TLS SNI/verification use the hostname."""
|
||||
|
||||
def __init__(self, host="", port=0, *, block_private: bool, **kwargs):
|
||||
self._block_private = block_private
|
||||
super().__init__(host, port, **kwargs)
|
||||
|
||||
def _get_socket(self, host, port, timeout):
|
||||
sock = _PolicySMTP._get_socket(self, host, port, timeout)
|
||||
return self.context.wrap_socket(sock, server_hostname=self._host)
|
||||
|
||||
|
||||
def _send_smtp_message(cfg: dict, from_addr: str, recipients: list[str], message: str | bytes, timeout: int = 30) -> None:
|
||||
"""Send through SMTP using the configured transport security mode."""
|
||||
host = cfg["smtp_host"]
|
||||
@@ -269,15 +178,14 @@ def _send_smtp_message(cfg: dict, from_addr: str, recipients: list[str], message
|
||||
smtp.login(user, password)
|
||||
|
||||
security = _smtp_security_mode(cfg)
|
||||
block_private = _mail_private_blocked(cfg.get("owner"))
|
||||
|
||||
if security == "ssl":
|
||||
with _PolicySMTP_SSL(host, port, timeout=timeout, block_private=block_private) as smtp:
|
||||
with smtplib.SMTP_SSL(host, port, timeout=timeout) as smtp:
|
||||
_auth_smtp(smtp)
|
||||
smtp.sendmail(from_addr, recipients, message)
|
||||
return
|
||||
|
||||
with _PolicySMTP(host, port, timeout=timeout, block_private=block_private) as smtp:
|
||||
with smtplib.SMTP(host, port, timeout=timeout) as smtp:
|
||||
if security == "starttls":
|
||||
smtp.starttls()
|
||||
_auth_smtp(smtp)
|
||||
@@ -316,39 +224,6 @@ def _friendly_email_auth_error(protocol: str, host: str, error: object) -> str:
|
||||
return raw[:200]
|
||||
|
||||
|
||||
# Bound at import: callers (and tests) may swap out imaplib.IMAP4 itself.
|
||||
_IMAP_ABORT = imaplib.IMAP4.abort
|
||||
|
||||
|
||||
def _mail_connection_test_error(protocol: str, host: str, error: BaseException) -> str:
|
||||
"""User-facing result for a failed IMAP/SMTP connection test.
|
||||
|
||||
Transport failures are reported by category, never with the peer's own
|
||||
bytes: a non-mail service answering on the chosen host/port would
|
||||
otherwise have its banner echoed back (an internal-service fingerprinting
|
||||
oracle). Errors from a server that does speak the protocol (login/auth
|
||||
rejections) keep their text via _friendly_email_auth_error, since that is
|
||||
what the user needs to fix their settings.
|
||||
"""
|
||||
if isinstance(error, MailServerAddressBlocked):
|
||||
return f"{protocol} server address is not allowed by this server's network policy"
|
||||
if isinstance(error, (_IMAP_ABORT, smtplib.SMTPConnectError, smtplib.SMTPServerDisconnected)):
|
||||
return f"{protocol} server did not respond like an {protocol} server"
|
||||
if isinstance(error, ssl.SSLCertVerificationError):
|
||||
return f"{protocol} TLS certificate verification failed"
|
||||
if isinstance(error, ssl.SSLError):
|
||||
return f"{protocol} TLS handshake failed; check the port and security setting"
|
||||
if isinstance(error, (socket.timeout, TimeoutError)):
|
||||
return f"{protocol} connection timed out"
|
||||
if isinstance(error, ConnectionRefusedError):
|
||||
return f"{protocol} connection refused"
|
||||
if isinstance(error, socket.gaierror):
|
||||
return f"{protocol} server name could not be resolved"
|
||||
if isinstance(error, OSError) and not isinstance(error, smtplib.SMTPException):
|
||||
return f"{protocol} connection failed"
|
||||
return _friendly_email_auth_error(protocol, host, error)
|
||||
|
||||
|
||||
def _strip_think(text: str) -> str:
|
||||
"""Email-flavored think strip — thin wrapper over the central helper.
|
||||
|
||||
@@ -443,9 +318,11 @@ async def _generate_email_summary(
|
||||
headers: dict | None = None,
|
||||
max_tokens: int = 8192,
|
||||
timeout: int = 180,
|
||||
owner: str | None = None,
|
||||
) -> str:
|
||||
"""Generate an interactive email summary through the shared LLM adapter."""
|
||||
from src.llm_core import llm_call_async
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
raw = await llm_call_async(
|
||||
url=url,
|
||||
@@ -456,6 +333,7 @@ async def _generate_email_summary(
|
||||
headers=headers,
|
||||
timeout=timeout,
|
||||
workload="foreground",
|
||||
reasoning_effort=effort_for_call(url, model, owner),
|
||||
)
|
||||
return _normalize_email_summary(raw)
|
||||
|
||||
@@ -807,21 +685,18 @@ def _ensure_sender_signatures_table(conn):
|
||||
_lg.getLogger(__name__).warning(f"sender_signatures owner-migration skipped: {_mig_e}")
|
||||
|
||||
|
||||
def attachment_extract_dir(folder: str, uid: str, *, owner: str, account_id: str | None) -> Path:
|
||||
"""Containment-safe extraction directory for one message's attachments.
|
||||
def attachment_extract_dir(folder: str, uid: str) -> Path:
|
||||
"""Containment-safe extraction directory for an attachment.
|
||||
|
||||
IMAP UIDs are small per-mailbox counters, so `folder_uid` alone put every
|
||||
user's and every account's "INBOX 42" in one directory, where extractions
|
||||
overwrote each other by filename (a path handed to one user's agent could
|
||||
then hold another user's attachment). See src.mail_attachment_paths: the
|
||||
directory is keyed by (owner, account, folder, uid) and contained in
|
||||
ATTACHMENTS_DIR whatever `folder`/`uid` hold."""
|
||||
from src.mail_attachment_paths import attachment_scope_dir
|
||||
|
||||
try:
|
||||
return attachment_scope_dir(ATTACHMENTS_DIR, folder, uid, owner=owner, account_id=account_id)
|
||||
except ValueError:
|
||||
`folder` and `uid` are user-controlled (query/path params). Flatten them to
|
||||
a single safe path segment so a value like folder='../../tmp' can't escape
|
||||
ATTACHMENTS_DIR, then assert containment as belt-and-suspenders."""
|
||||
key = re.sub(r"[^A-Za-z0-9._-]", "_", f"{folder}_{uid}") or "_"
|
||||
target = (ATTACHMENTS_DIR / key).resolve()
|
||||
base = ATTACHMENTS_DIR.resolve()
|
||||
if target != base and base not in target.parents:
|
||||
raise HTTPException(400, "Invalid attachment location")
|
||||
return target
|
||||
|
||||
|
||||
def _init_scheduled_db():
|
||||
@@ -1202,8 +1077,6 @@ def _get_email_config(account_id: str | None = None, owner: str = "") -> dict:
|
||||
cfg = {
|
||||
"account_id": row.id,
|
||||
"account_name": row.name,
|
||||
# Principal for the outbound mail address policy.
|
||||
"owner": row.owner or owner or "",
|
||||
"smtp_host": row.smtp_host or "",
|
||||
"smtp_port": int(row.smtp_port or 465),
|
||||
"smtp_security": _smtp_security_mode({"smtp_security": getattr(row, "smtp_security", ""), "smtp_port": row.smtp_port}),
|
||||
@@ -1237,7 +1110,6 @@ def _get_email_config(account_id: str | None = None, owner: str = "") -> dict:
|
||||
cfg = {
|
||||
"account_id": resolved_id,
|
||||
"account_name": "legacy",
|
||||
"owner": owner or "",
|
||||
"smtp_host": settings.get("smtp_host", os.environ.get("SMTP_HOST", "")),
|
||||
"smtp_port": int(settings.get("smtp_port", os.environ.get("SMTP_PORT", "465")) or 465),
|
||||
"smtp_security": _smtp_security_mode({
|
||||
@@ -1301,16 +1173,11 @@ def _open_imap_connection(
|
||||
starttls: bool,
|
||||
timeout: int = _IMAP_TIMEOUT_SECONDS,
|
||||
ssl_context=None,
|
||||
owner: str | None = None,
|
||||
):
|
||||
"""Open an IMAP connection using the configured security mode.
|
||||
|
||||
`owner` is the principal the destination is judged for
|
||||
(see _mail_private_blocked)."""
|
||||
"""Open an IMAP connection using the configured security mode."""
|
||||
port = int(port or 993)
|
||||
block_private = _mail_private_blocked(owner)
|
||||
if starttls:
|
||||
conn = _PolicyIMAP4(host, port, timeout=timeout, block_private=block_private)
|
||||
conn = imaplib.IMAP4(host, port, timeout=timeout)
|
||||
try:
|
||||
if ssl_context:
|
||||
conn.starttls(ssl_context=ssl_context)
|
||||
@@ -1326,9 +1193,9 @@ def _open_imap_connection(
|
||||
raise
|
||||
elif port == 993:
|
||||
kwargs = {"ssl_context": ssl_context} if ssl_context else {}
|
||||
conn = _PolicyIMAP4_SSL(host, port, timeout=timeout, block_private=block_private, **kwargs)
|
||||
conn = imaplib.IMAP4_SSL(host, port, timeout=timeout, **kwargs)
|
||||
else:
|
||||
conn = _PolicyIMAP4(host, port, timeout=timeout, block_private=block_private)
|
||||
conn = imaplib.IMAP4(host, port, timeout=timeout)
|
||||
try:
|
||||
conn.sock.settimeout(timeout)
|
||||
except Exception:
|
||||
@@ -1368,7 +1235,6 @@ def _imap_connect(account_id: str | None = None, owner: str = "",
|
||||
cfg["imap_port"],
|
||||
starttls=bool(cfg.get("imap_starttls")),
|
||||
timeout=timeout,
|
||||
owner=cfg.get("owner"),
|
||||
)
|
||||
try:
|
||||
if cfg.get("oauth_provider") == "google":
|
||||
|
||||
@@ -1031,6 +1031,7 @@ async def _auto_summarize_pass_single(days_back: int = 1, account_id: str | None
|
||||
fallback_url=url, fallback_model=model, fallback_headers=headers,
|
||||
owner=account_owner or None,
|
||||
temperature=0.7, max_tokens=1024, timeout=90,
|
||||
reasoning_effort="",
|
||||
)
|
||||
reply = _apply_email_style_mechanics(_extract_reply(reply or ""))
|
||||
if reply:
|
||||
|
||||
+340
-227
@@ -36,10 +36,10 @@ from pathlib import Path
|
||||
from email.mime.text import MIMEText
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
|
||||
from starlette.concurrency import run_in_threadpool
|
||||
from fastapi import APIRouter, Query, UploadFile, File, BackgroundTasks, HTTPException, Depends, Request
|
||||
from fastapi.responses import FileResponse, StreamingResponse
|
||||
from src.constants import DATA_DIR
|
||||
from src import shutdown as _shutdown
|
||||
from src.path_confinement import confine
|
||||
|
||||
from src.llm_core import llm_call_async
|
||||
@@ -61,7 +61,6 @@ from .email_helpers import (
|
||||
_fetch_sender_thread_context, _pre_retrieve_context,
|
||||
_EMAIL_REPLY_SYS_PROMPT_BASE, _POOL_HOOKS,
|
||||
_friendly_email_auth_error, _email_summary_failure_log_detail,
|
||||
_mail_connection_test_error, _mail_private_blocked, _PolicySMTP, _PolicySMTP_SSL,
|
||||
_generate_email_summary, EMAIL_SUMMARY_ERROR_CODE, EMAIL_SUMMARY_ERROR_MESSAGE,
|
||||
SendEmailRequest, ExtractStyleRequest,
|
||||
ATTACHMENTS_DIR, COMPOSE_UPLOADS_DIR, SCHEDULED_DB,
|
||||
@@ -81,6 +80,7 @@ _SERVER_OWNED_OAUTH_FIELDS = {
|
||||
"oauth_refresh_token",
|
||||
"oauth_token_expiry",
|
||||
}
|
||||
_CACHE_HOOKS: dict = {"invalidate_list": None}
|
||||
|
||||
|
||||
def _normalized_mail_host(value) -> str:
|
||||
@@ -572,6 +572,23 @@ def _uid_exists(conn, uid: str, *, strict: bool = False) -> bool:
|
||||
return False
|
||||
|
||||
|
||||
def _uid_has_deleted_flag(conn, uid: str) -> bool:
|
||||
r"""Return True if message already carries \Deleted flag."""
|
||||
try:
|
||||
status, data = conn.uid("FETCH", _uid_bytes(uid), "(FLAGS)")
|
||||
if status == "OK" and data:
|
||||
for part in data:
|
||||
if not part:
|
||||
continue
|
||||
meta = part[0] if isinstance(part, tuple) else part
|
||||
meta_b = meta if isinstance(meta, bytes) else str(meta).encode()
|
||||
if rb"\Deleted" in meta_b:
|
||||
return True
|
||||
except Exception:
|
||||
pass
|
||||
return False
|
||||
|
||||
|
||||
def _resolve_current_email_uid(conn, uid: str, message_id: str | None = None) -> str:
|
||||
"""Resolve a stale cached UID by the message's stable RFC Message-ID."""
|
||||
uid = str(uid or "").strip()
|
||||
@@ -1525,44 +1542,6 @@ def _envelope_recipients(*fields: str) -> list:
|
||||
return out
|
||||
|
||||
|
||||
_MD_LINK_URL_RE = re.compile(r"\((https?://)[^)\s]*")
|
||||
|
||||
|
||||
def _md_links_to_html(s: str) -> str:
|
||||
"""Linear ``re.sub(r"\\[([^\\]]+)\\]\\((https?://[^)\\s]+)\\)", '<a href="\\2">\\1</a>', s)``.
|
||||
|
||||
Every `[` before the next `]` shares that `]`, so only the first can match;
|
||||
and when a URL runs into whitespace/end without `)`, every later `[` whose
|
||||
`]` also lies before that stop fails the same way. Skipping those spans
|
||||
keeps a `[[[` or `[a](http://x[a](http://x` flood O(n) instead of the
|
||||
regex's O(n^2).
|
||||
"""
|
||||
out: list[str] = []
|
||||
emitted = scan = 0
|
||||
while True:
|
||||
open_at = s.find("[", scan)
|
||||
if open_at < 0:
|
||||
break
|
||||
close_at = s.find("]", open_at + 1)
|
||||
if close_at < 0:
|
||||
break
|
||||
scan = close_at + 1
|
||||
if close_at == open_at + 1:
|
||||
continue
|
||||
url = _MD_LINK_URL_RE.match(s, close_at + 1)
|
||||
if url is None:
|
||||
continue
|
||||
end = url.end()
|
||||
if end < len(s) and s[end] == ")" and end > url.end(1):
|
||||
out.append(s[emitted:open_at])
|
||||
out.append(f'<a href="{s[url.start(1):end]}">{s[open_at + 1:close_at]}</a>')
|
||||
emitted = scan = end + 1
|
||||
elif end > url.end(1):
|
||||
scan = max(scan, s.rfind("]", scan, end) + 1)
|
||||
out.append(s[emitted:])
|
||||
return "".join(out)
|
||||
|
||||
|
||||
def _md_to_email_html(text: str) -> str:
|
||||
"""Render the compose markdown body to a SAFE HTML fragment for the email's
|
||||
text/html part. Everything is HTML-escaped FIRST (so a pasted <script> /
|
||||
@@ -1578,7 +1557,7 @@ def _md_to_email_html(text: str) -> str:
|
||||
s = re.sub(r"~~([^~]+)~~", r"<del>\1</del>", s)
|
||||
s = re.sub(r"`([^`]+)`", r"<code>\1</code>", s)
|
||||
# links: text + http(s) url only (escape() already neutralised quotes)
|
||||
s = _md_links_to_html(s)
|
||||
s = re.sub(r"\[([^\]]+)\]\((https?://[^)\s]+)\)", r'<a href="\2">\1</a>', s)
|
||||
return s
|
||||
|
||||
parts: list[str] = []
|
||||
@@ -1797,13 +1776,60 @@ def setup_email_routes():
|
||||
return None
|
||||
return v[1]
|
||||
|
||||
# Stale-while-revalidate snapshot store: a last-good list response per key
|
||||
# with NO TTL, so a list view can render instantly from a snapshot (or the
|
||||
# durable index) and refresh in the background instead of blocking ~2-5 s on
|
||||
# IMAP. Kept small and separate from the TTL cache so invalidation of the
|
||||
# fresh cache never removes the fallback snapshot.
|
||||
_LIST_STALE = {}
|
||||
|
||||
def _list_stale_get(key):
|
||||
return _LIST_STALE.get(key)
|
||||
|
||||
def _list_stale_put(key, value):
|
||||
_LIST_STALE[key] = value
|
||||
if len(_LIST_STALE) > 96:
|
||||
for k in list(_LIST_STALE.keys())[:-48]:
|
||||
_LIST_STALE.pop(k, None)
|
||||
|
||||
_LIST_REFRESHING = set()
|
||||
|
||||
def _list_cache_put(key, value):
|
||||
_LIST_CACHE[key] = (_time.monotonic() + _LIST_TTL, value)
|
||||
# Also snapshot the last-good response for stale-while-revalidate.
|
||||
_list_stale_put(key, value)
|
||||
# Cap size
|
||||
if len(_LIST_CACHE) > 64:
|
||||
for k in list(_LIST_CACHE.keys())[:-32]:
|
||||
_LIST_CACHE.pop(k, None)
|
||||
|
||||
def _schedule_list_refresh(sync_args, cache_key, folder, account_id, owner):
|
||||
"""Refresh a list snapshot off the event loop, at most once per key.
|
||||
|
||||
Runs the blocking IMAP fetch in a daemon thread, then repopulates both
|
||||
the TTL cache and the stale snapshot so the next list view is warm.
|
||||
"""
|
||||
if cache_key in _LIST_REFRESHING:
|
||||
return
|
||||
_LIST_REFRESHING.add(cache_key)
|
||||
|
||||
def _run():
|
||||
try:
|
||||
refreshed = _list_emails_sync(*sync_args)
|
||||
if refreshed and not refreshed.get("error"):
|
||||
_list_cache_put(cache_key, refreshed)
|
||||
try:
|
||||
_schedule_recent_email_warm(
|
||||
refreshed.get("emails") or [], folder, account_id, owner)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception as exc: # pragma: no cover - background best effort
|
||||
logger.debug("email list background refresh failed: %s", exc)
|
||||
finally:
|
||||
_LIST_REFRESHING.discard(cache_key)
|
||||
|
||||
_threading.Thread(target=_run, daemon=True, name="email-list-refresh").start()
|
||||
|
||||
def _folder_cache_get(account_id, owner):
|
||||
key = (account_id or "", owner or "")
|
||||
v = _FOLDER_CACHE.get(key)
|
||||
@@ -1831,6 +1857,12 @@ def setup_email_routes():
|
||||
delete, move) so the UI doesn't show stale read/unread counts for up to
|
||||
the 8s TTL after a manual flag change. With no args, clears everything.
|
||||
"""
|
||||
hook = _CACHE_HOOKS.get("invalidate_list")
|
||||
if hook:
|
||||
try:
|
||||
hook(account_id, folder)
|
||||
except Exception:
|
||||
pass
|
||||
if account_id is None and folder is None:
|
||||
_LIST_CACHE.clear()
|
||||
return
|
||||
@@ -2824,6 +2856,46 @@ def setup_email_routes():
|
||||
owner, account_id or "", folder, filter, limit, offset, elapsed_ms,
|
||||
)
|
||||
return cached
|
||||
# Stale-while-revalidate: never block a plain list view on IMAP while
|
||||
# we already hold a recent snapshot or a durable index. Serve it now
|
||||
# with a `stale` marker and refresh in the background so the next view
|
||||
# is warm. Blocking IMAP only remains for a genuine cold start with no
|
||||
# snapshot and no indexed rows (e.g. a brand-new account/folder).
|
||||
if not from_addr and not has_attachments and not (date_from or date_to):
|
||||
snapshot = _list_stale_get(ck)
|
||||
if snapshot is None:
|
||||
try:
|
||||
indexed_emails, indexed_total, indexed_at = _email_index_list(
|
||||
owner, account_id, folder, filter, limit, offset, False,
|
||||
)
|
||||
except Exception:
|
||||
indexed_emails, indexed_total, indexed_at = [], 0, None
|
||||
if indexed_total:
|
||||
snapshot = {
|
||||
"emails": indexed_emails,
|
||||
"total": indexed_total,
|
||||
"folder": folder,
|
||||
"offset": offset,
|
||||
"sync": {
|
||||
"source": "index",
|
||||
"indexed": indexed_total,
|
||||
"updated_at": indexed_at,
|
||||
},
|
||||
}
|
||||
if snapshot is not None:
|
||||
payload = dict(snapshot)
|
||||
payload["emails"] = list(payload.get("emails") or [])
|
||||
_hide_unlinked_calendar_tags(payload["emails"])
|
||||
sync_meta = dict(payload.get("sync") or {})
|
||||
sync_meta["source"] = "cache_stale" if _list_stale_get(ck) is not None else "index"
|
||||
sync_meta["stale"] = True
|
||||
payload["sync"] = sync_meta
|
||||
_schedule_list_refresh(
|
||||
(folder, limit, offset, filter, account_id, from_addr,
|
||||
bool(has_attachments), owner, True, date_from or "", date_to or ""),
|
||||
ck, folder, account_id, owner,
|
||||
)
|
||||
return payload
|
||||
result = await _asyncio.to_thread(
|
||||
_list_emails_sync, folder, limit, offset, filter, account_id, from_addr,
|
||||
bool(has_attachments), owner, manual_refresh, date_from or "", date_to or "",
|
||||
@@ -3940,7 +4012,7 @@ def setup_email_routes():
|
||||
_row, att = fixture_att
|
||||
filename = str(att.get("filename") or f"attachment-{index}.txt")
|
||||
safe_name = re.sub(r"[^\w\s\-.]", "_", filename).strip() or f"attachment-{index}.txt"
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=account_id)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
target_dir.mkdir(parents=True, exist_ok=True)
|
||||
filepath = target_dir / safe_name
|
||||
filepath.write_bytes(str(att.get("content") or "").encode("utf-8"))
|
||||
@@ -3959,7 +4031,7 @@ def setup_email_routes():
|
||||
msg = email_mod.message_from_bytes(raw)
|
||||
|
||||
# Extract to a per-email folder
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=account_id)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
filepath = _extract_attachment_to_disk(msg, index, target_dir)
|
||||
if not filepath:
|
||||
return {"error": f"Attachment index {index} not found"}
|
||||
@@ -3991,7 +4063,7 @@ def setup_email_routes():
|
||||
if not attachments:
|
||||
raise HTTPException(status_code=404, detail="No downloadable attachments")
|
||||
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=account_id)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
zip_buf = io.BytesIO()
|
||||
used_names: dict[str, int] = {}
|
||||
with zipfile.ZipFile(zip_buf, "w", compression=zipfile.ZIP_DEFLATED) as zf:
|
||||
@@ -4131,7 +4203,7 @@ def setup_email_routes():
|
||||
att for att in _list_attachments_from_msg(msg)
|
||||
if not _is_likely_signature_image_attachment(att)
|
||||
]
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=acct)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
for att in attachments:
|
||||
idx = att.get("index")
|
||||
if idx is None:
|
||||
@@ -4196,7 +4268,7 @@ def setup_email_routes():
|
||||
continue
|
||||
if not ct.lower().startswith("image/"):
|
||||
raise HTTPException(status_code=415, detail="Content-ID is not an image")
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=account_id)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
filepath = _extract_attachment_to_disk(msg, idx, target_dir)
|
||||
if not filepath:
|
||||
raise HTTPException(status_code=404, detail="Inline image not found")
|
||||
@@ -4234,7 +4306,7 @@ def setup_email_routes():
|
||||
raw = msg_data[0][1]
|
||||
msg = email_mod.message_from_bytes(raw)
|
||||
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=account_id)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
filepath = _extract_attachment_to_disk(msg, index, target_dir)
|
||||
if not filepath:
|
||||
return {"error": f"Attachment index {index} not found"}
|
||||
@@ -4562,9 +4634,7 @@ def setup_email_routes():
|
||||
try:
|
||||
content = filepath.read_text(encoding="utf-8", errors="replace")
|
||||
except Exception as e:
|
||||
# OSError text includes the server-side extraction path.
|
||||
logger.warning("Failed to read text attachment %s: %s", base, e)
|
||||
return {"error": "Failed to read text file", "filename": base}
|
||||
return {"error": f"Failed to read text file: {e}", "filename": base}
|
||||
doc_id = _create_markdown_doc(content, "Imported from email attachment")
|
||||
return {"doc_id": doc_id, "filename": filepath.name}
|
||||
|
||||
@@ -4581,7 +4651,7 @@ def setup_email_routes():
|
||||
_row, att = fixture_att
|
||||
filename = str(att.get("filename") or f"attachment-{index}.txt")
|
||||
safe_name = re.sub(r"[^\w\s\-.]", "_", filename).strip() or f"attachment-{index}.txt"
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=account_id)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
target_dir.mkdir(parents=True, exist_ok=True)
|
||||
filepath = target_dir / safe_name
|
||||
filepath.write_bytes(str(att.get("content") or "").encode("utf-8"))
|
||||
@@ -4595,7 +4665,7 @@ def setup_email_routes():
|
||||
raw = msg_data[0][1]
|
||||
msg = email_mod.message_from_bytes(raw)
|
||||
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=account_id)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
filepath = _extract_attachment_to_disk(msg, index, target_dir)
|
||||
if not filepath:
|
||||
return {"error": f"Attachment index {index} not found"}
|
||||
@@ -4764,6 +4834,7 @@ def setup_email_routes():
|
||||
return {"success": False, "error": "No email UIDs provided", "deleted_uids": [], "failed_uids": []}
|
||||
deleted_uids = []
|
||||
failed_uids = []
|
||||
trash_folder = None
|
||||
try:
|
||||
with _imap(account_id, owner=owner) as conn:
|
||||
select_status, _ = conn.select(_q(folder), readonly=False)
|
||||
@@ -4779,7 +4850,8 @@ def setup_email_routes():
|
||||
trash_folder = "Trash"
|
||||
except Exception:
|
||||
pass
|
||||
pending_expunge = False
|
||||
pending_expunge = []
|
||||
preexisting_deleted = set()
|
||||
for uid in uids:
|
||||
try:
|
||||
if not _uid_exists(conn, uid):
|
||||
@@ -4789,32 +4861,75 @@ def setup_email_routes():
|
||||
if status != "OK":
|
||||
copy_status, _ = conn.uid("COPY", _uid_bytes(uid), _q(trash_folder))
|
||||
if copy_status != "OK":
|
||||
# Keep deletion reliable even when this IMAP
|
||||
# server has no writable Trash folder.
|
||||
store_status, _ = conn.uid("STORE", _uid_bytes(uid), "+FLAGS", "\\Deleted")
|
||||
if store_status != "OK":
|
||||
failed_uids.append(uid)
|
||||
continue
|
||||
pending_expunge = True
|
||||
else:
|
||||
store_status, _ = conn.uid("STORE", _uid_bytes(uid), "+FLAGS", "\\Deleted")
|
||||
if store_status != "OK":
|
||||
failed_uids.append(uid)
|
||||
continue
|
||||
pending_expunge = True
|
||||
# Bulk Delete means move to Trash. Never remove
|
||||
# the original without a recoverable Trash copy.
|
||||
failed_uids.append(uid)
|
||||
continue
|
||||
if _uid_has_deleted_flag(conn, uid):
|
||||
preexisting_deleted.add(uid)
|
||||
store_status, _ = conn.uid("STORE", _uid_bytes(uid), "+FLAGS", "\\Deleted")
|
||||
if store_status != "OK":
|
||||
failed_uids.append(uid)
|
||||
continue
|
||||
# Keep the local index until the server confirms
|
||||
# that the copied originals have been removed.
|
||||
pending_expunge.append(uid)
|
||||
continue
|
||||
deleted_uids.append(uid)
|
||||
_email_index_delete(owner, account_id, folder, uid)
|
||||
except Exception:
|
||||
failed_uids.append(uid)
|
||||
logger.debug("Bulk email delete failed for uid=%s", uid, exc_info=True)
|
||||
if pending_expunge:
|
||||
conn.expunge()
|
||||
if deleted_uids:
|
||||
_invalidate_list_cache(account_id, folder)
|
||||
return {"success": True, "deleted_uids": deleted_uids, "failed_uids": failed_uids}
|
||||
expunge_ok = False
|
||||
# Attempt selective RFC 4315 UID EXPUNGE so unrelated messages
|
||||
# carrying \Deleted in the selected mailbox are never expunged.
|
||||
# Mailbox-wide EXPUNGE is strictly avoided to eliminate TOCTOU races
|
||||
# where concurrent clients mark unrelated messages \Deleted.
|
||||
try:
|
||||
uid_set_bytes = _uid_bytes(",".join(pending_expunge))
|
||||
uid_exp_status, _ = conn.uid("EXPUNGE", uid_set_bytes)
|
||||
if uid_exp_status == "OK":
|
||||
expunge_ok = True
|
||||
except Exception:
|
||||
logger.debug("Selective UID EXPUNGE failed", exc_info=True)
|
||||
expunge_ok = False
|
||||
|
||||
if expunge_ok:
|
||||
for uid in pending_expunge:
|
||||
deleted_uids.append(uid)
|
||||
_email_index_delete(owner, account_id, folder, uid)
|
||||
else:
|
||||
# Prioritize preservation over cleanup: unflag \Deleted from our
|
||||
# copied messages so future EXPUNGE operations do not destroy them.
|
||||
# Do not remove a pre-existing \Deleted flag present before this operation.
|
||||
for uid in pending_expunge:
|
||||
if uid not in preexisting_deleted:
|
||||
try:
|
||||
conn.uid("STORE", _uid_bytes(uid), "-FLAGS", "\\Deleted")
|
||||
except Exception:
|
||||
pass
|
||||
failed_uids.extend(pending_expunge)
|
||||
if not deleted_uids:
|
||||
return {"success": False, "error": "Failed to delete requested emails", "deleted_uids": [], "failed_uids": failed_uids}
|
||||
res = {"success": True, "deleted_uids": deleted_uids, "failed_uids": failed_uids}
|
||||
if failed_uids:
|
||||
res["error"] = "Mail operation partially failed"
|
||||
return res
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to bulk delete emails: {e}")
|
||||
return {"success": False, "error": "Mail operation failed", "deleted_uids": deleted_uids, "failed_uids": [u for u in uids if u not in deleted_uids]}
|
||||
failed_all = [u for u in uids if u not in deleted_uids]
|
||||
return {
|
||||
"success": bool(deleted_uids),
|
||||
"error": "Mail operation failed" if not deleted_uids else "Mail operation partially failed",
|
||||
"deleted_uids": deleted_uids,
|
||||
"failed_uids": failed_all,
|
||||
}
|
||||
finally:
|
||||
if deleted_uids:
|
||||
_invalidate_list_cache(account_id, folder)
|
||||
if trash_folder:
|
||||
_invalidate_list_cache(account_id, trash_folder)
|
||||
|
||||
@router.delete("/odysseus/reminders")
|
||||
async def delete_odysseus_reminder_emails(
|
||||
@@ -5204,7 +5319,7 @@ def setup_email_routes():
|
||||
return {"success": False, "error": "Email not found"}
|
||||
raw = msg_data[0][1]
|
||||
msg = email_mod.message_from_bytes(raw)
|
||||
target_dir = attachment_extract_dir(folder, uid, owner=owner, account_id=account_id)
|
||||
target_dir = attachment_extract_dir(folder, uid)
|
||||
filepath = _extract_attachment_to_disk(msg, index, target_dir)
|
||||
if not filepath:
|
||||
return {"success": False, "error": f"Attachment index {index} not found"}
|
||||
@@ -5920,7 +6035,12 @@ def setup_email_routes():
|
||||
},
|
||||
]
|
||||
|
||||
style = await llm_call_async(url, model, messages, headers=headers, max_tokens=2048)
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
style = await llm_call_async(
|
||||
url, model, messages, headers=headers, max_tokens=2048,
|
||||
reasoning_effort=effort_for_call(url, model, owner),
|
||||
)
|
||||
style = _strip_think(style or "")
|
||||
if not style:
|
||||
return {"success": False, "error": "LLM failed to generate style description"}
|
||||
@@ -6004,6 +6124,7 @@ def setup_email_routes():
|
||||
headers=req_headers,
|
||||
max_tokens=8192,
|
||||
timeout=180,
|
||||
owner=owner,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(
|
||||
@@ -6125,6 +6246,8 @@ def setup_email_routes():
|
||||
if not candidates:
|
||||
return {"success": False, "error": "No LLM endpoint configured"}
|
||||
|
||||
from src.utility_effort import candidate_effort_factory
|
||||
|
||||
content = await llm_call_async_with_fallback(
|
||||
candidates,
|
||||
messages=[
|
||||
@@ -6152,6 +6275,7 @@ def setup_email_routes():
|
||||
temperature=0.2,
|
||||
max_tokens=8192,
|
||||
timeout=180,
|
||||
candidate_request_factory=candidate_effort_factory(owner),
|
||||
)
|
||||
model = candidates[0][1] if candidates else ""
|
||||
content = (content or "").strip()
|
||||
@@ -6212,7 +6336,7 @@ def setup_email_routes():
|
||||
await queue.put({'type': 'result', **result})
|
||||
task = asyncio.create_task(run())
|
||||
try:
|
||||
while True:
|
||||
while not _shutdown.is_shutting_down():
|
||||
item = await queue.get()
|
||||
yield 'data: ' + json.dumps(item) + '\n\n'
|
||||
if item.get('type') == 'result':
|
||||
@@ -6902,158 +7026,6 @@ def setup_email_routes():
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
def _test_mail_connections(body: dict, owner: str) -> dict:
|
||||
"""Blocking IMAP/SMTP connection test for /accounts/test.
|
||||
|
||||
Runs in the threadpool: each probe can block for its full socket
|
||||
timeout, which on the event loop stalled every other request. The
|
||||
connections go through the outbound mail address policy for `owner`
|
||||
(the user who chose the hosts)."""
|
||||
imap_result = {"ok": False}
|
||||
smtp_result = None
|
||||
|
||||
imap_host = (body.get("imap_host") or "").strip()
|
||||
imap_port, imap_port_err = _coerce_port(body.get("imap_port"), 993)
|
||||
imap_user = (body.get("imap_user") or "").strip()
|
||||
imap_pass = body.get("imap_password") or ""
|
||||
imap_starttls = bool(body.get("imap_starttls"))
|
||||
oauth_provider = body.get("oauth_provider") or ""
|
||||
|
||||
google_token = None
|
||||
google_token_loaded = False
|
||||
google_ssl_context = (
|
||||
ssl.create_default_context()
|
||||
if oauth_provider == "google"
|
||||
else None
|
||||
)
|
||||
|
||||
def _google_token():
|
||||
nonlocal google_token, google_token_loaded
|
||||
if not google_token_loaded:
|
||||
google_token = _get_valid_google_token(body.get("account_id"), body)
|
||||
google_token_loaded = True
|
||||
if not google_token:
|
||||
raise RuntimeError("Google OAuth token unavailable — reconnect the account")
|
||||
return google_token
|
||||
|
||||
if imap_port_err:
|
||||
imap_result = {"ok": False, "error": imap_port_err}
|
||||
elif not (imap_host and imap_user and (imap_pass or oauth_provider == "google")):
|
||||
imap_result = {"ok": False, "error": "Need IMAP host, username, and password"}
|
||||
elif oauth_provider == "google" and _normalized_mail_host(imap_host) != _GOOGLE_OAUTH_IMAP_HOST:
|
||||
imap_result = {"ok": False, "error": "Google OAuth IMAP requires imap.gmail.com"}
|
||||
elif oauth_provider == "google" and not _google_oauth_imap_transport_allowed(imap_port, imap_starttls):
|
||||
imap_result = {"ok": False, "error": "Google OAuth IMAP requires TLS on port 993 or STARTTLS on port 143"}
|
||||
else:
|
||||
# Connection mode resolution:
|
||||
# STARTTLS on → plain IMAP4 + .starttls() (upgrade)
|
||||
# STARTTLS off + port 993 → IMAP4_SSL (implicit SSL, "IMAPS")
|
||||
# STARTTLS off + any other port → plain IMAP4 (no encryption)
|
||||
# Without the last branch, local servers exposed on a non-993
|
||||
# port (Dovecot on 31143, etc.) would always fail the SSL
|
||||
# handshake because they're not actually wrapped in TLS.
|
||||
try:
|
||||
imap_kwargs = {
|
||||
"starttls": imap_starttls,
|
||||
"timeout": _IMAP_TIMEOUT_SECONDS,
|
||||
"owner": owner,
|
||||
}
|
||||
if google_ssl_context:
|
||||
imap_kwargs["ssl_context"] = google_ssl_context
|
||||
conn = _open_imap_connection(
|
||||
imap_host,
|
||||
imap_port,
|
||||
**imap_kwargs,
|
||||
)
|
||||
try:
|
||||
if oauth_provider == "google":
|
||||
token = _google_token()
|
||||
conn.authenticate("XOAUTH2", lambda x: _xoauth2_bytes(imap_user, token))
|
||||
else:
|
||||
conn.login(imap_user, imap_pass)
|
||||
imap_result = {"ok": True}
|
||||
finally:
|
||||
try: conn.logout()
|
||||
except Exception: pass
|
||||
except Exception as e:
|
||||
imap_result = {"ok": False, "error": _mail_connection_test_error("IMAP", imap_host, e)}
|
||||
|
||||
smtp_host = (body.get("smtp_host") or "").strip()
|
||||
smtp_port, smtp_port_err = _coerce_port(body.get("smtp_port"), 465)
|
||||
if smtp_host and smtp_port_err:
|
||||
smtp_result = {"ok": False, "error": smtp_port_err}
|
||||
elif oauth_provider == "google" and smtp_host and _normalized_mail_host(smtp_host) != _GOOGLE_OAUTH_SMTP_HOST:
|
||||
smtp_result = {"ok": False, "error": "Google OAuth SMTP requires smtp.gmail.com"}
|
||||
elif (
|
||||
oauth_provider == "google"
|
||||
and smtp_host
|
||||
and not _google_oauth_smtp_transport_allowed(
|
||||
smtp_port,
|
||||
_smtp_security_mode({"smtp_security": body.get("smtp_security"), "smtp_port": smtp_port}),
|
||||
)
|
||||
):
|
||||
smtp_result = {"ok": False, "error": "Google OAuth SMTP requires TLS on port 465 or STARTTLS on port 587"}
|
||||
elif smtp_host:
|
||||
smtp_security = _smtp_security_mode({"smtp_security": body.get("smtp_security"), "smtp_port": smtp_port})
|
||||
smtp_user = (body.get("smtp_user") or imap_user).strip()
|
||||
smtp_pass = body.get("smtp_password") or imap_pass
|
||||
smtp = None
|
||||
try:
|
||||
if smtp_security == "ssl":
|
||||
smtp_kwargs = (
|
||||
{"context": google_ssl_context}
|
||||
if google_ssl_context
|
||||
else {}
|
||||
)
|
||||
smtp = _PolicySMTP_SSL(
|
||||
smtp_host,
|
||||
smtp_port,
|
||||
timeout=10,
|
||||
block_private=_mail_private_blocked(owner),
|
||||
**smtp_kwargs,
|
||||
)
|
||||
else:
|
||||
smtp = _PolicySMTP(smtp_host, smtp_port, timeout=10, block_private=_mail_private_blocked(owner))
|
||||
if smtp_security == "starttls":
|
||||
try:
|
||||
if google_ssl_context:
|
||||
smtp.starttls(context=google_ssl_context)
|
||||
else:
|
||||
smtp.starttls()
|
||||
except Exception:
|
||||
# STARTTLS failed before the auth cleanup block.
|
||||
# Close the still-open plaintext socket explicitly.
|
||||
try:
|
||||
smtp.close()
|
||||
except Exception:
|
||||
pass
|
||||
smtp = None
|
||||
raise
|
||||
if oauth_provider == "google":
|
||||
token = _google_token()
|
||||
smtp.ehlo()
|
||||
smtp.auth("XOAUTH2", lambda challenge=None: _xoauth2_raw(smtp_user, token), initial_response_ok=True)
|
||||
else:
|
||||
smtp.login(smtp_user, smtp_pass)
|
||||
smtp_result = {"ok": True}
|
||||
except Exception as e:
|
||||
smtp_result = {"ok": False, "error": _mail_connection_test_error("SMTP", smtp_host, e)}
|
||||
finally:
|
||||
if smtp is not None:
|
||||
try:
|
||||
smtp.quit()
|
||||
except Exception:
|
||||
try:
|
||||
smtp.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return {
|
||||
"ok": imap_result["ok"] and (smtp_result is None or smtp_result["ok"]),
|
||||
"imap": imap_result,
|
||||
"smtp": smtp_result,
|
||||
}
|
||||
|
||||
@router.post("/accounts/test")
|
||||
async def test_account_config(req: Request, owner: str = Depends(require_user)):
|
||||
"""Try to actually connect to the provided IMAP (and optionally SMTP)
|
||||
@@ -7117,7 +7089,148 @@ def setup_email_routes():
|
||||
# inline test payloads select the OAuth branch or supply token data.
|
||||
body = {key: value for key, value in body.items() if key not in _SERVER_OWNED_OAUTH_FIELDS}
|
||||
|
||||
return await run_in_threadpool(_test_mail_connections, body, owner)
|
||||
imap_result = {"ok": False}
|
||||
smtp_result = None
|
||||
|
||||
imap_host = (body.get("imap_host") or "").strip()
|
||||
imap_port, imap_port_err = _coerce_port(body.get("imap_port"), 993)
|
||||
imap_user = (body.get("imap_user") or "").strip()
|
||||
imap_pass = body.get("imap_password") or ""
|
||||
imap_starttls = bool(body.get("imap_starttls"))
|
||||
oauth_provider = body.get("oauth_provider") or ""
|
||||
|
||||
google_token = None
|
||||
google_token_loaded = False
|
||||
google_ssl_context = (
|
||||
ssl.create_default_context()
|
||||
if oauth_provider == "google"
|
||||
else None
|
||||
)
|
||||
|
||||
def _google_token():
|
||||
nonlocal google_token, google_token_loaded
|
||||
if not google_token_loaded:
|
||||
google_token = _get_valid_google_token(body.get("account_id"), body)
|
||||
google_token_loaded = True
|
||||
if not google_token:
|
||||
raise RuntimeError("Google OAuth token unavailable — reconnect the account")
|
||||
return google_token
|
||||
|
||||
if imap_port_err:
|
||||
imap_result = {"ok": False, "error": imap_port_err}
|
||||
elif not (imap_host and imap_user and (imap_pass or oauth_provider == "google")):
|
||||
imap_result = {"ok": False, "error": "Need IMAP host, username, and password"}
|
||||
elif oauth_provider == "google" and _normalized_mail_host(imap_host) != _GOOGLE_OAUTH_IMAP_HOST:
|
||||
imap_result = {"ok": False, "error": "Google OAuth IMAP requires imap.gmail.com"}
|
||||
elif oauth_provider == "google" and not _google_oauth_imap_transport_allowed(imap_port, imap_starttls):
|
||||
imap_result = {"ok": False, "error": "Google OAuth IMAP requires TLS on port 993 or STARTTLS on port 143"}
|
||||
else:
|
||||
# Connection mode resolution:
|
||||
# STARTTLS on → plain IMAP4 + .starttls() (upgrade)
|
||||
# STARTTLS off + port 993 → IMAP4_SSL (implicit SSL, "IMAPS")
|
||||
# STARTTLS off + any other port → plain IMAP4 (no encryption)
|
||||
# Without the last branch, local servers exposed on a non-993
|
||||
# port (Dovecot on 31143, etc.) would always fail the SSL
|
||||
# handshake because they're not actually wrapped in TLS.
|
||||
try:
|
||||
imap_kwargs = {
|
||||
"starttls": imap_starttls,
|
||||
"timeout": _IMAP_TIMEOUT_SECONDS,
|
||||
}
|
||||
if google_ssl_context:
|
||||
imap_kwargs["ssl_context"] = google_ssl_context
|
||||
conn = _open_imap_connection(
|
||||
imap_host,
|
||||
imap_port,
|
||||
**imap_kwargs,
|
||||
)
|
||||
try:
|
||||
if oauth_provider == "google":
|
||||
token = _google_token()
|
||||
conn.authenticate("XOAUTH2", lambda x: _xoauth2_bytes(imap_user, token))
|
||||
else:
|
||||
conn.login(imap_user, imap_pass)
|
||||
imap_result = {"ok": True}
|
||||
finally:
|
||||
try: conn.logout()
|
||||
except Exception: pass
|
||||
except Exception as e:
|
||||
imap_result = {"ok": False, "error": _friendly_email_auth_error("IMAP", imap_host, e)}
|
||||
|
||||
smtp_host = (body.get("smtp_host") or "").strip()
|
||||
smtp_port, smtp_port_err = _coerce_port(body.get("smtp_port"), 465)
|
||||
if smtp_host and smtp_port_err:
|
||||
smtp_result = {"ok": False, "error": smtp_port_err}
|
||||
elif oauth_provider == "google" and smtp_host and _normalized_mail_host(smtp_host) != _GOOGLE_OAUTH_SMTP_HOST:
|
||||
smtp_result = {"ok": False, "error": "Google OAuth SMTP requires smtp.gmail.com"}
|
||||
elif (
|
||||
oauth_provider == "google"
|
||||
and smtp_host
|
||||
and not _google_oauth_smtp_transport_allowed(
|
||||
smtp_port,
|
||||
_smtp_security_mode({"smtp_security": body.get("smtp_security"), "smtp_port": smtp_port}),
|
||||
)
|
||||
):
|
||||
smtp_result = {"ok": False, "error": "Google OAuth SMTP requires TLS on port 465 or STARTTLS on port 587"}
|
||||
elif smtp_host:
|
||||
smtp_security = _smtp_security_mode({"smtp_security": body.get("smtp_security"), "smtp_port": smtp_port})
|
||||
smtp_user = (body.get("smtp_user") or imap_user).strip()
|
||||
smtp_pass = body.get("smtp_password") or imap_pass
|
||||
smtp = None
|
||||
try:
|
||||
if smtp_security == "ssl":
|
||||
smtp_kwargs = (
|
||||
{"context": google_ssl_context}
|
||||
if google_ssl_context
|
||||
else {}
|
||||
)
|
||||
smtp = smtplib.SMTP_SSL(
|
||||
smtp_host,
|
||||
smtp_port,
|
||||
timeout=10,
|
||||
**smtp_kwargs,
|
||||
)
|
||||
else:
|
||||
smtp = smtplib.SMTP(smtp_host, smtp_port, timeout=10)
|
||||
if smtp_security == "starttls":
|
||||
try:
|
||||
if google_ssl_context:
|
||||
smtp.starttls(context=google_ssl_context)
|
||||
else:
|
||||
smtp.starttls()
|
||||
except Exception:
|
||||
# STARTTLS failed before the auth cleanup block.
|
||||
# Close the still-open plaintext socket explicitly.
|
||||
try:
|
||||
smtp.close()
|
||||
except Exception:
|
||||
pass
|
||||
smtp = None
|
||||
raise
|
||||
if oauth_provider == "google":
|
||||
token = _google_token()
|
||||
smtp.ehlo()
|
||||
smtp.auth("XOAUTH2", lambda challenge=None: _xoauth2_raw(smtp_user, token), initial_response_ok=True)
|
||||
else:
|
||||
smtp.login(smtp_user, smtp_pass)
|
||||
smtp_result = {"ok": True}
|
||||
except Exception as e:
|
||||
smtp_result = {"ok": False, "error": _friendly_email_auth_error("SMTP", smtp_host, e)}
|
||||
finally:
|
||||
if smtp is not None:
|
||||
try:
|
||||
smtp.quit()
|
||||
except Exception:
|
||||
try:
|
||||
smtp.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return {
|
||||
"ok": imap_result["ok"] and (smtp_result is None or smtp_result["ok"]),
|
||||
"imap": imap_result,
|
||||
"smtp": smtp_result,
|
||||
}
|
||||
|
||||
@router.post("/accounts/{account_id}/set-default")
|
||||
async def set_default_account(account_id: str, owner: str = Depends(require_user)):
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -237,6 +237,18 @@ def _keep_count_before_message(db_messages, before_msg_id: str | None) -> int |
|
||||
return None
|
||||
|
||||
|
||||
def _effort_mode(model: str, raw_effort: Any) -> str:
|
||||
"""Session ``thinking_mode`` for a picked effort: ``effort:<level>`` or ``off``.
|
||||
|
||||
Validated like the chat routes do, so llama-swap advertised efforts persist
|
||||
as well as ChatGPT subscription levels.
|
||||
"""
|
||||
from src.chatgpt_subscription import validate_reasoning_effort
|
||||
|
||||
effort = validate_reasoning_effort(model, raw_effort)
|
||||
return f"effort:{effort}" if effort else "off"
|
||||
|
||||
|
||||
def setup_history_routes(session_manager, upload_handler=None) -> APIRouter:
|
||||
router = APIRouter(
|
||||
tags=["history"],
|
||||
@@ -391,26 +403,53 @@ def setup_history_routes(session_manager, upload_handler=None) -> APIRouter:
|
||||
async def truncate_session(request: Request, session_id: str):
|
||||
_verify_session_owner(request, session_id)
|
||||
try:
|
||||
body = await request.json()
|
||||
keep_count = int(body.get("keep_count", 0))
|
||||
before_msg_id = str(body.get("before_msg_id") or body.get("message_id") or "").strip()
|
||||
try:
|
||||
body = await request.json()
|
||||
except json.JSONDecodeError:
|
||||
raise HTTPException(400, "Request body must be valid JSON")
|
||||
if not isinstance(body, dict):
|
||||
raise HTTPException(400, "Request body must be a JSON object")
|
||||
# Resolve before_msg_id / message_id alias with explicit presence checks.
|
||||
# None (JSON null) and empty string are both treated as "not provided here"
|
||||
# and fall through to the alias, preserving the original OR-chain semantics.
|
||||
# Any other non-string value (False, 0, True, 123, list, …) is rejected
|
||||
# immediately so falsy non-strings cannot bypass type validation.
|
||||
raw_msg_id = body.get("before_msg_id") if "before_msg_id" in body else None
|
||||
if raw_msg_id is None or raw_msg_id == "":
|
||||
raw_msg_id = body.get("message_id")
|
||||
if raw_msg_id is not None and not isinstance(raw_msg_id, str):
|
||||
raise HTTPException(400, "Message ID must be a string")
|
||||
before_msg_id = (raw_msg_id or "").strip()
|
||||
if "keep_count" not in body and not before_msg_id:
|
||||
raise HTTPException(400, "keep_count or before_msg_id required")
|
||||
raw_count = body.get("keep_count", 0)
|
||||
# Keep integer-string clients working, but do not silently convert
|
||||
# booleans or fractional numbers into destructive message counts.
|
||||
if type(raw_count) not in (int, str):
|
||||
raise HTTPException(400, "keep_count must be a non-negative integer")
|
||||
try:
|
||||
keep_count = int(raw_count)
|
||||
except ValueError:
|
||||
raise HTTPException(400, "keep_count must be a non-negative integer")
|
||||
if keep_count < 0:
|
||||
raise HTTPException(400, "keep_count must be a non-negative integer")
|
||||
deleted_sft_pairs: list[dict[str, str]] = []
|
||||
if keep_count >= 0:
|
||||
db = SessionLocal()
|
||||
try:
|
||||
all_db_messages = db.query(DbChatMessage).filter(
|
||||
DbChatMessage.session_id == session_id
|
||||
).order_by(DbChatMessage.timestamp).all()
|
||||
if before_msg_id:
|
||||
resolved_keep_count = _keep_count_before_message(all_db_messages, before_msg_id)
|
||||
if resolved_keep_count is None:
|
||||
raise HTTPException(404, "Message not found")
|
||||
keep_count = resolved_keep_count
|
||||
for pos, row in enumerate(all_db_messages):
|
||||
row._will_delete_for_sft = pos >= keep_count
|
||||
deleted_sft_pairs = _deleted_sft_pairs_from_db_rows(all_db_messages)
|
||||
finally:
|
||||
db.close()
|
||||
# keep_count is always >= 0 here; the block is unconditional.
|
||||
db = SessionLocal()
|
||||
try:
|
||||
all_db_messages = db.query(DbChatMessage).filter(
|
||||
DbChatMessage.session_id == session_id
|
||||
).order_by(DbChatMessage.timestamp).all()
|
||||
if before_msg_id:
|
||||
resolved_keep_count = _keep_count_before_message(all_db_messages, before_msg_id)
|
||||
if resolved_keep_count is None:
|
||||
raise HTTPException(404, "Message not found")
|
||||
keep_count = resolved_keep_count
|
||||
for pos, row in enumerate(all_db_messages):
|
||||
row._will_delete_for_sft = pos >= keep_count
|
||||
deleted_sft_pairs = _deleted_sft_pairs_from_db_rows(all_db_messages)
|
||||
finally:
|
||||
db.close()
|
||||
result = session_manager.truncate_messages(session_id, keep_count)
|
||||
_remove_deleted_sft_trace_rows(
|
||||
owner=effective_user(request),
|
||||
@@ -1031,26 +1070,11 @@ def setup_history_routes(session_manager, upload_handler=None) -> APIRouter:
|
||||
mode = getattr(session, "thinking_mode", "off") or "off"
|
||||
raw_effort = body.get("reasoning_effort")
|
||||
if raw_effort is not None:
|
||||
clean_effort = str(raw_effort).strip().lower()
|
||||
if clean_effort in {"", "default"}:
|
||||
mode = "off"
|
||||
else:
|
||||
from src.chatgpt_subscription import get_chatgpt_model_metadata
|
||||
meta = get_chatgpt_model_metadata(session.model)
|
||||
if meta and clean_effort in [lvl.lower() for lvl in meta.get("supported_reasoning_levels", [])]:
|
||||
mode = f"effort:{clean_effort}"
|
||||
else:
|
||||
mode = "off"
|
||||
mode = _effort_mode(session.model, raw_effort)
|
||||
elif "thinking_mode" in body:
|
||||
raw_mode = str(body.get("thinking_mode") or "").strip().lower()
|
||||
if raw_mode.startswith("effort:"):
|
||||
clean_effort = raw_mode[7:].strip()
|
||||
from src.chatgpt_subscription import get_chatgpt_model_metadata
|
||||
meta = get_chatgpt_model_metadata(session.model)
|
||||
if meta and clean_effort in [lvl.lower() for lvl in meta.get("supported_reasoning_levels", [])]:
|
||||
mode = f"effort:{clean_effort}"
|
||||
else:
|
||||
mode = "off"
|
||||
mode = _effort_mode(session.model, raw_mode[7:])
|
||||
elif raw_mode in {"", "on", "off"}:
|
||||
mode = raw_mode
|
||||
from src.model_profiles import supports_user_thinking_toggle
|
||||
@@ -1129,7 +1153,14 @@ def setup_history_routes(session_manager, upload_handler=None) -> APIRouter:
|
||||
)
|
||||
|
||||
# Use utility model if available
|
||||
util_url, util_model, util_headers = resolve_endpoint("utility", owner=owner or None)
|
||||
from src.utility_effort import effort_for_call
|
||||
util_url, util_model, util_headers = resolve_endpoint(
|
||||
"utility",
|
||||
fallback_url=getattr(session, "endpoint_url", None),
|
||||
fallback_model=getattr(session, "model", None),
|
||||
fallback_headers=getattr(session, "headers", None),
|
||||
owner=owner or None,
|
||||
)
|
||||
compact_url = util_url or session.endpoint_url
|
||||
compact_model = util_model or session.model
|
||||
compact_headers = util_headers if util_url else session.headers
|
||||
@@ -1145,6 +1176,7 @@ def setup_history_routes(session_manager, upload_handler=None) -> APIRouter:
|
||||
],
|
||||
temperature=0.2, max_tokens=1024,
|
||||
headers=compact_headers, timeout=30,
|
||||
reasoning_effort=effort_for_call(compact_url, compact_model, owner, session),
|
||||
)
|
||||
summary = normalize_compaction_summary(summary)
|
||||
|
||||
|
||||
+4
-10
@@ -5,9 +5,8 @@ import shlex
|
||||
import subprocess
|
||||
from copy import deepcopy
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from fastapi import APIRouter, HTTPException
|
||||
|
||||
from core.middleware import require_admin
|
||||
from core.platform_compat import run_ssh_command
|
||||
from routes._validators import validate_remote_host, validate_ssh_port
|
||||
|
||||
@@ -199,11 +198,7 @@ def _inspect_model_path(model_path: str, host: str = "", ssh_port: str = "") ->
|
||||
|
||||
|
||||
def setup_hwfit_routes():
|
||||
# Admin-gated like the Cookbook routes this backs (/api/cookbook/gpus does
|
||||
# the same SSH host probing): `host`/`ssh_port` make the server SSH out with
|
||||
# its own key to any syntactically valid host, and `model_path` probes the
|
||||
# host filesystem. Single-user mode and internal tool calls still pass.
|
||||
router = APIRouter(prefix="/api/hwfit", tags=["hwfit"], dependencies=[Depends(require_admin)])
|
||||
router = APIRouter(prefix="/api/hwfit", tags=["hwfit"])
|
||||
|
||||
@router.get("/system")
|
||||
def get_system(host: str = "", ssh_port: str = "", platform: str = "", fresh: bool = False):
|
||||
@@ -223,7 +218,7 @@ def setup_hwfit_routes():
|
||||
fresh=true bypasses the hardware-detection cache."""
|
||||
from services.hwfit.hardware import detect_system
|
||||
from services.hwfit.fit import rank_models
|
||||
from services.hwfit.models import get_models, refresh_dynamic_catalogs
|
||||
from services.hwfit.models import get_models, model_catalog_path, refresh_dynamic_catalogs
|
||||
host, ssh_port = _validate_detection_target(host, ssh_port)
|
||||
system = deepcopy(detect_system(host=host, ssh_port=ssh_port, platform=platform, fresh=fresh))
|
||||
if system.get("error"):
|
||||
@@ -238,8 +233,7 @@ def setup_hwfit_routes():
|
||||
return {
|
||||
"system": system,
|
||||
"models": [],
|
||||
"error": "Model catalog is empty. Use Rescan in Cookbook while online to populate runtime model data; offline recommendations require a previously populated cache.",
|
||||
**({"catalog_refresh": catalog_refresh} if catalog_refresh is not None else {}),
|
||||
"error": f"Model catalog missing or empty: {model_catalog_path()}",
|
||||
}
|
||||
|
||||
if ignore_detected_gpu:
|
||||
|
||||
@@ -261,6 +261,8 @@ def setup_memory_routes(memory_manager: MemoryManager, session_manager: SessionM
|
||||
sess.endpoint_url, sess.model, sess.headers, owner=_owner(request)
|
||||
)
|
||||
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
try:
|
||||
suggestion_text = await llm_call_async(
|
||||
t_url,
|
||||
@@ -269,6 +271,7 @@ def setup_memory_routes(memory_manager: MemoryManager, session_manager: SessionM
|
||||
temperature=0.2,
|
||||
max_tokens=500,
|
||||
headers=t_headers,
|
||||
reasoning_effort=effort_for_call(t_url, t_model, _owner(request), sess),
|
||||
)
|
||||
try:
|
||||
suggestions = json.loads(suggestion_text)
|
||||
@@ -349,6 +352,7 @@ def setup_memory_routes(memory_manager: MemoryManager, session_manager: SessionM
|
||||
endpoint_url = None
|
||||
model = None
|
||||
headers = {}
|
||||
sess = None
|
||||
|
||||
user = _owner(request)
|
||||
|
||||
@@ -453,6 +457,8 @@ def setup_memory_routes(memory_manager: MemoryManager, session_manager: SessionM
|
||||
"Return ONLY valid JSON, no markdown fences."
|
||||
)
|
||||
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
try:
|
||||
raw = await llm_call_async(
|
||||
endpoint_url,
|
||||
@@ -464,6 +470,7 @@ def setup_memory_routes(memory_manager: MemoryManager, session_manager: SessionM
|
||||
temperature=0.2,
|
||||
max_tokens=2000,
|
||||
headers=headers,
|
||||
reasoning_effort=effort_for_call(endpoint_url, model, user, sess),
|
||||
)
|
||||
|
||||
# Parse JSON
|
||||
|
||||
+22
-7
@@ -472,7 +472,7 @@ def _truthy(value: str | None) -> bool:
|
||||
|
||||
_ENDPOINT_KINDS = {"auto", "local", "api", "proxy"}
|
||||
_REFRESH_MODES = {"auto", "manual", "disabled"}
|
||||
_MODEL_TOOL_MODES = {"none", "compact", "full"}
|
||||
_MODEL_TOOL_MODES = {"none", "compact", "full", "spec"}
|
||||
_MODEL_TOOL_MODE_ALIASES = {
|
||||
"regular": "full",
|
||||
"odysseus_compact": "compact",
|
||||
@@ -552,10 +552,10 @@ def _endpoint_refresh_timeout(ep: Any, category: str) -> float:
|
||||
val = 0
|
||||
if val > 0:
|
||||
return float(max(1, min(60, val)))
|
||||
# llama.cpp and other local OpenAI-compatible servers can block briefly
|
||||
# while warming/loading. A 2s local timeout makes working endpoints flicker
|
||||
# offline before /v1/models is ready.
|
||||
return 10.0 if category == "local" else 2.0
|
||||
# Keep the background refresh short so a single dead endpoint cannot stall
|
||||
# the model picker. A timed-out refresh never clears a non-empty model
|
||||
# cache, so a briefly-warming local server is simply retried next round.
|
||||
return 2.0
|
||||
|
||||
|
||||
def _manual_refresh_timeout(ep: Any, category: str, requested: Any = None) -> float:
|
||||
@@ -1510,6 +1510,9 @@ def setup_model_routes(model_discovery):
|
||||
_refresh_inflight = {"v": False, "done": None} # coarse single-flight guard
|
||||
_REFRESH_FAILURE_BASE = 300.0
|
||||
_REFRESH_FAILURE_MAX = 3600.0
|
||||
# Even a user-triggered refresh must not re-probe an endpoint that just
|
||||
# failed/timed out on every click; keep a short cooldown.
|
||||
_REFRESH_FAILURE_MIN = 60.0
|
||||
|
||||
def _refresh_key(base: str, api_key: Optional[str], provider_auth_id: Optional[str] = None) -> str:
|
||||
# Session-backed endpoints carry no static key; include their auth id
|
||||
@@ -1557,14 +1560,20 @@ def setup_model_routes(model_discovery):
|
||||
if mode in ("manual", "disabled") and not force:
|
||||
return False, info
|
||||
fails = int(state.get("fail_count") or 0)
|
||||
if fails and not force:
|
||||
if fails:
|
||||
last_failure = float(state.get("last_failure") or 0.0)
|
||||
empty_local = (
|
||||
not cached
|
||||
and category == "local"
|
||||
and str(getattr(ep, "id", "") or "").startswith("local-")
|
||||
)
|
||||
if now - last_failure < _failure_delay(fails, empty_local=empty_local):
|
||||
delay = _failure_delay(fails, empty_local=empty_local)
|
||||
if force:
|
||||
# A user-triggered refresh gets a short cooldown instead of the
|
||||
# long background backoff, but still skips a just-failed
|
||||
# endpoint so repeated clicks cannot stall the picker.
|
||||
delay = min(delay, _REFRESH_FAILURE_MIN)
|
||||
if now - last_failure < delay:
|
||||
return False, info
|
||||
if cached and not force:
|
||||
interval = _endpoint_refresh_interval(ep, category)
|
||||
@@ -3055,4 +3064,10 @@ def setup_model_routes(model_discovery):
|
||||
|
||||
router._should_refresh_endpoint = _should_refresh_endpoint
|
||||
router._search_endpoint_catalog = search_endpoint_catalog
|
||||
# Exposed for tests: the in-memory backoff state, its key function, and the
|
||||
# background refresh driver (probes endpoints in parallel with the short
|
||||
# per-endpoint timeout).
|
||||
router._refresh_state = _refresh_state
|
||||
router._refresh_key = _refresh_key
|
||||
router._refresh_caches_bg = _refresh_caches_bg
|
||||
return router
|
||||
|
||||
@@ -509,6 +509,7 @@ def setup_session_routes(
|
||||
"has_documents": s.id in doc_session_ids,
|
||||
"has_images": s.id in img_session_ids,
|
||||
"mode": s.mode,
|
||||
"thinking_mode": s.thinking_mode or "off",
|
||||
"message_count": s.message_count or 0,
|
||||
})
|
||||
finally:
|
||||
@@ -1042,6 +1043,7 @@ def setup_session_routes(
|
||||
"id": s.id,
|
||||
"name": s.name,
|
||||
"model": s.model,
|
||||
"thinking_mode": s.thinking_mode or "off",
|
||||
"message_count": s.message_count or 0,
|
||||
"created_at": s.created_at.isoformat() if s.created_at else None,
|
||||
"updated_at": s.updated_at.isoformat() if s.updated_at else None,
|
||||
@@ -1238,9 +1240,16 @@ def setup_session_routes(
|
||||
from src.context_compactor import SELF_SUMMARY_SYSTEM_PROMPT
|
||||
from src.endpoint_resolver import resolve_endpoint
|
||||
from src.llm_core import llm_call_async
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
owner = getattr(session, "owner", None) or effective_user(request)
|
||||
url, model, headers = resolve_endpoint("utility", owner=owner)
|
||||
url, model, headers = resolve_endpoint(
|
||||
"utility",
|
||||
fallback_url=getattr(session, "endpoint_url", None),
|
||||
fallback_model=getattr(session, "model", None),
|
||||
fallback_headers=getattr(session, "headers", None),
|
||||
owner=owner,
|
||||
)
|
||||
if not url or not model:
|
||||
url, model, headers = session.endpoint_url, session.model, session.headers
|
||||
if not url or not model:
|
||||
@@ -1268,6 +1277,7 @@ def setup_session_routes(
|
||||
max_tokens=1024,
|
||||
headers=headers,
|
||||
timeout=60,
|
||||
reasoning_effort=effort_for_call(url, model, owner, session),
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error("Manual compaction failed: %s", e)
|
||||
@@ -1311,6 +1321,7 @@ def setup_session_routes(
|
||||
users can clean junk without spending tokens.
|
||||
"""
|
||||
from src.llm_core import llm_call
|
||||
from src.utility_effort import effort_for_call
|
||||
user = effective_user(request)
|
||||
single_user_mode = not user and _auth_disabled()
|
||||
user_sessions = session_manager.get_sessions_for_user(user)
|
||||
@@ -1483,7 +1494,8 @@ def setup_session_routes(
|
||||
# reasoning model spends tokens thinking first — 4096 truncated the
|
||||
# JSON mid-output, so it never parsed ("invalid JSON for auto-sort").
|
||||
raw = llm_call(url, model, [{"role": "user", "content": prompt}],
|
||||
temperature=0.3, max_tokens=16384, headers=headers, timeout=120)
|
||||
temperature=0.3, max_tokens=16384, headers=headers, timeout=120,
|
||||
reasoning_effort=effort_for_call(url, model, user))
|
||||
logger.info(f"Auto-sort raw response ({len(raw)} chars): {raw[:300]}")
|
||||
# Extract JSON from response — handle markdown fences, leading text,
|
||||
# reasoning-model <think> blocks, and trailing commas.
|
||||
|
||||
+113
-1685
File diff suppressed because it is too large
Load Diff
+76
-25
@@ -21,7 +21,8 @@ from core.database import (
|
||||
Note,
|
||||
Session as DbSession,
|
||||
)
|
||||
from src.auth_helpers import effective_user
|
||||
from src.auth_helpers import effective_user, is_delegated_credential
|
||||
from src.owner_identity import auth_disabled, is_request_sentinel_owner
|
||||
from src.attachment_refs import attachment_refs_from_metadata
|
||||
from src.constants import GENERATED_IMAGES_DIR
|
||||
from src.path_confinement import is_inside
|
||||
@@ -34,6 +35,8 @@ from src.upload_handler import (
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
router = APIRouter(prefix="/api/upload", tags=["upload"])
|
||||
UPLOAD_READ_SCOPES = frozenset({"chat", "documents:read", "documents:write"})
|
||||
UPLOAD_WRITE_SCOPES = frozenset({"chat", "documents:write"})
|
||||
UPLOAD_RESPONSE_HEADERS = {"X-Content-Type-Options": "nosniff"}
|
||||
|
||||
def _upload_ids_from_persisted_text(value: object) -> set[str]:
|
||||
@@ -178,6 +181,52 @@ def setup_upload_routes(upload_handler):
|
||||
|
||||
raise HTTPException(404, "File not found")
|
||||
|
||||
def _verify_upload_access(
|
||||
request: Request,
|
||||
file_owner: str | None,
|
||||
*,
|
||||
write: bool = False,
|
||||
) -> None:
|
||||
if auth_disabled():
|
||||
return
|
||||
|
||||
auth_mgr = getattr(request.app.state, "auth_manager", None)
|
||||
if auth_mgr is None:
|
||||
raise HTTPException(503, "Authentication service unavailable")
|
||||
|
||||
if not getattr(auth_mgr, "is_configured", False):
|
||||
raise HTTPException(401, "Setup required")
|
||||
|
||||
current_user = effective_user(request)
|
||||
if not current_user or is_request_sentinel_owner(current_user):
|
||||
raise HTTPException(403, "Access denied")
|
||||
|
||||
# Delegated credentials (bearer API tokens):
|
||||
# Establish token owner identity but NEVER inherit interactive administrator privileges.
|
||||
if is_delegated_credential(request):
|
||||
token_owner = getattr(request.state, "api_token_owner", None)
|
||||
if not token_owner or is_request_sentinel_owner(token_owner):
|
||||
raise HTTPException(403, "API token has no valid owner")
|
||||
|
||||
token_scopes = set(getattr(request.state, "api_token_scopes", []) or [])
|
||||
required_scopes = UPLOAD_WRITE_SCOPES if write else UPLOAD_READ_SCOPES
|
||||
if not token_scopes.intersection(required_scopes):
|
||||
raise HTTPException(403, f"API token missing required scope: {' or '.join(sorted(required_scopes))}")
|
||||
|
||||
# Non-owners and legacy ownerless uploads are strictly forbidden for delegated tokens.
|
||||
if file_owner is None or current_user != file_owner:
|
||||
raise HTTPException(404, "File not found")
|
||||
return
|
||||
|
||||
# Interactive session (cookie-authenticated human):
|
||||
# Owner access
|
||||
if file_owner is not None and current_user == file_owner:
|
||||
return
|
||||
|
||||
# Non-owner or legacy ownerless upload: administrator only
|
||||
if not (hasattr(auth_mgr, "is_admin") and auth_mgr.is_admin(current_user)):
|
||||
raise HTTPException(404, "File not found")
|
||||
|
||||
def _valid_session_id_for_owner(db, session_id: str | None, owner: str | None) -> str | None:
|
||||
if not session_id:
|
||||
return None
|
||||
@@ -280,6 +329,25 @@ def setup_upload_routes(upload_handler):
|
||||
session_id = None
|
||||
if not files:
|
||||
raise HTTPException(400, "No files uploaded")
|
||||
|
||||
if not auth_disabled():
|
||||
app = getattr(request, "app", None)
|
||||
if app is not None:
|
||||
auth_mgr = getattr(getattr(app, "state", None), "auth_manager", None)
|
||||
if auth_mgr is None:
|
||||
raise HTTPException(503, "Authentication service unavailable")
|
||||
if not getattr(auth_mgr, "is_configured", False):
|
||||
raise HTTPException(401, "Setup required")
|
||||
current_user = effective_user(request)
|
||||
if not current_user or is_request_sentinel_owner(current_user):
|
||||
raise HTTPException(403, "Access denied")
|
||||
if is_delegated_credential(request):
|
||||
token_owner = getattr(request.state, "api_token_owner", None)
|
||||
if not token_owner or is_request_sentinel_owner(token_owner):
|
||||
raise HTTPException(403, "API token has no valid owner")
|
||||
token_scopes = set(getattr(request.state, "api_token_scopes", []) or [])
|
||||
if not token_scopes.intersection(UPLOAD_WRITE_SCOPES):
|
||||
raise HTTPException(403, f"API token missing required scope: {' or '.join(sorted(UPLOAD_WRITE_SCOPES))}")
|
||||
|
||||
client_ip = request.client.host if request.client else "unknown"
|
||||
out = []
|
||||
@@ -303,6 +371,8 @@ def setup_upload_routes(upload_handler):
|
||||
for u in files:
|
||||
try:
|
||||
owner = effective_user(request)
|
||||
if is_request_sentinel_owner(owner):
|
||||
owner = None
|
||||
meta = upload_handler.save_upload(u, client_ip, owner=owner)
|
||||
promoted_gallery_id = _promote_chat_image_to_gallery(meta, owner, session_id, gallery_id)
|
||||
item = {
|
||||
@@ -382,15 +452,8 @@ def setup_upload_routes(upload_handler):
|
||||
info = next((fi for fi in db.values() if fi.get("id") == file_id), None)
|
||||
if info:
|
||||
original_name = info.get("name", file_id)
|
||||
auth_mgr = getattr(request.app.state, "auth_manager", None)
|
||||
auth_configured = bool(auth_mgr and auth_mgr.is_configured)
|
||||
current_user = effective_user(request)
|
||||
file_owner = info.get("owner") if info else None
|
||||
if auth_configured:
|
||||
if not current_user:
|
||||
raise HTTPException(403, "Access denied")
|
||||
if file_owner != current_user and not auth_mgr.is_admin(current_user):
|
||||
raise HTTPException(404, "File not found")
|
||||
_verify_upload_access(request, file_owner)
|
||||
path = _resolve_upload_path(file_id)
|
||||
mime = (info or {}).get("mime") or _mt.guess_type(path)[0] or "application/octet-stream"
|
||||
from fastapi.responses import FileResponse
|
||||
@@ -471,15 +534,9 @@ def setup_upload_routes(upload_handler):
|
||||
if not upload_handler.validate_upload_id(file_id):
|
||||
raise HTTPException(400, "Invalid file ID")
|
||||
info = _load_upload_info(file_id)
|
||||
auth_mgr = getattr(request.app.state, "auth_manager", None)
|
||||
auth_configured = bool(auth_mgr and auth_mgr.is_configured)
|
||||
current_user = effective_user(request)
|
||||
file_owner = info.get("owner") if info else None
|
||||
if auth_configured:
|
||||
if not current_user:
|
||||
raise HTTPException(403, "Access denied")
|
||||
if file_owner != current_user and not auth_mgr.is_admin(current_user):
|
||||
raise HTTPException(404, "File not found")
|
||||
_verify_upload_access(request, file_owner)
|
||||
current_user = effective_user(request)
|
||||
path = _resolve_upload_path(file_id)
|
||||
import mimetypes as _mt
|
||||
mime = (info or {}).get("mime") or _mt.guess_type(path)[0] or ""
|
||||
@@ -517,15 +574,9 @@ def setup_upload_routes(upload_handler):
|
||||
info = _load_upload_info(file_id)
|
||||
if not info:
|
||||
raise HTTPException(404, "File not found")
|
||||
auth_mgr = getattr(request.app.state, "auth_manager", None)
|
||||
auth_configured = bool(auth_mgr and auth_mgr.is_configured)
|
||||
current_user = effective_user(request)
|
||||
file_owner = info.get("owner")
|
||||
if auth_configured:
|
||||
if not current_user:
|
||||
raise HTTPException(403, "Access denied")
|
||||
if file_owner != current_user and not auth_mgr.is_admin(current_user):
|
||||
raise HTTPException(404, "File not found")
|
||||
_verify_upload_access(request, file_owner, write=True)
|
||||
current_user = effective_user(request)
|
||||
_resolve_upload_path(file_id)
|
||||
try:
|
||||
body = await request.json()
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Publish explicitly owned native ES modules; never run at application startup."""
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path, PurePosixPath
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def module_path(base: Path, relative: str) -> Path:
|
||||
"""Accept canonical JS paths only, contained within the declared tree."""
|
||||
if not isinstance(relative, str):
|
||||
raise ValueError("module paths must be strings")
|
||||
parts = PurePosixPath(relative)
|
||||
if (
|
||||
parts.is_absolute()
|
||||
or parts.as_posix() != relative
|
||||
or ".." in parts.parts
|
||||
or "\\" in relative
|
||||
or "?" in relative
|
||||
or "#" in relative
|
||||
or parts.suffix != ".js"
|
||||
):
|
||||
raise ValueError(f"invalid module path: {relative!r}")
|
||||
path = base / relative
|
||||
if not path.resolve().is_relative_to(base.resolve()):
|
||||
raise ValueError(f"module path escapes its tree: {relative!r}")
|
||||
if any(p.is_symlink() for p in (path, *path.parents)):
|
||||
raise ValueError(f"symlink in module path: {relative!r}")
|
||||
return path
|
||||
|
||||
|
||||
def check_lf_attributes(root: Path, paths: set[Path]) -> None:
|
||||
"""Require portable, repository-owned LF attributes for every mapped path.
|
||||
|
||||
Ask Git in an isolated temporary repository so global attributes, local
|
||||
info/attributes and alternate Git directories cannot mask missing rules.
|
||||
Copy only attribute files at ancestors of the manifest's source/output paths.
|
||||
"""
|
||||
git = shutil.which("git")
|
||||
if git is None:
|
||||
raise ValueError("Git is required for frontend publication attribute checks")
|
||||
attributes = {root / ".gitattributes"}
|
||||
for path in paths:
|
||||
for parent in path.parents:
|
||||
if parent == root:
|
||||
break
|
||||
attributes.add(parent / ".gitattributes")
|
||||
env = {key: value for key, value in os.environ.items() if not key.startswith("GIT_")}
|
||||
env.update(GIT_CONFIG_NOSYSTEM="1", GIT_CONFIG_GLOBAL=os.devnull)
|
||||
relative = sorted(path.relative_to(root).as_posix() for path in paths)
|
||||
with tempfile.TemporaryDirectory(prefix="ody-frontend-attributes-") as directory:
|
||||
target = Path(directory)
|
||||
for attribute in attributes:
|
||||
if attribute.is_symlink():
|
||||
raise ValueError(f"symlink attribute file: {attribute.relative_to(root)}")
|
||||
if attribute.is_file():
|
||||
copy = target / attribute.relative_to(root)
|
||||
copy.parent.mkdir(parents=True, exist_ok=True)
|
||||
copy.write_bytes(attribute.read_bytes())
|
||||
command = [git, "-c", f"core.attributesFile={os.devnull}", "-C", str(target)]
|
||||
try:
|
||||
subprocess.run(command + ["init", "--quiet", "--template="], env=env, check=True, capture_output=True, timeout=15)
|
||||
result = subprocess.run(
|
||||
command + ["check-attr", "-z", "--stdin", "text", "eol"],
|
||||
input=("\0".join(relative) + "\0").encode("utf-8"),
|
||||
env=env, check=True, capture_output=True, timeout=15,
|
||||
)
|
||||
except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as error:
|
||||
raise ValueError("Git frontend attribute check failed") from error
|
||||
fields = result.stdout.decode("utf-8").split("\0")[:-1]
|
||||
effective = {name: {} for name in relative}
|
||||
for index in range(0, len(fields), 3):
|
||||
name, attribute, value = fields[index:index + 3]
|
||||
effective[name][attribute] = value
|
||||
invalid = [
|
||||
f"{name} (text={values.get('text')}, eol={values.get('eol')})"
|
||||
for name, values in effective.items()
|
||||
if values != {"text": "set", "eol": "lf"}
|
||||
]
|
||||
if invalid:
|
||||
raise ValueError("manifest paths require repository-owned 'text eol=lf' Git attributes: " + ", ".join(invalid))
|
||||
|
||||
|
||||
def synchronize(root: Path = ROOT, *, check: bool = False) -> list[str]:
|
||||
"""Validate the entire plan before writing. Return stale deployment paths."""
|
||||
root = root.resolve()
|
||||
source_root = root / "frontend" / "src"
|
||||
static_root = root / "static"
|
||||
manifest = json.loads((root / "frontend" / "modules.json").read_text(encoding="utf-8"))
|
||||
if not isinstance(manifest, dict) or manifest.get("version") != 1 or not isinstance(manifest.get("modules"), list):
|
||||
raise ValueError("expected frontend module manifest version 1")
|
||||
if not manifest["modules"]:
|
||||
raise ValueError("module manifest must not be empty")
|
||||
sources, outputs, plan = set(), set(), []
|
||||
for entry in manifest["modules"]:
|
||||
source = module_path(source_root, entry["source"])
|
||||
output = module_path(static_root, entry["deployment"])
|
||||
if not entry["deployment"].startswith("js/"):
|
||||
raise ValueError("deployment modules must be under static/js/")
|
||||
if source in sources or output in outputs:
|
||||
raise ValueError("each source and deployment path must be unique")
|
||||
sources.add(source)
|
||||
outputs.add(output)
|
||||
content = source.read_bytes()
|
||||
if output.exists() and not output.is_file():
|
||||
raise ValueError(f"deployment path is not a file: {output}")
|
||||
plan.append((output, content))
|
||||
unlisted = set(source_root.rglob("*.js")) - sources
|
||||
if unlisted:
|
||||
raise ValueError(f"source modules missing from manifest: {sorted(map(str, unlisted))}")
|
||||
check_lf_attributes(root, sources | outputs)
|
||||
stale = []
|
||||
for output, content in plan:
|
||||
if not output.is_file() or output.read_bytes() != content:
|
||||
stale.append(output.relative_to(root).as_posix())
|
||||
if not check:
|
||||
for output, content in plan:
|
||||
if output.relative_to(root).as_posix() in stale:
|
||||
output.parent.mkdir(parents=True, exist_ok=True)
|
||||
output.write_bytes(content)
|
||||
return stale
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--check", action="store_true", help="fail on invalid attributes or stale output; write no deployment files")
|
||||
args = parser.parse_args()
|
||||
try:
|
||||
stale = synchronize(check=args.check)
|
||||
except (OSError, ValueError, KeyError, TypeError) as error:
|
||||
parser.exit(2, f"frontend: {error}\n")
|
||||
if args.check and stale:
|
||||
print("Stale frontend deployment modules: " + ", ".join(stale))
|
||||
print("Run python scripts/build_frontend.py and include the source and output changes together.")
|
||||
return 1
|
||||
print(f"Frontend {'check passed' if args.check else 'published'} ({len(stale)} changed modules).")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,180 @@
|
||||
/** Architecture gates for maintained source. Legacy static modules stay under existing guards. */
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { parse } from 'acorn';
|
||||
|
||||
const layers = ['domain', 'application', 'infrastructure', 'ui'];
|
||||
const platformIdentifiers = new Set(['window', 'document', 'globalThis', 'navigator', 'localStorage', 'sessionStorage', 'fetch', 'Notification', 'indexedDB', 'WebSocket', 'XMLHttpRequest', 'Worker', 'setTimeout', 'setInterval', 'clearTimeout', 'clearInterval', 'requestAnimationFrame', 'cancelAnimationFrame', 'performance', 'eval', 'Function']);
|
||||
|
||||
function ownership(source) {
|
||||
const parts = source.split('/');
|
||||
if (parts[0] === 'app' && parts.length >= 2) return { feature: 'app', layer: 'index' };
|
||||
if (parts[0] === 'shared') {
|
||||
if (parts.length === 2) return { feature: 'shared', layer: 'domain' };
|
||||
const layer = { domain: 'domain', platform: 'infrastructure', ui: 'ui' }[parts[1]];
|
||||
if (layer) return { feature: 'shared', layer };
|
||||
}
|
||||
if (parts[0] === 'features' && parts.length >= 3) {
|
||||
if (['app', 'shared'].includes(parts[1])) throw new Error(`reserved feature name: ${parts[1]}`);
|
||||
if (parts.length === 3 && parts[2] === 'index.js') return { feature: parts[1], layer: 'index' };
|
||||
if (layers.includes(parts[2]) && parts.length >= 4) return { feature: parts[1], layer: parts[2] };
|
||||
}
|
||||
throw new Error(`unsupported source ownership: ${source}`);
|
||||
}
|
||||
|
||||
export function allowsDependency(from, to) {
|
||||
const a = ownership(from), b = ownership(to);
|
||||
if (b.feature === 'app') return a.feature === 'app';
|
||||
if (a.feature === 'app') return b.feature === 'shared' || b.layer === 'index';
|
||||
if (b.feature === 'shared') {
|
||||
const shared = { domain: ['domain'], application: ['domain'], infrastructure: ['domain', 'infrastructure'], ui: ['domain', 'infrastructure', 'ui'], index: layers };
|
||||
return shared[a.layer].includes(b.layer);
|
||||
}
|
||||
if (a.feature === 'shared') return false;
|
||||
if (a.feature !== b.feature) return ['application', 'index'].includes(a.layer) && b.layer === 'index';
|
||||
const internal = { domain: ['domain'], application: ['domain', 'application'], infrastructure: ['domain', 'infrastructure'], ui: ['domain', 'application', 'ui'], index: layers };
|
||||
return internal[a.layer].includes(b.layer);
|
||||
}
|
||||
|
||||
export function imports(source, { domain = false } = {}) {
|
||||
const ast = parse(source, { ecmaVersion: 'latest', sourceType: 'module', locations: true });
|
||||
const found = [];
|
||||
function visit(node, parent, field) {
|
||||
if (!node || typeof node !== 'object') return;
|
||||
// Domain modules use explicit values/ports, including an injected clock.
|
||||
// Keep platform vocabulary out even when a local binding shadows a global.
|
||||
const propertyName = parent && !parent.computed && (
|
||||
(parent.type === 'MemberExpression' && field === 'property') ||
|
||||
(['Property', 'MethodDefinition'].includes(parent.type) && field === 'key' && !parent.shorthand)
|
||||
);
|
||||
if (domain && !propertyName && node.type === 'Identifier' && platformIdentifiers.has(node.name)) {
|
||||
throw new Error(`platform identifier in domain at line ${node.loc.start.line}: ${node.name}`);
|
||||
}
|
||||
if (domain && ((node.type === 'MemberExpression' && node.object.name === 'Date' && (node.property.name === 'now' || node.property.value === 'now')) || (['CallExpression', 'NewExpression'].includes(node.type) && node.callee.name === 'Date' && !node.arguments.length))) {
|
||||
throw new Error(`ambient clock in domain at line ${node.loc.start.line}; inject time`);
|
||||
}
|
||||
if (['ImportDeclaration', 'ExportNamedDeclaration', 'ExportAllDeclaration', 'ImportExpression'].includes(node.type) && node.source) {
|
||||
if (node.source.type !== 'Literal' || typeof node.source.value !== 'string') {
|
||||
throw new Error(`computed import at line ${node.loc.start.line}; use explicit import thunks`);
|
||||
}
|
||||
found.push({ specifier: node.source.value, line: node.loc.start.line, dynamic: node.type === 'ImportExpression' });
|
||||
}
|
||||
for (const [key, value] of Object.entries(node)) {
|
||||
if (Array.isArray(value)) value.forEach(item => visit(item, node, key));
|
||||
else if (value && typeof value === 'object' && value.type) visit(value, node, key);
|
||||
}
|
||||
}
|
||||
visit(ast);
|
||||
return found;
|
||||
}
|
||||
|
||||
export function checkArchitecture(root) {
|
||||
const manifest = JSON.parse(fs.readFileSync(path.join(root, 'frontend/modules.json'), 'utf8'));
|
||||
const bySource = new Map(manifest.modules.map(m => [m.source, m]));
|
||||
const byOutput = new Map(manifest.modules.map(m => [`/static/${m.deployment}`, m.source]));
|
||||
const graph = new Map();
|
||||
const errors = [];
|
||||
const sw = fs.readFileSync(path.join(root, 'static/sw.js'), 'utf8');
|
||||
// Parse the actual manifest arrays, not comments or unrelated strings.
|
||||
const swAst = parse(sw, { ecmaVersion: 'latest', sourceType: 'script' });
|
||||
const precached = new Set();
|
||||
for (const statement of swAst.body) {
|
||||
for (const declaration of statement.declarations || []) {
|
||||
if (['PRECACHE', 'PANEL_PRECACHE'].includes(declaration.id.name)) {
|
||||
for (const item of declaration.init.elements) {
|
||||
if (item?.type === 'Literal' && typeof item.value === 'string') precached.add(item.value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for (const module of manifest.modules) {
|
||||
try {
|
||||
const owner = ownership(module.source);
|
||||
const deployed = `/static/${module.deployment}`;
|
||||
if (!precached.has(deployed)) throw new Error(`deployment URL absent from explicit precache: ${deployed}`);
|
||||
const dependencies = [];
|
||||
const exceptions = module.legacyImports || [];
|
||||
const used = new Set();
|
||||
for (const { specifier, line } of imports(fs.readFileSync(path.join(root, 'frontend/src', module.source), 'utf8'), { domain: owner.layer === 'domain' })) {
|
||||
const fail = message => { throw new Error(`line ${line}: ${message}: ${specifier}`); };
|
||||
const runtime = new URL(specifier, `https://odysseus.invalid${deployed}`);
|
||||
if (!runtime.pathname.startsWith('/static/js/') || !runtime.pathname.endsWith('.js') || runtime.pathname.includes('%')) fail('runtime imports must name canonical static JS paths');
|
||||
let target;
|
||||
if (specifier.startsWith('.')) {
|
||||
if (runtime.search || runtime.hash) fail('maintained modules use one unversioned URL identity');
|
||||
target = path.posix.normalize(path.posix.join(path.posix.dirname(module.source), specifier));
|
||||
if (!bySource.has(target)) fail('relative import must name maintained source');
|
||||
if (runtime.pathname !== `/static/${bySource.get(target).deployment}`) fail('source and deployment relative paths resolve differently');
|
||||
} else if (specifier.startsWith('/static/')) {
|
||||
target = byOutput.get(runtime.pathname);
|
||||
if (!target) {
|
||||
const exception = exceptions.find(e => e.specifier === specifier && e.reason?.trim());
|
||||
if (!exception || !['index', 'infrastructure', 'ui'].includes(owner.layer) || owner.feature === 'shared') fail('legacy import requires an explicit module-scoped rationale at a composition, infrastructure or UI boundary');
|
||||
if (!fs.statSync(path.join(root, runtime.pathname.slice(1))).isFile()) fail('legacy target does not exist');
|
||||
used.add(exception);
|
||||
continue;
|
||||
}
|
||||
} else fail('bare, external and source-tree runtime imports are unsupported');
|
||||
if (runtime.search || runtime.hash) fail('maintained modules use one unversioned URL identity');
|
||||
if (!allowsDependency(module.source, target)) fail(`forbidden dependency on ${target}`);
|
||||
dependencies.push(target);
|
||||
}
|
||||
if (exceptions.some(e => !used.has(e))) throw new Error('unused legacy import exception');
|
||||
graph.set(module.source, dependencies);
|
||||
} catch (error) { errors.push(`${module.source}: ${error.message}`); }
|
||||
}
|
||||
const visiting = new Set(), visited = new Set();
|
||||
function visit(source, trail = []) {
|
||||
if (visiting.has(source)) throw new Error(`maintained-source dependency cycle: ${[...trail, source].join(' -> ')}`);
|
||||
if (visited.has(source)) return;
|
||||
visiting.add(source);
|
||||
for (const target of graph.get(source) || []) visit(target, [...trail, source]);
|
||||
visiting.delete(source);
|
||||
visited.add(source);
|
||||
}
|
||||
try { for (const source of graph.keys()) visit(source); }
|
||||
catch (error) { errors.push(error.message); }
|
||||
if (errors.length) throw new Error(errors.join('\n'));
|
||||
return graph.size;
|
||||
}
|
||||
|
||||
export function inventory(root) {
|
||||
const staticRoot = path.join(root, 'static');
|
||||
const files = fs.readdirSync(staticRoot, { recursive: true }).map(p => p.split(path.sep).join('/')).filter(p => p.endsWith('.js') && !p.startsWith('lib/') && !p.startsWith('js/editor/build/')).sort();
|
||||
const graph = new Map(), fan = new Map(), missing = [];
|
||||
let staticImports = 0, dynamicLiteralImports = 0;
|
||||
for (const file of files) {
|
||||
const targets = [];
|
||||
for (const { specifier, dynamic } of imports(fs.readFileSync(path.join(staticRoot, file), 'utf8'))) {
|
||||
if (!specifier.startsWith('.') && !specifier.startsWith('/static/')) continue;
|
||||
const target = new URL(specifier, `https://odysseus.invalid/static/${file}`).pathname.slice('/static/'.length);
|
||||
if (dynamic) dynamicLiteralImports++;
|
||||
else { staticImports++; targets.push(target); }
|
||||
fan.set(target, (fan.get(target) || 0) + 1);
|
||||
if (!fs.existsSync(path.join(staticRoot, target))) missing.push({ file, specifier });
|
||||
}
|
||||
graph.set(file, targets);
|
||||
}
|
||||
const indices = new Map(), low = new Map(), stack = [], active = new Set(), staticCycles = [];
|
||||
function visit(v) {
|
||||
indices.set(v, indices.size); low.set(v, indices.get(v)); stack.push(v); active.add(v);
|
||||
for (const w of graph.get(v) || []) {
|
||||
if (!indices.has(w)) { visit(w); low.set(v, Math.min(low.get(v), low.get(w))); }
|
||||
else if (active.has(w)) low.set(v, Math.min(low.get(v), indices.get(w)));
|
||||
}
|
||||
if (low.get(v) === indices.get(v)) {
|
||||
const component = []; let w;
|
||||
do { w = stack.pop(); active.delete(w); component.push(w); } while (w !== v);
|
||||
if (component.length > 1) staticCycles.push(component.sort());
|
||||
}
|
||||
}
|
||||
for (const file of files) if (!indices.has(file)) visit(file);
|
||||
return { files: files.length, staticImports, dynamicLiteralImports, missing, fanIn: [...fan].sort((a, b) => b[1] - a[1]).slice(0, 8), staticCycles };
|
||||
}
|
||||
|
||||
if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
|
||||
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
|
||||
try { console.log(process.argv.includes('--inventory') ? JSON.stringify(inventory(root), null, 2) : `Frontend architecture passed (${checkArchitecture(root)} maintained modules).`); }
|
||||
catch (error) { console.error(error.message); process.exitCode = 1; }
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Verify the current Python runtime from an isolated distribution without frontend tooling."""
|
||||
import os
|
||||
import json
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
PROBE = """
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import json
|
||||
import sys
|
||||
from starlette.testclient import TestClient
|
||||
from app import app
|
||||
assert not Path('frontend').exists()
|
||||
assert not Path('node_modules').exists()
|
||||
assert shutil.which('node') is None
|
||||
with TestClient(app) as client:
|
||||
for output in json.loads(sys.argv[1]):
|
||||
asset = client.get('/static/' + output)
|
||||
assert asset.status_code == 200, (output, asset.status_code)
|
||||
assert asset.content == Path('static', output).read_bytes(), output
|
||||
assert asset.headers['content-type'].startswith('text/javascript'), output
|
||||
assert asset.headers['cache-control'] == 'no-cache', output
|
||||
response = client.get('/static/js/actionMenuOrder.js')
|
||||
assert response.status_code == 200, response.status_code
|
||||
assert response.content == Path('static/js/actionMenuOrder.js').read_bytes()
|
||||
assert response.headers['content-type'].startswith('text/javascript'), response.headers
|
||||
assert response.headers['cache-control'] == 'no-cache', response.headers
|
||||
assert "script-src 'self' 'nonce-" in response.headers['content-security-policy'], response.headers
|
||||
assert client.get('/frontend/src/shared/actionMenuOrder.js').status_code == 404
|
||||
assert client.get('/static/%2e%2e/app.py').status_code == 404
|
||||
shell = client.get('/')
|
||||
assert shell.status_code == 200, shell.status_code
|
||||
assert '{{CSP_NONCE}}' not in shell.text
|
||||
assert '/static/app.js' in shell.text
|
||||
print('PASS: isolated Python lifespan, shell, deployed bytes, MIME, revalidation, CSP and source-tree 404')
|
||||
"""
|
||||
|
||||
|
||||
def main() -> int:
|
||||
with tempfile.TemporaryDirectory(prefix="ody-f1-distribution-") as directory, socket.socket() as chroma_guard:
|
||||
target = Path(directory)
|
||||
for name in ("app.py", "HARNESS_VERSION"):
|
||||
shutil.copy2(ROOT / name, target / name)
|
||||
for name in ("core", "routes", "src", "services", "resources", "mcp_servers", "companion", "config", "static", "scripts"):
|
||||
shutil.copytree(ROOT / name, target / name, ignore=shutil.ignore_patterns("__pycache__", "node_modules", ".env", "secrets.env*", "*.db", "*.sqlite*"))
|
||||
# Reserve a non-listening port so initialization cannot reach a real store.
|
||||
chroma_guard.bind(("127.0.0.1", 0))
|
||||
env = dict(os.environ)
|
||||
env.update(
|
||||
ODYSSEUS_DATA_DIR=str(target / "data"),
|
||||
DATABASE_URL="sqlite:///:memory:",
|
||||
AUTH_ENABLED="false",
|
||||
ODYSSEUS_STARTUP_WARMUPS="0",
|
||||
ODYSSEUS_TOOL_INDEX_PREWARM="0",
|
||||
CHROMADB_HOST="127.0.0.1",
|
||||
CHROMADB_PORT=str(chroma_guard.getsockname()[1]),
|
||||
FASTEMBED_CACHE_PATH=str(target / "fastembed"),
|
||||
PATH=str(target / "no-development-tools"),
|
||||
)
|
||||
# A caller's Python search path must not import the original checkout.
|
||||
env.pop("PYTHONPATH", None)
|
||||
outputs = [entry['deployment'] for entry in json.loads(
|
||||
(ROOT / 'frontend/modules.json').read_text(encoding='utf-8')
|
||||
)['modules']]
|
||||
result = subprocess.run([sys.executable, "-c", PROBE, json.dumps(outputs)], cwd=target, env=env, capture_output=True, text=True, timeout=60)
|
||||
print(result.stdout, end="")
|
||||
if result.returncode:
|
||||
print(result.stderr[-8000:], file=sys.stderr)
|
||||
return result.returncode
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,76 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Run real Notes UI and API against a disposable native distribution and database."""
|
||||
import os
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
from urllib.request import urlopen
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def main():
|
||||
with tempfile.TemporaryDirectory(prefix="ody-notes-native-") as directory, socket.socket() as chroma_guard:
|
||||
target = Path(directory)
|
||||
for name in ("app.py", "HARNESS_VERSION"):
|
||||
shutil.copy2(ROOT / name, target / name)
|
||||
for name in ("core", "routes", "src", "services", "resources", "mcp_servers", "companion", "config", "static"):
|
||||
shutil.copytree(ROOT / name, target / name, ignore=shutil.ignore_patterns("__pycache__", ".env", "secrets.env*", "*.db", "*.sqlite*"))
|
||||
chroma_guard.bind(("127.0.0.1", 0))
|
||||
with socket.socket() as app_port:
|
||||
app_port.bind(("127.0.0.1", 0))
|
||||
port = app_port.getsockname()[1]
|
||||
env = dict(os.environ)
|
||||
env.update(
|
||||
ODYSSEUS_DATA_DIR=str(target / "data"),
|
||||
DATABASE_URL="sqlite:///" + str(target / "notes.db"), AUTH_ENABLED="true",
|
||||
ODYSSEUS_STARTUP_WARMUPS="0", ODYSSEUS_TOOL_INDEX_PREWARM="0",
|
||||
CHROMADB_HOST="127.0.0.1", CHROMADB_PORT=str(chroma_guard.getsockname()[1]),
|
||||
FASTEMBED_CACHE_PATH=str(target / "fastembed"),
|
||||
)
|
||||
env.pop("PYTHONPATH", None)
|
||||
server = subprocess.Popen(
|
||||
[sys.executable, "-m", "uvicorn", "app:app", "--host", "127.0.0.1", "--port", str(port)],
|
||||
cwd=target, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True,
|
||||
)
|
||||
result = None
|
||||
try:
|
||||
origin = f"http://127.0.0.1:{port}"
|
||||
deadline = time.monotonic() + 45
|
||||
while time.monotonic() < deadline:
|
||||
if server.poll() is not None:
|
||||
raise RuntimeError("Disposable Notes server exited during startup")
|
||||
try:
|
||||
with urlopen(origin + "/", timeout=1) as response:
|
||||
if response.status == 200:
|
||||
break
|
||||
except OSError:
|
||||
time.sleep(0.1)
|
||||
else:
|
||||
raise RuntimeError("Disposable Notes server did not become ready")
|
||||
result = subprocess.run(
|
||||
["node", "tests/browser/notesNative.mjs"], cwd=ROOT,
|
||||
env=dict(os.environ, ODYSSEUS_NOTES_RUNTIME_ORIGIN=origin, NOTES_TEST_PYTHON=sys.executable),
|
||||
capture_output=True, text=True, timeout=120,
|
||||
)
|
||||
print(result.stdout, end="")
|
||||
if result.returncode:
|
||||
print(result.stderr, file=sys.stderr)
|
||||
return result.returncode
|
||||
finally:
|
||||
server.terminate()
|
||||
try:
|
||||
logs, _ = server.communicate(timeout=10)
|
||||
except subprocess.TimeoutExpired:
|
||||
server.kill()
|
||||
logs, _ = server.communicate()
|
||||
if result is None or result.returncode:
|
||||
print(logs[-8000:], file=sys.stderr)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -331,6 +331,7 @@ async def extract_and_store(
|
||||
|
||||
try:
|
||||
from src.llm_core import llm_call_async
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
# Get last N messages from session
|
||||
messages = session.get_context_messages()
|
||||
@@ -404,6 +405,9 @@ async def extract_and_store(
|
||||
# enough once thinking has room.
|
||||
max_tokens=4096,
|
||||
headers=headers,
|
||||
reasoning_effort=effort_for_call(
|
||||
endpoint_url, model, getattr(session, "owner", None), session
|
||||
),
|
||||
)
|
||||
|
||||
# Parse JSON, tolerating reasoning-model noise (<think> blocks, a
|
||||
@@ -559,6 +563,7 @@ async def update_persona_memory(
|
||||
|
||||
try:
|
||||
from src.llm_core import llm_call_async
|
||||
from src.utility_effort import effort_for_call
|
||||
from src.text_helpers import strip_think
|
||||
|
||||
custom = {}
|
||||
@@ -607,6 +612,9 @@ async def update_persona_memory(
|
||||
temperature=0.1,
|
||||
max_tokens=1200,
|
||||
headers=headers,
|
||||
reasoning_effort=effort_for_call(
|
||||
endpoint_url, model, getattr(session, "owner", None), session
|
||||
),
|
||||
)
|
||||
|
||||
updated = strip_think(str(raw or ""), prose=True, prompt_echo=True).strip()
|
||||
@@ -643,6 +651,7 @@ async def audit_memories(
|
||||
"""
|
||||
try:
|
||||
from src.llm_core import llm_call_async
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
existing = memory_manager.load(owner=owner)
|
||||
if not existing:
|
||||
@@ -691,6 +700,7 @@ async def audit_memories(
|
||||
# Bound the call so the Tidy whirlpool can't spin indefinitely on a
|
||||
# slow/large generation.
|
||||
timeout=120,
|
||||
reasoning_effort=effort_for_call(endpoint_url, model, owner),
|
||||
)
|
||||
|
||||
# Parse the JSON list, tolerating reasoning-model noise: <think> blocks,
|
||||
|
||||
@@ -149,6 +149,7 @@ async def maybe_extract_skill(
|
||||
|
||||
try:
|
||||
from src.llm_core import llm_call_async
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
# Get recent messages
|
||||
history = session.get_context_messages()
|
||||
@@ -204,6 +205,7 @@ async def maybe_extract_skill(
|
||||
],
|
||||
headers=headers,
|
||||
timeout=30,
|
||||
reasoning_effort=effort_for_call(endpoint_url, model, owner, session),
|
||||
)
|
||||
logger.debug(
|
||||
"[skill-extract] LLM returned in %.1fs (len=%d, head=%r)",
|
||||
|
||||
@@ -674,6 +674,7 @@ class SkillsManager:
|
||||
*,
|
||||
active_toolsets: Optional[List[str]] = None,
|
||||
platform: Optional[str] = None,
|
||||
local_model: Optional[bool] = None,
|
||||
) -> List[Dict]:
|
||||
"""Return the `[{name, description, category, status}]` list the
|
||||
agent sees in its system prompt.
|
||||
@@ -710,6 +711,11 @@ class SkillsManager:
|
||||
# Platform gating
|
||||
if platform and s.get("platforms") and platform not in s["platforms"]:
|
||||
continue
|
||||
# remote-only tag: hide from local/private-endpoint models. Big
|
||||
# on-demand reference lookups overwhelm small local contexts.
|
||||
# local_model=None (API listings, UI) never gates.
|
||||
if local_model and "remote-only" in (s.get("tags") or []):
|
||||
continue
|
||||
# requires_toolsets: hide unless every required toolset is active.
|
||||
# active_toolsets=None means the caller doesn't know the active
|
||||
# set (API listings, chat preface) — don't gate in that case;
|
||||
@@ -745,6 +751,7 @@ class SkillsManager:
|
||||
min_confidence: float = 0.0,
|
||||
available_toolsets: Optional[Iterable[str]] = None,
|
||||
platform: Optional[str] = None,
|
||||
published_only: bool = False,
|
||||
) -> List[Dict]:
|
||||
if skills is None:
|
||||
skills = self.load_all()
|
||||
@@ -775,9 +782,15 @@ class SkillsManager:
|
||||
if not skill.get("platforms") or platform in skill.get("platforms", [])
|
||||
]
|
||||
# Prompt injection is fail-closed for user skills. Built-ins are
|
||||
# shipped procedures; every other skill needs a passing audit and a
|
||||
# confidence score at the user's current threshold.
|
||||
if min_confidence > 0:
|
||||
# shipped procedures. With Auto-approve OFF (published_only), the
|
||||
# user's publish is the approval; otherwise a skill needs a passing
|
||||
# audit and a confidence score at the user's current threshold.
|
||||
if published_only:
|
||||
skills = [
|
||||
s for s in skills
|
||||
if s.get("source") == "builtin" or s.get("status") == "published"
|
||||
]
|
||||
elif min_confidence > 0:
|
||||
def _passes(s):
|
||||
if s.get("source") == "builtin":
|
||||
return True
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
"""Skills domain operations; persistence and lifecycle remain in SkillsManager."""
|
||||
@@ -0,0 +1,308 @@
|
||||
"""Agent execution, transcripts and same-task stream cleanup."""
|
||||
|
||||
import logging
|
||||
from contextlib import aclosing
|
||||
from typing import Optional
|
||||
|
||||
from .dependencies import AuditDependencies
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
_skill_test_jobs: dict = {}
|
||||
|
||||
|
||||
class SkillAuditUnavailable(RuntimeError):
|
||||
"""The test infrastructure failed; this is not evidence about a skill."""
|
||||
|
||||
|
||||
async def run_test_job(
|
||||
key,
|
||||
name,
|
||||
md,
|
||||
task,
|
||||
url,
|
||||
model,
|
||||
headers,
|
||||
owner,
|
||||
skills_manager=None,
|
||||
*,
|
||||
messages=None,
|
||||
transcript=None,
|
||||
exact_approval=None,
|
||||
request_authority=None,
|
||||
deps: AuditDependencies,
|
||||
):
|
||||
"""Background coroutine: run the skill in an agent loop, capture a condensed
|
||||
log + transcript, then have the judge grade it. Writes into deps.test_jobs."""
|
||||
import json as _json
|
||||
from src.agent_loop import stream_agent_loop
|
||||
from src.agent_runtime.authority import RequestAuthority
|
||||
|
||||
job = deps.test_jobs.get(key)
|
||||
if job is None:
|
||||
return
|
||||
log = job["log"]
|
||||
transcript = transcript if isinstance(transcript, list) else []
|
||||
say_buf = []
|
||||
skill_stats = {"turns": 0, "tool_calls": 0}
|
||||
|
||||
def _flush_say():
|
||||
if say_buf:
|
||||
log.append({"type": "say", "text": "".join(say_buf)})
|
||||
say_buf.clear()
|
||||
|
||||
messages = list(messages) if isinstance(messages, list) else deps.test_messages(md, task)
|
||||
try:
|
||||
# aclosing: pausing for an approval leaves this loop early, and the
|
||||
# stream's ContextVar cleanup must run in this task, not in asyncio's
|
||||
# finalizer (#6635).
|
||||
async with aclosing(stream_agent_loop(
|
||||
url, model, messages, headers=headers,
|
||||
temperature=0.3, max_tokens=0, max_rounds=8, owner=owner,
|
||||
exact_approval=exact_approval,
|
||||
request_authority=(request_authority or (
|
||||
exact_approval.pending.request_authority if exact_approval is not None else None
|
||||
) or RequestAuthority.empty(owner=owner)),
|
||||
)) as stream:
|
||||
async for chunk in stream:
|
||||
if not chunk.startswith("data: ") or chunk.strip() == "data: [DONE]":
|
||||
continue
|
||||
try:
|
||||
d = _json.loads(chunk[6:])
|
||||
except Exception:
|
||||
continue
|
||||
if d.get("delta"):
|
||||
say_buf.append(d["delta"]); transcript.append(d["delta"])
|
||||
elif d.get("type") == "tool_start":
|
||||
_flush_say()
|
||||
skill_stats["tool_calls"] += 1
|
||||
cmd = str(d.get("command") or d.get("args") or "")[:300]
|
||||
log.append({"type": "tool_start", "tool": d.get("tool"), "command": cmd})
|
||||
transcript.append(f"\n[tool {d.get('tool')}] {cmd}\n")
|
||||
elif d.get("type") == "tool_output":
|
||||
_flush_say()
|
||||
out = str(d.get("output") or "")[:600]
|
||||
tool_log = {"type": "tool_output", "output": out}
|
||||
approval = d.get("ask_user")
|
||||
if isinstance(approval, dict):
|
||||
tool_log["ask_user"] = approval
|
||||
log.append(tool_log)
|
||||
transcript.append(f"[output] {out}\n")
|
||||
if (
|
||||
isinstance(approval, dict)
|
||||
and approval.get("kind") == "tool_approval"
|
||||
and approval.get("approval_id")
|
||||
):
|
||||
# Manual skill tests have their own polling UI instead of a
|
||||
# chat session. Pause the run and retain only server-side
|
||||
# continuation state until the same owner approves/denies
|
||||
# this exact sealed action.
|
||||
job["status"] = "awaiting_approval"
|
||||
job["approval"] = approval
|
||||
job["_transcript"] = transcript
|
||||
return
|
||||
elif d.get("type") == "agent_step":
|
||||
_flush_say()
|
||||
try:
|
||||
skill_stats["turns"] = max(skill_stats["turns"], int(d.get("round") or 0))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
log.append({"type": "agent_step", "round": d.get("round")})
|
||||
transcript.append(f"\n--- round {d.get('round')} ---\n")
|
||||
elif d.get("type") == "metrics":
|
||||
data = d.get("data") or {}
|
||||
try:
|
||||
skill_stats["turns"] = max(skill_stats["turns"], int(data.get("agent_rounds") or 0))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
try:
|
||||
skill_stats["tool_calls"] = max(skill_stats["tool_calls"], int(data.get("tool_calls") or 0))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
if len(log) > 600:
|
||||
del log[0:len(log) - 600]
|
||||
_flush_say()
|
||||
except Exception as e:
|
||||
_flush_say()
|
||||
log.append({"type": "error", "error": str(e)})
|
||||
|
||||
job.pop("approval", None)
|
||||
job.pop("_transcript", None)
|
||||
job.pop("_run", None)
|
||||
log.append({"type": "evaluating"})
|
||||
try:
|
||||
baseline_task = task
|
||||
log.append({"type": "agent_step", "round": "baseline"})
|
||||
baseline_transcript, baseline_stats, baseline_approval = await deps.run_arm(
|
||||
deps.baseline_messages(baseline_task),
|
||||
url,
|
||||
model,
|
||||
headers,
|
||||
owner,
|
||||
)
|
||||
if baseline_approval is not None:
|
||||
try:
|
||||
from src.tool_approvals import tool_approval_store
|
||||
tool_approval_store.consume(
|
||||
baseline_approval.get("approval_id"),
|
||||
decision="deny",
|
||||
owner=owner,
|
||||
session_id=None,
|
||||
)
|
||||
except Exception:
|
||||
logger.debug("Could not retire manual-test baseline approval", exc_info=True)
|
||||
job["verdict"] = await deps.evaluate_run(
|
||||
md,
|
||||
task,
|
||||
"".join(transcript),
|
||||
url,
|
||||
model,
|
||||
headers,
|
||||
baseline_transcript=baseline_transcript,
|
||||
skill_stats=skill_stats,
|
||||
baseline_stats=baseline_stats,
|
||||
owner=owner,
|
||||
)
|
||||
except Exception as e:
|
||||
job["verdict"] = {"verdict": "unknown", "confidence": 0, "summary": f"Eval failed: {e}", "issues": []}
|
||||
# Record the result so the card shows a 'verified' check (a manual test
|
||||
# never involves the teacher) and nudge the confidence score to match the
|
||||
# verdict — same scale as Audit-all's pass=0.95. inconclusive/unknown leave
|
||||
# the score alone (missing-fixture or parse failures shouldn't punish it).
|
||||
if skills_manager is not None:
|
||||
v = (job["verdict"] or {}).get("verdict") or "unknown"
|
||||
try:
|
||||
skills_manager.set_audit(
|
||||
name,
|
||||
v,
|
||||
by_teacher=False,
|
||||
worker_model=model,
|
||||
owner=owner,
|
||||
**deps.verdict_efficiency(job.get("verdict")),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
conf = {"pass": 0.95, "needs_work": 0.6, "fail": 0.4}.get(v)
|
||||
if conf is not None:
|
||||
try:
|
||||
skills_manager.update_skill(name, {"confidence": conf}, owner=owner)
|
||||
except Exception:
|
||||
pass
|
||||
job["status"] = "done"
|
||||
|
||||
|
||||
async def run_audit_arm(messages: list[dict], url, model, headers, owner,
|
||||
workload: str = "foreground") -> tuple[str, dict, Optional[dict]]:
|
||||
"""Run one audit arm in the agent loop; return transcript, stats, approval."""
|
||||
import json as _json
|
||||
from src.agent_loop import stream_agent_loop
|
||||
from src.agent_runtime.authority import RequestAuthority, active_request_authority
|
||||
transcript = []
|
||||
approval_required = None
|
||||
stats = {"turns": 0, "tool_calls": 0}
|
||||
try:
|
||||
# max_tokens explicitly set: passing 0 lets some upstreams (Ollama,
|
||||
# OpenAI-compat) generate an empty completion, which manifested as
|
||||
# the skill test returning nothing while chat (which carries its
|
||||
# preset's max_tokens) worked. 4096 matches the chat default.
|
||||
# aclosing: stopping for an approval leaves this loop early (#6635).
|
||||
async with aclosing(stream_agent_loop(
|
||||
url, model, messages, headers=headers,
|
||||
temperature=0.3, max_tokens=4096, max_rounds=8,
|
||||
owner=owner, workload=workload, suppress_skills=True,
|
||||
request_authority=(active_request_authority() or RequestAuthority.empty(owner=owner)),
|
||||
)) as stream:
|
||||
async for chunk in stream:
|
||||
# Streams can include an SSE event line before the data line,
|
||||
# notably `event: error`. Do not silently discard those failures.
|
||||
payload = next((line[6:] for line in chunk.splitlines() if line.startswith("data: ")), None)
|
||||
if payload is None or payload == "[DONE]":
|
||||
continue
|
||||
try:
|
||||
d = _json.loads(payload)
|
||||
except Exception:
|
||||
continue
|
||||
if d.get("error") or d.get("type") == "error":
|
||||
raise SkillAuditUnavailable(str(d.get("error") or d.get("message") or "Audit stream failed"))
|
||||
if d.get("delta"):
|
||||
transcript.append(d["delta"])
|
||||
elif d.get("type") == "tool_start":
|
||||
stats["tool_calls"] += 1
|
||||
transcript.append(f"\n[tool {d.get('tool')}] {str(d.get('command') or d.get('args') or '')[:300]}\n")
|
||||
elif d.get("type") == "tool_output":
|
||||
transcript.append(f"[output] {str(d.get('output') or '')[:600]}\n")
|
||||
approval = d.get("ask_user")
|
||||
if (
|
||||
isinstance(approval, dict)
|
||||
and approval.get("kind") == "tool_approval"
|
||||
):
|
||||
approval_required = approval
|
||||
break
|
||||
elif d.get("type") == "agent_step":
|
||||
try:
|
||||
stats["turns"] = max(stats["turns"], int(d.get("round") or 0))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
transcript.append(f"\n--- round {d.get('round')} ---\n")
|
||||
elif d.get("type") == "metrics":
|
||||
data = d.get("data") or {}
|
||||
try:
|
||||
stats["turns"] = max(stats["turns"], int(data.get("agent_rounds") or 0))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
try:
|
||||
stats["tool_calls"] = max(stats["tool_calls"], int(data.get("tool_calls") or 0))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
except SkillAuditUnavailable:
|
||||
raise
|
||||
except Exception as e:
|
||||
raise SkillAuditUnavailable(str(e)) from e
|
||||
return "".join(transcript), stats, approval_required
|
||||
|
||||
|
||||
async def run_test_once(md: str, task: str, url, model, headers, owner,
|
||||
workload: str = "foreground", *, deps: AuditDependencies) -> tuple:
|
||||
"""Run the skill once in the agent loop; return (transcript, verdict)."""
|
||||
messages = deps.test_messages(md, task)
|
||||
text, stats, approval_required = await deps.run_arm(
|
||||
messages, url, model, headers, owner, workload=workload,
|
||||
)
|
||||
if approval_required is not None:
|
||||
# Unattended audits have no authority to approve and no UI that could
|
||||
# resume this record. Destructively deny it now instead of leaving a
|
||||
# reusable opaque grant pending until TTL/cap eviction.
|
||||
try:
|
||||
from src.tool_approvals import tool_approval_store
|
||||
tool_approval_store.consume(
|
||||
approval_required.get("approval_id"),
|
||||
decision="deny",
|
||||
owner=owner,
|
||||
session_id=None,
|
||||
)
|
||||
except Exception:
|
||||
logger.debug("Could not retire unattended skill approval", exc_info=True)
|
||||
return text, {
|
||||
"verdict": "inconclusive",
|
||||
"confidence": 1.0,
|
||||
"summary": (
|
||||
"This automated audit reached an exact action that requires "
|
||||
"a human approval; no action was executed."
|
||||
),
|
||||
"issues": [
|
||||
"Run this skill's manual test and review the sealed action."
|
||||
],
|
||||
"approval_required": True,
|
||||
}
|
||||
verdict = await deps.evaluate_run(
|
||||
md,
|
||||
task,
|
||||
text,
|
||||
url,
|
||||
model,
|
||||
headers,
|
||||
skill_stats=stats,
|
||||
workload=workload,
|
||||
owner=owner,
|
||||
)
|
||||
return text, verdict
|
||||
@@ -0,0 +1,439 @@
|
||||
"""Sequential skill audit coordination and transient owner-scoped jobs."""
|
||||
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
from services.memory.skills import SkillsManager
|
||||
from .dependencies import AuditDependencies
|
||||
|
||||
from .agent_runner import SkillAuditUnavailable
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
_skill_audit_jobs: dict = {}
|
||||
|
||||
|
||||
async def audit_one_skill(skills_manager, skill, url, model, headers,
|
||||
teacher, owner, log, workload: str = "foreground", *, deps: AuditDependencies) -> dict:
|
||||
"""Test → judge → self-edit+retry → (teacher edit+retry) → flag. Never deletes;
|
||||
a skill the teacher still can't fix is demoted to draft for manual review.
|
||||
`teacher` is (url, model, headers) or None. `log(msg)` records progress."""
|
||||
name = skill.get("name")
|
||||
|
||||
# Reflect the audit outcome in the skill's confidence so the main list
|
||||
# updates: a clean pass earns high confidence; a pass that needed fixing
|
||||
# earns a bit less; a skill that still fails is marked low.
|
||||
def _set_conf(c):
|
||||
try:
|
||||
skills_manager.update_skill(name, {"confidence": c}, owner=owner)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
md = skills_manager.read_skill_md(name, owner=owner)
|
||||
if not md:
|
||||
log(f"{name}: no source — skipped")
|
||||
return {"skill": name, "result": "skipped"}
|
||||
|
||||
# Cheap deterministic cleanup first. If this is an obvious lower-priority
|
||||
# duplicate, do not spend LLM turns on necessity, retrieval precision,
|
||||
# skill-vs-baseline testing, self-edit, or teacher escalation.
|
||||
duplicate_of = deps.duplicate_blocker(skills_manager, name, owner)
|
||||
if duplicate_of:
|
||||
reason = f"Lower-priority duplicate of {duplicate_of}"
|
||||
try:
|
||||
skills_manager.update_skill(name, {"status": "draft", "confidence": 0.35}, owner=owner)
|
||||
skills_manager.set_audit(name, "skipped", by_teacher=False, worker_model=model, owner=owner)
|
||||
skills_manager.set_necessity(name, False, [duplicate_of], reason, owner=owner)
|
||||
except Exception:
|
||||
pass
|
||||
log(f"{name}: draft — skipped audit ({reason[:100]})")
|
||||
return {"skill": name, "result": "skipped_duplicate", "reason": reason, "confidence": 0.35, "status": "draft"}
|
||||
|
||||
# Advisory necessity/redundancy check — runs once, independent of the test
|
||||
# outcome, and only records a flag the UI surfaces (never deletes/demotes).
|
||||
others = []
|
||||
nec = None
|
||||
try:
|
||||
# Only compare against skills the SAME owner can see, so the necessity
|
||||
# judge never sees (or flags "redundant_with") another user's skills.
|
||||
sk_owner = skill.get("owner")
|
||||
others = [
|
||||
{"name": s.get("name"), "description": s.get("description", "")}
|
||||
for s in skills_manager.load(owner=owner)
|
||||
if s.get("name") and s.get("name") != name
|
||||
and (not sk_owner or not s.get("owner") or s.get("owner") == sk_owner)
|
||||
]
|
||||
nec = await deps.evaluate_necessity(
|
||||
md, others, url, model, headers, workload=workload,
|
||||
owner=owner,
|
||||
)
|
||||
if nec is not None:
|
||||
skills_manager.set_necessity(name, nec.get("necessary", True),
|
||||
nec.get("redundant_with"), nec.get("reason"),
|
||||
owner=owner)
|
||||
if not nec.get("necessary", True):
|
||||
log(f"{name}: possibly unnecessary — {nec.get('reason', '')[:80]}")
|
||||
except Exception as e:
|
||||
log(f"{name}: necessity check skipped — {e}")
|
||||
|
||||
# Retrieval precision check: if broad tags/trigger text would make this
|
||||
# narrow skill over-inject, fix only metadata before the functional test.
|
||||
try:
|
||||
if deps.should_check_retrieval_precision(skill):
|
||||
rp = await deps.evaluate_retrieval_precision(
|
||||
md, others, url, model, headers, workload=workload,
|
||||
owner=owner,
|
||||
)
|
||||
if rp and not rp.get("ok"):
|
||||
issues = rp.get("issues") or ["metadata: retrieval: narrow tags and when_to_use to the intended trigger"]
|
||||
log(f"{name}: narrowing retrieval metadata — {(rp.get('summary') or issues[0])[:80]}")
|
||||
fixed = await deps.improve_markdown(md, {
|
||||
"verdict": "pass",
|
||||
"confidence": 1.0,
|
||||
"summary": rp.get("summary") or "Retrieval metadata is too broad.",
|
||||
"issues": issues,
|
||||
}, "Retrieval audit only: the procedure may work, but matching metadata is too broad.",
|
||||
url, model, headers, workload=workload, owner=owner)
|
||||
if fixed and fixed.strip() != md.strip() and deps.apply_markdown(skills_manager, name, fixed, owner):
|
||||
md = fixed
|
||||
refreshed = next((s for s in skills_manager.load(owner=owner) if s.get("name") == name), None)
|
||||
if refreshed:
|
||||
skill = refreshed
|
||||
except Exception as e:
|
||||
log(f"{name}: retrieval precision check skipped — {e}")
|
||||
|
||||
task = deps.test_task(skill)
|
||||
log(f"{name}: testing…")
|
||||
skill_messages = deps.test_messages(md, task)
|
||||
transcript, skill_stats, approval_required = await deps.run_arm(
|
||||
skill_messages,
|
||||
url,
|
||||
model,
|
||||
headers,
|
||||
owner,
|
||||
workload=workload,
|
||||
)
|
||||
if approval_required is not None:
|
||||
try:
|
||||
from src.tool_approvals import tool_approval_store
|
||||
tool_approval_store.consume(
|
||||
approval_required.get("approval_id"),
|
||||
decision="deny",
|
||||
owner=owner,
|
||||
session_id=None,
|
||||
)
|
||||
except Exception:
|
||||
logger.debug("Could not retire unattended skill approval", exc_info=True)
|
||||
verdict = {
|
||||
"verdict": "inconclusive",
|
||||
"confidence": 1.0,
|
||||
"summary": (
|
||||
"This automated audit reached an exact action that requires "
|
||||
"a human approval; no action was executed."
|
||||
),
|
||||
"issues": [
|
||||
"Run this skill's manual test and review the sealed action."
|
||||
],
|
||||
"approval_required": True,
|
||||
}
|
||||
else:
|
||||
baseline_task = task
|
||||
log(f"{name}: running no-skill baseline…")
|
||||
baseline_transcript, baseline_stats, baseline_approval = await deps.run_arm(
|
||||
deps.baseline_messages(baseline_task),
|
||||
url,
|
||||
model,
|
||||
headers,
|
||||
owner,
|
||||
workload=workload,
|
||||
)
|
||||
if baseline_approval is not None:
|
||||
try:
|
||||
from src.tool_approvals import tool_approval_store
|
||||
tool_approval_store.consume(
|
||||
baseline_approval.get("approval_id"),
|
||||
decision="deny",
|
||||
owner=owner,
|
||||
session_id=None,
|
||||
)
|
||||
except Exception:
|
||||
logger.debug("Could not retire unattended baseline approval", exc_info=True)
|
||||
verdict = await deps.evaluate_run(
|
||||
md,
|
||||
task,
|
||||
transcript,
|
||||
url,
|
||||
model,
|
||||
headers,
|
||||
baseline_transcript=baseline_transcript,
|
||||
skill_stats=skill_stats,
|
||||
baseline_stats=baseline_stats,
|
||||
workload=workload,
|
||||
owner=owner,
|
||||
)
|
||||
v = verdict.get("verdict")
|
||||
log(f"{name}: verdict = {v} ({verdict.get('summary', '')[:80]})")
|
||||
if verdict.get("approval_required"):
|
||||
# An unattended audit is not authority for an action influenced by the
|
||||
# skill under test. Preserve the skill's current publication/confidence
|
||||
# state and route the exact action to the manual test UI instead of
|
||||
# letting a safety pause demote, rewrite, or auto-publish the skill.
|
||||
skills_manager.set_audit(
|
||||
name,
|
||||
"inconclusive",
|
||||
by_teacher=False,
|
||||
worker_model=model,
|
||||
owner=owner,
|
||||
audit_summary=verdict.get("summary") or "The test requires approval for an external action.",
|
||||
)
|
||||
status = skill.get("status") or "draft"
|
||||
log(f"{name}: {status} unchanged — exact action needs manual approval")
|
||||
return {
|
||||
"skill": name,
|
||||
"result": "approval_required",
|
||||
"verdict": verdict,
|
||||
"status": status,
|
||||
}
|
||||
if v == "pass":
|
||||
# Procedure works. If the reviewer still flagged metadata (tags/category/
|
||||
# when_to_use/description), do ONE fixer pass to correct the frontmatter
|
||||
# without re-testing — a metadata-only fix can't break a passing run.
|
||||
meta_issues = [i for i in (verdict.get("issues") or []) if str(i).lower().lstrip().startswith("metadata:")]
|
||||
if meta_issues:
|
||||
log(f"{name}: pass, but fixing {len(meta_issues)} metadata issue(s)…")
|
||||
fixed = await deps.improve_markdown(
|
||||
md, verdict, transcript, url, model, headers, workload=workload,
|
||||
owner=owner,
|
||||
)
|
||||
if fixed and fixed.strip() != md.strip():
|
||||
deps.apply_markdown(skills_manager, name, fixed, owner)
|
||||
_set_conf(0.95)
|
||||
skills_manager.set_audit(
|
||||
name,
|
||||
"pass",
|
||||
by_teacher=False,
|
||||
worker_model=model,
|
||||
owner=owner,
|
||||
**deps.verdict_efficiency(verdict),
|
||||
)
|
||||
refreshed = next((s for s in skills_manager.load(owner=owner) if s.get("name") == name), None)
|
||||
status = deps.finalize_status(skills_manager, name, owner, "pass", 0.95, (refreshed or {}).get("necessity"), verdict)
|
||||
log(f"{name}: {status} — confidence 95%")
|
||||
return {"skill": name, "result": "pass", "verdict": verdict, "confidence": 0.95, "status": status}
|
||||
if v in ("unknown", "inconclusive"):
|
||||
skills_manager.set_audit(
|
||||
name,
|
||||
"inconclusive",
|
||||
by_teacher=False,
|
||||
worker_model=model,
|
||||
owner=owner,
|
||||
**deps.verdict_efficiency(verdict),
|
||||
)
|
||||
status = deps.finalize_status(skills_manager, name, owner, "inconclusive", skill.get("confidence") or 0.0, skill.get("necessity"))
|
||||
log(f"{name}: {status} — inconclusive")
|
||||
return {"skill": name, "result": "inconclusive", "verdict": verdict, "status": status}
|
||||
|
||||
# Self-edit + retry.
|
||||
log(f"{name}: self-editing to fix issues…")
|
||||
new_md = await deps.improve_markdown(
|
||||
md, verdict, transcript, url, model, headers, workload=workload,
|
||||
owner=owner,
|
||||
)
|
||||
if new_md and new_md.strip() != md.strip() and deps.apply_markdown(skills_manager, name, new_md, owner):
|
||||
md = new_md
|
||||
transcript, verdict = await deps.run_test_once(
|
||||
md, task, url, model, headers, owner, workload=workload,
|
||||
)
|
||||
v = verdict.get("verdict")
|
||||
log(f"{name}: retry (self) = {v}")
|
||||
if v == "pass":
|
||||
_set_conf(0.85)
|
||||
skills_manager.set_audit(
|
||||
name,
|
||||
"pass",
|
||||
by_teacher=False,
|
||||
worker_model=model,
|
||||
owner=owner,
|
||||
**deps.verdict_efficiency(verdict),
|
||||
)
|
||||
refreshed = next((s for s in skills_manager.load(owner=owner) if s.get("name") == name), None)
|
||||
status = deps.finalize_status(skills_manager, name, owner, "pass", 0.85, (refreshed or {}).get("necessity"), verdict)
|
||||
log(f"{name}: {status} — confidence 85% after self-edit")
|
||||
return {"skill": name, "result": "pass_after_self_edit", "verdict": verdict, "confidence": 0.85, "status": status}
|
||||
|
||||
# Teacher escalation (if a distinct teacher model is configured). The
|
||||
# teacher only REWRITES the skill — it does NOT run the test. The point is
|
||||
# to verify the regular (student) model can now succeed with the teacher's
|
||||
# improved procedure, so the retry runs on the worker model, not the teacher.
|
||||
teacher_ran = False
|
||||
if teacher and teacher[0] and teacher[1] and (teacher[1] != model or teacher[0] != url):
|
||||
teacher_ran = True
|
||||
t_url, t_model, t_headers = teacher
|
||||
log(f"{name}: teacher {t_model} rewriting the skill…")
|
||||
t_md = await deps.improve_markdown(
|
||||
md, verdict, transcript, t_url, t_model, t_headers, workload=workload,
|
||||
owner=owner,
|
||||
)
|
||||
if t_md and t_md.strip() != md.strip() and deps.apply_markdown(skills_manager, name, t_md, owner):
|
||||
md = t_md
|
||||
# Re-test with the STUDENT model (the model the skill runs under in use).
|
||||
transcript, verdict = await deps.run_test_once(
|
||||
md, task, url, model, headers, owner, workload=workload,
|
||||
)
|
||||
v = verdict.get("verdict")
|
||||
log(f"{name}: retry on student after teacher rewrite = {v}")
|
||||
if v == "pass":
|
||||
_set_conf(0.8)
|
||||
skills_manager.set_audit(
|
||||
name,
|
||||
"pass",
|
||||
by_teacher=True,
|
||||
worker_model=model,
|
||||
teacher_model=t_model,
|
||||
owner=owner,
|
||||
**deps.verdict_efficiency(verdict),
|
||||
)
|
||||
refreshed = next((s for s in skills_manager.load(owner=owner) if s.get("name") == name), None)
|
||||
status = deps.finalize_status(skills_manager, name, owner, "pass", 0.8, (refreshed or {}).get("necessity"), verdict)
|
||||
log(f"{name}: {status} — confidence 80% after teacher rewrite")
|
||||
return {"skill": name, "result": "pass_after_teacher", "verdict": verdict, "confidence": 0.8, "status": status}
|
||||
|
||||
# Still failing → demote to draft + low confidence + flag (do NOT delete).
|
||||
try:
|
||||
skills_manager.update_skill(name, {"status": "draft", "confidence": 0.35}, owner=owner)
|
||||
except Exception:
|
||||
pass
|
||||
skills_manager.set_audit(
|
||||
name, v or "fail", by_teacher=teacher_ran,
|
||||
worker_model=model,
|
||||
teacher_model=(teacher[1] if teacher_ran and teacher else ""),
|
||||
owner=owner,
|
||||
**deps.verdict_efficiency(verdict),
|
||||
)
|
||||
log(f"{name}: flagged — confidence lowered, kept as draft for manual review")
|
||||
return {"skill": name, "result": "flagged", "verdict": verdict, "confidence": 0.35}
|
||||
|
||||
|
||||
async def run_audit_batch(key, skills_manager, names, url, model, headers, teacher, owner,
|
||||
workload: str = "foreground", *, deps: AuditDependencies):
|
||||
"""Background: audit each named skill in sequence, recording progress."""
|
||||
import asyncio as _asyncio
|
||||
import time as _time
|
||||
|
||||
job = deps.audit_jobs.get(key)
|
||||
if job is None:
|
||||
return
|
||||
|
||||
def log(msg):
|
||||
job["log"].append(msg)
|
||||
if len(job["log"]) > 1000:
|
||||
del job["log"][0:len(job["log"]) - 1000]
|
||||
|
||||
cancelled = False
|
||||
try:
|
||||
for nm in names:
|
||||
if job.get("cancel"):
|
||||
cancelled = True
|
||||
log("(cancelled)")
|
||||
break
|
||||
job["current"] = nm
|
||||
skills = skills_manager.load(owner=owner)
|
||||
sk = next((s for s in skills if s.get("name") == nm), None)
|
||||
if not sk:
|
||||
continue
|
||||
try:
|
||||
res = await deps.audit_one(
|
||||
skills_manager, sk, url, model, headers, teacher, owner, log,
|
||||
workload=workload,
|
||||
)
|
||||
except _asyncio.CancelledError:
|
||||
cancelled = True
|
||||
job["cancel"] = True
|
||||
log("(cancelled)")
|
||||
raise
|
||||
except SkillAuditUnavailable as e:
|
||||
job["unavailable"] = str(e)
|
||||
log(f"Audit paused: {e}. Skill verdicts unchanged; retry when the model is available.")
|
||||
break
|
||||
except Exception as e:
|
||||
log(f"{nm}: error — {e}")
|
||||
res = {"skill": nm, "result": "error"}
|
||||
skills_manager.set_audit(nm, "inconclusive", worker_model=model, owner=owner)
|
||||
try:
|
||||
refreshed = next((s for s in skills_manager.load(owner=owner) if s.get("name") == nm), None)
|
||||
if refreshed:
|
||||
res["skill_state"] = {
|
||||
"name": refreshed.get("name"),
|
||||
"status": refreshed.get("status"),
|
||||
"confidence": refreshed.get("confidence"),
|
||||
"audit_verdict": refreshed.get("audit_verdict"),
|
||||
"audit_by_teacher": refreshed.get("audit_by_teacher"),
|
||||
"audit_worker_model": refreshed.get("audit_worker_model"),
|
||||
"audit_teacher_model": refreshed.get("audit_teacher_model"),
|
||||
"audited_at": refreshed.get("audited_at"),
|
||||
"saved_turns": refreshed.get("saved_turns"),
|
||||
"saved_tool_calls": refreshed.get("saved_tool_calls"),
|
||||
"baseline_verdict": refreshed.get("baseline_verdict"),
|
||||
"usefulness": refreshed.get("usefulness"),
|
||||
"necessity": refreshed.get("necessity"),
|
||||
}
|
||||
except Exception:
|
||||
pass
|
||||
job["results"].append(res)
|
||||
job["done"] = len(job["results"])
|
||||
except _asyncio.CancelledError:
|
||||
cancelled = True
|
||||
finally:
|
||||
if not cancelled and not job.get("cancel") and not job.get("unavailable"):
|
||||
try:
|
||||
deps.finalize_batch(skills_manager, job.get("results") or [], owner, log)
|
||||
except Exception:
|
||||
logger.warning("Could not finalize skills audit batch", exc_info=True)
|
||||
job["current"] = None
|
||||
job["status"] = "cancelled" if cancelled or job.get("cancel") else "error" if job.get("unavailable") else "done"
|
||||
job["finished"] = _time.time()
|
||||
job.pop("task", None)
|
||||
|
||||
|
||||
async def run_scheduled_skill_audit(skills_manager: SkillsManager,
|
||||
owner: Optional[str] = None,
|
||||
max_skills: int = 8, *, deps: AuditDependencies) -> dict:
|
||||
"""Nightly audit pass. Audits the LEAST-recently-audited skills first and
|
||||
caps the batch so it rotates through the library over successive nights
|
||||
instead of re-checking the same ones every run. Reuses the same job store
|
||||
the manual 'Audit all' button uses, so its progress shows in the UI too."""
|
||||
import time as _time
|
||||
|
||||
key = (owner or "",)
|
||||
existing = deps.audit_jobs.get(key)
|
||||
if existing and existing.get("status") == "running":
|
||||
logger.info("Scheduled skill audit skipped — a run is already active.")
|
||||
return {"status": "running", "skipped": True}
|
||||
|
||||
try:
|
||||
url, model, headers, teacher = deps.resolve_models(owner=owner)
|
||||
except ValueError as e:
|
||||
logger.info(f"Scheduled skill audit skipped — {e}")
|
||||
return {"status": "skipped", "reason": str(e)}
|
||||
|
||||
from services.memory.skill_lifecycle import automatic_audit_candidates
|
||||
skills = automatic_audit_candidates(skills_manager.load(owner=owner), limit=max_skills)
|
||||
names = [s["name"] for s in skills]
|
||||
if not names:
|
||||
return {"status": "done", "total": 0}
|
||||
|
||||
deps.audit_jobs[key] = {
|
||||
"status": "running", "scope": "scheduled", "model": model,
|
||||
"teacher": teacher[1] if teacher else None,
|
||||
"total": len(names), "done": 0, "current": None,
|
||||
"results": [], "log": [f"Nightly audit of {len(names)} least-recently-checked skill(s) with {model}"
|
||||
+ (f"; teacher {teacher[1]}" if teacher else "")],
|
||||
"started": _time.time(), "cancel": False,
|
||||
}
|
||||
logger.info(f"Scheduled skill audit starting: {len(names)} skill(s) (owner={owner or 'all'})")
|
||||
await deps.run_batch(
|
||||
key, skills_manager, names, url, model, headers, teacher, owner,
|
||||
workload="background",
|
||||
)
|
||||
job = deps.audit_jobs.get(key, {})
|
||||
return {"status": "done", "total": len(names), "results": job.get("results", [])}
|
||||
@@ -0,0 +1,35 @@
|
||||
"""Explicit collaborators for execution and audit coordination.
|
||||
|
||||
The transport compatibility bindings supply the original patchable functions.
|
||||
Services never import the skills transport module or copy credentials into a
|
||||
second state store.
|
||||
"""
|
||||
from dataclasses import dataclass
|
||||
from typing import Callable
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AuditDependencies:
|
||||
test_jobs: dict
|
||||
audit_jobs: dict
|
||||
test_task: Callable
|
||||
test_messages: Callable
|
||||
baseline_messages: Callable
|
||||
evaluate_run: Callable
|
||||
evaluate_necessity: Callable
|
||||
evaluate_retrieval_precision: Callable
|
||||
should_check_retrieval_precision: Callable
|
||||
improve_markdown: Callable
|
||||
apply_markdown: Callable
|
||||
duplicate_blocker: Callable
|
||||
finalize_status: Callable
|
||||
finalize_batch: Callable
|
||||
auto_publish_policy: Callable
|
||||
utility_blocker: Callable
|
||||
verdict_efficiency: Callable
|
||||
run_test_job: Callable
|
||||
run_arm: Callable
|
||||
run_test_once: Callable
|
||||
audit_one: Callable
|
||||
run_batch: Callable
|
||||
resolve_models: Callable
|
||||
@@ -0,0 +1,464 @@
|
||||
"""Model grading and advisory skill assessment with explicit offline call seams."""
|
||||
|
||||
import logging
|
||||
import re
|
||||
from typing import Optional
|
||||
|
||||
from src.text_helpers import strip_closed_think_blocks
|
||||
from src.utility_effort import effort_for_call
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Last-resort verdict extraction from a teacher/verifier model's prose (run when
|
||||
# JSON parsing fails). `["\'\s:]*` already consumes whitespace, so the original
|
||||
# trailing `\s*` made two adjacent \s-matching quantifiers that backtrack O(n^2)
|
||||
# on a `verdict` + whitespace flood in untrusted model output (CodeQL
|
||||
# py/polynomial-redos). Without it a single unbounded quantifier remains — the
|
||||
# matched text is identical, and the scan is linear.
|
||||
_VERDICT_PROSE_RE = re.compile(
|
||||
r'verdict["\'\s:]*["\']?(pass|needs_work|fail|inconclusive)', re.I
|
||||
)
|
||||
|
||||
|
||||
def verdict_efficiency(verdict: Optional[dict]) -> dict:
|
||||
if not isinstance(verdict, dict):
|
||||
return {}
|
||||
out = {"audit_summary": str(verdict.get("summary") or "")[:2000]}
|
||||
for key in ("saved_turns", "saved_tool_calls"):
|
||||
if key not in verdict:
|
||||
continue
|
||||
try:
|
||||
out[key] = int(verdict.get(key))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
baseline = str(verdict.get("baseline_verdict") or "").lower().strip()
|
||||
if baseline in {"better", "same", "worse", "unknown"}:
|
||||
out["baseline_verdict"] = baseline
|
||||
if "usefulness" in verdict:
|
||||
try:
|
||||
out["usefulness"] = max(0.0, min(1.0, float(verdict.get("usefulness"))))
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
return out
|
||||
|
||||
|
||||
def parse_run_verdict(raw: str):
|
||||
"""Return a final result dict on success, or None if unparseable."""
|
||||
import json as _json
|
||||
import re as _re
|
||||
_VERDICTS = ("pass", "needs_work", "fail", "inconclusive")
|
||||
|
||||
text = (raw or '')
|
||||
# Strip closed think blocks. If a <think> was opened but never closed
|
||||
# (the model ran out of budget mid-reasoning), drop everything from it
|
||||
# onward so its stray braces don't poison JSON extraction.
|
||||
text = strip_closed_think_blocks(text)
|
||||
text = _re.sub(r'<think(?:ing)?>[\s\S]*$', '', text, flags=_re.I).strip()
|
||||
|
||||
def _coerce(d):
|
||||
return d if (isinstance(d, dict) and "verdict" in d) else None
|
||||
|
||||
data = None
|
||||
# Scan every balanced {...} candidate and keep the LAST one that parses
|
||||
# and carries a "verdict" — the transcript is full of JSON API bodies,
|
||||
# so a naive first-brace/last-brace span almost never parses.
|
||||
for m in _re.finditer(r'\{[\s\S]*?\}', text):
|
||||
frag = m.group(0)
|
||||
for cand in (frag, _re.sub(r',(\s*[}\]])', r'\1', frag)):
|
||||
try:
|
||||
d = _coerce(_json.loads(cand))
|
||||
except Exception:
|
||||
d = None
|
||||
if d is not None:
|
||||
data = d
|
||||
# Fallback to the greedy outermost span (handles nested objects the
|
||||
# non-greedy scan above splits apart).
|
||||
if data is None:
|
||||
a, b = text.find('{'), text.rfind('}')
|
||||
if a >= 0 and b > a:
|
||||
frag = text[a:b + 1]
|
||||
for cand in (frag, _re.sub(r',(\s*[}\]])', r'\1', frag)):
|
||||
try:
|
||||
d = _coerce(_json.loads(cand))
|
||||
except Exception:
|
||||
d = None
|
||||
if d is not None:
|
||||
data = d
|
||||
break
|
||||
|
||||
v = str(data.get("verdict", "")).lower().strip() if isinstance(data, dict) else None
|
||||
# Last resort: pull the verdict keyword straight out of the prose so a
|
||||
# clearly-decided run isn't thrown away as "unparseable".
|
||||
if v not in _VERDICTS:
|
||||
km = _VERDICT_PROSE_RE.search(text)
|
||||
if km:
|
||||
v = km.group(1).lower()
|
||||
if data is None:
|
||||
data = {}
|
||||
if not isinstance(data, dict) or v not in _VERDICTS:
|
||||
return None
|
||||
try:
|
||||
conf = float(data.get("confidence", 0))
|
||||
except (TypeError, ValueError):
|
||||
conf = 0
|
||||
try:
|
||||
usefulness = float(data.get("usefulness", 0.0))
|
||||
except (TypeError, ValueError):
|
||||
usefulness = 0.0
|
||||
try:
|
||||
saved_turns = int(data.get("saved_turns", 0))
|
||||
except (TypeError, ValueError):
|
||||
saved_turns = 0
|
||||
try:
|
||||
saved_tool_calls = int(data.get("saved_tool_calls", 0))
|
||||
except (TypeError, ValueError):
|
||||
saved_tool_calls = 0
|
||||
return {
|
||||
"verdict": v,
|
||||
"confidence": max(0.0, min(1.0, conf)),
|
||||
"summary": str(data.get("summary", ""))[:400],
|
||||
"issues": [str(x)[:200] for x in (data.get("issues") or []) if str(x).strip()][:8],
|
||||
"baseline_verdict": (
|
||||
str(data.get("baseline_verdict", "unknown")).lower().strip()
|
||||
if str(data.get("baseline_verdict", "unknown")).lower().strip() in {"better", "same", "worse", "unknown"}
|
||||
else "unknown"
|
||||
),
|
||||
"usefulness": max(0.0, min(1.0, usefulness)),
|
||||
"saved_turns": saved_turns,
|
||||
"saved_tool_calls": saved_tool_calls,
|
||||
}
|
||||
|
||||
|
||||
async def evaluate_run(skill_md: str, task: str, transcript: str,
|
||||
url: str, model: str, headers: Optional[dict],
|
||||
baseline_transcript: str = "",
|
||||
skill_stats: Optional[dict] = None,
|
||||
baseline_stats: Optional[dict] = None,
|
||||
workload: str = "foreground", owner: Optional[str] = None,
|
||||
*, _llm_call=None, _effort_for_call=None) -> dict:
|
||||
"""LLM-as-judge: grade a skill test run from its transcript. Advisory only.
|
||||
|
||||
Robust against local reasoning models (strips <think>, lenient JSON,
|
||||
generous token budget) — same defensive parsing used elsewhere.
|
||||
"""
|
||||
if _llm_call is None:
|
||||
from src.llm_core import llm_call_async
|
||||
_llm_call = llm_call_async
|
||||
_effort_for_call = _effort_for_call or effort_for_call
|
||||
|
||||
sys_prompt = (
|
||||
"You are a strict QA reviewer judging whether an AI 'skill' (a reusable "
|
||||
"procedure) actually works. You are given the SKILL, the TASK it was tested "
|
||||
"on, and the TRANSCRIPT of the agent's run.\n\n"
|
||||
"Judge honestly:\n"
|
||||
"- The functional verdict judges ONLY whether the SKILL RUN completed the "
|
||||
"task correctly and whether the skill procedure is usable. A correct skill "
|
||||
"run is pass even when the baseline is equally good. Record comparative "
|
||||
"value separately in baseline_verdict/usefulness.\n"
|
||||
"- Did following the skill accomplish the task accurately?\n"
|
||||
"- Are the steps clear, correct, and reproducible?\n"
|
||||
"- Did it reference tools/commands that don't exist or that errored?\n"
|
||||
"- Separately, compared with the baseline run WITHOUT the skill, did the skill make "
|
||||
"the agent more accurate, use fewer turns/tool calls, or avoid avoidable "
|
||||
"thrashing?\n"
|
||||
"- Do NOT penalize a skill merely for being broad or generic. A broad "
|
||||
"skill is useful if it makes the agent finish correctly in fewer turns "
|
||||
"or with fewer tools than baseline.\n"
|
||||
"- METADATA: do the frontmatter fields match what the skill actually does? "
|
||||
"Flag wrong/misleading/missing tags, a wrong category, a when_to_use that "
|
||||
"doesn't describe the real trigger, or a description that oversells or "
|
||||
"mismatches the body. List each metadata problem in 'issues' (prefix it "
|
||||
"with 'metadata:'). Metadata problems alone do NOT make the verdict 'fail' "
|
||||
"if the procedure works — note them as issues on an otherwise-passing run.\n\n"
|
||||
"Never use inconclusive merely because the baseline was the same or better. "
|
||||
"IMPORTANT — fairness rule: if the SKILL RUN could NOT proceed because it lacked "
|
||||
"an input or target the test never provided (e.g. there was no document/"
|
||||
"email/data to act on, so the agent reasonably asked for it), that is NOT "
|
||||
"the skill's fault. Return verdict \"inconclusive\" — do NOT mark it fail "
|
||||
"or needs_work. Only judge the skill's PROCEDURE; reserve fail/needs_work "
|
||||
"for when the steps themselves are wrong, vague, or reference missing tools.\n\n"
|
||||
"If you need to reason, do it inside <think></think> FIRST. Then output "
|
||||
"ONLY this JSON (no fences):\n"
|
||||
'Set baseline_verdict to how the SKILL RUN compares to the BASELINE RUN.\n\n'
|
||||
'{"verdict": "pass" | "needs_work" | "fail" | "inconclusive", '
|
||||
'"confidence": 0.0-1.0, "summary": "one short sentence", '
|
||||
'"issues": ["short issue", ...], '
|
||||
'"baseline_verdict": "better" | "same" | "worse" | "unknown", '
|
||||
'"usefulness": 0.0-1.0, "saved_turns": integer, "saved_tool_calls": integer}'
|
||||
)
|
||||
# Give the judge plenty of transcript, and when it must trim, keep the TAIL
|
||||
# (the final result lives at the end) plus a bit of the head — truncating to
|
||||
# a short prefix made the judge wrongly call complete runs "incomplete /
|
||||
# missing sections" because it never saw the end.
|
||||
def _clip(t: str, limit: int = 24000) -> str:
|
||||
t = (t or "").strip() or "(no output produced)"
|
||||
if len(t) <= limit:
|
||||
return t
|
||||
head = limit // 4
|
||||
return t[:head] + "\n\n…[transcript trimmed for length]…\n\n" + t[-(limit - head):]
|
||||
skill_stats = skill_stats or {}
|
||||
baseline_stats = baseline_stats or {}
|
||||
user_msg = (
|
||||
f"=== SKILL ===\n{(skill_md or '')[:4000]}\n\n"
|
||||
f"=== TASK ===\n{task}\n\n"
|
||||
f"=== SKILL RUN STATS ===\n"
|
||||
f"turns={skill_stats.get('turns', 'unknown')} "
|
||||
f"tool_calls={skill_stats.get('tool_calls', 'unknown')}\n\n"
|
||||
f"=== SKILL RUN TRANSCRIPT ===\n{_clip(transcript)}\n\n"
|
||||
f"=== BASELINE RUN WITHOUT SKILL STATS ===\n"
|
||||
f"turns={baseline_stats.get('turns', 'unknown')} "
|
||||
f"tool_calls={baseline_stats.get('tool_calls', 'unknown')}\n\n"
|
||||
f"=== BASELINE RUN WITHOUT SKILL TRANSCRIPT ===\n{_clip(baseline_transcript)}"
|
||||
)
|
||||
|
||||
# Two attempts: the first lets the judge reason; if a heavy reasoning model
|
||||
# burns its budget inside <think> and never emits the JSON, the second
|
||||
# forbids thinking and demands the JSON immediately.
|
||||
last_text = ""
|
||||
last_err = None
|
||||
for attempt in range(2):
|
||||
msgs = [{"role": "system", "content": sys_prompt},
|
||||
{"role": "user", "content": user_msg}]
|
||||
if attempt == 1:
|
||||
msgs[0]["content"] = (
|
||||
sys_prompt + "\n\nDO NOT use <think> or any reasoning. Your reply "
|
||||
"must START with '{' and be ONLY the JSON object, nothing else."
|
||||
)
|
||||
try:
|
||||
raw = await _llm_call(
|
||||
# Generous budget so a heavy reasoner can think AND still have
|
||||
# room to emit the JSON afterwards (reasoning tokens come out of
|
||||
# this same cap; the server clamps to its own max).
|
||||
url, model, msgs,
|
||||
temperature=0.1, max_tokens=32768, headers=headers, timeout=180,
|
||||
workload=workload,
|
||||
reasoning_effort=_effort_for_call(url, model, owner),
|
||||
)
|
||||
except Exception as e:
|
||||
# Don't give up on a transient first-attempt error — let the second
|
||||
# (no-think) attempt run before reporting failure.
|
||||
last_err = e
|
||||
continue
|
||||
last_text = (raw or '')
|
||||
parsed = parse_run_verdict(raw)
|
||||
if parsed is not None:
|
||||
return parsed
|
||||
|
||||
if last_err is not None and not last_text:
|
||||
return {"verdict": "unknown", "confidence": 0, "summary": f"Review call failed: {last_err}", "issues": []}
|
||||
return {"verdict": "unknown", "confidence": 0,
|
||||
"summary": "Reviewer returned unparseable output.", "issues": [], "raw": last_text[:300]}
|
||||
|
||||
|
||||
async def evaluate_necessity(skill_md: str, others: list, url: str, model: str,
|
||||
headers: Optional[dict],
|
||||
workload: str = "foreground", owner: Optional[str] = None,
|
||||
*, _llm_call=None, _effort_for_call=None) -> Optional[dict]:
|
||||
"""Advisory judge: is this skill worth keeping, or is it redundant / trivially
|
||||
unnecessary? Sees the OTHER skills' names+descriptions so it can spot
|
||||
duplicates. Returns {necessary, redundant_with, reason} or None. Never acts —
|
||||
purely a flag the UI surfaces."""
|
||||
import json as _json
|
||||
import re as _re
|
||||
if _llm_call is None:
|
||||
from src.llm_core import llm_call_async
|
||||
_llm_call = llm_call_async
|
||||
_effort_for_call = _effort_for_call or effort_for_call
|
||||
|
||||
catalog = "\n".join(f"- {o.get('name')}: {o.get('description', '')}" for o in others) or "(no other skills)"
|
||||
sys_prompt = (
|
||||
"You assess whether a reusable AI 'skill' (a saved procedure) is worth keeping. "
|
||||
"A skill is UNNECESSARY if it essentially duplicates another skill in the library. "
|
||||
"Do NOT call a skill unnecessary merely because it is broad or generic; broad "
|
||||
"skills can be worth keeping when they make a capable assistant finish accurately "
|
||||
"with fewer turns or fewer tool calls than it would without the skill. A skill IS "
|
||||
"necessary if it captures a reusable trigger, procedure, tool sequence, or "
|
||||
"hard-won detail that could improve future runs.\n\n"
|
||||
"Be conservative: only call it unnecessary when you're confident. Reason in "
|
||||
"<think></think> first if needed, then output ONLY this JSON:\n"
|
||||
'{"necessary": true|false, "redundant_with": ["skill-name", ...], '
|
||||
'"reason": "one short sentence"}'
|
||||
)
|
||||
user_msg = (
|
||||
f"=== SKILL UNDER REVIEW ===\n{(skill_md or '')[:3000]}\n\n"
|
||||
f"=== OTHER SKILLS IN THE LIBRARY ===\n{catalog[:4000]}"
|
||||
)
|
||||
try:
|
||||
raw = await _llm_call(
|
||||
url, model,
|
||||
[{"role": "system", "content": sys_prompt}, {"role": "user", "content": user_msg}],
|
||||
temperature=0.1, max_tokens=8192, headers=headers, timeout=120,
|
||||
workload=workload,
|
||||
reasoning_effort=_effort_for_call(url, model, owner),
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(f"Necessity check failed: {e}")
|
||||
return None
|
||||
text = strip_closed_think_blocks(raw or '')
|
||||
text = _re.sub(r'<think(?:ing)?>[\s\S]*$', '', text, flags=_re.I).strip()
|
||||
data = None
|
||||
a, b = text.find('{'), text.rfind('}')
|
||||
if a >= 0 and b > a:
|
||||
frag = text[a:b + 1]
|
||||
for cand in (frag, _re.sub(r',(\s*[}\]])', r'\1', frag)):
|
||||
try:
|
||||
data = _json.loads(cand)
|
||||
break
|
||||
except Exception:
|
||||
continue
|
||||
if not isinstance(data, dict) or "necessary" not in data:
|
||||
return None
|
||||
return {
|
||||
"necessary": bool(data.get("necessary", True)),
|
||||
"redundant_with": [str(x)[:80] for x in (data.get("redundant_with") or []) if str(x).strip()][:6],
|
||||
"reason": str(data.get("reason", ""))[:200],
|
||||
}
|
||||
|
||||
|
||||
def should_check_retrieval_precision(skill: dict) -> bool:
|
||||
"""Cheap prefilter for the expensive retrieval-precision judge.
|
||||
|
||||
Skills with broad tags like "network" or "document" are the ones most likely
|
||||
to over-inject. Narrow command/vendor tags alone are fine.
|
||||
"""
|
||||
broad = {
|
||||
"arch", "arch linux", "linux", "network", "networking", "wifi",
|
||||
"installation", "install", "system", "ssh", "document", "documents",
|
||||
"search", "email", "calendar", "gpu", "server", "python",
|
||||
}
|
||||
if not isinstance(skill, dict):
|
||||
return False
|
||||
tags = {str(t or "").strip().lower() for t in (skill.get("tags") or [])}
|
||||
if tags & broad:
|
||||
return True
|
||||
text = " ".join([
|
||||
str(skill.get("name") or ""),
|
||||
str(skill.get("description") or ""),
|
||||
str(skill.get("when_to_use") or ""),
|
||||
]).lower()
|
||||
return sum(1 for t in broad if t in text) >= 2
|
||||
|
||||
|
||||
async def evaluate_retrieval_precision(skill_md: str, others: list,
|
||||
url: str, model: str,
|
||||
headers: Optional[dict],
|
||||
workload: str = "foreground", owner: Optional[str] = None,
|
||||
*, _llm_call=None, _effort_for_call=None) -> Optional[dict]:
|
||||
"""Advisory judge: would this skill's metadata make retrieval over-select it?
|
||||
|
||||
This is distinct from "does the procedure work?". It asks whether tags,
|
||||
description, and when_to_use are specific enough that the skill won't be
|
||||
injected into adjacent but wrong tasks.
|
||||
"""
|
||||
import json as _json
|
||||
import re as _re
|
||||
if _llm_call is None:
|
||||
from src.llm_core import llm_call_async
|
||||
_llm_call = llm_call_async
|
||||
_effort_for_call = _effort_for_call or effort_for_call
|
||||
|
||||
catalog = "\n".join(f"- {o.get('name')}: {o.get('description', '')}" for o in others[:80]) or "(no other skills)"
|
||||
sys_prompt = (
|
||||
"You are auditing retrieval metadata for a reusable AI skill. The app selects "
|
||||
"skills by matching user requests against the skill name, description, tags, "
|
||||
"when_to_use, and procedure text. Judge whether this skill is likely to be "
|
||||
"over-selected for nearby but wrong requests.\n\n"
|
||||
"Focus ONLY on metadata/retrieval precision, not whether the procedure works. "
|
||||
"Flag broad tags such as network, installation, system, document, search, ssh, "
|
||||
"python, gpu, or server when they would cause this narrow skill to match too "
|
||||
"many adjacent tasks. Recommend narrower tags/when_to_use wording. Compare "
|
||||
"against the other skills to spot boundaries.\n\n"
|
||||
"Return ok=true only when the trigger metadata is narrow enough. If not ok, "
|
||||
"issues MUST start with 'metadata: retrieval:' and be actionable. Output ONLY JSON:\n"
|
||||
'{"ok": true|false, "summary": "one short sentence", "issues": ["metadata: retrieval: ..."]}'
|
||||
)
|
||||
user_msg = (
|
||||
f"=== SKILL UNDER REVIEW ===\n{(skill_md or '')[:5000]}\n\n"
|
||||
f"=== OTHER SKILLS IN LIBRARY ===\n{catalog[:5000]}\n\n"
|
||||
"Decide if this skill's retrieval metadata should be narrowed so it only "
|
||||
"fires for its intended scenario and not for adjacent skills above."
|
||||
)
|
||||
try:
|
||||
raw = await _llm_call(
|
||||
url, model,
|
||||
[{"role": "system", "content": sys_prompt}, {"role": "user", "content": user_msg}],
|
||||
temperature=0.1, max_tokens=4096, headers=headers, timeout=90,
|
||||
workload=workload,
|
||||
reasoning_effort=_effort_for_call(url, model, owner),
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(f"Retrieval precision check failed: {e}")
|
||||
return None
|
||||
text = strip_closed_think_blocks(raw or '')
|
||||
text = _re.sub(r'<think(?:ing)?>[\s\S]*$', '', text, flags=_re.I).strip()
|
||||
data = None
|
||||
a, b = text.find('{'), text.rfind('}')
|
||||
if a >= 0 and b > a:
|
||||
frag = text[a:b + 1]
|
||||
for cand in (frag, _re.sub(r',(\s*[}\]])', r'\1', frag)):
|
||||
try:
|
||||
data = _json.loads(cand)
|
||||
break
|
||||
except Exception:
|
||||
continue
|
||||
if not isinstance(data, dict) or "ok" not in data:
|
||||
return None
|
||||
return {
|
||||
"ok": bool(data.get("ok")),
|
||||
"summary": str(data.get("summary", ""))[:300],
|
||||
"issues": [str(x)[:220] for x in (data.get("issues") or []) if str(x).strip()][:6],
|
||||
}
|
||||
|
||||
|
||||
async def improve_markdown(skill_md: str, verdict: dict, transcript: str, url, model, headers,
|
||||
workload: str = "foreground", owner: Optional[str] = None,
|
||||
*, _llm_call=None, _effort_for_call=None):
|
||||
"""Have a model rewrite SKILL.md to fix the reviewer's issues. Returns the
|
||||
corrected markdown, or None if it couldn't produce a usable change."""
|
||||
import re as _re
|
||||
if _llm_call is None:
|
||||
from src.llm_core import llm_call_async
|
||||
_llm_call = llm_call_async
|
||||
_effort_for_call = _effort_for_call or effort_for_call
|
||||
issues = "\n".join("- " + str(i) for i in (verdict.get("issues") or []))
|
||||
sys_prompt = (
|
||||
"You are improving a reusable AI SKILL written in Markdown (frontmatter + body). "
|
||||
"A QA reviewer found problems after a test run. Rewrite the SKILL.md to fix them: "
|
||||
"make vague steps concrete, correct or remove references to tools that don't exist, "
|
||||
"ensure the procedure is reproducible. "
|
||||
"Keep the `name` field EXACTLY as-is (it is the skill's identity / filename). You MAY "
|
||||
"correct the OTHER frontmatter — tags, category, when_to_use, description — when the "
|
||||
"reviewer flagged them (issues prefixed 'metadata:') or they don't match the body; keep "
|
||||
"retrieval metadata narrow: remove broad tags that would over-select the skill, and make "
|
||||
"`when_to_use` say when NOT to use the skill if adjacent tasks are easy to confuse. Keep "
|
||||
"valid frontmatter structure. Do NOT invent capabilities the agent lacks. Reason in "
|
||||
"<think></think> first if needed, then output ONLY the full corrected SKILL.md (no "
|
||||
"fences, no commentary)."
|
||||
)
|
||||
user_msg = (
|
||||
f"=== CURRENT SKILL.md ===\n{skill_md}\n\n"
|
||||
f"=== REVIEWER VERDICT ===\n{verdict.get('summary', '')}\nIssues:\n{issues}\n\n"
|
||||
f"=== TEST TRANSCRIPT ===\n{(transcript or '')[:6000]}"
|
||||
)
|
||||
try:
|
||||
raw = await _llm_call(url, model,
|
||||
[{"role": "system", "content": sys_prompt},
|
||||
{"role": "user", "content": user_msg}],
|
||||
temperature=0.2, max_tokens=16384, headers=headers, timeout=180,
|
||||
workload=workload,
|
||||
reasoning_effort=_effort_for_call(url, model, owner))
|
||||
except Exception as e:
|
||||
logger.warning(f"Audit: improve call failed: {e}")
|
||||
return None
|
||||
text = strip_closed_think_blocks(raw or '')
|
||||
text = _re.sub(r'<think(?:ing)?>[\s\S]*$', '', text, flags=_re.I)
|
||||
text = _re.sub(r'</think(?:ing)?>', '', text, flags=_re.I).strip()
|
||||
if text.startswith("```"):
|
||||
text = text.split("\n", 1)[-1].rsplit("```", 1)[0].strip()
|
||||
# Some reasoning models still prepend analysis or echo the old skill before
|
||||
# the final corrected document. Keep only the last complete-looking
|
||||
# frontmatter document so reviewer prose never gets persisted into SKILL.md.
|
||||
starts = list(_re.finditer(r'(?m)^---\s*\n(?=[\s\S]*?^name\s*:)', text))
|
||||
if starts:
|
||||
text = text[starts[-1].start():].strip()
|
||||
return text or None
|
||||
@@ -0,0 +1,216 @@
|
||||
"""Transient job transitions and public polling projections.
|
||||
|
||||
HTTP ownership and approval validation happen before these operations. These
|
||||
functions use the supplied registries and preserve the existing task ownership.
|
||||
"""
|
||||
import asyncio as _asyncio
|
||||
import logging
|
||||
import time as _time
|
||||
|
||||
from src.prompt_security import untrusted_context_message
|
||||
from .dependencies import AuditDependencies
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def start_test_job(name, md, task, url, model, headers, user, skills_manager,
|
||||
request_authority, *, deps: AuditDependencies):
|
||||
key = (user or "", name)
|
||||
previous_job = deps.test_jobs.get(key) or {}
|
||||
previous_approval = previous_job.get("approval") or {}
|
||||
if previous_approval.get("approval_id"):
|
||||
try:
|
||||
from src.tool_approvals import tool_approval_store
|
||||
tool_approval_store.consume(
|
||||
previous_approval["approval_id"],
|
||||
decision="deny",
|
||||
owner=user,
|
||||
session_id=None,
|
||||
)
|
||||
except Exception:
|
||||
logger.debug("Could not retire replaced skill approval", exc_info=True)
|
||||
deps.test_jobs[key] = {
|
||||
"status": "running",
|
||||
"task": task,
|
||||
"model": model,
|
||||
"skill": name,
|
||||
"started": _time.time(),
|
||||
"log": [{"type": "skill_test_start", "task": task, "skill": name, "model": model}],
|
||||
"verdict": None,
|
||||
"_run": {
|
||||
"md": md,
|
||||
"url": url,
|
||||
"model": model,
|
||||
"headers": headers,
|
||||
"owner": user,
|
||||
"request_authority": request_authority,
|
||||
},
|
||||
}
|
||||
_asyncio.create_task(deps.run_test_job(
|
||||
key, name, md, task, url, model, headers, user, skills_manager,
|
||||
request_authority=request_authority))
|
||||
return {"ok": True, "status": "running", "skill": name, "model": model}
|
||||
|
||||
|
||||
def continue_test_job(job, key, name, decision, expected, exact_approval,
|
||||
skills_manager, *, deps: AuditDependencies):
|
||||
job.pop("approval", None)
|
||||
if decision == "deny":
|
||||
job.pop("_transcript", None)
|
||||
job.pop("_run", None)
|
||||
job["log"].append({
|
||||
"type": "approval_denied",
|
||||
"text": "Exact action denied; the skill test stopped without executing it.",
|
||||
})
|
||||
job["verdict"] = {
|
||||
"verdict": "inconclusive",
|
||||
"confidence": 1.0,
|
||||
"summary": "The test stopped because its exact action was denied.",
|
||||
"issues": [],
|
||||
}
|
||||
job["status"] = "done"
|
||||
return {"ok": True, "status": "done", "decision": "deny"}
|
||||
|
||||
run = job.get("_run") or {}
|
||||
transcript = job.pop("_transcript", [])
|
||||
# stream_agent_loop owns its per-round message list internally. Rebuild
|
||||
# continuation context from the original untrusted skill plus the
|
||||
# accumulated transcript so repeated approvals do not lose earlier
|
||||
# approved results, while keeping every transcript byte tainted.
|
||||
messages = deps.test_messages(
|
||||
run.get("md", ""),
|
||||
job.get("task", ""),
|
||||
)
|
||||
if transcript:
|
||||
messages.append(untrusted_context_message(
|
||||
"skill test transcript",
|
||||
"".join(str(item) for item in transcript),
|
||||
))
|
||||
messages.extend([
|
||||
{
|
||||
"role": "assistant",
|
||||
"content": str(expected.get("question") or "Allow this exact action once?"),
|
||||
},
|
||||
{
|
||||
"role": "user",
|
||||
"content": (
|
||||
f"Approved the exact {exact_approval.pending.tool_name} "
|
||||
"action shown above once."
|
||||
),
|
||||
},
|
||||
])
|
||||
job["status"] = "running"
|
||||
job["log"].append({
|
||||
"type": "approval_granted",
|
||||
"text": (
|
||||
f"Approved exact {exact_approval.pending.tool_name} action once; "
|
||||
"resuming test."
|
||||
),
|
||||
})
|
||||
_asyncio.create_task(deps.run_test_job(
|
||||
key,
|
||||
name,
|
||||
run.get("md", ""),
|
||||
job.get("task", ""),
|
||||
run.get("url"),
|
||||
run.get("model"),
|
||||
run.get("headers"),
|
||||
run.get("owner"),
|
||||
skills_manager,
|
||||
messages=messages,
|
||||
transcript=transcript,
|
||||
exact_approval=exact_approval,
|
||||
))
|
||||
return {"ok": True, "status": "running", "decision": "approve"}
|
||||
|
||||
|
||||
def test_status(user, name, *, deps: AuditDependencies):
|
||||
job = deps.test_jobs.get((user or "", name))
|
||||
if not job:
|
||||
return {"status": "none"}
|
||||
return {
|
||||
"status": job["status"],
|
||||
"task": job.get("task"),
|
||||
"model": job.get("model"),
|
||||
"log": job.get("log", []),
|
||||
"verdict": job.get("verdict"),
|
||||
"approval": job.get("approval"),
|
||||
}
|
||||
|
||||
|
||||
def select_audit_names(skills_manager, user, scope, requested_names, skip_audited):
|
||||
skills = skills_manager.load(owner=user)
|
||||
# Built-ins are tracked, pre-approved application procedures. They do
|
||||
# not consume audit turns and cannot be demoted by an audit result.
|
||||
auditable_skills = [s for s in skills if s.get("source") != "builtin"]
|
||||
by_name = {s.get("name"): s for s in auditable_skills if s.get("name")}
|
||||
if isinstance(requested_names, list):
|
||||
names = []
|
||||
seen = set()
|
||||
for raw in requested_names:
|
||||
nm = str(raw or "").strip()
|
||||
if not nm or nm in seen or nm not in by_name:
|
||||
continue
|
||||
if scope not in ("all", "selected") and (by_name[nm].get("status") or "draft") == "published":
|
||||
continue
|
||||
if skip_audited and by_name[nm].get("audit_verdict"):
|
||||
continue
|
||||
names.append(nm)
|
||||
seen.add(nm)
|
||||
scope = "selected" if requested_names else scope
|
||||
elif scope == "all":
|
||||
names = [
|
||||
s.get("name") for s in auditable_skills
|
||||
if s.get("name") and (not skip_audited or not s.get("audit_verdict"))
|
||||
]
|
||||
else:
|
||||
scope = "unchecked" if scope == "drafts" else scope
|
||||
names = [
|
||||
s.get("name") for s in auditable_skills
|
||||
if s.get("name")
|
||||
and (s.get("status") or "draft") != "published"
|
||||
and not s.get("audit_verdict")
|
||||
]
|
||||
return names, scope
|
||||
|
||||
|
||||
def start_audit_job(key, skills_manager, names, url, model, headers, teacher, user,
|
||||
scope, *, deps: AuditDependencies):
|
||||
if not names:
|
||||
return {"ok": True, "status": "done", "total": 0, "results": [], "log": ["No skills to audit."]}
|
||||
|
||||
deps.audit_jobs[key] = {
|
||||
"status": "running", "scope": scope, "model": model,
|
||||
"teacher": teacher[1] if teacher else None,
|
||||
"total": len(names), "done": 0, "current": None,
|
||||
"results": [], "log": [f"Auditing {len(names)} skill(s) with {model}" + (f"; teacher {teacher[1]}" if teacher else "")],
|
||||
"started": _time.time(), "cancel": False,
|
||||
}
|
||||
task = _asyncio.create_task(deps.run_batch(key, skills_manager, names, url, model, headers, teacher, user))
|
||||
deps.audit_jobs[key]["task"] = task
|
||||
return {"ok": True, "status": "running", "total": len(names), "model": model}
|
||||
|
||||
|
||||
def audit_status(user, *, deps: AuditDependencies):
|
||||
job = deps.audit_jobs.get((user or "",))
|
||||
if not job:
|
||||
return {"status": "none"}
|
||||
return {
|
||||
"status": job["status"], "scope": job.get("scope"),
|
||||
"total": job.get("total", 0), "done": job.get("done", 0),
|
||||
"current": job.get("current"), "model": job.get("model"), "teacher": job.get("teacher"),
|
||||
"results": job.get("results", []), "log": job.get("log", []),
|
||||
"started": job.get("started"), "finished": job.get("finished"),
|
||||
}
|
||||
|
||||
|
||||
def cancel_audit(user, *, deps: AuditDependencies):
|
||||
job = deps.audit_jobs.get((user or "",))
|
||||
if job:
|
||||
job["cancel"] = True
|
||||
job["status"] = "cancelled"
|
||||
job["current"] = None
|
||||
task = job.get("task")
|
||||
if task and not task.done():
|
||||
task.cancel()
|
||||
return {"ok": True, "status": "cancelled" if job else "none"}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user