fix: report nested workspace conflicts

2026-08-04 07:05:51 +02:00
parent 234b40e7cf
commit 8effdc6c89
6 changed files with 225 additions and 2 deletions
@@ -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,