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
@@ -39,6 +39,97 @@ llm_policy:
  allowed: [zai/glm-5.2]
 `;

+function withDwhRestTransport(source: string): string {
+  return source.replace(
+    "supported_transports: [postgres_direct]",
+    "supported_transports: [postgres_direct, rest_api]",
+  );
+}
+
+function withDwhRestDiagnostic(source: string): string {
+  return withDwhRestTransport(source).concat(`diagnostics:
+  dwh_rest:
+    method: GET
+    path: /health
+    auth: none
+    response:
+      database: database
+      schema: schema
+`);
+}
+
+function withEmbeddingDiagnostic(source: string): string {
+  return source.concat(`diagnostics:
+  embedding:
+    method: GET
+    path: /models
+    auth: none
+    response:
+      model: model
+      dimensions: dimensions
+`);
+}
+
+function withDwhRestAndEmbeddingDiagnostics(source: string): string {
+  return withDwhRestTransport(source).concat(`diagnostics:
+  dwh_rest:
+    method: GET
+    path: /health
+    auth: none
+    response:
+      database: database
+      schema: schema
+  embedding:
+    method: GET
+    path: /models
+    auth: none
+    response:
+      model: model
+      dimensions: dimensions
+`);
+}
+
+function withVectorRestTransport(source: string): string {
+  return source.replace(
+    "supported_transports: [pgvector_direct]",
+    "supported_transports: [pgvector_direct, rest_api]",
+  );
+}
+
+function withVectorMetadataDiagnostic(source: string): string {
+  return withVectorRestTransport(source).concat(`diagnostics:
+  vector_rest:
+    metadata:
+      method: GET
+      path: /metadata
+      auth: none
+      response:
+        collection: collection
+        dimensions: dimensions
+        distance: distance
+`);
+}
+
+function withReversibleVectorProbe(source: string): string {
+  return withVectorRestTransport(source).concat(`diagnostics:
+  vector_rest:
+    metadata:
+      method: GET
+      path: /metadata
+      auth: none
+      response:
+        collection: collection
+        dimensions: dimensions
+        distance: distance
+    reversible_probe:
+      method: POST
+      path: /probe
+      auth: bearer
+      response:
+        operation: operation
+`);
+}
+
 const runFile = promisify(execFile);
 const temporaryRoots: string[] = [];

@@ -237,6 +328,32 @@ test("reports stale publish conflicts with expected and actual revisions", async
  });
 });

+test.each([
+  ["adds", withEmbeddingDiagnostic(withDwhRestTransport(validYaml)), withDwhRestAndEmbeddingDiagnostics(validYaml), "diagnostics.dwh_rest"],
+  ["removes", withDwhRestAndEmbeddingDiagnostics(validYaml), withEmbeddingDiagnostic(withDwhRestTransport(validYaml)), "diagnostics.dwh_rest"],
+  ["adds", withVectorMetadataDiagnostic(validYaml), withReversibleVectorProbe(validYaml), "diagnostics.vector_rest.reversible_probe"],
+  ["removes", withReversibleVectorProbe(validYaml), withVectorMetadataDiagnostic(validYaml), "diagnostics.vector_rest.reversible_probe"],
+])("reports an optional diagnostics branch when the registry %s it", async (_operation, baseSource, remoteSource, field) => {
+  const remote = await fixture(baseSource);
+  const registry = new WorkspaceRegistry(config(join(remote.root, "registry"), remote.remote));
+  await registry.bootstrap();
+  const initial = await registry.read("psd-clinical");
+  writeFileSync(join(remote.source, "workspaces", "psd-clinical.yaml"), remoteSource);
+  await git(remote.source, ["add", "workspaces/psd-clinical.yaml"]);
+  await git(remote.source, ["commit", "-m", `Registry ${_operation} diagnostic branch`]);
+  await git(remote.source, ["push", "origin", "main"]);
+
+  await expect(registry.publish({
+    action: "update",
+    workspace: workspaceWith("psd-clinical", { description: "Local stale change" }),
+    baseCommit: initial.revision.commit,
+    baseBlob: initial.revision.blob,
+  })).rejects.toMatchObject({
+    code: "workspace_conflict",
+    fields: [field],
+  });
+});
+
 test("restores a clean checkout after a failed commit and retries publication", async () => {
  const remote = await fixture();
  const root = join(remote.root, "registry");