Consume standardized schema titles

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: SteveSandersonMS

dotnet/src/Generated/Rpc.cs

@@ -12,7 +12,7 @@ import path from "path";
 import { promisify } from "util";
 import type { JSONSchema7 } from "json-schema";
 import {
-    applyTitleSuggestions,
+    cloneSchemaForCodegen,
     getApiSchemaPath,
     getRpcSchemaTypeName,
     getSessionEventsSchemaPath,
@@ -584,7 +584,7 @@ namespace GitHub.Copilot.SDK;
 export async function generateSessionEvents(schemaPath?: string): Promise<void> {
     console.log("C#: generating session-events...");
     const resolvedPath = schemaPath ?? (await getSessionEventsSchemaPath());
-    const schema = applyTitleSuggestions(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as JSONSchema7);
+    const schema = cloneSchemaForCodegen(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as JSONSchema7);
     const code = generateSessionEventsCode(schema);
     const outPath = await writeGeneratedFile("dotnet/src/Generated/SessionEvents.cs", code);
     console.log(`  ✓ ${outPath}`);
@@ -1138,7 +1138,7 @@ internal static class Diagnostics
 export async function generateRpc(schemaPath?: string): Promise<void> {
     console.log("C#: generating RPC types...");
     const resolvedPath = schemaPath ?? (await getApiSchemaPath());
-    const schema = applyTitleSuggestions(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as ApiSchema);
+    const schema = cloneSchemaForCodegen(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as ApiSchema);
     const code = generateRpcCode(schema);
     const outPath = await writeGeneratedFile("dotnet/src/Generated/Rpc.cs", code);
     console.log(`  ✓ ${outPath}`);

go/rpc/generated_rpc.go

@@ -12,7 +12,7 @@ import type { JSONSchema7 } from "json-schema";
 import { FetchingJSONSchemaStore, InputData, JSONSchemaInput, quicktype } from "quicktype-core";
 import { promisify } from "util";
 import {
-    applyTitleSuggestions,
+    cloneSchemaForCodegen,
     getApiSchemaPath,
     getRpcSchemaTypeName,
     getSessionEventsSchemaPath,
@@ -842,7 +842,7 @@ async function generateSessionEvents(schemaPath?: string): Promise<void> {
     console.log("Go: generating session-events...");
 
     const resolvedPath = schemaPath ?? (await getSessionEventsSchemaPath());
-    const schema = applyTitleSuggestions(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as JSONSchema7);
+    const schema = cloneSchemaForCodegen(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as JSONSchema7);
     const processed = postProcessSchema(schema);
 
     const code = generateGoSessionEventsCode(processed);
@@ -859,7 +859,7 @@ async function generateRpc(schemaPath?: string): Promise<void> {
     console.log("Go: generating RPC types...");
 
     const resolvedPath = schemaPath ?? (await getApiSchemaPath());
-    const schema = applyTitleSuggestions(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as ApiSchema);
+    const schema = cloneSchemaForCodegen(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as ApiSchema);
 
     const allMethods = [
         ...collectRpcMethods(schema.server || {}),

nodejs/src/generated/rpc.ts

@@ -10,7 +10,7 @@ import fs from "fs/promises";
 import type { JSONSchema7 } from "json-schema";
 import { FetchingJSONSchemaStore, InputData, JSONSchemaInput, quicktype } from "quicktype-core";
 import {
-    applyTitleSuggestions,
+    cloneSchemaForCodegen,
     getApiSchemaPath,
     getRpcSchemaTypeName,
     getSessionEventsSchemaPath,
@@ -213,7 +213,7 @@ async function generateSessionEvents(schemaPath?: string): Promise<void> {
     console.log("Python: generating session-events...");
 
     const resolvedPath = schemaPath ?? (await getSessionEventsSchemaPath());
-    const schema = applyTitleSuggestions(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as JSONSchema7);
+    const schema = cloneSchemaForCodegen(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as JSONSchema7);
     const resolvedSchema = (schema.definitions?.SessionEvent as JSONSchema7) || schema;
     const processed = postProcessSchema(resolvedSchema);
 
@@ -269,7 +269,7 @@ async function generateRpc(schemaPath?: string): Promise<void> {
     console.log("Python: generating RPC types...");
 
     const resolvedPath = schemaPath ?? (await getApiSchemaPath());
-    const schema = applyTitleSuggestions(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as ApiSchema);
+    const schema = cloneSchemaForCodegen(JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as ApiSchema);
 
     const allMethods = [
         ...collectRpcMethods(schema.server || {}),

nodejs/src/generated/session-events.ts

@@ -16,6 +16,7 @@ import {
     isNodeFullyExperimental,
     isRpcMethod,
     postProcessSchema,
+    stripNonAnnotationTitles,
     writeGeneratedFile,
     type ApiSchema,
     type RpcMethod,
@@ -130,7 +131,7 @@ async function generateSessionEvents(schemaPath?: string): Promise<void> {
 
     const resolvedPath = schemaPath ?? (await getSessionEventsSchemaPath());
     const schema = JSON.parse(await fs.readFile(resolvedPath, "utf-8")) as JSONSchema7;
-    const processed = postProcessSchema(schema);
+    const processed = postProcessSchema(stripNonAnnotationTitles(schema));
 
     const ts = await compile(processed, "SessionEvent", {
         bannerComment: `/**
@@ -176,7 +177,7 @@ import type { MessageConnection } from "vscode-jsonrpc/node.js";
 
     for (const method of [...allMethods, ...clientSessionMethods]) {
         if (method.result) {
-            const compiled = await compile(method.result, resultTypeName(method), {
+            const compiled = await compile(stripNonAnnotationTitles(method.result), resultTypeName(method), {
                 bannerComment: "",
                 additionalProperties: false,
             });
@@ -188,7 +189,7 @@ import type { MessageConnection } from "vscode-jsonrpc/node.js";
         }
 
         if (method.params?.properties && Object.keys(method.params.properties).length > 0) {
-            const paramsCompiled = await compile(method.params, paramsTypeName(method), {
+            const paramsCompiled = await compile(stripNonAnnotationTitles(method.params), paramsTypeName(method), {
                 bannerComment: "",
                 additionalProperties: false,
             });

python/copilot/generated/rpc.py

@@ -118,28 +118,47 @@ export interface RpcMethod {
 }
 
 export function getRpcSchemaTypeName(schema: JSONSchema7 | null | undefined, fallback: string): string {
-    const titleSuggestion = (schema as JSONSchema7 & { titleSuggestion?: unknown } | null | undefined)?.titleSuggestion;
     if (typeof schema?.title === "string") return schema.title;
-    return typeof titleSuggestion === "string" ? titleSuggestion : fallback;
+    return fallback;
 }
 
-export function applyTitleSuggestions<T>(value: T): T {
+export function cloneSchemaForCodegen<T>(value: T): T {
     if (Array.isArray(value)) {
-        return value.map((item) => applyTitleSuggestions(item)) as T;
+        return value.map((item) => cloneSchemaForCodegen(item)) as T;
     }
 
     if (value && typeof value === "object") {
         const result: Record<string, unknown> = {};
-        const source = value as Record<string, unknown>;
-        for (const [key, child] of Object.entries(source)) {
-            if (key === "titleSuggestion") {
+        for (const [key, child] of Object.entries(value as Record<string, unknown>)) {
+            if (key === "titleSource") {
                 continue;
             }
-            result[key] = applyTitleSuggestions(child);
+            result[key] = cloneSchemaForCodegen(child);
         }
 
-        if (typeof source.title !== "string" && typeof source.titleSuggestion === "string") {
-            result.title = source.titleSuggestion;
+        return result as T;
+    }
+
+    return value;
+}
+
+export function stripNonAnnotationTitles<T>(value: T): T {
+    if (Array.isArray(value)) {
+        return value.map((item) => stripNonAnnotationTitles(item)) as T;
+    }
+
+    if (value && typeof value === "object") {
+        const result: Record<string, unknown> = {};
+        const source = value as Record<string, unknown>;
+        const keepTitle = typeof source.title === "string" && source.titleSource === "annotation";
+        for (const [key, child] of Object.entries(source)) {
+            if (key === "titleSource") {
+                continue;
+            }
+            if (key === "title" && !keepTitle) {
+                continue;
+            }
+            result[key] = stripNonAnnotationTitles(child);
         }
 
         return result as T;
@@ -232,6 +251,7 @@ function sortJsonValue(value: unknown): unknown {
     if (value && typeof value === "object") {
         return Object.fromEntries(
             Object.entries(value as Record<string, unknown>)
+                .filter(([key]) => key !== "description" && key !== "titleSource")
                 .sort(([left], [right]) => left.localeCompare(right))
                 .map(([key, child]) => [key, sortJsonValue(child)])
         );