fix: report nested workspace conflicts

frontend/src/api/workspaces.test.ts

@@ -50,6 +50,41 @@ const diagnosticConflictFields = [
   "diagnostics.embedding.auth", "diagnostics.embedding.response.model", "diagnostics.embedding.response.dimensions",
 ] as const;
 
+const optionalDiagnosticsConflictFields = [
+  "diagnostics",
+  "diagnostics.dwh_rest",
+  "diagnostics.vector_rest",
+  "diagnostics.vector_rest.reversible_probe",
+  "diagnostics.embedding",
+] as const;
+
+const diagnosticsWorkspace: CanonicalWorkspace = {
+  ...workspace,
+  dwh: { ...workspace.dwh, supported_transports: ["postgres_direct", "rest_api"] },
+  semantic_index: { ...workspace.semantic_index, vector_store: { ...workspace.semantic_index.vector_store, supported_transports: ["pgvector_direct", "rest_api"] } },
+  diagnostics: {
+    dwh_rest: { method: "POST", path: "/rpc/ping", auth: "bearer", response: { database: "database", schema: "schema" } },
+    vector_rest: {
+      metadata: { method: "GET", path: "/vector/metadata", auth: "bearer", response: { collection: "collection", dimensions: "dimensions", distance: "distance" } },
+      reversible_probe: { method: "POST", path: "/vector/probe", auth: "x-api-key", response: { operation: "operation" } },
+    },
+    embedding: { method: "GET", path: "/models", auth: "none", response: { model: "model", dimensions: "dimensions" } },
+  },
+};
+
+test.each(optionalDiagnosticsConflictFields)("accepts optional diagnostics conflict branch %s", async (field) => {
+  server.use(http.post("http://localhost:8787/workspaces/publish", () => HttpResponse.json({
+    code: "workspace_conflict", message: "Workspace changed in the registry.", fields: [field],
+    expected: { commit: "a".repeat(40), blob: "b".repeat(40) },
+    actual: { commit: "c".repeat(40), blob: "d".repeat(40) },
+    base: workspace, local: diagnosticsWorkspace, remote: diagnosticsWorkspace,
+  }, { status: 409 })));
+
+  const error = await publishWorkspace({ action: "update", workspace: diagnosticsWorkspace, baseCommit: "a".repeat(40), baseBlob: "b".repeat(40) }).catch((cause: unknown) => cause);
+
+  expect(asWorkspaceConflict(error)).toMatchObject({ fields: [field] });
+});
+
 test.each(diagnosticConflictFields)("accepts canonical diagnostic conflict leaf %s with its remote revision", async (field) => {
   const diagnosticsWorkspace: CanonicalWorkspace = {
     ...workspace,

frontend/src/api/workspaces.ts

@@ -142,6 +142,7 @@ const conflictFields = new Set([
   "semantic_index.vector_store.timeout_ms", "semantic_index.vector_store.supported_transports",
   "semantic_index.embedding.provider", "semantic_index.embedding.model", "semantic_index.embedding.dimensions",
   "semantic_index.embedding.timeout_ms", "semantic_index.vector_writer", "llm_policy.default", "llm_policy.allowed",
+  "diagnostics", "diagnostics.dwh_rest", "diagnostics.vector_rest", "diagnostics.vector_rest.reversible_probe", "diagnostics.embedding",
   "diagnostics.dwh_rest.method", "diagnostics.dwh_rest.path", "diagnostics.dwh_rest.auth",
   "diagnostics.dwh_rest.response.database", "diagnostics.dwh_rest.response.schema",
   "diagnostics.vector_rest.metadata.method", "diagnostics.vector_rest.metadata.path", "diagnostics.vector_rest.metadata.auth",

frontend/src/shell/WorkspacePublishDialog.test.tsx

@@ -30,6 +30,18 @@ const conflict: WorkspaceConflict = {
   remote: { ...workspace, semantic_index: { ...workspace.semantic_index, embedding: { ...workspace.semantic_index.embedding, model: "remote-model" } } },
 };
 
+const diagnosticsBranchConflict: WorkspaceConflict = {
+  ...conflict,
+  fields: ["diagnostics.dwh_rest"],
+  base: workspace,
+  remote: workspace,
+  local: {
+    ...workspace,
+    dwh: { ...workspace.dwh, supported_transports: ["postgres_direct", "rest_api"] },
+    diagnostics: { dwh_rest: { method: "GET", path: "/health", auth: "none", response: { database: "database", schema: "schema" } } },
+  },
+};
+
 beforeEach(() => {
   server.use(http.post("http://localhost:8787/workspaces/validate", () => HttpResponse.json({ workspace, contract: {} })));
 });
@@ -101,6 +113,26 @@ test("saves explicit local choices as a rebased draft and does not republish it"
   expect(publishCalls).toBe(1);
 });
 
+test("rebases a selected optional diagnostics branch into the revised draft", async () => {
+  const user = userEvent.setup();
+  const saved = vi.fn();
+  server.use(http.post("http://localhost:8787/workspaces/publish", () => HttpResponse.json({
+    ...diagnosticsBranchConflict, message: "Workspace changed in the registry.",
+  }, { status: 409 })));
+  render(<WorkspacePublishDialog open request={request} onOpenChange={vi.fn()} onPublished={vi.fn()} onResolved={saved} onPull={vi.fn()} onReload={vi.fn()} />);
+
+  await user.click(screen.getByRole("button", { name: "Validate draft" }));
+  await user.click(await screen.findByRole("button", { name: "Publish" }));
+  await user.click(screen.getByRole("button", { name: "Confirm publish" }));
+  await user.click(await screen.findByRole("radio", { name: "Use your draft for diagnostics.dwh_rest" }));
+  await user.click(screen.getByRole("button", { name: "Save revised draft" }));
+
+  expect(saved).toHaveBeenCalledWith(expect.objectContaining({
+    baseCommit: "c".repeat(40), baseBlob: "d".repeat(40),
+    workspace: expect.objectContaining({ diagnostics: diagnosticsBranchConflict.local.diagnostics }),
+  }));
+});
+
 test("keeps a conflict open and redacts a failed registry pull", async () => {
   const user = userEvent.setup();
   server.use(http.post("http://localhost:8787/workspaces/publish", () => HttpResponse.json({