Address catalogue conformance findings

Author: gokhanarkan

go/rpc/catalogue_conformance_test.go

@@ -136,3 +136,20 @@ func TestCatalogSearchResultPreservesRefusalsAndFailures(t *testing.T) {
 		})
 	}
 }
+
+func TestCatalogSearchResultRejectsUnknownCandidateKinds(t *testing.T) {
+	_, err := unmarshalCatalogSearchResult([]byte(`{
+		"kind":"succeeded",
+		"searchId":"search-unknown",
+		"candidates":[{
+			"kind":"future-kind",
+			"handle":"opaque:future/03-do-not-parse",
+			"rawCard":{"secret":"must-not-survive"}
+		}],
+		"truncated":false,
+		"negotiated":{"runtimeProtocolVersion":1,"grantedCapabilities":[]}
+	}`))
+	if err == nil {
+		t.Fatal("unknown catalogue candidate kind with rawCard must be rejected")
+	}
+}

go/rpc/zrpc.go

@@ -7,7 +7,7 @@
     "generate:java": "tsx java.ts"
   },
   "dependencies": {
-    "@github/copilot": "^1.0.83-3",
+    "@github/copilot": "1.0.83-3",
     "json-schema": "^0.4.0",
     "tsx": "^4.23.13"
   }

go/rpc/zrpc_encoding.go

@@ -805,6 +805,7 @@ did not produce the multi-release output. Re-build on JDK 25+ and verify the
                                     <workingDirectory>${project.parent.basedir}/scripts/codegen</workingDirectory>
                                     <arguments>
                                         <argument>install</argument>
+                                        <argument>--save-exact</argument>
                                         <argument>@github/copilot@${copilot.schema.version}</argument>
                                     </arguments>
                                 </configuration>

java/scripts/codegen/package-lock.json

@@ -261,3 +261,38 @@ async def test_catalog_search_preserves_refusals_and_failures(payload, expected_
     )
 
     assert isinstance(result, expected_type)
+
+
+@pytest.mark.asyncio
+async def test_catalog_search_rejects_unknown_candidate_kinds():
+    client = AsyncMock()
+    client.request = AsyncMock(
+        return_value={
+            "kind": "succeeded",
+            "searchId": "search-unknown",
+            "candidates": [
+                {
+                    "kind": "future-kind",
+                    "handle": "opaque:future/03-do-not-parse",
+                    "rawCard": {"secret": "must-not-survive"},
+                }
+            ],
+            "truncated": False,
+            "negotiated": {
+                "runtimeProtocolVersion": 1,
+                "grantedCapabilities": [],
+            },
+        }
+    )
+    api = ServerCatalogApi(client)
+
+    with pytest.raises(ValueError, match="Unknown CatalogCandidate kind"):
+        await api.search(
+            CatalogSearchRequest(
+                contract=CatalogClientContract(
+                    protocol_version=1,
+                    required_capabilities=[],
+                ),
+                query="example",
+            )
+        )

java/scripts/codegen/package.json

@@ -20,6 +20,11 @@ const sdkPackageLock = JSON.parse(
 ) as { packages?: Record<string, { version?: string }> };
 const expectedPackageVersion =
     sdkPackageLock.packages?.["node_modules/@github/copilot"]?.version;
+const javaCodegenPackageJson = JSON.parse(
+    await fs.readFile(path.join(REPO_ROOT, "java/scripts/codegen/package.json"), "utf8")
+) as { dependencies?: Record<string, string> };
+const javaCodegenPackageVersion =
+    javaCodegenPackageJson.dependencies?.["@github/copilot"];
 const packageJson = JSON.parse(
     await fs.readFile(path.join(packageRoot, "package.json"), "utf8")
 ) as { version?: string };
@@ -51,6 +56,10 @@ assert(
     packageJson.version === expectedPackageVersion,
     `expected @github/copilot ${expectedPackageVersion}, received ${packageJson.version ?? "unknown"}`
 );
+assert(
+    javaCodegenPackageVersion === expectedPackageVersion,
+    `java/scripts/codegen must pin @github/copilot exactly to ${expectedPackageVersion}`
+);
 assert(
     schema.server?.catalog?.search?.rpcMethod === "catalog.search",
     "catalog.search is missing"

java/sdk/pom.xml

@@ -1804,7 +1804,7 @@ function emitGoFlatDiscriminatedUnion(
 
     const unmarshalFuncName = goUnexportedFunctionName("unmarshal", typeName);
     const rawDataName = `Raw${typeName}${ctx.discriminatedUnionRawVariantSuffix ?? "Data"}`;
-    const hasRawVariant = discriminator.valueKind === "string";
+    const hasRawVariant = discriminator.valueKind === "string" && typeName !== "CatalogCandidate";
     const markerName = toGoUnexportedIdentifier(typeName);
     ctx.discriminatedUnions.set(typeName, { typeName, unmarshalFuncName });
 
@@ -1893,7 +1893,7 @@ function emitGoFlatDiscriminatedUnion(
         unmarshalLines.push(`\t\treturn &${rawDataName}{Discriminator: ${rawDiscExpr}, Raw: data}, nil`);
     }
     unmarshalLines.push(`\t}`);
-    if (discriminator.valueKind === "boolean") {
+    if (!hasRawVariant) {
         unmarshalLines.push(`\treturn nil, errors.New("data did not match any union variant for ${typeName}")`);
     }
     unmarshalLines.push(`}`);