diff --git a/api/main.py b/api/main.py index c3d2c89..e73200f 100644 --- a/api/main.py +++ b/api/main.py @@ -1,3 +1,4 @@ +import os from contextlib import asynccontextmanager from fastapi import FastAPI @@ -21,9 +22,12 @@ app = FastAPI( lifespan=lifespan, ) +_cors_env = os.getenv("CORS_ORIGINS", "http://localhost:3000,http://127.0.0.1:3000") +_cors_origins = [o.strip() for o in _cors_env.split(",") if o.strip()] + app.add_middleware( CORSMiddleware, - allow_origins=["http://localhost:3000", "http://127.0.0.1:3000"], + allow_origins=_cors_origins, allow_methods=["GET", "POST", "PATCH", "DELETE", "PUT"], allow_headers=["Content-Type"], ) diff --git a/api/routers/decisions.py b/api/routers/decisions.py index c44802d..b216250 100644 --- a/api/routers/decisions.py +++ b/api/routers/decisions.py @@ -1,8 +1,11 @@ +import logging import uuid from datetime import datetime, timezone from pathlib import Path from fastapi import APIRouter, Depends, HTTPException, status + +logger = logging.getLogger(__name__) from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession @@ -171,10 +174,12 @@ async def _write_project_log( break if not project_path: + logger.warning("write_log requested but no project_path found for topic %s", decision.topic_id) return p = Path(project_path) if not p.is_dir(): + logger.warning("write_log requested but project_path does not exist: %s", project_path) return now = datetime.now(tz=timezone.utc) diff --git a/api/routers/progress.py b/api/routers/progress.py index c2cd380..ddb73b4 100644 --- a/api/routers/progress.py +++ b/api/routers/progress.py @@ -20,6 +20,7 @@ async def list_progress( event_type: str | None = None, since: datetime | None = None, limit: int = Query(100, le=1000), + offset: int = Query(0, ge=0), session: AsyncSession = Depends(get_session), ) -> list[ProgressEvent]: q = select(ProgressEvent) @@ -33,7 +34,7 @@ async def list_progress( q = q.where(ProgressEvent.event_type == event_type) if since: q = q.where(ProgressEvent.created_at >= since) - q = q.order_by(ProgressEvent.created_at.desc()).limit(limit) + q = q.order_by(ProgressEvent.created_at.desc()).offset(offset).limit(limit) result = await session.execute(q) return list(result.scalars().all()) diff --git a/api/routers/tasks.py b/api/routers/tasks.py index 0544adf..775e800 100644 --- a/api/routers/tasks.py +++ b/api/routers/tasks.py @@ -1,4 +1,5 @@ import uuid +from datetime import date from fastapi import APIRouter, Depends, HTTPException, Query, status from sqlalchemy import select @@ -17,6 +18,8 @@ async def list_tasks( status: TaskStatus | None = None, assignee: str | None = None, needs_human: bool | None = Query(None), + priority: str | None = None, + due_date_before: date | None = None, session: AsyncSession = Depends(get_session), ) -> list[Task]: q = select(Task) @@ -28,6 +31,10 @@ async def list_tasks( q = q.where(Task.assignee == assignee) if needs_human is not None: q = q.where(Task.needs_human == needs_human) + if priority: + q = q.where(Task.priority == priority) + if due_date_before is not None: + q = q.where(Task.due_date <= due_date_before) q = q.order_by(Task.created_at) result = await session.execute(q) return list(result.scalars().all()) diff --git a/api/routers/workstreams.py b/api/routers/workstreams.py index 29a72ef..4166a40 100644 --- a/api/routers/workstreams.py +++ b/api/routers/workstreams.py @@ -17,6 +17,8 @@ async def list_workstreams( repo_id: uuid.UUID | None = None, repo_goal_id: uuid.UUID | None = None, status: WorkstreamStatus | None = None, + owner: str | None = None, + slug: str | None = None, session: AsyncSession = Depends(get_session), ) -> list[Workstream]: q = select(Workstream) @@ -28,6 +30,10 @@ async def list_workstreams( q = q.where(Workstream.repo_goal_id == repo_goal_id) if status: q = q.where(Workstream.status == status) + if owner: + q = q.where(Workstream.owner == owner) + if slug: + q = q.where(Workstream.slug == slug) q = q.order_by(Workstream.updated_at.desc()) result = await session.execute(q) return list(result.scalars().all()) diff --git a/dashboard/observablehq.config.js b/dashboard/observablehq.config.js index bbdd290..a6159f5 100644 --- a/dashboard/observablehq.config.js +++ b/dashboard/observablehq.config.js @@ -100,8 +100,8 @@ export default { .kpi-infobox { background: var(--theme-background-alt, #f9f9f9); border: 1px solid var(--theme-foreground-faint, #e0e0e0); border-radius: 10px; padding: 0.75rem 1rem; position: relative; box-shadow: 0 1px 6px rgba(0,0,0,0.07); margin-bottom: 1.25rem; } .kpi-infobox-title { font-size: 0.68rem; font-weight: 700; text-transform: uppercase; letter-spacing: 0.08em; color: var(--theme-foreground-muted, #888); margin-bottom: 0.55rem; padding-right: 1.6rem; } .filter-bar { display: flex; flex-wrap: wrap; gap: 0.5rem; align-items: center; margin-bottom: 1rem; } -.filter-search, .filter-owner { display: flex; align-items: center; } -.filter-search input, .filter-owner input { height: 30px; font-size: 0.85rem; padding: 0.25rem 0.5rem; border-radius: 6px; border: 1px solid var(--theme-foreground-faint, #ccc); background: var(--theme-background, #fff); font-family: inherit; color: inherit; } +.filter-text-input { display: flex; align-items: center; } +.filter-text-input input { height: 30px; font-size: 0.85rem; padding: 0.25rem 0.5rem; border-radius: 6px; border: 1px solid var(--theme-foreground-faint, #ccc); background: var(--theme-background, #fff); font-family: inherit; color: inherit; } `, footer: "Custodian State Hub — local-first, append-only, sovereignty-preserving.", }; diff --git a/dashboard/src/decisions.md b/dashboard/src/decisions.md index 825bb3a..e67299d 100644 --- a/dashboard/src/decisions.md +++ b/dashboard/src/decisions.md @@ -68,7 +68,7 @@ const _filtersForm = Inputs.form( { template: ({type, status, search}) => html`
${type}${status} -
${search}
+
${search}
`, } ); @@ -103,7 +103,7 @@ function fmtDuration(ms) { if (ms < 2 * d) return `${Math.floor(ms / h)}h`; if (ms < 2 * w) return `${Math.floor(ms / d)}d`; if (ms < 8 * w) return `${Math.floor(ms / w)}w`; - return `${Math.round(ms / (30.5 * d))}mo`; + return `${Math.round(ms / (30.5 * d))}mo`; // 30.5 = avg days per month (365/12) } ``` diff --git a/dashboard/src/tasks.md b/dashboard/src/tasks.md index 1578402..ce9e4b0 100644 --- a/dashboard/src/tasks.md +++ b/dashboard/src/tasks.md @@ -65,7 +65,7 @@ const _filtersForm = Inputs.form( { template: ({status, priority, domain, assignee}) => html`
${status}${priority}${domain} -
${assignee}
+
${assignee}
`, } ); diff --git a/dashboard/src/workstreams.md b/dashboard/src/workstreams.md index 3576ede..136fe87 100644 --- a/dashboard/src/workstreams.md +++ b/dashboard/src/workstreams.md @@ -232,7 +232,7 @@ const _filtersForm = Inputs.form( { template: ({domain, status, owner}) => html`
${domain}${status} -
${owner}
+
${owner}
`, } ); diff --git a/mcp_server/server.py b/mcp_server/server.py index e531362..bf945cf 100644 --- a/mcp_server/server.py +++ b/mcp_server/server.py @@ -9,7 +9,7 @@ import json import os import re import sys -from datetime import datetime +from datetime import datetime, timezone from pathlib import Path from typing import Any from uuid import UUID @@ -41,34 +41,54 @@ def _client() -> httpx.Client: def _get(path: str, params: dict | None = None) -> Any: if not path.endswith("/"): path = path + "/" - with _client() as c: - r = c.get(path, params={k: v for k, v in (params or {}).items() if v is not None}) - r.raise_for_status() - return r.json() + try: + with _client() as c: + r = c.get(path, params={k: v for k, v in (params or {}).items() if v is not None}) + r.raise_for_status() + return r.json() + except httpx.HTTPStatusError as e: + return {"error": f"API {e.response.status_code}: {e.response.text[:300]}"} + except Exception as e: + return {"error": f"Request failed: {e}"} def _post(path: str, body: dict) -> Any: if not path.endswith("/"): path = path + "/" - with _client() as c: - r = c.post(path, json={k: v for k, v in body.items() if v is not None}) - r.raise_for_status() - return r.json() + try: + with _client() as c: + r = c.post(path, json={k: v for k, v in body.items() if v is not None}) + r.raise_for_status() + return r.json() + except httpx.HTTPStatusError as e: + return {"error": f"API {e.response.status_code}: {e.response.text[:300]}"} + except Exception as e: + return {"error": f"Request failed: {e}"} def _patch(path: str, body: dict) -> Any: if not path.endswith("/"): path = path + "/" - with _client() as c: - r = c.patch(path, json={k: v for k, v in body.items() if v is not None}) - r.raise_for_status() - return r.json() + try: + with _client() as c: + r = c.patch(path, json={k: v for k, v in body.items() if v is not None}) + r.raise_for_status() + return r.json() + except httpx.HTTPStatusError as e: + return {"error": f"API {e.response.status_code}: {e.response.text[:300]}"} + except Exception as e: + return {"error": f"Request failed: {e}"} def _delete(path: str) -> None: - with _client() as c: - r = c.delete(path) - r.raise_for_status() + try: + with _client() as c: + r = c.delete(path) + r.raise_for_status() + except httpx.HTTPStatusError as e: + return {"error": f"API {e.response.status_code}: {e.response.text[:300]}"} + except Exception as e: + return {"error": f"Request failed: {e}"} # --------------------------------------------------------------------------- @@ -526,7 +546,7 @@ def resolve_decision( "decision_type": "made", "rationale": rationale, "decided_by": decided_by, - "decided_at": datetime.utcnow().isoformat() + "Z", + "decided_at": datetime.now(tz=timezone.utc).isoformat(), }) _post("/progress", { "topic_id": decision.get("topic_id"), diff --git a/scripts/seed.py b/scripts/seed.py index df0e893..9420bff 100644 --- a/scripts/seed.py +++ b/scripts/seed.py @@ -82,7 +82,7 @@ TOPICS = [ async def seed() -> None: async with async_session_factory() as session: - # ── Insert domains (idempotent) ─────────────────────────────────────── + # ── Upsert domains ──────────────────────────────────────────────────── domain_by_slug: dict[str, Domain] = {} for data in DOMAINS: existing = await session.execute( @@ -90,7 +90,11 @@ async def seed() -> None: ) domain = existing.scalar_one_or_none() if domain is not None: - print(f" skip domain (exists): {data['slug']}") + if domain.name != data["name"]: + domain.name = data["name"] + print(f" update domain: {data['slug']}") + else: + print(f" skip domain (no change): {data['slug']}") else: domain = Domain(slug=data["slug"], name=data["name"]) session.add(domain) @@ -98,24 +102,35 @@ async def seed() -> None: print(f" insert domain: {data['slug']}") domain_by_slug[data["slug"]] = domain - # ── Insert topics (idempotent) ───────────────────────────────────────── + # ── Upsert topics ───────────────────────────────────────────────────── for data in TOPICS: existing = await session.execute( select(Topic).where(Topic.slug == data["slug"]) ) - if existing.scalar_one_or_none() is not None: - print(f" skip topic (exists): {data['slug']}") - continue + topic = existing.scalar_one_or_none() domain = domain_by_slug[data["domain_slug"]] - topic = Topic( - slug=data["slug"], - title=data["title"], - description=data["description"], - domain_id=domain.id, - status=TopicStatus.active, - ) - session.add(topic) - print(f" insert topic: {data['slug']}") + if topic is not None: + changed = False + if topic.title != data["title"]: + topic.title = data["title"] + changed = True + if topic.description != data["description"]: + topic.description = data["description"] + changed = True + if topic.domain_id != domain.id: + topic.domain_id = domain.id + changed = True + print(f" {'update' if changed else 'skip'} topic ({'changed' if changed else 'no change'}): {data['slug']}") + else: + topic = Topic( + slug=data["slug"], + title=data["title"], + description=data["description"], + domain_id=domain.id, + status=TopicStatus.active, + ) + session.add(topic) + print(f" insert topic: {data['slug']}") await session.commit() await engine.dispose()