- {t("Source body was not imported; summary and semantic extraction are unavailable.")} -
{t("Raw source codes are shown; no state label was inferred.")}
{t("No summary is available for this record yet.")}
+ {t("Source body was not imported; summary and semantic extraction are unavailable.")} +
{t("Search includes post text and semantic evidence.")}
@@ -4292,10 +4390,10 @@ function CustomerMasterPanel({ } return ( - + {t("Authorized customer scope")} {t("Customer master")} - {t("Customer entities available to this account.")} + {t("Customer entities available to this account.")} {error ? {error} : null} {master === null && !error ? {t("Loading customer master...")} : null} {master?.corporate_entities.length === 0 ? ( @@ -4320,7 +4418,7 @@ function CustomerMasterPanel({ {master && (master.relationship_network ?? []).length > 0 ? ( {t("Relationship network")} - + {t("A counterparty can hold more than one role over time -- a customer in one post can be a competitor, supplier, or partner in another. Every role observed for a name is listed, not just the most frequent.")} @@ -4343,7 +4441,7 @@ function CustomerMasterPanel({ {master && master.source_customer_hints.length > 0 ? ( {t("Observed customer evidence")} - + {t("Source identifiers are hints only; ontology and semantic evidence must resolve them before binding a customer.")} {master.source_customer_hints.length > HINT_RENDER_LIMIT && ( @@ -4465,6 +4563,14 @@ function CustomerMasterPanel({ ); } +type AskAgentExchange = { + id: number; + question: string; + status: "pending" | "complete" | "error"; + response?: AskAgentResponse; + error?: string; +}; + function AskAgentPanel({ accessToken, onOpenPost, @@ -4473,76 +4579,130 @@ function AskAgentPanel({ onOpenPost: (postId: string) => void; }) { const [question, setQuestion] = useState(""); - const [answer, setAnswer] = useState(null); - const [error, setError] = useState(null); + const [exchanges, setExchanges] = useState([]); const [asking, setAsking] = useState(false); + const exchangeIdRef = useRef(0); async function handleAsk() { const normalized = question.trim(); - if (!normalized) return; + if (!normalized || asking) return; + const exchangeId = ++exchangeIdRef.current; + setExchanges((current) => [...current, { id: exchangeId, question: normalized, status: "pending" }]); + setQuestion(""); setAsking(true); - setError(null); try { - setAnswer(await askAgent(accessToken, normalized)); + const response = await askAgent(accessToken, normalized); + setExchanges((current) => current.map((exchange) => ( + exchange.id === exchangeId ? { ...exchange, status: "complete", response } : exchange + ))); } catch (err) { - setAnswer(null); - setError(orchestratorUnavailableMessage(err, t("Ask Agent"))); + setExchanges((current) => current.map((exchange) => ( + exchange.id === exchangeId + ? { ...exchange, status: "error", error: orchestratorUnavailableMessage(err, t("Ask Agent")) } + : exchange + ))); } finally { setAsking(false); } } return ( - - {t("Evidence-grounded questions")} - {t("Ask Agent")} - {t("Questions use authorized posts and their evidence.")} - {error ? {error} : null} - - {t("Ask a question")} - setQuestion(event.target.value)} - rows={4} - /> - </label> - <button className="keyman-select" onClick={() => void handleAsk()} disabled={asking || !question.trim()}> - {asking ? t("Asking...") : t("Ask")} - </button> - {answer && ( - <section className="popup-section" aria-label={t("Answer")}> - <h3>{t("Answer")}</h3> - {answer.answer_text ? <p>{answer.answer_text}</p> : null} - {answer.next_action ? <p className="post-meta">{t(answer.next_action)}</p> : null} - {answer.cited_posts && answer.cited_posts.length > 0 && ( - <> - <h4>{t("Cited posts")}</h4> - <ul className="related-post-list"> - {answer.cited_posts.map((post) => ( - <li key={post.post_id}> - <button className="post-list-item" onClick={() => onOpenPost(post.post_id)}> - <strong>{post.post_title}</strong> - </button> - {answer.cited_post_evidence?.find((item) => item.post_id === post.post_id)?.facts.length ? ( - <ul className="post-evidence-list" aria-label={t("Evidence facts")}> - {answer.cited_post_evidence - .find((item) => item.post_id === post.post_id) - ?.facts.map((fact, index) => ( - <li key={`${fact.kind}:${fact.text}:${index}`}> - <span>{chatEvidenceKindLabel(fact.kind)}</span> - <span>{fact.text}</span> - </li> - ))} + <section className="workspace-destination ask-agent-workspace" aria-labelledby="ask-agent-heading"> + <header className="ask-agent-header"> + <p className="section-eyebrow">{t("Evidence-grounded questions")}</p> + <h2 id="ask-agent-heading">{t("Ask Agent")}</h2> + <p className="workspace-destination-intro">{t("Questions use authorized posts and their evidence.")}</p> + </header> + + <div className="ask-agent-thread" role="log" aria-label={t("Conversation")} aria-live="polite" aria-busy={asking}> + {exchanges.length === 0 ? ( + <div className="ask-agent-empty"> + <span className="ask-agent-mark" aria-hidden="true">LW</span> + <h3>{t("Start with a question about the evidence")}</h3> + <p>{t("Ask about an event, decision, or source post.")}</p> + </div> + ) : exchanges.map((exchange) => { + const response = exchange.response; + return ( + <article className="ask-agent-turn" key={exchange.id}> + <div className="ask-agent-message-row"> + <span className="ask-agent-avatar ask-agent-user-avatar" aria-hidden="true">U</span> + <div className="ask-agent-message ask-agent-user-message"> + <p className="ask-agent-message-label">{t("You")}</p> + <p>{exchange.question}</p> + </div> + </div> + <div className="ask-agent-message-row"> + <span className="ask-agent-avatar ask-agent-assistant-avatar" aria-hidden="true">LW</span> + <div className="ask-agent-message ask-agent-assistant-message"> + <p className="ask-agent-message-label">{t("Ask Agent")}</p> + {exchange.status === "pending" ? <p className="ask-agent-pending">{t("Thinking...")}</p> : null} + {exchange.status === "error" ? <p className="ask-agent-error">{exchange.error}</p> : null} + {response?.answer_text ? <p>{response.answer_text}</p> : null} + {response?.next_action ? <p className="post-meta">{t(response.next_action)}</p> : null} + {response?.cited_posts && response.cited_posts.length > 0 ? ( + <section className="ask-agent-citations" aria-label={t("Cited posts")}> + <h4>{t("Cited posts")}</h4> + <ul className="ask-agent-citation-list"> + {response.cited_posts.map((post) => ( + <li key={post.post_id}> + <button className="ask-agent-citation" onClick={() => onOpenPost(post.post_id)}> + <strong>{post.post_title}</strong> + <span>{t("Open source")}</span> + </button> + {response.cited_post_evidence?.find((item) => item.post_id === post.post_id)?.facts.length ? ( + <ul className="post-evidence-list" aria-label={t("Evidence facts")}> + {response.cited_post_evidence + .find((item) => item.post_id === post.post_id) + ?.facts.map((fact, index) => ( + <li key={fact.kind + ":" + fact.text + ":" + index}> + <span>{chatEvidenceKindLabel(fact.kind)}</span> + <span>{fact.text}</span> + </li> + ))} + </ul> + ) : null} + </li> + ))} </ul> - ) : null} - </li> - ))} - </ul> - </> - )} - </section> - )} + </section> + ) : null} + </div> + </div> + </article> + ); + })} + </div> + + <form + className="ask-agent-composer" + onSubmit={(event) => { + event.preventDefault(); + void handleAsk(); + }} + > + <label className="sr-only" htmlFor="ask-agent-input">{t("Ask a question")}</label> + <div className="ask-agent-composer-field"> + <textarea + id="ask-agent-input" + aria-label={t("Ask a question")} + placeholder={t("What happened between these events?")} + value={question} + onChange={(event) => setQuestion(event.target.value)} + onKeyDown={(event) => { + if (event.key === "Enter" && !event.shiftKey) { + event.preventDefault(); + void handleAsk(); + } + }} + rows={1} + /> + <button className="ask-agent-send" type="submit" aria-label={t("Ask")} disabled={asking || !question.trim()}> + <SendIcon /> + </button> + </div> + <p className="ask-agent-composer-help">{t("Enter to send. Shift+Enter for a new line.")}</p> + </form> </section> ); } @@ -4551,7 +4711,11 @@ export default function App({ showLabPanels = false }: { showLabPanels?: boolean useLocale(); const [brandName, setBrandName] = useState("LineageWeave"); const auth = useAuth(); - const [destination, setDestination] = useState<BuyerDestination>("board"); + const [destination, setDestination] = useState<WorkspaceDestination>("board"); + const [mobileMenuOpen, setMobileMenuOpen] = useState(false); + const [siteMapOpen, setSiteMapOpen] = useState(false); + const [searchFocusRequest, setSearchFocusRequest] = useState(0); + const [currentUser, setCurrentUser] = useState<CurrentUser | null>(null); const [postToOpen, setPostToOpen] = useState<string | null>(() => { if (typeof window === "undefined") return null; return new URLSearchParams(window.location.search).get("post"); @@ -4562,6 +4726,21 @@ export default function App({ showLabPanels = false }: { showLabPanels?: boolean // post_admin check (`canRebuild`), not on this caller-supplied prop. const testOnlyLabPanels = import.meta.env.MODE === "test" && showLabPanels; const accessToken = auth.user?.access_token; + const changeDestination = (nextDestination: WorkspaceDestination) => { + setDestination(nextDestination); + setMobileMenuOpen(false); + setSiteMapOpen(false); + if (nextDestination !== "board") setSearchFocusRequest(0); + }; + + useEffect(() => { + if (!siteMapOpen) return; + const closeOnEscape = (event: KeyboardEvent) => { + if (event.key === "Escape") setSiteMapOpen(false); + }; + document.addEventListener("keydown", closeOnEscape); + return () => document.removeEventListener("keydown", closeOnEscape); + }, [siteMapOpen]); useEffect(() => { if (accessToken) { @@ -4582,9 +4761,13 @@ export default function App({ showLabPanels = false }: { showLabPanels?: boolean let active = true; fetchMe(accessToken) .then((member) => { - if (active && isSupportedLocale(member.preferred_locale)) setLocale(member.preferred_locale); + if (!active) return; + setCurrentUser(member); + if (isSupportedLocale(member.preferred_locale)) setLocale(member.preferred_locale); }) - .catch(() => undefined); + .catch(() => { + if (active) setCurrentUser(null); + }); return () => { active = false; }; @@ -4636,29 +4819,100 @@ export default function App({ showLabPanels = false }: { showLabPanels?: boolean return <p className="error">{t("Authenticated, but no access token was returned.")}</p>; } + const accountScope = currentUser?.account_affiliations + ?.map((affiliation) => + `${affiliation.corporate_entity_code}${affiliation.process_unit_code ? ` / ${affiliation.process_unit_code}` : ""}`, + ) + .join(", "); + return ( <div className="app-shell"> + <a + href="#main-content" + className="skip-link" + onClick={(event) => { + event.preventDefault(); + document.getElementById("main-content")?.focus(); + }} + > + {t("Skip to main content")} + </a> <header className="app-header"> <div className="app-header-logo"> <h1 className="app-header-title">{brandName}</h1> </div> + <button + type="button" + className="mobile-drawer-trigger" + aria-label={ + mobileMenuOpen ? `${t("Close")} ${t("Workspace navigation")}` : t("Open navigation") + } + aria-expanded={mobileMenuOpen} + aria-controls="mobile-workspace-navigation" + onClick={() => setMobileMenuOpen((open) => !open)} + > + <MenuIcon /> + </button> <div className="app-header-top-menu"> + {accountScope ? ( + <span className="app-account-scope" aria-label={t("Authorized scope")}> + {accountScope} + </span> + ) : null} <span className="app-user-profile">{auth.user?.profile.preferred_username}</span> + <LanguageSwitcher accessToken={accessToken} /> + <button + type="button" + className="btn-secondary app-header-search" + onClick={() => { + changeDestination("board"); + setSearchFocusRequest((request) => request + 1); + }} + > + {t("Search")} + </button> + <SiteMapUtility + destination={destination} + onChange={changeDestination} + open={siteMapOpen} + onToggle={() => setSiteMapOpen((open) => !open)} + /> <button className="btn-secondary" onClick={() => auth.signoutRedirect()}>{t("Log out")}</button> </div> </header> - <BuyerNav - destination={destination} - onChange={setDestination} - tools={<LanguageSwitcher accessToken={accessToken} />} - /> - <main> + <WorkspaceNav destination={destination} onChange={changeDestination} /> + {mobileMenuOpen ? ( + <div className="mobile-drawer-backdrop" onClick={() => setMobileMenuOpen(false)}> + <aside + className="mobile-drawer" + onClick={(event) => event.stopPropagation()} + > + <button + type="button" + className="mobile-drawer-close" + aria-label={t("Close")} + onClick={() => setMobileMenuOpen(false)} + > + <CloseIcon /> + </button> + <WorkspaceNav + id="mobile-workspace-navigation" + destination={destination} + onChange={changeDestination} + drawer + /> + </aside> + </div> + ) : null} + <main id="main-content" tabIndex={-1}> {destination === "board" ? ( <PostList accessToken={accessToken} showLabPanels={testOnlyLabPanels} postIdToOpen={postToOpen} onPostOpened={() => setPostToOpen(null)} + focusSearchRequest={searchFocusRequest} + onSearchFocusHandled={() => setSearchFocusRequest(0)} /> ) : null} {destination === "customers" ? ( @@ -4666,7 +4920,7 @@ export default function App({ showLabPanels = false }: { showLabPanels?: boolean accessToken={accessToken} onOpenPost={(postId) => { setPostToOpen(postId); - setDestination("board"); + changeDestination("board"); }} /> ) : null} @@ -4675,7 +4929,7 @@ export default function App({ showLabPanels = false }: { showLabPanels?: boolean accessToken={accessToken} onSelectPost={(postId) => { setPostToOpen(postId); - setDestination("board"); + changeDestination("board"); }} /> ) : null} @@ -4684,7 +4938,7 @@ export default function App({ showLabPanels = false }: { showLabPanels?: boolean accessToken={accessToken} onOpenPost={(postId) => { setPostToOpen(postId); - setDestination("board"); + changeDestination("board"); }} /> ) : null} diff --git a/frontend/src/LineageDag.css.test.ts b/frontend/src/LineageDag.css.test.ts index 73e8c1c2d..ec42d1adc 100644 --- a/frontend/src/LineageDag.css.test.ts +++ b/frontend/src/LineageDag.css.test.ts @@ -6,10 +6,21 @@ import { describe, expect, it } from "vitest"; const here = dirname(fileURLToPath(import.meta.url)); const css = readFileSync(join(here, "LineageDag.css"), "utf-8"); +const appCss = readFileSync(join(here, "App.css"), "utf-8"); describe("LineageDag CSS contracts", () => { it("keeps the event-date selector at least as specific as the shared node-text rule", () => { expect(css).toContain(".lineage-dag-node text.lineage-dag-node-date {"); expect(css).not.toMatch(/(^|\n)\.lineage-dag-node-date\s*\{/); }); + + it("does not override each edge's instance-specific SVG marker", () => { + expect(appCss).not.toContain('marker-end: url("#lineage-dag-arrow");'); + }); + + it("uses each localized cell label in the mobile evidence layout", () => { + expect(appCss).toContain("content: attr(data-label);"); + expect(appCss).not.toContain('content: "Graph relation";'); + expect(appCss).not.toContain('content: "Evidence (fused_score)";'); + }); }); diff --git a/frontend/src/LineageDag.stories.tsx b/frontend/src/LineageDag.stories.tsx new file mode 100644 index 000000000..1932140a7 --- /dev/null +++ b/frontend/src/LineageDag.stories.tsx @@ -0,0 +1,60 @@ +import type { Meta, StoryObj } from "@storybook/react-vite"; +import { LineageDag } from "./LineageDag"; +import type { LineageGraph } from "./api"; + +const branchingGraph: LineageGraph = { + nodes: [ + { + id: "record-root", + group: "DEMO-PROJECT", + label: "Root record", + occurred_at: "2026-01-01T00:00:00Z", + is_root: true, + is_branch_point: true, + }, + { + id: "record-a", + group: "DEMO-PROJECT", + label: "Design review", + occurred_at: "2026-01-02T00:00:00Z", + is_root: false, + is_branch_point: false, + }, + { + id: "record-b", + group: "DEMO-PROJECT", + label: "Commercial follow-up", + occurred_at: "2026-01-03T00:00:00Z", + is_root: false, + is_branch_point: false, + }, + ], + edges: [ + { source: "record-root", target: "record-a", fused_score: 0.91 }, + { source: "record-root", target: "record-b", fused_score: 0.78 }, + ], +}; + +const meta = { + title: "Evidence/LineageDag", + component: LineageDag, + parameters: { layout: "padded" }, +} satisfies Meta<typeof LineageDag>; + +export default meta; +type Story = StoryObj<typeof meta>; + +export const BranchingEventLineage: Story = { + args: { + graph: branchingGraph, + currentPostId: "record-a", + onSelectPost: () => undefined, + }, +}; + +export const EmptyState: Story = { + args: { + graph: { nodes: [], edges: [] }, + onSelectPost: () => undefined, + }, +}; diff --git a/frontend/src/LineageDag.test.tsx b/frontend/src/LineageDag.test.tsx index 1b6d8c174..1b3e51778 100644 --- a/frontend/src/LineageDag.test.tsx +++ b/frontend/src/LineageDag.test.tsx @@ -55,10 +55,9 @@ describe("LineageDag", () => { expect(screen.getByRole("group", { name: "synthetic-project lineage" })).toBeInTheDocument(); expect(document.querySelectorAll(".lineage-dag-edge")).toHaveLength(1); - expect(screen.getByRole("button", { name: "Open post: Root record" })).toHaveAttribute( - "aria-current", - "true", - ); + expect( + screen.getByRole("button", { name: "Open post: Root record (Current record, Root record)" }), + ).toHaveAttribute("aria-current", "true"); expect(document.querySelector(".lineage-list")).not.toBeInTheDocument(); await user.click(screen.getByRole("button", { name: "Open post: Child record" })); @@ -114,7 +113,9 @@ describe("LineageDag", () => { render(<LineageDag graph={isolatedGraph} onSelectPost={vi.fn()} />); expect(screen.getByRole("group", { name: "isolated-project lineage" })).toBeInTheDocument(); - expect(screen.getByRole("button", { name: "Open post: Unlinked record" })).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: "Open post: Unlinked record (Root record)" }), + ).toBeInTheDocument(); expect(screen.queryByRole("table")).not.toBeInTheDocument(); expect(screen.queryByRole("note")).not.toBeInTheDocument(); }); diff --git a/frontend/src/LineageDag.tsx b/frontend/src/LineageDag.tsx index a18937361..d8ba5738d 100644 --- a/frontend/src/LineageDag.tsx +++ b/frontend/src/LineageDag.tsx @@ -56,6 +56,39 @@ export function LineageDag({ return ( <div className="lineage-dag" aria-label={t("Reconstructed lineage")}> + <div className="lineage-dag-header"> + <p className="section-eyebrow">{t("Lineage evidence")}</p> + <p className="lineage-dag-description"> + {t("Reconstructed lineage")}. {t("Edges explain reconstructed continuation only. They are not causal or authoritative facts.")} + </p> + </div> + <ul className="lineage-dag-legend" aria-label={lineageDagText("Lineage legend")}> + <li className="lineage-dag-legend-item"> + <span + className="lineage-dag-legend-node lineage-dag-legend-mark lineage-dag-legend-root" + aria-hidden="true" + /> + {lineageDagText("Root record")} + </li> + <li className="lineage-dag-legend-item"> + <span + className="lineage-dag-legend-node lineage-dag-legend-mark lineage-dag-legend-branch" + aria-hidden="true" + /> + {lineageDagText("Branch point")} + </li> + <li className="lineage-dag-legend-item"> + <span + className="lineage-dag-legend-node lineage-dag-legend-mark lineage-dag-legend-current" + aria-hidden="true" + /> + {lineageDagText("Current record")} + </li> + <li className="lineage-dag-legend-item"> + <span className="lineage-dag-legend-direction" aria-hidden="true" /> + {lineageDagText("Parent to child")} + </li> + </ul> {groups.map((group, groupIndex) => { const byId = Object.fromEntries(group.nodes.map((node) => [node.id, node])); const arrowMarkerId = `lineage-dag-arrow-${instanceId}-${groupIndex}`; @@ -73,35 +106,8 @@ export function LineageDag({ edges: group.edges.length, })} </figcaption> - <ul className="lineage-dag-legend" aria-label={lineageDagText("Lineage legend")}> - <li> - <span - className="lineage-dag-legend-node lineage-dag-legend-root" - aria-hidden="true" - /> - {lineageDagText("Root record")} - </li> - <li> - <span - className="lineage-dag-legend-node lineage-dag-legend-branch" - aria-hidden="true" - /> - {lineageDagText("Branch point")} - </li> - <li> - <span - className="lineage-dag-legend-node lineage-dag-legend-current" - aria-hidden="true" - /> - {lineageDagText("Current record")} - </li> - <li> - <span className="lineage-dag-legend-direction" aria-hidden="true" /> - {lineageDagText("Parent to child")} - </li> - </ul> <div - className="lineage-dag-scroll" + className="lineage-dag-scroll lineage-dag-viewport" role="region" aria-labelledby={captionId} tabIndex={0} @@ -145,6 +151,16 @@ export function LineageDag({ {group.nodes.map((node) => { const kind = node.is_branch_point ? "branch" : node.is_root ? "root" : "node"; const isCurrent = node.id === currentPostId; + // Root/branch/current are otherwise conveyed by stroke color and + // border width alone (see .lineage-dag-root/-branch/[aria-current] + // in App.css) — name them here too so the distinction reaches + // screen readers and colorblind users relying on the tooltip. + const kindLabels = [ + isCurrent ? lineageDagText("Current record") : null, + kind === "branch" ? lineageDagText("Branch point") : null, + kind === "root" ? lineageDagText("Root record") : null, + ].filter((label): label is string => Boolean(label)); + const kindSuffix = kindLabels.length > 0 ? ` (${kindLabels.join(", ")})` : ""; return ( <g key={node.id} @@ -152,7 +168,7 @@ export function LineageDag({ transform={`translate(${node.x}, ${node.y})`} role="button" tabIndex={0} - aria-label={tf("Open post: {label}", { label: node.label })} + aria-label={tf("Open post: {label}", { label: node.label }) + kindSuffix} aria-current={isCurrent ? "true" : undefined} onClick={() => onSelectPost(node.id)} onKeyDown={(event) => { @@ -173,7 +189,7 @@ export function LineageDag({ {tf("{label} — {date}", { label: node.label, date: eventDate(node.occurred_at), - })} + }) + kindSuffix} </title> </g> ); @@ -182,7 +198,8 @@ export function LineageDag({ </div> {group.edges.length > 0 ? ( <> - <p className="lineage-dag-boundary" role="note"> + <p className="lineage-dag-boundary lineage-dag-inference-note" role="note"> + <strong>{t("Inference boundary")}</strong>{" "} {lineageDagText( "Reconstructed edges suggest continuation; they do not prove causality or authoritative fact.", )} diff --git a/frontend/src/PostBody.test.tsx b/frontend/src/PostBody.test.tsx index 1a9b00c4a..758de1310 100644 --- a/frontend/src/PostBody.test.tsx +++ b/frontend/src/PostBody.test.tsx @@ -34,7 +34,7 @@ describe("PostBody", () => { expect(screen.getByText("Root item")).toHaveAttribute("data-indent-level", "0"); }); - it("uses a buyer-facing accessible label instead of a source character offset", () => { + it("uses a reader-facing accessible label instead of a source character offset", () => { render( <PostBody body={'<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=" />'} @@ -174,7 +174,7 @@ describe("PostBody", () => { expect(screen.getByText("Unavailable source unit")).toHaveAttribute("data-indent-level", "0"); }); - it("keeps adjacent source tables as separate buyer-facing tables", () => { + it("keeps adjacent source tables as separate reader-facing tables", () => { render( <PostBody body={ @@ -273,7 +273,7 @@ describe("PostBody", () => { expect(screen.queryByText(/This post is an image/)).not.toBeInTheDocument(); }); - it("renders pipe-delimited image OCR as a buyer-facing table", () => { + it("renders pipe-delimited image OCR as a reader-facing table", () => { render( <PostBody body={'<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=" />'} diff --git a/frontend/src/PostBody.tsx b/frontend/src/PostBody.tsx index 6769d0192..b38d85038 100644 --- a/frontend/src/PostBody.tsx +++ b/frontend/src/PostBody.tsx @@ -50,7 +50,12 @@ function renderImageEvidence( return ( <figure key={`post-body-image-${index}`} className="post-embedded-image"> {sourceImageSrc ? ( - <img src={sourceImageSrc} alt={imageContent?.caption || t("Embedded image")} /> + <img + src={sourceImageSrc} + alt={imageContent?.caption || t("Embedded image")} + loading="lazy" + decoding="async" + /> ) : null} {imageContent?.caption || !sourceImageSrc ? ( <figcaption>{imageContent?.caption || t("Embedded image")}</figcaption> diff --git a/frontend/src/api.ts b/frontend/src/api.ts index f09701fbf..f30941870 100644 --- a/frontend/src/api.ts +++ b/frontend/src/api.ts @@ -536,9 +536,19 @@ export interface CurrentUser { display_name: string; permission_codes: string[]; corporate_entities?: CorporateEntityRef[]; + account_affiliations?: AccountAffiliation[]; preferred_locale?: string | null; } +export interface AccountAffiliation { + corporate_entity_id: string; + corporate_entity_code: string; + entity_name: string; + process_unit_id: string | null; + process_unit_code: string | null; + process_unit_name: string | null; +} + export function fetchMe(accessToken: string): Promise<CurrentUser> { return backendFetch<CurrentUser>("/api/me", accessToken); } diff --git a/frontend/src/components/BuyerNav.tsx b/frontend/src/components/BuyerNav.tsx deleted file mode 100644 index b691bfd9c..000000000 --- a/frontend/src/components/BuyerNav.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import { t } from "../i18n"; -import type { ReactNode } from "react"; - -export type BuyerDestination = "board" | "customers" | "calendar" | "ask" | "admin"; - -export type BuyerNavProps = { - destination: BuyerDestination; - onChange: (destination: BuyerDestination) => void; - tools?: ReactNode; -}; - -const ITEMS: BuyerDestination[] = ["board", "customers", "calendar", "ask", "admin"]; - -const LABELS: Record<BuyerDestination, string> = { - board: "Board", - customers: "Customer master", - calendar: "Calendar", - ask: "Ask Agent", - admin: "Admin", -}; - -export function BuyerNav({ destination, onChange, tools }: BuyerNavProps) { - return ( - <nav className="buyer-gnb" aria-label={t("Buyer navigation")}> - {ITEMS.map((id) => ( - <button - key={id} - type="button" - className="buyer-gnb-item" - aria-current={destination === id ? "page" : undefined} - onClick={() => onChange(id)} - > - {t(LABELS[id])} - </button> - ))} - {tools ? <div className="buyer-gnb-tools">{tools}</div> : null} - </nav> - ); -} diff --git a/frontend/src/components/CitationChip.test.tsx b/frontend/src/components/CitationChip.test.tsx index ff7b948a0..e2ade6d77 100644 --- a/frontend/src/components/CitationChip.test.tsx +++ b/frontend/src/components/CitationChip.test.tsx @@ -4,7 +4,7 @@ import { describe, expect, it, vi } from "vitest"; import { CitationChip } from "./CitationChip"; describe("CitationChip", () => { - it("opens the cited post when the buyer clicks the chip", async () => { + it("opens the cited post when the reader clicks the chip", async () => { const onOpenEvidence = vi.fn(); render( <CitationChip diff --git a/frontend/src/components/PopupCloseButton.test.tsx b/frontend/src/components/PopupCloseButton.test.tsx index b72e0b91d..1beee7a05 100644 --- a/frontend/src/components/PopupCloseButton.test.tsx +++ b/frontend/src/components/PopupCloseButton.test.tsx @@ -4,7 +4,7 @@ import { describe, expect, it, vi } from "vitest"; import { PopupCloseButton } from "./PopupCloseButton"; describe("PopupCloseButton", () => { - it("closes the evidence panel when the buyer clicks close", async () => { + it("closes the evidence panel when the reader clicks close", async () => { const onClose = vi.fn(); render( <PopupCloseButton onClose={onClose} label="Close evidence panel" />, diff --git a/frontend/src/components/PopupCloseButton.tsx b/frontend/src/components/PopupCloseButton.tsx index 129b07297..65c9123c5 100644 --- a/frontend/src/components/PopupCloseButton.tsx +++ b/frontend/src/components/PopupCloseButton.tsx @@ -1,3 +1,5 @@ +import { CloseIcon } from "./icons"; + export type PopupCloseButtonProps = { onClose: () => void; label: string; @@ -16,7 +18,7 @@ export function PopupCloseButton({ onClose, label }: PopupCloseButtonProps) { onClick={onClose} aria-label={label} > - × + <CloseIcon /> </button> ); } diff --git a/frontend/src/components/BuyerNav.test.tsx b/frontend/src/components/WorkspaceNav.test.tsx similarity index 70% rename from frontend/src/components/BuyerNav.test.tsx rename to frontend/src/components/WorkspaceNav.test.tsx index 21c7995fb..168db89ec 100644 --- a/frontend/src/components/BuyerNav.test.tsx +++ b/frontend/src/components/WorkspaceNav.test.tsx @@ -1,12 +1,12 @@ import { fireEvent, render, screen } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; -import { BuyerNav } from "./BuyerNav"; +import { WorkspaceNav } from "./WorkspaceNav"; -describe("BuyerNav", () => { - it("renders the four buyer destinations and marks the current page", () => { - render(<BuyerNav destination="board" onChange={vi.fn()} />); +describe("WorkspaceNav", () => { + it("renders the four workspace destinations and marks the current page", () => { + render(<WorkspaceNav destination="board" onChange={vi.fn()} />); - expect(screen.getByRole("navigation")).toHaveAccessibleName("Buyer navigation"); + expect(screen.getByRole("navigation")).toHaveAccessibleName("Workspace navigation"); expect(screen.getByRole("button", { name: "Board" })).toHaveAttribute("aria-current", "page"); expect(screen.getByRole("button", { name: "Customer master" })).not.toHaveAttribute("aria-current"); expect(screen.getByRole("button", { name: "Calendar" })).toBeInTheDocument(); @@ -15,7 +15,7 @@ describe("BuyerNav", () => { it("reports navigation changes", () => { const onChange = vi.fn(); - render(<BuyerNav destination="board" onChange={onChange} />); + render(<WorkspaceNav destination="board" onChange={onChange} />); fireEvent.click(screen.getByRole("button", { name: "Calendar" })); expect(onChange).toHaveBeenCalledWith("calendar"); diff --git a/frontend/src/components/WorkspaceNav.tsx b/frontend/src/components/WorkspaceNav.tsx new file mode 100644 index 000000000..52a6960ac --- /dev/null +++ b/frontend/src/components/WorkspaceNav.tsx @@ -0,0 +1,42 @@ +import { t } from "../i18n"; + +export type WorkspaceDestination = "board" | "customers" | "calendar" | "ask" | "admin"; + +export type WorkspaceNavProps = { + destination: WorkspaceDestination; + onChange: (destination: WorkspaceDestination) => void; + drawer?: boolean; + id?: string; +}; + +const ITEMS: WorkspaceDestination[] = ["board", "customers", "calendar", "ask", "admin"]; + +const LABELS: Record<WorkspaceDestination, string> = { + board: "Board", + customers: "Customer master", + calendar: "Calendar", + ask: "Ask Agent", + admin: "Admin", +}; + +export function WorkspaceNav({ destination, onChange, drawer = false, id }: WorkspaceNavProps) { + return ( + <nav + id={id} + className={`workspace-gnb${drawer ? " workspace-gnb-drawer" : ""}`} + aria-label={t("Workspace navigation")} + > + {ITEMS.map((id) => ( + <button + key={id} + type="button" + className="workspace-gnb-item" + aria-current={destination === id ? "page" : undefined} + onClick={() => onChange(id)} + > + {t(LABELS[id])} + </button> + ))} + </nav> + ); +} diff --git a/frontend/src/components/icons.tsx b/frontend/src/components/icons.tsx new file mode 100644 index 000000000..8e3ae40dc --- /dev/null +++ b/frontend/src/components/icons.tsx @@ -0,0 +1,63 @@ +/** + * Minimal inline SVG icons, standing in for the raw "☰"/"×" glyphs the + * menu trigger and close buttons used to render. A font glyph's exact + * shape, weight, and baseline vary by OS/browser; an SVG renders + * identically everywhere and inherits the button's own color via + * `currentColor`, matching the UI/UX Standard Guide's SVG-icon rule. + */ + +export function MenuIcon() { + return ( + <svg + width="1.25em" + height="1.25em" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + strokeWidth="2" + strokeLinecap="round" + aria-hidden="true" + > + <line x1="4" y1="6" x2="20" y2="6" /> + <line x1="4" y1="12" x2="20" y2="12" /> + <line x1="4" y1="18" x2="20" y2="18" /> + </svg> + ); +} + +export function CloseIcon() { + return ( + <svg + width="1.25em" + height="1.25em" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + strokeWidth="2" + strokeLinecap="round" + aria-hidden="true" + > + <line x1="5" y1="5" x2="19" y2="19" /> + <line x1="19" y1="5" x2="5" y2="19" /> + </svg> + ); +} + +export function SendIcon() { + return ( + <svg + width="1.1em" + height="1.1em" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + strokeWidth="2" + strokeLinecap="round" + strokeLinejoin="round" + aria-hidden="true" + > + <path d="M3 11.5 21 3l-8.5 18-2.7-7.8L3 11.5Z" /> + <path d="m9.8 13.2 4.8-4.8" /> + </svg> + ); +} diff --git a/frontend/src/i18n.test.ts b/frontend/src/i18n.test.ts index 5a3afbfc3..e867376f6 100644 --- a/frontend/src/i18n.test.ts +++ b/frontend/src/i18n.test.ts @@ -13,7 +13,7 @@ afterEach(() => { }); describe("i18n", () => { - const requiredBuyerLabels = [ + const requiredWorkspaceLabels = [ "Language", "Evidence", "Ask", @@ -33,10 +33,31 @@ describe("i18n", () => { "Calendar", "Board", "Search", + "Site map", + "Conversation", + "Start with a question about the evidence", + "Ask about an event, decision, or source post.", + "You", + "Thinking...", + "Open source", + "Enter to send. Shift+Enter for a new line.", "Page", "Answer", "Showing the first {shown} of {total} posts known at this cutoff.", ] as const; + const eventLineageLabels = [ + "Authorized scope", + "Open navigation", + "Skip to main content", + "Lineage legend", + "Root record", + "Branch point", + "Current record", + "Parent to child", + "Inference boundary", + "Edges explain reconstructed continuation only. They are not causal or authoritative facts.", + "Evidence (fused_score)", + ] as const; it("supports the five product locales", () => { expect(SUPPORTED_LOCALES).toEqual(["en", "ko", "zh", "ja", "vi"]); @@ -44,15 +65,36 @@ describe("i18n", () => { }); it.each(["ko", "zh", "ja", "vi"] as const)( - "translates all shared Buyer labels in %s", + "translates all shared workspace labels in %s", (locale) => { setLocale(locale); - for (const key of requiredBuyerLabels) { + for (const key of requiredWorkspaceLabels) { expect(t(key), `${locale}:${key}`).not.toBe(key); } }, ); + it.each(["ko", "zh", "ja", "vi"] as const)( + "translates Event Lineage and authorization labels in %s", + (locale) => { + setLocale(locale); + for (const key of eventLineageLabels) { + expect(t(key), `${locale}:${key}`).not.toBe(key); + } + }, + ); + + it.each([ + ["ko", "작업공간 메뉴"], + ["zh", "工作区导航"], + ["ja", "ワークスペースナビゲーション"], + ["vi", "Điều hướng không gian làm việc"], + ] as const)("uses workspace terminology for navigation in %s", (locale, expected) => { + setLocale(locale); + expect(t("Workspace navigation")).toBe(expected); + expect(t("Workspace navigation").toLocaleLowerCase()).not.toContain("buyer"); + }); + it.each([ ["ko", "관련 글"], ["zh", "相关文章"], @@ -70,7 +112,7 @@ describe("i18n", () => { ["zh", "DEMO 是事件谱系中的当前记录。接下来查看关键联系人和评估。"], ["ja", "DEMOはイベント系譜の現在の記録です。次にキーパーソンと評価を確認してください。"], ["vi", "DEMO là bản ghi hiện tại trong Dòng sự kiện. Hãy xem người liên hệ chính và đánh giá tiếp theo."], - ] as const)("formats dynamic buyer guidance in %s", (locale, expected) => { + ] as const)("formats dynamic reader guidance in %s", (locale, expected) => { setLocale(locale); expect(tf("{post} is current in Event Lineage. Read Keyman and evaluation next.", { post: "DEMO" })).toBe(expected); }); diff --git a/frontend/src/i18n.ts b/frontend/src/i18n.ts index 650acfca8..8d2a26e88 100644 --- a/frontend/src/i18n.ts +++ b/frontend/src/i18n.ts @@ -136,7 +136,9 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "No posts match the current filters.": "현재 필터에 맞는 글이 없습니다.", "Customer master": "고객 마스터", "Ask Agent": "Ask Agent", - "Buyer navigation": "구매자 메뉴", + "Workspace navigation": "작업공간 메뉴", + "Site map": "사이트맵", + "Authorized scope": "권한 범위", "Authorized customer scope": "권한이 있는 고객 범위", "Customer entities available to this account.": "이 계정에서 사용할 수 있는 고객 엔터티입니다.", "Loading customer master...": "고객 마스터를 불러오는 중...", @@ -159,6 +161,13 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "Authorized customer entity": "권한이 있는 고객 엔터티", "Evidence-grounded questions": "근거 기반 질문", "Questions use authorized posts and their evidence.": "질문은 권한이 있는 글과 그 근거를 사용합니다.", + Conversation: "대화", + "Start with a question about the evidence": "근거에 대한 질문으로 시작하세요", + "Ask about an event, decision, or source post.": "사건·결정·원문 글에 대해 질문하세요.", + You: "나", + "Thinking...": "답변을 준비하는 중...", + "Open source": "원문 열기", + "Enter to send. Shift+Enter for a new line.": "Enter로 전송하고 Shift+Enter로 줄바꿈합니다.", "Ask a question": "질문 입력", Ask: "질의", "Asking...": "질의 중...", @@ -180,7 +189,19 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "Analysis runs": "분석 실행", "Period reports": "기간 리포트", "Event Lineage": "이벤트 계보", + "Lineage evidence": "계보 근거", "Related posts": "관련 글", + "Open navigation": "탐색 메뉴 열기", + "Skip to main content": "본문으로 바로가기", + "Lineage legend": "계보 범례", + "Root record": "루트 기록", + "Branch point": "분기점", + "Current record": "현재 기록", + "Parent to child": "부모에서 자식으로", + "Inference boundary": "추론 경계", + "Edges explain reconstructed continuation only. They are not causal or authoritative facts.": + "연결선은 재구성된 연속성만 설명하며, 인과관계나 권위 있는 사실을 뜻하지 않습니다.", + "Evidence (fused_score)": "근거 (fused_score)", "Related to": "관련 대상:", "Graph relation": "그래프 연결", "Loading related nodes...": "관련 노드를 불러오는 중...", @@ -475,7 +496,8 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "No posts match the current filters.": "没有文章符合当前筛选条件。", "Customer master": "客户主数据", "Ask Agent": "Ask Agent", - "Buyer navigation": "买家导航", + "Workspace navigation": "工作区导航", + "Site map": "站点地图", "Authorized customer scope": "已授权的客户范围", "Customer entities available to this account.": "此账户可用的客户实体。", "Loading customer master...": "正在加载客户主数据...", @@ -497,6 +519,13 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "posts": "篇帖子", "Authorized customer entity": "已授权客户实体", "Evidence-grounded questions": "基于证据的问题", + Conversation: "对话", + "Start with a question about the evidence": "从关于证据的问题开始", + "Ask about an event, decision, or source post.": "询问事件、决策或来源文章。", + You: "你", + "Thinking...": "正在思考...", + "Open source": "打开原文", + "Enter to send. Shift+Enter for a new line.": "按 Enter 发送，Shift+Enter 换行。", "Questions use authorized posts and their evidence.": "问题使用已授权文章及其证据。", "Ask a question": "输入问题", Ask: "提问", @@ -519,6 +548,7 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "Analysis runs": "分析运行", "Period reports": "周期报告", "Event Lineage": "事件谱系", + "Lineage evidence": "谱系证据", "Related posts": "相关文章", "Related to": "相关对象：", "Graph relation": "图谱关联", @@ -694,6 +724,18 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "显示按文章数排序的 {total} 位已观察来源作者中的前 {shown} 位。", "Interactive questions are unavailable right now; saved evidence remains available.": "交互式提问暂不可用；已保存的证据仍可查看。", + "Authorized scope": "授权范围", + "Open navigation": "打开导航菜单", + "Skip to main content": "跳到主要内容", + "Lineage legend": "谱系图例", + "Root record": "根记录", + "Branch point": "分支点", + "Current record": "当前记录", + "Parent to child": "从父级到子级", + "Inference boundary": "推断边界", + "Edges explain reconstructed continuation only. They are not causal or authoritative facts.": + "连接线仅说明重建的连续性，不表示因果关系或权威事实。", + "Evidence (fused_score)": "证据（fused_score）", }, ja: { "Unknown": "不明", @@ -837,7 +879,8 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "No posts match the current filters.": "現在の絞り込みに一致する投稿はありません。", "Customer master": "顧客マスター", "Ask Agent": "Ask Agent", - "Buyer navigation": "購入者ナビゲーション", + "Workspace navigation": "ワークスペースナビゲーション", + "Site map": "サイトマップ", "Authorized customer scope": "許可された顧客範囲", "Customer entities available to this account.": "このアカウントで利用できる顧客エンティティです。", "Loading customer master...": "顧客マスターを読み込んでいます...", @@ -859,6 +902,13 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "posts": "件の投稿", "Authorized customer entity": "許可された顧客エンティティ", "Evidence-grounded questions": "証拠に基づく質問", + Conversation: "会話", + "Start with a question about the evidence": "証拠についての質問から始めましょう", + "Ask about an event, decision, or source post.": "イベント、意思決定、元記事について質問してください。", + You: "あなた", + "Thinking...": "考え中...", + "Open source": "元記事を開く", + "Enter to send. Shift+Enter for a new line.": "Enterで送信、Shift+Enterで改行します。", "Questions use authorized posts and their evidence.": "質問には許可された投稿とその証拠を使用します。", "Ask a question": "質問を入力", Ask: "質問する", @@ -881,6 +931,7 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "Analysis runs": "分析実行", "Period reports": "期間レポート", "Event Lineage": "イベント系譜", + "Lineage evidence": "系譜の証拠", "Related posts": "関連する投稿", "Related to": "関連対象：", "Graph relation": "グラフ関連", @@ -1032,6 +1083,18 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "投稿数順に、観測された{total}名の元投稿者のうち上位{shown}名を表示しています。", "Interactive questions are unavailable right now; saved evidence remains available.": "対話形式の質問は現在利用できません。保存された証拠は確認できます。", + "Authorized scope": "権限範囲", + "Open navigation": "ナビゲーションを開く", + "Skip to main content": "メインコンテンツへスキップ", + "Lineage legend": "系譜の凡例", + "Root record": "ルート記録", + "Branch point": "分岐点", + "Current record": "現在の記録", + "Parent to child": "親から子へ", + "Inference boundary": "推論境界", + "Edges explain reconstructed continuation only. They are not causal or authoritative facts.": + "接続線は再構築された連続性のみを示し、因果関係や権威ある事実を示すものではありません。", + "Evidence (fused_score)": "証拠（fused_score）", }, vi: { "Unknown": "Không rõ", @@ -1175,7 +1238,8 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "No posts match the current filters.": "Không có bài viết nào khớp với bộ lọc hiện tại.", "Customer master": "Danh mục khách hàng", "Ask Agent": "Ask Agent", - "Buyer navigation": "Điều hướng người mua", + "Workspace navigation": "Điều hướng không gian làm việc", + "Site map": "Sơ đồ trang", "Authorized customer scope": "Phạm vi khách hàng được cấp quyền", "Customer entities available to this account.": "Các thực thể khách hàng mà tài khoản này được phép sử dụng.", "Loading customer master...": "Đang tải danh mục khách hàng...", @@ -1197,6 +1261,13 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "posts": "bài viết", "Authorized customer entity": "Thực thể khách hàng được cấp quyền", "Evidence-grounded questions": "Câu hỏi dựa trên bằng chứng", + Conversation: "Cuộc trò chuyện", + "Start with a question about the evidence": "Bắt đầu bằng một câu hỏi về bằng chứng", + "Ask about an event, decision, or source post.": "Hỏi về sự kiện, quyết định hoặc bài viết nguồn.", + You: "Bạn", + "Thinking...": "Đang suy nghĩ...", + "Open source": "Mở nguồn", + "Enter to send. Shift+Enter for a new line.": "Nhấn Enter để gửi, Shift+Enter để xuống dòng.", "Questions use authorized posts and their evidence.": "Câu hỏi sử dụng các bài viết được cấp quyền và bằng chứng của chúng.", "Ask a question": "Nhập câu hỏi", Ask: "Hỏi", @@ -1219,6 +1290,7 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "Analysis runs": "Lần chạy phân tích", "Period reports": "Báo cáo theo kỳ", "Event Lineage": "Dòng sự kiện", + "Lineage evidence": "Bằng chứng dòng sự kiện", "Related posts": "Bài viết liên quan", "Related to": "Liên quan đến:", "Graph relation": "Liên kết đồ thị", @@ -1370,6 +1442,18 @@ const TRANSLATIONS: Partial<Record<Locale, Record<string, string>>> = { "Đang hiển thị {shown} tác giả nguồn hàng đầu trong số {total} tác giả đã quan sát, xếp theo số bài viết.", "Interactive questions are unavailable right now; saved evidence remains available.": "Câu hỏi tương tác hiện không khả dụng; bằng chứng đã lưu vẫn có thể xem.", + "Authorized scope": "Phạm vi được cấp quyền", + "Open navigation": "Mở menu điều hướng", + "Skip to main content": "Bỏ qua để đến nội dung chính", + "Lineage legend": "Chú giải dòng sự kiện", + "Root record": "Bản ghi gốc", + "Branch point": "Điểm phân nhánh", + "Current record": "Bản ghi hiện tại", + "Parent to child": "Từ nút cha đến nút con", + "Inference boundary": "Ranh giới suy luận", + "Edges explain reconstructed continuation only. They are not causal or authoritative facts.": + "Các đường nối chỉ giải thích tính liên tục được tái dựng; chúng không phải là quan hệ nhân quả hay sự thật có thẩm quyền.", + "Evidence (fused_score)": "Bằng chứng (fused_score)", }, }; diff --git a/frontend/src/index.css b/frontend/src/index.css index d4c7db546..37fc57d22 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -4,8 +4,8 @@ --text: var(--color-text); --text-h: var(--color-text-heading); --text-muted: var(--color-text); - --bg: var(--color-background); - --surface: var(--color-background); + --bg: #f5f7fb; + --surface: var(--color-palette-white); --surface-muted: var(--color-palette-gray-100); --border: var(--color-border); --code-bg: var(--color-code-background); @@ -140,12 +140,16 @@ code { background: var(--code-bg); } -/* Base Form & Input Standards (§3.1.4) */ +/* Base Form & Input Standards (§3.1.4) + font-size floors at 16px regardless of the responsive body scale above: + a focused control under 16px makes iOS Safari zoom the whole viewport, + which has nothing to do with the body-text density this app is tuned + for elsewhere. */ input, select, textarea { font-family: inherit; - font-size: inherit; + font-size: max(16px, 1em); box-sizing: border-box; } @@ -202,3 +206,17 @@ td.align-center { font-variant-numeric: tabular-nums; text-align: right; } + +/* Respect a reduced-motion preference: near-instant instead of fully + removed, so state changes (e.g. the skip link, the evidence-panel + slide-in) are still perceptible, just without the motion itself. */ +@media (prefers-reduced-motion: reduce) { + *, + *::before, + *::after { + animation-duration: 0.01ms !important; + animation-iteration-count: 1 !important; + transition-duration: 0.01ms !important; + scroll-behavior: auto !important; + } +} diff --git a/frontend/src/mobileHeaderCss.test.ts b/frontend/src/mobileHeaderCss.test.ts new file mode 100644 index 000000000..4b957acda --- /dev/null +++ b/frontend/src/mobileHeaderCss.test.ts @@ -0,0 +1,22 @@ +/// <reference types="node" /> +import { readFileSync } from "node:fs"; +import { dirname, join } from "node:path"; +import { fileURLToPath } from "node:url"; +import { describe, expect, it } from "vitest"; + +const here = dirname(fileURLToPath(import.meta.url)); +const appCss = readFileSync(join(here, "App.css"), "utf-8"); +const phoneMedia = appCss.split("@media (max-width: 768px)")[1] ?? ""; + +describe("mobile header CSS contract", () => { + it("keeps one phone app-header rule with vertical padding", () => { + expect(phoneMedia.match(/\.app-header\s*\{/g)).toHaveLength(1); + expect(phoneMedia).toContain("padding: 0.6rem 1rem;"); + expect(phoneMedia).not.toContain("padding: 0 1rem;"); + }); + + it("leaves navigation to the phone drawer instead of duplicating the site map", () => { + expect(appCss).toContain(".site-map-menu .workspace-gnb"); + expect(phoneMedia).toMatch(/\.site-map-utility\s*\{\s*display: none;/); + }); +}); diff --git a/frontend/src/popupLayoutCss.test.ts b/frontend/src/popupLayoutCss.test.ts new file mode 100644 index 000000000..c300b395e --- /dev/null +++ b/frontend/src/popupLayoutCss.test.ts @@ -0,0 +1,16 @@ +/// <reference types="node" /> +import { readFileSync } from "node:fs"; +import { dirname, join } from "node:path"; +import { fileURLToPath } from "node:url"; +import { describe, expect, it } from "vitest"; + +const here = dirname(fileURLToPath(import.meta.url)); +const css = readFileSync(join(here, "App.css"), "utf-8"); + +describe("popup layout CSS contract", () => { + it("widens the popup for desktop evidence grids and keeps the secondary grid responsive", () => { + expect(css).toContain("width: min(85%, 1180px);"); + expect(css).toContain(".popup-secondary-grid"); + expect(css).toContain(".popup-secondary-grid > .popup-section:only-child"); + }); +}); diff --git a/frontend/src/postBodyDisplay.test.ts b/frontend/src/postBodyDisplay.test.ts index 07ca9514d..ff51c8562 100644 --- a/frontend/src/postBodyDisplay.test.ts +++ b/frontend/src/postBodyDisplay.test.ts @@ -67,6 +67,12 @@ describe("splitPostBody", () => { ]); }); + it("preserves explicit metric superscripts and subscripts", () => { + expect(splitPostBody("<p>Volume: 5m<sup>3</sup>, index m<sub>3</sub>.</p>")).toEqual([ + { kind: "text", text: "Volume: 5m³, index m₃." }, + ]); + }); + it("keeps comparison operators that look like broken HTML", () => { expect(splitPostBody("qty < 50 and price > 10")).toEqual([ { kind: "text", text: "qty < 50 and price > 10" }, diff --git a/frontend/src/postBodyDisplay.ts b/frontend/src/postBodyDisplay.ts index 919e8c0ca..6fc12303c 100644 --- a/frontend/src/postBodyDisplay.ts +++ b/frontend/src/postBodyDisplay.ts @@ -1,7 +1,7 @@ /** * Split a raw `post_body` into text and in-place data-URI images. * - * The popup used to dump the source string, so a buyer who opened a post + * The popup used to dump the source string, so a reader who opened a post * with an embedded invoice saw a base64 wall instead of the picture. * Only `data:image/...;base64,...` payloads are turned into images — * remote `http(s)` img tags are stripped, never fetched. @@ -24,6 +24,20 @@ const FOOTNOTE_START = /^\s*[*†‡](?=\S)/; const INDENT_MARKER = "\u0001lw-indent:"; const INDENT_MARKER_END = "\u0002"; const INDENT_MARKER_PATTERN = /lw-indent:(\d+)/g; +const SUPERSCRIPT_DIGITS = "⁰¹²³⁴⁵⁶⁷⁸⁹"; +const SUBSCRIPT_DIGITS = "₀₁₂₃₄₅₆₇₈₉"; +const METRIC_MARKUP = + /((?<![A-Za-z])(?:\d+(?:\.\d+)?\s*)?(?:km|cm|mm|kg|m))\s*<(sup|sub)\b[^>]*>\s*(\d{1,3})\s*<\/\2>/gi; + +function normalizeMetricMarkup(raw: string): string { + return raw.replace( + METRIC_MARKUP, + (_match, base: string, kind: string, digits: string) => { + const table = kind.toLowerCase() === "sup" ? SUPERSCRIPT_DIGITS : SUBSCRIPT_DIGITS; + return `${base}${[...digits].map((digit) => table[Number(digit)]).join("")}`; + }, + ); +} function stripIndentMarkers(value: string): string { return value @@ -90,7 +104,7 @@ function indentMarker(width: number): string { } function stripHtmlTags(text: string): string { - text = text.replace(/<sup[^>]*>(.*?)<\/sup>/gi, "^$1"); + text = normalizeMetricMarkup(text).replace(/<sup[^>]*>(.*?)<\/sup>/gi, "^$1"); const withBoundaries = text .replace(BREAK_TAG, "\n") .replace(BLOCK_TAG, (tag) => { diff --git a/frontend/src/styles/tokens.css b/frontend/src/styles/tokens.css index d9e08bd18..2ace5113e 100644 --- a/frontend/src/styles/tokens.css +++ b/frontend/src/styles/tokens.css @@ -84,7 +84,7 @@ --space-chip-gap: 0.3rem; --space-close-inset: 0.75rem; --space-control-gap: 0.35rem; - --size-control-min: 24px; + --size-control-min: 44px; /* WCAG 2.5.5 minimum touch target */ --radius-chip: 999px; --radius-control: 6px; --font-size-close: 1.5rem; @@ -116,6 +116,7 @@ --z-modal-backdrop: 300; --z-modal: 310; --z-evidence-panel: 250; + --z-skip-link: 400; /* Required Field Indicator */ --color-required: #b91c1c; diff --git a/lineageweave/affiliate_tree.py b/lineageweave/affiliate_tree.py index 2f3dcdeb6..15859f591 100644 --- a/lineageweave/affiliate_tree.py +++ b/lineageweave/affiliate_tree.py @@ -3,7 +3,7 @@ The product popup's Affiliate Tree is the ancestor forest of every organization a post's Keymen are affiliated with -- not the full ``corporate_entity`` table. A sibling the post never mentions is omitted -so the buyer sees only the hierarchy that this record actually touches. +so the reader sees only the hierarchy that this record actually touches. Unresolved affiliation names (no ``corporate_entity_id``) stay as their own roots. Inventing a parent for "Northridge Grid" would be a guessed diff --git a/lineageweave/caldav_client.py b/lineageweave/caldav_client.py index b3bc9cffd..cd8ef9bce 100644 --- a/lineageweave/caldav_client.py +++ b/lineageweave/caldav_client.py @@ -1,4 +1,4 @@ -"""Small independent CalDAV event-consumption port for the buyer calendar.""" +"""Small independent CalDAV event-consumption port for the reader calendar.""" from __future__ import annotations diff --git a/lineageweave/chunking.py b/lineageweave/chunking.py index 6d1b7ccbc..61b5f28cd 100644 --- a/lineageweave/chunking.py +++ b/lineageweave/chunking.py @@ -294,6 +294,27 @@ def chunk_by_paragraph(text: str) -> list[Chunk]: _SENTENCE_BOUNDARY = re.compile(r"(?<=[.!?])\s+(?=[A-Z0-9가-힣])") +_SUPERSCRIPT_DIGITS = str.maketrans("0123456789", "⁰¹²³⁴⁵⁶⁷⁸⁹") +_SUBSCRIPT_DIGITS = str.maketrans("0123456789", "₀₁₂₃₄₅₆₇₈₉") +_METRIC_MARKUP = re.compile( + r"(?P<base>(?<![A-Za-z])(?:\d+(?:\.\d+)?\s*)?(?:km|cm|mm|kg|m))\s*" + r"<(?P<kind>sup|sub)\b[^>]*>\s*(?P<digits>\d{1,3})\s*</(?P=kind)>", + re.IGNORECASE, +) + + +def _normalize_metric_markup(html: str) -> str: + """Keep explicit metric superscript/subscript digits in semantic text.""" + + def replace(match: re.Match[str]) -> str: + table = ( + _SUPERSCRIPT_DIGITS + if match.group("kind").lower() == "sup" + else _SUBSCRIPT_DIGITS + ) + return f"{match.group('base')}{match.group('digits').translate(table)}" + + return _METRIC_MARKUP.sub(replace, html) def chunk_by_sentence(text: str) -> list[Chunk]: @@ -569,7 +590,7 @@ def chunk_by_dom(html: str) -> list[Chunk]: to the surrounding text chunks. """ parser = _BlockTextExtractor() - parser.feed(html) + parser.feed(_normalize_metric_markup(html)) entries = parser.finished() chunks: list[Chunk] = [] for index, ( diff --git a/lineageweave/ontology.py b/lineageweave/ontology.py index f7edf76e6..13e488267 100644 --- a/lineageweave/ontology.py +++ b/lineageweave/ontology.py @@ -64,8 +64,8 @@ def iri_for_lookup_code(lookup_code: str) -> str | None: """The ontology term IRI whose `:lookupCode` annotation equals `lookup_code`, or `None` if no term declares that code -- e.g. a `common_lookup_value` category this ontology doesn't cover yet - (`ticket_status`, `post_visibility`), which is a real, expected gap, - not a bug. + (for example a future `analysis_run_kind` value) which is not yet part + of the published ontology profile. """ subject = _term_subject(lookup_code) return str(subject) if subject is not None else None @@ -82,7 +82,7 @@ def ontology_annotations(lookup_code: str) -> dict[str, str]: if subject is None: return {} fields = {"ontology_iri": str(subject)} - label = ONTOLOGY.value(subject, RDFS.label) + label = ONTOLOGY.value(subject, RDFS.label) or ONTOLOGY.value(subject, SKOS.prefLabel) if label is not None: fields["ontology_label"] = str(label) return fields diff --git a/lineageweave/post_chat.py b/lineageweave/post_chat.py index 4041fe165..295e01467 100644 --- a/lineageweave/post_chat.py +++ b/lineageweave/post_chat.py @@ -93,7 +93,7 @@ def cited_post_summaries( ] -def _buyer_evidence_kind(fact: str) -> str: +def _cited_evidence_kind(fact: str) -> str: if fact.startswith("project:"): return "semantic_project" if fact.startswith("actor:"): @@ -103,7 +103,7 @@ def _buyer_evidence_kind(fact: str) -> str: return "source_field" -def _buyer_evidence_text(fact: str) -> str: +def _cited_evidence_text(fact: str) -> str: cleaned = re.sub(r"\s*\|\s*(?:ontology_iri|extraction_method|confidence):\s*[^|\[]+", "", fact) cleaned = re.sub(r"\s*\[provenance=[^]]+\]", "", cleaned) return " ".join(cleaned.split()) @@ -113,10 +113,10 @@ def cited_post_evidence( sources: list[ChatSourceDocument] | tuple[ChatSourceDocument, ...], cited_post_ids: tuple[str, ...] | list[str], ) -> list[dict[str, object]]: - """Return buyer-safe persisted evidence for cited posts. + """Return reader-safe persisted evidence for cited posts. Provider names, ontology IRIs, and storage provenance are prompt metadata, - not Buyer UI content. The evidence value itself remains visible so the + not reader-facing UI content. The evidence value itself remains visible so the cited post can be opened and checked against its full body. """ by_id = {source.post_id: source for source in sources} @@ -128,11 +128,11 @@ def cited_post_evidence( facts: list[dict[str, str]] = [] seen: set[str] = set() for fact in source.evidence_facts: - text = _buyer_evidence_text(fact) + text = _cited_evidence_text(fact) if not text or text in seen: continue seen.add(text) - facts.append({"kind": _buyer_evidence_kind(fact), "text": text}) + facts.append({"kind": _cited_evidence_kind(fact), "text": text}) result.append({"post_id": post_id, "facts": facts}) return result diff --git a/lineageweave/post_content_persistence.py b/lineageweave/post_content_persistence.py index 86dcfd4de..32caa944b 100644 --- a/lineageweave/post_content_persistence.py +++ b/lineageweave/post_content_persistence.py @@ -250,7 +250,7 @@ async def persist_post_content( """ insert into post_content_unit_structure (post_content_unit_id, indent_level, decision_source_code, - confidence, evidence_text) + structure_confidence, evidence_text) values ($1, $2, $3, $4, $5) """, unit_id, @@ -267,7 +267,7 @@ async def persist_post_content( """ insert into post_content_image (post_content_unit_id, mime_type, content_sha256, byte_length, - description_status_code, extracted_text, caption) + description_status_code, extracted_text, image_caption) values ($1, $2, $3, $4, $5, $6, $7) returning post_content_image_id """, @@ -291,7 +291,7 @@ async def persist_post_content( insert into post_content_image_region (post_content_image_id, region_index, x_ratio, y_ratio, width_ratio, height_ratio, description_status_code, - extracted_text, caption) + extracted_text, image_caption) values ($1, $2, $3, $4, $5, $6, $7, $8, $9) returning post_content_image_region_id """, diff --git a/lineageweave/rankweave_client.py b/lineageweave/rankweave_client.py index 1e5f77eb2..becd5731b 100644 --- a/lineageweave/rankweave_client.py +++ b/lineageweave/rankweave_client.py @@ -4,7 +4,7 @@ library, not an HTTP service. Reconstruction already calls ``weighted_convex_fuse`` inside ``reconstruct.py``; this module is the only LineageWeave port that may call ``weighted_reciprocal_rank_fuse`` -for the buyer-facing Rankings surface. It never invents a fused score, +for the reader-facing Rankings surface. It never invents a fused score, a theta, or a hidden post. The default transport raises :class:`RankWeaveNotAvailable` so a @@ -278,7 +278,7 @@ def as_api_payload( can_see_post: Callable[[Mapping[str, Any]], bool], query: str = DEFAULT_RANKING_QUERY, ) -> dict[str, Any]: - """Buyer-visible ranking status. Never invents a fused score.""" + """Reader-visible ranking status. Never invents a fused score.""" channels = ranking_channels_from_rows(posts, can_see_post, query=query) titles_by_id = { post_id: str(row.get("post_title") or "").strip() diff --git a/lineageweave/source_artifacts.py b/lineageweave/source_artifacts.py new file mode 100644 index 000000000..572dd5e05 --- /dev/null +++ b/lineageweave/source_artifacts.py @@ -0,0 +1,59 @@ +"""Resolve an explicitly mapped MHTML artifact into its HTML source body.""" + +from __future__ import annotations + +import hashlib +import re +from email import policy +from email.parser import BytesParser +from pathlib import Path + + +class SourceArtifactError(ValueError): + """Raised when an artifact cannot be proven to be the mapped source body.""" + + +_SHA256 = re.compile(r"^[0-9a-f]{64}$", re.IGNORECASE) + + +def _artifact_path(root: Path, source_path: str) -> Path: + """Resolve a source path and reject traversal or symlink escape.""" + if not source_path.strip(): + raise SourceArtifactError("source artifact path is empty") + root_path = root.expanduser().resolve() + candidate = Path(source_path).expanduser() + if not candidate.is_absolute(): + candidate = root_path / candidate + try: + resolved = candidate.resolve(strict=True) + resolved.relative_to(root_path) + except (FileNotFoundError, OSError, ValueError) as exc: + raise SourceArtifactError("source artifact path is missing or outside the artifact root") from exc + if not resolved.is_file(): + raise SourceArtifactError("source artifact is not a regular file") + return resolved + + +def read_mhtml_html(root: Path, source_path: str, expected_sha256: str) -> str: + """Read the first leaf HTML part from a hash-verified RFC 2557 artifact.""" + digest = expected_sha256.strip().lower() + if not _SHA256.fullmatch(digest): + raise SourceArtifactError("source artifact SHA-256 must be 64 hexadecimal characters") + artifact = _artifact_path(root, source_path) + payload = artifact.read_bytes() + if hashlib.sha256(payload).hexdigest() != digest: + raise SourceArtifactError("source artifact SHA-256 does not match the source row") + + message = BytesParser(policy=policy.default).parsebytes(payload) + if not message.is_multipart() or message.get_content_subtype().casefold() != "related": + raise SourceArtifactError("source artifact is not a multipart/related MHTML message") + for part in message.walk(): + if part.is_multipart() or part.get_content_type().casefold() != "text/html": + continue + body = part.get_content() + if isinstance(body, bytes): + charset = part.get_content_charset() or "utf-8" + body = body.decode(charset, errors="strict") + if isinstance(body, str) and body.strip(): + return body + raise SourceArtifactError("source artifact contains no non-empty text/html root part") diff --git a/lineageweave/voc_evidence.py b/lineageweave/voc_evidence.py index de50e11be..d993ce74b 100644 --- a/lineageweave/voc_evidence.py +++ b/lineageweave/voc_evidence.py @@ -1,7 +1,7 @@ """Extractive VOC evidence: the sentences that actually name an org. A post's ``voc_type_code`` is a closed lookup (Voice of Customer / Market -/ ...). The buyer-felt evidence for that label is not a second LLM +/ ...). The reader-felt evidence for that label is not a second LLM guess -- it is the span in the post that mentions a classified counterparty or a Keyman's affiliated organization (ACE mention extent; Doddington et al., 2004). A name that never appears yields no excerpt: diff --git a/migrations/0018_analysis_run_registry.sql b/migrations/0018_analysis_run_registry.sql index b08d80b3b..04cba8ece 100644 --- a/migrations/0018_analysis_run_registry.sql +++ b/migrations/0018_analysis_run_registry.sql @@ -549,21 +549,38 @@ create trigger analysis_run_status_transition_guard before insert on analysis_run_status_event for each row execute function enforce_analysis_run_status_transition(); -create or replace view analysis_run_current_status as -select distinct on (status_event.analysis_run_id) - status_event.analysis_run_id, - status_event.status_code, - status_event.status_ordinal, - status_event.occurred_at, - status_event.recorded_at, - status_event.failure_code, - status_event.retryable - from analysis_run_status_event as status_event - order by status_event.analysis_run_id, - status_event.status_ordinal desc; - -comment on view analysis_run_current_status is - 'Latest append-only status projection for each run; never a second mutable ' - 'lifecycle authority.'; +do $$ +declare + retryable_column text; +begin + if exists ( + select 1 + from information_schema.columns + where table_schema = 'public' + and table_name = 'analysis_run_status_event' + and column_name = 'is_retryable' + ) then + retryable_column := 'status_event.is_retryable'; + else + retryable_column := 'status_event.retryable'; + end if; + execute format($view$ + create or replace view analysis_run_current_status as + select distinct on (status_event.analysis_run_id) + status_event.analysis_run_id, + status_event.status_code, + status_event.status_ordinal, + status_event.occurred_at, + status_event.recorded_at, + status_event.failure_code, + %s + from analysis_run_status_event as status_event + order by status_event.analysis_run_id, + status_event.status_ordinal desc + $view$, retryable_column); + comment on view analysis_run_current_status is + 'Latest append-only status projection for each run; never a second mutable lifecycle authority.'; +end +$$; commit; diff --git a/migrations/0031_semantic_project_mentions.sql b/migrations/0031_semantic_project_mentions.sql index 961bb486e..392be793f 100644 --- a/migrations/0031_semantic_project_mentions.sql +++ b/migrations/0031_semantic_project_mentions.sql @@ -13,5 +13,25 @@ create table if not exists post_project_mention ( primary key (post_id, project_key) ); -create index if not exists post_project_mention_key_idx - on post_project_mention (project_key, confidence desc); +do $$ +declare + confidence_column text; +begin + if exists ( + select 1 + from information_schema.columns + where table_schema = 'public' + and table_name = 'post_project_mention' + and column_name = 'mention_confidence' + ) then + confidence_column := 'mention_confidence'; + else + confidence_column := 'confidence'; + end if; + execute format( + 'create index if not exists post_project_mention_key_idx ' + 'on post_project_mention (project_key, %s desc)', + confidence_column + ); +end +$$; diff --git a/migrations/0035_body_search_prefix.sql b/migrations/0035_body_search_prefix.sql index cc0114ec3..e23299260 100644 --- a/migrations/0035_body_search_prefix.sql +++ b/migrations/0035_body_search_prefix.sql @@ -1,5 +1,7 @@ -- Keep body search indexed without duplicating the full, potentially very large -- source body. The detail endpoint still returns the complete post_body. +set client_min_messages = warning; + create extension if not exists pg_trgm; create index concurrently if not exists source_post_body_prefix_trgm_idx @@ -9,5 +11,5 @@ create index concurrently if not exists source_post_body_prefix_trgm_idx create index concurrently if not exists source_post_body_fts_idx on source_post using gin ( - to_tsvector('simple', coalesce(post_body, '')) + to_tsvector('simple', left(coalesce(post_body, ''), 16384)) ); diff --git a/migrations/0036_normalized_body_search.sql b/migrations/0036_normalized_body_search.sql index 164fb8a10..e7539daf9 100644 --- a/migrations/0036_normalized_body_search.sql +++ b/migrations/0036_normalized_body_search.sql @@ -1,16 +1,21 @@ -- Search rendered post text, never arbitrary bytes inside an embedded image. +set client_min_messages = warning; + create or replace function source_post_search_text(body text) returns text language sql immutable parallel safe as $$ - select regexp_replace( + select left( regexp_replace( - regexp_replace(coalesce(body, ''), '<img[^>]*>', ' ', 'gi'), - '<[^>]+>', ' ', 'g' + regexp_replace( + regexp_replace(coalesce(body, ''), '<img[^>]*>', ' ', 'gi'), + '<[^>]+>', ' ', 'g' + ), + '\s+', ' ', 'g' ), - '\s+', ' ', 'g' + 16384 ) $$; diff --git a/migrations/0043_bookmark.sql b/migrations/0043_bookmark.sql index e26dc1166..da2a14845 100644 --- a/migrations/0043_bookmark.sql +++ b/migrations/0043_bookmark.sql @@ -1,10 +1,20 @@ -- ADR 0063: a bookmark is an independently identifiable entity in 3NF. -create table if not exists bookmark ( - bookmark_id uuid primary key default gen_random_uuid(), - user_account_id uuid not null references user_account(user_account_id) on delete cascade, - post_id uuid not null references source_post(post_id) on delete cascade, - created_at timestamptz not null default now(), - unique (user_account_id, post_id) -); - -create index if not exists bookmark_post_idx on bookmark (post_id); +-- Keep replay from recreating the legacy relation after ADR 0120 renames it. +do $$ +begin + if to_regclass('public.post_bookmark') is null then + execute $table$ + create table if not exists bookmark ( + bookmark_id uuid primary key default gen_random_uuid(), + user_account_id uuid not null references user_account(user_account_id) on delete cascade, + post_id uuid not null references source_post(post_id) on delete cascade, + created_at timestamptz not null default now(), + unique (user_account_id, post_id) + ) + $table$; + execute $index$ + create index if not exists bookmark_post_idx on bookmark (post_id) + $index$; + end if; +end +$$; diff --git a/migrations/0044_member_locale_preference.sql b/migrations/0044_member_locale_preference.sql index 30bb50b3c..949acd2d4 100644 --- a/migrations/0044_member_locale_preference.sql +++ b/migrations/0044_member_locale_preference.sql @@ -1,4 +1,4 @@ --- ADR 0069: persist the member's Buyer locale on the member account. +-- ADR 0069: persist the member's workspace locale on the member account. alter table user_account add column if not exists preferred_locale text; diff --git a/migrations/0103_tenant_settings.sql b/migrations/0103_tenant_settings.sql index 9470ebe9a..74b07bc58 100644 --- a/migrations/0103_tenant_settings.sql +++ b/migrations/0103_tenant_settings.sql @@ -1,6 +1,28 @@ -CREATE TABLE tenant_settings ( +CREATE TABLE IF NOT EXISTS tenant_settings ( id int PRIMARY KEY CHECK (id = 1), brand_name text NOT NULL DEFAULT 'LineageWeave', updated_at timestamptz NOT NULL DEFAULT now() ); -INSERT INTO tenant_settings (id, brand_name) VALUES (1, 'LineageWeave'); +DO $$ +BEGIN + IF EXISTS ( + SELECT 1 + FROM information_schema.columns + WHERE table_schema = 'public' + AND table_name = 'tenant_settings' + AND column_name = 'tenant_settings_id' + ) THEN + EXECUTE $seed$ + INSERT INTO tenant_settings (tenant_settings_id, brand_name) + VALUES (1, 'LineageWeave') + ON CONFLICT (tenant_settings_id) DO NOTHING + $seed$; + ELSE + EXECUTE $seed$ + INSERT INTO tenant_settings (id, brand_name) + VALUES (1, 'LineageWeave') + ON CONFLICT (id) DO NOTHING + $seed$; + END IF; +END +$$; diff --git a/migrations/0104_two_word_database_identifiers.sql b/migrations/0104_two_word_database_identifiers.sql new file mode 100644 index 000000000..8f40f196c --- /dev/null +++ b/migrations/0104_two_word_database_identifiers.sql @@ -0,0 +1,168 @@ +-- ADR 0120: canonicalize legacy single-token persistent identifiers. +begin; + +drop view if exists analysis_run_current_status; + +do $$ +begin + if to_regclass('public.bookmark') is not null + and to_regclass('public.post_bookmark') is null then + alter table public.bookmark rename to post_bookmark; + end if; +end +$$; + +alter index if exists public.bookmark_post_idx rename to post_bookmark_post_idx; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'analysis_run_status_event' + and column_name = 'retryable' + ) then + alter table public.analysis_run_status_event + rename column retryable to is_retryable; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_content_image' + and column_name = 'caption' + ) then + alter table public.post_content_image + rename column caption to image_caption; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_content_image_region' + and column_name = 'caption' + ) then + alter table public.post_content_image_region + rename column caption to image_caption; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_content_unit_structure' + and column_name = 'confidence' + ) then + alter table public.post_content_unit_structure + rename column confidence to structure_confidence; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_project_mention' + and column_name = 'confidence' + ) then + alter table public.post_project_mention + rename column confidence to mention_confidence; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_summary_role' + and column_name = 'responsibility' + ) then + alter table public.post_summary_role + rename column responsibility to responsibility_text; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'report_item_information' + and column_name = 'information' + ) then + alter table public.report_item_information + rename column information to information_value; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'report_item_parameter' + and column_name = 'slope' + ) then + alter table public.report_item_parameter + rename column slope to item_slope; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'tenant_settings' + and column_name = 'id' + ) then + alter table public.tenant_settings + rename column id to tenant_settings_id; + end if; +end +$$; + +do $$ +begin + if to_regclass('public.analysis_run_status_event') is not null then + execute $view$ + create view analysis_run_current_status as + select distinct on (status_event.analysis_run_id) + status_event.analysis_run_id, + status_event.status_code, + status_event.status_ordinal, + status_event.occurred_at, + status_event.recorded_at, + status_event.failure_code, + status_event.is_retryable + from analysis_run_status_event as status_event + order by status_event.analysis_run_id, + status_event.status_ordinal desc + $view$; + execute $comment$ + comment on view analysis_run_current_status is + 'Latest append-only status projection for each run; never a second mutable lifecycle authority.' + $comment$; + end if; +end +$$; + +commit; diff --git a/migrations/rollback/0104_two_word_database_identifiers.sql b/migrations/rollback/0104_two_word_database_identifiers.sql new file mode 100644 index 000000000..00d4abd27 --- /dev/null +++ b/migrations/rollback/0104_two_word_database_identifiers.sql @@ -0,0 +1,167 @@ +begin; + +drop view if exists analysis_run_current_status; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'tenant_settings' + and column_name = 'tenant_settings_id' + ) then + alter table public.tenant_settings + rename column tenant_settings_id to id; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'report_item_parameter' + and column_name = 'item_slope' + ) then + alter table public.report_item_parameter + rename column item_slope to slope; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'report_item_information' + and column_name = 'information_value' + ) then + alter table public.report_item_information + rename column information_value to information; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_summary_role' + and column_name = 'responsibility_text' + ) then + alter table public.post_summary_role + rename column responsibility_text to responsibility; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_project_mention' + and column_name = 'mention_confidence' + ) then + alter table public.post_project_mention + rename column mention_confidence to confidence; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_content_unit_structure' + and column_name = 'structure_confidence' + ) then + alter table public.post_content_unit_structure + rename column structure_confidence to confidence; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_content_image_region' + and column_name = 'image_caption' + ) then + alter table public.post_content_image_region + rename column image_caption to caption; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'post_content_image' + and column_name = 'image_caption' + ) then + alter table public.post_content_image + rename column image_caption to caption; + end if; +end +$$; + +do $$ +begin + if exists ( + select 1 from information_schema.columns + where table_schema = 'public' + and table_name = 'analysis_run_status_event' + and column_name = 'is_retryable' + ) then + alter table public.analysis_run_status_event + rename column is_retryable to retryable; + end if; +end +$$; + +do $$ +begin + if to_regclass('public.post_bookmark') is not null + and to_regclass('public.bookmark') is null then + alter table public.post_bookmark rename to bookmark; + end if; +end +$$; + +alter index if exists public.post_bookmark_post_idx rename to bookmark_post_idx; + +do $$ +begin + if to_regclass('public.analysis_run_status_event') is not null then + execute $view$ + create view analysis_run_current_status as + select distinct on (status_event.analysis_run_id) + status_event.analysis_run_id, + status_event.status_code, + status_event.status_ordinal, + status_event.occurred_at, + status_event.recorded_at, + status_event.failure_code, + status_event.retryable + from analysis_run_status_event as status_event + order by status_event.analysis_run_id, + status_event.status_ordinal desc + $view$; + execute $comment$ + comment on view analysis_run_current_status is + 'Latest append-only status projection for each run; never a second mutable lifecycle authority.' + $comment$; + end if; +end +$$; + +commit; diff --git a/scripts/backfill_post_content.py b/scripts/backfill_post_content.py index ef54c91a7..0e566129b 100644 --- a/scripts/backfill_post_content.py +++ b/scripts/backfill_post_content.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Reprocess selected stored posts through the existing content pipeline. -This is an operator command, not a buyer HTTP route. It is intentionally +This is an operator command, not a reader-facing HTTP route. It is intentionally post-id scoped so a VISION failure cannot trigger an unbounded spend or rewrite the whole corpus. Raw post bodies and model responses are never printed. """ diff --git a/scripts/backfill_post_keymen.py b/scripts/backfill_post_keymen.py index 5a4618c48..bc3770fb6 100644 --- a/scripts/backfill_post_keymen.py +++ b/scripts/backfill_post_keymen.py @@ -1,6 +1,6 @@ """Bounded operator backfill for evidence-backed Keyman extraction. -This is intentionally an operator script, not a buyer HTTP route. It reuses +This is intentionally an operator script, not a reader-facing HTTP route. It reuses the same contextual-orchestrator boundary and post session metadata as the per-post extraction endpoint, while keeping the default request count small. """ diff --git a/scripts/backfill_post_summaries.py b/scripts/backfill_post_summaries.py index 53cd214a0..96562579a 100644 --- a/scripts/backfill_post_summaries.py +++ b/scripts/backfill_post_summaries.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Backfill evidence-backed summaries for posts without a project field. -This is an operator command, not a buyer HTTP route. It uses the existing +This is an operator command, not a reader-facing HTTP route. It uses the existing post-summary contract through contextual-orchestrator, keeps one metadata session per post, and never prints source bodies or model responses. """ diff --git a/scripts/import_postgresql_posts.py b/scripts/import_postgresql_posts.py index e6ccf5449..57ace6c38 100644 --- a/scripts/import_postgresql_posts.py +++ b/scripts/import_postgresql_posts.py @@ -3,6 +3,8 @@ The query and column mapping are runtime inputs, so this public adapter contains no source-organization or source-table identifiers. It preserves raw HTML in ``source_post``, persists normalized content artifacts, and rebuilds lineage. +The body may come from an explicitly mapped source column or a hash-verified +RFC 2557 MHTML artifact beneath an operator-supplied root. """ from __future__ import annotations @@ -13,6 +15,7 @@ import os import sys import uuid +from collections.abc import Callable from dataclasses import dataclass from datetime import datetime, timezone from pathlib import Path @@ -27,13 +30,16 @@ sys.path.insert(0, str(REPOSITORY_ROOT)) from backend.app.lineage_ingestion import rebuild_lineage -from lineageweave.synthetic_seed_cleanup import cleanup_synthetic_seed from lineageweave.embedding_client import orchestrator_embedding_client from lineageweave.image_content import orchestrator_vision_client from lineageweave.llm_context import build_post_llm_metadata, use_llm_metadata from lineageweave.post_content_persistence import persist_post_content -from lineageweave.post_structure import ContextualOrchestratorPostStructureClient, NullPostStructureClient - +from lineageweave.post_structure import ( + ContextualOrchestratorPostStructureClient, + NullPostStructureClient, +) +from lineageweave.source_artifacts import SourceArtifactError, read_mhtml_html +from lineageweave.synthetic_seed_cleanup import cleanup_synthetic_seed SOURCE_NAMESPACE = uuid.UUID("b6e4b1d6-5fd0-4ca1-92b0-8f7a4e2df83e") @@ -65,7 +71,9 @@ class ColumnMapping: record_key: str post_id: str | None title: str - body: str + body: str | None + body_artifact_path: str | None + body_artifact_sha256: str | None created_at: str updated_at: str | None voc_type: str | None @@ -104,7 +112,17 @@ def _parser() -> argparse.ArgumentParser: help="optional source UUID column for post_id; otherwise derive it from record key", ) parser.add_argument("--title-column", required=True) - parser.add_argument("--body-column", required=True) + parser.add_argument( + "--body-column", + help="source body column; mutually exclusive with the MHTML artifact mapping", + ) + parser.add_argument("--body-artifact-path-column") + parser.add_argument("--body-artifact-sha256-column") + parser.add_argument( + "--artifact-root", + type=Path, + help="operator-local root containing the explicitly mapped MHTML artifacts", + ) parser.add_argument("--created-at-column", required=True) parser.add_argument("--updated-at-column") parser.add_argument("--voc-type-column") @@ -223,13 +241,48 @@ def _source_code_matches( def _validate_source_mapping( sales_pool_column: str | None, process_unit_column: str | None, + body_column: str | None = None, + body_artifact_path_column: str | None = None, + body_artifact_sha256_column: str | None = None, + artifact_root: Path | None = None, ) -> None: - """Reject the common PU-to-sales-pool mapping error at the import boundary.""" + """Reject unsafe or ambiguous source mappings at the import boundary.""" if sales_pool_column and process_unit_column and sales_pool_column == process_unit_column: raise ValueError( "source sales pool and PU/business-unit columns must be distinct; " "PU is source_process_unit_code, not source_sales_pool_code" ) + has_body_column = bool(body_column) + has_artifact_mapping = bool(body_artifact_path_column or body_artifact_sha256_column) + if has_body_column == has_artifact_mapping: + raise ValueError("map exactly one source body column or MHTML artifact body mapping") + if has_artifact_mapping and ( + not body_artifact_path_column or not body_artifact_sha256_column or artifact_root is None + ): + raise ValueError( + "MHTML artifact body mapping requires path column, SHA-256 column, and artifact root" + ) + + +def _source_body_resolver( + mapping: ColumnMapping, + artifact_root: Path | None, +) -> Callable[[Any, int], str]: + """Build the one explicit body resolver used by preflight and import.""" + if mapping.body is not None: + return lambda row, _row_number: str(_value(row, mapping.body) or "") + if artifact_root is None or mapping.body_artifact_path is None or mapping.body_artifact_sha256 is None: + raise ValueError("source body mapping is incomplete") + + def resolve(row: Any, row_number: int) -> str: + source_path = str(_value(row, mapping.body_artifact_path) or "") + expected_sha256 = str(_value(row, mapping.body_artifact_sha256) or "") + try: + return read_mhtml_html(artifact_root, source_path, expected_sha256) + except (KeyError, SourceArtifactError) as exc: + raise ValueError(f"source body artifact failed at source row {row_number}") from exc + + return resolve def _validate_publication_state( @@ -251,6 +304,7 @@ def _validate_source_rows( mapping: ColumnMapping, excluded_draft_values: list[str], excluded_deleted_values: list[str], + body_resolver: Callable[[Any, int], str] | None = None, ) -> None: """Reject incomplete source evidence before the target is mutated.""" _validate_publication_state(rows, mapping, excluded_draft_values) @@ -280,7 +334,11 @@ def _validate_source_rows( f"duplicate source post id at source rows {previous_row} and {row_number}" ) seen_post_ids[post_id] = row_number - body = str(_value(row, mapping.body) or "") + body = ( + body_resolver(row, row_number) + if body_resolver is not None + else str(_value(row, mapping.body) or "") + ) if not body.strip(): raise ValueError(f"source post body cannot be empty at source row {row_number}") voc_type_column = getattr(mapping, "voc_type", None) @@ -349,6 +407,8 @@ async def import_rows(args: argparse.Namespace) -> dict[str, int]: post_id=args.post_id_column, title=args.title_column, body=args.body_column, + body_artifact_path=args.body_artifact_path_column, + body_artifact_sha256=args.body_artifact_sha256_column, created_at=args.created_at_column, updated_at=args.updated_at_column, voc_type=args.voc_type_column, @@ -372,7 +432,15 @@ async def import_rows(args: argparse.Namespace) -> dict[str, int]: thread_group=args.thread_group_column, secondary_group=args.secondary_group_column, ) - _validate_source_mapping(mapping.sales_pool, mapping.source_business_unit) + _validate_source_mapping( + mapping.sales_pool, + mapping.source_business_unit, + mapping.body, + mapping.body_artifact_path, + mapping.body_artifact_sha256, + args.artifact_root, + ) + body_resolver = _source_body_resolver(mapping, args.artifact_root) query = args.query_file.read_text(encoding="utf-8") source = await asyncpg.connect(args.source_dsn) target = await asyncpg.connect(args.target_dsn) @@ -380,11 +448,19 @@ async def import_rows(args: argparse.Namespace) -> dict[str, int]: skipped = 0 try: rows = await source.fetch(query) + resolved_bodies: dict[int, str] = {} + + def resolve_body(row: Any, row_number: int) -> str: + body = body_resolver(row, row_number) + resolved_bodies[row_number] = body + return body + _validate_source_rows( rows, mapping, args.exclude_draft_value, args.exclude_deleted_value, + body_resolver=resolve_body, ) account_id, corporate_id, process_unit_id = await _ensure_scope(target, args) vision_client = orchestrator_vision_client( @@ -403,7 +479,7 @@ async def import_rows(args: argparse.Namespace) -> dict[str, int]: if orchestrator_base_url and orchestrator_api_key else NullPostStructureClient() ) - for row in rows: + for row_number, row in enumerate(rows, start=1): if _source_code_matches(row, mapping.draft, args.exclude_draft_value) or _source_code_matches( row, mapping.deleted, args.exclude_deleted_value ): @@ -414,7 +490,7 @@ async def import_rows(args: argparse.Namespace) -> dict[str, int]: updated_at = _timestamp(_value(row, mapping.updated_at, created_at)) post_id = _source_post_id(row, mapping, args.source_system_code, record_key) title = str(_value(row, mapping.title, "") or "") - body = str(_value(row, mapping.body, "") or "") + body = resolved_bodies[row_number] voc_type_code = _normalize_voc_type( _value(row, mapping.voc_type, "voc"), mapped=mapping.voc_type is not None, diff --git a/scripts/seed_demo_data.py b/scripts/seed_demo_data.py index 8ec15a065..3c84ba8b8 100644 --- a/scripts/seed_demo_data.py +++ b/scripts/seed_demo_data.py @@ -549,7 +549,7 @@ def _write_post_summary(cur, post_id, summary) -> None: cataloged_person_id = str(person_row[0]) cur.execute( "insert into post_summary_role " - "(post_id, actor_name, responsibility, actor_type_code, " + "(post_id, actor_name, responsibility_text, actor_type_code, " "affiliated_organization_name, cataloged_person_id) " "values (%s, %s, %s, %s, %s, %s)", ( @@ -1162,7 +1162,7 @@ def _persist_seed_period_report( cur.execute( "insert into report_item_parameter (" "grouping_kind, grouping_key, period_code, rubric_version, " - "item_code, item_index, slope, cat_params" + "item_code, item_index, item_slope, cat_params" ") values (%s,%s,%s,%s,%s,%s,%s,%s)", ( grouping_kind, @@ -1179,7 +1179,7 @@ def _persist_seed_period_report( cur.execute( "insert into report_item_information (" "grouping_kind, grouping_key, period_code, rubric_version, " - "item_code, item_rank, information" + "item_code, item_rank, information_value" ") values (%s,%s,%s,%s,%s,%s,%s)", ( grouping_kind, @@ -1216,7 +1216,7 @@ def _seed_demo_period_report(cur, author_account_id, corporate_entity_id, proces High-band and low-band posts live in different process units. A pooled free-calibrate writes the shared bank; each unit is then - FIPC-scored so the buyer can compare them. W03 is all-high on the + FIPC-scored so the reader can compare them. W03 is all-high on the high unit. Categories are constructed; thetas come only from ``score_groups_on_shared_metric``. A-100 fixtures (and the Riverbend calendar post) fold into the high unit; B-200 fixtures diff --git a/tests/test_analysis_run_start.py b/tests/test_analysis_run_start.py index e46aa4a0c..c2b1b6065 100644 --- a/tests/test_analysis_run_start.py +++ b/tests/test_analysis_run_start.py @@ -106,7 +106,7 @@ def test_period_report_start_is_unprocessable_and_tepp_is_allowed() -> None: def _tepp_request() -> AnalysisRunRequest: return tepp_run_request( - idempotency_key="buyer-tepp-2026-w07", + idempotency_key="run-tepp-2026-w07", snapshot_sha256="ab" * 32, knowledge_cutoff=datetime(2026, 1, 12, 12, 0, tzinfo=timezone.utc), corporate_entity_id="11111111-1111-1111-1111-111111111111", @@ -118,7 +118,7 @@ def test_tepp_run_request_is_the_published_wire_shape() -> None: request = _tepp_request() payload = request.to_json() assert payload["contract_version"] == 1 - assert payload["idempotency_key"] == "buyer-tepp-2026-w07" + assert payload["idempotency_key"] == "run-tepp-2026-w07" assert payload["snapshot_id"] == "ab" * 32 assert payload["knowledge_cutoff"] == "2026-01-12T12:00:00Z" assert payload["model_contract_version"] == "tepp-analysis-run-v1" diff --git a/tests/test_chunking.py b/tests/test_chunking.py index d37a300cc..fe8792a07 100644 --- a/tests/test_chunking.py +++ b/tests/test_chunking.py @@ -154,6 +154,24 @@ def test_chunk_by_dom_labels_ooxml_footnote_containers() -> None: ] +def test_chunk_by_dom_preserves_explicit_metric_superscripts() -> None: + """A metric exponent remains searchable mathematical evidence.""" + chunks = chunk_by_dom("<p>Volume: 5m<sup>3</sup>.</p>") + + assert [(chunk.label, chunk.text) for chunk in chunks] == [ + ("p", "Volume: 5m³.") + ] + + +def test_chunk_by_dom_preserves_explicit_metric_subscripts() -> None: + """A metric subscript is retained without changing ordinary footnotes.""" + chunks = chunk_by_dom("<p>Index m<sub>3</sub> is measured.</p>") + + assert [(chunk.label, chunk.text) for chunk in chunks] == [ + ("p", "Index m₃ is measured.") + ] + + def test_chunk_by_dom_word_table_rows_also_group_cells() -> None: html = "<w:tbl><w:tr><w:tc>1</w:tc><w:tc>Acme Corp</w:tc></w:tr></w:tbl>" chunks = chunk_by_dom(html) diff --git a/tests/test_global_ask_sources.py b/tests/test_global_ask_sources.py index 9a41b507c..f824b9c72 100644 --- a/tests/test_global_ask_sources.py +++ b/tests/test_global_ask_sources.py @@ -170,7 +170,7 @@ async def fetch(self, query: str, *args): assert candidate_terms == ["p41-4182-202405-0015"] -def test_global_sources_keep_unicode_search_terms_for_localized_buyers() -> None: +def test_global_sources_keep_unicode_search_terms_for_localized_readers() -> None: calls: list[tuple[str, tuple[object, ...]]] = [] class FakeConnection: diff --git a/tests/test_import_postgresql_posts.py b/tests/test_import_postgresql_posts.py index c98e96531..ee535e3e8 100644 --- a/tests/test_import_postgresql_posts.py +++ b/tests/test_import_postgresql_posts.py @@ -1,17 +1,21 @@ +import hashlib import uuid -from types import SimpleNamespace +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText from pathlib import Path +from types import SimpleNamespace import pytest from scripts.import_postgresql_posts import ( - _parser, _normalize_voc_type, - _source_post_id, + _parser, + _source_body_resolver, _source_code_matches, + _source_post_id, + _validate_corporate_entity_scope, _validate_source_mapping, _validate_source_rows, - _validate_corporate_entity_scope, ) @@ -50,6 +54,13 @@ def test_importer_rejects_mapping_the_pu_column_as_sales_pool() -> None: _validate_source_mapping("pu_code", "pu_code") +def test_importer_requires_one_verified_body_mapping() -> None: + with pytest.raises(ValueError, match="exactly one source body"): + _validate_source_mapping(None, None) + with pytest.raises(ValueError, match="requires path column"): + _validate_source_mapping(None, None, None, "artifact_path", "artifact_sha256") + + def test_importer_preflights_identity_and_body_before_target_mutation() -> None: mapping = SimpleNamespace(record_key="record_key", body="body", draft="draft_state", deleted=None) @@ -221,3 +232,55 @@ def test_importer_accepts_explicit_source_name_mappings() -> None: assert args.source_project_name_column == "project_name" assert args.source_company_name_column == "company_name" assert args.source_business_unit_name_column == "process_unit_name" + + +def test_importer_accepts_governed_mhtml_body_mapping(tmp_path: Path) -> None: + args = _parser().parse_args( + [ + "--source-dsn", "postgresql://source", + "--target-dsn", "postgresql://target", + "--query-file", "query.sql", + "--source-system-code", "source", + "--record-key-column", "record_key", + "--title-column", "title", + "--body-artifact-path-column", "artifact_path", + "--body-artifact-sha256-column", "artifact_sha256", + "--artifact-root", str(tmp_path), + "--created-at-column", "created_at", + "--author-subject-id", "subject", + "--corporate-entity-code", "corp", + "--process-unit-code", "pu", + ] + ) + + _validate_source_mapping( + None, + None, + args.body_column, + args.body_artifact_path_column, + args.body_artifact_sha256_column, + args.artifact_root, + ) + assert args.body_column is None + assert args.body_artifact_path_column == "artifact_path" + + +def test_importer_resolves_the_mapped_mhtml_body_before_target_writes(tmp_path: Path) -> None: + message = MIMEMultipart("related") + message.attach(MIMEText("<p>synthetic artifact body</p>", "html", "utf-8")) + payload = message.as_bytes() + (tmp_path / "message.mhtml").write_bytes(payload) + mapping = SimpleNamespace( + body=None, + body_artifact_path="artifact_path", + body_artifact_sha256="artifact_sha256", + ) + resolver = _source_body_resolver(mapping, tmp_path) + + assert resolver( + { + "artifact_path": "message.mhtml", + "artifact_sha256": hashlib.sha256(payload).hexdigest(), + }, + 1, + ) == "<p>synthetic artifact body</p>" diff --git a/tests/test_ingestion_transaction_contracts.py b/tests/test_ingestion_transaction_contracts.py index 68441ec0c..4e5945132 100644 --- a/tests/test_ingestion_transaction_contracts.py +++ b/tests/test_ingestion_transaction_contracts.py @@ -224,7 +224,7 @@ async def fetch(self, query: str, *args: Any) -> list[dict[str, Any]]: return [ { "actor_name": "Synthetic Design Team", - "responsibility": "도면 검토", + "responsibility_text": "도면 검토", "actor_type_code": ACTOR_TYPE_TEAM, "affiliated_organization_name": "Synthetic Energy", "cataloged_team_id": None, @@ -528,7 +528,7 @@ async def fetch(self, query: str, *args: Any) -> list[dict[str, Any]]: return [ { "actor_name": "Priya Nair", - "responsibility": "고객 측 수신", + "responsibility_text": "고객 측 수신", "actor_type_code": ACTOR_TYPE_PERSON, "affiliated_organization_name": "Northridge Grid", "cataloged_team_id": None, diff --git a/tests/test_migration_replay.py b/tests/test_migration_replay.py index 29fe1c176..1e10dbf6c 100644 --- a/tests/test_migration_replay.py +++ b/tests/test_migration_replay.py @@ -33,3 +33,39 @@ def test_migrate_sh_replays_leftover_pair_migration_on_existing_volumes() -> Non ).read_text(encoding="utf-8") assert "0012_*" in script + + +def test_migrate_sh_replays_tenant_settings_migration_on_existing_volumes() -> None: + """Existing Compose volumes must receive the tenant-settings table.""" + script = ( + Path(__file__).resolve().parents[1] + / "docker" + / "postgres-init" + / "migrate.sh" + ).read_text(encoding="utf-8") + + assert "0103_*" in script + + +def test_tenant_settings_migration_is_idempotent_for_replay() -> None: + """The replayed migration must not fail after its table already exists.""" + migration = ( + Path(__file__).resolve().parents[1] + / "migrations" + / "0103_tenant_settings.sql" + ).read_text(encoding="utf-8") + + assert "CREATE TABLE IF NOT EXISTS tenant_settings" in migration + assert "ON CONFLICT (id) DO NOTHING" in migration + + +def test_migrate_sh_replays_database_identifier_migration_on_existing_volumes() -> None: + """Existing Compose volumes must receive the canonical identifier names.""" + script = ( + Path(__file__).resolve().parents[1] + / "docker" + / "postgres-init" + / "migrate.sh" + ).read_text(encoding="utf-8") + + assert "0104_*" in script diff --git a/tests/test_ontology.py b/tests/test_ontology.py index 23eb77fda..cc4d3e0c8 100644 --- a/tests/test_ontology.py +++ b/tests/test_ontology.py @@ -12,6 +12,8 @@ import re from pathlib import Path +from rdflib.namespace import OWL, RDF, RDFS, SKOS, XSD + from lineageweave.knowledge_graph import ( EDGE_AFFILIATION, EDGE_CO_MENTION, @@ -27,7 +29,6 @@ load_ontology, ontology_annotations, ) -from rdflib.namespace import OWL, RDF, RDFS, SKOS, XSD _SEED_SCRIPT_PATH = Path(__file__).resolve().parents[1] / "scripts" / "seed_demo_data.py" @@ -44,9 +45,9 @@ ) # The categories this ontology covers (ADR 0004's scope). seed_demo_data.py -# also seeds categories this ontology deliberately does not model yet -# (post_visibility, voc_type, permission, ticket_status) -- those are -# real, expected gaps, not a test bug. +# also seeds categories this ontology does not model as KG node/edge +# predicates. Operational categories below are still modeled as SKOS +# concepts, so the full controlled vocabulary remains machine-checkable. _ONTOLOGY_COVERED_CATEGORIES = frozenset( { "node_type", @@ -55,6 +56,10 @@ "person_side", "corporate_entity_level", "prov_agent_type", + "post_visibility", + "voc_type", + "permission", + "ticket_status", } ) @@ -137,9 +142,31 @@ def test_ontology_annotations_carry_iri_and_label_for_a_node_type() -> None: def test_ontology_annotations_are_empty_for_an_undeclared_code() -> None: assert ontology_annotations("not_a_real_lookup_code") == {} - # `open` is a real ticket_status lookup code this ontology - # deliberately does not cover -- missing, not a fake label. - assert ontology_annotations("open") == {} + assert ontology_annotations("open") == { + "ontology_iri": str(LW.OpenTicketStatus), + "ontology_label": "Open", + } + + +def test_operational_controlled_vocabulary_uses_skos_concepts() -> None: + """Visibility, VOC, permission, and ticket state are semantic concepts, + not untyped strings or invented graph edge predicates. + """ + graph = load_ontology() + for code, term in ( + ("public", LW.PublicVisibility), + ("voc", LW.VoiceOfCustomer), + ("post_read", LW.ReadPostsPermission), + ("open", LW.OpenTicketStatus), + ): + assert iri_for_lookup_code(code) == str(term) + assert (term, RDF.type, SKOS.Concept) in graph + assert (term, SKOS.inScheme, None) in graph + + assert (LW.hasPostVisibility, RDFS.domain, LW.Post) in graph + assert (LW.hasPostVisibility, RDFS.range, SKOS.Concept) in graph + assert (LW.hasPermission, RDFS.domain, LW.AccessRole) in graph + assert (LW.hasTicketStatus, RDFS.domain, LW.IssueTicket) in graph def test_mentioned_in_property_matches_canonical_edge_direction() -> None: diff --git a/tests/test_period_report.py b/tests/test_period_report.py index 04c9c3921..1430cc515 100644 --- a/tests/test_period_report.py +++ b/tests/test_period_report.py @@ -77,7 +77,7 @@ def test_high_category_posts_outrank_low_category_posts() -> None: def test_fipc_keeps_all_high_week_above_mixed_reference() -> None: """Independent refit of an all-high week recenters near 0. Scoring the same rows on the mixed week's item bank must keep mean θ above - the reference -- that is the buyer-visible week-over-week signal. + the reference -- that is the reader-visible week-over-week signal. """ items = CRITERION_CODES high_ids = [f"high-{idx}" for idx in range(4)] @@ -128,7 +128,7 @@ def test_shared_metric_ranks_high_group_above_low_group() -> None: Independent refits each re-center near 0, so the gap collapses. Scoring both on one pooled bank must keep the high unit above the - low unit -- that is the buyer-visible multilevel signal. + low unit -- that is the reader-visible multilevel signal. """ items = CRITERION_CODES high_ids = [f"high-{idx}" for idx in range(4)] diff --git a/tests/test_person_mention_projection.py b/tests/test_person_mention_projection.py index 7252fb8e8..03d6fcf82 100644 --- a/tests/test_person_mention_projection.py +++ b/tests/test_person_mention_projection.py @@ -2,7 +2,7 @@ Keyman extraction and post-summary R&R are independent evidence channels. A replacement in either channel must remove only that channel's stale person -mentions, then reconcile the buyer-facing Knowledge Graph from the currently +mentions, then reconcile the reader-facing Knowledge Graph from the currently supported union. Orphan graph-registry rows must never become visible. """ @@ -77,6 +77,11 @@ / "migrations" / "0102_project_bound_summary_event.sql" ) +_IDENTIFIER_MIGRATION = ( + Path(__file__).resolve().parents[1] + / "migrations" + / "0104_two_word_database_identifiers.sql" +) _SEMANTIC_SEARCH_MIGRATION = ( Path(__file__).resolve().parents[1] / "migrations" / "0032_semantic_search_trigram.sql" ) @@ -165,6 +170,7 @@ def projection_database() -> str: cursor.execute(_MAJOR_EVENT_ACTION_MIGRATION.read_text(encoding="utf-8")) cursor.execute(_PROJECT_BOUND_ACTION_MIGRATION.read_text(encoding="utf-8")) cursor.execute(_PROJECT_BOUND_EVENT_MIGRATION.read_text(encoding="utf-8")) + cursor.execute(_IDENTIFIER_MIGRATION.read_text(encoding="utf-8")) cursor.execute( """ insert into common_lookup_value @@ -448,7 +454,7 @@ def test_cross_post_identity_upgrade_keeps_keyman_mention_context( cursor.execute( """ insert into post_summary_role - (post_id, actor_name, responsibility, actor_type_code) + (post_id, actor_name, responsibility_text, actor_type_code) values (%s, 'Summary Person', '검토', 'prov_person') """, (post_id,), diff --git a/tests/test_post_content_normalization.py b/tests/test_post_content_normalization.py index 0beead6f4..18e046b8b 100644 --- a/tests/test_post_content_normalization.py +++ b/tests/test_post_content_normalization.py @@ -275,7 +275,7 @@ def test_partial_locator_with_no_successful_description_fails_closed() -> None: assert result.text == "[image: content unavailable]" -def test_unknown_chunk_kinds_are_not_leaked_into_buyer_text(monkeypatch) -> None: +def test_unknown_chunk_kinds_are_not_leaked_into_reader_text(monkeypatch) -> None: from lineageweave import post_content_normalization monkeypatch.setattr( diff --git a/tests/test_schema.py b/tests/test_schema.py index 1e2c708a3..076ebb5c9 100644 --- a/tests/test_schema.py +++ b/tests/test_schema.py @@ -43,6 +43,14 @@ / "migrations" / "0102_project_bound_summary_event.sql" ) +_BOOKMARK_MIGRATION = ( + Path(__file__).resolve().parents[1] / "migrations" / "0043_bookmark.sql" +) +_IDENTIFIER_MIGRATION = ( + Path(__file__).resolve().parents[1] + / "migrations" + / "0104_two_word_database_identifiers.sql" +) def _postgres_available() -> bool: @@ -79,6 +87,10 @@ def schema_db(): cur.execute(_MAJOR_EVENT_ACTION_MIGRATION.read_text()) cur.execute(_PROJECT_BOUND_ACTION_MIGRATION.read_text()) cur.execute(_PROJECT_BOUND_EVENT_MIGRATION.read_text()) + cur.execute(_BOOKMARK_MIGRATION.read_text()) + identifier_migration = _IDENTIFIER_MIGRATION.read_text() + cur.execute(identifier_migration) + cur.execute(identifier_migration) conn.commit() yield conn finally: @@ -128,6 +140,7 @@ def test_migration_applies_cleanly(schema_db) -> None: "post_summary_action", "post_chat_result", "post_chat_citation", + "post_bookmark", } assert expected <= tables @@ -270,6 +283,32 @@ def test_every_created_table_name_has_at_least_two_words() -> None: assert len(words) >= 2, f"table {name!r} must be two or more snake_case words" +def test_identifier_migration_leaves_no_single_word_public_identifiers(schema_db) -> None: + """The current schema contract covers tables, views, and their columns.""" + with schema_db.cursor() as cur: + cur.execute( + """ + select table_name + from information_schema.tables + where table_schema = 'public' + and table_type = 'BASE TABLE' + and table_name !~ '^[a-z][a-z0-9]*(_[a-z0-9]+)+$' + """ + ) + invalid_tables = {row[0] for row in cur.fetchall()} + cur.execute( + """ + select table_name, column_name + from information_schema.columns + where table_schema = 'public' + and column_name !~ '^[a-z][a-z0-9]*(_[a-z0-9]+)+$' + """ + ) + invalid_columns = {(row[0], row[1]) for row in cur.fetchall()} + assert invalid_tables == set() + assert invalid_columns == set() + + def test_cataloged_team_null_affiliation_is_unique(schema_db) -> None: """Repeated NULL-affiliation upserts return one catalog identity.""" with schema_db.cursor() as cursor: diff --git a/tests/test_source_artifacts.py b/tests/test_source_artifacts.py new file mode 100644 index 000000000..b1e1424ff --- /dev/null +++ b/tests/test_source_artifacts.py @@ -0,0 +1,58 @@ +from __future__ import annotations + +import hashlib +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText +from pathlib import Path + +import pytest + +from lineageweave.source_artifacts import SourceArtifactError, read_mhtml_html + + +def _mhtml_bytes(html: str) -> bytes: + message = MIMEMultipart("related") + message.attach(MIMEText(html, "html", "utf-8")) + return message.as_bytes() + + +def test_read_mhtml_html_verifies_digest_and_returns_html_part(tmp_path: Path) -> None: + payload = _mhtml_bytes("<html><body>synthetic source</body></html>") + (tmp_path / "message.mhtml").write_bytes(payload) + + body = read_mhtml_html( + tmp_path, + "message.mhtml", + hashlib.sha256(payload).hexdigest(), + ) + + assert body == "<html><body>synthetic source</body></html>" + + +@pytest.mark.parametrize( + ("source_path", "expected_sha256", "message"), + [ + ("../message.mhtml", "0" * 64, "outside the artifact root"), + ("message.mhtml", "not-a-sha256", "64 hexadecimal"), + ("message.mhtml", "0" * 64, "does not match"), + ], +) +def test_read_mhtml_html_fails_closed_for_unproven_artifacts( + tmp_path: Path, + source_path: str, + expected_sha256: str, + message: str, +) -> None: + payload = _mhtml_bytes("<p>synthetic</p>") + (tmp_path / "message.mhtml").write_bytes(payload) + + with pytest.raises(SourceArtifactError, match=message): + read_mhtml_html(tmp_path, source_path, expected_sha256) + + +def test_read_mhtml_html_rejects_non_related_or_html_free_messages(tmp_path: Path) -> None: + message = MIMEText("plain source", "plain", "utf-8").as_bytes() + (tmp_path / "message.mhtml").write_bytes(message) + + with pytest.raises(SourceArtifactError, match="multipart/related"): + read_mhtml_html(tmp_path, "message.mhtml", hashlib.sha256(message).hexdigest()) diff --git a/tests/test_stale_summary_continuity.py b/tests/test_stale_summary_continuity.py index ef4f66184..a9edd0ed6 100644 --- a/tests/test_stale_summary_continuity.py +++ b/tests/test_stale_summary_continuity.py @@ -1,4 +1,4 @@ -"""Regression tests for buyer-visible stale summary continuity.""" +"""Regression tests for reader-visible stale summary continuity.""" import asyncio
{t("Authorized customer scope")}
{t("Customer entities available to this account.")}
{error}
{t("Loading customer master...")}
+
{t("A counterparty can hold more than one role over time -- a customer in one post can be a competitor, supplier, or partner in another. Every role observed for a name is listed, not just the most frequent.")}
{t("Source identifiers are hints only; ontology and semantic evidence must resolve them before binding a customer.")}
{t("Evidence-grounded questions")}
{t("Questions use authorized posts and their evidence.")}