Merge branch 'main' into belaltaher8/tool-meta-passthrough

Author: belaltaher8

dotnet/src/Generated/Rpc.cs

@@ -1118,6 +1118,7 @@ private void UpdateOpenCanvasesFromEvent(SessionEvent sessionEvent)
             InstanceId = data.InstanceId,
             Status = data.Status,
             Title = data.Title,
+            Icon = data.Icon,
             Url = data.Url,
         });
     }

dotnet/src/Generated/SessionEvents.cs

@@ -166,6 +166,7 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
                 ExtensionName = "Counter Provider",
                 InstanceId = "counter-1",
                 Title = "Counter",
+                Icon = "beaker",
                 Status = "ready",
                 Url = "https://example.test/counter",
                 Input = JsonDocument.Parse("""{"seed":1}""").RootElement.Clone(),
@@ -200,6 +201,7 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
                 ExtensionName = "Counter Provider",
                 InstanceId = "counter-1",
                 Title = "Counter Updated",
+                Icon = "beaker-filled",
                 Status = "reconnected",
                 Url = "https://example.test/counter-updated",
                 Input = JsonDocument.Parse("""{"seed":2}""").RootElement.Clone(),
@@ -212,6 +214,7 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
             {
                 Assert.Equal("counter-1", canvas.InstanceId);
                 Assert.Equal("Counter Updated", canvas.Title);
+                Assert.Equal("beaker-filled", canvas.Icon);
                 Assert.Equal("reconnected", canvas.Status);
                 Assert.Equal("https://example.test/counter-updated", canvas.Url);
                 Assert.Equal(2, canvas.Input!.Value.GetProperty("seed").GetInt32());

dotnet/src/Session.cs

@@ -168,6 +168,24 @@ public void FromJson_UnknownEventType_WithUnknownEnumInData_DoesNotThrow()
         Assert.Equal("unknown", result.Type);
     }
 
+    [Fact]
+    public void FromJson_InternalEventType_ReturnsBaseSessionEvent()
+    {
+        var json = """
+            {
+                "id": "12345678-1234-1234-1234-123456789abc",
+                "timestamp": "2026-06-15T10:30:00Z",
+                "type": "session.memory_changed",
+                "data": {}
+            }
+            """;
+
+        var result = SessionEvent.FromJson(json);
+
+        Assert.IsType<SessionEvent>(result);
+        Assert.Equal("unknown", result.Type);
+    }
+
     [Fact]
     public void FromJson_KnownEventType_WithUnknownEnumInData_PreservesValue()
     {

dotnet/test/Unit/CanvasTests.cs

@@ -207,7 +207,7 @@ func generateSchemaForType(t reflect.Type) map[string]any {
 	}
 
 	// Handle pointer types
-	if t.Kind() == reflect.Ptr {
+	if t.Kind() == reflect.Pointer {
 		t = t.Elem()
 	}
 

dotnet/test/Unit/ForwardCompatibilityTests.cs

@@ -168,6 +168,7 @@ func TestEventFidelityE2E(t *testing.T) {
 
 		if answer == nil {
 			t.Fatal("Expected SendAndWait to return an assistant message")
+			return
 		}
 		if ad, ok := answer.Data.(*copilot.AssistantMessageData); !ok || !strings.Contains(ad.Content, "18") {
 			t.Errorf("Expected answer to contain '18', got %v", answer.Data)

go/definetool.go

@@ -604,6 +604,7 @@ func TestRPCServerE2E(t *testing.T) {
 		projectSkillPath := findSkillDiscoveryPath(skillPaths.Paths, ctx.WorkDir)
 		if projectSkillPath == nil {
 			t.Fatalf("Expected skill discovery paths to include %q", ctx.WorkDir)
+			return
 		}
 		if strings.TrimSpace(projectSkillPath.Path) == "" {
 			t.Fatal("Expected non-empty skill discovery path")
@@ -632,6 +633,7 @@ func TestRPCServerE2E(t *testing.T) {
 		projectAgentPath := findAgentDiscoveryPath(agentPaths.Paths, ctx.WorkDir)
 		if projectAgentPath == nil {
 			t.Fatalf("Expected agent discovery paths to include %q", ctx.WorkDir)
+			return
 		}
 		if strings.TrimSpace(projectAgentPath.Path) == "" {
 			t.Fatal("Expected non-empty agent discovery path")

go/internal/e2e/event_fidelity_e2e_test.go

@@ -159,6 +159,7 @@ func TestRpcServerMisc(t *testing.T) {
 		}
 		if users == nil {
 			t.Fatal("Expected non-nil users result")
+			return
 		}
 		for _, user := range *users {
 			userInfo, ok := user.AuthInfo.(*rpc.UserAuthInfo)

go/internal/e2e/rpc_server_e2e_test.go

@@ -58,6 +58,7 @@ func TestRpcServerPlugins(t *testing.T) {
 		listed := findPortedInstalledPlugin(afterInstall.Plugins, portedPluginName, portedMarketplaceName)
 		if listed == nil {
 			t.Fatalf("Expected installed plugin %q in marketplace %q", portedPluginName, portedMarketplaceName)
+			return
 		}
 		if !listed.Enabled {
 			t.Fatal("Expected listed marketplace plugin to be enabled")
@@ -229,6 +230,7 @@ func TestRpcServerPlugins(t *testing.T) {
 		mine := findPortedMarketplace(list.Marketplaces, portedMarketplaceName)
 		if mine == nil {
 			t.Fatalf("Expected marketplace %q in list %+v", portedMarketplaceName, list.Marketplaces)
+			return
 		}
 		if mine.IsDefault != nil && *mine.IsDefault {
 			t.Fatal("Expected local marketplace not to be marked default")