Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 698821f065 | |||
| e794523079 | |||
| 28015ed1a2 | |||
| 376a6daddc | |||
| fb9b4fa422 | |||
| daebb54f47 | |||
| a598221812 | |||
| bada72f87e |
+181
@@ -23,6 +23,187 @@ skip versions are the composition of each intervening adjacent
|
|||||||
release's steps in order — no A-to-B path is pre-computed beyond
|
release's steps in order — no A-to-B path is pre-computed beyond
|
||||||
that.
|
that.
|
||||||
|
|
||||||
|
## 0.26.0 — 2026-05-28
|
||||||
|
|
||||||
|
**Minor — no schema migration, no new secret, no config, no upgrade
|
||||||
|
steps. Additive read-time enrichment; deployments inherit it on deploy
|
||||||
|
with nothing to set.** Roadmap item #28 **Part 1**: references to existing
|
||||||
|
**accepted** RFCs inside PR descriptions and comment text now render as
|
||||||
|
inline links to the referenced RFC. Shipped from driver session 0029.0,
|
||||||
|
in parallel with the v0.25.0 security-hardening session — hence the
|
||||||
|
version-slot gap (0.25.0 is that session's; this took the next free slot
|
||||||
|
per the roadmap's "claims the next available version number" rule).
|
||||||
|
|
||||||
|
Parts 2 (offer-to-create-RFC for strong-candidate terms) and 3
|
||||||
|
(offer-to-contribute-to-a-pending-RFC) of item #28 are deliberately **not**
|
||||||
|
in this release — Part 1 ships first as the easy win, exactly as the
|
||||||
|
roadmap row anticipates.
|
||||||
|
|
||||||
|
- **Where it links.** The PR review page's description and review
|
||||||
|
comments (`GET /api/rfcs/{slug}/prs/{n}`), and the PR-less per-RFC
|
||||||
|
discussion comments (`GET /api/rfcs/{slug}/discussion/threads/{id}/messages`).
|
||||||
|
Branch-chat (the AI-collaboration surface) is intentionally out of
|
||||||
|
scope for Part 1 — a noted follow-up.
|
||||||
|
- **Read-time, not submit-time.** The roadmap row phrases the scan as
|
||||||
|
happening "at submit/post time"; this ships it as **read-time**
|
||||||
|
enrichment instead. The intent the row actually names — "not as live
|
||||||
|
compose preview" — holds (drafts are never scanned, only submitted
|
||||||
|
content on read). Read-time was chosen because (a) links track the
|
||||||
|
*live* accepted-RFC set — a newly-accepted RFC starts linking in older
|
||||||
|
comments, a withdrawn one stops linking everywhere — rather than
|
||||||
|
freezing stale at submit; (b) it needs **no migration** (no derived
|
||||||
|
data to persist); (c) the active-RFC corpus is small and cache-resident,
|
||||||
|
so per-read scanning is cheap. (Recorded as a §19.3-rule-2 spec note in
|
||||||
|
the session transcript.)
|
||||||
|
- **XSS-safe by construction.** The backend returns structured *segments*
|
||||||
|
(a list of `{type:"text"}` / `{type:"rfc", slug, label, title}` items),
|
||||||
|
never HTML. The new `LinkedText` frontend component maps segments onto
|
||||||
|
React text nodes and anchors — no `dangerouslySetInnerHTML` — so a
|
||||||
|
comment author cannot inject markup through this path. Every enriched
|
||||||
|
field keeps its raw `text`/`description` alongside the `*_segments`, so
|
||||||
|
any non-segment-aware caller is unaffected.
|
||||||
|
- **Conservative matching (false-positive-averse).** A reference links
|
||||||
|
only when it is unlikely to be coincidental: an `rfc_id` token
|
||||||
|
(`RFC-0001`), a **multi-word** title (`Open Human Model`), or a
|
||||||
|
**hyphenated** slug (`open-human-model`). A single common-word title or
|
||||||
|
slug (a hypothetical RFC titled "Human") is **not** auto-linked — that
|
||||||
|
would turn every prose "human" into a link. Matching is case-insensitive,
|
||||||
|
word-boundary-anchored, longest-match-wins, and suppresses an RFC's
|
||||||
|
self-references inside its own PR/discussion. The roadmap's "curated
|
||||||
|
canonical-terms list" remains an explicit future opt-in rather than a
|
||||||
|
guessed-at default. New module: `backend/app/rfc_links.py`.
|
||||||
|
|
||||||
|
Tests: 12 new (`test_rfc_links_vertical.py`) — 9 scanner units (gating
|
||||||
|
rules, word boundaries, longest-match, case-insensitivity, casing
|
||||||
|
preservation, the rfc_id/multi-word/hyphenated gates) plus 3 end-to-end
|
||||||
|
(PR description + review comment + discussion comment all surface
|
||||||
|
`*_segments`; self-reference suppression). Full suite 363 green; frontend
|
||||||
|
builds clean.
|
||||||
|
|
||||||
|
Upgrade steps:
|
||||||
|
|
||||||
|
1. None. This release is purely additive: no migration, no new
|
||||||
|
environment variable, no secret, no overlay. A deployment picks up RFC
|
||||||
|
auto-linking the moment it deploys this version. (RFCs only link once
|
||||||
|
they are in the `active` state — proposed/super-draft and withdrawn
|
||||||
|
RFCs are never link targets, matching the §11.3 universal-public read
|
||||||
|
rule.)
|
||||||
|
|
||||||
|
## 0.24.0 — 2026-05-28
|
||||||
|
|
||||||
|
**Minor — one new secret required before this version serves tag
|
||||||
|
suggestions; no schema migration; no behavior change for deployments
|
||||||
|
that do not bind the key.** Roadmap item #27: as a contributor fills in
|
||||||
|
the propose-RFC form, the backend asks Claude Haiku to recommend tags
|
||||||
|
drawn from the collection's existing tag set, surfaced as clickable
|
||||||
|
suggestion chips. Shipped from driver session 0025.0. This is the §9.1
|
||||||
|
"Slice 2" AI-suggested chips that the propose modal has carried a
|
||||||
|
deferred placeholder for since Slice 1.
|
||||||
|
|
||||||
|
- **`POST /api/rfcs/suggest-tags`** (contributor-gated, per-user
|
||||||
|
rate-limited). Takes the partial draft (`title`, `pitch`,
|
||||||
|
`use_case`) and returns `{ "suggestions": [{ "tag", "confidence" },
|
||||||
|
…] }`. The model is constrained to the corpus's existing tags — v1
|
||||||
|
tags are free-form chip input, so "the taxonomy" is the de-facto set
|
||||||
|
of distinct tags the existing RFCs carry. The model MUST NOT invent
|
||||||
|
tags; taxonomy extension is a deliberate out-of-scope follow-up.
|
||||||
|
- **Always Claude Haiku, for cost.** Tag suggestion uses Haiku
|
||||||
|
regardless of the `ENABLED_MODELS` chat-picker universe, via the new
|
||||||
|
`providers.construct_haiku()` factory. There is no RFC slug at propose
|
||||||
|
time, so the §6.7 per-RFC funder credential path does not apply — the
|
||||||
|
surface runs on the operator's own `ANTHROPIC_API_KEY`.
|
||||||
|
- **Degrades to silence, never error.** No key bound, an empty corpus,
|
||||||
|
an empty draft, a rate-limited caller, or an unparseable model reply
|
||||||
|
all yield an empty list; the propose modal hides its suggestion row,
|
||||||
|
and the rest of the app is unaffected. So a deployment that does not
|
||||||
|
set the key sees no change at all.
|
||||||
|
- **Privacy disclosure.** The modal carries an inline note that the
|
||||||
|
draft text is sent to Anthropic to generate the suggestions. This is
|
||||||
|
required for honesty (the text leaves the deployment before the RFC
|
||||||
|
is submitted); cookie-consent does not gate it because the user has
|
||||||
|
actively typed into a draft surface. The exact wording wants a
|
||||||
|
counsel pass before OHM's deploy, per the #22 drafting discipline.
|
||||||
|
- **Frontend.** `ProposeModal` debounce-posts the draft (700 ms, with a
|
||||||
|
stale-response guard); suggestion chips are clickable and add to the
|
||||||
|
tag list (nothing auto-applies). `api.suggestTags()` is forgiving —
|
||||||
|
any non-OK response resolves to `[]`.
|
||||||
|
|
||||||
|
Tests: 11 new (`test_tag_suggest_vertical.py`) — contributor-gating,
|
||||||
|
universe-constrained filtering, no-key / empty-corpus / rate-limit
|
||||||
|
paths, plus units for the universe gather, the tolerant reply parser,
|
||||||
|
the max cap, the empty-draft short-circuit, and provider-failure
|
||||||
|
fallback. Full suite 351 green.
|
||||||
|
|
||||||
|
Upgrade steps:
|
||||||
|
|
||||||
|
1. You **MUST** bind `ANTHROPIC_API_KEY` for the suggestion surface to
|
||||||
|
work. On OHM this is an operator gesture — the key never touches the
|
||||||
|
conversation. Set it from your own terminal via stdin (so the bytes
|
||||||
|
never land in shell history):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
printf '%s' "$(pbpaste)" | .venv/bin/ohm-rfc-app-flotilla \
|
||||||
|
secret set ohm-rfc-app ANTHROPIC_API_KEY
|
||||||
|
```
|
||||||
|
|
||||||
|
(The §18 chat stack already reads this same key, so a deployment
|
||||||
|
that has chat configured **MAY** already have it bound — confirm with
|
||||||
|
`flotilla secret list ohm-rfc-app`.) If the key is absent the app
|
||||||
|
still boots and serves normally; tag suggestions are simply
|
||||||
|
unavailable until it is set.
|
||||||
|
2. You **MAY** tune the per-user rate limit via `TAG_SUGGEST_RATE_MAX`
|
||||||
|
(default 30) and `TAG_SUGGEST_RATE_WINDOW_SECONDS` (default 60). The
|
||||||
|
defaults apply when unset.
|
||||||
|
3. You **SHOULD** have counsel review the modal's disclosure wording
|
||||||
|
before exposing the surface to users, per the #22 drafting
|
||||||
|
discipline — the copy is honest as written, but the legal review is
|
||||||
|
the right call for any "your text is sent to a third party" notice.
|
||||||
|
|
||||||
|
## 0.23.0 — 2026-05-28
|
||||||
|
|
||||||
|
Roadmap item #29: signing in lands the user on their most recently
|
||||||
|
viewed app state instead of the empty-state home view. Shipped from
|
||||||
|
driver session 0022.0. Per-user, server-side, on by default; first-ever
|
||||||
|
sign-ins still land on home.
|
||||||
|
|
||||||
|
1. **Server-side last-state.** A new `user_session_state` table holds one
|
||||||
|
row per user: `last_route TEXT`, `last_route_state TEXT` (light view
|
||||||
|
state encoded as JSON — SQLite has no native JSONB — never draft-buffer
|
||||||
|
contents), `resume_enabled INTEGER NOT NULL DEFAULT 1`, and
|
||||||
|
`last_updated_at`. Per-user (not per-device), matching the
|
||||||
|
"go to where I was last" intent.
|
||||||
|
2. **Route-change capture.** A new frontend hook (`frontend/src/lib/
|
||||||
|
useLastState.js`) debounce-posts the current route + light state to
|
||||||
|
`PUT /api/me/last-state` for authenticated users only; anonymous
|
||||||
|
sessions are a no-op. The handler upserts the user's row and no-ops
|
||||||
|
when `resume_enabled` is 0.
|
||||||
|
3. **Sign-in redirect.** The stored `last_route` (+ decoded state +
|
||||||
|
`resume_enabled`) is folded onto the existing `/api/auth/me` payload
|
||||||
|
(no new GET endpoint), so the frontend reads it on boot. On a hard
|
||||||
|
sign-in landing (app booted on `/`), the app redirects to the stored
|
||||||
|
route. The redirect is gated on the #21-Part-C Amplitude `identify`
|
||||||
|
having fired (`identifyReady`), preserving identify-then-track
|
||||||
|
ordering — the first event on the resumed route carries the user_id.
|
||||||
|
4. **Edge cases.** Stale routes (an RFC since withdrawn or now
|
||||||
|
unreadable) are a graceful no-op — existing routing falls through to
|
||||||
|
the catalog/empty-state. Opt-out ships at the column level
|
||||||
|
(`resume_enabled`); the profile-settings toggle UI is a follow-up.
|
||||||
|
Stored state is route + light view state only, never draft contents
|
||||||
|
(documented in `SPEC.md` §6.8).
|
||||||
|
|
||||||
|
Migration `022_user_session_state.sql` creates the table. No new
|
||||||
|
environment variables, overlay keys, or secrets.
|
||||||
|
|
||||||
|
Upgrade steps:
|
||||||
|
|
||||||
|
1. Deployments **MUST** apply database migrations; `022_user_session_state.sql`
|
||||||
|
runs automatically on next boot (the migration runner globs
|
||||||
|
`backend/migrations/*.sql` and applies any not yet recorded in
|
||||||
|
`schema_migrations`). The migration is additive — a new table — and
|
||||||
|
requires no data backfill.
|
||||||
|
2. No new environment variables, overlay keys, or secrets. No operator
|
||||||
|
action beyond the standard `flotilla deploy ohm-rfc-app`.
|
||||||
|
|
||||||
## 0.22.0 — 2026-05-28
|
## 0.22.0 — 2026-05-28
|
||||||
|
|
||||||
Roadmap item #26: an optional **"What will you be using this for?"**
|
Roadmap item #26: an optional **"What will you be using this for?"**
|
||||||
|
|||||||
@@ -714,6 +714,47 @@ The lighter half ships the structural shape — frontmatter, consent,
|
|||||||
resolution, revocation. The heavier half ships the runtime
|
resolution, revocation. The heavier half ships the runtime
|
||||||
hardening.
|
hardening.
|
||||||
|
|
||||||
|
### 6.8 Sign-in state resume (roadmap item #29, v0.23.0)
|
||||||
|
|
||||||
|
Signing in lands the user back on their most recently-viewed app
|
||||||
|
state instead of always on the empty-state home view. The model is
|
||||||
|
**per-user**, not per-device — the safe default the roadmap calls
|
||||||
|
for: a sign-in on any device resumes the most-recently-recorded
|
||||||
|
route. A per-device split and a profile-settings toggle UI are
|
||||||
|
follow-ups; v0.23.0 ships the column-level opt-out flag
|
||||||
|
(`resume_enabled`, default on) and the default-on behavior.
|
||||||
|
|
||||||
|
**Storage.** A single row per user in `user_session_state`
|
||||||
|
(migration 022): `user_id` (PK, FK → `users.id`, cascade-delete),
|
||||||
|
`last_route` (TEXT, the frontend pathname), `last_route_state`
|
||||||
|
(TEXT, JSON-encoded — SQLite has no native JSONB, so JSON-as-TEXT
|
||||||
|
matches how the app stores every other JSON blob), `resume_enabled`
|
||||||
|
(INTEGER, default 1), and `last_updated_at`.
|
||||||
|
|
||||||
|
**Wiring.** A debounced (~1s) frontend route-change hook posts the
|
||||||
|
current route to `PUT /api/me/last-state` for authenticated users
|
||||||
|
(anonymous: no-op). The stored `last_route` is folded onto the
|
||||||
|
existing `/api/auth/me` payload (no extra round-trip); on sign-in,
|
||||||
|
after the §21-Part-C Amplitude `identify` fires, the frontend
|
||||||
|
`navigate()`s to it. The identify-then-redirect ordering is
|
||||||
|
preserved: the redirect is gated on identify having fired.
|
||||||
|
|
||||||
|
**Stale state.** If the stored route is an RFC since withdrawn or
|
||||||
|
one the user lost rights to read, the redirect is a graceful no-op:
|
||||||
|
`navigate(last_route)` lands on whatever that route renders today,
|
||||||
|
and the existing routing already falls through to the
|
||||||
|
catalog/empty-state for a missing/unreadable RFC. No special-casing
|
||||||
|
on the server.
|
||||||
|
|
||||||
|
**Privacy (binding).** The stored state is **route + light view
|
||||||
|
state ONLY** — scroll anchors, open-tab selection, filter chips, and
|
||||||
|
the like. It **MUST NOT** carry draft-buffer contents, PR/comment
|
||||||
|
draft text, or any user-typed content. The frontend never sends such
|
||||||
|
content; the `last_route_state` column comment in migration 022 and
|
||||||
|
this paragraph are the contract. Resume state is purposely cheap to
|
||||||
|
discard: a deliberate "clear" (or `resume_enabled = 0`) drops the
|
||||||
|
user back to today's empty-state behavior.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 7. The left pane
|
## 7. The left pane
|
||||||
|
|||||||
@@ -38,10 +38,22 @@ GITEA_WEBHOOK_SECRET=change-me-to-a-shared-secret
|
|||||||
# Comma-separated list of provider keys to enable. Per the §19.2
|
# Comma-separated list of provider keys to enable. Per the §19.2
|
||||||
# per-RFC-model topic, this is app-wide until that topic lands.
|
# per-RFC-model topic, this is app-wide until that topic lands.
|
||||||
ENABLED_MODELS=claude
|
ENABLED_MODELS=claude
|
||||||
|
# ANTHROPIC_API_KEY also powers the §9.1 propose-RFC tag suggestions
|
||||||
|
# (roadmap #27) — that surface always uses Claude Haiku for cost,
|
||||||
|
# independent of ENABLED_MODELS. With no key set, tag suggestions are
|
||||||
|
# simply unavailable (the modal hides the row); the rest of the app is
|
||||||
|
# unaffected.
|
||||||
ANTHROPIC_API_KEY=
|
ANTHROPIC_API_KEY=
|
||||||
GOOGLE_API_KEY=
|
GOOGLE_API_KEY=
|
||||||
OPENAI_API_KEY=
|
OPENAI_API_KEY=
|
||||||
|
|
||||||
|
# --- Tag suggestions (§9.1 / roadmap #27) ---
|
||||||
|
# Per-user rate limit on the suggest-tags endpoint (cost backstop; the
|
||||||
|
# modal debounces and the endpoint is contributor-gated). Optional —
|
||||||
|
# these defaults apply when unset.
|
||||||
|
TAG_SUGGEST_RATE_MAX=30
|
||||||
|
TAG_SUGGEST_RATE_WINDOW_SECONDS=60
|
||||||
|
|
||||||
# --- Email (§15.4) ---
|
# --- Email (§15.4) ---
|
||||||
# Leave SMTP_HOST unset to use the stdout fallback — the integration
|
# Leave SMTP_HOST unset to use the stdout fallback — the integration
|
||||||
# tests rely on it, and a dev environment without a real SMTP provider
|
# tests rely on it, and a dev environment without a real SMTP provider
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ from . import (
|
|||||||
notify,
|
notify,
|
||||||
philosophy,
|
philosophy,
|
||||||
providers as providers_mod,
|
providers as providers_mod,
|
||||||
|
tag_suggest,
|
||||||
)
|
)
|
||||||
from .bot import Bot
|
from .bot import Bot
|
||||||
from .config import Config
|
from .config import Config
|
||||||
@@ -58,6 +59,17 @@ class ProposeBody(BaseModel):
|
|||||||
proposed_use_case: str | None = Field(default=None, max_length=8000)
|
proposed_use_case: str | None = Field(default=None, max_length=8000)
|
||||||
|
|
||||||
|
|
||||||
|
class SuggestTagsBody(BaseModel):
|
||||||
|
# Roadmap #27: the partial propose-RFC draft, sent as the user types
|
||||||
|
# (debounced on the frontend). All fields optional — suggestions
|
||||||
|
# refine as the draft fills in. `pitch` is the "why is this needed"
|
||||||
|
# rationale; `use_case` is the #26 optional ground-truth field.
|
||||||
|
# Bounds mirror the propose body's free-text caps.
|
||||||
|
title: str = Field(default="", max_length=200)
|
||||||
|
pitch: str = Field(default="", max_length=8000)
|
||||||
|
use_case: str = Field(default="", max_length=8000)
|
||||||
|
|
||||||
|
|
||||||
class DeclineBody(BaseModel):
|
class DeclineBody(BaseModel):
|
||||||
comment: str = Field(min_length=1, max_length=4000)
|
comment: str = Field(min_length=1, max_length=4000)
|
||||||
|
|
||||||
@@ -67,6 +79,18 @@ class FunderCredentialBody(BaseModel):
|
|||||||
api_key: str = Field(min_length=1, max_length=2048)
|
api_key: str = Field(min_length=1, max_length=2048)
|
||||||
|
|
||||||
|
|
||||||
|
class LastStateBody(BaseModel):
|
||||||
|
# v0.23.0 / roadmap item #29: server-side sign-in state resume.
|
||||||
|
# `route` is a frontend pathname the user was last on (bounded so a
|
||||||
|
# hostile client can't stuff arbitrary blobs through). `state` is an
|
||||||
|
# optional bag of *light* view state (scroll anchors, open tab,
|
||||||
|
# filter chips). PRIVACY: it MUST NOT carry draft-buffer contents —
|
||||||
|
# the frontend only ever sends ephemeral view state, and the column
|
||||||
|
# comment in migration 022 + SPEC §6.2 are the binding contract.
|
||||||
|
route: str = Field(min_length=1, max_length=2048)
|
||||||
|
state: dict[str, Any] | None = None
|
||||||
|
|
||||||
|
|
||||||
class BetaRequestBody(BaseModel):
|
class BetaRequestBody(BaseModel):
|
||||||
# v0.8.0 — captured on the first OTC sign-in. All three fields are
|
# v0.8.0 — captured on the first OTC sign-in. All three fields are
|
||||||
# required so the admin queue has a coherent triage shape.
|
# required so the admin queue has a coherent triage shape.
|
||||||
@@ -354,6 +378,28 @@ def make_router(
|
|||||||
)
|
)
|
||||||
has_passcode = bool(row and row["passcode_hash"])
|
has_passcode = bool(row and row["passcode_hash"])
|
||||||
passcode_set_at = row["passcode_set_at"] if (row and has_passcode) else None
|
passcode_set_at = row["passcode_set_at"] if (row and has_passcode) else None
|
||||||
|
# v0.23.0 / item #29: fold the sign-in-resume state onto the
|
||||||
|
# same round-trip the frontend already makes on boot. When
|
||||||
|
# resume is disabled (resume_enabled = 0) we hand back a null
|
||||||
|
# route so the client never redirects; the stored row stays put
|
||||||
|
# so re-enabling later resumes the last-known route.
|
||||||
|
state_row = db.conn().execute(
|
||||||
|
"SELECT last_route, last_route_state, resume_enabled "
|
||||||
|
"FROM user_session_state WHERE user_id = ?",
|
||||||
|
(user.user_id,),
|
||||||
|
).fetchone()
|
||||||
|
resume_enabled = bool(state_row["resume_enabled"]) if state_row else True
|
||||||
|
last_route = (
|
||||||
|
state_row["last_route"]
|
||||||
|
if (state_row and resume_enabled)
|
||||||
|
else None
|
||||||
|
)
|
||||||
|
last_route_state = None
|
||||||
|
if state_row and resume_enabled and state_row["last_route_state"]:
|
||||||
|
try:
|
||||||
|
last_route_state = json.loads(state_row["last_route_state"])
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
last_route_state = None
|
||||||
return {
|
return {
|
||||||
"authenticated": True,
|
"authenticated": True,
|
||||||
"user": {
|
"user": {
|
||||||
@@ -370,6 +416,10 @@ def make_router(
|
|||||||
"needs_profile": needs_profile,
|
"needs_profile": needs_profile,
|
||||||
"has_passcode": has_passcode,
|
"has_passcode": has_passcode,
|
||||||
"passcode_set_at": passcode_set_at,
|
"passcode_set_at": passcode_set_at,
|
||||||
|
# v0.23.0 / item #29 — sign-in state resume.
|
||||||
|
"resume_enabled": resume_enabled,
|
||||||
|
"last_route": last_route,
|
||||||
|
"last_route_state": last_route_state,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -439,6 +489,52 @@ def make_router(
|
|||||||
notify.fan_out_new_beta_request(requester_user_id=user.user_id)
|
notify.fan_out_new_beta_request(requester_user_id=user.user_id)
|
||||||
return {"ok": True}
|
return {"ok": True}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------
|
||||||
|
# v0.23.0 (§6.2, roadmap item #29): server-side sign-in state
|
||||||
|
# resume. The frontend debounce-posts the user's current route +
|
||||||
|
# a small bag of light view state here on every route change; the
|
||||||
|
# next sign-in reads `last_route` off `/api/auth/me` and redirects.
|
||||||
|
#
|
||||||
|
# Per-user (NOT per-device) — one row per user, keyed on user_id.
|
||||||
|
# `resume_enabled` is the opt-out flag (default on); when it's 0
|
||||||
|
# this endpoint no-ops so a user who turned resume off doesn't keep
|
||||||
|
# silently rewriting their stored route. PRIVACY: the body carries
|
||||||
|
# route + light state ONLY, never draft-buffer contents (migration
|
||||||
|
# 022 column comment + SPEC §6.2 are the binding contract).
|
||||||
|
#
|
||||||
|
# `require_user` (not `require_contributor`) — a pending/granted
|
||||||
|
# distinction is irrelevant for "remember where I was", and a
|
||||||
|
# pending user navigating read-only surfaces should still resume.
|
||||||
|
# Anonymous callers get the 401 `require_user` raises.
|
||||||
|
# ---------------------------------------------------------------
|
||||||
|
|
||||||
|
@router.put("/api/me/last-state")
|
||||||
|
async def put_last_state(body: LastStateBody, request: Request) -> dict[str, Any]:
|
||||||
|
user = auth.require_user(request)
|
||||||
|
# Respect the opt-out: if a row already exists with resume
|
||||||
|
# disabled, leave it untouched and report the no-op. A first-
|
||||||
|
# ever POST (no row yet) defaults to enabled and stores.
|
||||||
|
existing = db.conn().execute(
|
||||||
|
"SELECT resume_enabled FROM user_session_state WHERE user_id = ?",
|
||||||
|
(user.user_id,),
|
||||||
|
).fetchone()
|
||||||
|
if existing is not None and not existing["resume_enabled"]:
|
||||||
|
return {"ok": True, "stored": False}
|
||||||
|
state_json = json.dumps(body.state) if body.state is not None else None
|
||||||
|
db.conn().execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO user_session_state
|
||||||
|
(user_id, last_route, last_route_state, last_updated_at)
|
||||||
|
VALUES (?, ?, ?, datetime('now'))
|
||||||
|
ON CONFLICT(user_id) DO UPDATE SET
|
||||||
|
last_route = excluded.last_route,
|
||||||
|
last_route_state = excluded.last_route_state,
|
||||||
|
last_updated_at = excluded.last_updated_at
|
||||||
|
""",
|
||||||
|
(user.user_id, body.route, state_json),
|
||||||
|
)
|
||||||
|
return {"ok": True, "stored": True}
|
||||||
|
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# v0.11.0: trust device for 30 days (§6.2, roadmap item #9).
|
# v0.11.0: trust device for 30 days (§6.2, roadmap item #9).
|
||||||
#
|
#
|
||||||
@@ -759,6 +855,33 @@ def make_router(
|
|||||||
|
|
||||||
return {"pr_number": pr["number"], "slug": slug}
|
return {"pr_number": pr["number"], "slug": slug}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------
|
||||||
|
# §9.1 Slice 2 (roadmap #27): Claude Haiku tag suggestions as the
|
||||||
|
# propose-RFC fields fill in. The modal debounce-posts the partial
|
||||||
|
# draft; we constrain Haiku to the corpus's existing tag set and
|
||||||
|
# return a short ranked list of clickable chips. Gated to
|
||||||
|
# contributors (same gate as propose) so the cost surface is bounded
|
||||||
|
# to people who can actually file an RFC; rate-limited per user as a
|
||||||
|
# backstop. Degrades to an empty list (no error) when no Anthropic
|
||||||
|
# key is bound, the corpus has no tags yet, or the draft is empty —
|
||||||
|
# so the modal simply shows nothing extra.
|
||||||
|
# ---------------------------------------------------------------
|
||||||
|
|
||||||
|
@router.post("/api/rfcs/suggest-tags")
|
||||||
|
async def suggest_rfc_tags(payload: SuggestTagsBody, request: Request) -> dict[str, Any]:
|
||||||
|
user = auth.require_contributor(request)
|
||||||
|
if not tag_suggest.rate_limit_ok(user.user_id):
|
||||||
|
raise HTTPException(429, "Too many tag-suggestion requests; please slow down.")
|
||||||
|
provider = tag_suggest.haiku_provider(config)
|
||||||
|
if provider is None:
|
||||||
|
return {"suggestions": []}
|
||||||
|
universe = tag_suggest.gather_tag_universe()
|
||||||
|
draft = tag_suggest.Draft(
|
||||||
|
title=payload.title, pitch=payload.pitch, use_case=payload.use_case
|
||||||
|
)
|
||||||
|
suggestions = tag_suggest.suggest(provider, draft, universe)
|
||||||
|
return {"suggestions": suggestions}
|
||||||
|
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# §9.3: merge / decline / withdraw an idea PR
|
# §9.3: merge / decline / withdraw an idea PR
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ from typing import Any
|
|||||||
from fastapi import APIRouter, HTTPException, Request
|
from fastapi import APIRouter, HTTPException, Request
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
from . import auth, chat as chat_layer, db
|
from . import auth, chat as chat_layer, db, rfc_links
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -171,9 +171,17 @@ def make_router() -> APIRouter:
|
|||||||
""",
|
""",
|
||||||
(thread_id,),
|
(thread_id,),
|
||||||
).fetchall()
|
).fetchall()
|
||||||
|
# Roadmap #28 Part 1: enrich each discussion comment with RFC
|
||||||
|
# auto-link segments scanned against the live accepted-RFC corpus
|
||||||
|
# (read-time; see rfc_links.py). exclude_slug suppresses self-links
|
||||||
|
# to this RFC inside its own discussion.
|
||||||
|
link_index = rfc_links.build_index(db.conn(), exclude_slug=slug)
|
||||||
|
messages = [_serialize_message(r) for r in rows]
|
||||||
|
for m in messages:
|
||||||
|
m["text_segments"] = link_index.segment(m["text"])
|
||||||
return {
|
return {
|
||||||
"thread": _serialize_thread(thread),
|
"thread": _serialize_thread(thread),
|
||||||
"messages": [_serialize_message(r) for r in rows],
|
"messages": messages,
|
||||||
}
|
}
|
||||||
|
|
||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
|
|||||||
+15
-1
@@ -23,7 +23,7 @@ from typing import Any
|
|||||||
from fastapi import APIRouter, HTTPException, Request
|
from fastapi import APIRouter, HTTPException, Request
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
from . import auth, cache, chat as chat_layer, db, entry as entry_mod, funder, models_resolver
|
from . import auth, cache, chat as chat_layer, db, entry as entry_mod, funder, models_resolver, rfc_links
|
||||||
from .bot import Bot
|
from .bot import Bot
|
||||||
from .config import Config
|
from .config import Config
|
||||||
from .gitea import Gitea, GiteaError
|
from .gitea import Gitea, GiteaError
|
||||||
@@ -213,6 +213,12 @@ def make_router(
|
|||||||
path = _file_path_for(rfc)
|
path = _file_path_for(rfc)
|
||||||
head_branch = pr_row["head_branch"]
|
head_branch = pr_row["head_branch"]
|
||||||
|
|
||||||
|
# Roadmap #28 Part 1: build the RFC auto-link index once for this
|
||||||
|
# PR view (read-time enrichment against the live accepted-RFC
|
||||||
|
# corpus; see rfc_links.py). exclude_slug suppresses self-links to
|
||||||
|
# this RFC inside its own PR.
|
||||||
|
link_index = rfc_links.build_index(db.conn(), exclude_slug=slug)
|
||||||
|
|
||||||
# §11.3: PRs are always public; no visibility check.
|
# §11.3: PRs are always public; no visibility check.
|
||||||
main_fetched = await gitea.read_file(owner, repo, path, ref="main")
|
main_fetched = await gitea.read_file(owner, repo, path, ref="main")
|
||||||
main_body = _extract_body(rfc, (main_fetched or ("", ""))[0])
|
main_body = _extract_body(rfc, (main_fetched or ("", ""))[0])
|
||||||
@@ -259,6 +265,13 @@ def make_router(
|
|||||||
for r in msg_rows:
|
for r in msg_rows:
|
||||||
messages_by_thread.setdefault(r["thread_id"], []).append(_serialize_message(r))
|
messages_by_thread.setdefault(r["thread_id"], []).append(_serialize_message(r))
|
||||||
|
|
||||||
|
# Roadmap #28 Part 1: enrich every comment with RFC auto-link
|
||||||
|
# segments (read-time; see rfc_links.py). The description is
|
||||||
|
# enriched alongside it in the return dict below.
|
||||||
|
for _msgs in messages_by_thread.values():
|
||||||
|
for _m in _msgs:
|
||||||
|
_m["text_segments"] = link_index.segment(_m["text"])
|
||||||
|
|
||||||
# Per-user seen cursor per §10.3. Anonymous viewers get no
|
# Per-user seen cursor per §10.3. Anonymous viewers get no
|
||||||
# cursor — they always see "everything new" but cannot advance
|
# cursor — they always see "everything new" but cannot advance
|
||||||
# the cursor (no row to write to).
|
# the cursor (no row to write to).
|
||||||
@@ -325,6 +338,7 @@ def make_router(
|
|||||||
"pr_number": pr_number,
|
"pr_number": pr_number,
|
||||||
"title": pr_row["title"],
|
"title": pr_row["title"],
|
||||||
"description": pr_row["description"],
|
"description": pr_row["description"],
|
||||||
|
"description_segments": link_index.segment(pr_row["description"]),
|
||||||
"proposed_use_case": _pr_use_case(pr_number),
|
"proposed_use_case": _pr_use_case(pr_number),
|
||||||
"state": pr_row["state"],
|
"state": pr_row["state"],
|
||||||
"opened_by": pr_row["opened_by"],
|
"opened_by": pr_row["opened_by"],
|
||||||
|
|||||||
@@ -184,6 +184,21 @@ def load_providers(env: dict) -> dict[str, BaseProvider]:
|
|||||||
return providers
|
return providers
|
||||||
|
|
||||||
|
|
||||||
|
def construct_haiku(api_key: str) -> AnthropicProvider:
|
||||||
|
"""A dedicated Claude Haiku provider, independent of the
|
||||||
|
`ENABLED_MODELS` chat-picker universe.
|
||||||
|
|
||||||
|
The §9.1 tag-suggestion surface (roadmap #27) always wants the
|
||||||
|
cheap + fast model regardless of which models the operator surfaces
|
||||||
|
in the §8.12 picker, so it constructs Haiku directly from the
|
||||||
|
operator's Anthropic key rather than going through `load_providers`.
|
||||||
|
The model id is sourced from the same `_CLAUDE_VARIANTS` table the
|
||||||
|
picker uses, so a model-string bump lands in one place.
|
||||||
|
"""
|
||||||
|
model, name = _CLAUDE_VARIANTS["claude-haiku"]
|
||||||
|
return AnthropicProvider(api_key=api_key, model=model, display_name=name)
|
||||||
|
|
||||||
|
|
||||||
def load_from_config(config) -> dict[str, BaseProvider]:
|
def load_from_config(config) -> dict[str, BaseProvider]:
|
||||||
"""Convenience adapter so callers can pass our Config dataclass directly."""
|
"""Convenience adapter so callers can pass our Config dataclass directly."""
|
||||||
env = {
|
env = {
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
"""Roadmap #28 Part 1 — auto-link RFC references in submitted prose.
|
||||||
|
|
||||||
|
Scans plain-text PR descriptions and comment bodies for references to
|
||||||
|
existing **accepted** (state='active') RFCs and returns a structured list
|
||||||
|
of *segments* the frontend renders: plain-text runs interleaved with
|
||||||
|
``{"type": "rfc", ...}`` link segments. The backend never emits HTML —
|
||||||
|
the frontend maps link segments onto React anchors — so the surface is
|
||||||
|
XSS-safe by construction and independent of any HTML-sanitization layer.
|
||||||
|
|
||||||
|
**Read-time enrichment, not submit-time persistence.** The roadmap row
|
||||||
|
phrases the scan as happening "at submit/post time"; this module instead
|
||||||
|
enriches on read. The intent the roadmap actually names — "not as live
|
||||||
|
compose preview" — is honored (drafts are never scanned, only submitted
|
||||||
|
content on the read paths). Read-time was chosen for three reasons:
|
||||||
|
|
||||||
|
1. Correctness — links track the *live* active-RFC set. A newly-accepted
|
||||||
|
RFC starts linking in older comments; a withdrawn RFC stops linking
|
||||||
|
everywhere. Submit-time freezing would drift stale.
|
||||||
|
2. Zero migration — no derived data to store. (A concurrent session
|
||||||
|
already holds migration 023; staying migration-free keeps this slice
|
||||||
|
conflict-free as well as simpler.)
|
||||||
|
3. Cost — the active-RFC corpus is small and cache-resident, so building
|
||||||
|
the term index and scanning a ≤20k-char body per read is cheap.
|
||||||
|
|
||||||
|
**Matching is conservative by design.** Only references that are unlikely
|
||||||
|
to be coincidental link:
|
||||||
|
|
||||||
|
* ``rfc_id`` tokens (e.g. ``RFC-0001``) — inherently specific.
|
||||||
|
* Multi-word titles (containing whitespace, e.g. ``Open Human Model``).
|
||||||
|
* Hyphenated slugs (containing ``-``, e.g. ``open-human-model``).
|
||||||
|
|
||||||
|
Single common-word titles or slugs (e.g. a hypothetical RFC titled
|
||||||
|
"Human") are deliberately NOT auto-linked — they would turn every prose
|
||||||
|
"human" into a link. Surfacing those is the job of the roadmap's
|
||||||
|
"curated canonical-terms list", an explicit per-deployment opt-in left as
|
||||||
|
a future extension rather than guessed at here.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Any, Iterable
|
||||||
|
|
||||||
|
|
||||||
|
def _is_word_char(c: str) -> bool:
|
||||||
|
"""Word-boundary test. Hyphen and underscore count as word chars so a
|
||||||
|
match can't begin or end in the middle of a kebab/snake token."""
|
||||||
|
return c.isalnum() or c in ("-", "_")
|
||||||
|
|
||||||
|
|
||||||
|
def segment_text(text: str | None, terms: list[tuple[str, str, str]]) -> list[dict[str, Any]]:
|
||||||
|
"""Split ``text`` into text / rfc-link segments against ``terms``.
|
||||||
|
|
||||||
|
``terms`` is a list of ``(key_lower, slug, title)`` tuples; callers
|
||||||
|
pass it pre-sorted longest-first so the longest match wins at any
|
||||||
|
position (so "Open Human Model" wins over a bare "Open"). Matching is
|
||||||
|
case-insensitive and respects word boundaries on both ends. The
|
||||||
|
returned ``label`` preserves the source casing.
|
||||||
|
|
||||||
|
Always returns at least one segment; for empty/None input that is a
|
||||||
|
single empty text segment, so callers can render uniformly.
|
||||||
|
"""
|
||||||
|
if not text:
|
||||||
|
return [{"type": "text", "text": text or ""}]
|
||||||
|
|
||||||
|
out: list[dict[str, Any]] = []
|
||||||
|
buf: list[str] = []
|
||||||
|
low = text.lower()
|
||||||
|
n = len(text)
|
||||||
|
i = 0
|
||||||
|
while i < n:
|
||||||
|
match: tuple[str, str, str, int] | None = None
|
||||||
|
for key, slug, title in terms:
|
||||||
|
klen = len(key)
|
||||||
|
if klen == 0 or not low.startswith(key, i):
|
||||||
|
continue
|
||||||
|
before = text[i - 1] if i > 0 else ""
|
||||||
|
after = text[i + klen] if i + klen < n else ""
|
||||||
|
if _is_word_char(before) or _is_word_char(after):
|
||||||
|
continue
|
||||||
|
match = (key, slug, title, klen)
|
||||||
|
break
|
||||||
|
if match is not None:
|
||||||
|
_key, slug, title, klen = match
|
||||||
|
if buf:
|
||||||
|
out.append({"type": "text", "text": "".join(buf)})
|
||||||
|
buf = []
|
||||||
|
out.append({
|
||||||
|
"type": "rfc",
|
||||||
|
"slug": slug,
|
||||||
|
"label": text[i:i + klen],
|
||||||
|
"title": title,
|
||||||
|
})
|
||||||
|
i += klen
|
||||||
|
else:
|
||||||
|
buf.append(text[i])
|
||||||
|
i += 1
|
||||||
|
if buf:
|
||||||
|
out.append({"type": "text", "text": "".join(buf)})
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def _keys_for(slug: str, title: str, rfc_id: str | None) -> Iterable[str]:
|
||||||
|
"""The match keys an active RFC contributes. See the module docstring
|
||||||
|
for why each gate exists (conservative, false-positive-averse)."""
|
||||||
|
if rfc_id:
|
||||||
|
rid = rfc_id.strip()
|
||||||
|
if len(rid) >= 2:
|
||||||
|
yield rid.lower()
|
||||||
|
if title:
|
||||||
|
t = title.strip()
|
||||||
|
# Multi-word titles only — a single common word is too noisy.
|
||||||
|
if len(t) >= 2 and (" " in t or "\t" in t):
|
||||||
|
yield t.lower()
|
||||||
|
if slug:
|
||||||
|
s = slug.strip()
|
||||||
|
# Hyphenated slugs only — a single-token slug is a bare word.
|
||||||
|
if len(s) >= 2 and "-" in s:
|
||||||
|
yield s.lower()
|
||||||
|
|
||||||
|
|
||||||
|
class LinkIndex:
|
||||||
|
"""A reusable term index built once per request and applied to many
|
||||||
|
bodies (a PR's description plus every comment on it)."""
|
||||||
|
|
||||||
|
def __init__(self, terms: list[tuple[str, str, str]]):
|
||||||
|
# Longest key first so the longest reference wins at each position.
|
||||||
|
self._terms = sorted(terms, key=lambda t: len(t[0]), reverse=True)
|
||||||
|
|
||||||
|
def __bool__(self) -> bool:
|
||||||
|
return bool(self._terms)
|
||||||
|
|
||||||
|
def segment(self, text: str | None) -> list[dict[str, Any]]:
|
||||||
|
return segment_text(text, self._terms)
|
||||||
|
|
||||||
|
|
||||||
|
def build_index(conn, *, exclude_slug: str | None = None) -> LinkIndex:
|
||||||
|
"""Build a :class:`LinkIndex` from the accepted (active) RFC corpus.
|
||||||
|
|
||||||
|
``exclude_slug`` drops the RFC the surrounding surface is itself scoped
|
||||||
|
to, so an RFC's own title/id/slug don't self-link inside its own PR or
|
||||||
|
discussion. ``ORDER BY slug`` makes key de-duplication deterministic
|
||||||
|
when two RFCs would contribute the same key (first slug wins)."""
|
||||||
|
rows = conn.execute(
|
||||||
|
"SELECT slug, title, rfc_id FROM cached_rfcs WHERE state = 'active' ORDER BY slug"
|
||||||
|
).fetchall()
|
||||||
|
terms: list[tuple[str, str, str]] = []
|
||||||
|
seen: set[str] = set()
|
||||||
|
for r in rows:
|
||||||
|
slug = r["slug"]
|
||||||
|
if exclude_slug is not None and slug == exclude_slug:
|
||||||
|
continue
|
||||||
|
title = r["title"] or ""
|
||||||
|
rfc_id = r["rfc_id"] if "rfc_id" in r.keys() else None
|
||||||
|
for key in _keys_for(slug, title, rfc_id):
|
||||||
|
if key in seen:
|
||||||
|
continue
|
||||||
|
seen.add(key)
|
||||||
|
terms.append((key, slug, title))
|
||||||
|
return LinkIndex(terms)
|
||||||
@@ -0,0 +1,244 @@
|
|||||||
|
"""Roadmap #27 — Claude Haiku tag suggestions for the propose-RFC modal.
|
||||||
|
|
||||||
|
A cheap, fast assist: given the partial RFC draft a user is typing, ask
|
||||||
|
Claude Haiku to recommend tags drawn ONLY from the tags already in use
|
||||||
|
across the corpus. v1 has no curated tag list — tags are free-form chip
|
||||||
|
input (§9.1) — so "the taxonomy" is the de-facto set of distinct tags
|
||||||
|
the existing RFCs already carry. The model is constrained to that set
|
||||||
|
and MUST NOT invent new tags; taxonomy extension (letting the model
|
||||||
|
propose genuinely new tags) is a deferred follow-up per the roadmap.
|
||||||
|
|
||||||
|
Why Haiku specifically: cost. Picking a few reasonable tags from a known
|
||||||
|
set is well within Haiku's range, and the modal fires this repeatedly as
|
||||||
|
the user types, so the per-call price has to stay small.
|
||||||
|
|
||||||
|
The whole surface degrades to silence rather than error: no Anthropic
|
||||||
|
key, no provider, an empty corpus, a rate-limited caller, an empty
|
||||||
|
draft, or an unparseable model reply all yield an empty suggestion list.
|
||||||
|
The propose modal hides its suggestion row on an empty list, so the
|
||||||
|
fallback is simply the existing free-form chip input with nothing extra
|
||||||
|
shown.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import time
|
||||||
|
from dataclasses import dataclass
|
||||||
|
|
||||||
|
from . import db
|
||||||
|
from .providers import BaseProvider, construct_haiku
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Bound the universe handed to the model so a large corpus can't blow up
|
||||||
|
# the prompt size (and the cost). The most-common tags matter most.
|
||||||
|
_UNIVERSE_CAP = 200
|
||||||
|
|
||||||
|
# How many suggestions we ever return to the modal.
|
||||||
|
DEFAULT_MAX_SUGGESTIONS = 6
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Draft:
|
||||||
|
"""The partial propose-RFC draft. `pitch` is the "why is this needed"
|
||||||
|
rationale; `use_case` is the #26 optional ground-truth field."""
|
||||||
|
|
||||||
|
title: str = ""
|
||||||
|
pitch: str = ""
|
||||||
|
use_case: str = ""
|
||||||
|
|
||||||
|
def is_empty(self) -> bool:
|
||||||
|
return not (self.title.strip() or self.pitch.strip() or self.use_case.strip())
|
||||||
|
|
||||||
|
|
||||||
|
def haiku_provider(config) -> BaseProvider | None:
|
||||||
|
"""Construct a dedicated Claude Haiku provider from the operator's
|
||||||
|
Anthropic key, or return None when no key is configured.
|
||||||
|
|
||||||
|
None means "suggestions unavailable" — the caller returns an empty
|
||||||
|
list and the modal shows nothing. This is the seam tests monkeypatch
|
||||||
|
to inject a fake provider without a real key. There is no RFC slug at
|
||||||
|
propose time, so the §6.7 per-RFC funder path deliberately does not
|
||||||
|
apply: tag suggestion always runs on the operator's own key.
|
||||||
|
"""
|
||||||
|
key = getattr(config, "anthropic_api_key", "") or ""
|
||||||
|
if not key:
|
||||||
|
return None
|
||||||
|
return construct_haiku(key)
|
||||||
|
|
||||||
|
|
||||||
|
def gather_tag_universe(cap: int = _UNIVERSE_CAP) -> list[str]:
|
||||||
|
"""Every distinct tag in use across the cached corpus, most-common
|
||||||
|
first (ties broken alphabetically for determinism), capped.
|
||||||
|
|
||||||
|
This is the universe the model is constrained to. An empty corpus
|
||||||
|
yields an empty list, which short-circuits suggestion to silence.
|
||||||
|
"""
|
||||||
|
rows = db.conn().execute("SELECT tags_json FROM cached_rfcs").fetchall()
|
||||||
|
counts: dict[str, int] = {}
|
||||||
|
for r in rows:
|
||||||
|
try:
|
||||||
|
tags = json.loads(r["tags_json"] or "[]")
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
continue
|
||||||
|
if not isinstance(tags, list):
|
||||||
|
continue
|
||||||
|
for t in tags:
|
||||||
|
if not isinstance(t, str):
|
||||||
|
continue
|
||||||
|
tag = t.strip()
|
||||||
|
if tag:
|
||||||
|
counts[tag] = counts.get(tag, 0) + 1
|
||||||
|
ranked = sorted(counts, key=lambda t: (-counts[t], t.lower()))
|
||||||
|
return ranked[:cap]
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Rate limiting — in-process, per-user sliding window.
|
||||||
|
#
|
||||||
|
# Cost control, not security: the `require_contributor` gate already
|
||||||
|
# bounds callers to authenticated beta users, and the modal debounces.
|
||||||
|
# This is the backstop against a stuck/abusive client hammering the
|
||||||
|
# endpoint. In-memory is sufficient (single-process uvicorn on the VM)
|
||||||
|
# and resets on restart, which is fine for a cost guard.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
_CALLS: dict[int, list[float]] = {}
|
||||||
|
|
||||||
|
|
||||||
|
def _rate_config() -> tuple[int, float]:
|
||||||
|
try:
|
||||||
|
max_calls = int(os.environ.get("TAG_SUGGEST_RATE_MAX", "30"))
|
||||||
|
except ValueError:
|
||||||
|
max_calls = 30
|
||||||
|
try:
|
||||||
|
window = float(os.environ.get("TAG_SUGGEST_RATE_WINDOW_SECONDS", "60"))
|
||||||
|
except ValueError:
|
||||||
|
window = 60.0
|
||||||
|
return max_calls, window
|
||||||
|
|
||||||
|
|
||||||
|
def rate_limit_ok(user_id: int, *, now: float | None = None) -> bool:
|
||||||
|
"""True if this call is within the per-user window; records the call.
|
||||||
|
`now` is injectable for tests (defaults to a monotonic clock)."""
|
||||||
|
max_calls, window = _rate_config()
|
||||||
|
t = time.monotonic() if now is None else now
|
||||||
|
calls = _CALLS.setdefault(user_id, [])
|
||||||
|
cutoff = t - window
|
||||||
|
calls[:] = [c for c in calls if c > cutoff]
|
||||||
|
if len(calls) >= max_calls:
|
||||||
|
return False
|
||||||
|
calls.append(t)
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def reset_rate_limits() -> None:
|
||||||
|
"""Test seam — clear the in-process window state."""
|
||||||
|
_CALLS.clear()
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Prompt + parse.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
_SYSTEM = (
|
||||||
|
"You suggest topic tags for a draft RFC — a structured proposal "
|
||||||
|
"document in a collection. You are given the draft's title, its "
|
||||||
|
"rationale, an optional use case, and the exact set of tags already "
|
||||||
|
"in use across the collection. Choose the tags from that set that "
|
||||||
|
"best fit the draft.\n"
|
||||||
|
"Rules:\n"
|
||||||
|
"- Choose ONLY from the provided tag set. Never invent a tag.\n"
|
||||||
|
"- Order best-fit first. Omit weak fits rather than padding the list.\n"
|
||||||
|
"- Return at most {max} tags.\n"
|
||||||
|
"Respond with ONLY a JSON array, no prose, of the form:\n"
|
||||||
|
'[{{"tag": "<exact tag from the set>", "confidence": <number between 0 and 1>}}]\n'
|
||||||
|
"If no tag in the set fits the draft, return []."
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _build_messages(draft: Draft, universe: list[str], max_suggestions: int):
|
||||||
|
system = _SYSTEM.format(max=max_suggestions)
|
||||||
|
parts: list[str] = []
|
||||||
|
if draft.title.strip():
|
||||||
|
parts.append(f"Title: {draft.title.strip()[:300]}")
|
||||||
|
if draft.pitch.strip():
|
||||||
|
parts.append(f"Why this RFC is needed:\n{draft.pitch.strip()[:4000]}")
|
||||||
|
if draft.use_case.strip():
|
||||||
|
parts.append(f"What it will be used for:\n{draft.use_case.strip()[:4000]}")
|
||||||
|
parts.append(
|
||||||
|
"Tags already in use (choose only from these):\n" + ", ".join(universe)
|
||||||
|
)
|
||||||
|
return system, [{"role": "user", "content": "\n\n".join(parts)}]
|
||||||
|
|
||||||
|
|
||||||
|
def _extract_json_array(text: str):
|
||||||
|
start = text.find("[")
|
||||||
|
end = text.rfind("]")
|
||||||
|
if start == -1 or end == -1 or end < start:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
return json.loads(text[start : end + 1])
|
||||||
|
except ValueError:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def parse_reply(text: str, universe: list[str], max_suggestions: int) -> list[dict]:
|
||||||
|
"""Parse the model reply into a clean, universe-constrained list.
|
||||||
|
|
||||||
|
Tolerant of the model returning bare strings or objects, extra prose
|
||||||
|
around the JSON, unknown/invented tags (dropped), duplicate tags
|
||||||
|
(deduped), and missing/garbage confidences (defaulted + clamped).
|
||||||
|
"""
|
||||||
|
data = _extract_json_array(text or "")
|
||||||
|
if not isinstance(data, list):
|
||||||
|
return []
|
||||||
|
# Map back to the canonical spelling in the universe, case-insensitively,
|
||||||
|
# so a model that lowercases a tag still resolves to the real one.
|
||||||
|
canonical = {t.lower(): t for t in universe}
|
||||||
|
out: list[dict] = []
|
||||||
|
seen: set[str] = set()
|
||||||
|
for item in data:
|
||||||
|
if isinstance(item, dict):
|
||||||
|
raw = item.get("tag")
|
||||||
|
conf = item.get("confidence")
|
||||||
|
elif isinstance(item, str):
|
||||||
|
raw, conf = item, None
|
||||||
|
else:
|
||||||
|
continue
|
||||||
|
if not isinstance(raw, str):
|
||||||
|
continue
|
||||||
|
tag = canonical.get(raw.strip().lower())
|
||||||
|
if tag is None or tag in seen:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
c = float(conf) if conf is not None else 0.5
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
c = 0.5
|
||||||
|
c = max(0.0, min(1.0, c))
|
||||||
|
out.append({"tag": tag, "confidence": round(c, 3)})
|
||||||
|
seen.add(tag)
|
||||||
|
if len(out) >= max_suggestions:
|
||||||
|
break
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def suggest(
|
||||||
|
provider: BaseProvider,
|
||||||
|
draft: Draft,
|
||||||
|
universe: list[str],
|
||||||
|
max_suggestions: int = DEFAULT_MAX_SUGGESTIONS,
|
||||||
|
) -> list[dict]:
|
||||||
|
"""Orchestrate one suggestion call. Returns [] for an empty draft or
|
||||||
|
empty universe (no model call), and for any provider/parse failure."""
|
||||||
|
if draft.is_empty() or not universe:
|
||||||
|
return []
|
||||||
|
system, history = _build_messages(draft, universe, max_suggestions)
|
||||||
|
try:
|
||||||
|
text = provider.send(system, history)
|
||||||
|
except Exception as exc: # provider/network failure → silent empty
|
||||||
|
log.warning("tag-suggest provider failed: %s", exc)
|
||||||
|
return []
|
||||||
|
return parse_reply(text, universe, max_suggestions)
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
-- v0.23.0 / roadmap item #29: server-side sign-in state resume.
|
||||||
|
--
|
||||||
|
-- Track each authenticated user's last-viewed route + a small bag of
|
||||||
|
-- "light" component state so that the *next* sign-in can land the user
|
||||||
|
-- back where they left off, rather than always dropping them on the
|
||||||
|
-- empty-state home view.
|
||||||
|
--
|
||||||
|
-- Storage shape (one row per user — per-user, NOT per-device, per the
|
||||||
|
-- #29 "safe default"):
|
||||||
|
--
|
||||||
|
-- * `user_id` — PRIMARY KEY and FK into users(id) with cascade on
|
||||||
|
-- delete. INTEGER to match users.id (INTEGER PRIMARY KEY
|
||||||
|
-- AUTOINCREMENT). A deleted user automatically loses their stored
|
||||||
|
-- resume state. One row per user means a later sign-in on any
|
||||||
|
-- device resumes the most-recently-recorded route — the per-user
|
||||||
|
-- model the roadmap asks for.
|
||||||
|
--
|
||||||
|
-- * `last_route` — the frontend pathname the user was last on
|
||||||
|
-- (e.g. "/rfc/open-human-model"). TEXT, nullable until the first
|
||||||
|
-- route-change POST lands. NEVER contains draft-buffer contents —
|
||||||
|
-- it is a route only. See SPEC §6.2 "Sign-in state resume
|
||||||
|
-- (privacy)".
|
||||||
|
--
|
||||||
|
-- * `last_route_state` — a JSON-encoded bag of *light* component
|
||||||
|
-- state (scroll anchors, open-tab selection, filter chips, etc.).
|
||||||
|
-- SQLite has no native JSONB; we store JSON as TEXT exactly as the
|
||||||
|
-- rest of the app stores its JSON blobs (json.dumps / json.loads,
|
||||||
|
-- cf. permission_events.details, actions.details). Nullable.
|
||||||
|
-- PRIVACY INVARIANT: this column MUST NOT carry draft-buffer text,
|
||||||
|
-- PR bodies, comment drafts, or any user-typed content — only
|
||||||
|
-- ephemeral view state safe to replay. The PUT handler is the
|
||||||
|
-- enforcement point; the column comment is the contract.
|
||||||
|
--
|
||||||
|
-- * `resume_enabled` — the per-user opt-out flag. 1 (default) means
|
||||||
|
-- "resume me where I left off"; 0 means "always land on home". The
|
||||||
|
-- PUT handler no-ops the upsert when this is 0, and the read path
|
||||||
|
-- refuses to hand back a stored route when this is 0. A
|
||||||
|
-- profile-settings toggle UI to flip this is a follow-up (the
|
||||||
|
-- column + default-on behavior ship now); see CHANGELOG v0.23.0.
|
||||||
|
--
|
||||||
|
-- * `last_updated_at` — TEXT timestamp, app convention
|
||||||
|
-- `datetime('now')`, matching device_trust.last_seen_at /
|
||||||
|
-- users.last_seen_at. Refreshed on every successful upsert.
|
||||||
|
--
|
||||||
|
-- No new env vars. The debounce interval for the frontend route-change
|
||||||
|
-- POST is a frontend constant (~1s), not a server knob.
|
||||||
|
|
||||||
|
CREATE TABLE user_session_state (
|
||||||
|
user_id INTEGER PRIMARY KEY REFERENCES users(id) ON DELETE CASCADE,
|
||||||
|
last_route TEXT,
|
||||||
|
last_route_state TEXT, -- JSON-encoded light state, nullable
|
||||||
|
resume_enabled INTEGER NOT NULL DEFAULT 1,
|
||||||
|
last_updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
||||||
|
);
|
||||||
@@ -0,0 +1,235 @@
|
|||||||
|
"""Roadmap #28 Part 1 — auto-link RFC references in PR text + comments.
|
||||||
|
|
||||||
|
Two layers:
|
||||||
|
|
||||||
|
* Unit tests over the pure scanner (`rfc_links.segment_text` /
|
||||||
|
`_keys_for` / `LinkIndex`) — the matching rules and their
|
||||||
|
false-positive guards, no DB.
|
||||||
|
* End-to-end tests that the PR description, PR review comments, and
|
||||||
|
PR-less discussion comments all surface `*_segments` enriched against
|
||||||
|
the live accepted-RFC corpus, with self-references suppressed.
|
||||||
|
|
||||||
|
Reuses the FakeGitea + session helpers from test_propose_vertical.py and
|
||||||
|
the active-RFC seed from test_rfc_view_vertical.py.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from app import rfc_links
|
||||||
|
|
||||||
|
from test_propose_vertical import ( # noqa: F401
|
||||||
|
FakeGitea,
|
||||||
|
app_with_fake_gitea,
|
||||||
|
grant_rfc_collaborator,
|
||||||
|
provision_user_row,
|
||||||
|
sign_in_as,
|
||||||
|
tmp_env,
|
||||||
|
)
|
||||||
|
from test_rfc_view_vertical import SEED_BODY, seed_active_rfc
|
||||||
|
from test_pr_flow_vertical import _cut_branch_and_accept_change
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Unit — the pure scanner
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def _idx(*terms):
|
||||||
|
"""Build a LinkIndex from raw (key, slug, title) tuples (keys lower)."""
|
||||||
|
return rfc_links.LinkIndex(list(terms))
|
||||||
|
|
||||||
|
|
||||||
|
def test_empty_text_is_single_empty_segment():
|
||||||
|
assert rfc_links.segment_text("", []) == [{"type": "text", "text": ""}]
|
||||||
|
assert rfc_links.segment_text(None, []) == [{"type": "text", "text": ""}]
|
||||||
|
|
||||||
|
|
||||||
|
def test_no_terms_returns_plain_text():
|
||||||
|
out = rfc_links.segment_text("hello world", [])
|
||||||
|
assert out == [{"type": "text", "text": "hello world"}]
|
||||||
|
|
||||||
|
|
||||||
|
def test_multiword_title_links_and_preserves_casing():
|
||||||
|
idx = _idx(("open human model", "open-human-model", "Open Human Model"))
|
||||||
|
out = idx.segment("See the Open Human Model for details.")
|
||||||
|
assert out == [
|
||||||
|
{"type": "text", "text": "See the "},
|
||||||
|
{"type": "rfc", "slug": "open-human-model", "label": "Open Human Model",
|
||||||
|
"title": "Open Human Model"},
|
||||||
|
{"type": "text", "text": " for details."},
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def test_match_is_case_insensitive():
|
||||||
|
idx = _idx(("open human model", "open-human-model", "Open Human Model"))
|
||||||
|
out = idx.segment("see the OPEN HUMAN MODEL")
|
||||||
|
assert out[-1] == {"type": "rfc", "slug": "open-human-model",
|
||||||
|
"label": "OPEN HUMAN MODEL", "title": "Open Human Model"}
|
||||||
|
|
||||||
|
|
||||||
|
def test_word_boundary_prevents_substring_match():
|
||||||
|
# "harm" must not match inside "charming" / "harmless".
|
||||||
|
idx = _idx(("rfc-0001", "open-human-model", "Open Human Model"))
|
||||||
|
out = idx.segment("a charming rfc-00012 not real")
|
||||||
|
# rfc-0001 is a prefix of rfc-00012 but the trailing '2' is a word char,
|
||||||
|
# so no match — the whole string stays plain text.
|
||||||
|
assert out == [{"type": "text", "text": "a charming rfc-00012 not real"}]
|
||||||
|
|
||||||
|
|
||||||
|
def test_rfc_id_token_links():
|
||||||
|
idx = _idx(("rfc-0001", "open-human-model", "Open Human Model"))
|
||||||
|
out = idx.segment("as established in RFC-0001.")
|
||||||
|
assert out[1] == {"type": "rfc", "slug": "open-human-model",
|
||||||
|
"label": "RFC-0001", "title": "Open Human Model"}
|
||||||
|
|
||||||
|
|
||||||
|
def test_longest_match_wins():
|
||||||
|
# A bare "Open" term and the full title both present; the full title
|
||||||
|
# (longer) must win at the position.
|
||||||
|
idx = _idx(
|
||||||
|
("open", "open", "Open"),
|
||||||
|
("open human model", "open-human-model", "Open Human Model"),
|
||||||
|
)
|
||||||
|
out = idx.segment("the Open Human Model")
|
||||||
|
assert out[-1]["slug"] == "open-human-model"
|
||||||
|
assert out[-1]["label"] == "Open Human Model"
|
||||||
|
|
||||||
|
|
||||||
|
def test_keys_for_gating():
|
||||||
|
keys = lambda **kw: set(rfc_links._keys_for(**kw))
|
||||||
|
# rfc_id always contributes.
|
||||||
|
assert "rfc-0001" in keys(slug="x", title="X", rfc_id="RFC-0001")
|
||||||
|
# multi-word title contributes; single common word does NOT.
|
||||||
|
assert "open human model" in keys(slug="ohm", title="Open Human Model", rfc_id=None)
|
||||||
|
assert keys(slug="human", title="Human", rfc_id=None) == set()
|
||||||
|
# hyphenated slug contributes; single-token slug does NOT.
|
||||||
|
assert "open-human-model" in keys(slug="open-human-model", title="X", rfc_id=None)
|
||||||
|
assert "ohm" not in keys(slug="ohm", title="OHM", rfc_id=None)
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# End-to-end — enrichment surfaces on the read paths
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def _open_pr_on(client, fake, *, host_slug: str, description: str):
|
||||||
|
"""Seed branch + accepted change on host_slug and open a PR. Returns
|
||||||
|
the pr_number."""
|
||||||
|
# `original` must exist verbatim in SEED_BODY or the accept is "stale".
|
||||||
|
branch, _ = _cut_branch_and_accept_change(
|
||||||
|
client, fake, slug=host_slug,
|
||||||
|
original="It defines consent, trait, and agency in compatible terms.",
|
||||||
|
proposed="It defines consent, trait, harm, and agency in compatible terms.",
|
||||||
|
)
|
||||||
|
r = client.post(
|
||||||
|
f"/api/rfcs/{host_slug}/branches/{branch}/open-pr",
|
||||||
|
json={"title": "A change", "description": description},
|
||||||
|
)
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
return r.json()["pr_number"]
|
||||||
|
|
||||||
|
|
||||||
|
def _rfc_segments(segments):
|
||||||
|
return [s for s in segments if s["type"] == "rfc"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_pr_description_autolinks_other_rfc(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
# Two accepted RFCs: a host for the PR + a referenceable target.
|
||||||
|
seed_active_rfc(fake, slug="ohm", title="OHM", body=SEED_BODY)
|
||||||
|
seed_active_rfc(fake, slug="open-human-model", title="Open Human Model", body=SEED_BODY)
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor")
|
||||||
|
|
||||||
|
pr_number = _open_pr_on(
|
||||||
|
client, fake, host_slug="ohm",
|
||||||
|
description="This builds on the Open Human Model definition.",
|
||||||
|
)
|
||||||
|
r = client.get(f"/api/rfcs/ohm/prs/{pr_number}")
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
pr = r.json()
|
||||||
|
links = _rfc_segments(pr["description_segments"])
|
||||||
|
assert len(links) == 1
|
||||||
|
assert links[0]["slug"] == "open-human-model"
|
||||||
|
assert links[0]["label"] == "Open Human Model"
|
||||||
|
# The plain text is still present for non-segment callers (the bot
|
||||||
|
# appends a §6.5 On-behalf-of trailer, so this is a containment check).
|
||||||
|
assert "This builds on the Open Human Model definition." in pr["description"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_pr_review_comment_autolinked(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
seed_active_rfc(fake, slug="ohm", title="OHM", body=SEED_BODY)
|
||||||
|
seed_active_rfc(fake, slug="open-human-model", title="Open Human Model", body=SEED_BODY)
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor")
|
||||||
|
|
||||||
|
pr_number = _open_pr_on(client, fake, host_slug="ohm", description="plain.")
|
||||||
|
r = client.post(
|
||||||
|
f"/api/rfcs/ohm/prs/{pr_number}/review",
|
||||||
|
json={"text": "See Open Human Model and RFC-0001.", "anchor_payload": {}},
|
||||||
|
)
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
|
||||||
|
pr = client.get(f"/api/rfcs/ohm/prs/{pr_number}").json()
|
||||||
|
all_msgs = [m for msgs in pr["messages_by_thread"].values() for m in msgs]
|
||||||
|
review_msgs = [m for m in all_msgs if "Open Human Model" in (m["text"] or "")]
|
||||||
|
assert review_msgs, "review comment not found in payload"
|
||||||
|
links = _rfc_segments(review_msgs[0]["text_segments"])
|
||||||
|
# Both "Open Human Model" (title) and "RFC-0001" (id) point to the
|
||||||
|
# one referenceable RFC.
|
||||||
|
assert {s["slug"] for s in links} == {"open-human-model"}
|
||||||
|
assert {s["label"] for s in links} == {"Open Human Model", "RFC-0001"}
|
||||||
|
|
||||||
|
|
||||||
|
def test_discussion_comment_autolinked(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
seed_active_rfc(fake, slug="ohm", title="OHM", body=SEED_BODY)
|
||||||
|
seed_active_rfc(fake, slug="open-human-model", title="Open Human Model", body=SEED_BODY)
|
||||||
|
# alice is the seeded owner of ohm (owners=["alice"]); grant the
|
||||||
|
# per-RFC collaborator row explicitly so the #12 discuss gate passes.
|
||||||
|
grant_rfc_collaborator(user_id=2, rfc_slug="ohm", role_in_rfc="contributor")
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor")
|
||||||
|
|
||||||
|
r = client.post(
|
||||||
|
"/api/rfcs/ohm/discussion/threads",
|
||||||
|
json={"message": "Compare with the Open Human Model."},
|
||||||
|
)
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
thread_id = r.json()["thread_id"]
|
||||||
|
|
||||||
|
r = client.get(f"/api/rfcs/ohm/discussion/threads/{thread_id}/messages")
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
msgs = r.json()["messages"]
|
||||||
|
assert msgs and "text_segments" in msgs[0]
|
||||||
|
links = _rfc_segments(msgs[0]["text_segments"])
|
||||||
|
assert len(links) == 1
|
||||||
|
assert links[0]["slug"] == "open-human-model"
|
||||||
|
|
||||||
|
|
||||||
|
def test_self_reference_not_linked(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
# The host RFC has a multi-word title, so absent exclude_slug it
|
||||||
|
# WOULD self-link. exclude_slug must suppress it.
|
||||||
|
seed_active_rfc(fake, slug="open-human-model", title="Open Human Model", body=SEED_BODY)
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor")
|
||||||
|
|
||||||
|
pr_number = _open_pr_on(
|
||||||
|
client, fake, host_slug="open-human-model",
|
||||||
|
description="Refines the Open Human Model definition.",
|
||||||
|
)
|
||||||
|
pr = client.get(f"/api/rfcs/open-human-model/prs/{pr_number}").json()
|
||||||
|
assert _rfc_segments(pr["description_segments"]) == []
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
"""End-to-end integration tests for the v0.23.0 sign-in state-resume
|
||||||
|
vertical (§6.2, roadmap item #29).
|
||||||
|
|
||||||
|
New behavior: each authenticated user's last-viewed route + a small bag
|
||||||
|
of light view state is tracked server-side, so the next sign-in can land
|
||||||
|
them back where they left off rather than on the empty-state home view.
|
||||||
|
|
||||||
|
The tests below prove:
|
||||||
|
|
||||||
|
* `PUT /api/me/last-state` requires auth — an anonymous client gets
|
||||||
|
401, and nothing is stored.
|
||||||
|
* An authenticated PUT upserts the route, and the stored route is
|
||||||
|
read back for that user off `GET /api/auth/me` (`last_route`).
|
||||||
|
* A second PUT overwrites (upsert, one row per user) — the latest
|
||||||
|
route wins.
|
||||||
|
* `last_route_state` round-trips as decoded JSON on `/api/auth/me`.
|
||||||
|
* Per-user isolation: user A's stored route is not visible to user B.
|
||||||
|
* `resume_enabled = 0` disables resume: the PUT no-ops (does not
|
||||||
|
rewrite the stored route) and `/api/auth/me` hands back a null
|
||||||
|
`last_route` even though a stored row exists.
|
||||||
|
|
||||||
|
The fakes from `test_propose_vertical` give us a working app harness +
|
||||||
|
the `sign_in_as` / `provision_user_row` seams.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from test_propose_vertical import ( # noqa: F401
|
||||||
|
FakeGitea,
|
||||||
|
app_with_fake_gitea,
|
||||||
|
provision_user_row,
|
||||||
|
sign_in_as,
|
||||||
|
tmp_env,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_put_last_state_requires_auth(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
from app import db
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
# Anonymous — no session cookie set.
|
||||||
|
r = client.put("/api/me/last-state", json={"route": "/rfc/open-human-model"})
|
||||||
|
assert r.status_code == 401
|
||||||
|
# Nothing landed in the table.
|
||||||
|
row = db.conn().execute("SELECT COUNT(*) AS n FROM user_session_state").fetchone()
|
||||||
|
assert row["n"] == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_put_last_state_upserts_and_reads_back(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor", email="alice@test")
|
||||||
|
|
||||||
|
# First POST stores a route + light state.
|
||||||
|
r = client.put(
|
||||||
|
"/api/me/last-state",
|
||||||
|
json={"route": "/rfc/open-human-model", "state": {"tab": "discussion", "scroll": 420}},
|
||||||
|
)
|
||||||
|
assert r.status_code == 200
|
||||||
|
assert r.json()["stored"] is True
|
||||||
|
|
||||||
|
# /api/auth/me hands the route + decoded state back.
|
||||||
|
me = client.get("/api/auth/me").json()
|
||||||
|
assert me["authenticated"] is True
|
||||||
|
assert me["user"]["resume_enabled"] is True
|
||||||
|
assert me["user"]["last_route"] == "/rfc/open-human-model"
|
||||||
|
assert me["user"]["last_route_state"] == {"tab": "discussion", "scroll": 420}
|
||||||
|
|
||||||
|
# A later POST overwrites — one row per user, latest wins.
|
||||||
|
r = client.put("/api/me/last-state", json={"route": "/proposals/7"})
|
||||||
|
assert r.status_code == 200
|
||||||
|
me = client.get("/api/auth/me").json()
|
||||||
|
assert me["user"]["last_route"] == "/proposals/7"
|
||||||
|
# state was omitted on the second POST → cleared to null.
|
||||||
|
assert me["user"]["last_route_state"] is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_last_state_is_per_user(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
provision_user_row(user_id=3, login="bob", role="contributor")
|
||||||
|
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor", email="alice@test")
|
||||||
|
client.put("/api/me/last-state", json={"route": "/rfc/alice-route"})
|
||||||
|
|
||||||
|
# Switch to bob — he has no stored route yet.
|
||||||
|
sign_in_as(client, user_id=3, gitea_login="bob", display_name="Bob", role="contributor", email="bob@test")
|
||||||
|
me = client.get("/api/auth/me").json()
|
||||||
|
assert me["user"]["last_route"] is None
|
||||||
|
|
||||||
|
client.put("/api/me/last-state", json={"route": "/rfc/bob-route"})
|
||||||
|
me = client.get("/api/auth/me").json()
|
||||||
|
assert me["user"]["last_route"] == "/rfc/bob-route"
|
||||||
|
|
||||||
|
# Back to alice — her route is untouched by bob's write.
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor", email="alice@test")
|
||||||
|
me = client.get("/api/auth/me").json()
|
||||||
|
assert me["user"]["last_route"] == "/rfc/alice-route"
|
||||||
|
|
||||||
|
|
||||||
|
def test_resume_disabled_no_ops_put_and_hides_route(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
from app import db
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor", email="alice@test")
|
||||||
|
|
||||||
|
# Seed a stored row, then flip resume_enabled off directly (the
|
||||||
|
# profile-settings toggle UI to do this from the client is a
|
||||||
|
# follow-up; the column + behavior ship now).
|
||||||
|
client.put("/api/me/last-state", json={"route": "/rfc/before-disable"})
|
||||||
|
db.conn().execute(
|
||||||
|
"UPDATE user_session_state SET resume_enabled = 0 WHERE user_id = ?",
|
||||||
|
(2,),
|
||||||
|
)
|
||||||
|
|
||||||
|
# /api/auth/me reports resume off and hands back a null route
|
||||||
|
# even though a stored row exists.
|
||||||
|
me = client.get("/api/auth/me").json()
|
||||||
|
assert me["user"]["resume_enabled"] is False
|
||||||
|
assert me["user"]["last_route"] is None
|
||||||
|
|
||||||
|
# A PUT while disabled no-ops: stored=False and the stored route
|
||||||
|
# is NOT rewritten.
|
||||||
|
r = client.put("/api/me/last-state", json={"route": "/rfc/after-disable"})
|
||||||
|
assert r.status_code == 200
|
||||||
|
assert r.json()["stored"] is False
|
||||||
|
row = db.conn().execute(
|
||||||
|
"SELECT last_route FROM user_session_state WHERE user_id = ?", (2,)
|
||||||
|
).fetchone()
|
||||||
|
assert row["last_route"] == "/rfc/before-disable"
|
||||||
@@ -0,0 +1,264 @@
|
|||||||
|
"""Vertical + unit coverage for roadmap #27 (rfc-app v0.24.0): Claude
|
||||||
|
Haiku tag suggestions on the propose-RFC modal.
|
||||||
|
|
||||||
|
Reuses the FakeGitea + session helpers from test_propose_vertical.py.
|
||||||
|
The Anthropic call is never made for real — tests monkeypatch the
|
||||||
|
`tag_suggest.haiku_provider` seam with a stub provider whose `send`
|
||||||
|
returns canned text, so the HTTP contract is exercised without a key.
|
||||||
|
|
||||||
|
Proves:
|
||||||
|
(a) the endpoint is contributor-gated (anon → 401);
|
||||||
|
(b) a contributor gets suggestions, filtered to the corpus tag
|
||||||
|
universe, with invented tags dropped;
|
||||||
|
(c) no Anthropic key bound → empty list, not an error;
|
||||||
|
(d) an empty corpus → empty list (model is never even called);
|
||||||
|
(e) the per-user rate limit surfaces as a 429;
|
||||||
|
plus unit coverage of the universe gather, the reply parser's tolerance,
|
||||||
|
and the suggest() orchestration short-circuits.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from test_propose_vertical import ( # noqa: F401
|
||||||
|
FakeGitea,
|
||||||
|
app_with_fake_gitea,
|
||||||
|
provision_user_row,
|
||||||
|
sign_in_as,
|
||||||
|
tmp_env,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Helpers
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class StubProvider:
|
||||||
|
"""A BaseProvider stand-in whose send() returns a fixed string (or
|
||||||
|
raises, to exercise the graceful-failure path)."""
|
||||||
|
|
||||||
|
def __init__(self, reply: str = "[]", *, raises: bool = False):
|
||||||
|
self.reply = reply
|
||||||
|
self.raises = raises
|
||||||
|
self.calls: list[tuple[str, list]] = []
|
||||||
|
|
||||||
|
def send(self, system, history):
|
||||||
|
self.calls.append((system, history))
|
||||||
|
if self.raises:
|
||||||
|
raise RuntimeError("boom")
|
||||||
|
return self.reply
|
||||||
|
|
||||||
|
|
||||||
|
def _seed_tags(slug: str, title: str, tags: list[str], state: str = "active") -> None:
|
||||||
|
from app import db
|
||||||
|
|
||||||
|
db.conn().execute(
|
||||||
|
"INSERT OR REPLACE INTO cached_rfcs (slug, title, state, tags_json) VALUES (?, ?, ?, ?)",
|
||||||
|
(slug, title, state, json.dumps(tags)),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _use_provider(monkeypatch, provider) -> None:
|
||||||
|
monkeypatch.setattr("app.tag_suggest.haiku_provider", lambda config: provider)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(autouse=True)
|
||||||
|
def _reset_rate_limits():
|
||||||
|
from app import tag_suggest
|
||||||
|
|
||||||
|
tag_suggest.reset_rate_limits()
|
||||||
|
yield
|
||||||
|
tag_suggest.reset_rate_limits()
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Endpoint (vertical)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def test_anonymous_cannot_suggest(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
r = client.post("/api/rfcs/suggest-tags", json={"title": "X"})
|
||||||
|
assert r.status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
def test_contributor_gets_filtered_suggestions(app_with_fake_gitea, monkeypatch):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor")
|
||||||
|
|
||||||
|
_seed_tags("ohm", "OHM", ["identity", "schema", "consent"])
|
||||||
|
_seed_tags("other", "Other", ["identity", "governance"])
|
||||||
|
|
||||||
|
# Model returns two real tags (one lowercased to test canonical
|
||||||
|
# mapping is exact-set anyway), plus one invented tag that MUST
|
||||||
|
# be dropped.
|
||||||
|
reply = json.dumps([
|
||||||
|
{"tag": "identity", "confidence": 0.9},
|
||||||
|
{"tag": "consent", "confidence": 0.7},
|
||||||
|
{"tag": "totally-invented", "confidence": 0.99},
|
||||||
|
])
|
||||||
|
stub = StubProvider(reply=reply)
|
||||||
|
_use_provider(monkeypatch, stub)
|
||||||
|
|
||||||
|
r = client.post("/api/rfcs/suggest-tags", json={
|
||||||
|
"title": "Consent and identity",
|
||||||
|
"pitch": "We need a shared definition of consent tied to identity.",
|
||||||
|
})
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
tags = [s["tag"] for s in r.json()["suggestions"]]
|
||||||
|
assert tags == ["identity", "consent"]
|
||||||
|
# the model was actually invoked
|
||||||
|
assert len(stub.calls) == 1
|
||||||
|
# the universe (deduped distinct tags) was handed to the model
|
||||||
|
user_msg = stub.calls[0][1][0]["content"]
|
||||||
|
assert "identity" in user_msg and "governance" in user_msg
|
||||||
|
|
||||||
|
|
||||||
|
def test_no_api_key_returns_empty(app_with_fake_gitea, monkeypatch):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor")
|
||||||
|
_seed_tags("ohm", "OHM", ["identity"])
|
||||||
|
|
||||||
|
# No key bound (test env has no ANTHROPIC_API_KEY) → provider None.
|
||||||
|
# (Explicitly assert the seam returns None given the test config.)
|
||||||
|
from app import tag_suggest
|
||||||
|
assert tag_suggest.haiku_provider(app.state.config) is None
|
||||||
|
|
||||||
|
r = client.post("/api/rfcs/suggest-tags", json={"title": "X", "pitch": "y"})
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
assert r.json()["suggestions"] == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_empty_corpus_returns_empty_without_calling_model(app_with_fake_gitea, monkeypatch):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor")
|
||||||
|
|
||||||
|
stub = StubProvider(reply=json.dumps([{"tag": "x", "confidence": 1}]))
|
||||||
|
_use_provider(monkeypatch, stub)
|
||||||
|
|
||||||
|
# No cached_rfcs rows → empty universe → suggest() short-circuits.
|
||||||
|
r = client.post("/api/rfcs/suggest-tags", json={"title": "X", "pitch": "y"})
|
||||||
|
assert r.status_code == 200, r.text
|
||||||
|
assert r.json()["suggestions"] == []
|
||||||
|
assert stub.calls == [] # model never invoked on an empty universe
|
||||||
|
|
||||||
|
|
||||||
|
def test_rate_limit_surfaces_429(app_with_fake_gitea, monkeypatch):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
monkeypatch.setenv("TAG_SUGGEST_RATE_MAX", "2")
|
||||||
|
monkeypatch.setenv("TAG_SUGGEST_RATE_WINDOW_SECONDS", "60")
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
with TestClient(app) as client:
|
||||||
|
provision_user_row(user_id=2, login="alice", role="contributor")
|
||||||
|
sign_in_as(client, user_id=2, gitea_login="alice", display_name="Alice", role="contributor")
|
||||||
|
_seed_tags("ohm", "OHM", ["identity"])
|
||||||
|
_use_provider(monkeypatch, StubProvider(reply="[]"))
|
||||||
|
|
||||||
|
body = {"title": "X", "pitch": "y"}
|
||||||
|
assert client.post("/api/rfcs/suggest-tags", json=body).status_code == 200
|
||||||
|
assert client.post("/api/rfcs/suggest-tags", json=body).status_code == 200
|
||||||
|
# Third call inside the window trips the limit.
|
||||||
|
assert client.post("/api/rfcs/suggest-tags", json=body).status_code == 429
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Units
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def test_gather_tag_universe_dedupes_and_ranks(app_with_fake_gitea):
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
from app import tag_suggest
|
||||||
|
|
||||||
|
app, _fake = app_with_fake_gitea
|
||||||
|
# The db is initialized in the app's lifespan; enter the client
|
||||||
|
# context so cached_rfcs exists before we seed it directly.
|
||||||
|
with TestClient(app):
|
||||||
|
_seed_tags("a", "A", ["identity", "schema"])
|
||||||
|
_seed_tags("b", "B", ["identity", " schema ", "consent", ""]) # whitespace + empty
|
||||||
|
_seed_tags("c", "C", ["identity"])
|
||||||
|
|
||||||
|
universe = tag_suggest.gather_tag_universe()
|
||||||
|
# identity (3) > schema (2) > consent (1); whitespace trimmed/merged,
|
||||||
|
# empties dropped.
|
||||||
|
assert universe == ["identity", "schema", "consent"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_parse_reply_tolerates_junk():
|
||||||
|
from app import tag_suggest
|
||||||
|
|
||||||
|
universe = ["identity", "schema", "consent"]
|
||||||
|
|
||||||
|
# Prose around the JSON, an invented tag, a bare string, a dup, a
|
||||||
|
# missing confidence, and a garbage confidence.
|
||||||
|
text = (
|
||||||
|
"Sure! Here are the tags:\n"
|
||||||
|
'[{"tag": "identity", "confidence": 0.9}, '
|
||||||
|
'{"tag": "invented", "confidence": 1}, '
|
||||||
|
'"schema", '
|
||||||
|
'{"tag": "identity", "confidence": 0.5}, '
|
||||||
|
'{"tag": "consent"}, '
|
||||||
|
'{"tag": "consent", "confidence": "high"}]\n'
|
||||||
|
"Hope that helps!"
|
||||||
|
)
|
||||||
|
out = tag_suggest.parse_reply(text, universe, max_suggestions=6)
|
||||||
|
tags = [s["tag"] for s in out]
|
||||||
|
assert tags == ["identity", "schema", "consent"] # invented dropped, deduped
|
||||||
|
by_tag = {s["tag"]: s["confidence"] for s in out}
|
||||||
|
assert by_tag["identity"] == 0.9
|
||||||
|
assert by_tag["schema"] == 0.5 # bare string defaults to 0.5
|
||||||
|
assert by_tag["consent"] == 0.5 # missing/garbage confidence → 0.5
|
||||||
|
|
||||||
|
|
||||||
|
def test_parse_reply_empty_on_unparseable():
|
||||||
|
from app import tag_suggest
|
||||||
|
|
||||||
|
assert tag_suggest.parse_reply("no json here", ["a"], 6) == []
|
||||||
|
assert tag_suggest.parse_reply("", ["a"], 6) == []
|
||||||
|
assert tag_suggest.parse_reply("[]", ["a"], 6) == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_parse_reply_respects_max():
|
||||||
|
from app import tag_suggest
|
||||||
|
|
||||||
|
universe = ["a", "b", "c", "d", "e"]
|
||||||
|
text = json.dumps([{"tag": t, "confidence": 0.5} for t in universe])
|
||||||
|
out = tag_suggest.parse_reply(text, universe, max_suggestions=3)
|
||||||
|
assert [s["tag"] for s in out] == ["a", "b", "c"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_suggest_short_circuits_empty_draft():
|
||||||
|
from app import tag_suggest
|
||||||
|
|
||||||
|
stub = StubProvider(reply=json.dumps([{"tag": "a", "confidence": 1}]))
|
||||||
|
draft = tag_suggest.Draft(title=" ", pitch="", use_case="")
|
||||||
|
assert tag_suggest.suggest(stub, draft, ["a"]) == []
|
||||||
|
assert stub.calls == [] # never called for an empty draft
|
||||||
|
|
||||||
|
|
||||||
|
def test_suggest_returns_empty_on_provider_failure():
|
||||||
|
from app import tag_suggest
|
||||||
|
|
||||||
|
stub = StubProvider(raises=True)
|
||||||
|
draft = tag_suggest.Draft(title="Real title", pitch="a reason")
|
||||||
|
assert tag_suggest.suggest(stub, draft, ["identity"]) == []
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "rfc-app-frontend",
|
"name": "rfc-app-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.22.0",
|
"version": "0.26.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -1354,6 +1354,17 @@
|
|||||||
.pr-breadcrumb a:hover { text-decoration: underline; }
|
.pr-breadcrumb a:hover { text-decoration: underline; }
|
||||||
.pr-title { font-size: var(--text-xl); margin: 0 0 6px 0; }
|
.pr-title { font-size: var(--text-xl); margin: 0 0 6px 0; }
|
||||||
.pr-description { font-size: var(--text-base); color: var(--c-gray-600); margin: 0 0 6px 0; line-height: 1.55; }
|
.pr-description { font-size: var(--text-base); color: var(--c-gray-600); margin: 0 0 6px 0; line-height: 1.55; }
|
||||||
|
/* Roadmap #28 Part 1: inline auto-links to referenced RFCs inside PR text
|
||||||
|
and comments. Subtle accent + dotted underline so they read as enriched
|
||||||
|
references, not as primary navigation. */
|
||||||
|
.rfc-autolink {
|
||||||
|
color: var(--color-link);
|
||||||
|
text-decoration: underline;
|
||||||
|
text-decoration-style: dotted;
|
||||||
|
text-underline-offset: 2px;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
.rfc-autolink:hover { text-decoration-style: solid; }
|
||||||
.pr-header-edit { display: flex; flex-direction: column; gap: 8px; }
|
.pr-header-edit { display: flex; flex-direction: column; gap: 8px; }
|
||||||
.pr-header-right {
|
.pr-header-right {
|
||||||
display: flex; flex-direction: column; align-items: flex-end; gap: 8px;
|
display: flex; flex-direction: column; align-items: flex-end; gap: 8px;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react'
|
|||||||
import { Routes, Route, Link, Navigate, useLocation, useNavigate } from 'react-router-dom'
|
import { Routes, Route, Link, Navigate, useLocation, useNavigate } from 'react-router-dom'
|
||||||
import { getMe, subscribeToNotifications } from './api'
|
import { getMe, subscribeToNotifications } from './api'
|
||||||
import { anonymize, EVENTS, identify, track } from './lib/analytics'
|
import { anonymize, EVENTS, identify, track } from './lib/analytics'
|
||||||
|
import { useLastState } from './lib/useLastState'
|
||||||
import Catalog from './components/Catalog.jsx'
|
import Catalog from './components/Catalog.jsx'
|
||||||
import Inbox from './components/Inbox.jsx'
|
import Inbox from './components/Inbox.jsx'
|
||||||
import RFCView from './components/RFCView.jsx'
|
import RFCView from './components/RFCView.jsx'
|
||||||
@@ -42,6 +43,12 @@ export default function App() {
|
|||||||
// "Privacy & cookies" tab dispatches a `rfc-app:cookie-consent-reopen`
|
// "Privacy & cookies" tab dispatches a `rfc-app:cookie-consent-reopen`
|
||||||
// event that bumps this.
|
// event that bumps this.
|
||||||
const [consentReopenTick, setConsentReopenTick] = useState(0)
|
const [consentReopenTick, setConsentReopenTick] = useState(0)
|
||||||
|
// v0.23.0 / item #29 — flips true once the #21-Part-C identify effect
|
||||||
|
// has fired (or once we've confirmed there's no authenticated user to
|
||||||
|
// identify). useLastState gates its resume redirect on this so the
|
||||||
|
// redirect always happens AFTER identify, preserving identify-then-
|
||||||
|
// track ordering.
|
||||||
|
const [identifyReady, setIdentifyReady] = useState(false)
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
const location = useLocation()
|
const location = useLocation()
|
||||||
// v0.15.0 — Page Viewed event taxonomy. We fire on every
|
// v0.15.0 — Page Viewed event taxonomy. We fire on every
|
||||||
@@ -86,6 +93,9 @@ export default function App() {
|
|||||||
if (viewer?.first_sign_in_at) props.first_sign_in_at = ['__setOnce__', viewer.first_sign_in_at]
|
if (viewer?.first_sign_in_at) props.first_sign_in_at = ['__setOnce__', viewer.first_sign_in_at]
|
||||||
if (viewer?.created_at) props.account_created_at = ['__setOnce__', viewer.created_at]
|
if (viewer?.created_at) props.account_created_at = ['__setOnce__', viewer.created_at]
|
||||||
identify({ user_id: String(uid), properties: props })
|
identify({ user_id: String(uid), properties: props })
|
||||||
|
// v0.23.0 / item #29 — identify has now fired for this sign-in;
|
||||||
|
// release useLastState's resume redirect (it waits on this).
|
||||||
|
setIdentifyReady(true)
|
||||||
} else if (uid == null && lastUserIdRef.current != null) {
|
} else if (uid == null && lastUserIdRef.current != null) {
|
||||||
// Sign-out edge — App-level reset is handled separately by the
|
// Sign-out edge — App-level reset is handled separately by the
|
||||||
// sign-out gesture that fires User Signed Out. Clear our local
|
// sign-out gesture that fires User Signed Out. Clear our local
|
||||||
@@ -94,6 +104,14 @@ export default function App() {
|
|||||||
}
|
}
|
||||||
}, [me?.authenticated, me?.user?.id, me?.user?.role, me?.user?.permission_state, me?.user?.passcode_set, me?.user?.device_trusted])
|
}, [me?.authenticated, me?.user?.id, me?.user?.role, me?.user?.permission_state, me?.user?.passcode_set, me?.user?.device_trusted])
|
||||||
|
|
||||||
|
// v0.23.0 / item #29 — once `me` has resolved, if there's no
|
||||||
|
// authenticated user there is nothing to identify, so release the
|
||||||
|
// resume gate immediately (anonymous boots have no resume to do, but
|
||||||
|
// the hook still needs the gate resolved to be a clean no-op).
|
||||||
|
useEffect(() => {
|
||||||
|
if (me != null && !me.authenticated) setIdentifyReady(true)
|
||||||
|
}, [me])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handler = () => setConsentReopenTick(t => t + 1)
|
const handler = () => setConsentReopenTick(t => t + 1)
|
||||||
window.addEventListener('rfc-app:cookie-consent-reopen', handler)
|
window.addEventListener('rfc-app:cookie-consent-reopen', handler)
|
||||||
@@ -107,6 +125,18 @@ export default function App() {
|
|||||||
.finally(() => setLoading(false))
|
.finally(() => setLoading(false))
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
|
// v0.23.0 / item #29 — server-side sign-in state resume. The hook
|
||||||
|
// debounce-posts the current route for authenticated users and, once
|
||||||
|
// identify has fired, redirects a fresh sign-in (which hard-lands on
|
||||||
|
// "/") to the user's stored last route. Anonymous users: no-op.
|
||||||
|
useLastState({
|
||||||
|
authenticated: !!me?.authenticated,
|
||||||
|
pathname: location.pathname,
|
||||||
|
identifyReady,
|
||||||
|
lastRoute: me?.authenticated ? me.user?.last_route : null,
|
||||||
|
navigate,
|
||||||
|
})
|
||||||
|
|
||||||
// §15.3 — subscribe to the live SSE stream for authenticated viewers
|
// §15.3 — subscribe to the live SSE stream for authenticated viewers
|
||||||
// so the badge counter and the toast surface stay in lockstep with
|
// so the badge counter and the toast surface stay in lockstep with
|
||||||
// the inbox. Tabs that miss an event because they were closed pick
|
// the inbox. Tabs that miss an event because they were closed pick
|
||||||
|
|||||||
@@ -25,6 +25,25 @@ export async function getMe() {
|
|||||||
return jsonOrThrow(res)
|
return jsonOrThrow(res)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── v0.23.0: sign-in state resume (§6.2, roadmap item #29) ───────────────
|
||||||
|
//
|
||||||
|
// The route-change hook (useLastState) debounce-posts the user's current
|
||||||
|
// route + a small bag of *light* view state here for authenticated users.
|
||||||
|
// The next sign-in reads `last_route` off `/api/auth/me` and redirects.
|
||||||
|
// Privacy: `state` carries ephemeral view state ONLY — never draft-buffer
|
||||||
|
// contents (see SPEC §6.2). Best-effort: callers ignore failures (an
|
||||||
|
// offline/401 POST must never disrupt navigation).
|
||||||
|
export async function putLastState(route, state) {
|
||||||
|
const body = { route }
|
||||||
|
if (state != null) body.state = state
|
||||||
|
const res = await fetch('/api/me/last-state', {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
})
|
||||||
|
return jsonOrThrow(res)
|
||||||
|
}
|
||||||
|
|
||||||
// ── v0.7.0: email + one-time-code sign-in (§6.2) ─────────────────────────
|
// ── v0.7.0: email + one-time-code sign-in (§6.2) ─────────────────────────
|
||||||
//
|
//
|
||||||
// The legacy /auth/login → /auth/callback OAuth flow remains during the
|
// The legacy /auth/login → /auth/callback OAuth flow remains during the
|
||||||
@@ -183,6 +202,30 @@ export async function proposeRFC({ title, slug, pitch, tags, proposedUseCase })
|
|||||||
return jsonOrThrow(res)
|
return jsonOrThrow(res)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Roadmap #27: Claude Haiku tag suggestions for the propose-RFC modal.
|
||||||
|
// Returns a (possibly empty) array of { tag, confidence }. Deliberately
|
||||||
|
// forgiving — any non-OK response (rate limit, transient error, no key
|
||||||
|
// configured server-side) resolves to [] so the modal just shows nothing
|
||||||
|
// rather than surfacing an error for what is a best-effort assist.
|
||||||
|
export async function suggestTags({ title, pitch, useCase }) {
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/rfcs/suggest-tags', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
title: title || '',
|
||||||
|
pitch: pitch || '',
|
||||||
|
use_case: useCase || '',
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
if (!res.ok) return []
|
||||||
|
const data = await res.json()
|
||||||
|
return Array.isArray(data.suggestions) ? data.suggestions : []
|
||||||
|
} catch {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function mergeProposal(prNumber) {
|
export async function mergeProposal(prNumber) {
|
||||||
const res = await fetch(`/api/proposals/${prNumber}/merge`, { method: 'POST' })
|
const res = await fetch(`/api/proposals/${prNumber}/merge`, { method: 'POST' })
|
||||||
return jsonOrThrow(res)
|
return jsonOrThrow(res)
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
// LinkedText.jsx — roadmap #28 Part 1.
|
||||||
|
//
|
||||||
|
// Renders a backend-provided list of text/rfc-link segments (see
|
||||||
|
// backend/app/rfc_links.py). RFC references in PR descriptions and
|
||||||
|
// comments arrive pre-scanned as structured segments — this component
|
||||||
|
// maps them onto plain text runs and anchor elements. It never renders
|
||||||
|
// HTML from the server (no dangerouslySetInnerHTML), so the surface is
|
||||||
|
// XSS-safe regardless of what a comment author typed.
|
||||||
|
//
|
||||||
|
// `segments` is the enriched array; `text` is the raw fallback used when
|
||||||
|
// the field is absent (an older cached response, or a caller that didn't
|
||||||
|
// pass segments). Either way the visible text is identical — only the
|
||||||
|
// links differ.
|
||||||
|
|
||||||
|
export default function LinkedText({ segments, text }) {
|
||||||
|
if (!Array.isArray(segments) || segments.length === 0) {
|
||||||
|
return <>{text ?? ''}</>
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{segments.map((seg, i) => {
|
||||||
|
if (seg.type === 'rfc') {
|
||||||
|
return (
|
||||||
|
<a
|
||||||
|
key={i}
|
||||||
|
className="rfc-autolink"
|
||||||
|
href={`/rfc/${seg.slug}`}
|
||||||
|
title={seg.title ? `RFC: ${seg.title}` : undefined}
|
||||||
|
>
|
||||||
|
{seg.label}
|
||||||
|
</a>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return <span key={i}>{seg.text}</span>
|
||||||
|
})}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -23,6 +23,7 @@ import {
|
|||||||
withdrawPR,
|
withdrawPR,
|
||||||
} from '../api'
|
} from '../api'
|
||||||
import { EVENTS, track } from '../lib/analytics'
|
import { EVENTS, track } from '../lib/analytics'
|
||||||
|
import LinkedText from './LinkedText'
|
||||||
|
|
||||||
export default function PRView({ viewer }) {
|
export default function PRView({ viewer }) {
|
||||||
const { slug, prNumber: prNumberParam } = useParams()
|
const { slug, prNumber: prNumberParam } = useParams()
|
||||||
@@ -218,7 +219,9 @@ export default function PRView({ viewer }) {
|
|||||||
<>
|
<>
|
||||||
<h1 className="pr-title">{pr.title}</h1>
|
<h1 className="pr-title">{pr.title}</h1>
|
||||||
{pr.description && (
|
{pr.description && (
|
||||||
<p className="pr-description">{pr.description}</p>
|
<p className="pr-description">
|
||||||
|
<LinkedText segments={pr.description_segments} text={pr.description} />
|
||||||
|
</p>
|
||||||
)}
|
)}
|
||||||
{/* #26: the optional ground-truth use case for this change,
|
{/* #26: the optional ground-truth use case for this change,
|
||||||
captured when the PR was opened. Muted "left blank"
|
captured when the PR was opened. Muted "left blank"
|
||||||
@@ -440,7 +443,9 @@ function PRConversation({ threads, messagesByThread, threadsByKind, seenMsgId })
|
|||||||
{isNew && <span className="chat-msg-new-pip" title="New since your last visit">●</span>}
|
{isNew && <span className="chat-msg-new-pip" title="New since your last visit">●</span>}
|
||||||
</div>
|
</div>
|
||||||
{m.quote && <pre className="chat-msg-quote">{m.quote}</pre>}
|
{m.quote && <pre className="chat-msg-quote">{m.quote}</pre>}
|
||||||
<div className="chat-msg-body">{m.text}</div>
|
<div className="chat-msg-body">
|
||||||
|
<LinkedText segments={m.text_segments} text={m.text} />
|
||||||
|
</div>
|
||||||
</li>
|
</li>
|
||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -2,17 +2,24 @@
|
|||||||
//
|
//
|
||||||
// Title (required) and pitch (required textarea), with a slug field
|
// Title (required) and pitch (required textarea), with a slug field
|
||||||
// that auto-fills from the title via the same deterministic kebab-case
|
// that auto-fills from the title via the same deterministic kebab-case
|
||||||
// the backend uses. Tags are chip-input (free-form for slice 1; the
|
// the backend uses. Tags are chip-input (free-form), with the §9.1
|
||||||
// AI-suggested chips of §9.1 are deferred to Slice 2 when the AI surface
|
// Slice 2 AI-suggested chips (roadmap #27) wired in: as the draft fills
|
||||||
// is wired up).
|
// in, the backend asks Claude Haiku for tags drawn from the corpus's
|
||||||
|
// existing tag set, surfaced as clickable suggestion chips. The assist
|
||||||
|
// is best-effort — it stays silent when unavailable.
|
||||||
//
|
//
|
||||||
// The submit button drives the §17 POST /api/rfcs/propose endpoint;
|
// The submit button drives the §17 POST /api/rfcs/propose endpoint;
|
||||||
// success navigates the proposer to the pending-idea view per §9.3.
|
// success navigates the proposer to the pending-idea view per §9.3.
|
||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useRef, useState } from 'react'
|
||||||
import { proposeRFC } from '../api'
|
import { proposeRFC, suggestTags } from '../api'
|
||||||
import { EVENTS, track } from '../lib/analytics'
|
import { EVENTS, track } from '../lib/analytics'
|
||||||
|
|
||||||
|
// How long the draft must sit unchanged before we ask for suggestions —
|
||||||
|
// long enough to fire on typing pauses / field-blur, not on every
|
||||||
|
// keystroke (the backend is also per-user rate-limited as a backstop).
|
||||||
|
const SUGGEST_DEBOUNCE_MS = 700
|
||||||
|
|
||||||
function slugify(title) {
|
function slugify(title) {
|
||||||
return title
|
return title
|
||||||
.toLowerCase()
|
.toLowerCase()
|
||||||
@@ -32,17 +39,50 @@ export default function ProposeModal({ viewer, onClose, onSubmitted }) {
|
|||||||
const [tags, setTags] = useState([])
|
const [tags, setTags] = useState([])
|
||||||
const [submitting, setSubmitting] = useState(false)
|
const [submitting, setSubmitting] = useState(false)
|
||||||
const [error, setError] = useState(null)
|
const [error, setError] = useState(null)
|
||||||
|
// #27: Claude Haiku tag suggestions. `suggestions` is the latest
|
||||||
|
// ranked list from the backend ({ tag, confidence }); we render the
|
||||||
|
// subset not already chosen. `suggestedOnce` gates the disclosure +
|
||||||
|
// row so they only appear after the assist has actually run.
|
||||||
|
const [suggestions, setSuggestions] = useState([])
|
||||||
|
const [suggestedOnce, setSuggestedOnce] = useState(false)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!slugEdited) setSlug(slugify(title))
|
if (!slugEdited) setSlug(slugify(title))
|
||||||
}, [title, slugEdited])
|
}, [title, slugEdited])
|
||||||
|
|
||||||
|
// #27: debounced tag-suggestion fetch. Fires after the draft sits
|
||||||
|
// unchanged for SUGGEST_DEBOUNCE_MS, only once there's something to go
|
||||||
|
// on (a title). A stale-response guard keeps an earlier in-flight
|
||||||
|
// request from clobbering a newer one.
|
||||||
|
const suggestSeq = useRef(0)
|
||||||
|
useEffect(() => {
|
||||||
|
if (!title.trim()) {
|
||||||
|
setSuggestions([])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const handle = setTimeout(async () => {
|
||||||
|
const seq = ++suggestSeq.current
|
||||||
|
const result = await suggestTags({ title, pitch, useCase })
|
||||||
|
if (seq !== suggestSeq.current) return // a newer request superseded us
|
||||||
|
setSuggestions(Array.isArray(result) ? result : [])
|
||||||
|
if (result && result.length) setSuggestedOnce(true)
|
||||||
|
}, SUGGEST_DEBOUNCE_MS)
|
||||||
|
return () => clearTimeout(handle)
|
||||||
|
}, [title, pitch, useCase])
|
||||||
|
|
||||||
|
// Suggestions the user hasn't already added.
|
||||||
|
const freshSuggestions = suggestions.filter(s => !tags.includes(s.tag))
|
||||||
|
|
||||||
function addTag() {
|
function addTag() {
|
||||||
const t = tagInput.trim()
|
const t = tagInput.trim()
|
||||||
if (t && !tags.includes(t)) setTags([...tags, t])
|
if (t && !tags.includes(t)) setTags([...tags, t])
|
||||||
setTagInput('')
|
setTagInput('')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addSuggested(tag) {
|
||||||
|
if (!tags.includes(tag)) setTags([...tags, tag])
|
||||||
|
}
|
||||||
|
|
||||||
async function handleSubmit(e) {
|
async function handleSubmit(e) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
if (!title.trim() || !slug || !pitch.trim()) return
|
if (!title.trim() || !slug || !pitch.trim()) return
|
||||||
@@ -152,6 +192,45 @@ export default function ProposeModal({ viewer, onClose, onSubmitted }) {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* #27: Claude Haiku suggested tags. Clickable chips that add
|
||||||
|
to the tag list; nothing auto-applies. The disclosure is
|
||||||
|
required — the draft text is sent to Anthropic to generate
|
||||||
|
these — so it renders whenever the suggestion row does. */}
|
||||||
|
{(freshSuggestions.length > 0 || (suggestedOnce && suggestions.length > 0)) && (
|
||||||
|
<div style={{ marginTop: 4, marginBottom: 14 }}>
|
||||||
|
{freshSuggestions.length > 0 && (
|
||||||
|
<>
|
||||||
|
<p className="field-help" style={{ marginTop: 0, marginBottom: 4 }}>
|
||||||
|
Suggested tags — click to add:
|
||||||
|
</p>
|
||||||
|
<div>
|
||||||
|
{freshSuggestions.map(s => (
|
||||||
|
<button
|
||||||
|
key={s.tag}
|
||||||
|
type="button"
|
||||||
|
className="entry-tag"
|
||||||
|
onClick={() => addSuggested(s.tag)}
|
||||||
|
title={`Add "${s.tag}"`}
|
||||||
|
style={{
|
||||||
|
display: 'inline-block',
|
||||||
|
marginRight: 4,
|
||||||
|
marginBottom: 4,
|
||||||
|
border: '1px dashed var(--color-border, #ccc)',
|
||||||
|
background: 'none',
|
||||||
|
cursor: 'pointer',
|
||||||
|
}}
|
||||||
|
>+ {s.tag}</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
<p className="field-help" style={{ marginTop: 4, marginBottom: 0, fontStyle: 'italic' }}>
|
||||||
|
Suggestions are generated by Claude (Anthropic). The text you've
|
||||||
|
entered above is sent to Anthropic to produce them.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{viewer && (
|
{viewer && (
|
||||||
<p className="field-help" style={{ marginTop: 14, marginBottom: 0 }}>
|
<p className="field-help" style={{ marginTop: 14, marginBottom: 0 }}>
|
||||||
Owner: <strong>{viewer.display_name || viewer.gitea_login}</strong> — you'll be the first owner of this super-draft. Additional owners can claim later (§13.1).
|
Owner: <strong>{viewer.display_name || viewer.gitea_login}</strong> — you'll be the first owner of this super-draft. Additional owners can claim later (§13.1).
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import {
|
|||||||
resolveDiscussionThread,
|
resolveDiscussionThread,
|
||||||
} from '../api'
|
} from '../api'
|
||||||
import { EVENTS, track } from '../lib/analytics'
|
import { EVENTS, track } from '../lib/analytics'
|
||||||
|
import LinkedText from './LinkedText'
|
||||||
|
|
||||||
export default function RFCDiscussionPanel({ slug, viewer }) {
|
export default function RFCDiscussionPanel({ slug, viewer }) {
|
||||||
const [threads, setThreads] = useState([])
|
const [threads, setThreads] = useState([])
|
||||||
@@ -279,7 +280,9 @@ function DiscussionMessage({ message }) {
|
|||||||
{message.quote && (
|
{message.quote && (
|
||||||
<div className="discussion-message-quote">"{message.quote}"</div>
|
<div className="discussion-message-quote">"{message.quote}"</div>
|
||||||
)}
|
)}
|
||||||
<div className="discussion-message-body">{message.text}</div>
|
<div className="discussion-message-body">
|
||||||
|
<LinkedText segments={message.text_segments} text={message.text} />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
// useLastState — v0.23.0 / roadmap item #29: server-side sign-in state
|
||||||
|
// resume. Two responsibilities, kept in one small hook so App.jsx's
|
||||||
|
// surface stays minimal:
|
||||||
|
//
|
||||||
|
// 1. Debounce-post the authenticated user's current route to
|
||||||
|
// `PUT /api/me/last-state` on every route change (~1s debounce so
|
||||||
|
// a fast click-through doesn't spray the endpoint). Anonymous
|
||||||
|
// users: no-op. Best-effort: a failed POST never disrupts nav.
|
||||||
|
//
|
||||||
|
// 2. On the first authenticated load, read the stored `last_route`
|
||||||
|
// (handed back on `/api/auth/me`) and `navigate()` to it ONCE.
|
||||||
|
// Stale routes (a withdrawn RFC, a slug the user lost rights to)
|
||||||
|
// are not special-cased here: navigating lands on whatever that
|
||||||
|
// route renders today, and the existing routing already falls
|
||||||
|
// through to the catalog/empty-state for a missing RFC. Keeping
|
||||||
|
// this dumb is deliberate (see SPEC §6.2 + the #29 scope note).
|
||||||
|
//
|
||||||
|
// Ordering with #21 Part C (Amplitude identify): App.jsx fires
|
||||||
|
// `identify` in its own effect when `me.user.id` first appears. This
|
||||||
|
// hook's resume redirect is gated on `identifyReady` — App.jsx flips it
|
||||||
|
// true only after the identify effect has run — so the redirect always
|
||||||
|
// happens AFTER identify, preserving the identify-then-track ordering
|
||||||
|
// the roadmap calls out.
|
||||||
|
import { useEffect, useRef } from 'react'
|
||||||
|
import { putLastState } from '../api'
|
||||||
|
|
||||||
|
// ~1s debounce on the route-change POST. A frontend constant, not a
|
||||||
|
// server knob — the backend takes whatever lands.
|
||||||
|
const DEBOUNCE_MS = 1000
|
||||||
|
|
||||||
|
// Routes we never want to resume *to* — auth/landing surfaces that
|
||||||
|
// would be nonsensical or hostile to drop a returning user onto. We
|
||||||
|
// still record them (cheap, and the user may legitimately be sitting on
|
||||||
|
// /docs), but the resume redirect skips them and falls through to the
|
||||||
|
// default landing. Anything not listed resumes normally.
|
||||||
|
const NON_RESUMABLE_PREFIXES = ['/login', '/welcome', '/invites/', '/invitations/']
|
||||||
|
|
||||||
|
function isResumable(route) {
|
||||||
|
if (!route || typeof route !== 'string') return false
|
||||||
|
if (route === '/') return false // "/" is already the default landing
|
||||||
|
return !NON_RESUMABLE_PREFIXES.some(p => route.startsWith(p))
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {object} opts
|
||||||
|
* @param {boolean} opts.authenticated whether a viewer is signed in
|
||||||
|
* @param {string} opts.pathname current location.pathname
|
||||||
|
* @param {boolean} opts.identifyReady App flips true after identify fires
|
||||||
|
* @param {string|null} opts.lastRoute stored route from /api/auth/me
|
||||||
|
* @param {function} opts.navigate react-router navigate()
|
||||||
|
*/
|
||||||
|
export function useLastState({ authenticated, pathname, identifyReady, lastRoute, navigate }) {
|
||||||
|
// ── 1. Debounced route-change POST ────────────────────────────────
|
||||||
|
const timerRef = useRef(null)
|
||||||
|
useEffect(() => {
|
||||||
|
if (!authenticated) return undefined
|
||||||
|
if (timerRef.current) clearTimeout(timerRef.current)
|
||||||
|
timerRef.current = setTimeout(() => {
|
||||||
|
// Best-effort — swallow failures so an offline/401 POST never
|
||||||
|
// surfaces as a navigation error.
|
||||||
|
putLastState(pathname).catch(() => {})
|
||||||
|
}, DEBOUNCE_MS)
|
||||||
|
return () => {
|
||||||
|
if (timerRef.current) clearTimeout(timerRef.current)
|
||||||
|
}
|
||||||
|
}, [authenticated, pathname])
|
||||||
|
|
||||||
|
// ── 2. One-time resume redirect ───────────────────────────────────
|
||||||
|
// Fires once, after identify is ready, when there's a resumable
|
||||||
|
// stored route AND the user is currently sitting on the default
|
||||||
|
// landing ("/"). We only redirect from "/" so we never yank a user
|
||||||
|
// who deep-linked somewhere specific (or refreshed mid-RFC) back to
|
||||||
|
// their last route.
|
||||||
|
const resumedRef = useRef(false)
|
||||||
|
useEffect(() => {
|
||||||
|
if (resumedRef.current) return
|
||||||
|
if (!authenticated || !identifyReady) return
|
||||||
|
// Only resume when the app booted on the default landing — a hard
|
||||||
|
// sign-in nav lands on "/", which is exactly the case we want.
|
||||||
|
if (pathname !== '/') {
|
||||||
|
resumedRef.current = true // user deep-linked; don't resume later either
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (isResumable(lastRoute)) {
|
||||||
|
resumedRef.current = true
|
||||||
|
navigate(lastRoute, { replace: true })
|
||||||
|
} else {
|
||||||
|
resumedRef.current = true // nothing to resume to; keep default landing
|
||||||
|
}
|
||||||
|
}, [authenticated, identifyReady, lastRoute, pathname, navigate])
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user