FE-1842: Gather Brunch's website code under its plugin and stop packages importing each other's files

apps/brunch-agent/.oxlintrc.json

@@ -30,6 +30,10 @@
           }
         ],
         "patterns": [
+          {
+            "regex": "^(\\.\\./)+((apps|libs|tests|@[a-z0-9-]+)/|[^./][^/]*/(src|dist|test)/)",
+            "message": "Import another workspace package by its package name, not a relative path into it."
+          },
           {
             "group": [
               "@hashintel/petrinaut/*",

apps/brunch-agent/README.md

@@ -43,8 +43,19 @@ To try a candidate, copy `src/agents/petrinaut/` to `src/agents/petrinaut-alt-<i
 
 Neither `test:unit` nor `test:integration` needs anything running. `test:integration` checks the built app, starting it as a server and loading it in process with scripted OpenAI responses on the default model.
 
+The app exports its harness for the built server under `@apps/brunch-agent/testing/*` (`test/load-built-application.ts` and `test/integration/run-admission-controls.ts`). Its one consumer is `tests/petrinaut-brunch-integration`, which runs the Petrinaut website's Brunch code against the built app.
+
 The `test:manual:*` scripts are not part of either suite and do not run in CI. `test:manual:browser` builds the website and drives it in the local macOS Chrome against the built app.
 
+`test:manual:browser:persona` exercises the persona helper through that same browser boundary, using only synthetic model responses. It checks opening and subsequent admissions, current-turn approvals, and an unanswered approval left visible by a transport failure. Run it once for each supported endpoint:
+
+```sh
+yarn workspace @apps/brunch-agent test:manual:browser:persona
+VITE_BRUNCH_CHAT_ENDPOINT=/agents/chat yarn workspace @apps/brunch-agent test:manual:browser:persona
+```
+
+The transport-failure case starts with an unanswered ordinary composer turn. It reproduces the stale-panel failure at the persona helper's entrypoint; it does not claim that a sequence made exclusively of persona turns reaches that starting state.
+
 ## Local Postgres
 
 Set `BRUNCH_DB_KIND=postgres` explicitly to use the existing Postgres adapter and migrations locally. An unset selector defaults to SQLite outside production; `BRUNCH_DB_KIND=sqlite` also selects that lightweight path. Production always requires Postgres (selector unset or `postgres`), and rejects `sqlite`. Selector values are exact and case-sensitive; blank or unknown values fail.

apps/brunch-agent/docker/Dockerfile

@@ -87,7 +87,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
     --mount=type=cache,target=/repo/target,sharing=locked \
     --mount=type=cache,target=/repo/.turbo/cache,sharing=locked \
     turbo run build --filter '@apps/brunch-agent' --env-mode=loose && \
-    rm -rf apps/brunch-agent/test
+    rm -rf apps/brunch-agent/src apps/brunch-agent/test
 
 
 FROM mise AS runner

apps/brunch-agent/docs/task-dependencies.json

@@ -4,7 +4,8 @@
     "@hashintel/brunch-agent",
     "@hashintel/petrinaut-core",
     "@local/flue-aisdk-transport",
-    "@local/hash-backend-utils"
+    "@local/hash-backend-utils",
+    "@local/pi-faux-providers"
   ],
   "tasks": {
     "build": {

apps/brunch-agent/evals/petrinaut/persona/browser-turn.ts

@@ -113,11 +113,9 @@ export const submitPersonaBrowserTurn = async (
     "",
     "Refusing to overwrite an existing browser draft",
   );
+  // Match the mounted route, including aliases and evaluation candidates.
   // Only the conversation POST admits work; /abort is a control request.
-  const admissionPath = new RegExp(
-    `^${brunchRoutes.agents}/${brunchRoutes.petrinautAgent}/[^/]+$`,
-    "u",
-  );
+  const admissionPath = new RegExp(`^${brunchRoutes.agents}/[^/]+/[^/]+$`, "u");
   const isAdmission = (response: BrowserResponse) =>
     response.request().method() === "POST" &&
     admissionPath.test(new URL(response.url()).pathname);
@@ -136,13 +134,7 @@ export const submitPersonaBrowserTurn = async (
   };
   signal?.addEventListener("abort", cancel, { once: true });
   let turnSettled = false;
-  const allowing = allowDestructiveEdits(
-    page,
-    () => turnSettled,
-    options.onAllowedEdit,
-  );
-  // Raced while the turn runs, awaited once it ends.
-  void allowing.catch(() => {});
+  let allowing: Promise<void> | undefined;
   try {
     await composer.fill(message);
     signal?.throwIfAborted();
@@ -197,7 +189,16 @@ export const submitPersonaBrowserTurn = async (
       headers: agentOwnershipHeaders(session),
     });
     await options.onAdmission?.(session, admission);
-    if (signal?.aborted) cancel();
+    signal?.throwIfAborted();
+    // Submission revokes earlier approvals before its POST. Wait for the
+    // receipt and utterance log before watching for this turn's approvals.
+    allowing = allowDestructiveEdits(
+      page,
+      () => turnSettled,
+      options.onAllowedEdit,
+    );
+    // Raced while the turn runs, awaited once it ends.
+    void allowing.catch(() => {});
     await Promise.race([
       stop.waitFor({ state: "hidden", timeout: 0 }),
       aborted.promise,
@@ -263,6 +264,6 @@ export const submitPersonaBrowserTurn = async (
   } finally {
     signal?.removeEventListener("abort", cancel);
     turnSettled = true;
-    await allowing.catch(() => {});
+    await allowing?.catch(() => {});
   }
 };

apps/brunch-agent/test/proof-artifacts.test.ts → apps/brunch-agent/evals/petrinaut/persona/proof-artifacts.test.ts

@@ -5,10 +5,7 @@ import { join } from "node:path";
 
 import { afterEach, expect, test } from "vitest";
 
-import {
-  deriveProofTrace,
-  writeProofArtifacts,
-} from "../evals/petrinaut/persona/proof-artifacts";
+import { deriveProofTrace, writeProofArtifacts } from "./proof-artifacts";
 
 import type { FlueConversationSnapshot } from "@flue/sdk";
 

apps/brunch-agent/package.json

@@ -5,6 +5,10 @@
   "description": "Remote Brunch server and local Petrinaut development loop.",
   "license": "AGPL-3.0",
   "type": "module",
+  "exports": {
+    "./testing/admission-controls": "./test/integration/run-admission-controls.ts",
+    "./testing/load-built-application": "./test/load-built-application.ts"
+  },
   "scripts": {
     "build": "vite build && vite build --config vite.client.config.ts",
     "build:docker": "docker buildx build --tag brunch-agent --file docker/Dockerfile ../../ --load",
@@ -23,6 +27,7 @@
     "test:integration": "vitest run --config vitest.integration.config.ts",
     "test:manual:browser": "VITE_BRUNCH_CHAT_ENDPOINT=/agents/petrinaut VITE_PETRINAUT_DEFAULT_ASSISTANT=brunch turbo run build --filter '@apps/brunch-agent...' --filter '@apps/petrinaut-website...' --env-mode=loose && node --experimental-strip-types test/browser-witness/petrinaut-panel.ts",
     "test:manual:browser:ledger-tab": "VITE_BRUNCH_CHAT_ENDPOINT=/agents/petrinaut VITE_PETRINAUT_DEFAULT_ASSISTANT=brunch turbo run build --filter '@apps/brunch-agent...' --filter '@apps/petrinaut-website...' --env-mode=loose && node --experimental-strip-types test/browser-witness/ledger-tab.ts",
+    "test:manual:browser:persona": "VITE_BRUNCH_CHAT_ENDPOINT=${VITE_BRUNCH_CHAT_ENDPOINT:-/agents/petrinaut} VITE_PETRINAUT_DEFAULT_ASSISTANT=brunch turbo run build --filter '@apps/brunch-agent...' --filter '@apps/petrinaut-website...' --env-mode=loose && node --experimental-strip-types test/browser-witness/persona-turn.ts",
     "test:unit": "vitest run --config vitest.config.ts",
     "transcript": "node --experimental-strip-types src/server/transcript-cli.ts"
   },
@@ -50,6 +55,7 @@
   "devDependencies": {
     "@earendil-works/pi-tui": "0.84.3",
     "@flue/vite": "2.0.3",
+    "@local/pi-faux-providers": "workspace:*",
     "@playwright/test": "1.58.2",
     "@types/node": "22.18.13",
     "@types/pg": "8.23.1",

apps/brunch-agent/test/experiment-configuration.test.ts → apps/brunch-agent/src/agents/petrinaut/experiment-configuration.test.ts

@@ -10,16 +10,16 @@ import {
   type PetrinautExperimentRequest,
 } from "@hashintel/petrinaut-core";
 
-import { openaiProviderWithAddedModels } from "../src/server/openai-provider.ts";
-import { openrouterProviderWithAddedModels } from "../src/server/openrouter-provider.ts";
+import { openaiProviderWithAddedModels } from "../../server/openai-provider.ts";
+import { openrouterProviderWithAddedModels } from "../../server/openrouter-provider.ts";
 import {
   selectChatModelSpecifier,
   selectChatThinking,
-} from "../src/shared/chat-model.ts";
+} from "../../shared/chat-model.ts";
 
 const reference = readFileSync(
   new URL(
-    "../src/agents/petrinaut/skills/modelling/references/experiment-configuration.md",
+    "./skills/modelling/references/experiment-configuration.md",
     import.meta.url,
   ),
   "utf8",

apps/brunch-agent/test/petrinaut-agent-mounting.test.ts → apps/brunch-agent/src/agents/petrinaut/petrinaut-agent-mounting.test.ts

@@ -6,16 +6,16 @@ import { afterEach, beforeEach, expect, test, vi } from "vitest";
 import { brunchTools, sdcpnInitialDataSchema } from "@hashintel/brunch-agent";
 import { petrinautAiTools } from "@hashintel/petrinaut-core/ai";
 
-import {
-  commitToolDescription,
-  compileToolDescription,
-} from "../src/agents/petrinaut/tools/ledger.ts";
-import { queryBasisToolDescription } from "../src/agents/petrinaut/tools/query-basis.ts";
 import {
   assertPetrinautToolCatalogueConformance,
   canonicalPetrinautToolCatalogue,
   brunchToolCatalogue,
-} from "../src/shared/tool-catalogue.ts";
+} from "../../shared/tool-catalogue.ts";
+import {
+  commitToolDescription,
+  compileToolDescription,
+} from "./tools/ledger.ts";
+import { queryBasisToolDescription } from "./tools/query-basis.ts";
 
 const mounted = vi.hoisted(() => ({
   initialData: undefined as unknown,
@@ -46,13 +46,13 @@ vi.mock("@flue/runtime", async (importOriginal) => ({
   },
 }));
 // Only the Flue build packages skills; these tests exercise the composition around them.
-vi.mock("../src/agents/petrinaut/skills/eliciting/SKILL.md", () => ({
+vi.mock("./skills/eliciting/SKILL.md", () => ({
   default: { name: "eliciting" },
 }));
-vi.mock("../src/agents/petrinaut/skills/modelling/SKILL.md", () => ({
+vi.mock("./skills/modelling/SKILL.md", () => ({
   default: { name: "modelling" },
 }));
-vi.mock("../src/agents/petrinaut/skills/petrinaut/SKILL.md", () => ({
+vi.mock("./skills/petrinaut/SKILL.md", () => ({
   default: { name: "petrinaut" },
 }));
 
@@ -64,10 +64,7 @@ const bound = {
 };
 const systemPrompt = async () =>
   (
-    await readFile(
-      new URL("../src/agents/petrinaut/prompts/system.md", import.meta.url),
-      "utf8",
-    )
+    await readFile(new URL("./prompts/system.md", import.meta.url), "utf8")
   ).trim();
 beforeEach(() => {
   vi.resetModules();
@@ -86,8 +83,7 @@ afterEach(() => vi.unstubAllEnvs());
 
 test("a document binding mounts the guidance, the complete canonical catalogue, the Ledger and the draft", async () => {
   mounted.initialData = bound;
-  const { PetrinautAgent: renderAgent } =
-    await import("../src/agents/petrinaut/agent.ts");
+  const { PetrinautAgent: renderAgent } = await import("./agent.ts");
   expect(renderAgent({ id: "bound" })).toBe(await systemPrompt());
   expect(mounted.contextProjections).toBe(1);
   expect(mounted.skills).toEqual(["eliciting", "modelling", "petrinaut"]);
@@ -118,8 +114,7 @@ test("a document binding mounts the guidance, the complete canonical catalogue,
 });
 
 test("a conversation without initial data mounts the guidance and Ledger without browser tools", async () => {
-  const { PetrinautAgent: renderAgent } =
-    await import("../src/agents/petrinaut/agent.ts");
+  const { PetrinautAgent: renderAgent } = await import("./agent.ts");
   renderAgent({ id: "unbound" });
   expect(mounted.skills).toEqual(["eliciting", "modelling", "petrinaut"]);
   expect(mounted.tools.sort()).toEqual(

apps/brunch-agent/test/ledger-kind-enums.test.ts → apps/brunch-agent/src/agents/petrinaut/tools/ledger-kind-enums.test.ts

@@ -26,16 +26,16 @@ import {
   vStatus,
 } from "@hashintel/brunch-agent";
 
+import { openaiProviderWithAddedModels } from "../../../server/openai-provider.ts";
+import {
+  selectChatModelSpecifier,
+  selectChatThinking,
+} from "../../../shared/chat-model.ts";
 import {
   commitToolDescription,
   createLedgerCommitTool,
   createLedgerCompileTool,
-} from "../src/agents/petrinaut/tools/ledger.ts";
-import { openaiProviderWithAddedModels } from "../src/server/openai-provider.ts";
-import {
-  selectChatModelSpecifier,
-  selectChatThinking,
-} from "../src/shared/chat-model.ts";
+} from "./ledger.ts";
 
 type Batch = LedgerAppend["entries"];
 

apps/brunch-agent/test/query-basis.test.ts → apps/brunch-agent/src/agents/petrinaut/tools/query-basis.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "vitest";
 
-import { queryBasis } from "../src/agents/petrinaut/tools/query-basis.ts";
+import { queryBasis } from "./query-basis.ts";
 
 import type { FlueConversationSnapshot } from "@flue/sdk";
 

apps/brunch-agent/test/db-path.test.ts → apps/brunch-agent/src/db-path.test.ts

@@ -16,7 +16,7 @@ import { fileURLToPath } from "node:url";
 
 import { afterEach, describe, expect, test } from "vitest";
 
-import { conversationDbPath } from "../src/db-path";
+import { conversationDbPath } from "./db-path";
 
 const appDir = fileURLToPath(new URL("..", import.meta.url));
 

apps/brunch-agent/test/provider-registration.test.ts → apps/brunch-agent/src/provider-registration.test.ts

@@ -9,8 +9,8 @@ import { instrument, setProvider } from "@flue/runtime";
 import { Hono } from "hono";
 import { beforeAll, expect, test, vi } from "vitest";
 
-vi.mock("../src/server/telemetry-bootstrap.ts", () => ({}));
-vi.mock("../src/agents/petrinaut/agent.ts", () => ({
+vi.mock("./server/telemetry-bootstrap.ts", () => ({}));
+vi.mock("./agents/petrinaut/agent.ts", () => ({
   PetrinautAgent: { agentName: "brunch-chat-agent" },
 }));
 vi.mock("@flue/runtime/routing", () => ({
@@ -52,7 +52,7 @@ vi.mock(
   },
 );
 beforeAll(async () => {
-  await import("../src/app");
+  await import("./app");
 });
 
 test("app registration admits the Anthropic, OpenAI and OpenRouter providers", () => {

apps/brunch-agent/test/database-config.test.ts → apps/brunch-agent/src/server/database-config.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, test } from "vitest";
 
 import { brunchEnv } from "@hashintel/brunch-agent";
 
-import { loadDatabaseConfig } from "../src/server/database-config.ts";
+import { loadDatabaseConfig } from "./database-config.ts";
 
 const productionEnvironment = {
   NODE_ENV: "production",

apps/brunch-agent/test/deployment-smoke-validation.test.ts → apps/brunch-agent/src/server/deployment-smoke-validation.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, test, vi } from "vitest";
 import {
   validatePersistedHistory,
   validateUiMessageStream,
-} from "../src/server/deployment-smoke-validation.ts";
+} from "./deployment-smoke-validation.ts";
 
 const streamOf = (...values: string[]): ReadableStream<Uint8Array> => {
   const encoder = new TextEncoder();

apps/brunch-agent/test/dev-configuration-preflight.test.ts → apps/brunch-agent/src/server/dev-configuration-preflight.test.ts

@@ -4,11 +4,11 @@ import { join } from "node:path";
 
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-import { checkDevConfiguration } from "../src/server/dev-configuration-preflight.ts";
 import {
   selectChatModelSpecifier,
   selectChatThinking,
-} from "../src/shared/chat-model.ts";
+} from "../shared/chat-model.ts";
+import { checkDevConfiguration } from "./dev-configuration-preflight.ts";
 
 const syntheticKey = "synthetic-config-fixture-not-a-real-credential";
 let root: string;

apps/brunch-agent/test/health.test.ts → apps/brunch-agent/src/server/health.test.ts

@@ -1,7 +1,7 @@
 import { Hono } from "hono";
 import { expect, test, vi } from "vitest";
 
-import { healthHandler } from "../src/server/health.ts";
+import { healthHandler } from "./health.ts";
 
 test("health reports liveness without consulting dependencies", async () => {
   const dependency = vi.fn<() => void>();

apps/brunch-agent/test/agent-ownership.test.ts → apps/brunch-agent/src/server/http/agent-ownership.test.ts

@@ -3,11 +3,11 @@ import { expect, test } from "vitest";
 
 import { brunchRoutes } from "@hashintel/brunch-agent";
 
-import { agentOwnershipGuard } from "../src/server/http/ownership.ts";
 import {
   agentOwnershipHeaders,
   flueConversationIdFrom,
-} from "../src/shared/conversation/identity.ts";
+} from "../../shared/conversation/identity.ts";
+import { agentOwnershipGuard } from "./ownership.ts";
 
 const mount = `${brunchRoutes.agents}/${brunchRoutes.petrinautAgent}`;
 const app = new Hono();

apps/brunch-agent/test/assets.test.ts → apps/brunch-agent/src/server/http/assets.test.ts

@@ -27,7 +27,7 @@ import { pathToFileURL } from "node:url";
 import { Hono } from "hono";
 import { afterAll, describe, expect, test } from "vitest";
 
-import { assetHandler } from "../src/server/http/assets";
+import { assetHandler } from "./assets";
 
 const uiRoot = mkdtempSync(join(tmpdir(), "brunch-assets-"));
 const BINARY_BYTES = Uint8Array.from({ length: 256 }, (_, i) => i);

apps/brunch-agent/test/cors.test.ts → apps/brunch-agent/src/server/http/cors.test.ts

@@ -7,15 +7,12 @@ import {
   brunchRoutes,
 } from "@hashintel/brunch-agent";
 
-import {
-  createAgentCors,
-  parseCorsAllowedOrigins,
-} from "../src/server/http/cors.ts";
-import { agentOwnershipGuard } from "../src/server/http/ownership.ts";
 import {
   agentOwnershipHeaders,
   flueConversationIdFrom,
-} from "../src/shared/conversation/identity.ts";
+} from "../../shared/conversation/identity.ts";
+import { createAgentCors, parseCorsAllowedOrigins } from "./cors.ts";
+import { agentOwnershipGuard } from "./ownership.ts";
 
 describe("parseCorsAllowedOrigins", () => {
   test("grants no cross-origin access when configuration is absent or blank", () => {

apps/brunch-agent/test/live-tool-route.test.ts → apps/brunch-agent/src/server/http/live-tool-route.test.ts

@@ -7,11 +7,11 @@ import {
   liveToolRouteSegment,
 } from "@local/flue-aisdk-transport/server";
 
-import { agentOwnershipGuard } from "../src/server/http/ownership.ts";
 import {
   agentOwnershipHeaders,
   flueConversationIdFrom,
-} from "../src/shared/conversation/identity.ts";
+} from "../../shared/conversation/identity.ts";
+import { agentOwnershipGuard } from "./ownership.ts";
 
 const mount = "/agents/chat";
 const identity = {