@@ -703,15 +687,7 @@ export function ServicesNavigatorPage() {
{[
{ label: "Best fit", query: defaultQuery },
{ label: "Crisis", query: "crisis" },
-<<<<<<< ours
-<<<<<<< ours
- { label: "Culturally safe", query: "Aboriginal and Torres Strait Islander" },
-=======
- { label: "Culturally safe", query: "Aboriginal Torres Strait Islander" },
->>>>>>> theirs
-=======
{ label: "Culturally safe", query: "Aboriginal Torres Strait Islander" },
->>>>>>> theirs
{ label: "Phone referral", query: "phone referral" },
{ label: "Free", query: "free" },
{ label: "WA", query: "WA" },
diff --git a/src/components/ui-primitives.tsx b/src/components/ui-primitives.tsx
index c546c5ec89..44682a3323 100644
--- a/src/components/ui-primitives.tsx
+++ b/src/components/ui-primitives.tsx
@@ -492,7 +492,7 @@ export function EmptyState({
title,
body,
actions,
- live,
+ live = "polite",
tone = "neutral",
testId,
}: {
@@ -510,6 +510,7 @@ export function EmptyState({
| null = null;
+
+function getDb(): Promise {
+ if (typeof window === "undefined" || !window.indexedDB) {
+ return Promise.reject(new Error("IndexedDB not available"));
+ }
+ if (!dbPromise) {
+ dbPromise = new Promise((resolve, reject) => {
+ const request = indexedDB.open(DB_NAME, 1);
+ request.onerror = () => reject(request.error);
+ request.onsuccess = () => resolve(request.result);
+ request.onupgradeneeded = () => {
+ if (!request.result.objectStoreNames.contains(STORE_NAME)) {
+ request.result.createObjectStore(STORE_NAME, { keyPath: "id" });
+ }
+ };
+ });
+ }
+ return dbPromise;
+}
+
+export async function enqueueOfflineAction(action: Omit) {
+ try {
+ const db = await getDb();
+ await new Promise((resolve, reject) => {
+ const transaction = db.transaction(STORE_NAME, "readwrite");
+ const store = transaction.objectStore(STORE_NAME);
+ const fullAction: OfflineAction = {
+ ...action,
+ id: crypto.randomUUID(),
+ timestamp: Date.now(),
+ retryCount: 0,
+ };
+ store.add(fullAction);
+ transaction.oncomplete = () => resolve();
+ transaction.onerror = () => reject(transaction.error);
+ });
+ } catch (error) {
+ console.warn("Failed to enqueue offline action", error);
+ }
+}
+
+export async function drainOfflineQueue(getAuthHeaders: () => Record) {
+ if (typeof window === "undefined" || !navigator.onLine) return;
+
+ try {
+ const db = await getDb();
+ const actions = await new Promise((resolve, reject) => {
+ const transaction = db.transaction(STORE_NAME, "readonly");
+ const store = transaction.objectStore(STORE_NAME);
+ const request = store.getAll();
+ request.onsuccess = () => resolve(request.result);
+ request.onerror = () => reject(request.error);
+ });
+
+ if (actions.length === 0) return;
+
+ // Sort by timestamp (oldest first)
+ actions.sort((a, b) => a.timestamp - b.timestamp);
+
+ for (const action of actions) {
+ if (!navigator.onLine) break;
+
+ try {
+ const response = await fetch(action.endpoint, {
+ method: action.method,
+ headers: { "Content-Type": "application/json", ...getAuthHeaders() },
+ body: action.body,
+ });
+
+ if (
+ response.ok ||
+ response.status === 400 ||
+ response.status === 401 ||
+ response.status === 403 ||
+ response.status === 404
+ ) {
+ // Success or non-retriable client error
+ await removeAction(db, action.id);
+ } else {
+ // Retriable error (e.g. 500, 502, 503, 429)
+ await incrementRetry(db, action);
+ }
+ } catch {
+ // Network error (fetch threw)
+ await incrementRetry(db, action);
+ }
+ }
+ } catch (error) {
+ console.warn("Failed to drain offline queue", error);
+ }
+}
+
+async function removeAction(db: IDBDatabase, id: string) {
+ return new Promise((resolve, reject) => {
+ const transaction = db.transaction(STORE_NAME, "readwrite");
+ transaction.objectStore(STORE_NAME).delete(id);
+ transaction.oncomplete = () => resolve();
+ transaction.onerror = () => reject(transaction.error);
+ });
+}
+
+async function incrementRetry(db: IDBDatabase, action: OfflineAction) {
+ if (action.retryCount >= MAX_RETRIES) {
+ return removeAction(db, action.id);
+ }
+ return new Promise((resolve, reject) => {
+ const transaction = db.transaction(STORE_NAME, "readwrite");
+ action.retryCount += 1;
+ transaction.objectStore(STORE_NAME).put(action);
+ transaction.oncomplete = () => resolve();
+ transaction.onerror = () => reject(transaction.error);
+ });
+}
diff --git a/src/lib/service-catalog-mapper.ts b/src/lib/service-catalog-mapper.ts
index 185677cc06..0ae6d7fe72 100644
--- a/src/lib/service-catalog-mapper.ts
+++ b/src/lib/service-catalog-mapper.ts
@@ -173,32 +173,14 @@ function buildSummaryCards(service: CatalogService): ServiceSummaryCard[] {
const bestUse = cleanField(service.best_use_indication) ?? cleanField(service.discharge_planning_usefulness);
if (bestUse) {
-<<<<<<< ours
-<<<<<<< ours
- cards.push({
- id: "best-use",
- label: "Best use",
- title: bestUse,
- detail: cleanField(service.patient_group) ?? cleanField(service.sections[0]) ?? "Clinical fit and referral priority",
-=======
- const title = compactBestUseTitle(bestUse);
- cards.push({
- id: "best-use",
- label: "Best use",
-=======
const title = compactBestUseTitle(bestUse);
cards.push({
id: "best-use",
label: "Best use",
->>>>>>> theirs
title,
detail:
compactBestUseTitle(cleanField(service.patient_group) ?? cleanField(service.sections[0]) ?? "") ||
(title === bestUse ? "Clinical fit and referral priority" : bestUse),
-<<<<<<< ours
->>>>>>> theirs
-=======
->>>>>>> theirs
});
}
diff --git a/tests/privacy-ui.test.ts b/tests/privacy-ui.test.ts
index 6c3f703929..617f23668a 100644
--- a/tests/privacy-ui.test.ts
+++ b/tests/privacy-ui.test.ts
@@ -1,6 +1,12 @@
import { createElement } from "react";
import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("next/navigation", () => ({
+ useRouter: () => ({ push: vi.fn(), replace: vi.fn(), prefetch: vi.fn(), back: vi.fn() }),
+ useSearchParams: () => new URLSearchParams(),
+ usePathname: () => "/",
+}));
import PrivacyPage from "@/app/privacy/page";
import { PrivacyInputNotice } from "@/components/privacy-input-notice";
diff --git a/tests/private-access-routes.test.ts b/tests/private-access-routes.test.ts
index 9d64c57189..0dfb4241f4 100644
--- a/tests/private-access-routes.test.ts
+++ b/tests/private-access-routes.test.ts
@@ -4921,21 +4921,9 @@ describe("private document API access", () => {
expectFeedbackTokenBoundToAnswer(body);
});
-<<<<<<< ours
- it("runs non-stream document summaries through the governed summary path", async () => {
- const answerQuestionWithScope = vi.fn();
- const summarizeDocument = vi.fn(async () => ({
- answer: "Full non-stream document summary.",
- grounded: true,
- confidence: "high",
- citations: [],
- sources: [],
- }));
-=======
it("rejects non-stream document summaries before RAG/provider work", async () => {
const answerQuestionWithScope = vi.fn();
const summarizeDocument = vi.fn();
->>>>>>> theirs
const client = createSupabaseMock();
mockRuntime(client, { answerQuestionWithScope, summarizeDocument });
const { POST } = await import("../src/app/api/answer/route");
@@ -4950,30 +4938,6 @@ describe("private document API access", () => {
}),
}),
);
-<<<<<<< ours
- const body = await payload(response);
-
- expect(response.status).toBe(200);
- expect(body).toMatchObject({
- answer: "Full non-stream document summary.",
- interactionId: expect.any(String),
- feedbackToken: expect.any(String),
- });
- expect(summarizeDocument).toHaveBeenCalledWith(documentId, userId, {
- signal: expect.any(AbortSignal),
- });
- expect(client.rpc).toHaveBeenCalledTimes(1);
- expect(client.rpc).toHaveBeenCalledWith(
- "consume_summary_rate_limits_atomic",
- expect.objectContaining({
- p_owner_id: userId,
- p_subject_key: null,
- p_answer_limit: 30,
- p_summary_limit: 12,
- }),
- );
-=======
-
expect(response.status).toBe(400);
await expect(payload(response)).resolves.toMatchObject({
error: "Document summaries require the streaming answer endpoint.",
@@ -4981,7 +4945,6 @@ describe("private document API access", () => {
});
expect(client.rpc).not.toHaveBeenCalled();
expect(summarizeDocument).not.toHaveBeenCalled();
->>>>>>> theirs
expect(answerQuestionWithScope).not.toHaveBeenCalled();
});
diff --git a/tests/reconciliation-preflight.test.ts b/tests/reconciliation-preflight.test.ts
index fd0711e877..7319f63fbd 100644
--- a/tests/reconciliation-preflight.test.ts
+++ b/tests/reconciliation-preflight.test.ts
@@ -116,5 +116,5 @@ describe("reconciliation preflight", () => {
expect(payload.integrationBase).toBe("dedicated-worktree-required");
expect(payload.processDiagnostics).toMatchObject({ skipped: true, rawCommandLinesSerialized: false });
expect(result.stdout).not.toContain("commandLine");
- });
+ }, 60000);
});
diff --git a/tests/ui-tools.spec.ts b/tests/ui-tools.spec.ts
index a1e6883486..7d152cad3f 100644
--- a/tests/ui-tools.spec.ts
+++ b/tests/ui-tools.spec.ts
@@ -931,7 +931,9 @@ test.describe("Clinical KB tools launcher", () => {
await gotoLauncher(page, "/services?q=13YARN&focus=1&run=1");
await expect(page.getByRole("heading", { level: 1, name: /referral matches/i })).toBeVisible();
- await expect(page.getByText("Prioritised for crisis support, culturally safe access, and phone referral.")).toBeVisible();
+ await expect(
+ page.getByText("Prioritised for crisis support, culturally safe access, and phone referral."),
+ ).toBeVisible();
await expect(page.getByRole("button", { name: "Advanced service filters" })).toBeDisabled();
await expect(page.getByText("Advanced service filters are coming soon.")).toHaveCount(1);
diff --git a/tests/visual-evidence-tabs.dom.test.tsx b/tests/visual-evidence-tabs.dom.test.tsx
index 8bbaaaa849..5ee3fc5cc5 100644
--- a/tests/visual-evidence-tabs.dom.test.tsx
+++ b/tests/visual-evidence-tabs.dom.test.tsx
@@ -3,6 +3,7 @@ import userEvent from "@testing-library/user-event";
import { describe, expect, it, vi } from "vitest";
import { MobileEvidenceSheetContent } from "@/components/clinical-dashboard/visual-evidence";
+import { ClinicalNotesChecklistPanel } from "@/components/clinical-dashboard/evidence-panels";
import type { AnswerRenderModel } from "@/lib/answer-render-policy";
import type { RagAnswer } from "@/lib/types";
import type { AnswerEvidenceMapRow } from "@/lib/ward-output";
@@ -137,8 +138,6 @@ describe("MobileEvidenceSheetContent tabs (jsdom)", () => {
expect(claims).toHaveAttribute("tabindex", "-1");
});
});
-<<<<<<< ours
-=======
describe("ClinicalNotesChecklistPanel visual-evidence boundary (jsdom)", () => {
it("does not expose raw table evidence suppressed by the render model", () => {
@@ -376,4 +375,3 @@ describe("ClinicalNotesChecklistPanel visual-evidence boundary (jsdom)", () => {
expect(screen.queryByText("monthly when stable")).not.toBeInTheDocument();
});
});
->>>>>>> theirs
diff --git a/worker/main.ts b/worker/main.ts
index 79b053481d..87fcfca8ee 100644
--- a/worker/main.ts
+++ b/worker/main.ts
@@ -1061,7 +1061,8 @@ async function uploadAndCaptionImages(
const { task, classificationCacheHit } = resolved;
const { candidate, index, image, perceptualHash, imageHash, nearbyText, tableMetadata, contextHash } = task;
let classification = redactImageClassification(resolved.classification);
- const retainedWithoutCaptioning = task.presetClassification?.skip_reason === "retained for document view without captioning";
+ const retainedWithoutCaptioning =
+ task.presetClassification?.skip_reason === "retained for document view without captioning";
const policyAssessment = assessClinicalImageUse({
imageType: classification.image_type,
searchable: classification.searchable,