Merge branch 'main' into edburns/dd-3012834-experimental-annotation

Author: edburns

.github/workflows/update-copilot-dependency.yml

@@ -114,10 +114,6 @@ jobs:
         working-directory: ./java
         run: mvn generate-sources -Pcodegen
 
-      - name: Compile Java SDK (validate generated code)
-        working-directory: ./java
-        run: mvn compile -Pskip-test-harness
-
       - name: Create pull request
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

dotnet/test/E2E/SessionFsE2ETests.cs

@@ -410,8 +410,10 @@ public async Task Should_Write_Workspace_Metadata_Via_SessionFs()
             Assert.Contains("56", msg?.Data.Content ?? string.Empty);
 
             var workspaceYamlPath = GetStoredPath(providerRoot, session.SessionId, $"{SessionFsConfig.SessionStatePath}/workspace.yaml");
-            await WaitForConditionAsync(() => File.Exists(workspaceYamlPath), TimeSpan.FromSeconds(30));
-            Assert.Contains(session.SessionId, await ReadAllTextSharedAsync(workspaceYamlPath));
+            await WaitForConditionAsync(
+                async () => File.Exists(workspaceYamlPath)
+                    && (await ReadAllTextSharedAsync(workspaceYamlPath)).Contains(session.SessionId),
+                TimeSpan.FromSeconds(30));
 
             var indexPath = GetStoredPath(providerRoot, session.SessionId, $"{SessionFsConfig.SessionStatePath}/checkpoints/index.md");
             await WaitForConditionAsync(() => File.Exists(indexPath), TimeSpan.FromSeconds(30));
@@ -442,8 +444,10 @@ public async Task Should_Persist_Plan_Md_Via_SessionFs()
             await session.Rpc.Plan.UpdateAsync("# Test Plan\n\nThis is a test.");
 
             var planPath = GetStoredPath(providerRoot, session.SessionId, $"{SessionFsConfig.SessionStatePath}/plan.md");
-            await WaitForConditionAsync(() => File.Exists(planPath), TimeSpan.FromSeconds(30));
-            Assert.Contains("This is a test.", await ReadAllTextSharedAsync(planPath));
+            await WaitForConditionAsync(
+                async () => File.Exists(planPath)
+                    && (await ReadAllTextSharedAsync(planPath)).Contains("This is a test."),
+                TimeSpan.FromSeconds(30));
 
             await session.DisposeAsync();
         }

python/e2e/test_session_fs_e2e.py

@@ -235,9 +235,7 @@ async def test_should_write_workspace_metadata_via_sessionfs(
         workspace_yaml_path = provider_path(
             provider_root, session.session_id, f"{SESSION_STATE_PATH}/workspace.yaml"
         )
-        await wait_for_path(workspace_yaml_path)
-        yaml_content = workspace_yaml_path.read_text(encoding="utf-8")
-        assert "id:" in yaml_content
+        await wait_for_content(workspace_yaml_path, "id:")
 
         # Checkpoint index should also exist
         index_path = provider_path(
@@ -265,9 +263,7 @@ async def test_should_persist_plan_md_via_sessionfs(
         plan_path = provider_path(
             provider_root, session.session_id, f"{SESSION_STATE_PATH}/plan.md"
         )
-        await wait_for_path(plan_path)
-        content = plan_path.read_text(encoding="utf-8")
-        assert "# Test Plan" in content
+        await wait_for_content(plan_path, "# Test Plan")
 
         await session.disconnect()
 

rust/src/generated/api_types.rs

@@ -1,6 +1,7 @@
 //! Auto-generated from api.schema.json — do not edit manually.
 
 #![allow(clippy::large_enum_variant)]
+#![allow(dead_code)]
 
 use std::collections::HashMap;
 

rust/src/generated/rpc.rs

@@ -7,6 +7,7 @@
 
 #![allow(missing_docs)]
 #![allow(clippy::too_many_arguments)]
+#![allow(dead_code)]
 
 use super::api_types::{rpc_methods, *};
 use super::session_events::SessionMode;

scripts/codegen/go.ts

@@ -1731,6 +1731,27 @@ function goVariantMatchFunctionLines(
     return lines;
 }
 
+function goDiscriminatorMethodName(
+    typeName: string,
+    discriminatorProp: string,
+    discGoName: string,
+    variants: GoDiscriminatedUnionVariant[],
+    ctx: GoCodegenCtx
+): string {
+    const collidesWithVariantField = variants.some((variant) => {
+        const resolved = resolveSchema(variant.schema, ctx.definitions) ?? variant.schema;
+        const objectSchema = resolveObjectSchema(resolved, ctx.definitions) ?? resolved;
+        return Object.keys(objectSchema.properties ?? {}).some((propName) => {
+            if (propName === discriminatorProp) {
+                return variant.discriminatorValues.length > 1 && discGoName === "Discriminator";
+            }
+            return toGoFieldName(propName) === discGoName;
+        });
+    });
+
+    return collidesWithVariantField ? `${toGoUnexportedIdentifier(typeName)}${discGoName}` : discGoName;
+}
+
 /**
  * Emit a Go interface for a discriminated union (anyOf with const discriminator).
  */
@@ -1748,7 +1769,7 @@ function emitGoFlatDiscriminatedUnion(
     const mapping = discriminator.mapping;
     const unionVariants = [...discriminator.variants].sort((left, right) => compareGoTypeNames(left.typeName, right.typeName));
     const discGoName = toGoFieldName(discriminatorProp);
-    const discriminatorMethodName = discGoName;
+    const discriminatorMethodName = goDiscriminatorMethodName(typeName, discriminatorProp, discGoName, unionVariants, ctx);
     let discEnumName: string | undefined;
     let discGoType = "bool";
     if (discriminator.valueKind === "string") {

scripts/codegen/rust.ts

@@ -1545,6 +1545,7 @@ function generateApiTypesCode(
 	out.push("//! Auto-generated from api.schema.json — do not edit manually.");
 	out.push("");
 	out.push("#![allow(clippy::large_enum_variant)]");
+	out.push("#![allow(dead_code)]");
 	out.push("");
 	out.push("use std::collections::HashMap;");
 	out.push("");
@@ -1776,6 +1777,17 @@ function getResultTypeName(
 	return `${toPascalCase(method.rpcMethod)}Result`;
 }
 
+function methodUsesInternalSchema(
+	schema: JSONSchema7 | null | undefined,
+	defCollections: DefinitionCollections,
+): boolean {
+	if (!schema) return false;
+
+	const nonNullable = getNullableInner(schema) ?? schema;
+	const resolved = resolveSchema(nonNullable, defCollections) ?? nonNullable;
+	return isSchemaInternal(resolved);
+}
+
 function pushNamespaceMethodBody(
 	out: string[],
 	constName: string,
@@ -1884,7 +1896,12 @@ function emitNamespaceMethod(
 	};
 
 	const paramArg = hasParams ? `, params: ${paramsTypeName}` : "";
-	const fnVis = method.visibility === "internal" ? "pub(crate)" : "pub";
+	const fnVis =
+		method.visibility === "internal" ||
+		methodUsesInternalSchema(method.params, defCollections) ||
+		methodUsesInternalSchema(method.result, defCollections)
+			? "pub(crate)"
+			: "pub";
 
 	if (hasParams && paramsInfo.optional) {
 		out.push(...buildDocs(false));
@@ -1949,6 +1966,7 @@ function generateRpcCode(apiSchema: ApiSchema): string {
 	out.push("");
 	out.push("#![allow(missing_docs)]");
 	out.push("#![allow(clippy::too_many_arguments)]");
+	out.push("#![allow(dead_code)]");
 	out.push("");
 	out.push("use super::api_types::{rpc_methods, *};");
 	const externalTypeRefs = new Map<string, Set<string>>();

test/snapshots/builtin_tools/should_search_for_patterns_in_files.yaml

@@ -50,3 +50,33 @@ conversations:
           The search found **2 lines** starting with 'ap':
           - Line 1: `apple`
           - Line 3: `apricot`
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Search for lines starting with 'ap' in the file 'data.txt'. Tell me which lines matched.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: report_intent
+              arguments: '{"intent":"Searching file for pattern"}'
+          - id: toolcall_1
+            type: function
+            function:
+              name: grep
+              arguments: '{"pattern":"^ap","path":"${workdir}/data.txt","output_mode":"content","-n":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Intent logged
+      - role: tool
+        tool_call_id: toolcall_1
+        content: |-
+          ${workdir}/data.txt:1:apple
+          ${workdir}/data.txt:3:apricot
+      - role: assistant
+        content: |-
+          The search found **2 lines** starting with 'ap':
+          - Line 1: `apple`
+          - Line 3: `apricot`