diff --git a/dotnet/src/Client.cs b/dotnet/src/Client.cs
index eaf9859bc..d0e00b56d 100644
--- a/dotnet/src/Client.cs
+++ b/dotnet/src/Client.cs
@@ -1648,6 +1648,11 @@ private static string FormatCliExitedMessage(string message, string stderrOutput
         Message = "CopilotClient.ConnectToServerAsync connecting to CLI server. Host={Host}, Port={Port}")]
     private static partial void LogConnectingToCliServer(ILogger logger, string host, int port);
 
+    [LoggerMessage(
+        Level = LogLevel.Warning,
+        Message = "[CLI] {Line}")]
+    private static partial void LogCliStderrLine(ILogger logger, string line);
+
     private static IOException CreateCliExitedException(string message, StringBuilder stderrBuffer)
     {
         string stderrOutput;
@@ -2324,7 +2329,7 @@ private async Task PumpAsync(Process process, ILogger logger, CancellationToken
                         Buffer.AppendLine(line);
                     }
 
-                    logger.LogWarning("[CLI] {Line}", line);
+                    LogCliStderrLine(logger, line);
                 }
             }
             catch (Exception e) when (cancellationToken.IsCancellationRequested
diff --git a/dotnet/src/Generated/Rpc.cs b/dotnet/src/Generated/Rpc.cs
index 7ec632a5e..91caad1e3 100644
--- a/dotnet/src/Generated/Rpc.cs
+++ b/dotnet/src/Generated/Rpc.cs
@@ -69,7 +69,9 @@ internal sealed class ConnectRequest
 /// <summary>Long context tier pricing (available for models with extended context windows).</summary>
 public sealed class ModelBillingTokenPricesLongContext
 {
-    /// <summary>Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens.</summary>
+    /// <summary>Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
     [JsonPropertyName("cachePrice")]
     public double? CachePrice { get; set; }
 
@@ -81,7 +83,9 @@ public sealed class ModelBillingTokenPricesLongContext
     [JsonPropertyName("cacheWritePrice")]
     public double? CacheWritePrice { get; set; }
 
-    /// <summary>Deprecated: use maxPromptTokens. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.</summary>
+    /// <summary>Use maxPromptTokens instead. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
     [JsonPropertyName("contextMax")]
     public long? ContextMax { get; set; }
 
@@ -105,7 +109,9 @@ public sealed class ModelBillingTokenPrices
     [JsonPropertyName("batchSize")]
     public long? BatchSize { get; set; }
 
-    /// <summary>Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens.</summary>
+    /// <summary>Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
     [JsonPropertyName("cachePrice")]
     public double? CachePrice { get; set; }
 
@@ -117,7 +123,9 @@ public sealed class ModelBillingTokenPrices
     [JsonPropertyName("cacheWritePrice")]
     public double? CacheWritePrice { get; set; }
 
-    /// <summary>Deprecated: use maxPromptTokens. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.</summary>
+    /// <summary>Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
     [JsonPropertyName("contextMax")]
     public long? ContextMax { get; set; }
 
@@ -370,2956 +378,3010 @@ internal sealed class AccountGetQuotaRequest
     public string? GitHubToken { get; set; }
 }
 
-/// <summary>Confirmation that the secret values were registered.</summary>
-public sealed class SecretsAddFilterValuesResult
+/// <summary>Initial authentication info for the session.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AuthInfoHmac), "hmac")]
+[JsonDerivedType(typeof(AuthInfoEnv), "env")]
+[JsonDerivedType(typeof(AuthInfoToken), "token")]
+[JsonDerivedType(typeof(AuthInfoCopilotApiToken), "copilot-api-token")]
+[JsonDerivedType(typeof(AuthInfoUser), "user")]
+[JsonDerivedType(typeof(AuthInfoGhCli), "gh-cli")]
+[JsonDerivedType(typeof(AuthInfoApiKey), "api-key")]
+public partial class AuthInfo
 {
-    /// <summary>Whether the values were successfully registered.</summary>
-    [JsonPropertyName("ok")]
-    public bool Ok { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Secret values to add to the redaction filter.</summary>
-internal sealed class SecretsAddFilterValuesRequest
-{
-    /// <summary>Raw secret values to register for redaction.</summary>
-    [JsonPropertyName("values")]
-    public IList<string> Values { get => field ??= []; set; }
-}
 
-/// <summary>Schema for the `DiscoveredMcpServer` type.</summary>
-public sealed class DiscoveredMcpServer
+/// <summary>Schema for the `CopilotUserResponseEndpoints` type.</summary>
+public sealed class CopilotUserResponseEndpoints
 {
-    /// <summary>Whether the server is enabled (not in the disabled list).</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Server name (config key).</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Configuration source: user, workspace, plugin, or builtin.</summary>
-    [JsonPropertyName("source")]
-    public McpServerSource Source { get; set; }
+    /// <summary>Gets or sets the <c>api</c> value.</summary>
+    [JsonPropertyName("api")]
+    public string? Api { get; set; }
 
-    /// <summary>Plugin name that provided this server, when source is plugin.</summary>
-    [JsonPropertyName("sourcePlugin")]
-    public string? SourcePlugin { get; set; }
+    /// <summary>Gets or sets the <c>origin-tracker</c> value.</summary>
+    [JsonPropertyName("origin-tracker")]
+    public string? OriginTracker { get; set; }
 
-    /// <summary>Plugin version that provided this server, when source is plugin.</summary>
-    [JsonPropertyName("sourcePluginVersion")]
-    public string? SourcePluginVersion { get; set; }
+    /// <summary>Gets or sets the <c>proxy</c> value.</summary>
+    [JsonPropertyName("proxy")]
+    public string? Proxy { get; set; }
 
-    /// <summary>Server transport type: stdio, http, sse (deprecated), or memory.</summary>
-    [JsonPropertyName("type")]
-    public DiscoveredMcpServerType? Type { get; set; }
+    /// <summary>Gets or sets the <c>telemetry</c> value.</summary>
+    [JsonPropertyName("telemetry")]
+    public string? Telemetry { get; set; }
 }
 
-/// <summary>MCP servers discovered from user, workspace, plugin, and built-in sources.</summary>
-public sealed class McpDiscoverResult
+/// <summary>RPC data type for CopilotUserResponseOrganizationListItem operations.</summary>
+public sealed class CopilotUserResponseOrganizationListItem
 {
-    /// <summary>MCP servers discovered from all sources.</summary>
-    [JsonPropertyName("servers")]
-    public IList<DiscoveredMcpServer> Servers { get => field ??= []; set; }
-}
+    /// <summary>Gets or sets the <c>login</c> value.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
 
-/// <summary>Optional working directory used as context for MCP server discovery.</summary>
-internal sealed class McpDiscoverRequest
-{
-    /// <summary>Working directory used as context for discovery (e.g., plugin resolution).</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+    /// <summary>Gets or sets the <c>name</c> value.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 }
 
-/// <summary>User-configured MCP servers, keyed by server name.</summary>
-public sealed class McpConfigList
+/// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.</summary>
+public sealed class CopilotUserResponseQuotaSnapshotsChat
 {
-    /// <summary>All MCP servers from user config, keyed by name.</summary>
-    [JsonPropertyName("servers")]
-    public IDictionary<string, JsonElement> Servers { get => field ??= new Dictionary<string, JsonElement>(); set; }
-}
+    /// <summary>Gets or sets the <c>entitlement</c> value.</summary>
+    [JsonPropertyName("entitlement")]
+    public double? Entitlement { get; set; }
 
-/// <summary>MCP server name and configuration to add to user configuration.</summary>
-internal sealed class McpConfigAddRequest
-{
-    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
-    [JsonPropertyName("config")]
-    public JsonElement Config { get; set; }
+    /// <summary>Gets or sets the <c>has_quota</c> value.</summary>
+    [JsonPropertyName("has_quota")]
+    public bool? HasQuota { get; set; }
 
-    /// <summary>Unique name for the MCP server.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-}
+    /// <summary>Gets or sets the <c>overage_count</c> value.</summary>
+    [JsonPropertyName("overage_count")]
+    public double? OverageCount { get; set; }
 
-/// <summary>MCP server name and replacement configuration to write to user configuration.</summary>
-internal sealed class McpConfigUpdateRequest
-{
-    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
-    [JsonPropertyName("config")]
-    public JsonElement Config { get; set; }
+    /// <summary>Gets or sets the <c>overage_permitted</c> value.</summary>
+    [JsonPropertyName("overage_permitted")]
+    public bool? OveragePermitted { get; set; }
 
-    /// <summary>Name of the MCP server to update.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-}
+    /// <summary>Gets or sets the <c>percent_remaining</c> value.</summary>
+    [JsonPropertyName("percent_remaining")]
+    public double? PercentRemaining { get; set; }
 
-/// <summary>MCP server name to remove from user configuration.</summary>
-internal sealed class McpConfigRemoveRequest
-{
-    /// <summary>Name of the MCP server to remove.</summary>
-    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
-    [MinLength(1)]
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-}
+    /// <summary>Gets or sets the <c>quota_id</c> value.</summary>
+    [JsonPropertyName("quota_id")]
+    public string? QuotaId { get; set; }
 
-/// <summary>MCP server names to enable for new sessions.</summary>
-internal sealed class McpConfigEnableRequest
-{
-    /// <summary>Names of MCP servers to enable. Each server is removed from the persisted disabled list so new sessions spawn it. Unknown or already-enabled names are ignored.</summary>
-    [JsonPropertyName("names")]
-    public IList<string> Names { get => field ??= []; set; }
-}
+    /// <summary>Gets or sets the <c>quota_remaining</c> value.</summary>
+    [JsonPropertyName("quota_remaining")]
+    public double? QuotaRemaining { get; set; }
 
-/// <summary>MCP server names to disable for new sessions.</summary>
-internal sealed class McpConfigDisableRequest
-{
-    /// <summary>Names of MCP servers to disable. Each server is added to the persisted disabled list so new sessions skip it. Already-disabled names are ignored. Active sessions keep their current connections until they end.</summary>
-    [JsonPropertyName("names")]
-    public IList<string> Names { get => field ??= []; set; }
-}
+    /// <summary>Gets or sets the <c>quota_reset_at</c> value.</summary>
+    [JsonPropertyName("quota_reset_at")]
+    public double? QuotaResetAt { get; set; }
 
-/// <summary>Information about an installed plugin tracked in global state.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class InstalledPluginInfo
-{
-    /// <summary>Whether the plugin is currently enabled for new sessions.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>Gets or sets the <c>remaining</c> value.</summary>
+    [JsonPropertyName("remaining")]
+    public double? Remaining { get; set; }
 
-    /// <summary>Marketplace the plugin came from. Empty string ("") for direct repo / URL / local installs.</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
+    /// <summary>Gets or sets the <c>timestamp_utc</c> value.</summary>
+    [JsonPropertyName("timestamp_utc")]
+    public string? TimestampUtc { get; set; }
 
-    /// <summary>Plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Gets or sets the <c>token_based_billing</c> value.</summary>
+    [JsonPropertyName("token_based_billing")]
+    public bool? TokenBasedBilling { get; set; }
 
-    /// <summary>Installed version (when reported by the plugin manifest).</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>Gets or sets the <c>unlimited</c> value.</summary>
+    [JsonPropertyName("unlimited")]
+    public bool? Unlimited { get; set; }
 }
 
-/// <summary>Plugins installed in user/global state.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PluginListResult
+/// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type.</summary>
+public sealed class CopilotUserResponseQuotaSnapshotsCompletions
 {
-    /// <summary>Installed plugins.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<InstalledPluginInfo> Plugins { get => field ??= []; set; }
-}
+    /// <summary>Gets or sets the <c>entitlement</c> value.</summary>
+    [JsonPropertyName("entitlement")]
+    public double? Entitlement { get; set; }
 
-/// <summary>Result of installing a plugin.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PluginInstallResult
-{
-    /// <summary>Set when the install path is deprecated (e.g. direct repo / URL / local installs). Callers should surface this to end users.</summary>
-    [JsonPropertyName("deprecationWarning")]
-    public string? DeprecationWarning { get; set; }
+    /// <summary>Gets or sets the <c>has_quota</c> value.</summary>
+    [JsonPropertyName("has_quota")]
+    public bool? HasQuota { get; set; }
 
-    /// <summary>The newly installed plugin's metadata.</summary>
-    [JsonPropertyName("plugin")]
-    public InstalledPluginInfo Plugin { get => field ??= new(); set; }
+    /// <summary>Gets or sets the <c>overage_count</c> value.</summary>
+    [JsonPropertyName("overage_count")]
+    public double? OverageCount { get; set; }
 
-    /// <summary>Optional post-install message provided by the plugin (e.g. setup instructions).</summary>
-    [JsonPropertyName("postInstallMessage")]
-    public string? PostInstallMessage { get; set; }
+    /// <summary>Gets or sets the <c>overage_permitted</c> value.</summary>
+    [JsonPropertyName("overage_permitted")]
+    public bool? OveragePermitted { get; set; }
 
-    /// <summary>Number of skills discovered and installed from the plugin.</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long SkillsInstalled { get; set; }
-}
+    /// <summary>Gets or sets the <c>percent_remaining</c> value.</summary>
+    [JsonPropertyName("percent_remaining")]
+    public double? PercentRemaining { get; set; }
 
-/// <summary>Plugin source and optional working directory for relative-path resolution.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsInstallRequest
-{
-    /// <summary>Plugin install spec. Accepts the same forms as the CLI: "plugin@marketplace" (marketplace install), "owner/repo" or "owner/repo:subpath" (GitHub direct), an http/https/ssh URL, or a local path. Direct (non-marketplace) installs are deprecated and will produce a deprecationWarning in the result.</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
+    /// <summary>Gets or sets the <c>quota_id</c> value.</summary>
+    [JsonPropertyName("quota_id")]
+    public string? QuotaId { get; set; }
 
-    /// <summary>Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
-}
+    /// <summary>Gets or sets the <c>quota_remaining</c> value.</summary>
+    [JsonPropertyName("quota_remaining")]
+    public double? QuotaRemaining { get; set; }
 
-/// <summary>Name (or spec) of the plugin to uninstall.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsUninstallRequest
-{
-    /// <summary>Plugin name or "plugin@marketplace" spec to uninstall. When ambiguous, prefer the fully-qualified spec.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-}
+    /// <summary>Gets or sets the <c>quota_reset_at</c> value.</summary>
+    [JsonPropertyName("quota_reset_at")]
+    public double? QuotaResetAt { get; set; }
 
-/// <summary>Result of updating a single plugin.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PluginUpdateResult
-{
-    /// <summary>Version after the update, when reported by the plugin manifest.</summary>
-    [JsonPropertyName("newVersion")]
-    public string? NewVersion { get; set; }
+    /// <summary>Gets or sets the <c>remaining</c> value.</summary>
+    [JsonPropertyName("remaining")]
+    public double? Remaining { get; set; }
 
-    /// <summary>Version that was previously installed, when available.</summary>
-    [JsonPropertyName("previousVersion")]
-    public string? PreviousVersion { get; set; }
+    /// <summary>Gets or sets the <c>timestamp_utc</c> value.</summary>
+    [JsonPropertyName("timestamp_utc")]
+    public string? TimestampUtc { get; set; }
 
-    /// <summary>Number of skills discovered and installed after the update.</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long SkillsInstalled { get; set; }
-}
+    /// <summary>Gets or sets the <c>token_based_billing</c> value.</summary>
+    [JsonPropertyName("token_based_billing")]
+    public bool? TokenBasedBilling { get; set; }
 
-/// <summary>Name (or spec) of the plugin to update.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsUpdateRequest
-{
-    /// <summary>Plugin name or "plugin@marketplace" spec to update.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Gets or sets the <c>unlimited</c> value.</summary>
+    [JsonPropertyName("unlimited")]
+    public bool? Unlimited { get; set; }
 }
 
-/// <summary>Schema for the `PluginUpdateAllEntry` type.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PluginUpdateAllEntry
+/// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type.</summary>
+public sealed class CopilotUserResponseQuotaSnapshotsPremiumInteractions
 {
-    /// <summary>Error message (failure only).</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Gets or sets the <c>entitlement</c> value.</summary>
+    [JsonPropertyName("entitlement")]
+    public double? Entitlement { get; set; }
 
-    /// <summary>Marketplace the plugin came from. Empty string ("") for direct installs.</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
+    /// <summary>Gets or sets the <c>has_quota</c> value.</summary>
+    [JsonPropertyName("has_quota")]
+    public bool? HasQuota { get; set; }
 
-    /// <summary>Plugin name that was updated.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Gets or sets the <c>overage_count</c> value.</summary>
+    [JsonPropertyName("overage_count")]
+    public double? OverageCount { get; set; }
 
-    /// <summary>Version after the update, when available.</summary>
-    [JsonPropertyName("newVersion")]
-    public string? NewVersion { get; set; }
+    /// <summary>Gets or sets the <c>overage_permitted</c> value.</summary>
+    [JsonPropertyName("overage_permitted")]
+    public bool? OveragePermitted { get; set; }
 
-    /// <summary>Previously installed version, when available.</summary>
-    [JsonPropertyName("previousVersion")]
-    public string? PreviousVersion { get; set; }
+    /// <summary>Gets or sets the <c>percent_remaining</c> value.</summary>
+    [JsonPropertyName("percent_remaining")]
+    public double? PercentRemaining { get; set; }
 
-    /// <summary>Number of skills installed after the update (success only).</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long? SkillsInstalled { get; set; }
+    /// <summary>Gets or sets the <c>quota_id</c> value.</summary>
+    [JsonPropertyName("quota_id")]
+    public string? QuotaId { get; set; }
 
-    /// <summary>Whether the update succeeded for this plugin.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Gets or sets the <c>quota_remaining</c> value.</summary>
+    [JsonPropertyName("quota_remaining")]
+    public double? QuotaRemaining { get; set; }
+
+    /// <summary>Gets or sets the <c>quota_reset_at</c> value.</summary>
+    [JsonPropertyName("quota_reset_at")]
+    public double? QuotaResetAt { get; set; }
+
+    /// <summary>Gets or sets the <c>remaining</c> value.</summary>
+    [JsonPropertyName("remaining")]
+    public double? Remaining { get; set; }
+
+    /// <summary>Gets or sets the <c>timestamp_utc</c> value.</summary>
+    [JsonPropertyName("timestamp_utc")]
+    public string? TimestampUtc { get; set; }
+
+    /// <summary>Gets or sets the <c>token_based_billing</c> value.</summary>
+    [JsonPropertyName("token_based_billing")]
+    public bool? TokenBasedBilling { get; set; }
+
+    /// <summary>Gets or sets the <c>unlimited</c> value.</summary>
+    [JsonPropertyName("unlimited")]
+    public bool? Unlimited { get; set; }
 }
 
-/// <summary>Result of updating all installed plugins.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class PluginUpdateAllResult
+/// <summary>Schema for the `CopilotUserResponseQuotaSnapshots` type.</summary>
+public sealed class CopilotUserResponseQuotaSnapshots
 {
-    /// <summary>Per-plugin update results in deterministic order.</summary>
-    [JsonPropertyName("results")]
-    public IList<PluginUpdateAllEntry> Results { get => field ??= []; set; }
+    /// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.</summary>
+    [JsonPropertyName("chat")]
+    public CopilotUserResponseQuotaSnapshotsChat? Chat { get; set; }
+
+    /// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type.</summary>
+    [JsonPropertyName("completions")]
+    public CopilotUserResponseQuotaSnapshotsCompletions? Completions { get; set; }
+
+    /// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type.</summary>
+    [JsonPropertyName("premium_interactions")]
+    public CopilotUserResponseQuotaSnapshotsPremiumInteractions? PremiumInteractions { get; set; }
 }
 
-/// <summary>Plugin names (or specs) to enable.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsEnableRequest
+/// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+public sealed class CopilotUserResponse
 {
-    /// <summary>Plugin names or "plugin@marketplace" specs to enable. Unknown names are ignored. Non-marketplace direct installs are always enabled and cannot be toggled via this API.</summary>
-    [JsonPropertyName("names")]
-    public IList<string> Names { get => field ??= []; set; }
+    /// <summary>Gets or sets the <c>access_type_sku</c> value.</summary>
+    [JsonPropertyName("access_type_sku")]
+    public string? AccessTypeSku { get; set; }
+
+    /// <summary>Gets or sets the <c>analytics_tracking_id</c> value.</summary>
+    [JsonPropertyName("analytics_tracking_id")]
+    public string? AnalyticsTrackingId { get; set; }
+
+    /// <summary>Gets or sets the <c>assigned_date</c> value.</summary>
+    [JsonPropertyName("assigned_date")]
+    public string? AssignedDate { get; set; }
+
+    /// <summary>Gets or sets the <c>can_signup_for_limited</c> value.</summary>
+    [JsonPropertyName("can_signup_for_limited")]
+    public bool? CanSignupForLimited { get; set; }
+
+    /// <summary>Gets or sets the <c>can_upgrade_plan</c> value.</summary>
+    [JsonPropertyName("can_upgrade_plan")]
+    public bool? CanUpgradePlan { get; set; }
+
+    /// <summary>Gets or sets the <c>chat_enabled</c> value.</summary>
+    [JsonPropertyName("chat_enabled")]
+    public bool? ChatEnabled { get; set; }
+
+    /// <summary>Gets or sets the <c>cli_remote_control_enabled</c> value.</summary>
+    [JsonPropertyName("cli_remote_control_enabled")]
+    public bool? CliRemoteControlEnabled { get; set; }
+
+    /// <summary>Gets or sets the <c>cloud_session_storage_enabled</c> value.</summary>
+    [JsonPropertyName("cloud_session_storage_enabled")]
+    public bool? CloudSessionStorageEnabled { get; set; }
+
+    /// <summary>Gets or sets the <c>codex_agent_enabled</c> value.</summary>
+    [JsonPropertyName("codex_agent_enabled")]
+    public bool? CodexAgentEnabled { get; set; }
+
+    /// <summary>Gets or sets the <c>copilot_plan</c> value.</summary>
+    [JsonPropertyName("copilot_plan")]
+    public string? CopilotPlan { get; set; }
+
+    /// <summary>Gets or sets the <c>copilotignore_enabled</c> value.</summary>
+    [JsonPropertyName("copilotignore_enabled")]
+    public bool? CopilotignoreEnabled { get; set; }
+
+    /// <summary>Schema for the `CopilotUserResponseEndpoints` type.</summary>
+    [JsonPropertyName("endpoints")]
+    public CopilotUserResponseEndpoints? Endpoints { get; set; }
+
+    /// <summary>Gets or sets the <c>is_mcp_enabled</c> value.</summary>
+    [JsonPropertyName("is_mcp_enabled")]
+    public bool? IsMcpEnabled { get; set; }
+
+    /// <summary>Gets or sets the <c>is_staff</c> value.</summary>
+    [JsonPropertyName("is_staff")]
+    public bool? IsStaff { get; set; }
+
+    /// <summary>Gets or sets the <c>limited_user_quotas</c> value.</summary>
+    [JsonPropertyName("limited_user_quotas")]
+    public IDictionary<string, double>? LimitedUserQuotas { get; set; }
+
+    /// <summary>Gets or sets the <c>limited_user_reset_date</c> value.</summary>
+    [JsonPropertyName("limited_user_reset_date")]
+    public string? LimitedUserResetDate { get; set; }
+
+    /// <summary>Gets or sets the <c>login</c> value.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
+
+    /// <summary>Gets or sets the <c>monthly_quotas</c> value.</summary>
+    [JsonPropertyName("monthly_quotas")]
+    public IDictionary<string, double>? MonthlyQuotas { get; set; }
+
+    /// <summary>Gets or sets the <c>organization_list</c> value.</summary>
+    [JsonPropertyName("organization_list")]
+    public IList<CopilotUserResponseOrganizationListItem?>? OrganizationList { get; set; }
+
+    /// <summary>Gets or sets the <c>organization_login_list</c> value.</summary>
+    [JsonPropertyName("organization_login_list")]
+    public IList<string>? OrganizationLoginList { get; set; }
+
+    /// <summary>Gets or sets the <c>quota_reset_date</c> value.</summary>
+    [JsonPropertyName("quota_reset_date")]
+    public string? QuotaResetDate { get; set; }
+
+    /// <summary>Gets or sets the <c>quota_reset_date_utc</c> value.</summary>
+    [JsonPropertyName("quota_reset_date_utc")]
+    public string? QuotaResetDateUtc { get; set; }
+
+    /// <summary>Schema for the `CopilotUserResponseQuotaSnapshots` type.</summary>
+    [JsonPropertyName("quota_snapshots")]
+    public CopilotUserResponseQuotaSnapshots? QuotaSnapshots { get; set; }
+
+    /// <summary>Gets or sets the <c>restricted_telemetry</c> value.</summary>
+    [JsonPropertyName("restricted_telemetry")]
+    public bool? RestrictedTelemetry { get; set; }
+
+    /// <summary>Gets or sets the <c>token_based_billing</c> value.</summary>
+    [JsonPropertyName("token_based_billing")]
+    public bool? TokenBasedBilling { get; set; }
 }
 
-/// <summary>Plugin names (or specs) to disable.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsDisableRequest
+/// <summary>Schema for the `HMACAuthInfo` type.</summary>
+/// <remarks>The <c>hmac</c> variant of <see cref="AuthInfo"/>.</remarks>
+public partial class AuthInfoHmac : AuthInfo
 {
-    /// <summary>Plugin names or "plugin@marketplace" specs to disable. Unknown names are ignored. Non-marketplace direct installs cannot be disabled via this API; uninstall them instead. Plugin-owned MCP servers are stopped in active sessions immediately; other plugin contributions remain available until each session reloads plugins.</summary>
-    [JsonPropertyName("names")]
-    public IList<string> Names { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "hmac";
+
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>HMAC secret used to sign requests.</summary>
+    [JsonPropertyName("hmac")]
+    public required string Hmac { get; set; }
+
+    /// <summary>Authentication host. HMAC auth always targets the public GitHub host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 }
 
-/// <summary>Registered marketplace summary.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceInfo
+/// <summary>Schema for the `EnvAuthInfo` type.</summary>
+/// <remarks>The <c>env</c> variant of <see cref="AuthInfo"/>.</remarks>
+public partial class AuthInfoEnv : AuthInfo
 {
-    /// <summary>True when this is a default marketplace shipped with the runtime. Defaults are not removable.</summary>
-    [JsonPropertyName("isDefault")]
-    public bool? IsDefault { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "env";
 
-    /// <summary>Marketplace name (matches the @marketplace suffix in plugin specs).</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
 
-    /// <summary>Human-readable description of where the marketplace data is fetched from (e.g. "GitHub: owner/repo").</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
+    /// <summary>Name of the environment variable the token was sourced from.</summary>
+    [JsonPropertyName("envVar")]
+    public required string EnvVar { get; set; }
+
+    /// <summary>Authentication host (e.g. https://github.com or a GHES host).</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
+
+    /// <summary>User login associated with the token. Undefined for server-to-server tokens (those starting with `ghs_`).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
+
+    /// <summary>The token value itself. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>All registered marketplaces, including built-in defaults.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceListResult
+/// <summary>Schema for the `TokenAuthInfo` type.</summary>
+/// <remarks>The <c>token</c> variant of <see cref="AuthInfo"/>.</remarks>
+public partial class AuthInfoToken : AuthInfo
 {
-    /// <summary>Registered marketplaces.</summary>
-    [JsonPropertyName("marketplaces")]
-    public IList<MarketplaceInfo> Marketplaces { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "token";
+
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
+
+    /// <summary>The token value itself. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>Result of registering a new marketplace.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceAddResult
+/// <summary>Schema for the `CopilotApiTokenAuthInfo` type.</summary>
+/// <remarks>The <c>copilot-api-token</c> variant of <see cref="AuthInfo"/>.</remarks>
+public partial class AuthInfoCopilotApiToken : AuthInfo
 {
-    /// <summary>Final name of the marketplace as resolved from its manifest.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "copilot-api-token";
+
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host (always the public GitHub host).</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 }
 
-/// <summary>Marketplace source to register.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesAddRequest
+/// <summary>Schema for the `UserAuthInfo` type.</summary>
+/// <remarks>The <c>user</c> variant of <see cref="AuthInfo"/>.</remarks>
+public partial class AuthInfoUser : AuthInfo
 {
-    /// <summary>Marketplace source. Accepts the same forms as the CLI: "owner/repo" or "owner/repo#ref" (GitHub), an http/https/ssh URL (optionally with #ref), a git scp-style URL (user@host:path), or a local path. The marketplace's own name (from its manifest) is used as the registration key.</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "user";
+
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
+
+    /// <summary>OAuth user login.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { get; set; }
 }
 
-/// <summary>Outcome of the remove attempt, including dependent-plugin info when applicable.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceRemoveResult
+/// <summary>Schema for the `GhCliAuthInfo` type.</summary>
+/// <remarks>The <c>gh-cli</c> variant of <see cref="AuthInfo"/>.</remarks>
+public partial class AuthInfoGhCli : AuthInfo
 {
-    /// <summary>Names of installed plugins that prevented removal. Populated only when `removed=false`.</summary>
-    [JsonPropertyName("dependentPlugins")]
-    public IList<string>? DependentPlugins { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "gh-cli";
 
-    /// <summary>True when the marketplace was actually removed. False when removal was skipped because the marketplace has dependent plugins and `force` was not set.</summary>
-    [JsonPropertyName("removed")]
-    public bool Removed { get; set; }
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
+
+    /// <summary>User login as reported by `gh auth status`.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { get; set; }
+
+    /// <summary>The token returned by `gh auth token`. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>Name of the marketplace to remove and an optional force flag.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesRemoveRequest
+/// <summary>Schema for the `ApiKeyAuthInfo` type.</summary>
+/// <remarks>The <c>api-key</c> variant of <see cref="AuthInfo"/>.</remarks>
+public partial class AuthInfoApiKey : AuthInfo
 {
-    /// <summary>When true, also uninstall every plugin sourced from this marketplace. When false (default), removal is a no-op if any plugin from this marketplace is installed and the dependent plugin names are returned in the result.</summary>
-    [JsonPropertyName("force")]
-    public bool? Force { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "api-key";
 
-    /// <summary>Marketplace name to remove.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>The API key. Treat as a secret.</summary>
+    [JsonPropertyName("apiKey")]
+    public required string ApiKey { get; set; }
+
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 }
 
-/// <summary>Plugin entry advertised by a marketplace.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MarketplacePluginInfo
+/// <summary>Current authentication state.</summary>
+public sealed class AccountGetCurrentAuthResult
 {
-    /// <summary>Short description from the marketplace catalog, when present.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Authentication errors from the last auth attempt, if any.</summary>
+    [JsonPropertyName("authErrors")]
+    public IList<string>? AuthErrors { get; set; }
 
-    /// <summary>Plugin name as listed in the marketplace catalog.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Current authentication information, if authenticated.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo? AuthInfo { get; set; }
 }
 
-/// <summary>Plugins advertised by the marketplace.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceBrowseResult
+/// <summary>Schema for the `AccountAllUsers` type.</summary>
+public sealed class AccountAllUsers
 {
-    /// <summary>Plugins advertised by the marketplace.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<MarketplacePluginInfo> Plugins { get => field ??= []; set; }
+    /// <summary>Authentication information for this user.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo AuthInfo { get => field ??= new(); set; }
+
+    /// <summary>Associated token, if available.</summary>
+    [JsonPropertyName("token")]
+    public string? Token { get; set; }
 }
 
-/// <summary>Name of the marketplace whose plugin catalog to fetch.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesBrowseRequest
+/// <summary>Result of a successful login; throws on failure.</summary>
+public sealed class AccountLoginResult
 {
-    /// <summary>Marketplace name to browse.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Whether the credential was persisted to a secure store (system keychain, or the config file when plaintext storage is enabled). False when no secure store was available and the token was not saved, so the consumer can decide how to proceed.</summary>
+    [JsonPropertyName("storedInVault")]
+    public bool StoredInVault { get; set; }
 }
 
-/// <summary>Schema for the `MarketplaceRefreshEntry` type.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceRefreshEntry
+/// <summary>Credentials to store after successful authentication.</summary>
+internal sealed class AccountLoginRequest
 {
-    /// <summary>Error message (failure only).</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>GitHub host URL.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>Marketplace name that was refreshed.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>User login/username.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
 
-    /// <summary>Whether the refresh succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>GitHub authentication token.</summary>
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
 }
 
-/// <summary>Result of refreshing one or more marketplace catalogs.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class MarketplaceRefreshResult
+/// <summary>Logout result indicating if more users remain.</summary>
+public sealed class AccountLogoutResult
 {
-    /// <summary>Per-marketplace refresh results in deterministic order.</summary>
-    [JsonPropertyName("results")]
-    public IList<MarketplaceRefreshEntry> Results { get => field ??= []; set; }
+    /// <summary>Whether other authenticated users remain after logout.</summary>
+    [JsonPropertyName("hasMoreUsers")]
+    public bool HasMoreUsers { get; set; }
 }
 
-/// <summary>RPC data type for PluginsMarketplacesRefresh operations.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesRefreshRequest
+/// <summary>User to log out.</summary>
+internal sealed class AccountLogoutRequest
 {
-    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Authentication information for the user to log out.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo AuthInfo { get => field ??= new(); set; }
+}
+
+/// <summary>Confirmation that the secret values were registered.</summary>
+public sealed class SecretsAddFilterValuesResult
+{
+    /// <summary>Whether the values were successfully registered.</summary>
+    [JsonPropertyName("ok")]
+    public bool Ok { get; set; }
 }
 
-/// <summary>Schema for the `ServerSkill` type.</summary>
-public sealed class ServerSkill
+/// <summary>Secret values to add to the redaction filter.</summary>
+internal sealed class SecretsAddFilterValuesRequest
 {
-    /// <summary>Description of what the skill does.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
+    /// <summary>Raw secret values to register for redaction.</summary>
+    [JsonPropertyName("values")]
+    public IList<string> Values { get => field ??= []; set; }
+}
 
-    /// <summary>Whether the skill is currently enabled (based on global config).</summary>
+/// <summary>Schema for the `DiscoveredMcpServer` type.</summary>
+public sealed class DiscoveredMcpServer
+{
+    /// <summary>Whether the server is enabled (not in the disabled list).</summary>
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
 
-    /// <summary>Unique identifier for the skill.</summary>
+    /// <summary>Server name (config key).</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
 
-    /// <summary>Absolute path to the skill file.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    /// <summary>Configuration source: user, workspace, plugin, or builtin.</summary>
+    [JsonPropertyName("source")]
+    public McpServerSource Source { get; set; }
 
-    /// <summary>The project path this skill belongs to (only for project/inherited skills).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+    /// <summary>Plugin name that provided this server, when source is plugin.</summary>
+    [JsonPropertyName("sourcePlugin")]
+    public string? SourcePlugin { get; set; }
 
-    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
-    [JsonPropertyName("source")]
-    public SkillSource Source { get; set; }
+    /// <summary>Plugin version that provided this server, when source is plugin.</summary>
+    [JsonPropertyName("sourcePluginVersion")]
+    public string? SourcePluginVersion { get; set; }
 
-    /// <summary>Whether the skill can be invoked by the user as a slash command.</summary>
-    [JsonPropertyName("userInvocable")]
-    public bool UserInvocable { get; set; }
+    /// <summary>Server transport type: stdio, http, sse (deprecated), or memory.</summary>
+    [JsonPropertyName("type")]
+    public DiscoveredMcpServerType? Type { get; set; }
 }
 
-/// <summary>Skills discovered across global and project sources.</summary>
-public sealed class ServerSkillList
+/// <summary>MCP servers discovered from user, workspace, plugin, and built-in sources.</summary>
+public sealed class McpDiscoverResult
 {
-    /// <summary>All discovered skills across all sources.</summary>
-    [JsonPropertyName("skills")]
-    public IList<ServerSkill> Skills { get => field ??= []; set; }
+    /// <summary>MCP servers discovered from all sources.</summary>
+    [JsonPropertyName("servers")]
+    public IList<DiscoveredMcpServer> Servers { get => field ??= []; set; }
 }
 
-/// <summary>Optional project paths and additional skill directories to include in discovery.</summary>
-internal sealed class SkillsDiscoverRequest
+/// <summary>Optional working directory used as context for MCP server discovery.</summary>
+internal sealed class McpDiscoverRequest
 {
-    /// <summary>When true, omit skills from the host's global sources (personal, custom, plugin, and built-in), returning only project-scoped skills. For multitenant deployments.</summary>
-    [JsonPropertyName("excludeHostSkills")]
-    public bool? ExcludeHostSkills { get; set; }
-
-    /// <summary>Optional list of project directory paths to scan for project-scoped skills.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Working directory used as context for discovery (e.g., plugin resolution).</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
+}
 
-    /// <summary>Optional list of additional skill directory paths to include.</summary>
-    [JsonPropertyName("skillDirectories")]
-    public IList<string>? SkillDirectories { get; set; }
+/// <summary>User-configured MCP servers, keyed by server name.</summary>
+public sealed class McpConfigList
+{
+    /// <summary>All MCP servers from user config, keyed by name.</summary>
+    [JsonPropertyName("servers")]
+    public IDictionary<string, JsonElement> Servers { get => field ??= new Dictionary<string, JsonElement>(); set; }
 }
 
-/// <summary>Schema for the `SkillDiscoveryPath` type.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SkillDiscoveryPath
+/// <summary>MCP server name and configuration to add to user configuration.</summary>
+internal sealed class McpConfigAddRequest
 {
-    /// <summary>Absolute path of the create/discovery target (may not exist on disk yet).</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
+    [JsonPropertyName("config")]
+    public JsonElement Config { get; set; }
 
-    /// <summary>Whether this is the canonical directory to create a new skill in its tier. At most one entry per tier is preferred; the `personal-agents` and `custom` scopes are never preferred.</summary>
-    [JsonPropertyName("preferredForCreation")]
-    public bool PreferredForCreation { get; set; }
+    /// <summary>Unique name for the MCP server.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+}
 
-    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+/// <summary>MCP server name and replacement configuration to write to user configuration.</summary>
+internal sealed class McpConfigUpdateRequest
+{
+    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
+    [JsonPropertyName("config")]
+    public JsonElement Config { get; set; }
 
-    /// <summary>Which tier this directory belongs to.</summary>
-    [JsonPropertyName("scope")]
-    public SkillDiscoveryScope Scope { get; set; }
+    /// <summary>Name of the MCP server to update.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Canonical locations where skills can be created so the runtime will recognize them.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SkillDiscoveryPathList
+/// <summary>MCP server name to remove from user configuration.</summary>
+internal sealed class McpConfigRemoveRequest
 {
-    /// <summary>Canonical skill create/discovery directories, in priority order.</summary>
-    [JsonPropertyName("paths")]
-    public IList<SkillDiscoveryPath> Paths { get => field ??= []; set; }
+    /// <summary>Name of the MCP server to remove.</summary>
+    [RegularExpression("^[^\\x00-\\x1f/\\x7f-\\x9f}]+(?:\\/[^\\x00-\\x1f/\\x7f-\\x9f}]+)*$")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Safe for generated string properties: JSON Schema minLength/maxLength map to string length validation, not reflection over trimmed Count members")]
+    [MinLength(1)]
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Optional project paths to enumerate.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SkillsGetDiscoveryPathsRequest
+/// <summary>MCP server names to enable for new sessions.</summary>
+internal sealed class McpConfigEnableRequest
 {
-    /// <summary>When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.</summary>
-    [JsonPropertyName("excludeHostSkills")]
-    public bool? ExcludeHostSkills { get; set; }
-
-    /// <summary>Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Names of MCP servers to enable. Each server is removed from the persisted disabled list so new sessions spawn it. Unknown or already-enabled names are ignored.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
 }
 
-/// <summary>Skill names to mark as disabled in global configuration, replacing any previous list.</summary>
-internal sealed class SkillsConfigSetDisabledSkillsRequest
+/// <summary>MCP server names to disable for new sessions.</summary>
+internal sealed class McpConfigDisableRequest
 {
-    /// <summary>List of skill names to disable.</summary>
-    [JsonPropertyName("disabledSkills")]
-    public IList<string> DisabledSkills { get => field ??= []; set; }
+    /// <summary>Names of MCP servers to disable. Each server is added to the persisted disabled list so new sessions skip it. Already-disabled names are ignored. Active sessions keep their current connections until they end.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
 }
 
-/// <summary>Schema for the `AgentInfo` type.</summary>
+/// <summary>Information about an installed plugin tracked in global state.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentInfo
+public sealed class InstalledPluginInfo
 {
-    /// <summary>Description of the agent's purpose.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Human-readable display name.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
-
-    /// <summary>Stable identifier for selection. For most agents this is the same as `name`; for plugin/builtin agents it may differ. Always populated; defaults to `name` when no distinct id was assigned.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>MCP server configurations attached to this agent, keyed by server name. Server config shape mirrors the MCP `mcpServers` schema.</summary>
-    [Experimental(Diagnostics.Experimental)]
-    [JsonPropertyName("mcpServers")]
-    public IDictionary<string, JsonElement>? McpServers { get; set; }
+    /// <summary>Whether the plugin is currently enabled for new sessions.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Preferred model id for this agent. When omitted, inherits the outer agent's model.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Marketplace the plugin came from. Empty string ("") for direct repo / URL / local installs.</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
 
-    /// <summary>Unique identifier of the custom agent.</summary>
+    /// <summary>Plugin name.</summary>
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
 
-    /// <summary>Absolute local file path of the agent definition. Only set for file-based agents loaded from disk; remote agents do not have a path.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
-
-    /// <summary>Skill names preloaded into this agent's context. Omitted means none.</summary>
-    [JsonPropertyName("skills")]
-    public IList<string>? Skills { get; set; }
-
-    /// <summary>Where the agent definition was loaded from.</summary>
-    [JsonPropertyName("source")]
-    public AgentInfoSource? Source { get; set; }
-
-    /// <summary>Allowed tool names for this agent. Empty array means none; omitted means inherit defaults.</summary>
-    [JsonPropertyName("tools")]
-    public IList<string>? Tools { get; set; }
-
-    /// <summary>Whether the agent can be selected directly by the user. Agents marked `false` are subagent-only.</summary>
-    [JsonPropertyName("userInvocable")]
-    public bool? UserInvocable { get; set; }
-}
-
-/// <summary>Agents discovered across user, project, plugin, and remote sources.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ServerAgentList
-{
-    /// <summary>All discovered agents across all sources.</summary>
-    [JsonPropertyName("agents")]
-    public IList<AgentInfo> Agents { get => field ??= []; set; }
+    /// <summary>Installed version (when reported by the plugin manifest).</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>Optional project paths to include in agent discovery.</summary>
+/// <summary>Plugins installed in user/global state.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AgentsDiscoverRequest
+public sealed class PluginListResult
 {
-    /// <summary>When true, omit the host's agents (the user-level agent directory and all plugin agents), leaving only project and remote agents. For multitenant deployments.</summary>
-    [JsonPropertyName("excludeHostAgents")]
-    public bool? ExcludeHostAgents { get; set; }
-
-    /// <summary>Optional list of project directory paths to scan for project-scoped agents. When omitted or empty, only user/plugin/remote-independent agents are returned (no project scan).</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Installed plugins.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<InstalledPluginInfo> Plugins { get => field ??= []; set; }
 }
 
-/// <summary>Schema for the `AgentDiscoveryPath` type.</summary>
+/// <summary>Result of installing a plugin.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentDiscoveryPath
+public sealed class PluginInstallResult
 {
-    /// <summary>Absolute path of the search/create directory (may not exist on disk yet).</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Set when the install path is deprecated (e.g. direct repo / URL / local installs). Callers should surface this to end users.</summary>
+    [JsonPropertyName("deprecationWarning")]
+    public string? DeprecationWarning { get; set; }
 
-    /// <summary>Whether this is the canonical directory to create a new agent in its tier. At most one entry per tier is preferred.</summary>
-    [JsonPropertyName("preferredForCreation")]
-    public bool PreferredForCreation { get; set; }
+    /// <summary>The newly installed plugin's metadata.</summary>
+    [JsonPropertyName("plugin")]
+    public InstalledPluginInfo Plugin { get => field ??= new(); set; }
 
-    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+    /// <summary>Optional post-install message provided by the plugin (e.g. setup instructions).</summary>
+    [JsonPropertyName("postInstallMessage")]
+    public string? PostInstallMessage { get; set; }
 
-    /// <summary>Which tier this directory belongs to.</summary>
-    [JsonPropertyName("scope")]
-    public AgentDiscoveryPathScope Scope { get; set; }
+    /// <summary>Number of skills discovered and installed from the plugin.</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long SkillsInstalled { get; set; }
 }
 
-/// <summary>Canonical locations where custom agents can be created so the runtime will recognize them.</summary>
+/// <summary>Plugin source and optional working directory for relative-path resolution.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentDiscoveryPathList
+internal sealed class PluginsInstallRequest
 {
-    /// <summary>Canonical agent create/discovery directories, in priority order.</summary>
-    [JsonPropertyName("paths")]
-    public IList<AgentDiscoveryPath> Paths { get => field ??= []; set; }
+    /// <summary>Plugin install spec. Accepts the same forms as the CLI: "plugin@marketplace" (marketplace install), "owner/repo" or "owner/repo:subpath" (GitHub direct), an http/https/ssh URL, or a local path. Direct (non-marketplace) installs are deprecated and will produce a deprecationWarning in the result.</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
+
+    /// <summary>Working directory used to resolve relative local paths in `source`. Defaults to the server's current working directory.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>Optional project paths to include when enumerating agent discovery directories.</summary>
+/// <summary>Name (or spec) of the plugin to uninstall.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AgentsGetDiscoveryPathsRequest
+internal sealed class PluginsUninstallRequest
 {
-    /// <summary>When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).</summary>
-    [JsonPropertyName("excludeHostAgents")]
-    public bool? ExcludeHostAgents { get; set; }
-
-    /// <summary>Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Plugin name or "plugin@marketplace" spec to uninstall. When ambiguous, prefer the fully-qualified spec.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Schema for the `InstructionSource` type.</summary>
+/// <summary>Result of updating a single plugin.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstructionSource
+public sealed class PluginUpdateResult
 {
-    /// <summary>Glob pattern(s) from frontmatter — when set, this instruction applies only to matching files.</summary>
-    [JsonPropertyName("applyTo")]
-    public IList<string>? ApplyTo { get; set; }
+    /// <summary>Version after the update, when reported by the plugin manifest.</summary>
+    [JsonPropertyName("newVersion")]
+    public string? NewVersion { get; set; }
 
-    /// <summary>Raw content of the instruction file.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Version that was previously installed, when available.</summary>
+    [JsonPropertyName("previousVersion")]
+    public string? PreviousVersion { get; set; }
 
-    /// <summary>When true, this source starts disabled and must be toggled on by the user.</summary>
-    [JsonPropertyName("defaultDisabled")]
-    public bool? DefaultDisabled { get; set; }
+    /// <summary>Number of skills discovered and installed after the update.</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long SkillsInstalled { get; set; }
+}
 
-    /// <summary>Short description (body after frontmatter) for use in instruction tables.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+/// <summary>Name (or spec) of the plugin to update.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PluginsUpdateRequest
+{
+    /// <summary>Plugin name or "plugin@marketplace" spec to update.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+}
 
-    /// <summary>Unique identifier for this source (used for toggling).</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+/// <summary>Schema for the `PluginUpdateAllEntry` type.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class PluginUpdateAllEntry
+{
+    /// <summary>Error message (failure only).</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Human-readable label.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>Marketplace the plugin came from. Empty string ("") for direct installs.</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
 
-    /// <summary>Where this source lives — used for UI grouping.</summary>
-    [JsonPropertyName("location")]
-    public InstructionSourceLocation Location { get; set; }
+    /// <summary>Plugin name that was updated.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>The project path this source was discovered from. Only set by sessionless discovery for repository/working-directory sources, where it disambiguates same-named files (e.g. .github/copilot-instructions.md) across multiple workspace roots. The session-scoped getSources leaves it unset.</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+    /// <summary>Version after the update, when available.</summary>
+    [JsonPropertyName("newVersion")]
+    public string? NewVersion { get; set; }
 
-    /// <summary>File path relative to repo or absolute for home.</summary>
-    [JsonPropertyName("sourcePath")]
-    public string SourcePath { get; set; } = string.Empty;
+    /// <summary>Previously installed version, when available.</summary>
+    [JsonPropertyName("previousVersion")]
+    public string? PreviousVersion { get; set; }
 
-    /// <summary>Category of instruction source — used for merge logic.</summary>
-    [JsonPropertyName("type")]
-    public InstructionSourceType Type { get; set; }
+    /// <summary>Number of skills installed after the update (success only).</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long? SkillsInstalled { get; set; }
+
+    /// <summary>Whether the update succeeded for this plugin.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Instruction sources discovered across user, repository, and plugin sources.</summary>
+/// <summary>Result of updating all installed plugins.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ServerInstructionSourceList
+public sealed class PluginUpdateAllResult
 {
-    /// <summary>All discovered instruction sources.</summary>
-    [JsonPropertyName("sources")]
-    public IList<InstructionSource> Sources { get => field ??= []; set; }
+    /// <summary>Per-plugin update results in deterministic order.</summary>
+    [JsonPropertyName("results")]
+    public IList<PluginUpdateAllEntry> Results { get => field ??= []; set; }
 }
 
-/// <summary>Optional project paths to include in instruction discovery.</summary>
+/// <summary>Plugin names (or specs) to enable.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class InstructionsDiscoverRequest
+internal sealed class PluginsEnableRequest
 {
-    /// <summary>When true, omit the host's instruction sources (user/home-level files and plugin rules), leaving only repository and working-directory sources. For multitenant deployments.</summary>
-    [JsonPropertyName("excludeHostInstructions")]
-    public bool? ExcludeHostInstructions { get; set; }
-
-    /// <summary>Optional list of project directory paths to scan for repository/working-directory instruction sources. When omitted or empty, only user-level and plugin instruction sources are returned (no project scan).</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Plugin names or "plugin@marketplace" specs to enable. Unknown names are ignored. Non-marketplace direct installs are always enabled and cannot be toggled via this API.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
 }
 
-/// <summary>Schema for the `InstructionDiscoveryPath` type.</summary>
+/// <summary>Plugin names (or specs) to disable.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstructionDiscoveryPath
+internal sealed class PluginsDisableRequest
 {
-    /// <summary>Whether the target is a single file or a directory of instruction files.</summary>
-    [JsonPropertyName("kind")]
-    public InstructionDiscoveryPathKind Kind { get; set; }
-
-    /// <summary>Which tier this target belongs to.</summary>
-    [JsonPropertyName("location")]
-    public InstructionDiscoveryPathLocation Location { get; set; }
+    /// <summary>Plugin names or "plugin@marketplace" specs to disable. Unknown names are ignored. Non-marketplace direct installs cannot be disabled via this API; uninstall them instead. Plugin-owned MCP servers are stopped in active sessions immediately; other plugin contributions remain available until each session reloads plugins.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
+}
 
-    /// <summary>Absolute path of the file or directory (may not exist on disk yet).</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+/// <summary>Registered marketplace summary.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class MarketplaceInfo
+{
+    /// <summary>True when this is a default marketplace shipped with the runtime. Defaults are not removable.</summary>
+    [JsonPropertyName("isDefault")]
+    public bool? IsDefault { get; set; }
 
-    /// <summary>Whether this is the canonical target to create new instructions in its tier. At most one entry per tier is preferred.</summary>
-    [JsonPropertyName("preferredForCreation")]
-    public bool PreferredForCreation { get; set; }
+    /// <summary>Marketplace name (matches the @marketplace suffix in plugin specs).</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>The input project path this target was derived from (only for repository targets).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+    /// <summary>Human-readable description of where the marketplace data is fetched from (e.g. "GitHub: owner/repo").</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
 }
 
-/// <summary>Canonical files and directories where custom instructions can be created so the runtime will recognize them.</summary>
+/// <summary>All registered marketplaces, including built-in defaults.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstructionDiscoveryPathList
+public sealed class MarketplaceListResult
 {
-    /// <summary>Canonical instruction create/discovery files and directories, in priority order.</summary>
-    [JsonPropertyName("paths")]
-    public IList<InstructionDiscoveryPath> Paths { get => field ??= []; set; }
+    /// <summary>Registered marketplaces.</summary>
+    [JsonPropertyName("marketplaces")]
+    public IList<MarketplaceInfo> Marketplaces { get => field ??= []; set; }
 }
 
-/// <summary>Optional project paths to include when enumerating instruction discovery targets.</summary>
+/// <summary>Result of registering a new marketplace.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class InstructionsGetDiscoveryPathsRequest
+public sealed class MarketplaceAddResult
 {
-    /// <summary>When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).</summary>
-    [JsonPropertyName("excludeHostInstructions")]
-    public bool? ExcludeHostInstructions { get; set; }
-
-    /// <summary>Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Final name of the marketplace as resolved from its manifest.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the calling client was registered as the session filesystem provider.</summary>
-public sealed class SessionFsSetProviderResult
+/// <summary>Marketplace source to register.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PluginsMarketplacesAddRequest
 {
-    /// <summary>Whether the provider was set successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Marketplace source. Accepts the same forms as the CLI: "owner/repo" or "owner/repo#ref" (GitHub), an http/https/ssh URL (optionally with #ref), a git scp-style URL (user@host:path), or a local path. The marketplace's own name (from its manifest) is used as the registration key.</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
 }
 
-/// <summary>Optional capabilities declared by the provider.</summary>
-public sealed class SessionFsSetProviderCapabilities
+/// <summary>Outcome of the remove attempt, including dependent-plugin info when applicable.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class MarketplaceRemoveResult
 {
-    /// <summary>Whether the provider supports SQLite query/exists operations.</summary>
-    [JsonPropertyName("sqlite")]
-    public bool? Sqlite { get; set; }
+    /// <summary>Names of installed plugins that prevented removal. Populated only when `removed=false`.</summary>
+    [JsonPropertyName("dependentPlugins")]
+    public IList<string>? DependentPlugins { get; set; }
+
+    /// <summary>True when the marketplace was actually removed. False when removal was skipped because the marketplace has dependent plugins and `force` was not set.</summary>
+    [JsonPropertyName("removed")]
+    public bool Removed { get; set; }
 }
 
-/// <summary>Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider.</summary>
-internal sealed class SessionFsSetProviderRequest
+/// <summary>Name of the marketplace to remove and an optional force flag.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class PluginsMarketplacesRemoveRequest
 {
-    /// <summary>Optional capabilities declared by the provider.</summary>
-    [JsonPropertyName("capabilities")]
-    public SessionFsSetProviderCapabilities? Capabilities { get; set; }
+    /// <summary>When true, also uninstall every plugin sourced from this marketplace. When false (default), removal is a no-op if any plugin from this marketplace is installed and the dependent plugin names are returned in the result.</summary>
+    [JsonPropertyName("force")]
+    public bool? Force { get; set; }
 
-    /// <summary>Path conventions used by this filesystem.</summary>
-    [JsonPropertyName("conventions")]
-    public SessionFsSetProviderConventions Conventions { get; set; }
+    /// <summary>Marketplace name to remove.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+}
 
-    /// <summary>Initial working directory for sessions.</summary>
-    [JsonPropertyName("initialCwd")]
-    public string InitialCwd { get; set; } = string.Empty;
+/// <summary>Plugin entry advertised by a marketplace.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class MarketplacePluginInfo
+{
+    /// <summary>Short description from the marketplace catalog, when present.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Path within each session's SessionFs where the runtime stores files for that session.</summary>
-    [JsonPropertyName("sessionStatePath")]
-    public string SessionStatePath { get; set; } = string.Empty;
+    /// <summary>Plugin name as listed in the marketplace catalog.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the calling client was registered as the LLM inference provider.</summary>
+/// <summary>Plugins advertised by the marketplace.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceSetProviderResult
+public sealed class MarketplaceBrowseResult
 {
-    /// <summary>Whether the provider was set successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Plugins advertised by the marketplace.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<MarketplacePluginInfo> Plugins { get => field ??= []; set; }
 }
 
-/// <summary>Whether the start frame was accepted.</summary>
+/// <summary>Name of the marketplace whose plugin catalog to fetch.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseStartResult
+internal sealed class PluginsMarketplacesBrowseRequest
 {
-    /// <summary>True when the response start was matched to a pending request; false when unknown.</summary>
-    [JsonPropertyName("accepted")]
-    public bool Accepted { get; set; }
+    /// <summary>Marketplace name to browse.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Response head.</summary>
+/// <summary>Schema for the `MarketplaceRefreshEntry` type.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class LlmInferenceHttpResponseStartRequest
+public sealed class MarketplaceRefreshEntry
 {
-    /// <summary>Gets or sets the <c>headers</c> value.</summary>
-    [JsonPropertyName("headers")]
-    public IDictionary<string, IList<string>> Headers { get => field ??= new Dictionary<string, IList<string>>(); set; }
-
-    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Error message (failure only).</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>HTTP status code.</summary>
-    [JsonPropertyName("status")]
-    public long Status { get; set; }
+    /// <summary>Marketplace name that was refreshed.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Optional HTTP status reason phrase.</summary>
-    [JsonPropertyName("statusText")]
-    public string? StatusText { get; set; }
+    /// <summary>Whether the refresh succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Whether the chunk was accepted.</summary>
+/// <summary>Result of refreshing one or more marketplace catalogs.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseChunkResult
+public sealed class MarketplaceRefreshResult
 {
-    /// <summary>True when the chunk was matched to a pending request; false when unknown.</summary>
-    [JsonPropertyName("accepted")]
-    public bool Accepted { get; set; }
+    /// <summary>Per-marketplace refresh results in deterministic order.</summary>
+    [JsonPropertyName("results")]
+    public IList<MarketplaceRefreshEntry> Results { get => field ??= []; set; }
 }
 
-/// <summary>Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.</summary>
+/// <summary>RPC data type for PluginsMarketplacesRefresh operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseChunkError
+internal sealed class PluginsMarketplacesRefreshRequest
 {
-    /// <summary>Optional machine-readable error code.</summary>
-    [JsonPropertyName("code")]
-    public string? Code { get; set; }
-
-    /// <summary>Human-readable failure description.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 }
 
-/// <summary>A response body chunk or terminal error.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class LlmInferenceHttpResponseChunkRequest
+/// <summary>Schema for the `ServerSkill` type.</summary>
+public sealed class ServerSkill
 {
-    /// <summary>When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.</summary>
-    [JsonPropertyName("binary")]
-    public bool? Binary { get; set; }
+    /// <summary>Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field.</summary>
+    [JsonPropertyName("argumentHint")]
+    public string? ArgumentHint { get; set; }
 
-    /// <summary>Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty (e.g. when the response body is empty: send a single chunk with empty data and end=true).</summary>
-    [JsonPropertyName("data")]
-    public string Data { get; set; } = string.Empty;
+    /// <summary>Description of what the skill does.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>When true, this is the final body chunk for the response. The runtime treats the response body as complete after receiving an end-marked chunk.</summary>
-    [JsonPropertyName("end")]
-    public bool? End { get; set; }
+    /// <summary>Whether the skill is currently enabled (based on global config).</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.</summary>
-    [JsonPropertyName("error")]
-    public LlmInferenceHttpResponseChunkError? Error { get; set; }
+    /// <summary>Unique identifier for the skill.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Absolute path to the skill file.</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
+
+    /// <summary>The project path this skill belongs to (only for project/inherited skills).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
+
+    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
+    [JsonPropertyName("source")]
+    public SkillSource Source { get; set; }
+
+    /// <summary>Whether the skill can be invoked by the user as a slash command.</summary>
+    [JsonPropertyName("userInvocable")]
+    public bool UserInvocable { get; set; }
 }
 
-/// <summary>Pre-resolved working-directory context for session startup.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionContext
+/// <summary>Skills discovered across global and project sources.</summary>
+public sealed class ServerSkillList
 {
-    /// <summary>Active git branch.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
-
-    /// <summary>Most recent working directory for this session.</summary>
-    [JsonPropertyName("cwd")]
-    public string Cwd { get; set; } = string.Empty;
+    /// <summary>All discovered skills across all sources.</summary>
+    [JsonPropertyName("skills")]
+    public IList<ServerSkill> Skills { get => field ??= []; set; }
+}
 
-    /// <summary>Git repository root, if the cwd was inside a git repo.</summary>
-    [JsonPropertyName("gitRoot")]
-    public string? GitRoot { get; set; }
+/// <summary>Optional project paths and additional skill directories to include in discovery.</summary>
+internal sealed class SkillsDiscoverRequest
+{
+    /// <summary>When true, omit skills from the host's global sources (personal, custom, plugin, and built-in), returning only project-scoped skills. For multitenant deployments.</summary>
+    [JsonPropertyName("excludeHostSkills")]
+    public bool? ExcludeHostSkills { get; set; }
 
-    /// <summary>Repository host type.</summary>
-    [JsonPropertyName("hostType")]
-    public SessionContextHostType? HostType { get; set; }
+    /// <summary>Optional list of project directory paths to scan for project-scoped skills.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 
-    /// <summary>Repository slug in `owner/name` form, when known.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>Optional list of additional skill directory paths to include.</summary>
+    [JsonPropertyName("skillDirectories")]
+    public IList<string>? SkillDirectories { get; set; }
 }
 
-/// <summary>GitHub repository the remote session belongs to.</summary>
+/// <summary>Schema for the `SkillDiscoveryPath` type.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteSessionMetadataRepository
+public sealed class SkillDiscoveryPath
 {
-    /// <summary>Branch associated with the remote session.</summary>
-    [JsonPropertyName("branch")]
-    public string Branch { get; set; } = string.Empty;
+    /// <summary>Absolute path of the create/discovery target (may not exist on disk yet).</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Repository name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Whether this is the canonical directory to create a new skill in its tier. At most one entry per tier is preferred; the `personal-agents` and `custom` scopes are never preferred.</summary>
+    [JsonPropertyName("preferredForCreation")]
+    public bool PreferredForCreation { get; set; }
 
-    /// <summary>Repository owner.</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
+    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
+
+    /// <summary>Which tier this directory belongs to.</summary>
+    [JsonPropertyName("scope")]
+    public SkillDiscoveryScope Scope { get; set; }
 }
 
-/// <summary>Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).</summary>
+/// <summary>Canonical locations where skills can be created so the runtime will recognize them.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteSessionMetadataValue
+public sealed class SkillDiscoveryPathList
 {
-    /// <summary>Most recent working directory context.</summary>
-    [JsonPropertyName("context")]
-    public SessionContext? Context { get; set; }
+    /// <summary>Canonical skill create/discovery directories, in priority order.</summary>
+    [JsonPropertyName("paths")]
+    public IList<SkillDiscoveryPath> Paths { get => field ??= []; set; }
+}
 
-    /// <summary>Always true for remote sessions.</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
+/// <summary>Optional project paths to enumerate.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SkillsGetDiscoveryPathsRequest
+{
+    /// <summary>When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.</summary>
+    [JsonPropertyName("excludeHostSkills")]
+    public bool? ExcludeHostSkills { get; set; }
 
-    /// <summary>Last-modified time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public string ModifiedTime { get; set; } = string.Empty;
+    /// <summary>Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
+}
 
-    /// <summary>Optional human-friendly name set via /rename.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+/// <summary>Skill names to mark as disabled in global configuration, replacing any previous list.</summary>
+internal sealed class SkillsConfigSetDisabledSkillsRequest
+{
+    /// <summary>List of skill names to disable.</summary>
+    [JsonPropertyName("disabledSkills")]
+    public IList<string> DisabledSkills { get => field ??= []; set; }
+}
 
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
+/// <summary>Schema for the `AgentInfo` type.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class AgentInfo
+{
+    /// <summary>Description of the agent's purpose.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Backing remote session IDs (most recent first).</summary>
-    [JsonPropertyName("remoteSessionIds")]
-    public IList<string> RemoteSessionIds { get => field ??= []; set; }
+    /// <summary>Human-readable display name.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
 
-    /// <summary>GitHub repository the remote session belongs to.</summary>
-    [JsonPropertyName("repository")]
-    public RemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
+    /// <summary>Stable identifier for selection. For most agents this is the same as `name`; for plugin/builtin agents it may differ. Always populated; defaults to `name` when no distinct id was assigned.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
+    /// <summary>MCP server configurations attached to this agent, keyed by server name. Server config shape mirrors the MCP `mcpServers` schema.</summary>
+    [Experimental(Diagnostics.Experimental)]
+    [JsonPropertyName("mcpServers")]
+    public IDictionary<string, JsonElement>? McpServers { get; set; }
 
-    /// <summary>Stable session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Preferred model id for this agent. When omitted, inherits the outer agent's model.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
-    [JsonPropertyName("staleAt")]
-    public string? StaleAt { get; set; }
+    /// <summary>Unique identifier of the custom agent.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("startTime")]
-    public string StartTime { get; set; } = string.Empty;
+    /// <summary>Absolute local file path of the agent definition. Only set for file-based agents loaded from disk; remote agents do not have a path.</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 
-    /// <summary>Server-side task state returned by GitHub.</summary>
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
+    /// <summary>Skill names preloaded into this agent's context. Omitted means none.</summary>
+    [JsonPropertyName("skills")]
+    public IList<string>? Skills { get; set; }
 
-    /// <summary>Short summary of the session, when one has been derived.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+    /// <summary>Where the agent definition was loaded from.</summary>
+    [JsonPropertyName("source")]
+    public AgentInfoSource? Source { get; set; }
 
-    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
-    [JsonPropertyName("taskType")]
-    public RemoteSessionMetadataTaskType? TaskType { get; set; }
+    /// <summary>Allowed tool names for this agent. Empty array means none; omitted means inherit defaults.</summary>
+    [JsonPropertyName("tools")]
+    public IList<string>? Tools { get; set; }
+
+    /// <summary>Whether the agent can be selected directly by the user. Agents marked `false` are subagent-only.</summary>
+    [JsonPropertyName("userInvocable")]
+    public bool? UserInvocable { get; set; }
 }
 
-/// <summary>Schema for the `SessionsOpenProgress` type.</summary>
+/// <summary>Agents discovered across user, project, plugin, and remote sources.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsOpenProgress
+public sealed class ServerAgentList
 {
-    /// <summary>Optional step message.</summary>
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
-
-    /// <summary>Step status.</summary>
-    [JsonPropertyName("status")]
-    public SessionsOpenProgressStatus Status { get; set; }
-
-    /// <summary>Handoff step.</summary>
-    [JsonPropertyName("step")]
-    public SessionsOpenProgressStep Step { get; set; }
+    /// <summary>All discovered agents across all sources.</summary>
+    [JsonPropertyName("agents")]
+    public IList<AgentInfo> Agents { get => field ??= []; set; }
 }
 
-/// <summary>Result of opening a session.</summary>
+/// <summary>Optional project paths to include in agent discovery.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionOpenResult
+internal sealed class AgentsDiscoverRequest
 {
-    /// <summary>Remote session metadata, present when status is `connected`.</summary>
-    [JsonPropertyName("metadata")]
-    public RemoteSessionMetadataValue? Metadata { get; set; }
-
-    /// <summary>Handoff progress steps, present when status is `handed_off`.</summary>
-    [JsonPropertyName("progress")]
-    public IList<SessionsOpenProgress>? Progress { get; set; }
+    /// <summary>When true, omit the host's agents (the user-level agent directory and all plugin agents), leaving only project and remote agents. For multitenant deployments.</summary>
+    [JsonPropertyName("excludeHostAgents")]
+    public bool? ExcludeHostAgents { get; set; }
 
-    /// <summary>Remote session ID, present when status is `connected`.</summary>
-    [JsonPropertyName("remoteSessionId")]
-    public string? RemoteSessionId { get; set; }
+    /// <summary>Optional list of project directory paths to scan for project-scoped agents. When omitted or empty, only user/plugin/remote-independent agents are returned (no project scan).</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
+}
 
-    /// <summary>In-process SessionClientApi handle for the opened session, returned to CLI callers as a transitional shortcut. Marked internal so the public SDK surface does not expose it; SDK consumers should construct per-session clients from `sessionId` instead.</summary>
-    [JsonInclude]
-    [JsonPropertyName("sessionApi")]
-    internal JsonElement? SessionApi { get; set; }
+/// <summary>Schema for the `AgentDiscoveryPath` type.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class AgentDiscoveryPath
+{
+    /// <summary>Absolute path of the search/create directory (may not exist on disk yet).</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Opened session ID. Omitted when status is `not_found`.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Whether this is the canonical directory to create a new agent in its tier. At most one entry per tier is preferred.</summary>
+    [JsonPropertyName("preferredForCreation")]
+    public bool PreferredForCreation { get; set; }
 
-    /// <summary>Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.</summary>
-    [JsonPropertyName("startupPrompts")]
-    public IList<string>? StartupPrompts { get; set; }
+    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
 
-    /// <summary>Outcome of the open request.</summary>
-    [JsonPropertyName("status")]
-    public SessionsOpenStatus Status { get; set; }
+    /// <summary>Which tier this directory belongs to.</summary>
+    [JsonPropertyName("scope")]
+    public AgentDiscoveryPathScope Scope { get; set; }
 }
 
-/// <summary>Identifier and optional friendly name assigned to the newly forked session.</summary>
+/// <summary>Canonical locations where custom agents can be created so the runtime will recognize them.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsForkResult
+public sealed class AgentDiscoveryPathList
 {
-    /// <summary>Friendly name assigned to the forked session, if any.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
-
-    /// <summary>The new forked session's ID.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Canonical agent create/discovery directories, in priority order.</summary>
+    [JsonPropertyName("paths")]
+    public IList<AgentDiscoveryPath> Paths { get => field ??= []; set; }
 }
 
-/// <summary>Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.</summary>
+/// <summary>Optional project paths to include when enumerating agent discovery directories.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsForkRequest
+internal sealed class AgentsGetDiscoveryPathsRequest
 {
-    /// <summary>Optional friendly name to assign to the forked session.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
-
-    /// <summary>Source session ID to fork from.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).</summary>
+    [JsonPropertyName("excludeHostAgents")]
+    public bool? ExcludeHostAgents { get; set; }
 
-    /// <summary>Optional event ID boundary. When provided, the fork includes only events before this ID (exclusive). When omitted, all events are included.</summary>
-    [JsonPropertyName("toEventId")]
-    public string? ToEventId { get; set; }
+    /// <summary>Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 }
 
-/// <summary>Repository associated with the connected remote session.</summary>
+/// <summary>Schema for the `InstructionSource` type.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class ConnectedRemoteSessionMetadataRepository
+public sealed class InstructionSource
 {
-    /// <summary>Branch associated with the remote session.</summary>
-    [JsonPropertyName("branch")]
-    public string Branch { get; set; } = string.Empty;
-
-    /// <summary>Repository name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Glob pattern(s) from frontmatter — when set, this instruction applies only to matching files.</summary>
+    [JsonPropertyName("applyTo")]
+    public IList<string>? ApplyTo { get; set; }
 
-    /// <summary>Repository owner or organization login.</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
-}
+    /// <summary>Raw content of the instruction file.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-/// <summary>Metadata for a connected remote session.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ConnectedRemoteSessionMetadata
-{
-    /// <summary>Neutral SDK discriminator for the connected remote session kind.</summary>
-    [JsonPropertyName("kind")]
-    public ConnectedRemoteSessionMetadataKind Kind { get; set; }
+    /// <summary>When true, this source starts disabled and must be toggled on by the user.</summary>
+    [JsonPropertyName("defaultDisabled")]
+    public bool? DefaultDisabled { get; set; }
 
-    /// <summary>Last session update time as an ISO 8601 string.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public DateTimeOffset ModifiedTime { get; set; }
+    /// <summary>Short description (body after frontmatter) for use in instruction tables.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Optional friendly session name.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Unique identifier for this source (used for toggling).</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
+    /// <summary>Human-readable label.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
 
-    /// <summary>Repository associated with the connected remote session.</summary>
-    [JsonPropertyName("repository")]
-    public ConnectedRemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
+    /// <summary>Where this source lives — used for UI grouping.</summary>
+    [JsonPropertyName("location")]
+    public InstructionSourceLocation Location { get; set; }
 
-    /// <summary>Original remote resource identifier.</summary>
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
+    /// <summary>The project path this source was discovered from. Only set by sessionless discovery for repository/working-directory sources, where it disambiguates same-named files (e.g. .github/copilot-instructions.md) across multiple workspace roots. The session-scoped getSources leaves it unset.</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
 
-    /// <summary>SDK session ID for the connected remote session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>File path relative to repo or absolute for home.</summary>
+    [JsonPropertyName("sourcePath")]
+    public string SourcePath { get; set; } = string.Empty;
 
-    /// <summary>Remote session staleness deadline as an ISO 8601 string.</summary>
-    [JsonPropertyName("staleAt")]
-    public DateTimeOffset? StaleAt { get; set; }
+    /// <summary>Category of instruction source — used for merge logic.</summary>
+    [JsonPropertyName("type")]
+    public InstructionSourceType Type { get; set; }
+}
 
-    /// <summary>Session start time as an ISO 8601 string.</summary>
-    [JsonPropertyName("startTime")]
-    public DateTimeOffset StartTime { get; set; }
+/// <summary>Instruction sources discovered across user, repository, and plugin sources.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ServerInstructionSourceList
+{
+    /// <summary>All discovered instruction sources.</summary>
+    [JsonPropertyName("sources")]
+    public IList<InstructionSource> Sources { get => field ??= []; set; }
+}
 
-    /// <summary>Remote session state returned by the backing service.</summary>
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
+/// <summary>Optional project paths to include in instruction discovery.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class InstructionsDiscoverRequest
+{
+    /// <summary>When true, omit the host's instruction sources (user/home-level files and plugin rules), leaving only repository and working-directory sources. For multitenant deployments.</summary>
+    [JsonPropertyName("excludeHostInstructions")]
+    public bool? ExcludeHostInstructions { get; set; }
 
-    /// <summary>Optional session summary.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+    /// <summary>Optional list of project directory paths to scan for repository/working-directory instruction sources. When omitted or empty, only user-level and plugin instruction sources are returned (no project scan).</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 }
 
-/// <summary>Remote session connection result.</summary>
+/// <summary>Schema for the `InstructionDiscoveryPath` type.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteSessionConnectionResult
+public sealed class InstructionDiscoveryPath
 {
-    /// <summary>Metadata for a connected remote session.</summary>
-    [JsonPropertyName("metadata")]
-    public ConnectedRemoteSessionMetadata Metadata { get => field ??= new(); set; }
+    /// <summary>Whether the target is a single file or a directory of instruction files.</summary>
+    [JsonPropertyName("kind")]
+    public InstructionDiscoveryPathKind Kind { get; set; }
 
-    /// <summary>SDK session ID for the connected remote session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Which tier this target belongs to.</summary>
+    [JsonPropertyName("location")]
+    public InstructionDiscoveryPathLocation Location { get; set; }
+
+    /// <summary>Absolute path of the file or directory (may not exist on disk yet).</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Whether this is the canonical target to create new instructions in its tier. At most one entry per tier is preferred.</summary>
+    [JsonPropertyName("preferredForCreation")]
+    public bool PreferredForCreation { get; set; }
+
+    /// <summary>The input project path this target was derived from (only for repository targets).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
 }
 
-/// <summary>Remote session connection parameters.</summary>
+/// <summary>Canonical files and directories where custom instructions can be created so the runtime will recognize them.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ConnectRemoteSessionParams
+public sealed class InstructionDiscoveryPathList
 {
-    /// <summary>Session ID to connect to.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Canonical instruction create/discovery files and directories, in priority order.</summary>
+    [JsonPropertyName("paths")]
+    public IList<InstructionDiscoveryPath> Paths { get => field ??= []; set; }
 }
 
-/// <summary>Local or remote session metadata entry. Narrow on `isRemote` to access source-specific fields.</summary>
-/// <remarks>Data type discriminated by <c>isRemote</c>.</remarks>
+/// <summary>Optional project paths to include when enumerating instruction discovery targets.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class SessionListEntry
+internal sealed class InstructionsGetDiscoveryPathsRequest
 {
-    /// <summary>The boolean discriminator.</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
-
-    /// <summary>Runtime client name that created/last resumed this session.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
-
-    /// <summary>Pre-resolved working-directory context for session startup.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("context")]
-    public SessionContext? Context { get; set; }
-
-    /// <summary>True for detached maintenance sessions that should be hidden from normal resume lists.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("isDetached")]
-    public bool? IsDetached { get; set; }
+    /// <summary>When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).</summary>
+    [JsonPropertyName("excludeHostInstructions")]
+    public bool? ExcludeHostInstructions { get; set; }
 
-    /// <summary>GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mcTaskId")]
-    public string? McTaskId { get; set; }
+    /// <summary>Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
+}
 
-    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public required string ModifiedTime { get; set; }
+/// <summary>Indicates whether the calling client was registered as the session filesystem provider.</summary>
+public sealed class SessionFsSetProviderResult
+{
+    /// <summary>Whether the provider was set successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>Optional human-friendly name set via /rename.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+/// <summary>Optional capabilities declared by the provider.</summary>
+public sealed class SessionFsSetProviderCapabilities
+{
+    /// <summary>Whether the provider supports SQLite query/exists operations.</summary>
+    [JsonPropertyName("sqlite")]
+    public bool? Sqlite { get; set; }
+}
 
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
+/// <summary>Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider.</summary>
+internal sealed class SessionFsSetProviderRequest
+{
+    /// <summary>Optional capabilities declared by the provider.</summary>
+    [JsonPropertyName("capabilities")]
+    public SessionFsSetProviderCapabilities? Capabilities { get; set; }
 
-    /// <summary>Backing remote session IDs (most recent first).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("remoteSessionIds")]
-    public IList<string>? RemoteSessionIds { get; set; }
+    /// <summary>Path conventions used by this filesystem.</summary>
+    [JsonPropertyName("conventions")]
+    public SessionFsSetProviderConventions Conventions { get; set; }
 
-    /// <summary>GitHub repository the remote session belongs to.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("repository")]
-    public RemoteSessionMetadataRepository? Repository { get; set; }
+    /// <summary>Initial working directory for sessions.</summary>
+    [JsonPropertyName("initialCwd")]
+    public string InitialCwd { get; set; } = string.Empty;
 
-    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
+    /// <summary>Path within each session's SessionFs where the runtime stores files for that session.</summary>
+    [JsonPropertyName("sessionStatePath")]
+    public string SessionStatePath { get; set; } = string.Empty;
+}
 
-    /// <summary>Stable session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public required string SessionId { get; set; }
+/// <summary>Indicates whether the calling client was registered as the LLM inference provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class LlmInferenceSetProviderResult
+{
+    /// <summary>Whether the provider was set successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("staleAt")]
-    public string? StaleAt { get; set; }
+/// <summary>Whether the start frame was accepted.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class LlmInferenceHttpResponseStartResult
+{
+    /// <summary>True when the response start was matched to a pending request; false when unknown.</summary>
+    [JsonPropertyName("accepted")]
+    public bool Accepted { get; set; }
+}
 
-    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("startTime")]
-    public required string StartTime { get; set; }
+/// <summary>Response head.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class LlmInferenceHttpResponseStartRequest
+{
+    /// <summary>Gets or sets the <c>headers</c> value.</summary>
+    [JsonPropertyName("headers")]
+    public IDictionary<string, IList<string>> Headers { get => field ??= new Dictionary<string, IList<string>>(); set; }
 
-    /// <summary>Server-side task state returned by GitHub.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
+    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 
-    /// <summary>Short summary of the session, when one has been derived.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+    /// <summary>HTTP status code.</summary>
+    [JsonPropertyName("status")]
+    public long Status { get; set; }
 
-    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("taskType")]
-    public RemoteSessionMetadataTaskType? TaskType { get; set; }
+    /// <summary>Optional HTTP status reason phrase.</summary>
+    [JsonPropertyName("statusText")]
+    public string? StatusText { get; set; }
 }
 
-/// <summary>Sessions matching the filter, ordered most-recently-modified first.</summary>
+/// <summary>Whether the chunk was accepted.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionList
+public sealed class LlmInferenceHttpResponseChunkResult
 {
-    /// <summary>Sessions ordered most-recently-modified first. Discriminated by `isRemote`.</summary>
-    [JsonPropertyName("sessions")]
-    public IList<SessionListEntry> Sessions { get => field ??= []; set; }
+    /// <summary>True when the chunk was matched to a pending request; false when unknown.</summary>
+    [JsonPropertyName("accepted")]
+    public bool Accepted { get; set; }
 }
 
-/// <summary>Optional filter applied to the returned sessions.</summary>
+/// <summary>Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionListFilter
+public sealed class LlmInferenceHttpResponseChunkError
 {
-    /// <summary>Match sessions whose context.branch equals this value.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
-
-    /// <summary>Match sessions whose context.cwd equals this value.</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
-
-    /// <summary>Match sessions whose context.gitRoot equals this value.</summary>
-    [JsonPropertyName("gitRoot")]
-    public string? GitRoot { get; set; }
+    /// <summary>Optional machine-readable error code.</summary>
+    [JsonPropertyName("code")]
+    public string? Code { get; set; }
 
-    /// <summary>Match sessions whose context.repository equals this value.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>Human-readable failure description.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 }
 
-/// <summary>Optional source filter, metadata-load limit, and context filter applied to the returned sessions.</summary>
+/// <summary>A response body chunk or terminal error.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsListRequest
+internal sealed class LlmInferenceHttpResponseChunkRequest
 {
-    /// <summary>Optional filter applied to the returned sessions.</summary>
-    [JsonPropertyName("filter")]
-    public SessionListFilter? Filter { get; set; }
+    /// <summary>When true, `data` is base64-encoded bytes. When absent or false, `data` is UTF-8 text.</summary>
+    [JsonPropertyName("binary")]
+    public bool? Binary { get; set; }
 
-    /// <summary>When true, include detached maintenance sessions. Defaults to false for user-facing session lists.</summary>
-    [JsonPropertyName("includeDetached")]
-    public bool? IncludeDetached { get; set; }
+    /// <summary>Body byte range. UTF-8 text when `binary` is absent or false; base64-encoded bytes when `binary` is true. May be empty (e.g. when the response body is empty: send a single chunk with empty data and end=true).</summary>
+    [JsonPropertyName("data")]
+    public string Data { get; set; } = string.Empty;
 
-    /// <summary>When provided, only the first N local sessions (sorted by modification time, newest first) load full metadata; remaining sessions return basic info only. Use 0 to return only basic info for every local session. Has no effect on remote entries (which always carry their full shape).</summary>
-    [JsonPropertyName("metadataLimit")]
-    public long? MetadataLimit { get; set; }
+    /// <summary>When true, this is the final body chunk for the response. The runtime treats the response body as complete after receiving an end-marked chunk.</summary>
+    [JsonPropertyName("end")]
+    public bool? End { get; set; }
 
-    /// <summary>Which session sources to include. Defaults to `local` for backward compatibility.</summary>
-    [JsonPropertyName("source")]
-    public SessionSource? Source { get; set; }
+    /// <summary>Set to terminate the response with a transport-level failure. Implies end-of-stream; any further chunks for this requestId are ignored.</summary>
+    [JsonPropertyName("error")]
+    public LlmInferenceHttpResponseChunkError? Error { get; set; }
 
-    /// <summary>Only meaningful when `source` includes remote. When true, propagates errors from the remote service instead of silently returning an empty remote list. Defaults to false.</summary>
-    [JsonPropertyName("throwOnError")]
-    public bool? ThrowOnError { get; set; }
+    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 }
 
-/// <summary>ID of the local session bound to the given GitHub task, or omitted when none.</summary>
+/// <summary>Pre-resolved working-directory context for session startup.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsFindByTaskIDResult
+public sealed class SessionContext
 {
-    /// <summary>Omitted when no local session is bound to that GitHub task.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
-}
+    /// <summary>Active git branch.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-/// <summary>GitHub task ID to look up.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsFindByTaskIDRequest
-{
-    /// <summary>GitHub task ID to look up.</summary>
-    [JsonPropertyName("taskId")]
-    public string TaskId { get; set; } = string.Empty;
+    /// <summary>Most recent working directory for this session.</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
+
+    /// <summary>Git repository root, if the cwd was inside a git repo.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
+
+    /// <summary>Repository host type.</summary>
+    [JsonPropertyName("hostType")]
+    public SessionContextHostType? HostType { get; set; }
+
+    /// <summary>Repository slug in `owner/name` form, when known.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
 }
 
-/// <summary>Session ID matching the prefix, omitted when no unique match exists.</summary>
+/// <summary>GitHub repository the remote session belongs to.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsFindByPrefixResult
+public sealed class RemoteSessionMetadataRepository
 {
-    /// <summary>Omitted when no unique session matches the prefix (no match or ambiguous).</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
-}
+    /// <summary>Branch associated with the remote session.</summary>
+    [JsonPropertyName("branch")]
+    public string Branch { get; set; } = string.Empty;
 
-/// <summary>UUID prefix to resolve to a unique session ID.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsFindByPrefixRequest
-{
-    /// <summary>UUID prefix (&gt;=7 hex chars, &lt;36 chars). Returns the unique session ID, or undefined when there is no match or the prefix matches multiple sessions.</summary>
-    [JsonPropertyName("prefix")]
-    public string Prefix { get; set; } = string.Empty;
-}
+    /// <summary>Repository name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-/// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionsGetLastForContextResult
-{
-    /// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Repository owner.</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
 }
 
-/// <summary>Optional working-directory context used to score session relevance.</summary>
+/// <summary>Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetLastForContextRequest
+public sealed class RemoteSessionMetadataValue
 {
-    /// <summary>Optional working-directory context used to score session relevance. When omitted the most-recently-modified session wins.</summary>
+    /// <summary>Most recent working directory context.</summary>
     [JsonPropertyName("context")]
     public SessionContext? Context { get; set; }
-}
 
-/// <summary>Absolute path to the session's events.jsonl file on disk.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetEventFilePathResult
-{
-    /// <summary>Absolute path to the session's events.jsonl file.</summary>
-    [JsonPropertyName("filePath")]
-    public string FilePath { get; set; } = string.Empty;
-}
+    /// <summary>Always true for remote sessions.</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { get; set; }
 
-/// <summary>Session ID whose event-log file path to compute.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetEventFilePathRequest
-{
-    /// <summary>Session ID whose event-log file path to compute.</summary>
+    /// <summary>Last-modified time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public string ModifiedTime { get; set; } = string.Empty;
+
+    /// <summary>Optional human-friendly name set via /rename.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
+
+    /// <summary>Backing remote session IDs (most recent first).</summary>
+    [JsonPropertyName("remoteSessionIds")]
+    public IList<string> RemoteSessionIds { get => field ??= []; set; }
+
+    /// <summary>GitHub repository the remote session belongs to.</summary>
+    [JsonPropertyName("repository")]
+    public RemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
+
+    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
+
+    /// <summary>Stable session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>Map of sessionId -&gt; on-disk size in bytes for each session's workspace directory.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionSizes
-{
-    /// <summary>Map of sessionId -&gt; on-disk size in bytes for the session's workspace directory.</summary>
-    [JsonPropertyName("sizes")]
-    public IDictionary<string, long> Sizes { get => field ??= new Dictionary<string, long>(); set; }
-}
+    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
+    [JsonPropertyName("staleAt")]
+    public string? StaleAt { get; set; }
 
-/// <summary>Session IDs from the input set that are currently in use by another process.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionsCheckInUseResult
-{
-    /// <summary>Session IDs from the input set that are currently held by another running process via an alive lock file.</summary>
-    [JsonPropertyName("inUse")]
-    public IList<string> InUse { get => field ??= []; set; }
+    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("startTime")]
+    public string StartTime { get; set; } = string.Empty;
+
+    /// <summary>Server-side task state returned by GitHub.</summary>
+    [JsonPropertyName("state")]
+    public string? State { get; set; }
+
+    /// <summary>Short summary of the session, when one has been derived.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
+
+    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
+    [JsonPropertyName("taskType")]
+    public RemoteSessionMetadataTaskType? TaskType { get; set; }
 }
 
-/// <summary>Session IDs to test for live in-use locks.</summary>
+/// <summary>Schema for the `SessionsOpenProgress` type.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsCheckInUseRequest
+public sealed class SessionsOpenProgress
 {
-    /// <summary>Session IDs to test for live in-use locks.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; set; }
+    /// <summary>Optional step message.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>Step status.</summary>
+    [JsonPropertyName("status")]
+    public SessionsOpenProgressStatus Status { get; set; }
+
+    /// <summary>Handoff step.</summary>
+    [JsonPropertyName("step")]
+    public SessionsOpenProgressStep Step { get; set; }
 }
 
-/// <summary>The session's persisted remote-steerable flag, or omitted when no value has been persisted.</summary>
+/// <summary>Result of opening a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetPersistedRemoteSteerableResult
+public sealed class SessionOpenResult
 {
-    /// <summary>The session's persisted remote-steerable flag if recorded; omitted when no value has been persisted.</summary>
-    [JsonPropertyName("remoteSteerable")]
-    public bool? RemoteSteerable { get; set; }
+    /// <summary>Remote session metadata, present when status is `connected`.</summary>
+    [JsonPropertyName("metadata")]
+    public RemoteSessionMetadataValue? Metadata { get; set; }
+
+    /// <summary>Handoff progress steps, present when status is `handed_off`.</summary>
+    [JsonPropertyName("progress")]
+    public IList<SessionsOpenProgress>? Progress { get; set; }
+
+    /// <summary>Remote session ID, present when status is `connected`.</summary>
+    [JsonPropertyName("remoteSessionId")]
+    public string? RemoteSessionId { get; set; }
+
+    /// <summary>In-process SessionClientApi handle for the opened session, returned to CLI callers as a transitional shortcut. Marked internal so the public SDK surface does not expose it; SDK consumers should construct per-session clients from `sessionId` instead.</summary>
+    [JsonInclude]
+    [JsonPropertyName("sessionApi")]
+    internal JsonElement? SessionApi { get; set; }
+
+    /// <summary>Opened session ID. Omitted when status is `not_found`.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
+
+    /// <summary>Startup prompts queued by user-level hook configs at session creation. Only populated when status is `created`; resumed sessions return an empty array.</summary>
+    [JsonPropertyName("startupPrompts")]
+    public IList<string>? StartupPrompts { get; set; }
+
+    /// <summary>Outcome of the open request.</summary>
+    [JsonPropertyName("status")]
+    public SessionsOpenStatus Status { get; set; }
 }
 
-/// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
+/// <summary>Identifier and optional friendly name assigned to the newly forked session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetPersistedRemoteSteerableRequest
+public sealed class SessionsForkResult
 {
-    /// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
+    /// <summary>Friendly name assigned to the forked session, if any.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>The new forked session's ID.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Closes a session: emits shutdown, flushes pending events to disk, releases the in-use lock, disposes the active session. Idempotent: succeeds even if the session is not currently active.</summary>
+/// <summary>Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsCloseResult
+internal sealed class SessionsForkRequest
 {
-}
+    /// <summary>Optional friendly name to assign to the forked session.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-/// <summary>Session ID to close.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsCloseRequest
-{
-    /// <summary>Session ID to close.</summary>
+    /// <summary>Source session ID to fork from.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionBulkDeleteResult
-{
-    /// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory. Sessions whose deletion failed are omitted from this map (failures are logged on the server but not surfaced per-id; check the map for absent IDs to detect them).</summary>
-    [JsonPropertyName("freedBytes")]
-    public IDictionary<string, long> FreedBytes { get => field ??= new Dictionary<string, long>(); set; }
+    /// <summary>Optional event ID boundary. When provided, the fork includes only events before this ID (exclusive). When omitted, all events are included.</summary>
+    [JsonPropertyName("toEventId")]
+    public string? ToEventId { get; set; }
 }
 
-/// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
+/// <summary>Repository associated with the connected remote session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsBulkDeleteRequest
+public sealed class ConnectedRemoteSessionMetadataRepository
 {
-    /// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; set; }
+    /// <summary>Branch associated with the remote session.</summary>
+    [JsonPropertyName("branch")]
+    public string Branch { get; set; } = string.Empty;
+
+    /// <summary>Repository name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Repository owner or organization login.</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
 }
 
-/// <summary>Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.</summary>
+/// <summary>Metadata for a connected remote session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionPruneResult
+public sealed class ConnectedRemoteSessionMetadata
 {
-    /// <summary>Session IDs that would be deleted in dry-run mode (always empty otherwise).</summary>
-    [JsonPropertyName("candidates")]
-    public IList<string> Candidates { get => field ??= []; set; }
+    /// <summary>Neutral SDK discriminator for the connected remote session kind.</summary>
+    [JsonPropertyName("kind")]
+    public ConnectedRemoteSessionMetadataKind Kind { get; set; }
 
-    /// <summary>Session IDs that were deleted (always empty in dry-run mode).</summary>
-    [JsonPropertyName("deleted")]
-    public IList<string> Deleted { get => field ??= []; set; }
+    /// <summary>Last session update time as an ISO 8601 string.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public DateTimeOffset ModifiedTime { get; set; }
 
-    /// <summary>True when no deletions were actually performed.</summary>
-    [JsonPropertyName("dryRun")]
-    public bool DryRun { get; set; }
+    /// <summary>Optional friendly session name.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Total bytes freed (actual when not dry-run, projected when dry-run).</summary>
-    [JsonPropertyName("freedBytes")]
-    public long FreedBytes { get; set; }
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
+
+    /// <summary>Repository associated with the connected remote session.</summary>
+    [JsonPropertyName("repository")]
+    public ConnectedRemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
+
+    /// <summary>Original remote resource identifier.</summary>
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
 
-    /// <summary>Session IDs that were skipped (e.g., named sessions).</summary>
-    [JsonPropertyName("skipped")]
-    public IList<string> Skipped { get => field ??= []; set; }
-}
+    /// <summary>SDK session ID for the connected remote session.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-/// <summary>Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsPruneOldRequest
-{
-    /// <summary>When true, only report what would be deleted without performing any deletion.</summary>
-    [JsonPropertyName("dryRun")]
-    public bool? DryRun { get; set; }
+    /// <summary>Remote session staleness deadline as an ISO 8601 string.</summary>
+    [JsonPropertyName("staleAt")]
+    public DateTimeOffset? StaleAt { get; set; }
 
-    /// <summary>Session IDs that should never be considered for pruning.</summary>
-    [JsonPropertyName("excludeSessionIds")]
-    public IList<string>? ExcludeSessionIds { get; set; }
+    /// <summary>Session start time as an ISO 8601 string.</summary>
+    [JsonPropertyName("startTime")]
+    public DateTimeOffset StartTime { get; set; }
 
-    /// <summary>When true, named sessions (set via /rename) are also eligible for pruning.</summary>
-    [JsonPropertyName("includeNamed")]
-    public bool? IncludeNamed { get; set; }
+    /// <summary>Remote session state returned by the backing service.</summary>
+    [JsonPropertyName("state")]
+    public string? State { get; set; }
 
-    /// <summary>Delete sessions whose modifiedTime is at least this many days old.</summary>
-    [JsonPropertyName("olderThanDays")]
-    public long OlderThanDays { get; set; }
+    /// <summary>Optional session summary.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
 }
 
-/// <summary>Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).</summary>
+/// <summary>Remote session connection result.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsSaveResult
+public sealed class RemoteSessionConnectionResult
 {
-}
+    /// <summary>Metadata for a connected remote session.</summary>
+    [JsonPropertyName("metadata")]
+    public ConnectedRemoteSessionMetadata Metadata { get => field ??= new(); set; }
 
-/// <summary>Session ID whose pending events should be flushed to disk.</summary>
-[Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsSaveRequest
-{
-    /// <summary>Session ID whose pending events should be flushed to disk.</summary>
+    /// <summary>SDK session ID for the connected remote session.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Release the in-use lock held by this process for the given session. No-op when this process does not currently hold a lock for the session.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class SessionsReleaseLockResult
-{
-}
-
-/// <summary>Session ID whose in-use lock should be released.</summary>
+/// <summary>Remote session connection parameters.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsReleaseLockRequest
+internal sealed class ConnectRemoteSessionParams
 {
-    /// <summary>Session ID whose in-use lock should be released.</summary>
+    /// <summary>Session ID to connect to.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Schema for the `LocalSessionMetadataValue` type.</summary>
+/// <summary>Local or remote session metadata entry. Narrow on `isRemote` to access source-specific fields.</summary>
+/// <remarks>Data type discriminated by <c>isRemote</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LocalSessionMetadataValue
+public partial class SessionListEntry
 {
+    /// <summary>The boolean discriminator.</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { get; set; }
+
     /// <summary>Runtime client name that created/last resumed this session.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("clientName")]
     public string? ClientName { get; set; }
 
     /// <summary>Pre-resolved working-directory context for session startup.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("context")]
     public SessionContext? Context { get; set; }
 
     /// <summary>True for detached maintenance sessions that should be hidden from normal resume lists.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("isDetached")]
     public bool? IsDetached { get; set; }
 
-    /// <summary>Always false for local sessions.</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
-
     /// <summary>GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("mcTaskId")]
     public string? McTaskId { get; set; }
 
     /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
     [JsonPropertyName("modifiedTime")]
-    public string ModifiedTime { get; set; } = string.Empty;
+    public required string ModifiedTime { get; set; }
 
     /// <summary>Optional human-friendly name set via /rename.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("name")]
     public string? Name { get; set; }
 
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
+
+    /// <summary>Backing remote session IDs (most recent first).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("remoteSessionIds")]
+    public IList<string>? RemoteSessionIds { get; set; }
+
+    /// <summary>GitHub repository the remote session belongs to.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("repository")]
+    public RemoteSessionMetadataRepository? Repository { get; set; }
+
+    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
+
     /// <summary>Stable session identifier.</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    public required string SessionId { get; set; }
+
+    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("staleAt")]
+    public string? StaleAt { get; set; }
 
     /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
     [JsonPropertyName("startTime")]
-    public string StartTime { get; set; } = string.Empty;
+    public required string StartTime { get; set; }
+
+    /// <summary>Server-side task state returned by GitHub.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("state")]
+    public string? State { get; set; }
 
     /// <summary>Short summary of the session, when one has been derived.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("summary")]
     public string? Summary { get; set; }
+
+    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("taskType")]
+    public RemoteSessionMetadataTaskType? TaskType { get; set; }
 }
 
-/// <summary>The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.</summary>
+/// <summary>Sessions matching the filter, ordered most-recently-modified first.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionEnrichMetadataResult
+public sealed class SessionList
 {
-    /// <summary>Enriched records, with summary and context backfilled. Sessions confirmed empty and unnamed may be omitted.</summary>
+    /// <summary>Sessions ordered most-recently-modified first. Discriminated by `isRemote`.</summary>
     [JsonPropertyName("sessions")]
-    public IList<LocalSessionMetadataValue> Sessions { get => field ??= []; set; }
+    public IList<SessionListEntry> Sessions { get => field ??= []; set; }
 }
 
-/// <summary>Session metadata records to enrich with summary and context information.</summary>
+/// <summary>Optional filter applied to the returned sessions.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsEnrichMetadataRequest
+public sealed class SessionListFilter
 {
-    /// <summary>Session metadata records to enrich. Records that already have summary and context are returned unchanged.</summary>
-    [JsonPropertyName("sessions")]
-    public IList<LocalSessionMetadataValue> Sessions { get => field ??= []; set; }
+    /// <summary>Match sessions whose context.branch equals this value.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
+
+    /// <summary>Match sessions whose context.cwd equals this value.</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
+
+    /// <summary>Match sessions whose context.gitRoot equals this value.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
+
+    /// <summary>Match sessions whose context.repository equals this value.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
 }
 
-/// <summary>Reload all hooks (user, plugin, optionally repo) and apply them to the active session. Call after installing or removing plugins so their hooks take effect immediately. No-op when no active session matches the given sessionId.</summary>
+/// <summary>Optional source filter, metadata-load limit, and context filter applied to the returned sessions.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsReloadPluginHooksResult
+internal sealed class SessionsListRequest
 {
+    /// <summary>Optional filter applied to the returned sessions.</summary>
+    [JsonPropertyName("filter")]
+    public SessionListFilter? Filter { get; set; }
+
+    /// <summary>When true, include detached maintenance sessions. Defaults to false for user-facing session lists.</summary>
+    [JsonPropertyName("includeDetached")]
+    public bool? IncludeDetached { get; set; }
+
+    /// <summary>When provided, only the first N local sessions (sorted by modification time, newest first) load full metadata; remaining sessions return basic info only. Use 0 to return only basic info for every local session. Has no effect on remote entries (which always carry their full shape).</summary>
+    [JsonPropertyName("metadataLimit")]
+    public long? MetadataLimit { get; set; }
+
+    /// <summary>Which session sources to include. Defaults to `local` for backward compatibility.</summary>
+    [JsonPropertyName("source")]
+    public SessionSource? Source { get; set; }
+
+    /// <summary>Only meaningful when `source` includes remote. When true, propagates errors from the remote service instead of silently returning an empty remote list. Defaults to false.</summary>
+    [JsonPropertyName("throwOnError")]
+    public bool? ThrowOnError { get; set; }
 }
 
-/// <summary>Active session ID and an optional flag for deferring repo-level hooks until folder trust.</summary>
+/// <summary>ID of the local session bound to the given GitHub task, or omitted when none.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsReloadPluginHooksRequest
+public sealed class SessionsFindByTaskIDResult
 {
-    /// <summary>When true, skip repo-level hooks. Use before folder trust is confirmed; loadDeferredRepoHooks loads them post-trust.</summary>
-    [JsonPropertyName("deferRepoHooks")]
-    public bool? DeferRepoHooks { get; set; }
-
-    /// <summary>Active session ID to reload hooks for.</summary>
+    /// <summary>Omitted when no local session is bound to that GitHub task.</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    public string? SessionId { get; set; }
 }
 
-/// <summary>Queued repo-level startup prompts and the total hook command count after loading.</summary>
+/// <summary>GitHub task ID to look up.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionLoadDeferredRepoHooksResult
+internal sealed class SessionsFindByTaskIDRequest
 {
-    /// <summary>Total hook command count (user + plugin + repo) loaded for the session by this call. Captured atomically with startupPrompts so callers don't need to read a separate counter.</summary>
-    [JsonPropertyName("hookCount")]
-    public long HookCount { get; set; }
-
-    /// <summary>Repo-level startup prompts queued from repo hook configs. Empty on resume, when no repo configs were pending, or when disableAllHooks is set.</summary>
-    [JsonPropertyName("startupPrompts")]
-    public IList<string> StartupPrompts { get => field ??= []; set; }
+    /// <summary>GitHub task ID to look up.</summary>
+    [JsonPropertyName("taskId")]
+    public string TaskId { get; set; } = string.Empty;
 }
 
-/// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
+/// <summary>Session ID matching the prefix, omitted when no unique match exists.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsLoadDeferredRepoHooksRequest
+public sealed class SessionsFindByPrefixResult
 {
-    /// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
+    /// <summary>Omitted when no unique session matches the prefix (no match or ambiguous).</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    public string? SessionId { get; set; }
 }
 
-/// <summary>Replace the manager-wide additional plugins. New session creations and subsequent hook reloads see the new set; already-running sessions keep their existing hook installation until the next reload.</summary>
+/// <summary>UUID prefix to resolve to a unique session ID.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsSetAdditionalPluginsResult
+internal sealed class SessionsFindByPrefixRequest
 {
+    /// <summary>UUID prefix (&gt;=7 hex chars, &lt;36 chars). Returns the unique session ID, or undefined when there is no match or the prefix matches multiple sessions.</summary>
+    [JsonPropertyName("prefix")]
+    public string Prefix { get; set; } = string.Empty;
 }
 
-/// <summary>Schema for the `InstalledPlugin` type.</summary>
+/// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class InstalledPlugin
+public sealed class SessionsGetLastForContextResult
 {
-    /// <summary>Path where the plugin is cached locally.</summary>
-    [JsonPropertyName("cache_path")]
-    public string? CachePath { get; set; }
-
-    /// <summary>Whether the plugin is currently enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Installation timestamp.</summary>
-    [JsonPropertyName("installed_at")]
-    public string InstalledAt { get; set; } = string.Empty;
-
-    /// <summary>Marketplace the plugin came from (empty string for direct repo installs).</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
-
-    /// <summary>Plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Source for direct repo installs (when marketplace is empty).</summary>
-    [JsonPropertyName("source")]
-    public JsonElement? Source { get; set; }
-
-    /// <summary>Version installed (if available).</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
 }
 
-/// <summary>Manager-wide additional plugins to register; replaces any previously-configured set.</summary>
+/// <summary>Optional working-directory context used to score session relevance.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsSetAdditionalPluginsRequest
-{
-    /// <summary>Manager-wide additional plugins to register. Replaces any previously-configured set. Pass an empty array to clear.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<InstalledPlugin> Plugins { get => field ??= []; set; }
+internal sealed class SessionsGetLastForContextRequest
+{
+    /// <summary>Optional working-directory context used to score session relevance. When omitted the most-recently-modified session wins.</summary>
+    [JsonPropertyName("context")]
+    public SessionContext? Context { get; set; }
 }
 
-/// <summary>Dynamic-context board entry count, when available.</summary>
+/// <summary>Absolute path to the session's events.jsonl file on disk.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetBoardEntryCountResult
+internal sealed class SessionsGetEventFilePathResult
 {
-    /// <summary>Board entry count, when available.</summary>
-    [JsonPropertyName("count")]
-    public long? Count { get; set; }
+    /// <summary>Absolute path to the session's events.jsonl file.</summary>
+    [JsonPropertyName("filePath")]
+    public string FilePath { get; set; } = string.Empty;
 }
 
-/// <summary>Session ID whose board entry count should be returned.</summary>
+/// <summary>Session ID whose event-log file path to compute.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsGetBoardEntryCountRequest
+internal sealed class SessionsGetEventFilePathRequest
 {
-    /// <summary>Session ID whose board entry count should be returned.</summary>
+    /// <summary>Session ID whose event-log file path to compute.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>State of the runtime-managed remote-control singleton.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>state</c>.</remarks>
+/// <summary>Map of sessionId -&gt; on-disk size in bytes for each session's workspace directory.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "state",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(RemoteControlStatusOff), "off")]
-[JsonDerivedType(typeof(RemoteControlStatusConnecting), "connecting")]
-[JsonDerivedType(typeof(RemoteControlStatusActive), "active")]
-[JsonDerivedType(typeof(RemoteControlStatusError), "error")]
-public partial class RemoteControlStatus
+public sealed class SessionSizes
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("state")]
-    public virtual string State { get; set; } = string.Empty;
+    /// <summary>Map of sessionId -&gt; on-disk size in bytes for the session's workspace directory.</summary>
+    [JsonPropertyName("sizes")]
+    public IDictionary<string, long> Sizes { get => field ??= new Dictionary<string, long>(); set; }
 }
 
-
-/// <summary>Remote control is not connected.</summary>
-/// <remarks>The <c>off</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>Session IDs from the input set that are currently in use by another process.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class RemoteControlStatusOff : RemoteControlStatus
+public sealed class SessionsCheckInUseResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string State => "off";
+    /// <summary>Session IDs from the input set that are currently held by another running process via an alive lock file.</summary>
+    [JsonPropertyName("inUse")]
+    public IList<string> InUse { get => field ??= []; set; }
 }
 
-/// <summary>Remote control is in the middle of initial setup.</summary>
-/// <remarks>The <c>connecting</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>Session IDs to test for live in-use locks.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class RemoteControlStatusConnecting : RemoteControlStatus
+internal sealed class SessionsCheckInUseRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string State => "connecting";
-
-    /// <summary>Session id the connection is attaching to.</summary>
-    [JsonPropertyName("attachedSessionId")]
-    public required string AttachedSessionId { get; set; }
+    /// <summary>Session IDs to test for live in-use locks.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>Remote control is connected to a local session.</summary>
-/// <remarks>The <c>active</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>The session's persisted remote-steerable flag, or omitted when no value has been persisted.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class RemoteControlStatusActive : RemoteControlStatus
+internal sealed class SessionsGetPersistedRemoteSteerableResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string State => "active";
-
-    /// <summary>Session id remote control is pointed at.</summary>
-    [JsonPropertyName("attachedSessionId")]
-    public required string AttachedSessionId { get; set; }
-
-    /// <summary>MC frontend URL for this session, when known.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("frontendUrl")]
-    public string? FrontendUrl { get; set; }
-
-    /// <summary>Whether the MC session may steer this session.</summary>
-    [JsonPropertyName("isSteerable")]
-    public required bool IsSteerable { get; set; }
-
-    /// <summary>In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, the same bidirectional prompt-routing handshake is expressed via dedicated remote-control RPCs (register/resolve) rather than a shared in-process object.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("promptManager")]
-    internal JsonElement? PromptManager { get; set; }
+    /// <summary>The session's persisted remote-steerable flag if recorded; omitted when no value has been persisted.</summary>
+    [JsonPropertyName("remoteSteerable")]
+    public bool? RemoteSteerable { get; set; }
 }
 
-/// <summary>The last setup attempt failed. The singleton is otherwise off.</summary>
-/// <remarks>The <c>error</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class RemoteControlStatusError : RemoteControlStatus
+internal sealed class SessionsGetPersistedRemoteSteerableRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string State => "error";
-
-    /// <summary>Session id the failing setup attempt targeted, when known.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("attachedSessionId")]
-    public string? AttachedSessionId { get; set; }
-
-    /// <summary>Human-readable error message from the last setup attempt.</summary>
-    [JsonPropertyName("error")]
-    public required string Error { get; set; }
+    /// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Wrapper for the singleton's current status.</summary>
+/// <summary>Closes a session: emits shutdown, flushes pending events to disk, releases the in-use lock, disposes the active session. Idempotent: succeeds even if the session is not currently active.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlStatusResult
+public sealed class SessionsCloseResult
 {
-    /// <summary>State of the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("status")]
-    public RemoteControlStatus Status { get => field ??= new(); set; }
 }
 
-/// <summary>Reattach to an existing MC session without creating a new one.</summary>
+/// <summary>Session ID to close.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlConfigExistingMcSession
+internal sealed class SessionsCloseRequest
 {
-    /// <summary>Existing MC session ID to reattach to.</summary>
-    [JsonPropertyName("mcSessionId")]
-    public string McSessionId { get; set; } = string.Empty;
-
-    /// <summary>Existing MC task ID for the reattached session.</summary>
-    [JsonPropertyName("mcTaskId")]
-    public string McTaskId { get; set; } = string.Empty;
+    /// <summary>Session ID to close.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
+/// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlConfig
+public sealed class SessionBulkDeleteResult
 {
-    /// <summary>Reattach to an existing MC session without creating a new one.</summary>
-    [JsonPropertyName("existingMcSession")]
-    public RemoteControlConfigExistingMcSession? ExistingMcSession { get; set; }
-
-    /// <summary>Whether the user explicitly requested remote (vs. implicit session-sync). Controls warning surfacing for missing-repo cases.</summary>
-    [JsonPropertyName("explicit")]
-    public bool Explicit { get; set; }
-
-    /// <summary>Whether remote export should be enabled.</summary>
-    [JsonPropertyName("remote")]
-    public bool Remote { get; set; }
-
-    /// <summary>When true, suppresses timeline messages on successful setup.</summary>
-    [JsonPropertyName("silent")]
-    public bool Silent { get; set; }
-
-    /// <summary>Whether the MC session may steer the local session (write mode).</summary>
-    [JsonPropertyName("steerable")]
-    public bool Steerable { get; set; }
-
-    /// <summary>Existing Mission Control task ID to attach the exported session to.</summary>
-    [JsonPropertyName("taskId")]
-    public string? TaskId { get; set; }
+    /// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory. Sessions whose deletion failed are omitted from this map (failures are logged on the server but not surfaced per-id; check the map for absent IDs to detect them).</summary>
+    [JsonPropertyName("freedBytes")]
+    public IDictionary<string, long> FreedBytes { get => field ??= new Dictionary<string, long>(); set; }
 }
 
-/// <summary>Parameters for attaching the remote-control singleton to a session.</summary>
+/// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsStartRemoteControlRequest
+internal sealed class SessionsBulkDeleteRequest
 {
-    /// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("config")]
-    public RemoteControlConfig Config { get => field ??= new(); set; }
-
-    /// <summary>Local session id to attach remote control to.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>Outcome of a transferRemoteControl call.</summary>
+/// <summary>Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlTransferResult
+public sealed class SessionPruneResult
 {
-    /// <summary>State of the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("status")]
-    public RemoteControlStatus Status { get => field ??= new(); set; }
+    /// <summary>Session IDs that would be deleted in dry-run mode (always empty otherwise).</summary>
+    [JsonPropertyName("candidates")]
+    public IList<string> Candidates { get => field ??= []; set; }
 
-    /// <summary>Whether the rebinding actually happened.</summary>
-    [JsonPropertyName("transferred")]
-    public bool Transferred { get; set; }
+    /// <summary>Session IDs that were deleted (always empty in dry-run mode).</summary>
+    [JsonPropertyName("deleted")]
+    public IList<string> Deleted { get => field ??= []; set; }
+
+    /// <summary>True when no deletions were actually performed.</summary>
+    [JsonPropertyName("dryRun")]
+    public bool DryRun { get; set; }
+
+    /// <summary>Total bytes freed (actual when not dry-run, projected when dry-run).</summary>
+    [JsonPropertyName("freedBytes")]
+    public long FreedBytes { get; set; }
+
+    /// <summary>Session IDs that were skipped (e.g., named sessions).</summary>
+    [JsonPropertyName("skipped")]
+    public IList<string> Skipped { get => field ??= []; set; }
 }
 
-/// <summary>Parameters for atomically rebinding the remote-control singleton.</summary>
+/// <summary>Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsTransferRemoteControlRequest
+internal sealed class SessionsPruneOldRequest
 {
-    /// <summary>When provided, the transfer is rejected unless the singleton currently points at this session id (compare-and-swap semantics to avoid clobbering newer state).</summary>
-    [JsonPropertyName("expectedFromSessionId")]
-    public string? ExpectedFromSessionId { get; set; }
+    /// <summary>When true, only report what would be deleted without performing any deletion.</summary>
+    [JsonPropertyName("dryRun")]
+    public bool? DryRun { get; set; }
 
-    /// <summary>Local session id to point remote control at.</summary>
-    [JsonPropertyName("toSessionId")]
-    public string ToSessionId { get; set; } = string.Empty;
+    /// <summary>Session IDs that should never be considered for pruning.</summary>
+    [JsonPropertyName("excludeSessionIds")]
+    public IList<string>? ExcludeSessionIds { get; set; }
+
+    /// <summary>When true, named sessions (set via /rename) are also eligible for pruning.</summary>
+    [JsonPropertyName("includeNamed")]
+    public bool? IncludeNamed { get; set; }
+
+    /// <summary>Delete sessions whose modifiedTime is at least this many days old.</summary>
+    [JsonPropertyName("olderThanDays")]
+    public long OlderThanDays { get; set; }
 }
 
-/// <summary>Patch for the singleton's steering state.</summary>
+/// <summary>Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsSetRemoteControlSteeringRequest
+public sealed class SessionsSaveResult
 {
-    /// <summary>Target steering state. Today only `true` is actionable on the underlying exporter; `false` is reserved for future use.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
 }
 
-/// <summary>Outcome of a stopRemoteControl call.</summary>
+/// <summary>Session ID whose pending events should be flushed to disk.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class RemoteControlStopResult
+internal sealed class SessionsSaveRequest
 {
-    /// <summary>State of the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("status")]
-    public RemoteControlStatus Status { get => field ??= new(); set; }
-
-    /// <summary>Whether the singleton was actually torn down by this call.</summary>
-    [JsonPropertyName("stopped")]
-    public bool Stopped { get; set; }
+    /// <summary>Session ID whose pending events should be flushed to disk.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionsStopRemoteControl operations.</summary>
+/// <summary>Release the in-use lock held by this process for the given session. No-op when this process does not currently hold a lock for the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsStopRemoteControlRequest
+public sealed class SessionsReleaseLockResult
 {
-    /// <summary>When provided, the stop is rejected unless the singleton currently points at this session id (compare-and-swap semantics).</summary>
-    [JsonPropertyName("expectedSessionId")]
-    public string? ExpectedSessionId { get; set; }
-
-    /// <summary>When true, the singleton is unconditionally torn down regardless of `expectedSessionId`. Use during shutdown or explicit `/remote off`.</summary>
-    [JsonPropertyName("force")]
-    public bool? Force { get; set; }
 }
 
-/// <summary>Schema for the `SessionsPollSpawnedSessionsEvent` type.</summary>
+/// <summary>Session ID whose in-use lock should be released.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsPollSpawnedSessionsEvent
+internal sealed class SessionsReleaseLockRequest
 {
-    /// <summary>Session id of the newly-spawned session.</summary>
+    /// <summary>Session ID whose in-use lock should be released.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Batch of spawn events plus a cursor for follow-up polls.</summary>
+/// <summary>Schema for the `LocalSessionMetadataValue` type.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class PollSpawnedSessionsResult
+public sealed class LocalSessionMetadataValue
 {
-    /// <summary>Opaque cursor to pass back to receive only events after this batch.</summary>
-    [JsonPropertyName("cursor")]
-    public string Cursor { get; set; } = string.Empty;
+    /// <summary>Runtime client name that created/last resumed this session.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>Spawn events emitted since the supplied cursor.</summary>
-    [JsonPropertyName("events")]
-    public IList<SessionsPollSpawnedSessionsEvent> Events { get => field ??= []; set; }
+    /// <summary>Pre-resolved working-directory context for session startup.</summary>
+    [JsonPropertyName("context")]
+    public SessionContext? Context { get; set; }
+
+    /// <summary>True for detached maintenance sessions that should be hidden from normal resume lists.</summary>
+    [JsonPropertyName("isDetached")]
+    public bool? IsDetached { get; set; }
+
+    /// <summary>Always false for local sessions.</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { get; set; }
+
+    /// <summary>GitHub task ID, when this local session is bound to one. Only present for local sessions exported to remote control.</summary>
+    [JsonPropertyName("mcTaskId")]
+    public string? McTaskId { get; set; }
+
+    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public string ModifiedTime { get; set; } = string.Empty;
+
+    /// <summary>Optional human-friendly name set via /rename.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Stable session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("startTime")]
+    public string StartTime { get; set; } = string.Empty;
+
+    /// <summary>Short summary of the session, when one has been derived.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
 }
 
-/// <summary>RPC data type for SessionsPollSpawnedSessions operations.</summary>
+/// <summary>The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionsPollSpawnedSessionsRequest
+public sealed class SessionEnrichMetadataResult
 {
-    /// <summary>Opaque cursor returned by a previous poll. Omit on the first call to receive any spawn events buffered since the runtime started.</summary>
-    [JsonPropertyName("cursor")]
-    public string? Cursor { get; set; }
-
-    /// <summary>Milliseconds to wait for new spawn events when the cursor is at the tail. 0 (default) returns immediately even if no events are buffered. Capped at 60000ms.</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonPropertyName("waitMs")]
-    public TimeSpan? Wait { get; set; }
+    /// <summary>Enriched records, with summary and context backfilled. Sessions confirmed empty and unnamed may be omitted.</summary>
+    [JsonPropertyName("sessions")]
+    public IList<LocalSessionMetadataValue> Sessions { get => field ??= []; set; }
 }
 
-/// <summary>Handle for releasing the extension tool registration.</summary>
+/// <summary>Session metadata records to enrich with summary and context information.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class RegisterExtensionToolsResult
+internal sealed class SessionsEnrichMetadataRequest
 {
-    /// <summary>In-process unsubscribe function (CLI-only optimization). Marked internal: replaced by an explicit `extensions.unregister` RPC in the SDK migration.</summary>
-    [JsonInclude]
-    [JsonPropertyName("unsubscribe")]
-    internal JsonElement Unsubscribe { get; set; }
+    /// <summary>Session metadata records to enrich. Records that already have summary and context are returned unchanged.</summary>
+    [JsonPropertyName("sessions")]
+    public IList<LocalSessionMetadataValue> Sessions { get => field ??= []; set; }
 }
 
-/// <summary>Optional registration options.</summary>
+/// <summary>Reload all hooks (user, plugin, optionally repo) and apply them to the active session. Call after installing or removing plugins so their hooks take effect immediately. No-op when no active session matches the given sessionId.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionsRegisterExtensionToolsOnSessionOptions
+public sealed class SessionsReloadPluginHooksResult
 {
-    /// <summary>In-process `() =&gt; boolean` gating callback (CLI-only optimization). Marked internal: replaced by runtime-side enable/disable RPCs in the SDK migration.</summary>
-    [JsonInclude]
-    [JsonPropertyName("enabled")]
-    internal JsonElement? Enabled { get; set; }
 }
 
-/// <summary>Params to attach an extension loader's tools to a session.</summary>
+/// <summary>Active session ID and an optional flag for deferring repo-level hooks until folder trust.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class RegisterExtensionToolsParams
+internal sealed class SessionsReloadPluginHooksRequest
 {
-    /// <summary>In-process ExtensionLoader handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, extension discovery/launch moves entirely into the runtime — the CLI passes pure config (search paths, disabled ids) via SessionOptions instead.</summary>
-    [JsonInclude]
-    [JsonPropertyName("loader")]
-    internal JsonElement Loader { get; set; }
-
-    /// <summary>Optional registration options.</summary>
-    [JsonPropertyName("options")]
-    public SessionsRegisterExtensionToolsOnSessionOptions? Options { get; set; }
+    /// <summary>When true, skip repo-level hooks. Use before folder trust is confirmed; loadDeferredRepoHooks loads them post-trust.</summary>
+    [JsonPropertyName("deferRepoHooks")]
+    public bool? DeferRepoHooks { get; set; }
 
-    /// <summary>Session to register extension tools on.</summary>
+    /// <summary>Active session ID to reload hooks for.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Params to attach or detach an in-process ExtensionController delegate.</summary>
+/// <summary>Queued repo-level startup prompts and the total hook command count after loading.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ConfigureSessionExtensionsParams
+public sealed class SessionLoadDeferredRepoHooksResult
 {
-    /// <summary>In-process ExtensionController delegate (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. The post-SDK extension surface exposes list/enable/disable/reload via dedicated RPCs served by the runtime.</summary>
-    [JsonInclude]
-    [JsonPropertyName("controller")]
-    internal JsonElement? Controller { get; set; }
+    /// <summary>Total hook command count (user + plugin + repo) loaded for the session by this call. Captured atomically with startupPrompts so callers don't need to read a separate counter.</summary>
+    [JsonPropertyName("hookCount")]
+    public long HookCount { get; set; }
 
-    /// <summary>Session to attach the extension controller delegate to.</summary>
+    /// <summary>Repo-level startup prompts queued from repo hook configs. Empty on resume, when no repo configs were pending, or when disableAllHooks is set.</summary>
+    [JsonPropertyName("startupPrompts")]
+    public IList<string> StartupPrompts { get => field ??= []; set; }
+}
+
+/// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionsLoadDeferredRepoHooksRequest
+{
+    /// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Outcome of an agentRegistry.spawn call.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Replace the manager-wide additional plugins. New session creations and subsequent hook reloads see the new set; already-running sessions keep their existing hook installation until the next reload.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AgentRegistrySpawnResultSpawned), "spawned")]
-[JsonDerivedType(typeof(AgentRegistrySpawnResultSpawnError), "spawn-error")]
-[JsonDerivedType(typeof(AgentRegistrySpawnResultRegistryTimeout), "registry-timeout")]
-[JsonDerivedType(typeof(AgentRegistrySpawnResultValidationError), "validation-error")]
-public partial class AgentRegistrySpawnResult
+public sealed class SessionsSetAdditionalPluginsResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
 }
 
-
-/// <summary>Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).</summary>
+/// <summary>Schema for the `InstalledPlugin` type.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentRegistryLiveTargetEntry
+public sealed class InstalledPlugin
 {
-    /// <summary>Kind of attention required when status === "attention". Meaningful only when status === "attention".</summary>
-    [JsonPropertyName("attentionKind")]
-    public AgentRegistryLiveTargetEntryAttentionKind? AttentionKind { get; set; }
-
-    /// <summary>Git branch of the session (when known).</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
-
-    /// <summary>Copilot CLI version that wrote the entry.</summary>
-    [JsonPropertyName("copilotVersion")]
-    public string CopilotVersion { get; set; } = string.Empty;
-
-    /// <summary>Working directory of the session (when known).</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
-
-    /// <summary>Bind host for the entry's JSON-RPC server.</summary>
-    [JsonPropertyName("host")]
-    public string Host { get; set; } = string.Empty;
-
-    /// <summary>Process kind tag for the registry entry.</summary>
-    [JsonPropertyName("kind")]
-    public AgentRegistryLiveTargetEntryKind Kind { get; set; }
-
-    /// <summary>Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness).</summary>
-    [JsonPropertyName("lastSeenMs")]
-    public long LastSeenMs { get; set; }
-
-    /// <summary>How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.</summary>
-    [JsonPropertyName("lastTerminalEvent")]
-    public AgentRegistryLiveTargetEntryLastTerminalEvent? LastTerminalEvent { get; set; }
-
-    /// <summary>Model identifier currently selected for the session.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
-
-    /// <summary>Operating-system pid of the process owning this entry.</summary>
-    [JsonPropertyName("pid")]
-    public long Pid { get; set; }
+    /// <summary>Path where the plugin is cached locally.</summary>
+    [JsonPropertyName("cache_path")]
+    public string? CachePath { get; set; }
 
-    /// <summary>TCP port the entry's JSON-RPC server is listening on.</summary>
-    [JsonPropertyName("port")]
-    public long Port { get; set; }
+    /// <summary>Whether the plugin is currently enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Registry entry schema version (1 = ui-server, 2 = managed-server).</summary>
-    [JsonPropertyName("schemaVersion")]
-    public long SchemaVersion { get; set; }
+    /// <summary>Installation timestamp.</summary>
+    [JsonPropertyName("installed_at")]
+    public string InstalledAt { get; set; } = string.Empty;
 
-    /// <summary>Session ID of the foreground session for this entry.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Marketplace the plugin came from (empty string for direct repo installs).</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
 
-    /// <summary>Friendly session name (when set).</summary>
-    [JsonPropertyName("sessionName")]
-    public string? SessionName { get; set; }
+    /// <summary>Plugin name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>ISO 8601 timestamp captured at registration.</summary>
-    [JsonPropertyName("startedAt")]
-    public string StartedAt { get; set; } = string.Empty;
+    /// <summary>Source for direct repo installs (when marketplace is empty).</summary>
+    [JsonPropertyName("source")]
+    public JsonElement? Source { get; set; }
 
-    /// <summary>Coarse lifecycle status of the foreground session.</summary>
-    [JsonPropertyName("status")]
-    public AgentRegistryLiveTargetEntryStatus? Status { get; set; }
+    /// <summary>Version installed (if available).</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
+}
 
-    /// <summary>Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.</summary>
-    [JsonPropertyName("statusRevision")]
-    public long? StatusRevision { get; set; }
+/// <summary>Manager-wide additional plugins to register; replaces any previously-configured set.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionsSetAdditionalPluginsRequest
+{
+    /// <summary>Manager-wide additional plugins to register. Replaces any previously-configured set. Pass an empty array to clear.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<InstalledPlugin> Plugins { get => field ??= []; set; }
+}
 
-    /// <summary>Connection token (null when the target is unauthenticated).</summary>
-    [JsonInclude]
-    [JsonPropertyName("token")]
-    internal string? Token { get; set; }
+/// <summary>Dynamic-context board entry count, when available.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionsGetBoardEntryCountResult
+{
+    /// <summary>Board entry count, when available.</summary>
+    [JsonPropertyName("count")]
+    public long? Count { get; set; }
 }
 
-/// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+/// <summary>Session ID whose board entry count should be returned.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AgentRegistryLogCapture
+internal sealed class SessionsGetBoardEntryCountRequest
 {
-    /// <summary>Whether per-spawn log capture is on (false when env-disabled or open failed).</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Human-readable open failure message (only set when enabled === false AND the env-disable opt-out was NOT used).</summary>
-    [JsonPropertyName("openError")]
-    public string? OpenError { get; set; }
-
-    /// <summary>Categorized reason for log-open failure.</summary>
-    [JsonPropertyName("openErrorReason")]
-    public AgentRegistryLogCaptureOpenErrorReason? OpenErrorReason { get; set; }
-
-    /// <summary>Absolute path to the per-spawn log file (only set when enabled).</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    /// <summary>Session ID whose board entry count should be returned.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Managed-server child was spawned and registered successfully.</summary>
-/// <remarks>The <c>spawned</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <summary>State of the runtime-managed remote-control singleton.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>state</c>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultSpawned : AgentRegistrySpawnResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "state",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(RemoteControlStatusOff), "off")]
+[JsonDerivedType(typeof(RemoteControlStatusConnecting), "connecting")]
+[JsonDerivedType(typeof(RemoteControlStatusActive), "active")]
+[JsonDerivedType(typeof(RemoteControlStatusError), "error")]
+public partial class RemoteControlStatus
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "spawned";
-
-    /// <summary>Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).</summary>
-    [JsonPropertyName("entry")]
-    public required AgentRegistryLiveTargetEntry Entry { get; set; }
-
-    /// <summary>If the delegate attempted to send the initial prompt and failed, the categorized error message.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("initialPromptError")]
-    public string? InitialPromptError { get; set; }
-
-    /// <summary>Whether the delegate already sent the initial prompt. Always omitted in the current wiring: the controller sends the prompt post-attach via the standard LocalRpcSession.send path.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("initialPromptSent")]
-    public bool? InitialPromptSent { get; set; }
-
-    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("logCapture")]
-    public AgentRegistryLogCapture? LogCapture { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("state")]
+    public virtual string State { get; set; } = string.Empty;
 }
 
-/// <summary>`child_process.spawn` itself failed before the child entered the registry.</summary>
-/// <remarks>The <c>spawn-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+
+/// <summary>Remote control is not connected.</summary>
+/// <remarks>The <c>off</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultSpawnError : AgentRegistrySpawnResult
+public partial class RemoteControlStatusOff : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "spawn-error";
-
-    /// <summary>Underlying errno code (e.g. ENOENT, EACCES) when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("code")]
-    public string? Code { get; set; }
-
-    /// <summary>Human-readable error message.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
+    public override string State => "off";
 }
 
-/// <summary>Spawn succeeded but the child did not publish a matching managed-server entry within the timeout.</summary>
-/// <remarks>The <c>registry-timeout</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <summary>Remote control is in the middle of initial setup.</summary>
+/// <remarks>The <c>connecting</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultRegistryTimeout : AgentRegistrySpawnResult
+public partial class RemoteControlStatusConnecting : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "registry-timeout";
-
-    /// <summary>Process ID of the orphaned child (so the caller can offer 'kill the pid' guidance).</summary>
-    [JsonPropertyName("childPid")]
-    public required long ChildPid { get; set; }
+    public override string State => "connecting";
 
-    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("logCapture")]
-    public AgentRegistryLogCapture? LogCapture { get; set; }
+    /// <summary>Session id the connection is attaching to.</summary>
+    [JsonPropertyName("attachedSessionId")]
+    public required string AttachedSessionId { get; set; }
 }
 
-/// <summary>Synchronous pre-validation rejected the spawn request.</summary>
-/// <remarks>The <c>validation-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <summary>Remote control is connected to a local session.</summary>
+/// <remarks>The <c>active</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultValidationError : AgentRegistrySpawnResult
+public partial class RemoteControlStatusActive : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "validation-error";
+    public override string State => "active";
 
-    /// <summary>Which parameter field was invalid. Omitted when the rejection is not field-specific.</summary>
+    /// <summary>Session id remote control is pointed at.</summary>
+    [JsonPropertyName("attachedSessionId")]
+    public required string AttachedSessionId { get; set; }
+
+    /// <summary>MC frontend URL for this session, when known.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("field")]
-    public AgentRegistrySpawnValidationErrorField? Field { get; set; }
+    [JsonPropertyName("frontendUrl")]
+    public string? FrontendUrl { get; set; }
 
-    /// <summary>Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
+    /// <summary>Whether the MC session may steer this session.</summary>
+    [JsonPropertyName("isSteerable")]
+    public required bool IsSteerable { get; set; }
 
-    /// <summary>Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.</summary>
-    [JsonPropertyName("reason")]
-    public required AgentRegistrySpawnValidationErrorReason Reason { get; set; }
+    /// <summary>In-process prompt-manager handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, the same bidirectional prompt-routing handshake is expressed via dedicated remote-control RPCs (register/resolve) rather than a shared in-process object.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("promptManager")]
+    internal JsonElement? PromptManager { get; set; }
 }
 
-/// <summary>Inputs to spawn a managed-server child via the controller's spawn delegate.</summary>
+/// <summary>The last setup attempt failed. The singleton is otherwise off.</summary>
+/// <remarks>The <c>error</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AgentRegistrySpawnRequest
+public partial class RemoteControlStatusError : RemoteControlStatus
 {
-    /// <summary>Custom or built-in agent name (e.g. 'explore'). When omitted, the child uses its own default.</summary>
-    [JsonPropertyName("agentName")]
-    public string? AgentName { get; set; }
-
-    /// <summary>Working directory for the spawned child (must be an existing directory).</summary>
-    [JsonPropertyName("cwd")]
-    public string Cwd { get; set; } = string.Empty;
-
-    /// <summary>Optional first user message. Forwarded to the caller (the CLI's spawn wrapper sends it post-attach via the standard LocalRpcSession.send path).</summary>
-    [JsonPropertyName("initialPrompt")]
-    public string? InitialPrompt { get; set; }
-
-    /// <summary>Model identifier to apply to the new session.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string State => "error";
 
-    /// <summary>Friendly session name. Must satisfy validateSessionName: non-empty, no leading/trailing whitespace, &lt;=100 chars, no control chars, no double quotes.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Session id the failing setup attempt targeted, when known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("attachedSessionId")]
+    public string? AttachedSessionId { get; set; }
 
-    /// <summary>Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.</summary>
-    [JsonPropertyName("permissionMode")]
-    public AgentRegistrySpawnPermissionMode? PermissionMode { get; set; }
+    /// <summary>Human-readable error message from the last setup attempt.</summary>
+    [JsonPropertyName("error")]
+    public required string Error { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Wrapper for the singleton's current status.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionSuspendRequest
+public sealed class RemoteControlStatusResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>State of the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("status")]
+    public RemoteControlStatus Status { get => field ??= new(); set; }
 }
 
-/// <summary>Result of sending a user message.</summary>
+/// <summary>Reattach to an existing MC session without creating a new one.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SendResult
+public sealed class RemoteControlConfigExistingMcSession
 {
-    /// <summary>Unique identifier assigned to the message.</summary>
-    [JsonPropertyName("messageId")]
-    public string MessageId { get; set; } = string.Empty;
+    /// <summary>Existing MC session ID to reattach to.</summary>
+    [JsonPropertyName("mcSessionId")]
+    public string McSessionId { get; set; } = string.Empty;
+
+    /// <summary>Existing MC task ID for the reattached session.</summary>
+    [JsonPropertyName("mcTaskId")]
+    public string McTaskId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for sending a user message to the session.</summary>
+/// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SendRequest
+public sealed class RemoteControlConfig
 {
-    /// <summary>The UI mode the agent was in when this message was sent. Defaults to the session's current mode.</summary>
-    [JsonPropertyName("agentMode")]
-    public SendAgentMode? AgentMode { get; set; }
-
-    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with the message.</summary>
-    [JsonPropertyName("attachments")]
-    public IList<Attachment>? Attachments { get; set; }
-
-    /// <summary>If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.</summary>
-    [JsonPropertyName("billable")]
-    public bool? Billable { get; set; }
-
-    /// <summary>If provided, this is shown in the timeline instead of `prompt`.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
-
-    /// <summary>How to deliver the message. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.</summary>
-    [JsonPropertyName("mode")]
-    public SendMode? Mode { get; set; }
-
-    /// <summary>If true, adds the message to the front of the queue instead of the end.</summary>
-    [JsonPropertyName("prepend")]
-    public bool? Prepend { get; set; }
-
-    /// <summary>The user message text.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
-
-    /// <summary>Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.</summary>
-    [JsonPropertyName("requestHeaders")]
-    public IDictionary<string, string>? RequestHeaders { get; set; }
-
-    /// <summary>If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange.</summary>
-    [JsonPropertyName("requiredTool")]
-    public string? RequiredTool { get; set; }
+    /// <summary>Reattach to an existing MC session without creating a new one.</summary>
+    [JsonPropertyName("existingMcSession")]
+    public RemoteControlConfigExistingMcSession? ExistingMcSession { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether the user explicitly requested remote (vs. implicit session-sync). Controls warning surfacing for missing-repo cases.</summary>
+    [JsonPropertyName("explicit")]
+    public bool Explicit { get; set; }
 
-    /// <summary>Optional provenance tag copied to the resulting user.message event. Must match one of three forms: the literal `system`, `command-&lt;command-id&gt;` for messages originating from a command (e.g. slash command, Mission Control command), or `schedule-&lt;numeric-id&gt;` for messages originating from a scheduled job.</summary>
-    [RegularExpression("^(system|command-.*|schedule-\\d+)$")]
-    [JsonInclude]
-    [JsonPropertyName("source")]
-    internal string? Source { get; set; }
+    /// <summary>Whether remote export should be enabled.</summary>
+    [JsonPropertyName("remote")]
+    public bool Remote { get; set; }
 
-    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
-    [JsonPropertyName("traceparent")]
-    public string? Traceparent { get; set; }
+    /// <summary>When true, suppresses timeline messages on successful setup.</summary>
+    [JsonPropertyName("silent")]
+    public bool Silent { get; set; }
 
-    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
-    [JsonPropertyName("tracestate")]
-    public string? Tracestate { get; set; }
+    /// <summary>Whether the MC session may steer the local session (write mode).</summary>
+    [JsonPropertyName("steerable")]
+    public bool Steerable { get; set; }
 
-    /// <summary>If true, await completion of the agentic loop for this message before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageId`; the caller can rely on the agent having processed the message before the call resolves.</summary>
-    [JsonPropertyName("wait")]
-    public bool? Wait { get; set; }
+    /// <summary>Existing Mission Control task ID to attach the exported session to.</summary>
+    [JsonPropertyName("taskId")]
+    public string? TaskId { get; set; }
 }
 
-/// <summary>Result of aborting the current turn.</summary>
+/// <summary>Parameters for attaching the remote-control singleton to a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class AbortResult
+internal sealed class SessionsStartRemoteControlRequest
 {
-    /// <summary>Error message if the abort failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("config")]
+    public RemoteControlConfig Config { get => field ??= new(); set; }
 
-    /// <summary>Whether the abort completed successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Local session id to attach remote control to.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for aborting the current turn.</summary>
+/// <summary>Outcome of a transferRemoteControl call.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class AbortRequest
+public sealed class RemoteControlTransferResult
 {
-    /// <summary>Finite reason code describing why the current turn was aborted.</summary>
-    [JsonPropertyName("reason")]
-    public AbortReason? Reason { get; set; }
+    /// <summary>State of the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("status")]
+    public RemoteControlStatus Status { get => field ??= new(); set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether the rebinding actually happened.</summary>
+    [JsonPropertyName("transferred")]
+    public bool Transferred { get; set; }
 }
 
-/// <summary>Parameters for shutting down the session.</summary>
+/// <summary>Parameters for atomically rebinding the remote-control singleton.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ShutdownRequest
+internal sealed class SessionsTransferRemoteControlRequest
 {
-    /// <summary>Optional human-readable reason. Typically the message of the error that triggered shutdown when type is 'error'.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>When provided, the transfer is rejected unless the singleton currently points at this session id (compare-and-swap semantics to avoid clobbering newer state).</summary>
+    [JsonPropertyName("expectedFromSessionId")]
+    public string? ExpectedFromSessionId { get; set; }
 
-    /// <summary>Why the session is being shut down. Defaults to "routine" when omitted.</summary>
-    [JsonPropertyName("type")]
-    public ShutdownType? Type { get; set; }
+    /// <summary>Local session id to point remote control at.</summary>
+    [JsonPropertyName("toSessionId")]
+    public string ToSessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Identifier of the session event that was emitted for the log message.</summary>
+/// <summary>Patch for the singleton's steering state.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class LogResult
+internal sealed class SessionsSetRemoteControlSteeringRequest
 {
-    /// <summary>The unique identifier of the emitted session event.</summary>
-    [JsonPropertyName("eventId")]
-    public Guid EventId { get; set; }
+    /// <summary>Target steering state. Today only `true` is actionable on the underlying exporter; `false` is reserved for future use.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 }
 
-/// <summary>Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.</summary>
+/// <summary>Outcome of a stopRemoteControl call.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class LogRequest
+public sealed class RemoteControlStopResult
 {
-    /// <summary>When true, the message is transient and not persisted to the session event log on disk.</summary>
-    [JsonPropertyName("ephemeral")]
-    public bool? Ephemeral { get; set; }
+    /// <summary>State of the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("status")]
+    public RemoteControlStatus Status { get => field ??= new(); set; }
 
-    /// <summary>Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".</summary>
-    [JsonPropertyName("level")]
-    public SessionLogLevel? Level { get; set; }
+    /// <summary>Whether the singleton was actually torn down by this call.</summary>
+    [JsonPropertyName("stopped")]
+    public bool Stopped { get; set; }
+}
 
-    /// <summary>Human-readable message.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+/// <summary>RPC data type for SessionsStopRemoteControl operations.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionsStopRemoteControlRequest
+{
+    /// <summary>When provided, the stop is rejected unless the singleton currently points at this session id (compare-and-swap semantics).</summary>
+    [JsonPropertyName("expectedSessionId")]
+    public string? ExpectedSessionId { get; set; }
 
-    /// <summary>Target session identifier.</summary>
+    /// <summary>When true, the singleton is unconditionally torn down regardless of `expectedSessionId`. Use during shutdown or explicit `/remote off`.</summary>
+    [JsonPropertyName("force")]
+    public bool? Force { get; set; }
+}
+
+/// <summary>Schema for the `SessionsPollSpawnedSessionsEvent` type.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionsPollSpawnedSessionsEvent
+{
+    /// <summary>Session id of the newly-spawned session.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Optional actionable tip displayed alongside the message. Only honored on `level: "info"`.</summary>
-    [JsonPropertyName("tip")]
-    public string? Tip { get; set; }
-
-    /// <summary>Domain category for this log entry (e.g., "mcp", "subscription", "policy", "model"). Maps to `infoType`/`warningType`/`errorType` on the emitted event. Defaults to "notification".</summary>
-    [JsonPropertyName("type")]
-    public string? Type { get; set; }
-
-    /// <summary>Optional URL the user can open in their browser for more details.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
 }
 
-/// <summary>Authentication status and account metadata for the session.</summary>
+/// <summary>Batch of spawn events plus a cursor for follow-up polls.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionAuthStatus
+internal sealed class PollSpawnedSessionsResult
 {
-    /// <summary>Authentication type.</summary>
-    [JsonPropertyName("authType")]
-    public AuthInfoType? AuthType { get; set; }
-
-    /// <summary>Copilot plan tier (e.g., individual_pro, business).</summary>
-    [JsonPropertyName("copilotPlan")]
-    public string? CopilotPlan { get; set; }
-
-    /// <summary>Authentication host URL.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("host")]
-    public string? Host { get; set; }
-
-    /// <summary>Whether the session has resolved authentication.</summary>
-    [JsonPropertyName("isAuthenticated")]
-    public bool IsAuthenticated { get; set; }
-
-    /// <summary>Authenticated login/username, if available.</summary>
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
+    /// <summary>Opaque cursor to pass back to receive only events after this batch.</summary>
+    [JsonPropertyName("cursor")]
+    public string Cursor { get; set; } = string.Empty;
 
-    /// <summary>Human-readable authentication status description.</summary>
-    [JsonPropertyName("statusMessage")]
-    public string? StatusMessage { get; set; }
+    /// <summary>Spawn events emitted since the supplied cursor.</summary>
+    [JsonPropertyName("events")]
+    public IList<SessionsPollSpawnedSessionsEvent> Events { get => field ??= []; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>RPC data type for SessionsPollSpawnedSessions operations.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class SessionAuthGetStatusRequest
+internal sealed class SessionsPollSpawnedSessionsRequest
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Opaque cursor returned by a previous poll. Omit on the first call to receive any spawn events buffered since the runtime started.</summary>
+    [JsonPropertyName("cursor")]
+    public string? Cursor { get; set; }
+
+    /// <summary>Milliseconds to wait for new spawn events when the cursor is at the tail. 0 (default) returns immediately even if no events are buffered. Capped at 60000ms.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("waitMs")]
+    public TimeSpan? Wait { get; set; }
 }
 
-/// <summary>Indicates whether the credential update succeeded.</summary>
+/// <summary>Handle for releasing the extension tool registration.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class SessionSetCredentialsResult
+internal sealed class RegisterExtensionToolsResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>In-process unsubscribe function (CLI-only optimization). Marked internal: replaced by an explicit `extensions.unregister` RPC in the SDK migration.</summary>
+    [JsonInclude]
+    [JsonPropertyName("unsubscribe")]
+    internal JsonElement Unsubscribe { get; set; }
 }
 
-/// <summary>Initial authentication info for the session.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+/// <summary>Optional registration options.</summary>
 [Experimental(Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AuthInfoHmac), "hmac")]
-[JsonDerivedType(typeof(AuthInfoEnv), "env")]
-[JsonDerivedType(typeof(AuthInfoToken), "token")]
-[JsonDerivedType(typeof(AuthInfoCopilotApiToken), "copilot-api-token")]
-[JsonDerivedType(typeof(AuthInfoUser), "user")]
-[JsonDerivedType(typeof(AuthInfoGhCli), "gh-cli")]
-[JsonDerivedType(typeof(AuthInfoApiKey), "api-key")]
-public partial class AuthInfo
+public sealed class SessionsRegisterExtensionToolsOnSessionOptions
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
+    /// <summary>In-process `() =&gt; boolean` gating callback (CLI-only optimization). Marked internal: replaced by runtime-side enable/disable RPCs in the SDK migration.</summary>
+    [JsonInclude]
+    [JsonPropertyName("enabled")]
+    internal JsonElement? Enabled { get; set; }
 }
 
-
-/// <summary>Schema for the `CopilotUserResponseEndpoints` type.</summary>
+/// <summary>Params to attach an extension loader's tools to a session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CopilotUserResponseEndpoints
+internal sealed class RegisterExtensionToolsParams
 {
-    /// <summary>Gets or sets the <c>api</c> value.</summary>
-    [JsonPropertyName("api")]
-    public string? Api { get; set; }
+    /// <summary>In-process ExtensionLoader handle (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. When the CLI migrates to a process-separated SDK, extension discovery/launch moves entirely into the runtime — the CLI passes pure config (search paths, disabled ids) via SessionOptions instead.</summary>
+    [JsonInclude]
+    [JsonPropertyName("loader")]
+    internal JsonElement Loader { get; set; }
 
-    /// <summary>Gets or sets the <c>origin-tracker</c> value.</summary>
-    [JsonPropertyName("origin-tracker")]
-    public string? OriginTracker { get; set; }
+    /// <summary>Optional registration options.</summary>
+    [JsonPropertyName("options")]
+    public SessionsRegisterExtensionToolsOnSessionOptions? Options { get; set; }
 
-    /// <summary>Gets or sets the <c>proxy</c> value.</summary>
-    [JsonPropertyName("proxy")]
-    public string? Proxy { get; set; }
+    /// <summary>Session to register extension tools on.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Gets or sets the <c>telemetry</c> value.</summary>
-    [JsonPropertyName("telemetry")]
-    public string? Telemetry { get; set; }
+/// <summary>Params to attach or detach an in-process ExtensionController delegate.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ConfigureSessionExtensionsParams
+{
+    /// <summary>In-process ExtensionController delegate (CLI-only optimization). Marked internal: this field is excluded from the public SDK surface. The post-SDK extension surface exposes list/enable/disable/reload via dedicated RPCs served by the runtime.</summary>
+    [JsonInclude]
+    [JsonPropertyName("controller")]
+    internal JsonElement? Controller { get; set; }
+
+    /// <summary>Session to attach the extension controller delegate to.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for CopilotUserResponseOrganizationListItem operations.</summary>
-public sealed class CopilotUserResponseOrganizationListItem
+/// <summary>Outcome of an agentRegistry.spawn call.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AgentRegistrySpawnResultSpawned), "spawned")]
+[JsonDerivedType(typeof(AgentRegistrySpawnResultSpawnError), "spawn-error")]
+[JsonDerivedType(typeof(AgentRegistrySpawnResultRegistryTimeout), "registry-timeout")]
+[JsonDerivedType(typeof(AgentRegistrySpawnResultValidationError), "validation-error")]
+public partial class AgentRegistrySpawnResult
 {
-    /// <summary>Gets or sets the <c>login</c> value.</summary>
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
-
-    /// <summary>Gets or sets the <c>name</c> value.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.</summary>
+
+/// <summary>Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CopilotUserResponseQuotaSnapshotsChat
+public sealed class AgentRegistryLiveTargetEntry
 {
-    /// <summary>Gets or sets the <c>entitlement</c> value.</summary>
-    [JsonPropertyName("entitlement")]
-    public double? Entitlement { get; set; }
-
-    /// <summary>Gets or sets the <c>has_quota</c> value.</summary>
-    [JsonPropertyName("has_quota")]
-    public bool? HasQuota { get; set; }
-
-    /// <summary>Gets or sets the <c>overage_count</c> value.</summary>
-    [JsonPropertyName("overage_count")]
-    public double? OverageCount { get; set; }
+    /// <summary>Kind of attention required when status === "attention". Meaningful only when status === "attention".</summary>
+    [JsonPropertyName("attentionKind")]
+    public AgentRegistryLiveTargetEntryAttentionKind? AttentionKind { get; set; }
 
-    /// <summary>Gets or sets the <c>overage_permitted</c> value.</summary>
-    [JsonPropertyName("overage_permitted")]
-    public bool? OveragePermitted { get; set; }
+    /// <summary>Git branch of the session (when known).</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-    /// <summary>Gets or sets the <c>percent_remaining</c> value.</summary>
-    [JsonPropertyName("percent_remaining")]
-    public double? PercentRemaining { get; set; }
+    /// <summary>Copilot CLI version that wrote the entry.</summary>
+    [JsonPropertyName("copilotVersion")]
+    public string CopilotVersion { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>quota_id</c> value.</summary>
-    [JsonPropertyName("quota_id")]
-    public string? QuotaId { get; set; }
+    /// <summary>Working directory of the session (when known).</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-    /// <summary>Gets or sets the <c>quota_remaining</c> value.</summary>
-    [JsonPropertyName("quota_remaining")]
-    public double? QuotaRemaining { get; set; }
+    /// <summary>Bind host for the entry's JSON-RPC server.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>quota_reset_at</c> value.</summary>
-    [JsonPropertyName("quota_reset_at")]
-    public double? QuotaResetAt { get; set; }
+    /// <summary>Process kind tag for the registry entry.</summary>
+    [JsonPropertyName("kind")]
+    public AgentRegistryLiveTargetEntryKind Kind { get; set; }
 
-    /// <summary>Gets or sets the <c>remaining</c> value.</summary>
-    [JsonPropertyName("remaining")]
-    public double? Remaining { get; set; }
+    /// <summary>Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness).</summary>
+    [JsonPropertyName("lastSeenMs")]
+    public long LastSeenMs { get; set; }
 
-    /// <summary>Gets or sets the <c>timestamp_utc</c> value.</summary>
-    [JsonPropertyName("timestamp_utc")]
-    public string? TimestampUtc { get; set; }
+    /// <summary>How the most recent turn ended (clean vs aborted). Lets the renderer distinguish done from done_cancelled.</summary>
+    [JsonPropertyName("lastTerminalEvent")]
+    public AgentRegistryLiveTargetEntryLastTerminalEvent? LastTerminalEvent { get; set; }
 
-    /// <summary>Gets or sets the <c>token_based_billing</c> value.</summary>
-    [JsonPropertyName("token_based_billing")]
-    public bool? TokenBasedBilling { get; set; }
+    /// <summary>Model identifier currently selected for the session.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Gets or sets the <c>unlimited</c> value.</summary>
-    [JsonPropertyName("unlimited")]
-    public bool? Unlimited { get; set; }
-}
+    /// <summary>Operating-system pid of the process owning this entry.</summary>
+    [JsonPropertyName("pid")]
+    public long Pid { get; set; }
 
-/// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class CopilotUserResponseQuotaSnapshotsCompletions
-{
-    /// <summary>Gets or sets the <c>entitlement</c> value.</summary>
-    [JsonPropertyName("entitlement")]
-    public double? Entitlement { get; set; }
+    /// <summary>TCP port the entry's JSON-RPC server is listening on.</summary>
+    [JsonPropertyName("port")]
+    public long Port { get; set; }
 
-    /// <summary>Gets or sets the <c>has_quota</c> value.</summary>
-    [JsonPropertyName("has_quota")]
-    public bool? HasQuota { get; set; }
+    /// <summary>Registry entry schema version (1 = ui-server, 2 = managed-server).</summary>
+    [JsonPropertyName("schemaVersion")]
+    public long SchemaVersion { get; set; }
 
-    /// <summary>Gets or sets the <c>overage_count</c> value.</summary>
-    [JsonPropertyName("overage_count")]
-    public double? OverageCount { get; set; }
+    /// <summary>Session ID of the foreground session for this entry.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
 
-    /// <summary>Gets or sets the <c>overage_permitted</c> value.</summary>
-    [JsonPropertyName("overage_permitted")]
-    public bool? OveragePermitted { get; set; }
+    /// <summary>Friendly session name (when set).</summary>
+    [JsonPropertyName("sessionName")]
+    public string? SessionName { get; set; }
 
-    /// <summary>Gets or sets the <c>percent_remaining</c> value.</summary>
-    [JsonPropertyName("percent_remaining")]
-    public double? PercentRemaining { get; set; }
+    /// <summary>ISO 8601 timestamp captured at registration.</summary>
+    [JsonPropertyName("startedAt")]
+    public string StartedAt { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>quota_id</c> value.</summary>
-    [JsonPropertyName("quota_id")]
-    public string? QuotaId { get; set; }
+    /// <summary>Coarse lifecycle status of the foreground session.</summary>
+    [JsonPropertyName("status")]
+    public AgentRegistryLiveTargetEntryStatus? Status { get; set; }
 
-    /// <summary>Gets or sets the <c>quota_remaining</c> value.</summary>
-    [JsonPropertyName("quota_remaining")]
-    public double? QuotaRemaining { get; set; }
+    /// <summary>Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.</summary>
+    [JsonPropertyName("statusRevision")]
+    public long? StatusRevision { get; set; }
 
-    /// <summary>Gets or sets the <c>quota_reset_at</c> value.</summary>
-    [JsonPropertyName("quota_reset_at")]
-    public double? QuotaResetAt { get; set; }
+    /// <summary>Connection token (null when the target is unauthenticated).</summary>
+    [JsonInclude]
+    [JsonPropertyName("token")]
+    internal string? Token { get; set; }
+}
 
-    /// <summary>Gets or sets the <c>remaining</c> value.</summary>
-    [JsonPropertyName("remaining")]
-    public double? Remaining { get; set; }
+/// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class AgentRegistryLogCapture
+{
+    /// <summary>Whether per-spawn log capture is on (false when env-disabled or open failed).</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Gets or sets the <c>timestamp_utc</c> value.</summary>
-    [JsonPropertyName("timestamp_utc")]
-    public string? TimestampUtc { get; set; }
+    /// <summary>Human-readable open failure message (only set when enabled === false AND the env-disable opt-out was NOT used).</summary>
+    [JsonPropertyName("openError")]
+    public string? OpenError { get; set; }
 
-    /// <summary>Gets or sets the <c>token_based_billing</c> value.</summary>
-    [JsonPropertyName("token_based_billing")]
-    public bool? TokenBasedBilling { get; set; }
+    /// <summary>Categorized reason for log-open failure.</summary>
+    [JsonPropertyName("openErrorReason")]
+    public AgentRegistryLogCaptureOpenErrorReason? OpenErrorReason { get; set; }
 
-    /// <summary>Gets or sets the <c>unlimited</c> value.</summary>
-    [JsonPropertyName("unlimited")]
-    public bool? Unlimited { get; set; }
+    /// <summary>Absolute path to the per-spawn log file (only set when enabled).</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 }
 
-/// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type.</summary>
+/// <summary>Managed-server child was spawned and registered successfully.</summary>
+/// <remarks>The <c>spawned</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CopilotUserResponseQuotaSnapshotsPremiumInteractions
+public partial class AgentRegistrySpawnResultSpawned : AgentRegistrySpawnResult
 {
-    /// <summary>Gets or sets the <c>entitlement</c> value.</summary>
-    [JsonPropertyName("entitlement")]
-    public double? Entitlement { get; set; }
-
-    /// <summary>Gets or sets the <c>has_quota</c> value.</summary>
-    [JsonPropertyName("has_quota")]
-    public bool? HasQuota { get; set; }
-
-    /// <summary>Gets or sets the <c>overage_count</c> value.</summary>
-    [JsonPropertyName("overage_count")]
-    public double? OverageCount { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "spawned";
 
-    /// <summary>Gets or sets the <c>overage_permitted</c> value.</summary>
-    [JsonPropertyName("overage_permitted")]
-    public bool? OveragePermitted { get; set; }
+    /// <summary>Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).</summary>
+    [JsonPropertyName("entry")]
+    public required AgentRegistryLiveTargetEntry Entry { get; set; }
 
-    /// <summary>Gets or sets the <c>percent_remaining</c> value.</summary>
-    [JsonPropertyName("percent_remaining")]
-    public double? PercentRemaining { get; set; }
+    /// <summary>If the delegate attempted to send the initial prompt and failed, the categorized error message.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("initialPromptError")]
+    public string? InitialPromptError { get; set; }
 
-    /// <summary>Gets or sets the <c>quota_id</c> value.</summary>
-    [JsonPropertyName("quota_id")]
-    public string? QuotaId { get; set; }
+    /// <summary>Whether the delegate already sent the initial prompt. Always omitted in the current wiring: the controller sends the prompt post-attach via the standard LocalRpcSession.send path.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("initialPromptSent")]
+    public bool? InitialPromptSent { get; set; }
 
-    /// <summary>Gets or sets the <c>quota_remaining</c> value.</summary>
-    [JsonPropertyName("quota_remaining")]
-    public double? QuotaRemaining { get; set; }
+    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("logCapture")]
+    public AgentRegistryLogCapture? LogCapture { get; set; }
+}
 
-    /// <summary>Gets or sets the <c>quota_reset_at</c> value.</summary>
-    [JsonPropertyName("quota_reset_at")]
-    public double? QuotaResetAt { get; set; }
+/// <summary>`child_process.spawn` itself failed before the child entered the registry.</summary>
+/// <remarks>The <c>spawn-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class AgentRegistrySpawnResultSpawnError : AgentRegistrySpawnResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "spawn-error";
 
-    /// <summary>Gets or sets the <c>remaining</c> value.</summary>
-    [JsonPropertyName("remaining")]
-    public double? Remaining { get; set; }
+    /// <summary>Underlying errno code (e.g. ENOENT, EACCES) when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("code")]
+    public string? Code { get; set; }
 
-    /// <summary>Gets or sets the <c>timestamp_utc</c> value.</summary>
-    [JsonPropertyName("timestamp_utc")]
-    public string? TimestampUtc { get; set; }
+    /// <summary>Human-readable error message.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+}
 
-    /// <summary>Gets or sets the <c>token_based_billing</c> value.</summary>
-    [JsonPropertyName("token_based_billing")]
-    public bool? TokenBasedBilling { get; set; }
+/// <summary>Spawn succeeded but the child did not publish a matching managed-server entry within the timeout.</summary>
+/// <remarks>The <c>registry-timeout</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public partial class AgentRegistrySpawnResultRegistryTimeout : AgentRegistrySpawnResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "registry-timeout";
 
-    /// <summary>Gets or sets the <c>unlimited</c> value.</summary>
-    [JsonPropertyName("unlimited")]
-    public bool? Unlimited { get; set; }
+    /// <summary>Process ID of the orphaned child (so the caller can offer 'kill the pid' guidance).</summary>
+    [JsonPropertyName("childPid")]
+    public required long ChildPid { get; set; }
+
+    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("logCapture")]
+    public AgentRegistryLogCapture? LogCapture { get; set; }
 }
 
-/// <summary>Schema for the `CopilotUserResponseQuotaSnapshots` type.</summary>
+/// <summary>Synchronous pre-validation rejected the spawn request.</summary>
+/// <remarks>The <c>validation-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CopilotUserResponseQuotaSnapshots
+public partial class AgentRegistrySpawnResultValidationError : AgentRegistrySpawnResult
 {
-    /// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.</summary>
-    [JsonPropertyName("chat")]
-    public CopilotUserResponseQuotaSnapshotsChat? Chat { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "validation-error";
 
-    /// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type.</summary>
-    [JsonPropertyName("completions")]
-    public CopilotUserResponseQuotaSnapshotsCompletions? Completions { get; set; }
+    /// <summary>Which parameter field was invalid. Omitted when the rejection is not field-specific.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("field")]
+    public AgentRegistrySpawnValidationErrorField? Field { get; set; }
 
-    /// <summary>Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type.</summary>
-    [JsonPropertyName("premium_interactions")]
-    public CopilotUserResponseQuotaSnapshotsPremiumInteractions? PremiumInteractions { get; set; }
+    /// <summary>Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Categorized reason for the rejection. Low-cardinality enum so telemetry can aggregate by reason without leaking raw paths or agent/model names.</summary>
+    [JsonPropertyName("reason")]
+    public required AgentRegistrySpawnValidationErrorReason Reason { get; set; }
 }
 
-/// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
+/// <summary>Inputs to spawn a managed-server child via the controller's spawn delegate.</summary>
 [Experimental(Diagnostics.Experimental)]
-public sealed class CopilotUserResponse
+internal sealed class AgentRegistrySpawnRequest
 {
-    /// <summary>Gets or sets the <c>access_type_sku</c> value.</summary>
-    [JsonPropertyName("access_type_sku")]
-    public string? AccessTypeSku { get; set; }
-
-    /// <summary>Gets or sets the <c>analytics_tracking_id</c> value.</summary>
-    [JsonPropertyName("analytics_tracking_id")]
-    public string? AnalyticsTrackingId { get; set; }
-
-    /// <summary>Gets or sets the <c>assigned_date</c> value.</summary>
-    [JsonPropertyName("assigned_date")]
-    public string? AssignedDate { get; set; }
-
-    /// <summary>Gets or sets the <c>can_signup_for_limited</c> value.</summary>
-    [JsonPropertyName("can_signup_for_limited")]
-    public bool? CanSignupForLimited { get; set; }
+    /// <summary>Custom or built-in agent name (e.g. 'explore'). When omitted, the child uses its own default.</summary>
+    [JsonPropertyName("agentName")]
+    public string? AgentName { get; set; }
 
-    /// <summary>Gets or sets the <c>can_upgrade_plan</c> value.</summary>
-    [JsonPropertyName("can_upgrade_plan")]
-    public bool? CanUpgradePlan { get; set; }
+    /// <summary>Working directory for the spawned child (must be an existing directory).</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>chat_enabled</c> value.</summary>
-    [JsonPropertyName("chat_enabled")]
-    public bool? ChatEnabled { get; set; }
+    /// <summary>Optional first user message. Forwarded to the caller (the CLI's spawn wrapper sends it post-attach via the standard LocalRpcSession.send path).</summary>
+    [JsonPropertyName("initialPrompt")]
+    public string? InitialPrompt { get; set; }
 
-    /// <summary>Gets or sets the <c>cli_remote_control_enabled</c> value.</summary>
-    [JsonPropertyName("cli_remote_control_enabled")]
-    public bool? CliRemoteControlEnabled { get; set; }
+    /// <summary>Model identifier to apply to the new session.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Gets or sets the <c>cloud_session_storage_enabled</c> value.</summary>
-    [JsonPropertyName("cloud_session_storage_enabled")]
-    public bool? CloudSessionStorageEnabled { get; set; }
+    /// <summary>Friendly session name. Must satisfy validateSessionName: non-empty, no leading/trailing whitespace, &lt;=100 chars, no control chars, no double quotes.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Gets or sets the <c>codex_agent_enabled</c> value.</summary>
-    [JsonPropertyName("codex_agent_enabled")]
-    public bool? CodexAgentEnabled { get; set; }
+    /// <summary>Permission posture for the new session. 'yolo' requires the controller-local session to currently be in allow-all mode.</summary>
+    [JsonPropertyName("permissionMode")]
+    public AgentRegistrySpawnPermissionMode? PermissionMode { get; set; }
+}
 
-    /// <summary>Gets or sets the <c>copilot_plan</c> value.</summary>
-    [JsonPropertyName("copilot_plan")]
-    public string? CopilotPlan { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SessionSuspendRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Gets or sets the <c>copilotignore_enabled</c> value.</summary>
-    [JsonPropertyName("copilotignore_enabled")]
-    public bool? CopilotignoreEnabled { get; set; }
+/// <summary>Result of sending a user message.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SendResult
+{
+    /// <summary>Unique identifier assigned to the message.</summary>
+    [JsonPropertyName("messageId")]
+    public string MessageId { get; set; } = string.Empty;
+}
 
-    /// <summary>Schema for the `CopilotUserResponseEndpoints` type.</summary>
-    [JsonPropertyName("endpoints")]
-    public CopilotUserResponseEndpoints? Endpoints { get; set; }
+/// <summary>Parameters for sending a user message to the session.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class SendRequest
+{
+    /// <summary>The UI mode the agent was in when this message was sent. Defaults to the session's current mode.</summary>
+    [JsonPropertyName("agentMode")]
+    public SendAgentMode? AgentMode { get; set; }
 
-    /// <summary>Gets or sets the <c>is_mcp_enabled</c> value.</summary>
-    [JsonPropertyName("is_mcp_enabled")]
-    public bool? IsMcpEnabled { get; set; }
+    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with the message.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<Attachment>? Attachments { get; set; }
 
-    /// <summary>Gets or sets the <c>is_staff</c> value.</summary>
-    [JsonPropertyName("is_staff")]
-    public bool? IsStaff { get; set; }
+    /// <summary>If false, this message will not trigger a Premium Request Unit charge. User messages default to billable.</summary>
+    [JsonPropertyName("billable")]
+    public bool? Billable { get; set; }
 
-    /// <summary>Gets or sets the <c>limited_user_quotas</c> value.</summary>
-    [JsonPropertyName("limited_user_quotas")]
-    public IDictionary<string, double>? LimitedUserQuotas { get; set; }
+    /// <summary>If provided, this is shown in the timeline instead of `prompt`.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>Gets or sets the <c>limited_user_reset_date</c> value.</summary>
-    [JsonPropertyName("limited_user_reset_date")]
-    public string? LimitedUserResetDate { get; set; }
+    /// <summary>How to deliver the message. `enqueue` (default) appends to the message queue. `immediate` interjects during an in-progress turn.</summary>
+    [JsonPropertyName("mode")]
+    public SendMode? Mode { get; set; }
 
-    /// <summary>Gets or sets the <c>login</c> value.</summary>
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
+    /// <summary>If true, adds the message to the front of the queue instead of the end.</summary>
+    [JsonPropertyName("prepend")]
+    public bool? Prepend { get; set; }
 
-    /// <summary>Gets or sets the <c>monthly_quotas</c> value.</summary>
-    [JsonPropertyName("monthly_quotas")]
-    public IDictionary<string, double>? MonthlyQuotas { get; set; }
+    /// <summary>The user message text.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>organization_list</c> value.</summary>
-    [JsonPropertyName("organization_list")]
-    public IList<CopilotUserResponseOrganizationListItem?>? OrganizationList { get; set; }
+    /// <summary>Custom HTTP headers to include in outbound model requests for this turn. Merged with session-level provider headers; per-turn headers augment and overwrite session-level headers with the same key.</summary>
+    [JsonPropertyName("requestHeaders")]
+    public IDictionary<string, string>? RequestHeaders { get; set; }
 
-    /// <summary>Gets or sets the <c>organization_login_list</c> value.</summary>
-    [JsonPropertyName("organization_login_list")]
-    public IList<string>? OrganizationLoginList { get; set; }
+    /// <summary>If set, the request will fail if the named tool is not available when this message is among the user messages at the start of the current exchange.</summary>
+    [JsonPropertyName("requiredTool")]
+    public string? RequiredTool { get; set; }
 
-    /// <summary>Gets or sets the <c>quota_reset_date</c> value.</summary>
-    [JsonPropertyName("quota_reset_date")]
-    public string? QuotaResetDate { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Gets or sets the <c>quota_reset_date_utc</c> value.</summary>
-    [JsonPropertyName("quota_reset_date_utc")]
-    public string? QuotaResetDateUtc { get; set; }
+    /// <summary>Optional provenance tag copied to the resulting user.message event. Must match one of three forms: the literal `system`, `command-&lt;command-id&gt;` for messages originating from a command (e.g. slash command, Mission Control command), or `schedule-&lt;numeric-id&gt;` for messages originating from a scheduled job.</summary>
+    [RegularExpression("^(system|command-.*|schedule-\\d+)$")]
+    [JsonInclude]
+    [JsonPropertyName("source")]
+    internal string? Source { get; set; }
 
-    /// <summary>Schema for the `CopilotUserResponseQuotaSnapshots` type.</summary>
-    [JsonPropertyName("quota_snapshots")]
-    public CopilotUserResponseQuotaSnapshots? QuotaSnapshots { get; set; }
+    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
+    [JsonPropertyName("traceparent")]
+    public string? Traceparent { get; set; }
 
-    /// <summary>Gets or sets the <c>restricted_telemetry</c> value.</summary>
-    [JsonPropertyName("restricted_telemetry")]
-    public bool? RestrictedTelemetry { get; set; }
+    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
+    [JsonPropertyName("tracestate")]
+    public string? Tracestate { get; set; }
 
-    /// <summary>Gets or sets the <c>token_based_billing</c> value.</summary>
-    [JsonPropertyName("token_based_billing")]
-    public bool? TokenBasedBilling { get; set; }
+    /// <summary>If true, await completion of the agentic loop for this message before returning. Defaults to false (fire-and-forget). When true, the result still contains the same `messageId`; the caller can rely on the agent having processed the message before the call resolves.</summary>
+    [JsonPropertyName("wait")]
+    public bool? Wait { get; set; }
 }
 
-/// <summary>Schema for the `HMACAuthInfo` type.</summary>
-/// <remarks>The <c>hmac</c> variant of <see cref="AuthInfo"/>.</remarks>
+/// <summary>Result of aborting the current turn.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AuthInfoHmac : AuthInfo
+public sealed class AbortResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "hmac";
-
-    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("copilotUser")]
-    public CopilotUserResponse? CopilotUser { get; set; }
-
-    /// <summary>HMAC secret used to sign requests.</summary>
-    [JsonPropertyName("hmac")]
-    public required string Hmac { get; set; }
+    /// <summary>Error message if the abort failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Authentication host. HMAC auth always targets the public GitHub host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Whether the abort completed successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Schema for the `EnvAuthInfo` type.</summary>
-/// <remarks>The <c>env</c> variant of <see cref="AuthInfo"/>.</remarks>
+/// <summary>Parameters for aborting the current turn.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AuthInfoEnv : AuthInfo
+internal sealed class AbortRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "env";
-
-    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("copilotUser")]
-    public CopilotUserResponse? CopilotUser { get; set; }
-
-    /// <summary>Name of the environment variable the token was sourced from.</summary>
-    [JsonPropertyName("envVar")]
-    public required string EnvVar { get; set; }
-
-    /// <summary>Authentication host (e.g. https://github.com or a GHES host).</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
-
-    /// <summary>User login associated with the token. Undefined for server-to-server tokens (those starting with `ghs_`).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
+    /// <summary>Finite reason code describing why the current turn was aborted.</summary>
+    [JsonPropertyName("reason")]
+    public AbortReason? Reason { get; set; }
 
-    /// <summary>The token value itself. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Schema for the `TokenAuthInfo` type.</summary>
-/// <remarks>The <c>token</c> variant of <see cref="AuthInfo"/>.</remarks>
+/// <summary>Parameters for shutting down the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AuthInfoToken : AuthInfo
+internal sealed class ShutdownRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "token";
-
-    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("copilotUser")]
-    public CopilotUserResponse? CopilotUser { get; set; }
+    /// <summary>Optional human-readable reason. Typically the message of the error that triggered shutdown when type is 'error'.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>The token value itself. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
+    /// <summary>Why the session is being shut down. Defaults to "routine" when omitted.</summary>
+    [JsonPropertyName("type")]
+    public ShutdownType? Type { get; set; }
 }
 
-/// <summary>Schema for the `CopilotApiTokenAuthInfo` type.</summary>
-/// <remarks>The <c>copilot-api-token</c> variant of <see cref="AuthInfo"/>.</remarks>
+/// <summary>Identifier of the session event that was emitted for the log message.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AuthInfoCopilotApiToken : AuthInfo
+public sealed class LogResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "copilot-api-token";
-
-    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("copilotUser")]
-    public CopilotUserResponse? CopilotUser { get; set; }
-
-    /// <summary>Authentication host (always the public GitHub host).</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>The unique identifier of the emitted session event.</summary>
+    [JsonPropertyName("eventId")]
+    public Guid EventId { get; set; }
 }
 
-/// <summary>Schema for the `UserAuthInfo` type.</summary>
-/// <remarks>The <c>user</c> variant of <see cref="AuthInfo"/>.</remarks>
+/// <summary>Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AuthInfoUser : AuthInfo
+internal sealed class LogRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "user";
+    /// <summary>When true, the message is transient and not persisted to the session event log on disk.</summary>
+    [JsonPropertyName("ephemeral")]
+    public bool? Ephemeral { get; set; }
 
-    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("copilotUser")]
-    public CopilotUserResponse? CopilotUser { get; set; }
+    /// <summary>Log severity level. Determines how the message is displayed in the timeline. Defaults to "info".</summary>
+    [JsonPropertyName("level")]
+    public SessionLogLevel? Level { get; set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Human-readable message.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 
-    /// <summary>OAuth user login.</summary>
-    [JsonPropertyName("login")]
-    public required string Login { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Optional actionable tip displayed alongside the message. Only honored on `level: "info"`.</summary>
+    [JsonPropertyName("tip")]
+    public string? Tip { get; set; }
+
+    /// <summary>Domain category for this log entry (e.g., "mcp", "subscription", "policy", "model"). Maps to `infoType`/`warningType`/`errorType` on the emitted event. Defaults to "notification".</summary>
+    [JsonPropertyName("type")]
+    public string? Type { get; set; }
+
+    /// <summary>Optional URL the user can open in their browser for more details.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <summary>Schema for the `GhCliAuthInfo` type.</summary>
-/// <remarks>The <c>gh-cli</c> variant of <see cref="AuthInfo"/>.</remarks>
+/// <summary>Authentication status and account metadata for the session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AuthInfoGhCli : AuthInfo
+public sealed class SessionAuthStatus
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "gh-cli";
+    /// <summary>Authentication type.</summary>
+    [JsonPropertyName("authType")]
+    public AuthInfoType? AuthType { get; set; }
 
-    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("copilotUser")]
-    public CopilotUserResponse? CopilotUser { get; set; }
+    /// <summary>Copilot plan tier (e.g., individual_pro, business).</summary>
+    [JsonPropertyName("copilotPlan")]
+    public string? CopilotPlan { get; set; }
 
-    /// <summary>Authentication host.</summary>
+    /// <summary>Authentication host URL.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
     [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    public string? Host { get; set; }
 
-    /// <summary>User login as reported by `gh auth status`.</summary>
+    /// <summary>Whether the session has resolved authentication.</summary>
+    [JsonPropertyName("isAuthenticated")]
+    public bool IsAuthenticated { get; set; }
+
+    /// <summary>Authenticated login/username, if available.</summary>
     [JsonPropertyName("login")]
-    public required string Login { get; set; }
+    public string? Login { get; set; }
 
-    /// <summary>The token returned by `gh auth token`. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
+    /// <summary>Human-readable authentication status description.</summary>
+    [JsonPropertyName("statusMessage")]
+    public string? StatusMessage { get; set; }
 }
 
-/// <summary>Schema for the `ApiKeyAuthInfo` type.</summary>
-/// <remarks>The <c>api-key</c> variant of <see cref="AuthInfo"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(Diagnostics.Experimental)]
-public partial class AuthInfoApiKey : AuthInfo
+internal sealed class SessionAuthGetStatusRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "api-key";
-
-    /// <summary>The API key. Treat as a secret.</summary>
-    [JsonPropertyName("apiKey")]
-    public required string ApiKey { get; set; }
-
-    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("copilotUser")]
-    public CopilotUserResponse? CopilotUser { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+/// <summary>Indicates whether the credential update succeeded.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SessionSetCredentialsResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
 /// <summary>New auth credentials to install on the session. Omit to leave credentials unchanged.</summary>
@@ -4841,6 +4903,10 @@ internal sealed class TasksSendMessageRequest
 [Experimental(Diagnostics.Experimental)]
 public sealed class Skill
 {
+    /// <summary>Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field.</summary>
+    [JsonPropertyName("argumentHint")]
+    public string? ArgumentHint { get; set; }
+
     /// <summary>Description of what the skill does.</summary>
     [JsonPropertyName("description")]
     public string Description { get; set; } = string.Empty;
@@ -6059,11 +6125,124 @@ public sealed class ProviderGetEndpointRequest
 
 /// <summary>Optional model identifier to scope the endpoint snapshot to.</summary>
 [Experimental(Diagnostics.Experimental)]
-internal sealed class ProviderGetEndpointRequestWithSession
+internal sealed class ProviderGetEndpointRequestWithSession
+{
+    /// <summary>Model identifier the caller intends to use against the returned endpoint. Used to pick the correct wire shape. Omit to use whichever model the session is currently using.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>The selectable model entries synthesized for the models added by this call.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProviderAddResult
+{
+    /// <summary>Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.</summary>
+    [JsonPropertyName("models")]
+    public IList<JsonElement> Models { get => field ??= []; set; }
+}
+
+/// <summary>A BYOK model definition referencing a named provider.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProviderModelConfig
+{
+    /// <summary>Optional capability overrides (vision, tool_calls, reasoning, etc.).</summary>
+    [JsonPropertyName("capabilities")]
+    public ModelCapabilitiesOverride? Capabilities { get; set; }
+
+    /// <summary>Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Maximum context window tokens for the model.</summary>
+    [JsonPropertyName("maxContextWindowTokens")]
+    public double? MaxContextWindowTokens { get; set; }
+
+    /// <summary>Maximum output tokens for the model.</summary>
+    [JsonPropertyName("maxOutputTokens")]
+    public double? MaxOutputTokens { get; set; }
+
+    /// <summary>Maximum prompt/input tokens for the model.</summary>
+    [JsonPropertyName("maxPromptTokens")]
+    public double? MaxPromptTokens { get; set; }
+
+    /// <summary>Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
+
+    /// <summary>Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Name of the NamedProviderConfig that serves this model.</summary>
+    [JsonPropertyName("provider")]
+    public string Provider { get; set; } = string.Empty;
+
+    /// <summary>The model name sent to the provider API for inference. Defaults to `id`.</summary>
+    [JsonPropertyName("wireModel")]
+    public string? WireModel { get; set; }
+}
+
+/// <summary>Azure-specific provider options.</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ProviderConfigAzure
+{
+    /// <summary>API version. When set, uses the versioned deployment route. When omitted, uses the GA versionless v1 route.</summary>
+    [JsonPropertyName("apiVersion")]
+    public string? ApiVersion { get; set; }
+}
+
+/// <summary>A named BYOK provider connection (transport + credentials).</summary>
+[Experimental(Diagnostics.Experimental)]
+public sealed class NamedProviderConfig
+{
+    /// <summary>API key. Optional for local providers like Ollama.</summary>
+    [JsonPropertyName("apiKey")]
+    public string? ApiKey { get; set; }
+
+    /// <summary>Azure-specific provider options.</summary>
+    [JsonPropertyName("azure")]
+    public ProviderConfigAzure? Azure { get; set; }
+
+    /// <summary>API endpoint URL.</summary>
+    [JsonPropertyName("baseUrl")]
+    public string BaseUrl { get; set; } = string.Empty;
+
+    /// <summary>Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set.</summary>
+    [JsonPropertyName("bearerToken")]
+    public string? BearerToken { get; set; }
+
+    /// <summary>Custom HTTP headers to include in all outbound requests to the provider.</summary>
+    [JsonPropertyName("headers")]
+    public IDictionary<string, string>? Headers { get; set; }
+
+    /// <summary>Stable identifier referenced by BYOK model definitions. Must not contain '/'.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
+    [JsonPropertyName("type")]
+    public ProviderConfigType? Type { get; set; }
+
+    /// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
+    [JsonPropertyName("wireApi")]
+    public ProviderConfigWireApi? WireApi { get; set; }
+}
+
+/// <summary>BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.</summary>
+[Experimental(Diagnostics.Experimental)]
+internal sealed class ProviderAddRequest
 {
-    /// <summary>Model identifier the caller intends to use against the returned endpoint. Used to pick the correct wire shape. Omit to use whichever model the session is currently using.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+    /// <summary>BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry.</summary>
+    [JsonPropertyName("models")]
+    public IList<ProviderModelConfig>? Models { get; set; }
+
+    /// <summary>Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'.</summary>
+    [JsonPropertyName("providers")]
+    public IList<NamedProviderConfig>? Providers { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
@@ -6163,15 +6342,6 @@ public sealed class SessionInstalledPlugin
     public string? Version { get; set; }
 }
 
-/// <summary>Azure-specific provider options.</summary>
-[Experimental(Diagnostics.Experimental)]
-public sealed class ProviderConfigAzure
-{
-    /// <summary>API version. When set, uses the versioned deployment route. When omitted, uses the GA versionless v1 route.</summary>
-    [JsonPropertyName("apiVersion")]
-    public string? ApiVersion { get; set; }
-}
-
 /// <summary>Custom model-provider configuration (BYOK).</summary>
 [Experimental(Diagnostics.Experimental)]
 public sealed class ProviderConfig
@@ -13907,43 +14077,46 @@ public override void Write(Utf8JsonWriter writer, ProviderEndpointWireApi value,
 }
 
 
-/// <summary>Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.</summary>
+/// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct OptionsUpdateAdditionalContentExclusionPolicyScope : IEquatable<OptionsUpdateAdditionalContentExclusionPolicyScope>
+public readonly struct ProviderConfigType : IEquatable<ProviderConfigType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderConfigType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderConfigType"/>.</param>
     [JsonConstructor]
-    public OptionsUpdateAdditionalContentExclusionPolicyScope(string value)
+    public ProviderConfigType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderConfigType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The content exclusion policy applies to the current repository.</summary>
-    public static OptionsUpdateAdditionalContentExclusionPolicyScope Repo { get; } = new("repo");
+    /// <summary>Generic OpenAI-compatible API.</summary>
+    public static ProviderConfigType Openai { get; } = new("openai");
 
-    /// <summary>The content exclusion policy applies across all repositories.</summary>
-    public static OptionsUpdateAdditionalContentExclusionPolicyScope All { get; } = new("all");
+    /// <summary>Azure OpenAI Service endpoint.</summary>
+    public static ProviderConfigType Azure { get; } = new("azure");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances are equivalent.</summary>
-    public static bool operator ==(OptionsUpdateAdditionalContentExclusionPolicyScope left, OptionsUpdateAdditionalContentExclusionPolicyScope right) => left.Equals(right);
+    /// <summary>Anthropic API endpoint.</summary>
+    public static ProviderConfigType Anthropic { get; } = new("anthropic");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances are not equivalent.</summary>
-    public static bool operator !=(OptionsUpdateAdditionalContentExclusionPolicyScope left, OptionsUpdateAdditionalContentExclusionPolicyScope right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigType"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderConfigType left, ProviderConfigType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigType"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderConfigType left, ProviderConfigType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is OptionsUpdateAdditionalContentExclusionPolicyScope other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderConfigType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(OptionsUpdateAdditionalContentExclusionPolicyScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderConfigType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13951,62 +14124,62 @@ public OptionsUpdateAdditionalContentExclusionPolicyScope(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateAdditionalContentExclusionPolicyScope}"/> for serializing <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigType}"/> for serializing <see cref="ProviderConfigType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<OptionsUpdateAdditionalContentExclusionPolicyScope>
+    public sealed class Converter : JsonConverter<ProviderConfigType>
     {
         /// <inheritdoc />
-        public override OptionsUpdateAdditionalContentExclusionPolicyScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderConfigType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, OptionsUpdateAdditionalContentExclusionPolicyScope value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderConfigType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateAdditionalContentExclusionPolicyScope));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigType));
         }
     }
 }
 
 
-/// <summary>Context tier for models with tiered pricing. The session uses this to derive effective `modelCapabilitiesOverrides` so compaction, truncation, token display, and request limits honor the selected tier.</summary>
+/// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct OptionsUpdateContextTier : IEquatable<OptionsUpdateContextTier>
+public readonly struct ProviderConfigWireApi : IEquatable<ProviderConfigWireApi>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateContextTier"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="OptionsUpdateContextTier"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderConfigWireApi"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderConfigWireApi"/>.</param>
     [JsonConstructor]
-    public OptionsUpdateContextTier(string value)
+    public ProviderConfigWireApi(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="OptionsUpdateContextTier"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderConfigWireApi"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Use the model's default context tier and its standard token limits / pricing.</summary>
-    public static OptionsUpdateContextTier Default { get; } = new("default");
+    /// <summary>OpenAI Chat Completions wire format.</summary>
+    public static ProviderConfigWireApi Completions { get; } = new("completions");
 
-    /// <summary>Use the model's long-context tier (when available) so larger inputs are accepted and tier-specific pricing applies.</summary>
-    public static OptionsUpdateContextTier LongContext { get; } = new("long_context");
+    /// <summary>OpenAI Responses API wire format.</summary>
+    public static ProviderConfigWireApi Responses { get; } = new("responses");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateContextTier"/> instances are equivalent.</summary>
-    public static bool operator ==(OptionsUpdateContextTier left, OptionsUpdateContextTier right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigWireApi"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderConfigWireApi left, ProviderConfigWireApi right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateContextTier"/> instances are not equivalent.</summary>
-    public static bool operator !=(OptionsUpdateContextTier left, OptionsUpdateContextTier right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigWireApi"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderConfigWireApi left, ProviderConfigWireApi right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is OptionsUpdateContextTier other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderConfigWireApi other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(OptionsUpdateContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderConfigWireApi other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14014,62 +14187,62 @@ public OptionsUpdateContextTier(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateContextTier}"/> for serializing <see cref="OptionsUpdateContextTier"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigWireApi}"/> for serializing <see cref="ProviderConfigWireApi"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<OptionsUpdateContextTier>
+    public sealed class Converter : JsonConverter<ProviderConfigWireApi>
     {
         /// <inheritdoc />
-        public override OptionsUpdateContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderConfigWireApi Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, OptionsUpdateContextTier value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderConfigWireApi value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateContextTier));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigWireApi));
         }
     }
 }
 
 
-/// <summary>How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).</summary>
+/// <summary>Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct OptionsUpdateEnvValueMode : IEquatable<OptionsUpdateEnvValueMode>
+public readonly struct OptionsUpdateAdditionalContentExclusionPolicyScope : IEquatable<OptionsUpdateAdditionalContentExclusionPolicyScope>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateEnvValueMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="OptionsUpdateEnvValueMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/>.</param>
     [JsonConstructor]
-    public OptionsUpdateEnvValueMode(string value)
+    public OptionsUpdateAdditionalContentExclusionPolicyScope(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="OptionsUpdateEnvValueMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Pass MCP server environment values as literal strings.</summary>
-    public static OptionsUpdateEnvValueMode Direct { get; } = new("direct");
+    /// <summary>The content exclusion policy applies to the current repository.</summary>
+    public static OptionsUpdateAdditionalContentExclusionPolicyScope Repo { get; } = new("repo");
 
-    /// <summary>Resolve MCP server environment values from host-side references.</summary>
-    public static OptionsUpdateEnvValueMode Indirect { get; } = new("indirect");
+    /// <summary>The content exclusion policy applies across all repositories.</summary>
+    public static OptionsUpdateAdditionalContentExclusionPolicyScope All { get; } = new("all");
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateEnvValueMode"/> instances are equivalent.</summary>
-    public static bool operator ==(OptionsUpdateEnvValueMode left, OptionsUpdateEnvValueMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances are equivalent.</summary>
+    public static bool operator ==(OptionsUpdateAdditionalContentExclusionPolicyScope left, OptionsUpdateAdditionalContentExclusionPolicyScope right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateEnvValueMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(OptionsUpdateEnvValueMode left, OptionsUpdateEnvValueMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(OptionsUpdateAdditionalContentExclusionPolicyScope left, OptionsUpdateAdditionalContentExclusionPolicyScope right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is OptionsUpdateEnvValueMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateAdditionalContentExclusionPolicyScope other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(OptionsUpdateEnvValueMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(OptionsUpdateAdditionalContentExclusionPolicyScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14077,65 +14250,62 @@ public OptionsUpdateEnvValueMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateEnvValueMode}"/> for serializing <see cref="OptionsUpdateEnvValueMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateAdditionalContentExclusionPolicyScope}"/> for serializing <see cref="OptionsUpdateAdditionalContentExclusionPolicyScope"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<OptionsUpdateEnvValueMode>
+    public sealed class Converter : JsonConverter<OptionsUpdateAdditionalContentExclusionPolicyScope>
     {
         /// <inheritdoc />
-        public override OptionsUpdateEnvValueMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override OptionsUpdateAdditionalContentExclusionPolicyScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, OptionsUpdateEnvValueMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateAdditionalContentExclusionPolicyScope value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateEnvValueMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateAdditionalContentExclusionPolicyScope));
         }
     }
 }
 
 
-/// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
+/// <summary>Context tier for models with tiered pricing. The session uses this to derive effective `modelCapabilitiesOverrides` so compaction, truncation, token display, and request limits honor the selected tier.</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProviderConfigType : IEquatable<ProviderConfigType>
+public readonly struct OptionsUpdateContextTier : IEquatable<OptionsUpdateContextTier>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ProviderConfigType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ProviderConfigType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateContextTier"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateContextTier"/>.</param>
     [JsonConstructor]
-    public ProviderConfigType(string value)
+    public OptionsUpdateContextTier(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProviderConfigType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="OptionsUpdateContextTier"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Generic OpenAI-compatible API.</summary>
-    public static ProviderConfigType Openai { get; } = new("openai");
-
-    /// <summary>Azure OpenAI Service endpoint.</summary>
-    public static ProviderConfigType Azure { get; } = new("azure");
+    /// <summary>Use the model's default context tier and its standard token limits / pricing.</summary>
+    public static OptionsUpdateContextTier Default { get; } = new("default");
 
-    /// <summary>Anthropic API endpoint.</summary>
-    public static ProviderConfigType Anthropic { get; } = new("anthropic");
+    /// <summary>Use the model's long-context tier (when available) so larger inputs are accepted and tier-specific pricing applies.</summary>
+    public static OptionsUpdateContextTier LongContext { get; } = new("long_context");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigType"/> instances are equivalent.</summary>
-    public static bool operator ==(ProviderConfigType left, ProviderConfigType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateContextTier"/> instances are equivalent.</summary>
+    public static bool operator ==(OptionsUpdateContextTier left, OptionsUpdateContextTier right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigType"/> instances are not equivalent.</summary>
-    public static bool operator !=(ProviderConfigType left, ProviderConfigType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateContextTier"/> instances are not equivalent.</summary>
+    public static bool operator !=(OptionsUpdateContextTier left, OptionsUpdateContextTier right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProviderConfigType other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateContextTier other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProviderConfigType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(OptionsUpdateContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14143,62 +14313,62 @@ public ProviderConfigType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigType}"/> for serializing <see cref="ProviderConfigType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateContextTier}"/> for serializing <see cref="OptionsUpdateContextTier"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProviderConfigType>
+    public sealed class Converter : JsonConverter<OptionsUpdateContextTier>
     {
         /// <inheritdoc />
-        public override ProviderConfigType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override OptionsUpdateContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProviderConfigType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateContextTier value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateContextTier));
         }
     }
 }
 
 
-/// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
+/// <summary>How env values are passed to MCP servers (`direct` inlines literal values; `indirect` resolves at launch).</summary>
 [Experimental(Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProviderConfigWireApi : IEquatable<ProviderConfigWireApi>
+public readonly struct OptionsUpdateEnvValueMode : IEquatable<OptionsUpdateEnvValueMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ProviderConfigWireApi"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ProviderConfigWireApi"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="OptionsUpdateEnvValueMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateEnvValueMode"/>.</param>
     [JsonConstructor]
-    public ProviderConfigWireApi(string value)
+    public OptionsUpdateEnvValueMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProviderConfigWireApi"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="OptionsUpdateEnvValueMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>OpenAI Chat Completions wire format.</summary>
-    public static ProviderConfigWireApi Completions { get; } = new("completions");
+    /// <summary>Pass MCP server environment values as literal strings.</summary>
+    public static OptionsUpdateEnvValueMode Direct { get; } = new("direct");
 
-    /// <summary>OpenAI Responses API wire format.</summary>
-    public static ProviderConfigWireApi Responses { get; } = new("responses");
+    /// <summary>Resolve MCP server environment values from host-side references.</summary>
+    public static OptionsUpdateEnvValueMode Indirect { get; } = new("indirect");
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigWireApi"/> instances are equivalent.</summary>
-    public static bool operator ==(ProviderConfigWireApi left, ProviderConfigWireApi right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateEnvValueMode"/> instances are equivalent.</summary>
+    public static bool operator ==(OptionsUpdateEnvValueMode left, OptionsUpdateEnvValueMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ProviderConfigWireApi"/> instances are not equivalent.</summary>
-    public static bool operator !=(ProviderConfigWireApi left, ProviderConfigWireApi right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="OptionsUpdateEnvValueMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(OptionsUpdateEnvValueMode left, OptionsUpdateEnvValueMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProviderConfigWireApi other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateEnvValueMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProviderConfigWireApi other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(OptionsUpdateEnvValueMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14206,20 +14376,20 @@ public ProviderConfigWireApi(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProviderConfigWireApi}"/> for serializing <see cref="ProviderConfigWireApi"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{OptionsUpdateEnvValueMode}"/> for serializing <see cref="OptionsUpdateEnvValueMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProviderConfigWireApi>
+    public sealed class Converter : JsonConverter<OptionsUpdateEnvValueMode>
     {
         /// <inheritdoc />
-        public override ProviderConfigWireApi Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override OptionsUpdateEnvValueMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProviderConfigWireApi value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateEnvValueMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderConfigWireApi));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateEnvValueMode));
         }
     }
 }
@@ -16318,6 +16488,50 @@ public async Task<AccountGetQuotaResult> GetQuotaAsync(string? gitHubToken = nul
         var request = new AccountGetQuotaRequest { GitHubToken = gitHubToken };
         return await CopilotClient.InvokeRpcAsync<AccountGetQuotaResult>(_rpc, "account.getQuota", [request], cancellationToken);
     }
+
+    /// <summary>Gets the currently active authentication credentials from the global auth manager.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Current authentication state.</returns>
+    public async Task<AccountGetCurrentAuthResult> GetCurrentAuthAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<AccountGetCurrentAuthResult>(_rpc, "account.getCurrentAuth", [], cancellationToken);
+    }
+
+    /// <summary>Gets all authenticated users available for account switching.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>List of all authenticated users.</returns>
+    public async Task<IList<AccountAllUsers>> GetAllUsersAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<IList<AccountAllUsers>>(_rpc, "account.getAllUsers", [], cancellationToken);
+    }
+
+    /// <summary>Stores authentication credentials after successful login (e.g., device code flow).</summary>
+    /// <param name="host">GitHub host URL.</param>
+    /// <param name="login">User login/username.</param>
+    /// <param name="token">GitHub authentication token.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Result of a successful login; throws on failure.</returns>
+    public async Task<AccountLoginResult> LoginAsync(string host, string login, string token, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(host);
+        ArgumentNullException.ThrowIfNull(login);
+        ArgumentNullException.ThrowIfNull(token);
+
+        var request = new AccountLoginRequest { Host = host, Login = login, Token = token };
+        return await CopilotClient.InvokeRpcAsync<AccountLoginResult>(_rpc, "account.login", [request], cancellationToken);
+    }
+
+    /// <summary>Removes user authentication from keychain and persisted state.</summary>
+    /// <param name="authInfo">Authentication information for the user to log out.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Logout result indicating if more users remain.</returns>
+    public async Task<AccountLogoutResult> LogoutAsync(AuthInfo authInfo, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(authInfo);
+
+        var request = new AccountLogoutRequest { AuthInfo = authInfo };
+        return await CopilotClient.InvokeRpcAsync<AccountLogoutResult>(_rpc, "account.logout", [request], cancellationToken);
+    }
 }
 
 /// <summary>Provides server-scoped Secrets APIs.</summary>
@@ -18801,6 +19015,19 @@ public async Task<ProviderEndpoint> GetEndpointAsync(ProviderGetEndpointRequest?
         var rpcRequest = new ProviderGetEndpointRequestWithSession { SessionId = _session.SessionId, ModelId = request?.ModelId };
         return await CopilotClient.InvokeRpcAsync<ProviderEndpoint>(_session.Rpc, "session.provider.getEndpoint", [rpcRequest], cancellationToken);
     }
+
+    /// <summary>Adds BYOK providers and/or models to the session's registry at runtime, extending the additive registry built from the session's `providers`/`models` options. Both fields are optional, so a call may add providers only, models only, or both. Within a single call providers are registered before models, so a model may reference a provider added in the same call; across calls a model may reference any provider already registered (from session creation or a prior add). A model whose referenced provider is not registered by the end of the call is rejected. Newly added models become selectable via `model.list` / `model.switchTo` and are inherited by sub-agents spawned afterwards.</summary>
+    /// <param name="providers">Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'.</param>
+    /// <param name="models">BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The selectable model entries synthesized for the models added by this call.</returns>
+    public async Task<ProviderAddResult> AddAsync(IList<NamedProviderConfig>? providers = null, IList<ProviderModelConfig>? models = null, CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new ProviderAddRequest { SessionId = _session.SessionId, Providers = providers, Models = models };
+        return await CopilotClient.InvokeRpcAsync<ProviderAddResult>(_session.Rpc, "session.provider.add", [request], cancellationToken);
+    }
 }
 
 /// <summary>Provides session-scoped Options APIs.</summary>
@@ -20444,6 +20671,7 @@ public static void RegisterClientSessionApiHandlers(JsonRpc rpc, Func<string, Cl
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallFailureBadRequestKind), TypeInfoPropertyName = "SessionEventsModelCallFailureBadRequestKind")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallFailureData), TypeInfoPropertyName = "SessionEventsModelCallFailureData")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallFailureEvent), TypeInfoPropertyName = "SessionEventsModelCallFailureEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelCallFailureRequestFingerprint), TypeInfoPropertyName = "SessionEventsModelCallFailureRequestFingerprint")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallFailureSource), TypeInfoPropertyName = "SessionEventsModelCallFailureSource")]
 [JsonSerializable(typeof(GitHub.Copilot.OmittedBinaryOmittedReason), TypeInfoPropertyName = "SessionEventsOmittedBinaryOmittedReason")]
 [JsonSerializable(typeof(GitHub.Copilot.OmittedBinaryResult), TypeInfoPropertyName = "SessionEventsOmittedBinaryResult")]
@@ -20590,8 +20818,14 @@ public static void RegisterClientSessionApiHandlers(JsonRpc rpc, Func<string, Cl
 [JsonSerializable(typeof(GitHub.Copilot.WorkspaceFileChangedOperation), TypeInfoPropertyName = "SessionEventsWorkspaceFileChangedOperation")]
 [JsonSerializable(typeof(AbortRequest))]
 [JsonSerializable(typeof(AbortResult))]
+[JsonSerializable(typeof(AccountAllUsers))]
+[JsonSerializable(typeof(AccountGetCurrentAuthResult))]
 [JsonSerializable(typeof(AccountGetQuotaRequest))]
 [JsonSerializable(typeof(AccountGetQuotaResult))]
+[JsonSerializable(typeof(AccountLoginRequest))]
+[JsonSerializable(typeof(AccountLoginResult))]
+[JsonSerializable(typeof(AccountLogoutRequest))]
+[JsonSerializable(typeof(AccountLogoutResult))]
 [JsonSerializable(typeof(AccountQuotaSnapshot))]
 [JsonSerializable(typeof(AgentDiscoveryPath))]
 [JsonSerializable(typeof(AgentDiscoveryPathList))]
@@ -20803,6 +21037,7 @@ public static void RegisterClientSessionApiHandlers(JsonRpc rpc, Func<string, Cl
 [JsonSerializable(typeof(NameSetAutoRequest))]
 [JsonSerializable(typeof(NameSetAutoResult))]
 [JsonSerializable(typeof(NameSetRequest))]
+[JsonSerializable(typeof(NamedProviderConfig))]
 [JsonSerializable(typeof(OpenCanvasInstance))]
 [JsonSerializable(typeof(OptionsUpdateAdditionalContentExclusionPolicy))]
 [JsonSerializable(typeof(OptionsUpdateAdditionalContentExclusionPolicyRule))]
@@ -20882,11 +21117,14 @@ public static void RegisterClientSessionApiHandlers(JsonRpc rpc, Func<string, Cl
 [JsonSerializable(typeof(PluginsUninstallRequest))]
 [JsonSerializable(typeof(PluginsUpdateRequest))]
 [JsonSerializable(typeof(PollSpawnedSessionsResult))]
+[JsonSerializable(typeof(ProviderAddRequest))]
+[JsonSerializable(typeof(ProviderAddResult))]
 [JsonSerializable(typeof(ProviderConfig))]
 [JsonSerializable(typeof(ProviderConfigAzure))]
 [JsonSerializable(typeof(ProviderEndpoint))]
 [JsonSerializable(typeof(ProviderGetEndpointRequest))]
 [JsonSerializable(typeof(ProviderGetEndpointRequestWithSession))]
+[JsonSerializable(typeof(ProviderModelConfig))]
 [JsonSerializable(typeof(ProviderSessionToken))]
 [JsonSerializable(typeof(PushAttachment))]
 [JsonSerializable(typeof(PushAttachmentFileLineRange))]
diff --git a/dotnet/src/Generated/SessionEvents.cs b/dotnet/src/Generated/SessionEvents.cs
index d4609e19f..acd075455 100644
--- a/dotnet/src/Generated/SessionEvents.cs
+++ b/dotnet/src/Generated/SessionEvents.cs
@@ -2506,6 +2506,11 @@ public sealed partial class ModelCallFailureData
     [JsonPropertyName("providerCallId")]
     public string? ProviderCallId { get; set; }
 
+    /// <summary>Content-free structural summary of the failing request. Contains only counts and shape flags (no prompt content), so it is safe for unrestricted telemetry. Populated only for client-error (4xx) failures.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("requestFingerprint")]
+    public ModelCallFailureRequestFingerprint? RequestFingerprint { get; set; }
+
     /// <summary>Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("serviceRequestId")]
@@ -4414,6 +4419,40 @@ internal sealed partial class AssistantUsageQuotaSnapshot
     internal required long UsedRequests { get; set; }
 }
 
+/// <summary>Content-free structural summary of the failing request for diagnosing malformed 4xx calls.</summary>
+/// <remarks>Nested data type for <c>ModelCallFailureRequestFingerprint</c>.</remarks>
+public sealed partial class ModelCallFailureRequestFingerprint
+{
+    /// <summary>Total number of image content parts.</summary>
+    [JsonPropertyName("imagePartCount")]
+    public required long ImagePartCount { get; set; }
+
+    /// <summary>Image parts whose media type cannot be determined (rejected by strict providers).</summary>
+    [JsonPropertyName("imagePartsMissingMediaType")]
+    public required long ImagePartsMissingMediaType { get; set; }
+
+    /// <summary>Role of the final message in the request.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("lastMessageRole")]
+    public string? LastMessageRole { get; set; }
+
+    /// <summary>Total number of messages in the request.</summary>
+    [JsonPropertyName("messageCount")]
+    public required long MessageCount { get; set; }
+
+    /// <summary>Tool calls whose name is missing or empty (rejected by strict providers).</summary>
+    [JsonPropertyName("namelessToolCallCount")]
+    public required long NamelessToolCallCount { get; set; }
+
+    /// <summary>Total number of tool calls across assistant messages.</summary>
+    [JsonPropertyName("toolCallCount")]
+    public required long ToolCallCount { get; set; }
+
+    /// <summary>Number of "tool" result messages in the request.</summary>
+    [JsonPropertyName("toolResultMessageCount")]
+    public required long ToolResultMessageCount { get; set; }
+}
+
 /// <summary>Schema for the `ToolExecutionStartToolDescriptionMetaUI` type.</summary>
 /// <remarks>Nested data type for <c>ToolExecutionStartToolDescriptionMetaUI</c>.</remarks>
 public sealed partial class ToolExecutionStartToolDescriptionMetaUI
@@ -6459,6 +6498,11 @@ public sealed partial class CapabilitiesChangedUI
 /// <remarks>Nested data type for <c>SkillsLoadedSkill</c>.</remarks>
 public sealed partial class SkillsLoadedSkill
 {
+    /// <summary>Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("argumentHint")]
+    public string? ArgumentHint { get; set; }
+
     /// <summary>Description of what the skill does.</summary>
     [JsonPropertyName("description")]
     public required string Description { get; set; }
@@ -9582,6 +9626,7 @@ public override void Write(Utf8JsonWriter writer, CanvasOpenedAvailability value
 [JsonSerializable(typeof(McpServersLoadedServer))]
 [JsonSerializable(typeof(ModelCallFailureData))]
 [JsonSerializable(typeof(ModelCallFailureEvent))]
+[JsonSerializable(typeof(ModelCallFailureRequestFingerprint))]
 [JsonSerializable(typeof(OmittedBinaryResult))]
 [JsonSerializable(typeof(PendingMessagesModifiedData))]
 [JsonSerializable(typeof(PendingMessagesModifiedEvent))]
diff --git a/dotnet/src/JsonRpc.cs b/dotnet/src/JsonRpc.cs
index 912d5a529..edd0534ab 100644
--- a/dotnet/src/JsonRpc.cs
+++ b/dotnet/src/JsonRpc.cs
@@ -470,7 +470,7 @@ private void HandleResponse(JsonElement message, JsonElement idProp)
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogWarning(ex, "Inline response callback for request {RequestId} threw", id);
+                    LogInlineResponseCallbackThrew(_logger, ex, id);
                     pending.TrySetException(ex);
                     return;
                 }
@@ -935,6 +935,11 @@ private sealed class CancelRequestParams
         public long Id { get; set; }
     }
 
+    [LoggerMessage(
+        Level = LogLevel.Warning,
+        Message = "Inline response callback for request {RequestId} threw")]
+    private static partial void LogInlineResponseCallbackThrew(ILogger logger, Exception exception, long requestId);
+
     [JsonSerializable(typeof(CancelRequestParams))]
     private partial class CancelRequestParamsContext : JsonSerializerContext;
 }
diff --git a/dotnet/test/Unit/SerializationTests.cs b/dotnet/test/Unit/SerializationTests.cs
index baf71c299..ee95c8ea0 100644
--- a/dotnet/test/Unit/SerializationTests.cs
+++ b/dotnet/test/Unit/SerializationTests.cs
@@ -83,15 +83,17 @@ public void ModelBilling_CanSerializeTokenPrices_WithSdkOptions()
             {
                 InputPrice = 2.0,
                 OutputPrice = 8.0,
-                CachePrice = 0.5,
+                CacheReadPrice = 0.5,
+                CacheWritePrice = 0.75,
                 BatchSize = 1_000_000L,
-                ContextMax = 128_000L,
+                MaxPromptTokens = 128_000L,
                 LongContext = new GitHub.Copilot.Rpc.ModelBillingTokenPricesLongContext
                 {
                     InputPrice = 4.0,
                     OutputPrice = 16.0,
-                    CachePrice = 1.0,
-                    ContextMax = 1_000_000L
+                    CacheReadPrice = 1.0,
+                    CacheWritePrice = 1.25,
+                    MaxPromptTokens = 1_000_000L
                 }
             }
         };
@@ -103,12 +105,14 @@ public void ModelBilling_CanSerializeTokenPrices_WithSdkOptions()
         var tokenPrices = root.GetProperty("tokenPrices");
         Assert.Equal(2.0, tokenPrices.GetProperty("inputPrice").GetDouble());
         Assert.Equal(8.0, tokenPrices.GetProperty("outputPrice").GetDouble());
-        Assert.Equal(0.5, tokenPrices.GetProperty("cachePrice").GetDouble());
+        Assert.Equal(0.5, tokenPrices.GetProperty("cacheReadPrice").GetDouble());
+        Assert.Equal(0.75, tokenPrices.GetProperty("cacheWritePrice").GetDouble());
         Assert.Equal(1_000_000L, tokenPrices.GetProperty("batchSize").GetInt64());
-        Assert.Equal(128_000L, tokenPrices.GetProperty("contextMax").GetInt64());
+        Assert.Equal(128_000L, tokenPrices.GetProperty("maxPromptTokens").GetInt64());
         var longContext = tokenPrices.GetProperty("longContext");
         Assert.Equal(4.0, longContext.GetProperty("inputPrice").GetDouble());
-        Assert.Equal(1_000_000L, longContext.GetProperty("contextMax").GetInt64());
+        Assert.Equal(1.25, longContext.GetProperty("cacheWritePrice").GetDouble());
+        Assert.Equal(1_000_000L, longContext.GetProperty("maxPromptTokens").GetInt64());
 
         var deserialized = JsonSerializer.Deserialize<ModelBilling>(json, options);
         Assert.NotNull(deserialized);
@@ -116,10 +120,10 @@ public void ModelBilling_CanSerializeTokenPrices_WithSdkOptions()
         Assert.NotNull(deserialized.TokenPrices);
         Assert.Equal(2.0, deserialized.TokenPrices.InputPrice);
         Assert.Equal(1_000_000L, deserialized.TokenPrices.BatchSize);
-        Assert.Equal(128_000L, deserialized.TokenPrices.ContextMax);
+        Assert.Equal(128_000L, deserialized.TokenPrices.MaxPromptTokens);
         Assert.NotNull(deserialized.TokenPrices.LongContext);
         Assert.Equal(16.0, deserialized.TokenPrices.LongContext.OutputPrice);
-        Assert.Equal(1_000_000L, deserialized.TokenPrices.LongContext.ContextMax);
+        Assert.Equal(1_000_000L, deserialized.TokenPrices.LongContext.MaxPromptTokens);
     }
 
     [Fact]
diff --git a/go/rpc/zrpc.go b/go/rpc/zrpc.go
index b5c10e9b3..990b45b07 100644
--- a/go/rpc/zrpc.go
+++ b/go/rpc/zrpc.go
@@ -28,6 +28,25 @@ type AbortResult struct {
 	Success bool `json:"success"`
 }
 
+// Schema for the `AccountAllUsers` type.
+type AccountAllUsers struct {
+	// Authentication information for this user
+	AuthInfo AuthInfo `json:"authInfo"`
+	// Associated token, if available
+	Token *string `json:"token,omitempty"`
+}
+
+// List of all authenticated users
+type AccountGetAllUsersResult []AccountAllUsers
+
+// Current authentication state
+type AccountGetCurrentAuthResult struct {
+	// Authentication errors from the last auth attempt, if any
+	AuthErrors []string `json:"authErrors,omitzero"`
+	// Current authentication information, if authenticated
+	AuthInfo AuthInfo `json:"authInfo,omitempty"`
+}
+
 type AccountGetQuotaRequest struct {
 	// GitHub token for per-user quota lookup. When provided, resolves this token to determine
 	// the user's quota instead of using the global auth.
@@ -40,6 +59,36 @@ type AccountGetQuotaResult struct {
 	QuotaSnapshots map[string]AccountQuotaSnapshot `json:"quotaSnapshots"`
 }
 
+// Credentials to store after successful authentication
+type AccountLoginRequest struct {
+	// GitHub host URL
+	Host string `json:"host"`
+	// User login/username
+	Login string `json:"login"`
+	// GitHub authentication token
+	Token string `json:"token"`
+}
+
+// Result of a successful login; throws on failure
+type AccountLoginResult struct {
+	// Whether the credential was persisted to a secure store (system keychain, or the config
+	// file when plaintext storage is enabled). False when no secure store was available and the
+	// token was not saved, so the consumer can decide how to proceed.
+	StoredInVault bool `json:"storedInVault"`
+}
+
+// User to log out
+type AccountLogoutRequest struct {
+	// Authentication information for the user to log out
+	AuthInfo AuthInfo `json:"authInfo"`
+}
+
+// Logout result indicating if more users remain
+type AccountLogoutResult struct {
+	// Whether other authenticated users remain after logout
+	HasMoreUsers bool `json:"hasMoreUsers"`
+}
+
 // Schema for the `AccountQuotaSnapshot` type.
 type AccountQuotaSnapshot struct {
 	// Number of requests included in the entitlement, or -1 for unlimited entitlements
@@ -567,7 +616,6 @@ type AttachmentSelectionDetailsStart struct {
 }
 
 // Initial authentication info for the session.
-// Experimental: AuthInfo is part of an experimental API and may change or be removed.
 type AuthInfo interface {
 	authInfo()
 	Type() AuthInfoType
@@ -584,7 +632,6 @@ func (r RawAuthInfoData) Type() AuthInfoType {
 }
 
 // Schema for the `ApiKeyAuthInfo` type.
-// Experimental: APIKeyAuthInfo is part of an experimental API and may change or be removed.
 type APIKeyAuthInfo struct {
 	// The API key. Treat as a secret.
 	APIKey string `json:"apiKey"`
@@ -602,8 +649,6 @@ func (APIKeyAuthInfo) Type() AuthInfoType {
 }
 
 // Schema for the `CopilotApiTokenAuthInfo` type.
-// Experimental: CopilotAPITokenAuthInfo is part of an experimental API and may change or be
-// removed.
 type CopilotAPITokenAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
 	// GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
@@ -619,7 +664,6 @@ func (CopilotAPITokenAuthInfo) Type() AuthInfoType {
 }
 
 // Schema for the `EnvAuthInfo` type.
-// Experimental: EnvAuthInfo is part of an experimental API and may change or be removed.
 type EnvAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
 	// GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
@@ -642,7 +686,6 @@ func (EnvAuthInfo) Type() AuthInfoType {
 }
 
 // Schema for the `GhCliAuthInfo` type.
-// Experimental: GhCLIAuthInfo is part of an experimental API and may change or be removed.
 type GhCLIAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
 	// GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
@@ -662,7 +705,6 @@ func (GhCLIAuthInfo) Type() AuthInfoType {
 }
 
 // Schema for the `HMACAuthInfo` type.
-// Experimental: HMACAuthInfo is part of an experimental API and may change or be removed.
 type HMACAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
 	// GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
@@ -680,7 +722,6 @@ func (HMACAuthInfo) Type() AuthInfoType {
 }
 
 // Schema for the `TokenAuthInfo` type.
-// Experimental: TokenAuthInfo is part of an experimental API and may change or be removed.
 type TokenAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
 	// GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
@@ -698,7 +739,6 @@ func (TokenAuthInfo) Type() AuthInfoType {
 }
 
 // Schema for the `UserAuthInfo` type.
-// Experimental: UserAuthInfo is part of an experimental API and may change or be removed.
 type UserAuthInfo struct {
 	// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
 	// GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
@@ -1051,8 +1091,6 @@ type ConnectResult struct {
 // Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
 // GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this
 // verbatim and does not re-fetch when set.
-// Experimental: CopilotUserResponse is part of an experimental API and may change or be
-// removed.
 type CopilotUserResponse struct {
 	AccessTypeSku              *string `json:"access_type_sku,omitempty"`
 	AnalyticsTrackingID        *string `json:"analytics_tracking_id,omitempty"`
@@ -1084,8 +1122,6 @@ type CopilotUserResponse struct {
 }
 
 // Schema for the `CopilotUserResponseEndpoints` type.
-// Experimental: CopilotUserResponseEndpoints is part of an experimental API and may change
-// or be removed.
 type CopilotUserResponseEndpoints struct {
 	API           *string `json:"api,omitempty"`
 	OriginTracker *string `json:"origin-tracker,omitempty"`
@@ -1099,8 +1135,6 @@ type CopilotUserResponseOrganizationListItem struct {
 }
 
 // Schema for the `CopilotUserResponseQuotaSnapshots` type.
-// Experimental: CopilotUserResponseQuotaSnapshots is part of an experimental API and may
-// change or be removed.
 type CopilotUserResponseQuotaSnapshots struct {
 	// Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.
 	Chat *CopilotUserResponseQuotaSnapshotsChat `json:"chat,omitempty"`
@@ -1111,8 +1145,6 @@ type CopilotUserResponseQuotaSnapshots struct {
 }
 
 // Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.
-// Experimental: CopilotUserResponseQuotaSnapshotsChat is part of an experimental API and
-// may change or be removed.
 type CopilotUserResponseQuotaSnapshotsChat struct {
 	Entitlement       *float64 `json:"entitlement,omitempty"`
 	HasQuota          *bool    `json:"has_quota,omitempty"`
@@ -1129,8 +1161,6 @@ type CopilotUserResponseQuotaSnapshotsChat struct {
 }
 
 // Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type.
-// Experimental: CopilotUserResponseQuotaSnapshotsCompletions is part of an experimental API
-// and may change or be removed.
 type CopilotUserResponseQuotaSnapshotsCompletions struct {
 	Entitlement       *float64 `json:"entitlement,omitempty"`
 	HasQuota          *bool    `json:"has_quota,omitempty"`
@@ -1147,8 +1177,6 @@ type CopilotUserResponseQuotaSnapshotsCompletions struct {
 }
 
 // Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type.
-// Experimental: CopilotUserResponseQuotaSnapshotsPremiumInteractions is part of an
-// experimental API and may change or be removed.
 type CopilotUserResponseQuotaSnapshotsPremiumInteractions struct {
 	Entitlement       *float64 `json:"entitlement,omitempty"`
 	HasQuota          *bool    `json:"has_quota,omitempty"`
@@ -3182,14 +3210,16 @@ type ModelBilling struct {
 type ModelBillingTokenPrices struct {
 	// Number of tokens per standard billing batch
 	BatchSize *int64 `json:"batchSize,omitempty"`
-	// Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens
+	// Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
+	// Deprecated: CachePrice is deprecated.
 	CachePrice *float64 `json:"cachePrice,omitempty"`
 	// AI Credits cost per billing batch of cached (read) tokens
 	CacheReadPrice *float64 `json:"cacheReadPrice,omitempty"`
 	// AI Credits cost per billing batch of cache-write (cache creation) tokens.
 	CacheWritePrice *float64 `json:"cacheWritePrice,omitempty"`
-	// Deprecated: use maxPromptTokens. Prompt token budget for the default tier. The total
-	// context window is this value plus the model's max_output_tokens.
+	// Use maxPromptTokens instead. Prompt token budget for the default tier. The total context
+	// window is this value plus the model's max_output_tokens.
+	// Deprecated: ContextMax is deprecated.
 	ContextMax *int64 `json:"contextMax,omitempty"`
 	// AI Credits cost per billing batch of input tokens
 	InputPrice *float64 `json:"inputPrice,omitempty"`
@@ -3204,14 +3234,16 @@ type ModelBillingTokenPrices struct {
 
 // Long context tier pricing (available for models with extended context windows)
 type ModelBillingTokenPricesLongContext struct {
-	// Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens
+	// Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
+	// Deprecated: CachePrice is deprecated.
 	CachePrice *float64 `json:"cachePrice,omitempty"`
 	// AI Credits cost per billing batch of cached (read) tokens
 	CacheReadPrice *float64 `json:"cacheReadPrice,omitempty"`
 	// AI Credits cost per billing batch of cache-write (cache creation) tokens.
 	CacheWritePrice *float64 `json:"cacheWritePrice,omitempty"`
-	// Deprecated: use maxPromptTokens. Prompt token budget for the long context tier. The total
+	// Use maxPromptTokens instead. Prompt token budget for the long context tier. The total
 	// context window is this value plus the model's max_output_tokens.
+	// Deprecated: ContextMax is deprecated.
 	ContextMax *int64 `json:"contextMax,omitempty"`
 	// AI Credits cost per billing batch of input tokens
 	InputPrice *float64 `json:"inputPrice,omitempty"`
@@ -4882,6 +4914,29 @@ type PollSpawnedSessionsResult struct {
 	Events []SessionsPollSpawnedSessionsEvent `json:"events"`
 }
 
+// BYOK providers and/or models to add to the session's registry at runtime. Both fields are
+// optional; provide providers, models, or both.
+// Experimental: ProviderAddRequest is part of an experimental API and may change or be
+// removed.
+type ProviderAddRequest struct {
+	// BYOK model definitions to register. Each must reference a provider that is already
+	// registered or included in this same call. Selection ids (`provider/id`) must be unique
+	// across the registry.
+	Models []ProviderModelConfig `json:"models,omitzero"`
+	// Named BYOK provider connections to register, additive to any providers already in the
+	// registry. Each name must be unique across the registry and must not contain '/'.
+	Providers []NamedProviderConfig `json:"providers,omitzero"`
+}
+
+// The selectable model entries synthesized for the models added by this call.
+// Experimental: ProviderAddResult is part of an experimental API and may change or be
+// removed.
+type ProviderAddResult struct {
+	// Synthesized selectable model entries for the newly added BYOK models, each under its
+	// provider-qualified selection id (`provider/id`). Empty when only providers were added.
+	Models []any `json:"models"`
+}
+
 // Custom model-provider configuration (BYOK).
 // Experimental: ProviderConfig is part of an experimental API and may change or be removed.
 type ProviderConfig struct {
@@ -5719,6 +5774,9 @@ type ServerInstructionSourceList struct {
 
 // Schema for the `ServerSkill` type.
 type ServerSkill struct {
+	// Optional freeform hint describing the skill's expected arguments, from the
+	// `argument-hint` frontmatter field
+	ArgumentHint *string `json:"argumentHint,omitempty"`
 	// Description of what the skill does
 	Description string `json:"description"`
 	// Whether the skill is currently enabled (based on global config)
@@ -7452,6 +7510,9 @@ type ShutdownRequest struct {
 // Schema for the `Skill` type.
 // Experimental: Skill is part of an experimental API and may change or be removed.
 type Skill struct {
+	// Optional freeform hint describing the skill's expected arguments, from the
+	// `argument-hint` frontmatter field
+	ArgumentHint *string `json:"argumentHint,omitempty"`
 	// Description of what the skill does
 	Description string `json:"description"`
 	// Whether the skill is currently enabled
@@ -10789,6 +10850,41 @@ type serverAPI struct {
 
 type ServerAccountAPI serverAPI
 
+// GetAllUsers gets all authenticated users available for account switching.
+//
+// RPC method: account.getAllUsers.
+//
+// Returns: List of all authenticated users
+func (a *ServerAccountAPI) GetAllUsers(ctx context.Context) (*AccountGetAllUsersResult, error) {
+	raw, err := a.client.Request(ctx, "account.getAllUsers", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result AccountGetAllUsersResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetCurrentAuth gets the currently active authentication credentials from the global auth
+// manager.
+//
+// RPC method: account.getCurrentAuth.
+//
+// Returns: Current authentication state
+func (a *ServerAccountAPI) GetCurrentAuth(ctx context.Context) (*AccountGetCurrentAuthResult, error) {
+	raw, err := a.client.Request(ctx, "account.getCurrentAuth", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result AccountGetCurrentAuthResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // GetQuota gets Copilot quota usage for the authenticated user or supplied GitHub token.
 //
 // RPC method: account.getQuota.
@@ -10809,6 +10905,44 @@ func (a *ServerAccountAPI) GetQuota(ctx context.Context, params *AccountGetQuota
 	return &result, nil
 }
 
+// Login stores authentication credentials after successful login (e.g., device code flow).
+//
+// RPC method: account.login.
+//
+// Parameters: Credentials to store after successful authentication
+//
+// Returns: Result of a successful login; throws on failure
+func (a *ServerAccountAPI) Login(ctx context.Context, params *AccountLoginRequest) (*AccountLoginResult, error) {
+	raw, err := a.client.Request(ctx, "account.login", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AccountLoginResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Logout removes user authentication from keychain and persisted state.
+//
+// RPC method: account.logout.
+//
+// Parameters: User to log out
+//
+// Returns: Logout result indicating if more users remain
+func (a *ServerAccountAPI) Logout(ctx context.Context, params *AccountLogoutRequest) (*AccountLogoutResult, error) {
+	raw, err := a.client.Request(ctx, "account.logout", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AccountLogoutResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Experimental: ServerAgentRegistryAPI contains experimental APIs that may change or be
 // removed.
 type ServerAgentRegistryAPI serverAPI
@@ -14919,6 +15053,42 @@ func (a *PluginsAPI) Reload(ctx context.Context, params ...*PluginsReloadRequest
 // Experimental: ProviderAPI contains experimental APIs that may change or be removed.
 type ProviderAPI sessionAPI
 
+// Adds BYOK providers and/or models to the session's registry at runtime, extending the
+// additive registry built from the session's `providers`/`models` options. Both fields are
+// optional, so a call may add providers only, models only, or both. Within a single call
+// providers are registered before models, so a model may reference a provider added in the
+// same call; across calls a model may reference any provider already registered (from
+// session creation or a prior add). A model whose referenced provider is not registered by
+// the end of the call is rejected. Newly added models become selectable via `model.list` /
+// `model.switchTo` and are inherited by sub-agents spawned afterwards.
+//
+// RPC method: session.provider.add.
+//
+// Parameters: BYOK providers and/or models to add to the session's registry at runtime.
+// Both fields are optional; provide providers, models, or both.
+//
+// Returns: The selectable model entries synthesized for the models added by this call.
+func (a *ProviderAPI) Add(ctx context.Context, params *ProviderAddRequest) (*ProviderAddResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		if params.Models != nil {
+			req["models"] = params.Models
+		}
+		if params.Providers != nil {
+			req["providers"] = params.Providers
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.provider.add", req)
+	if err != nil {
+		return nil, err
+	}
+	var result ProviderAddResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // GetEndpoint returns the provider endpoint and credentials the session is currently
 // configured to talk to, so the caller can make inference calls directly against the same
 // backend the session uses.
diff --git a/go/rpc/zrpc_encoding.go b/go/rpc/zrpc_encoding.go
index 12a5e0a45..84e0fb43e 100644
--- a/go/rpc/zrpc_encoding.go
+++ b/go/rpc/zrpc_encoding.go
@@ -8,240 +8,315 @@ import (
 	"errors"
 )
 
-func unmarshalAgentRegistrySpawnResult(data []byte) (AgentRegistrySpawnResult, error) {
+func unmarshalAuthInfo(data []byte) (AuthInfo, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Kind AgentRegistrySpawnResultKind `json:"kind"`
+		Type AuthInfoType `json:"type"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return nil, err
 	}
 
-	switch raw.Kind {
-	case AgentRegistrySpawnResultKindRegistryTimeout:
-		var d AgentRegistrySpawnRegistryTimeout
+	switch raw.Type {
+	case AuthInfoTypeAPIKey:
+		var d APIKeyAuthInfo
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AgentRegistrySpawnResultKindSpawnError:
-		var d AgentRegistrySpawnError
+	case AuthInfoTypeCopilotAPIToken:
+		var d CopilotAPITokenAuthInfo
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AgentRegistrySpawnResultKindSpawned:
-		var d AgentRegistrySpawnSpawned
+	case AuthInfoTypeEnv:
+		var d EnvAuthInfo
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AgentRegistrySpawnResultKindValidationError:
-		var d AgentRegistrySpawnValidationError
+	case AuthInfoTypeGhCLI:
+		var d GhCLIAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case AuthInfoTypeHMAC:
+		var d HMACAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case AuthInfoTypeToken:
+		var d TokenAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
+	case AuthInfoTypeUser:
+		var d UserAuthInfo
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	default:
-		return &RawAgentRegistrySpawnResultData{Discriminator: raw.Kind, Raw: data}, nil
+		return &RawAuthInfoData{Discriminator: raw.Type, Raw: data}, nil
 	}
 }
 
-func (r RawAgentRegistrySpawnResultData) MarshalJSON() ([]byte, error) {
+func (r RawAuthInfoData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return json.Marshal(struct {
-		Kind AgentRegistrySpawnResultKind `json:"kind"`
+		Type AuthInfoType `json:"type"`
 	}{
-		Kind: r.Discriminator,
+		Type: r.Discriminator,
 	})
 }
 
-func (r AgentRegistrySpawnError) MarshalJSON() ([]byte, error) {
-	type alias AgentRegistrySpawnError
+func (r APIKeyAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias APIKeyAuthInfo
 	return json.Marshal(struct {
-		Kind AgentRegistrySpawnResultKind `json:"kind"`
+		Type AuthInfoType `json:"type"`
 		alias
 	}{
-		Kind:  r.Kind(),
+		Type:  r.Type(),
 		alias: alias(r),
 	})
 }
 
-func (r AgentRegistrySpawnRegistryTimeout) MarshalJSON() ([]byte, error) {
-	type alias AgentRegistrySpawnRegistryTimeout
+func (r CopilotAPITokenAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias CopilotAPITokenAuthInfo
 	return json.Marshal(struct {
-		Kind AgentRegistrySpawnResultKind `json:"kind"`
+		Type AuthInfoType `json:"type"`
 		alias
 	}{
-		Kind:  r.Kind(),
+		Type:  r.Type(),
 		alias: alias(r),
 	})
 }
 
-func (r AgentRegistrySpawnSpawned) MarshalJSON() ([]byte, error) {
-	type alias AgentRegistrySpawnSpawned
+func (r EnvAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias EnvAuthInfo
 	return json.Marshal(struct {
-		Kind AgentRegistrySpawnResultKind `json:"kind"`
+		Type AuthInfoType `json:"type"`
 		alias
 	}{
-		Kind:  r.Kind(),
+		Type:  r.Type(),
 		alias: alias(r),
 	})
 }
 
-func (r AgentRegistrySpawnValidationError) MarshalJSON() ([]byte, error) {
-	type alias AgentRegistrySpawnValidationError
+func (r GhCLIAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias GhCLIAuthInfo
 	return json.Marshal(struct {
-		Kind AgentRegistrySpawnResultKind `json:"kind"`
+		Type AuthInfoType `json:"type"`
 		alias
 	}{
-		Kind:  r.Kind(),
+		Type:  r.Type(),
 		alias: alias(r),
 	})
 }
 
-func unmarshalAttachment(data []byte) (Attachment, error) {
+func (r HMACAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias HMACAuthInfo
+	return json.Marshal(struct {
+		Type AuthInfoType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r TokenAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias TokenAuthInfo
+	return json.Marshal(struct {
+		Type AuthInfoType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r UserAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias UserAuthInfo
+	return json.Marshal(struct {
+		Type AuthInfoType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
+func (r *AccountAllUsers) UnmarshalJSON(data []byte) error {
+	type rawAccountAllUsers struct {
+		AuthInfo json.RawMessage `json:"authInfo"`
+		Token    *string         `json:"token,omitempty"`
+	}
+	var raw rawAccountAllUsers
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	if raw.AuthInfo != nil {
+		value, err := unmarshalAuthInfo(raw.AuthInfo)
+		if err != nil {
+			return err
+		}
+		r.AuthInfo = value
+	}
+	r.Token = raw.Token
+	return nil
+}
+
+func (r *AccountGetCurrentAuthResult) UnmarshalJSON(data []byte) error {
+	type rawAccountGetCurrentAuthResult struct {
+		AuthErrors []string        `json:"authErrors,omitzero"`
+		AuthInfo   json.RawMessage `json:"authInfo,omitempty"`
+	}
+	var raw rawAccountGetCurrentAuthResult
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	r.AuthErrors = raw.AuthErrors
+	if raw.AuthInfo != nil {
+		value, err := unmarshalAuthInfo(raw.AuthInfo)
+		if err != nil {
+			return err
+		}
+		r.AuthInfo = value
+	}
+	return nil
+}
+
+func (r *AccountLogoutRequest) UnmarshalJSON(data []byte) error {
+	type rawAccountLogoutRequest struct {
+		AuthInfo json.RawMessage `json:"authInfo"`
+	}
+	var raw rawAccountLogoutRequest
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+	if raw.AuthInfo != nil {
+		value, err := unmarshalAuthInfo(raw.AuthInfo)
+		if err != nil {
+			return err
+		}
+		r.AuthInfo = value
+	}
+	return nil
+}
+
+func unmarshalAgentRegistrySpawnResult(data []byte) (AgentRegistrySpawnResult, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Type AttachmentType `json:"type"`
+		Kind AgentRegistrySpawnResultKind `json:"kind"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
 		return nil, err
 	}
 
-	switch raw.Type {
-	case AttachmentTypeBlob:
-		var d AttachmentBlob
-		if err := json.Unmarshal(data, &d); err != nil {
-			return nil, err
-		}
-		return &d, nil
-	case AttachmentTypeDirectory:
-		var d AttachmentDirectory
-		if err := json.Unmarshal(data, &d); err != nil {
-			return nil, err
-		}
-		return &d, nil
-	case AttachmentTypeExtensionContext:
-		var d AttachmentExtensionContext
+	switch raw.Kind {
+	case AgentRegistrySpawnResultKindRegistryTimeout:
+		var d AgentRegistrySpawnRegistryTimeout
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AttachmentTypeFile:
-		var d AttachmentFile
+	case AgentRegistrySpawnResultKindSpawnError:
+		var d AgentRegistrySpawnError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AttachmentTypeGitHubReference:
-		var d AttachmentGitHubReference
+	case AgentRegistrySpawnResultKindSpawned:
+		var d AgentRegistrySpawnSpawned
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AttachmentTypeSelection:
-		var d AttachmentSelection
+	case AgentRegistrySpawnResultKindValidationError:
+		var d AgentRegistrySpawnValidationError
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	default:
-		return &RawAttachmentData{Discriminator: raw.Type, Raw: data}, nil
+		return &RawAgentRegistrySpawnResultData{Discriminator: raw.Kind, Raw: data}, nil
 	}
 }
 
-func (r RawAttachmentData) MarshalJSON() ([]byte, error) {
+func (r RawAgentRegistrySpawnResultData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return json.Marshal(struct {
-		Type AttachmentType `json:"type"`
-	}{
-		Type: r.Discriminator,
-	})
-}
-
-func (r AttachmentBlob) MarshalJSON() ([]byte, error) {
-	type alias AttachmentBlob
-	return json.Marshal(struct {
-		Type AttachmentType `json:"type"`
-		alias
-	}{
-		Type:  r.Type(),
-		alias: alias(r),
-	})
-}
-
-func (r AttachmentDirectory) MarshalJSON() ([]byte, error) {
-	type alias AttachmentDirectory
-	return json.Marshal(struct {
-		Type AttachmentType `json:"type"`
-		alias
+		Kind AgentRegistrySpawnResultKind `json:"kind"`
 	}{
-		Type:  r.Type(),
-		alias: alias(r),
+		Kind: r.Discriminator,
 	})
 }
 
-func (r AttachmentExtensionContext) MarshalJSON() ([]byte, error) {
-	type alias AttachmentExtensionContext
+func (r AgentRegistrySpawnError) MarshalJSON() ([]byte, error) {
+	type alias AgentRegistrySpawnError
 	return json.Marshal(struct {
-		Type AttachmentType `json:"type"`
+		Kind AgentRegistrySpawnResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r AttachmentFile) MarshalJSON() ([]byte, error) {
-	type alias AttachmentFile
+func (r AgentRegistrySpawnRegistryTimeout) MarshalJSON() ([]byte, error) {
+	type alias AgentRegistrySpawnRegistryTimeout
 	return json.Marshal(struct {
-		Type AttachmentType `json:"type"`
+		Kind AgentRegistrySpawnResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r AttachmentGitHubReference) MarshalJSON() ([]byte, error) {
-	type alias AttachmentGitHubReference
+func (r AgentRegistrySpawnSpawned) MarshalJSON() ([]byte, error) {
+	type alias AgentRegistrySpawnSpawned
 	return json.Marshal(struct {
-		Type AttachmentType `json:"type"`
+		Kind AgentRegistrySpawnResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func (r AttachmentSelection) MarshalJSON() ([]byte, error) {
-	type alias AttachmentSelection
+func (r AgentRegistrySpawnValidationError) MarshalJSON() ([]byte, error) {
+	type alias AgentRegistrySpawnValidationError
 	return json.Marshal(struct {
-		Type AttachmentType `json:"type"`
+		Kind AgentRegistrySpawnResultKind `json:"kind"`
 		alias
 	}{
-		Type:  r.Type(),
+		Kind:  r.Kind(),
 		alias: alias(r),
 	})
 }
 
-func unmarshalAuthInfo(data []byte) (AuthInfo, error) {
+func unmarshalAttachment(data []byte) (Attachment, error) {
 	if string(data) == "null" {
 		return nil, nil
 	}
 	type rawUnion struct {
-		Type AuthInfoType `json:"type"`
+		Type AttachmentType `json:"type"`
 	}
 	var raw rawUnion
 	if err := json.Unmarshal(data, &raw); err != nil {
@@ -249,79 +324,62 @@ func unmarshalAuthInfo(data []byte) (AuthInfo, error) {
 	}
 
 	switch raw.Type {
-	case AuthInfoTypeAPIKey:
-		var d APIKeyAuthInfo
-		if err := json.Unmarshal(data, &d); err != nil {
-			return nil, err
-		}
-		return &d, nil
-	case AuthInfoTypeCopilotAPIToken:
-		var d CopilotAPITokenAuthInfo
+	case AttachmentTypeBlob:
+		var d AttachmentBlob
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AuthInfoTypeEnv:
-		var d EnvAuthInfo
+	case AttachmentTypeDirectory:
+		var d AttachmentDirectory
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AuthInfoTypeGhCLI:
-		var d GhCLIAuthInfo
+	case AttachmentTypeExtensionContext:
+		var d AttachmentExtensionContext
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AuthInfoTypeHMAC:
-		var d HMACAuthInfo
+	case AttachmentTypeFile:
+		var d AttachmentFile
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AuthInfoTypeToken:
-		var d TokenAuthInfo
+	case AttachmentTypeGitHubReference:
+		var d AttachmentGitHubReference
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
-	case AuthInfoTypeUser:
-		var d UserAuthInfo
+	case AttachmentTypeSelection:
+		var d AttachmentSelection
 		if err := json.Unmarshal(data, &d); err != nil {
 			return nil, err
 		}
 		return &d, nil
 	default:
-		return &RawAuthInfoData{Discriminator: raw.Type, Raw: data}, nil
+		return &RawAttachmentData{Discriminator: raw.Type, Raw: data}, nil
 	}
 }
 
-func (r RawAuthInfoData) MarshalJSON() ([]byte, error) {
+func (r RawAttachmentData) MarshalJSON() ([]byte, error) {
 	if r.Raw != nil {
 		return r.Raw, nil
 	}
 	return json.Marshal(struct {
-		Type AuthInfoType `json:"type"`
+		Type AttachmentType `json:"type"`
 	}{
 		Type: r.Discriminator,
 	})
 }
 
-func (r APIKeyAuthInfo) MarshalJSON() ([]byte, error) {
-	type alias APIKeyAuthInfo
-	return json.Marshal(struct {
-		Type AuthInfoType `json:"type"`
-		alias
-	}{
-		Type:  r.Type(),
-		alias: alias(r),
-	})
-}
-
-func (r CopilotAPITokenAuthInfo) MarshalJSON() ([]byte, error) {
-	type alias CopilotAPITokenAuthInfo
+func (r AttachmentBlob) MarshalJSON() ([]byte, error) {
+	type alias AttachmentBlob
 	return json.Marshal(struct {
-		Type AuthInfoType `json:"type"`
+		Type AttachmentType `json:"type"`
 		alias
 	}{
 		Type:  r.Type(),
@@ -329,10 +387,10 @@ func (r CopilotAPITokenAuthInfo) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r EnvAuthInfo) MarshalJSON() ([]byte, error) {
-	type alias EnvAuthInfo
+func (r AttachmentDirectory) MarshalJSON() ([]byte, error) {
+	type alias AttachmentDirectory
 	return json.Marshal(struct {
-		Type AuthInfoType `json:"type"`
+		Type AttachmentType `json:"type"`
 		alias
 	}{
 		Type:  r.Type(),
@@ -340,10 +398,10 @@ func (r EnvAuthInfo) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r GhCLIAuthInfo) MarshalJSON() ([]byte, error) {
-	type alias GhCLIAuthInfo
+func (r AttachmentExtensionContext) MarshalJSON() ([]byte, error) {
+	type alias AttachmentExtensionContext
 	return json.Marshal(struct {
-		Type AuthInfoType `json:"type"`
+		Type AttachmentType `json:"type"`
 		alias
 	}{
 		Type:  r.Type(),
@@ -351,10 +409,10 @@ func (r GhCLIAuthInfo) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r HMACAuthInfo) MarshalJSON() ([]byte, error) {
-	type alias HMACAuthInfo
+func (r AttachmentFile) MarshalJSON() ([]byte, error) {
+	type alias AttachmentFile
 	return json.Marshal(struct {
-		Type AuthInfoType `json:"type"`
+		Type AttachmentType `json:"type"`
 		alias
 	}{
 		Type:  r.Type(),
@@ -362,10 +420,10 @@ func (r HMACAuthInfo) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r TokenAuthInfo) MarshalJSON() ([]byte, error) {
-	type alias TokenAuthInfo
+func (r AttachmentGitHubReference) MarshalJSON() ([]byte, error) {
+	type alias AttachmentGitHubReference
 	return json.Marshal(struct {
-		Type AuthInfoType `json:"type"`
+		Type AttachmentType `json:"type"`
 		alias
 	}{
 		Type:  r.Type(),
@@ -373,10 +431,10 @@ func (r TokenAuthInfo) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r UserAuthInfo) MarshalJSON() ([]byte, error) {
-	type alias UserAuthInfo
+func (r AttachmentSelection) MarshalJSON() ([]byte, error) {
+	type alias AttachmentSelection
 	return json.Marshal(struct {
-		Type AuthInfoType `json:"type"`
+		Type AttachmentType `json:"type"`
 		alias
 	}{
 		Type:  r.Type(),
diff --git a/go/rpc/zsession_events.go b/go/rpc/zsession_events.go
index 2144faed0..760752911 100644
--- a/go/rpc/zsession_events.go
+++ b/go/rpc/zsession_events.go
@@ -543,6 +543,8 @@ type ModelCallFailureData struct {
 	Model *string `json:"model,omitempty"`
 	// GitHub request tracing ID (x-github-request-id header) for server-side log correlation
 	ProviderCallID *string `json:"providerCallId,omitempty"`
+	// Content-free structural summary of the failing request. Contains only counts and shape flags (no prompt content), so it is safe for unrestricted telemetry. Populated only for client-error (4xx) failures.
+	RequestFingerprint *ModelCallFailureRequestFingerprint `json:"requestFingerprint,omitempty"`
 	// Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
 	ServiceRequestID *string `json:"serviceRequestId,omitempty"`
 	// Where the failed model call originated
@@ -2081,6 +2083,24 @@ type MCPServersLoadedServer struct {
 	Transport *MCPServerTransport `json:"transport,omitempty"`
 }
 
+// Content-free structural summary of the failing request for diagnosing malformed 4xx calls
+type ModelCallFailureRequestFingerprint struct {
+	// Total number of image content parts
+	ImagePartCount int64 `json:"imagePartCount"`
+	// Image parts whose media type cannot be determined (rejected by strict providers)
+	ImagePartsMissingMediaType int64 `json:"imagePartsMissingMediaType"`
+	// Role of the final message in the request
+	LastMessageRole *string `json:"lastMessageRole,omitempty"`
+	// Total number of messages in the request
+	MessageCount int64 `json:"messageCount"`
+	// Tool calls whose name is missing or empty (rejected by strict providers)
+	NamelessToolCallCount int64 `json:"namelessToolCallCount"`
+	// Total number of tool calls across assistant messages
+	ToolCallCount int64 `json:"toolCallCount"`
+	// Number of "tool" result messages in the request
+	ToolResultMessageCount int64 `json:"toolResultMessageCount"`
+}
+
 // Derived user-facing permission prompt details for UI consumers
 type PermissionPromptRequest interface {
 	permissionPromptRequest()
@@ -2770,6 +2790,8 @@ type ShutdownTokenDetail struct {
 
 // Schema for the `SkillsLoadedSkill` type.
 type SkillsLoadedSkill struct {
+	// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
+	ArgumentHint *string `json:"argumentHint,omitempty"`
 	// Description of what the skill does
 	Description string `json:"description"`
 	// Whether the skill is currently enabled
diff --git a/go/zsession_events.go b/go/zsession_events.go
index 5d76ec8e7..0f2d4a792 100644
--- a/go/zsession_events.go
+++ b/go/zsession_events.go
@@ -109,6 +109,7 @@ type (
 	MCPServerTransport                                             = rpc.MCPServerTransport
 	ModelCallFailureBadRequestKind                                 = rpc.ModelCallFailureBadRequestKind
 	ModelCallFailureData                                           = rpc.ModelCallFailureData
+	ModelCallFailureRequestFingerprint                             = rpc.ModelCallFailureRequestFingerprint
 	ModelCallFailureSource                                         = rpc.ModelCallFailureSource
 	OmittedBinaryOmittedReason                                     = rpc.OmittedBinaryOmittedReason
 	OmittedBinaryResult                                            = rpc.OmittedBinaryResult
diff --git a/java/pom.xml b/java/pom.xml
index ac7b719b5..5224132d8 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -86,7 +86,7 @@
             DO NOT EDIT MANUALLY. Updated by the update-copilot-dependency
             workflow.
         -->
-        <readonly-copilot-sdk-ref-impl-version-from-lastmerge-file-updated-by-reference-impl-sync>^1.0.64-1</readonly-copilot-sdk-ref-impl-version-from-lastmerge-file-updated-by-reference-impl-sync>
+        <readonly-copilot-sdk-ref-impl-version-from-lastmerge-file-updated-by-reference-impl-sync>^1.0.64-3</readonly-copilot-sdk-ref-impl-version-from-lastmerge-file-updated-by-reference-impl-sync>
 
     </properties>
 
diff --git a/java/scripts/codegen/java.ts b/java/scripts/codegen/java.ts
index ba0ed3df1..c30836f7a 100644
--- a/java/scripts/codegen/java.ts
+++ b/java/scripts/codegen/java.ts
@@ -1393,6 +1393,14 @@ async function generateRpcTypes(schemaPath: string): Promise<void> {
                         generatedClasses.set(resultRefName, true);
                         allFiles.push(await generateRpcDataClass(resultRefName, resultSchema, packageName, packageDir, method.rpcMethod, "result"));
                     }
+                } else if (resultRefName && resultSchema.type === "array") {
+                    // Named array aliases (e.g. AccountGetAllUsersResult) are returned
+                    // as List<T> by wrappers, but resolving them here discovers any
+                    // referenced item records that need standalone generation.
+                    schemaTypeToJava(resultSchema, false, resultRefName, "item", new Map());
+                } else if (resultSchema.type === "array") {
+                    // Inline arrays also need their referenced item records generated.
+                    schemaTypeToJava(resultSchema, false, `${className}Result`, "item", new Map());
                 }
             }
         }
@@ -1521,8 +1529,8 @@ function apiClassName(prefix: string, path: string[]): string {
 }
 
 /**
- * Derive the result class name for an RPC method.
- * Handles $ref to named definitions (enums, anyOf unions, objects with properties).
+ * Derive the Java result type for an RPC method.
+ * Handles $ref to named definitions (enums, anyOf unions, objects with properties, arrays).
  * Falls back to Void for null results or schemas with no meaningful type.
  */
 function wrapperResultClassName(method: RpcMethodNode): string {
@@ -1553,6 +1561,11 @@ function wrapperResultClassName(method: RpcMethodNode): string {
             if (resolved.type === "object" && !resolved.properties) {
                 return refName;
             }
+            // Named array aliases → use the underlying List<T> Java type.
+            if (resolved.type === "array") {
+                const result = schemaTypeToJava(resolved, false, refName, "item", new Map());
+                return result.javaType;
+            }
         }
     }
 
@@ -1568,6 +1581,11 @@ function wrapperResultClassName(method: RpcMethodNode): string {
         return rpcMethodToClassName(method.rpcMethod) + "Result";
     }
 
+    if (result && typeof result === "object" && result.type === "array") {
+        const javaResult = schemaTypeToJava(result, false, `${rpcMethodToClassName(method.rpcMethod)}Result`, "item", new Map());
+        return javaResult.javaType;
+    }
+
     // Free-form object with additionalProperties (e.g., x-opaque-json) → JsonNode
     if (
         result &&
@@ -1582,6 +1600,41 @@ function wrapperResultClassName(method: RpcMethodNode): string {
     return "Void";
 }
 
+function wrapperResultTypeExpression(resultType: string): string {
+    const listMatch = resultType.match(/^List<([^<>]+)>$/);
+    if (listMatch) {
+        return `RpcMapper.INSTANCE.getTypeFactory().constructCollectionType(List.class, ${javaClassLiteral(listMatch[1])})`;
+    }
+
+    return javaClassLiteral(resultType);
+}
+
+function javaClassLiteral(javaType: string): string {
+    return javaType === "Void" ? "Void.class" : `${javaType}.class`;
+}
+
+function addWrapperResultImports(resultType: string, allImports: Set<string>, packageName: string): void {
+    if (resultType === "Void") {
+        return;
+    }
+
+    if (resultType === "JsonNode") {
+        allImports.add("com.fasterxml.jackson.databind.JsonNode");
+        return;
+    }
+
+    if (resultType.startsWith("List<")) {
+        allImports.add("java.util.List");
+    }
+
+    const builtInTypes = new Set(["Boolean", "Double", "Long", "List", "Object", "String", "Void"]);
+    for (const typeName of resultType.match(/\b[A-Z][A-Za-z0-9_]*\b/g) ?? []) {
+        if (!builtInTypes.has(typeName)) {
+            allImports.add(`${packageName}.${typeName}`);
+        }
+    }
+}
+
 /**
  * Return the params class name if the method has a params schema with properties
  * other than sessionId (i.e. there are user-supplied parameters).
@@ -1659,18 +1712,18 @@ function generateApiMethod(
             needsMapper = true;
             lines.push(`        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);`);
             lines.push(`        _p.put("sessionId", ${sessionIdExpr});`);
-            lines.push(`        return caller.invoke("${method.rpcMethod}", _p, ${resultClass}.class);`);
+            lines.push(`        return caller.invoke("${method.rpcMethod}", _p, ${wrapperResultTypeExpression(resultClass)});`);
         } else if (hasSessionId) {
-            lines.push(`        return caller.invoke("${method.rpcMethod}", java.util.Map.of("sessionId", ${sessionIdExpr}), ${resultClass}.class);`);
+            lines.push(`        return caller.invoke("${method.rpcMethod}", java.util.Map.of("sessionId", ${sessionIdExpr}), ${wrapperResultTypeExpression(resultClass)});`);
         } else {
-            lines.push(`        return caller.invoke("${method.rpcMethod}", java.util.Map.of(), ${resultClass}.class);`);
+            lines.push(`        return caller.invoke("${method.rpcMethod}", java.util.Map.of(), ${wrapperResultTypeExpression(resultClass)});`);
         }
     } else {
         // Server-side: pass params directly (or empty map if no params)
         if (hasExtraParams) {
-            lines.push(`        return caller.invoke("${method.rpcMethod}", params, ${resultClass}.class);`);
+            lines.push(`        return caller.invoke("${method.rpcMethod}", params, ${wrapperResultTypeExpression(resultClass)});`);
         } else {
-            lines.push(`        return caller.invoke("${method.rpcMethod}", java.util.Map.of(), ${resultClass}.class);`);
+            lines.push(`        return caller.invoke("${method.rpcMethod}", java.util.Map.of(), ${wrapperResultTypeExpression(resultClass)});`);
         }
     }
 
@@ -1723,13 +1776,7 @@ async function generateNamespaceApiFile(
     for (const [key, method] of tree.methods) {
         const resultClass = wrapperResultClassName(method);
         const paramsClass = wrapperParamsClassName(method);
-        if (resultClass !== "Void") {
-            if (resultClass === "JsonNode") {
-                allImports.add("com.fasterxml.jackson.databind.JsonNode");
-            } else {
-                allImports.add(`${packageName}.${resultClass}`);
-            }
-        }
+        addWrapperResultImports(resultClass, allImports, packageName);
         if (paramsClass) allImports.add(`${packageName}.${paramsClass}`);
 
         const { lines, needsMapper: nm, needsExperimentalImport } = generateApiMethod(key, method, isSession, sessionIdExpr);
@@ -1849,13 +1896,7 @@ async function generateRpcRootFile(
     for (const [key, method] of tree.methods) {
         const resultClass = wrapperResultClassName(method);
         const paramsClass = wrapperParamsClassName(method);
-        if (resultClass !== "Void") {
-            if (resultClass === "JsonNode") {
-                allImports.add("com.fasterxml.jackson.databind.JsonNode");
-            } else {
-                allImports.add(`${packageName}.${resultClass}`);
-            }
-        }
+        addWrapperResultImports(resultClass, allImports, packageName);
         if (paramsClass) allImports.add(`${packageName}.${paramsClass}`);
 
         const { lines, needsMapper: nm, needsExperimentalImport } = generateApiMethod(key, method, isSession, sessionIdExpr);
@@ -1959,7 +2000,10 @@ async function generateRpcCallerInterface(packageName: string, packageDir: strin
     lines.push(``);
     lines.push(`package ${packageName};`);
     lines.push(``);
+    lines.push(`import com.fasterxml.jackson.databind.JavaType;`);
+    lines.push(`import com.fasterxml.jackson.databind.JsonNode;`);
     lines.push(`import java.util.concurrent.CompletableFuture;`);
+    lines.push(`import java.util.concurrent.CompletionException;`);
     lines.push(`import javax.annotation.processing.Generated;`);
     lines.push(``);
     lines.push(`/**`);
@@ -1987,6 +2031,28 @@ async function generateRpcCallerInterface(packageName: string, packageDir: strin
     lines.push(`     * @return a {@link CompletableFuture} that completes with the deserialized result`);
     lines.push(`     */`);
     lines.push(`    <T> CompletableFuture<T> invoke(String method, Object params, Class<T> resultType);`);
+    lines.push(``);
+    lines.push(`    /**`);
+    lines.push(`     * Invokes a JSON-RPC method and returns a future for the typed response.`);
+    lines.push(`     *`);
+    lines.push(`     * @param <T>        the expected response type`);
+    lines.push(`     * @param method     the JSON-RPC method name`);
+    lines.push(`     * @param params     the request parameters (may be a {@code Map}, DTO record, or {@code JsonNode})`);
+    lines.push(`     * @param resultType the Jackson {@link JavaType} of the expected response type`);
+    lines.push(`     * @return a {@link CompletableFuture} that completes with the deserialized result`);
+    lines.push(`     */`);
+    lines.push(`    default <T> CompletableFuture<T> invoke(String method, Object params, JavaType resultType) {`);
+    lines.push(`        if (resultType.hasRawClass(Void.class) || resultType.hasRawClass(Void.TYPE)) {`);
+    lines.push(`            return invoke(method, params, Void.class).thenApply(ignored -> null);`);
+    lines.push(`        }`);
+    lines.push(`        return invoke(method, params, JsonNode.class).thenApply(result -> {`);
+    lines.push(`            try {`);
+    lines.push(`                return RpcMapper.INSTANCE.readerFor(resultType).readValue(result);`);
+    lines.push(`            } catch (java.io.IOException e) {`);
+    lines.push(`                throw new CompletionException(e);`);
+    lines.push(`            }`);
+    lines.push(`        });`);
+    lines.push(`    }`);
     lines.push(`}`);
     lines.push(``);
 
diff --git a/java/scripts/codegen/package-lock.json b/java/scripts/codegen/package-lock.json
index 0bce4a4fc..9a7b832c7 100644
--- a/java/scripts/codegen/package-lock.json
+++ b/java/scripts/codegen/package-lock.json
@@ -6,7 +6,7 @@
     "": {
       "name": "copilot-sdk-java-codegen",
       "dependencies": {
-        "@github/copilot": "^1.0.64-1",
+        "@github/copilot": "^1.0.64-3",
         "json-schema": "^0.4.0",
         "tsx": "^4.22.4"
       }
@@ -428,9 +428,9 @@
       }
     },
     "node_modules/@github/copilot": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.64-1.tgz",
-      "integrity": "sha512-lojV4Cb7oT4VJnYPEKBRH8KI3W43Q4Lh0Pc+V6sej+xjPJkoqwm68sNKn73/p3wXPBSTVTzPeCm9WhIisgf1Jw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.64-3.tgz",
+      "integrity": "sha512-Q9nBMYEHX1bJLXzzJocQx2nZvORJ0E9gvK6ly/FCtmtA7ad96BWZvf4EHzkCNDsn56aI3zNaUSfKHUKcmIAzSg==",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "detect-libc": "^2.1.2"
@@ -439,20 +439,20 @@
         "copilot": "npm-loader.js"
       },
       "optionalDependencies": {
-        "@github/copilot-darwin-arm64": "1.0.64-1",
-        "@github/copilot-darwin-x64": "1.0.64-1",
-        "@github/copilot-linux-arm64": "1.0.64-1",
-        "@github/copilot-linux-x64": "1.0.64-1",
-        "@github/copilot-linuxmusl-arm64": "1.0.64-1",
-        "@github/copilot-linuxmusl-x64": "1.0.64-1",
-        "@github/copilot-win32-arm64": "1.0.64-1",
-        "@github/copilot-win32-x64": "1.0.64-1"
+        "@github/copilot-darwin-arm64": "1.0.64-3",
+        "@github/copilot-darwin-x64": "1.0.64-3",
+        "@github/copilot-linux-arm64": "1.0.64-3",
+        "@github/copilot-linux-x64": "1.0.64-3",
+        "@github/copilot-linuxmusl-arm64": "1.0.64-3",
+        "@github/copilot-linuxmusl-x64": "1.0.64-3",
+        "@github/copilot-win32-arm64": "1.0.64-3",
+        "@github/copilot-win32-x64": "1.0.64-3"
       }
     },
     "node_modules/@github/copilot-darwin-arm64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.64-1.tgz",
-      "integrity": "sha512-MQHZT9LhmCiq+ogO1E8cPCWrurZ6x+r9lPJfYUSnOyMO+EHbREpiJwOOChxtLHgL2/tKJSZdId2pg3tDgUlcsw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.64-3.tgz",
+      "integrity": "sha512-wlV6mRoAd/wG2V08TG+BOJ0nyOjroya24FSyA5A49z7PnUUuQXYRpa/GljvI5j3PM8aUl0DyBkXuB/DcFU818g==",
       "cpu": [
         "arm64"
       ],
@@ -466,9 +466,9 @@
       }
     },
     "node_modules/@github/copilot-darwin-x64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.64-1.tgz",
-      "integrity": "sha512-kOQY7CvI7He0eO3ObQAHePWdkNLWAOegCSzUqUmdcpa1SNVqbZ3GBMsQ7uAZQip2cQxnGZ7pS1v6tKQ0HJdkYw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.64-3.tgz",
+      "integrity": "sha512-mk48PIESL2keeemX7tLRmWRDxKwl0q3cFI1ORD2QcrieNK7pSqI3eVbfoB7MqoUUI27yzIkl67xqgl8Qq28IUQ==",
       "cpu": [
         "x64"
       ],
@@ -482,9 +482,9 @@
       }
     },
     "node_modules/@github/copilot-linux-arm64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.64-1.tgz",
-      "integrity": "sha512-hIfuO7Q+pWs0SKfIRYqT+CjMaupudnhp4RMS6XoJ5s/e33rvpj2tkTkXYlHJo1PMDI823vvbqgpEdr+KeewMwg==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.64-3.tgz",
+      "integrity": "sha512-rCgtK3/rofQW5StSbeU0TwDUlOl2bvS2HGKyapVxow1Nvz3Q/TDB+eFRQc5ocBdv5tNSor+Caw2JGkRx5v508w==",
       "cpu": [
         "arm64"
       ],
@@ -498,9 +498,9 @@
       }
     },
     "node_modules/@github/copilot-linux-x64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.64-1.tgz",
-      "integrity": "sha512-VHaE62pha0rDDvuNN3bd97gf0EZ+EJebstM1ejHsMYoPT1IOUkYEXlNfGGHY+GfUGYxAiy/+Uew4xw5mJyy/Sw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.64-3.tgz",
+      "integrity": "sha512-FAiBMw1h07mURSBLi3ztj5yzbP+uTbo9mhxOym1Xysut5LDpO2kYUzTYk2DlIyLGZhmH/HDOZE+b6U7lOUQy0g==",
       "cpu": [
         "x64"
       ],
@@ -514,9 +514,9 @@
       }
     },
     "node_modules/@github/copilot-linuxmusl-arm64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.64-1.tgz",
-      "integrity": "sha512-L/YrZPotRujAP0QERq+DlkR1SLr7abbTSz/56JqKKOqEdjKZPdQW1bUlhL/w1CZg1gXlTNUsNVyKz/fUfrEBgw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.64-3.tgz",
+      "integrity": "sha512-vn8P6grPf0y2mNskkdVbAz0i46b1sP9uSXv7z6kgycjprl0CdIYPDf3WEkG60vpyopfQna+iCqCLMWRnNyCk3g==",
       "cpu": [
         "arm64"
       ],
@@ -530,9 +530,9 @@
       }
     },
     "node_modules/@github/copilot-linuxmusl-x64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.64-1.tgz",
-      "integrity": "sha512-AGMjXqR128oyjiJhoI6Gd7JP5ddWkib+P4YH/JoHm05iNn23ZYl4tSc0XihHzeyMI1ix7Aacn8UINYB7lGOGOA==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.64-3.tgz",
+      "integrity": "sha512-atdHimNd6nzRRwHybXUY6/84bYzXeKbDOeYN/N/DsX23+AQOPSu5BD8MD8166I/5kNHui0XOmeTSydVNBUwcJw==",
       "cpu": [
         "x64"
       ],
@@ -546,9 +546,9 @@
       }
     },
     "node_modules/@github/copilot-win32-arm64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.64-1.tgz",
-      "integrity": "sha512-vvv+gnemi9WKaxF41zz7Xmq6a493n8Yjps5UFaOY6a3WR222kKXZXfOpeRvIYsDgnIPHGBHIj1TBOmnHQT4V4w==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.64-3.tgz",
+      "integrity": "sha512-jUTS9meoHEXQR8nMDOjwC0baqV273lYtLxY46W7TiOFszhsqhbhWxQMkNQBfT3GEfPp+40igzMPq3reaUTuvag==",
       "cpu": [
         "arm64"
       ],
@@ -562,9 +562,9 @@
       }
     },
     "node_modules/@github/copilot-win32-x64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.64-1.tgz",
-      "integrity": "sha512-mcHvD0fjGDuqr/YXzy8mKuDmah1F+qjPujxoFuGmabmTJZ33cSIJ3nq7RRvxZNIdp8YJ57NkbcW30WvIcOeJ3w==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.64-3.tgz",
+      "integrity": "sha512-gHUhS500Q91hjtH9fqKDblaIs0mO09G4ifpZ1woDPXbkdKe/W29uwB7g2fn0+KczNRyPxFSWlqjnOon4Fe8svA==",
       "cpu": [
         "x64"
       ],
diff --git a/java/scripts/codegen/package.json b/java/scripts/codegen/package.json
index ec0ade02a..5a6e0b777 100644
--- a/java/scripts/codegen/package.json
+++ b/java/scripts/codegen/package.json
@@ -7,7 +7,7 @@
     "generate:java": "tsx java.ts"
   },
   "dependencies": {
-    "@github/copilot": "^1.0.64-1",
+    "@github/copilot": "^1.0.64-3",
     "json-schema": "^0.4.0",
     "tsx": "^4.22.4"
   }
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java b/java/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
index 40dc4c54e..067203ac3 100644
--- a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
+++ b/java/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
@@ -57,7 +57,9 @@ public record ModelCallFailureEventData(
         /** For HTTP 400 failures only: the `code` from the CAPI error envelope (e.g. 'model_max_prompt_tokens_exceeded') identifying which deterministic validation failure occurred. Raw server-controlled string, emitted only through restricted telemetry. Absent for bodyless or non-400 failures. */
         @JsonProperty("errorCode") String errorCode,
         /** For HTTP 400 failures only: the `type` from the CAPI error envelope (e.g. 'websocket_error'), a coarser companion to errorCode for envelopes that carry no code. Raw server-controlled string, emitted only through restricted telemetry. Absent for bodyless or non-400 failures. */
-        @JsonProperty("errorType") String errorType
+        @JsonProperty("errorType") String errorType,
+        /** Content-free structural summary of the failing request. Contains only counts and shape flags (no prompt content), so it is safe for unrestricted telemetry. Populated only for client-error (4xx) failures. */
+        @JsonProperty("requestFingerprint") ModelCallFailureRequestFingerprint requestFingerprint
     ) {
     }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java b/java/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java
new file mode 100644
index 000000000..b8d0622b6
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: session-events.schema.json
+
+package com.github.copilot.generated;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Content-free structural summary of the failing request for diagnosing malformed 4xx calls
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ModelCallFailureRequestFingerprint(
+    /** Total number of messages in the request */
+    @JsonProperty("messageCount") Long messageCount,
+    /** Number of "tool" result messages in the request */
+    @JsonProperty("toolResultMessageCount") Long toolResultMessageCount,
+    /** Total number of tool calls across assistant messages */
+    @JsonProperty("toolCallCount") Long toolCallCount,
+    /** Tool calls whose name is missing or empty (rejected by strict providers) */
+    @JsonProperty("namelessToolCallCount") Long namelessToolCallCount,
+    /** Total number of image content parts */
+    @JsonProperty("imagePartCount") Long imagePartCount,
+    /** Image parts whose media type cannot be determined (rejected by strict providers) */
+    @JsonProperty("imagePartsMissingMediaType") Long imagePartsMissingMediaType,
+    /** Role of the final message in the request */
+    @JsonProperty("lastMessageRole") String lastMessageRole
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java b/java/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java
index 07ce97825..a3db9697f 100644
--- a/java/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java
+++ b/java/src/generated/java/com/github/copilot/generated/SkillsLoadedSkill.java
@@ -32,6 +32,8 @@ public record SkillsLoadedSkill(
     /** Whether the skill is currently enabled */
     @JsonProperty("enabled") Boolean enabled,
     /** Absolute path to the skill file, if available */
-    @JsonProperty("path") String path
+    @JsonProperty("path") String path,
+    /** Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field */
+    @JsonProperty("argumentHint") String argumentHint
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java b/java/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java
new file mode 100644
index 000000000..a544b8a30
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/AccountAllUsers.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Schema for the `AccountAllUsers` type.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AccountAllUsers(
+    /** Authentication information for this user */
+    @JsonProperty("authInfo") Object authInfo,
+    /** Associated token, if available */
+    @JsonProperty("token") String token
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountGetCurrentAuthResult.java b/java/src/generated/java/com/github/copilot/generated/rpc/AccountGetCurrentAuthResult.java
new file mode 100644
index 000000000..9cbcd4906
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/AccountGetCurrentAuthResult.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Current authentication state
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AccountGetCurrentAuthResult(
+    /** Current authentication information, if authenticated */
+    @JsonProperty("authInfo") Object authInfo,
+    /** Authentication errors from the last auth attempt, if any */
+    @JsonProperty("authErrors") List<String> authErrors
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java b/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java
new file mode 100644
index 000000000..6dd4266b2
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginParams.java
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Credentials to store after successful authentication
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AccountLoginParams(
+    /** GitHub host URL */
+    @JsonProperty("host") String host,
+    /** User login/username */
+    @JsonProperty("login") String login,
+    /** GitHub authentication token */
+    @JsonProperty("token") String token
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginResult.java b/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginResult.java
new file mode 100644
index 000000000..33d65f7dc
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/AccountLoginResult.java
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Result of a successful login; throws on failure
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AccountLoginResult(
+    /** Whether the credential was persisted to a secure store (system keychain, or the config file when plaintext storage is enabled). False when no secure store was available and the token was not saved, so the consumer can decide how to proceed. */
+    @JsonProperty("storedInVault") Boolean storedInVault
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java b/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java
new file mode 100644
index 000000000..0d15fd123
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutParams.java
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * User to log out
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AccountLogoutParams(
+    /** Authentication information for the user to log out */
+    @JsonProperty("authInfo") Object authInfo
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutResult.java b/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutResult.java
new file mode 100644
index 000000000..c26df8524
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/AccountLogoutResult.java
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Logout result indicating if more users remain
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AccountLogoutResult(
+    /** Whether other authenticated users remain after logout */
+    @JsonProperty("hasMoreUsers") Boolean hasMoreUsers
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java b/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java
index 246d4e585..56e06fe22 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPrices.java
@@ -25,7 +25,7 @@ public record ModelBillingTokenPrices(
     @JsonProperty("inputPrice") Double inputPrice,
     /** AI Credits cost per billing batch of output tokens */
     @JsonProperty("outputPrice") Double outputPrice,
-    /** Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens */
+    /** Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens */
     @JsonProperty("cachePrice") Double cachePrice,
     /** AI Credits cost per billing batch of cached (read) tokens */
     @JsonProperty("cacheReadPrice") Double cacheReadPrice,
@@ -33,7 +33,7 @@ public record ModelBillingTokenPrices(
     @JsonProperty("cacheWritePrice") Double cacheWritePrice,
     /** Number of tokens per standard billing batch */
     @JsonProperty("batchSize") Long batchSize,
-    /** Deprecated: use maxPromptTokens. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens. */
+    /** Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens. */
     @JsonProperty("contextMax") Long contextMax,
     /** Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens. */
     @JsonProperty("maxPromptTokens") Long maxPromptTokens,
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java b/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java
index 95ca05631..bb6751579 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/ModelBillingTokenPricesLongContext.java
@@ -25,13 +25,13 @@ public record ModelBillingTokenPricesLongContext(
     @JsonProperty("inputPrice") Double inputPrice,
     /** AI Credits cost per billing batch of output tokens */
     @JsonProperty("outputPrice") Double outputPrice,
-    /** Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens */
+    /** Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens */
     @JsonProperty("cachePrice") Double cachePrice,
     /** AI Credits cost per billing batch of cached (read) tokens */
     @JsonProperty("cacheReadPrice") Double cacheReadPrice,
     /** AI Credits cost per billing batch of cache-write (cache creation) tokens. */
     @JsonProperty("cacheWritePrice") Double cacheWritePrice,
-    /** Deprecated: use maxPromptTokens. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens. */
+    /** Use maxPromptTokens instead. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens. */
     @JsonProperty("contextMax") Long contextMax,
     /** Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens. */
     @JsonProperty("maxPromptTokens") Long maxPromptTokens
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java b/java/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java
new file mode 100644
index 000000000..2d5bddaf8
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/NamedProviderConfig.java
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * A named BYOK provider connection (transport + credentials).
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record NamedProviderConfig(
+    /** Stable identifier referenced by BYOK model definitions. Must not contain '/'. */
+    @JsonProperty("name") String name,
+    /** Provider type. Defaults to "openai" for generic OpenAI-compatible APIs. */
+    @JsonProperty("type") ProviderConfigType type,
+    /** Wire API format (openai/azure only). Defaults to "completions". */
+    @JsonProperty("wireApi") ProviderConfigWireApi wireApi,
+    /** API endpoint URL. */
+    @JsonProperty("baseUrl") String baseUrl,
+    /** API key. Optional for local providers like Ollama. */
+    @JsonProperty("apiKey") String apiKey,
+    /** Bearer token for authentication. Sets the Authorization header directly. Takes precedence over apiKey when both are set. */
+    @JsonProperty("bearerToken") String bearerToken,
+    /** Azure-specific provider options. */
+    @JsonProperty("azure") ProviderConfigAzure azure,
+    /** Custom HTTP headers to include in all outbound requests to the provider. */
+    @JsonProperty("headers") Map<String, String> headers
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java b/java/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java
new file mode 100644
index 000000000..c9f2630ed
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/ProviderModelConfig.java
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * A BYOK model definition referencing a named provider.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ProviderModelConfig(
+    /** Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`. */
+    @JsonProperty("id") String id,
+    /** Name of the NamedProviderConfig that serves this model. */
+    @JsonProperty("provider") String provider,
+    /** The model name sent to the provider API for inference. Defaults to `id`. */
+    @JsonProperty("wireModel") String wireModel,
+    /** Well-known base model id used for behavior/capability/config lookup. Defaults to `id`. */
+    @JsonProperty("modelId") String modelId,
+    /** Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`). */
+    @JsonProperty("name") String name,
+    /** Maximum prompt/input tokens for the model. */
+    @JsonProperty("maxPromptTokens") Double maxPromptTokens,
+    /** Maximum context window tokens for the model. */
+    @JsonProperty("maxContextWindowTokens") Double maxContextWindowTokens,
+    /** Maximum output tokens for the model. */
+    @JsonProperty("maxOutputTokens") Double maxOutputTokens,
+    /** Optional capability overrides (vision, tool_calls, reasoning, etc.). */
+    @JsonProperty("capabilities") ModelCapabilitiesOverride capabilities
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/RpcCaller.java b/java/src/generated/java/com/github/copilot/generated/rpc/RpcCaller.java
index 67e7571a1..eec46d688 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/RpcCaller.java
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/RpcCaller.java
@@ -7,7 +7,10 @@
 
 package com.github.copilot.generated.rpc;
 
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonNode;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import javax.annotation.processing.Generated;
 
 /**
@@ -35,4 +38,26 @@ public interface RpcCaller {
      * @return a {@link CompletableFuture} that completes with the deserialized result
      */
     <T> CompletableFuture<T> invoke(String method, Object params, Class<T> resultType);
+
+    /**
+     * Invokes a JSON-RPC method and returns a future for the typed response.
+     *
+     * @param <T>        the expected response type
+     * @param method     the JSON-RPC method name
+     * @param params     the request parameters (may be a {@code Map}, DTO record, or {@code JsonNode})
+     * @param resultType the Jackson {@link JavaType} of the expected response type
+     * @return a {@link CompletableFuture} that completes with the deserialized result
+     */
+    default <T> CompletableFuture<T> invoke(String method, Object params, JavaType resultType) {
+        if (resultType.hasRawClass(Void.class) || resultType.hasRawClass(Void.TYPE)) {
+            return invoke(method, params, Void.class).thenApply(ignored -> null);
+        }
+        return invoke(method, params, JsonNode.class).thenApply(result -> {
+            try {
+                return RpcMapper.INSTANCE.readerFor(resultType).readValue(result);
+            } catch (java.io.IOException e) {
+                throw new CompletionException(e);
+            }
+        });
+    }
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java b/java/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
index d3bd44460..b750596b5 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
@@ -7,6 +7,7 @@
 
 package com.github.copilot.generated.rpc;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
 
@@ -33,4 +34,36 @@ public CompletableFuture<AccountGetQuotaResult> getQuota() {
         return caller.invoke("account.getQuota", java.util.Map.of(), AccountGetQuotaResult.class);
     }
 
+    /**
+     * Current authentication state
+     * @since 1.0.0
+     */
+    public CompletableFuture<AccountGetCurrentAuthResult> getCurrentAuth() {
+        return caller.invoke("account.getCurrentAuth", java.util.Map.of(), AccountGetCurrentAuthResult.class);
+    }
+
+    /**
+     * List of all authenticated users
+     * @since 1.0.0
+     */
+    public CompletableFuture<List<AccountAllUsers>> getAllUsers() {
+        return caller.invoke("account.getAllUsers", java.util.Map.of(), RpcMapper.INSTANCE.getTypeFactory().constructCollectionType(List.class, AccountAllUsers.class));
+    }
+
+    /**
+     * Credentials to store after successful authentication
+     * @since 1.0.0
+     */
+    public CompletableFuture<AccountLoginResult> login(AccountLoginParams params) {
+        return caller.invoke("account.login", params, AccountLoginResult.class);
+    }
+
+    /**
+     * User to log out
+     * @since 1.0.0
+     */
+    public CompletableFuture<AccountLogoutResult> logout(AccountLogoutParams params) {
+        return caller.invoke("account.logout", params, AccountLogoutResult.class);
+    }
+
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java b/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java
index ba02ea28d..9752907e9 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/ServerSkill.java
@@ -34,6 +34,8 @@ public record ServerSkill(
     /** Absolute path to the skill file */
     @JsonProperty("path") String path,
     /** The project path this skill belongs to (only for project/inherited skills) */
-    @JsonProperty("projectPath") String projectPath
+    @JsonProperty("projectPath") String projectPath,
+    /** Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field */
+    @JsonProperty("argumentHint") String argumentHint
 ) {
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddParams.java b/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddParams.java
new file mode 100644
index 000000000..371c9d10d
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddParams.java
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionProviderAddParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'. */
+    @JsonProperty("providers") List<NamedProviderConfig> providers,
+    /** BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry. */
+    @JsonProperty("models") List<ProviderModelConfig> models
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddResult.java b/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddResult.java
new file mode 100644
index 000000000..c0a04eb8c
--- /dev/null
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderAddResult.java
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+// AUTO-GENERATED FILE - DO NOT EDIT
+// Generated from: api.schema.json
+
+package com.github.copilot.generated.rpc;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The selectable model entries synthesized for the models added by this call.
+ *
+ * @apiNote This method is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionProviderAddResult(
+    /** Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added. */
+    @JsonProperty("models") List<Object> models
+) {
+}
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java b/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
index 428f916ae..4a6fdc186 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
@@ -19,6 +19,8 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 public final class SessionProviderApi {
 
+    private static final com.fasterxml.jackson.databind.ObjectMapper MAPPER = RpcMapper.INSTANCE;
+
     private final RpcCaller caller;
     private final String sessionId;
 
@@ -39,4 +41,20 @@ public CompletableFuture<SessionProviderGetEndpointResult> getEndpoint() {
         return caller.invoke("session.provider.getEndpoint", java.util.Map.of("sessionId", this.sessionId), SessionProviderGetEndpointResult.class);
     }
 
+    /**
+     * BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+     * <p>
+     * Note: the {@code sessionId} field in the params record is overridden
+     * by the session-scoped wrapper; any value provided is ignored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionProviderAddResult> add(SessionProviderAddParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.provider.add", _p, SessionProviderAddResult.class);
+    }
+
 }
diff --git a/java/src/generated/java/com/github/copilot/generated/rpc/Skill.java b/java/src/generated/java/com/github/copilot/generated/rpc/Skill.java
index d64f01515..5b1cea9b7 100644
--- a/java/src/generated/java/com/github/copilot/generated/rpc/Skill.java
+++ b/java/src/generated/java/com/github/copilot/generated/rpc/Skill.java
@@ -34,6 +34,8 @@ public record Skill(
     /** Absolute path to the skill file */
     @JsonProperty("path") String path,
     /** Name of the plugin that provides the skill, when source is 'plugin' */
-    @JsonProperty("pluginName") String pluginName
+    @JsonProperty("pluginName") String pluginName,
+    /** Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field */
+    @JsonProperty("argumentHint") String argumentHint
 ) {
 }
diff --git a/java/src/test/java/com/github/copilot/RpcWrappersTest.java b/java/src/test/java/com/github/copilot/RpcWrappersTest.java
index feb78d896..9a3559d66 100644
--- a/java/src/test/java/com/github/copilot/RpcWrappersTest.java
+++ b/java/src/test/java/com/github/copilot/RpcWrappersTest.java
@@ -85,6 +85,28 @@ void serverRpc_models_list_invokes_correct_rpc_method() {
         assertEquals("models.list", stub.calls.get(0).method());
     }
 
+    @Test
+    void serverRpc_account_getAllUsers_returns_typed_list() throws Exception {
+        var stub = new StubCaller();
+        stub.nextResult = new ObjectMapper().readTree("""
+                [
+                  {
+                    "authInfo": { "kind": "oauth" },
+                    "token": "token-1"
+                  }
+                ]
+                """);
+
+        var server = new ServerRpc(stub);
+        var users = server.account.getAllUsers().get();
+
+        assertEquals(1, stub.calls.size());
+        assertEquals("account.getAllUsers", stub.calls.get(0).method());
+        assertEquals(1, users.size());
+        assertInstanceOf(Map.class, users.get(0).authInfo());
+        assertEquals("token-1", users.get(0).token());
+    }
+
     @Test
     void serverRpc_ping_passes_params_directly() {
         var stub = new StubCaller();
diff --git a/java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java b/java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
index dbfc15036..b5e83f17d 100644
--- a/java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
+++ b/java/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
@@ -696,7 +696,8 @@ void sessionShellKillResult_record() {
 
     @Test
     void sessionSkillsListResult_nested() {
-        var item = new Skill("deploy", "Deploy the app", SkillSource.PROJECT, true, true, "/skills/deploy.md", null);
+        var item = new Skill("deploy", "Deploy the app", SkillSource.PROJECT, true, true, "/skills/deploy.md", null,
+                null);
         var result = new SessionSkillsListResult(List.of(item));
         assertEquals(1, result.skills().size());
         assertEquals("deploy", result.skills().get(0).name());
diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json
index 08cd933c4..6727b3d33 100644
--- a/nodejs/package-lock.json
+++ b/nodejs/package-lock.json
@@ -9,7 +9,7 @@
             "version": "0.0.0-dev",
             "license": "MIT",
             "dependencies": {
-                "@github/copilot": "^1.0.64-1",
+                "@github/copilot": "^1.0.64-3",
                 "vscode-jsonrpc": "^8.2.1",
                 "zod": "^4.3.6"
             },
@@ -697,9 +697,9 @@
             }
         },
         "node_modules/@github/copilot": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.64-1.tgz",
-            "integrity": "sha512-lojV4Cb7oT4VJnYPEKBRH8KI3W43Q4Lh0Pc+V6sej+xjPJkoqwm68sNKn73/p3wXPBSTVTzPeCm9WhIisgf1Jw==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.64-3.tgz",
+            "integrity": "sha512-Q9nBMYEHX1bJLXzzJocQx2nZvORJ0E9gvK6ly/FCtmtA7ad96BWZvf4EHzkCNDsn56aI3zNaUSfKHUKcmIAzSg==",
             "license": "SEE LICENSE IN LICENSE.md",
             "dependencies": {
                 "detect-libc": "^2.1.2"
@@ -708,20 +708,20 @@
                 "copilot": "npm-loader.js"
             },
             "optionalDependencies": {
-                "@github/copilot-darwin-arm64": "1.0.64-1",
-                "@github/copilot-darwin-x64": "1.0.64-1",
-                "@github/copilot-linux-arm64": "1.0.64-1",
-                "@github/copilot-linux-x64": "1.0.64-1",
-                "@github/copilot-linuxmusl-arm64": "1.0.64-1",
-                "@github/copilot-linuxmusl-x64": "1.0.64-1",
-                "@github/copilot-win32-arm64": "1.0.64-1",
-                "@github/copilot-win32-x64": "1.0.64-1"
+                "@github/copilot-darwin-arm64": "1.0.64-3",
+                "@github/copilot-darwin-x64": "1.0.64-3",
+                "@github/copilot-linux-arm64": "1.0.64-3",
+                "@github/copilot-linux-x64": "1.0.64-3",
+                "@github/copilot-linuxmusl-arm64": "1.0.64-3",
+                "@github/copilot-linuxmusl-x64": "1.0.64-3",
+                "@github/copilot-win32-arm64": "1.0.64-3",
+                "@github/copilot-win32-x64": "1.0.64-3"
             }
         },
         "node_modules/@github/copilot-darwin-arm64": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.64-1.tgz",
-            "integrity": "sha512-MQHZT9LhmCiq+ogO1E8cPCWrurZ6x+r9lPJfYUSnOyMO+EHbREpiJwOOChxtLHgL2/tKJSZdId2pg3tDgUlcsw==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.64-3.tgz",
+            "integrity": "sha512-wlV6mRoAd/wG2V08TG+BOJ0nyOjroya24FSyA5A49z7PnUUuQXYRpa/GljvI5j3PM8aUl0DyBkXuB/DcFU818g==",
             "cpu": [
                 "arm64"
             ],
@@ -735,9 +735,9 @@
             }
         },
         "node_modules/@github/copilot-darwin-x64": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.64-1.tgz",
-            "integrity": "sha512-kOQY7CvI7He0eO3ObQAHePWdkNLWAOegCSzUqUmdcpa1SNVqbZ3GBMsQ7uAZQip2cQxnGZ7pS1v6tKQ0HJdkYw==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.64-3.tgz",
+            "integrity": "sha512-mk48PIESL2keeemX7tLRmWRDxKwl0q3cFI1ORD2QcrieNK7pSqI3eVbfoB7MqoUUI27yzIkl67xqgl8Qq28IUQ==",
             "cpu": [
                 "x64"
             ],
@@ -751,9 +751,9 @@
             }
         },
         "node_modules/@github/copilot-linux-arm64": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.64-1.tgz",
-            "integrity": "sha512-hIfuO7Q+pWs0SKfIRYqT+CjMaupudnhp4RMS6XoJ5s/e33rvpj2tkTkXYlHJo1PMDI823vvbqgpEdr+KeewMwg==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.64-3.tgz",
+            "integrity": "sha512-rCgtK3/rofQW5StSbeU0TwDUlOl2bvS2HGKyapVxow1Nvz3Q/TDB+eFRQc5ocBdv5tNSor+Caw2JGkRx5v508w==",
             "cpu": [
                 "arm64"
             ],
@@ -767,9 +767,9 @@
             }
         },
         "node_modules/@github/copilot-linux-x64": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.64-1.tgz",
-            "integrity": "sha512-VHaE62pha0rDDvuNN3bd97gf0EZ+EJebstM1ejHsMYoPT1IOUkYEXlNfGGHY+GfUGYxAiy/+Uew4xw5mJyy/Sw==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.64-3.tgz",
+            "integrity": "sha512-FAiBMw1h07mURSBLi3ztj5yzbP+uTbo9mhxOym1Xysut5LDpO2kYUzTYk2DlIyLGZhmH/HDOZE+b6U7lOUQy0g==",
             "cpu": [
                 "x64"
             ],
@@ -783,9 +783,9 @@
             }
         },
         "node_modules/@github/copilot-linuxmusl-arm64": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.64-1.tgz",
-            "integrity": "sha512-L/YrZPotRujAP0QERq+DlkR1SLr7abbTSz/56JqKKOqEdjKZPdQW1bUlhL/w1CZg1gXlTNUsNVyKz/fUfrEBgw==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.64-3.tgz",
+            "integrity": "sha512-vn8P6grPf0y2mNskkdVbAz0i46b1sP9uSXv7z6kgycjprl0CdIYPDf3WEkG60vpyopfQna+iCqCLMWRnNyCk3g==",
             "cpu": [
                 "arm64"
             ],
@@ -799,9 +799,9 @@
             }
         },
         "node_modules/@github/copilot-linuxmusl-x64": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.64-1.tgz",
-            "integrity": "sha512-AGMjXqR128oyjiJhoI6Gd7JP5ddWkib+P4YH/JoHm05iNn23ZYl4tSc0XihHzeyMI1ix7Aacn8UINYB7lGOGOA==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.64-3.tgz",
+            "integrity": "sha512-atdHimNd6nzRRwHybXUY6/84bYzXeKbDOeYN/N/DsX23+AQOPSu5BD8MD8166I/5kNHui0XOmeTSydVNBUwcJw==",
             "cpu": [
                 "x64"
             ],
@@ -815,9 +815,9 @@
             }
         },
         "node_modules/@github/copilot-win32-arm64": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.64-1.tgz",
-            "integrity": "sha512-vvv+gnemi9WKaxF41zz7Xmq6a493n8Yjps5UFaOY6a3WR222kKXZXfOpeRvIYsDgnIPHGBHIj1TBOmnHQT4V4w==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.64-3.tgz",
+            "integrity": "sha512-jUTS9meoHEXQR8nMDOjwC0baqV273lYtLxY46W7TiOFszhsqhbhWxQMkNQBfT3GEfPp+40igzMPq3reaUTuvag==",
             "cpu": [
                 "arm64"
             ],
@@ -831,9 +831,9 @@
             }
         },
         "node_modules/@github/copilot-win32-x64": {
-            "version": "1.0.64-1",
-            "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.64-1.tgz",
-            "integrity": "sha512-mcHvD0fjGDuqr/YXzy8mKuDmah1F+qjPujxoFuGmabmTJZ33cSIJ3nq7RRvxZNIdp8YJ57NkbcW30WvIcOeJ3w==",
+            "version": "1.0.64-3",
+            "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.64-3.tgz",
+            "integrity": "sha512-gHUhS500Q91hjtH9fqKDblaIs0mO09G4ifpZ1woDPXbkdKe/W29uwB7g2fn0+KczNRyPxFSWlqjnOon4Fe8svA==",
             "cpu": [
                 "x64"
             ],
diff --git a/nodejs/package.json b/nodejs/package.json
index 140a50fd4..d9663006c 100644
--- a/nodejs/package.json
+++ b/nodejs/package.json
@@ -56,7 +56,7 @@
     "author": "GitHub",
     "license": "MIT",
     "dependencies": {
-        "@github/copilot": "^1.0.64-1",
+        "@github/copilot": "^1.0.64-3",
         "vscode-jsonrpc": "^8.2.1",
         "zod": "^4.3.6"
     },
diff --git a/nodejs/samples/package-lock.json b/nodejs/samples/package-lock.json
index 1589ceb67..ddcf5a8e2 100644
--- a/nodejs/samples/package-lock.json
+++ b/nodejs/samples/package-lock.json
@@ -18,7 +18,7 @@
             "version": "0.0.0-dev",
             "license": "MIT",
             "dependencies": {
-                "@github/copilot": "^1.0.64-1",
+                "@github/copilot": "^1.0.64-3",
                 "vscode-jsonrpc": "^8.2.1",
                 "zod": "^4.3.6"
             },
diff --git a/nodejs/src/client.ts b/nodejs/src/client.ts
index 473479ac1..ade6c54fd 100644
--- a/nodejs/src/client.ts
+++ b/nodejs/src/client.ts
@@ -727,7 +727,8 @@ export class CopilotClient {
         const errors: Error[] = [];
 
         // Disconnect all active sessions with retry logic
-        for (const session of this.sessions.values()) {
+        const activeSessions = [...this.sessions.values()];
+        for (const session of activeSessions) {
             const sessionId = session.sessionId;
             let lastError: Error | null = null;
 
@@ -756,6 +757,9 @@ export class CopilotClient {
                 );
             }
         }
+        for (const session of activeSessions) {
+            session._markDisconnected();
+        }
         this.sessions.clear();
 
         // Ask SDK-owned runtimes to flush and clean up before we tear down
@@ -916,6 +920,9 @@ export class CopilotClient {
         this.forceStopping = true;
 
         // Clear sessions immediately without trying to destroy them
+        for (const session of this.sessions.values()) {
+            session._markDisconnected();
+        }
         this.sessions.clear();
 
         // Force close connection
diff --git a/nodejs/src/generated/rpc.ts b/nodejs/src/generated/rpc.ts
index 6303f9db2..b894228f5 100644
--- a/nodejs/src/generated/rpc.ts
+++ b/nodejs/src/generated/rpc.ts
@@ -7,6 +7,20 @@ import type { MessageConnection } from "vscode-jsonrpc/node.js";
 
 import type { AbortReason, Attachment, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, McpServerSource, McpServerStatus, PermissionPromptRequest, PermissionRule, ReasoningSummary, SessionEvent, SessionMode, ShutdownType, SkillSource, UserToolSessionApproval } from "./session-events.js";
 
+/**
+ * Initial authentication info for the session.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AuthInfo".
+ */
+export type AuthInfo =
+  | HMACAuthInfo
+  | EnvAuthInfo
+  | TokenAuthInfo
+  | CopilotApiTokenAuthInfo
+  | UserAuthInfo
+  | GhCliAuthInfo
+  | ApiKeyAuthInfo;
 /**
  * Which tier this directory belongs to
  *
@@ -173,21 +187,6 @@ export type AgentRegistrySpawnValidationErrorField =
   | "model"
   /** The permissionMode parameter */
   | "permissionMode";
-/**
- * Initial authentication info for the session.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AuthInfo".
- */
-/** @experimental */
-export type AuthInfo =
-  | HMACAuthInfo
-  | EnvAuthInfo
-  | TokenAuthInfo
-  | CopilotApiTokenAuthInfo
-  | UserAuthInfo
-  | GhCliAuthInfo
-  | ApiKeyAuthInfo;
 /**
  * Authentication type
  *
@@ -1796,6 +1795,13 @@ export type WorkspacesWorkspaceDetailsHostType =
   | "github"
   /** Workspace repository is hosted on Azure DevOps. */
   | "ado";
+/**
+ * List of all authenticated users
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountGetAllUsersResult".
+ */
+export type AccountGetAllUsersResult = AccountAllUsers[];
 
 /**
  * Parameters for aborting the current turn
@@ -1824,827 +1830,893 @@ export interface AbortResult {
    */
   error?: string;
 }
-
-export interface AccountGetQuotaRequest {
-  /**
-   * GitHub token for per-user quota lookup. When provided, resolves this token to determine the user's quota instead of using the global auth.
-   */
-  gitHubToken?: string;
-}
 /**
- * Quota usage snapshots for the resolved user, keyed by quota type.
+ * Schema for the `AccountAllUsers` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AccountGetQuotaResult".
+ * via the `definition` "AccountAllUsers".
  */
-export interface AccountGetQuotaResult {
+export interface AccountAllUsers {
+  authInfo: AuthInfo;
   /**
-   * Quota snapshots keyed by type (e.g., chat, completions, premium_interactions)
+   * Associated token, if available
    */
-  quotaSnapshots: {
-    [k: string]: AccountQuotaSnapshot | undefined;
-  };
+  token?: string;
 }
 /**
- * Schema for the `AccountQuotaSnapshot` type.
+ * Schema for the `HMACAuthInfo` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AccountQuotaSnapshot".
+ * via the `definition` "HMACAuthInfo".
  */
-export interface AccountQuotaSnapshot {
-  /**
-   * Whether the user has an unlimited usage entitlement
-   */
-  isUnlimitedEntitlement: boolean;
-  /**
-   * Number of requests included in the entitlement, or -1 for unlimited entitlements
-   */
-  entitlementRequests: number;
-  /**
-   * Number of requests used so far this period
-   */
-  usedRequests: number;
-  /**
-   * Whether usage is still permitted after quota exhaustion
-   */
-  usageAllowedWithExhaustedQuota: boolean;
-  /**
-   * Percentage of entitlement remaining
-   */
-  remainingPercentage: number;
+export interface HMACAuthInfo {
   /**
-   * Number of additional usage requests made this period
+   * HMAC-based authentication used by GitHub-internal services.
    */
-  overage: number;
+  type: "hmac";
   /**
-   * Whether additional usage is allowed when quota is exhausted
+   * Authentication host. HMAC auth always targets the public GitHub host.
    */
-  overageAllowedWithExhaustedQuota: boolean;
+  host: "https://github.com";
   /**
-   * Date when the quota resets (ISO 8601 string)
+   * HMAC secret used to sign requests.
    */
-  resetDate?: string;
+  hmac: string;
+  copilotUser?: CopilotUserResponse;
 }
 /**
- * Schema for the `AgentDiscoveryPath` type.
+ * Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentDiscoveryPath".
+ * via the `definition` "CopilotUserResponse".
  */
-/** @experimental */
-export interface AgentDiscoveryPath {
-  /**
-   * Absolute path of the search/create directory (may not exist on disk yet)
-   */
-  path: string;
-  scope: AgentDiscoveryPathScope;
-  /**
-   * Whether this is the canonical directory to create a new agent in its tier. At most one entry per tier is preferred.
-   */
-  preferredForCreation: boolean;
-  /**
-   * The input project path this directory was derived from (only for project scope)
-   */
-  projectPath?: string;
+export interface CopilotUserResponse {
+  login?: string;
+  access_type_sku?: string;
+  analytics_tracking_id?: string;
+  assigned_date?:
+    | (
+        | {
+            [k: string]: unknown | undefined;
+          }
+        | string
+      )
+    | null;
+  can_signup_for_limited?: boolean;
+  chat_enabled?: boolean;
+  copilot_plan?: string;
+  copilotignore_enabled?: boolean;
+  endpoints?: CopilotUserResponseEndpoints;
+  organization_login_list?: string[];
+  organization_list?:
+    | (
+        | {
+            [k: string]: unknown | undefined;
+          }
+        | ({
+            login?:
+              | (
+                  | {
+                      [k: string]: unknown | undefined;
+                    }
+                  | string
+                )
+              | null;
+            name?:
+              | (
+                  | {
+                      [k: string]: unknown | undefined;
+                    }
+                  | string
+                )
+              | null;
+          } | null)[]
+      )
+    | null;
+  codex_agent_enabled?: boolean;
+  is_mcp_enabled?:
+    | (
+        | {
+            [k: string]: unknown | undefined;
+          }
+        | boolean
+      )
+    | null;
+  quota_reset_date?: string;
+  quota_snapshots?: CopilotUserResponseQuotaSnapshots;
+  restricted_telemetry?: boolean;
+  is_staff?: boolean;
+  token_based_billing?: boolean;
+  can_upgrade_plan?: boolean;
+  quota_reset_date_utc?: string;
+  limited_user_quotas?: {
+    [k: string]: number | undefined;
+  };
+  limited_user_reset_date?: string;
+  monthly_quotas?: {
+    [k: string]: number | undefined;
+  };
+  cloud_session_storage_enabled?: boolean;
+  cli_remote_control_enabled?: boolean;
 }
 /**
- * Canonical locations where custom agents can be created so the runtime will recognize them.
+ * Schema for the `CopilotUserResponseEndpoints` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentDiscoveryPathList".
+ * via the `definition` "CopilotUserResponseEndpoints".
  */
-/** @experimental */
-export interface AgentDiscoveryPathList {
-  /**
-   * Canonical agent create/discovery directories, in priority order
-   */
-  paths: AgentDiscoveryPath[];
+export interface CopilotUserResponseEndpoints {
+  api?: string;
+  "origin-tracker"?: string;
+  proxy?: string;
+  telemetry?: string;
 }
 /**
- * The currently selected custom agent, or null when using the default agent.
+ * Schema for the `CopilotUserResponseQuotaSnapshots` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentGetCurrentResult".
+ * via the `definition` "CopilotUserResponseQuotaSnapshots".
  */
-/** @experimental */
-export interface AgentGetCurrentResult {
-  /**
-   * Currently selected custom agent, or null if using the default agent
-   */
-  agent?: AgentInfo | null;
+export interface CopilotUserResponseQuotaSnapshots {
+  chat?: CopilotUserResponseQuotaSnapshotsChat;
+  completions?: CopilotUserResponseQuotaSnapshotsCompletions;
+  premium_interactions?: CopilotUserResponseQuotaSnapshotsPremiumInteractions;
+  [k: string]:
+    | ({
+        entitlement?: number;
+        overage_count?: number;
+        overage_permitted?: boolean;
+        percent_remaining?: number;
+        quota_id?: string;
+        quota_remaining?: number;
+        remaining?: number;
+        unlimited?: boolean;
+        timestamp_utc?: string;
+        has_quota?: boolean;
+        quota_reset_at?: number;
+        token_based_billing?: boolean;
+      } | null)
+    | undefined;
 }
 /**
- * Schema for the `AgentInfo` type.
+ * Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentInfo".
+ * via the `definition` "CopilotUserResponseQuotaSnapshotsChat".
  */
-/** @experimental */
-export interface AgentInfo {
-  /**
-   * Unique identifier of the custom agent
-   */
-  name: string;
-  /**
-   * Human-readable display name
-   */
-  displayName: string;
-  /**
-   * Description of the agent's purpose
-   */
-  description: string;
-  /**
-   * Absolute local file path of the agent definition. Only set for file-based agents loaded from disk; remote agents do not have a path.
-   */
-  path?: string;
-  /**
-   * Stable identifier for selection. For most agents this is the same as `name`; for plugin/builtin agents it may differ. Always populated; defaults to `name` when no distinct id was assigned.
-   */
-  id: string;
-  source?: AgentInfoSource;
-  /**
-   * Whether the agent can be selected directly by the user. Agents marked `false` are subagent-only.
-   */
-  userInvocable?: boolean;
-  /**
-   * Allowed tool names for this agent. Empty array means none; omitted means inherit defaults.
-   */
-  tools?: string[];
-  /**
-   * Preferred model id for this agent. When omitted, inherits the outer agent's model.
-   */
-  model?: string;
-  /**
-   * MCP server configurations attached to this agent, keyed by server name. Server config shape mirrors the MCP `mcpServers` schema.
-   *
-   * @experimental
-   */
-  mcpServers?: {
-    [k: string]: unknown | undefined;
-  };
-  /**
-   * Skill names preloaded into this agent's context. Omitted means none.
-   */
-  skills?: string[];
+export interface CopilotUserResponseQuotaSnapshotsChat {
+  entitlement?: number;
+  overage_count?: number;
+  overage_permitted?: boolean;
+  percent_remaining?: number;
+  quota_id?: string;
+  quota_remaining?: number;
+  remaining?: number;
+  unlimited?: boolean;
+  timestamp_utc?: string;
+  has_quota?: boolean;
+  quota_reset_at?: number;
+  token_based_billing?: boolean;
 }
 /**
- * Custom agents available to the session.
+ * Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentList".
+ * via the `definition` "CopilotUserResponseQuotaSnapshotsCompletions".
  */
-/** @experimental */
-export interface AgentList {
-  /**
-   * Available custom agents
-   */
-  agents: AgentInfo[];
+export interface CopilotUserResponseQuotaSnapshotsCompletions {
+  entitlement?: number;
+  overage_count?: number;
+  overage_permitted?: boolean;
+  percent_remaining?: number;
+  quota_id?: string;
+  quota_remaining?: number;
+  remaining?: number;
+  unlimited?: boolean;
+  timestamp_utc?: string;
+  has_quota?: boolean;
+  quota_reset_at?: number;
+  token_based_billing?: boolean;
 }
 /**
- * Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).
+ * Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentRegistryLiveTargetEntry".
+ * via the `definition` "CopilotUserResponseQuotaSnapshotsPremiumInteractions".
  */
-/** @experimental */
-export interface AgentRegistryLiveTargetEntry {
-  /**
-   * Registry entry schema version (1 = ui-server, 2 = managed-server)
-   */
-  schemaVersion: number;
-  kind: AgentRegistryLiveTargetEntryKind;
+export interface CopilotUserResponseQuotaSnapshotsPremiumInteractions {
+  entitlement?: number;
+  overage_count?: number;
+  overage_permitted?: boolean;
+  percent_remaining?: number;
+  quota_id?: string;
+  quota_remaining?: number;
+  remaining?: number;
+  unlimited?: boolean;
+  timestamp_utc?: string;
+  has_quota?: boolean;
+  quota_reset_at?: number;
+  token_based_billing?: boolean;
+}
+/**
+ * Schema for the `EnvAuthInfo` type.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "EnvAuthInfo".
+ */
+export interface EnvAuthInfo {
   /**
-   * Operating-system pid of the process owning this entry
+   * Personal access token (PAT) or server-to-server token sourced from an environment variable.
    */
-  pid: number;
+  type: "env";
   /**
-   * Bind host for the entry's JSON-RPC server
+   * Authentication host (e.g. https://github.com or a GHES host).
    */
   host: string;
   /**
-   * TCP port the entry's JSON-RPC server is listening on
+   * User login associated with the token. Undefined for server-to-server tokens (those starting with `ghs_`).
    */
-  port: number;
+  login?: string;
   /**
-   * Connection token (null when the target is unauthenticated)
-   *
-   * @internal
+   * The token value itself. Treat as a secret.
    */
-  token?: string | null;
+  token: string;
   /**
-   * Session ID of the foreground session for this entry
+   * Name of the environment variable the token was sourced from.
    */
-  sessionId?: string;
+  envVar: string;
+  copilotUser?: CopilotUserResponse;
+}
+/**
+ * Schema for the `TokenAuthInfo` type.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "TokenAuthInfo".
+ */
+export interface TokenAuthInfo {
   /**
-   * Friendly session name (when set)
+   * SDK-side token authentication; the host configured the token directly via the SDK.
    */
-  sessionName?: string;
+  type: "token";
   /**
-   * Working directory of the session (when known)
+   * Authentication host.
    */
-  cwd?: string;
+  host: string;
   /**
-   * Git branch of the session (when known)
+   * The token value itself. Treat as a secret.
    */
-  branch?: string;
+  token: string;
+  copilotUser?: CopilotUserResponse;
+}
+/**
+ * Schema for the `CopilotApiTokenAuthInfo` type.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "CopilotApiTokenAuthInfo".
+ */
+export interface CopilotApiTokenAuthInfo {
   /**
-   * Model identifier currently selected for the session
+   * Direct Copilot API authentication via the `GITHUB_COPILOT_API_TOKEN` + `COPILOT_API_URL` environment-variable pair. The token itself is read from the environment by the runtime, not carried in this struct.
    */
-  model?: string;
-  status?: AgentRegistryLiveTargetEntryStatus;
-  attentionKind?: AgentRegistryLiveTargetEntryAttentionKind;
+  type: "copilot-api-token";
   /**
-   * Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.
+   * Authentication host (always the public GitHub host).
    */
-  statusRevision?: number;
-  lastTerminalEvent?: AgentRegistryLiveTargetEntryLastTerminalEvent;
+  host: "https://github.com";
+  copilotUser?: CopilotUserResponse;
+}
+/**
+ * Schema for the `UserAuthInfo` type.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserAuthInfo".
+ */
+export interface UserAuthInfo {
   /**
-   * ISO 8601 timestamp captured at registration
+   * OAuth user authentication. The token itself is held in the runtime's secret token store (keyed by host+login) and is NOT carried in this struct.
    */
-  startedAt: string;
+  type: "user";
   /**
-   * Copilot CLI version that wrote the entry
+   * Authentication host.
    */
-  copilotVersion: string;
+  host: string;
   /**
-   * Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness)
+   * OAuth user login.
    */
-  lastSeenMs: number;
+  login: string;
+  copilotUser?: CopilotUserResponse;
 }
 /**
- * Per-spawn log-capture outcome; populated from spawnLiveTarget.
+ * Schema for the `GhCliAuthInfo` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentRegistryLogCapture".
+ * via the `definition` "GhCliAuthInfo".
  */
-/** @experimental */
-export interface AgentRegistryLogCapture {
+export interface GhCliAuthInfo {
   /**
-   * Whether per-spawn log capture is on (false when env-disabled or open failed)
+   * Authentication via the `gh` CLI's saved credentials.
    */
-  enabled: boolean;
+  type: "gh-cli";
   /**
-   * Absolute path to the per-spawn log file (only set when enabled)
+   * Authentication host.
    */
-  path?: string;
+  host: string;
   /**
-   * Human-readable open failure message (only set when enabled === false AND the env-disable opt-out was NOT used)
+   * User login as reported by `gh auth status`.
    */
-  openError?: string;
-  openErrorReason?: AgentRegistryLogCaptureOpenErrorReason;
+  login: string;
+  /**
+   * The token returned by `gh auth token`. Treat as a secret.
+   */
+  token: string;
+  copilotUser?: CopilotUserResponse;
 }
 /**
- * `child_process.spawn` itself failed before the child entered the registry.
+ * Schema for the `ApiKeyAuthInfo` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentRegistrySpawnError".
+ * via the `definition` "ApiKeyAuthInfo".
  */
-/** @experimental */
-export interface AgentRegistrySpawnError {
+export interface ApiKeyAuthInfo {
   /**
-   * Discriminator: child_process.spawn itself failed
+   * API-key authentication for non-GitHub LLM providers (e.g. when running BYOM-style).
    */
-  kind: "spawn-error";
+  type: "api-key";
   /**
-   * Human-readable error message
+   * The API key. Treat as a secret.
    */
-  message: string;
+  apiKey: string;
   /**
-   * Underlying errno code (e.g. ENOENT, EACCES) when available
+   * Authentication host.
    */
-  code?: string;
+  host: string;
+  copilotUser?: CopilotUserResponse;
 }
 /**
- * Spawn succeeded but the child did not publish a matching managed-server entry within the timeout.
+ * Current authentication state
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentRegistrySpawnRegistryTimeout".
+ * via the `definition` "AccountGetCurrentAuthResult".
  */
-/** @experimental */
-export interface AgentRegistrySpawnRegistryTimeout {
+export interface AccountGetCurrentAuthResult {
+  authInfo?: AuthInfo;
   /**
-   * Discriminator: spawn succeeded but child never registered
+   * Authentication errors from the last auth attempt, if any
    */
-  kind: "registry-timeout";
+  authErrors?: string[];
+}
+
+export interface AccountGetQuotaRequest {
   /**
-   * Process ID of the orphaned child (so the caller can offer 'kill the pid' guidance)
+   * GitHub token for per-user quota lookup. When provided, resolves this token to determine the user's quota instead of using the global auth.
    */
-  childPid: number;
-  logCapture?: AgentRegistryLogCapture;
+  gitHubToken?: string;
 }
 /**
- * Inputs to spawn a managed-server child via the controller's spawn delegate.
+ * Quota usage snapshots for the resolved user, keyed by quota type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentRegistrySpawnRequest".
+ * via the `definition` "AccountGetQuotaResult".
  */
-/** @experimental */
-export interface AgentRegistrySpawnRequest {
+export interface AccountGetQuotaResult {
   /**
-   * Working directory for the spawned child (must be an existing directory)
+   * Quota snapshots keyed by type (e.g., chat, completions, premium_interactions)
    */
-  cwd: string;
+  quotaSnapshots: {
+    [k: string]: AccountQuotaSnapshot | undefined;
+  };
+}
+/**
+ * Schema for the `AccountQuotaSnapshot` type.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountQuotaSnapshot".
+ */
+export interface AccountQuotaSnapshot {
   /**
-   * Custom or built-in agent name (e.g. 'explore'). When omitted, the child uses its own default.
+   * Whether the user has an unlimited usage entitlement
    */
-  agentName?: string;
+  isUnlimitedEntitlement: boolean;
   /**
-   * Model identifier to apply to the new session
+   * Number of requests included in the entitlement, or -1 for unlimited entitlements
    */
-  model?: string;
+  entitlementRequests: number;
   /**
-   * Friendly session name. Must satisfy validateSessionName: non-empty, no leading/trailing whitespace, <=100 chars, no control chars, no double quotes.
+   * Number of requests used so far this period
    */
-  name?: string;
-  permissionMode?: AgentRegistrySpawnPermissionMode;
+  usedRequests: number;
   /**
-   * Optional first user message. Forwarded to the caller (the CLI's spawn wrapper sends it post-attach via the standard LocalRpcSession.send path).
+   * Whether usage is still permitted after quota exhaustion
    */
-  initialPrompt?: string;
-}
-/**
- * Managed-server child was spawned and registered successfully.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentRegistrySpawnSpawned".
- */
-/** @experimental */
-export interface AgentRegistrySpawnSpawned {
+  usageAllowedWithExhaustedQuota: boolean;
   /**
-   * Discriminator: managed-server child spawned successfully
+   * Percentage of entitlement remaining
    */
-  kind: "spawned";
-  entry: AgentRegistryLiveTargetEntry;
+  remainingPercentage: number;
   /**
-   * Whether the delegate already sent the initial prompt. Always omitted in the current wiring: the controller sends the prompt post-attach via the standard LocalRpcSession.send path.
+   * Number of additional usage requests made this period
    */
-  initialPromptSent?: boolean;
+  overage: number;
   /**
-   * If the delegate attempted to send the initial prompt and failed, the categorized error message.
+   * Whether additional usage is allowed when quota is exhausted
    */
-  initialPromptError?: string;
-  logCapture?: AgentRegistryLogCapture;
+  overageAllowedWithExhaustedQuota: boolean;
+  /**
+   * Date when the quota resets (ISO 8601 string)
+   */
+  resetDate?: string;
 }
 /**
- * Synchronous pre-validation rejected the spawn request.
+ * Credentials to store after successful authentication
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentRegistrySpawnValidationError".
+ * via the `definition` "AccountLoginRequest".
  */
-/** @experimental */
-export interface AgentRegistrySpawnValidationError {
+export interface AccountLoginRequest {
   /**
-   * Discriminator: synchronous pre-validation rejected the request
+   * GitHub host URL
    */
-  kind: "validation-error";
-  reason: AgentRegistrySpawnValidationErrorReason;
-  field?: AgentRegistrySpawnValidationErrorField;
+  host: string;
   /**
-   * Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.
+   * User login/username
    */
-  message: string;
-}
-/**
- * Custom agents available to the session after reloading definitions from disk.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentReloadResult".
- */
-/** @experimental */
-export interface AgentReloadResult {
+  login: string;
   /**
-   * Reloaded custom agents
+   * GitHub authentication token
    */
-  agents: AgentInfo[];
+  token: string;
 }
 /**
- * Optional project paths to include in agent discovery.
+ * Result of a successful login; throws on failure
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentsDiscoverRequest".
+ * via the `definition` "AccountLoginResult".
  */
-/** @experimental */
-export interface AgentsDiscoverRequest {
-  /**
-   * Optional list of project directory paths to scan for project-scoped agents. When omitted or empty, only user/plugin/remote-independent agents are returned (no project scan).
-   */
-  projectPaths?: string[];
+export interface AccountLoginResult {
   /**
-   * When true, omit the host's agents (the user-level agent directory and all plugin agents), leaving only project and remote agents. For multitenant deployments.
+   * Whether the credential was persisted to a secure store (system keychain, or the config file when plaintext storage is enabled). False when no secure store was available and the token was not saved, so the consumer can decide how to proceed.
    */
-  excludeHostAgents?: boolean;
+  storedInVault: boolean;
 }
 /**
- * Name of the custom agent to select for subsequent turns.
+ * User to log out
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentSelectRequest".
+ * via the `definition` "AccountLogoutRequest".
  */
-/** @experimental */
-export interface AgentSelectRequest {
-  /**
-   * Name of the custom agent to select
-   */
-  name: string;
+export interface AccountLogoutRequest {
+  authInfo: AuthInfo;
 }
 /**
- * The newly selected custom agent.
+ * Logout result indicating if more users remain
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentSelectResult".
+ * via the `definition` "AccountLogoutResult".
  */
-/** @experimental */
-export interface AgentSelectResult {
-  agent: AgentInfo;
+export interface AccountLogoutResult {
+  /**
+   * Whether other authenticated users remain after logout
+   */
+  hasMoreUsers: boolean;
 }
 /**
- * Optional project paths to include when enumerating agent discovery directories.
+ * Schema for the `AgentDiscoveryPath` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AgentsGetDiscoveryPathsRequest".
+ * via the `definition` "AgentDiscoveryPath".
  */
 /** @experimental */
-export interface AgentsGetDiscoveryPathsRequest {
+export interface AgentDiscoveryPath {
   /**
-   * Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.
+   * Absolute path of the search/create directory (may not exist on disk yet)
    */
-  projectPaths?: string[];
+  path: string;
+  scope: AgentDiscoveryPathScope;
   /**
-   * When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
+   * Whether this is the canonical directory to create a new agent in its tier. At most one entry per tier is preferred.
    */
-  excludeHostAgents?: boolean;
+  preferredForCreation: boolean;
+  /**
+   * The input project path this directory was derived from (only for project scope)
+   */
+  projectPath?: string;
 }
 /**
- * Indicates whether the operation succeeded and reports the post-mutation state.
+ * Canonical locations where custom agents can be created so the runtime will recognize them.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AllowAllPermissionSetResult".
+ * via the `definition` "AgentDiscoveryPathList".
  */
 /** @experimental */
-export interface AllowAllPermissionSetResult {
-  /**
-   * Whether the operation succeeded
-   */
-  success: boolean;
+export interface AgentDiscoveryPathList {
   /**
-   * Authoritative allow-all state after the mutation
+   * Canonical agent create/discovery directories, in priority order
    */
-  enabled: boolean;
+  paths: AgentDiscoveryPath[];
 }
 /**
- * Current full allow-all permission state.
+ * The currently selected custom agent, or null when using the default agent.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AllowAllPermissionState".
+ * via the `definition` "AgentGetCurrentResult".
  */
 /** @experimental */
-export interface AllowAllPermissionState {
+export interface AgentGetCurrentResult {
   /**
-   * Whether full allow-all permissions are currently active
+   * Currently selected custom agent, or null if using the default agent
    */
-  enabled: boolean;
+  agent?: AgentInfo | null;
 }
 /**
- * Schema for the `ApiKeyAuthInfo` type.
+ * Schema for the `AgentInfo` type.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "ApiKeyAuthInfo".
+ * via the `definition` "AgentInfo".
  */
 /** @experimental */
-export interface ApiKeyAuthInfo {
+export interface AgentInfo {
   /**
-   * API-key authentication for non-GitHub LLM providers (e.g. when running BYOM-style).
+   * Unique identifier of the custom agent
    */
-  type: "api-key";
+  name: string;
   /**
-   * The API key. Treat as a secret.
+   * Human-readable display name
    */
-  apiKey: string;
+  displayName: string;
   /**
-   * Authentication host.
+   * Description of the agent's purpose
    */
-  host: string;
-  copilotUser?: CopilotUserResponse;
-}
-/**
- * Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CopilotUserResponse".
- */
-/** @experimental */
-export interface CopilotUserResponse {
-  login?: string;
-  access_type_sku?: string;
-  analytics_tracking_id?: string;
-  assigned_date?:
-    | (
-        | {
-            [k: string]: unknown | undefined;
-          }
-        | string
-      )
-    | null;
-  can_signup_for_limited?: boolean;
-  chat_enabled?: boolean;
-  copilot_plan?: string;
-  copilotignore_enabled?: boolean;
-  endpoints?: CopilotUserResponseEndpoints;
-  organization_login_list?: string[];
-  organization_list?:
-    | (
-        | {
-            [k: string]: unknown | undefined;
-          }
-        | ({
-            login?:
-              | (
-                  | {
-                      [k: string]: unknown | undefined;
-                    }
-                  | string
-                )
-              | null;
-            name?:
-              | (
-                  | {
-                      [k: string]: unknown | undefined;
-                    }
-                  | string
-                )
-              | null;
-          } | null)[]
-      )
-    | null;
-  codex_agent_enabled?: boolean;
-  is_mcp_enabled?:
-    | (
-        | {
-            [k: string]: unknown | undefined;
-          }
-        | boolean
-      )
-    | null;
-  quota_reset_date?: string;
-  quota_snapshots?: CopilotUserResponseQuotaSnapshots;
-  restricted_telemetry?: boolean;
-  is_staff?: boolean;
-  token_based_billing?: boolean;
-  can_upgrade_plan?: boolean;
-  quota_reset_date_utc?: string;
-  limited_user_quotas?: {
-    [k: string]: number | undefined;
-  };
-  limited_user_reset_date?: string;
-  monthly_quotas?: {
-    [k: string]: number | undefined;
+  description: string;
+  /**
+   * Absolute local file path of the agent definition. Only set for file-based agents loaded from disk; remote agents do not have a path.
+   */
+  path?: string;
+  /**
+   * Stable identifier for selection. For most agents this is the same as `name`; for plugin/builtin agents it may differ. Always populated; defaults to `name` when no distinct id was assigned.
+   */
+  id: string;
+  source?: AgentInfoSource;
+  /**
+   * Whether the agent can be selected directly by the user. Agents marked `false` are subagent-only.
+   */
+  userInvocable?: boolean;
+  /**
+   * Allowed tool names for this agent. Empty array means none; omitted means inherit defaults.
+   */
+  tools?: string[];
+  /**
+   * Preferred model id for this agent. When omitted, inherits the outer agent's model.
+   */
+  model?: string;
+  /**
+   * MCP server configurations attached to this agent, keyed by server name. Server config shape mirrors the MCP `mcpServers` schema.
+   *
+   * @experimental
+   */
+  mcpServers?: {
+    [k: string]: unknown | undefined;
   };
-  cloud_session_storage_enabled?: boolean;
-  cli_remote_control_enabled?: boolean;
+  /**
+   * Skill names preloaded into this agent's context. Omitted means none.
+   */
+  skills?: string[];
 }
 /**
- * Schema for the `CopilotUserResponseEndpoints` type.
+ * Custom agents available to the session.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CopilotUserResponseEndpoints".
+ * via the `definition` "AgentList".
  */
 /** @experimental */
-export interface CopilotUserResponseEndpoints {
-  api?: string;
-  "origin-tracker"?: string;
-  proxy?: string;
-  telemetry?: string;
+export interface AgentList {
+  /**
+   * Available custom agents
+   */
+  agents: AgentInfo[];
 }
 /**
- * Schema for the `CopilotUserResponseQuotaSnapshots` type.
+ * Full registry entry for the spawned child. Lets the controller call `handleLiveTargetSelected(entry)` directly without re-reading the registry (avoids a TOCTOU window).
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CopilotUserResponseQuotaSnapshots".
+ * via the `definition` "AgentRegistryLiveTargetEntry".
  */
 /** @experimental */
-export interface CopilotUserResponseQuotaSnapshots {
-  chat?: CopilotUserResponseQuotaSnapshotsChat;
-  completions?: CopilotUserResponseQuotaSnapshotsCompletions;
-  premium_interactions?: CopilotUserResponseQuotaSnapshotsPremiumInteractions;
-  [k: string]:
-    | ({
-        entitlement?: number;
-        overage_count?: number;
-        overage_permitted?: boolean;
-        percent_remaining?: number;
-        quota_id?: string;
-        quota_remaining?: number;
-        remaining?: number;
-        unlimited?: boolean;
-        timestamp_utc?: string;
-        has_quota?: boolean;
-        quota_reset_at?: number;
-        token_based_billing?: boolean;
-      } | null)
-    | undefined;
+export interface AgentRegistryLiveTargetEntry {
+  /**
+   * Registry entry schema version (1 = ui-server, 2 = managed-server)
+   */
+  schemaVersion: number;
+  kind: AgentRegistryLiveTargetEntryKind;
+  /**
+   * Operating-system pid of the process owning this entry
+   */
+  pid: number;
+  /**
+   * Bind host for the entry's JSON-RPC server
+   */
+  host: string;
+  /**
+   * TCP port the entry's JSON-RPC server is listening on
+   */
+  port: number;
+  /**
+   * Connection token (null when the target is unauthenticated)
+   *
+   * @internal
+   */
+  token?: string | null;
+  /**
+   * Session ID of the foreground session for this entry
+   */
+  sessionId?: string;
+  /**
+   * Friendly session name (when set)
+   */
+  sessionName?: string;
+  /**
+   * Working directory of the session (when known)
+   */
+  cwd?: string;
+  /**
+   * Git branch of the session (when known)
+   */
+  branch?: string;
+  /**
+   * Model identifier currently selected for the session
+   */
+  model?: string;
+  status?: AgentRegistryLiveTargetEntryStatus;
+  attentionKind?: AgentRegistryLiveTargetEntryAttentionKind;
+  /**
+   * Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.
+   */
+  statusRevision?: number;
+  lastTerminalEvent?: AgentRegistryLiveTargetEntryLastTerminalEvent;
+  /**
+   * ISO 8601 timestamp captured at registration
+   */
+  startedAt: string;
+  /**
+   * Copilot CLI version that wrote the entry
+   */
+  copilotVersion: string;
+  /**
+   * Wall-clock milliseconds since the watcher last observed this entry (heartbeat freshness)
+   */
+  lastSeenMs: number;
 }
 /**
- * Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.
+ * Per-spawn log-capture outcome; populated from spawnLiveTarget.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CopilotUserResponseQuotaSnapshotsChat".
+ * via the `definition` "AgentRegistryLogCapture".
  */
 /** @experimental */
-export interface CopilotUserResponseQuotaSnapshotsChat {
-  entitlement?: number;
-  overage_count?: number;
-  overage_permitted?: boolean;
-  percent_remaining?: number;
-  quota_id?: string;
-  quota_remaining?: number;
-  remaining?: number;
-  unlimited?: boolean;
-  timestamp_utc?: string;
-  has_quota?: boolean;
-  quota_reset_at?: number;
-  token_based_billing?: boolean;
+export interface AgentRegistryLogCapture {
+  /**
+   * Whether per-spawn log capture is on (false when env-disabled or open failed)
+   */
+  enabled: boolean;
+  /**
+   * Absolute path to the per-spawn log file (only set when enabled)
+   */
+  path?: string;
+  /**
+   * Human-readable open failure message (only set when enabled === false AND the env-disable opt-out was NOT used)
+   */
+  openError?: string;
+  openErrorReason?: AgentRegistryLogCaptureOpenErrorReason;
 }
 /**
- * Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type.
+ * `child_process.spawn` itself failed before the child entered the registry.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CopilotUserResponseQuotaSnapshotsCompletions".
+ * via the `definition` "AgentRegistrySpawnError".
  */
 /** @experimental */
-export interface CopilotUserResponseQuotaSnapshotsCompletions {
-  entitlement?: number;
-  overage_count?: number;
-  overage_permitted?: boolean;
-  percent_remaining?: number;
-  quota_id?: string;
-  quota_remaining?: number;
-  remaining?: number;
-  unlimited?: boolean;
-  timestamp_utc?: string;
-  has_quota?: boolean;
-  quota_reset_at?: number;
-  token_based_billing?: boolean;
+export interface AgentRegistrySpawnError {
+  /**
+   * Discriminator: child_process.spawn itself failed
+   */
+  kind: "spawn-error";
+  /**
+   * Human-readable error message
+   */
+  message: string;
+  /**
+   * Underlying errno code (e.g. ENOENT, EACCES) when available
+   */
+  code?: string;
 }
 /**
- * Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type.
+ * Spawn succeeded but the child did not publish a matching managed-server entry within the timeout.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CopilotUserResponseQuotaSnapshotsPremiumInteractions".
+ * via the `definition` "AgentRegistrySpawnRegistryTimeout".
  */
 /** @experimental */
-export interface CopilotUserResponseQuotaSnapshotsPremiumInteractions {
-  entitlement?: number;
-  overage_count?: number;
-  overage_permitted?: boolean;
-  percent_remaining?: number;
-  quota_id?: string;
-  quota_remaining?: number;
-  remaining?: number;
-  unlimited?: boolean;
-  timestamp_utc?: string;
-  has_quota?: boolean;
-  quota_reset_at?: number;
-  token_based_billing?: boolean;
+export interface AgentRegistrySpawnRegistryTimeout {
+  /**
+   * Discriminator: spawn succeeded but child never registered
+   */
+  kind: "registry-timeout";
+  /**
+   * Process ID of the orphaned child (so the caller can offer 'kill the pid' guidance)
+   */
+  childPid: number;
+  logCapture?: AgentRegistryLogCapture;
 }
 /**
- * Schema for the `HMACAuthInfo` type.
+ * Inputs to spawn a managed-server child via the controller's spawn delegate.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "HMACAuthInfo".
+ * via the `definition` "AgentRegistrySpawnRequest".
  */
 /** @experimental */
-export interface HMACAuthInfo {
+export interface AgentRegistrySpawnRequest {
   /**
-   * HMAC-based authentication used by GitHub-internal services.
+   * Working directory for the spawned child (must be an existing directory)
    */
-  type: "hmac";
+  cwd: string;
   /**
-   * Authentication host. HMAC auth always targets the public GitHub host.
+   * Custom or built-in agent name (e.g. 'explore'). When omitted, the child uses its own default.
    */
-  host: "https://github.com";
+  agentName?: string;
   /**
-   * HMAC secret used to sign requests.
+   * Model identifier to apply to the new session
    */
-  hmac: string;
-  copilotUser?: CopilotUserResponse;
+  model?: string;
+  /**
+   * Friendly session name. Must satisfy validateSessionName: non-empty, no leading/trailing whitespace, <=100 chars, no control chars, no double quotes.
+   */
+  name?: string;
+  permissionMode?: AgentRegistrySpawnPermissionMode;
+  /**
+   * Optional first user message. Forwarded to the caller (the CLI's spawn wrapper sends it post-attach via the standard LocalRpcSession.send path).
+   */
+  initialPrompt?: string;
 }
 /**
- * Schema for the `EnvAuthInfo` type.
+ * Managed-server child was spawned and registered successfully.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "EnvAuthInfo".
+ * via the `definition` "AgentRegistrySpawnSpawned".
  */
 /** @experimental */
-export interface EnvAuthInfo {
-  /**
-   * Personal access token (PAT) or server-to-server token sourced from an environment variable.
-   */
-  type: "env";
-  /**
-   * Authentication host (e.g. https://github.com or a GHES host).
-   */
-  host: string;
+export interface AgentRegistrySpawnSpawned {
   /**
-   * User login associated with the token. Undefined for server-to-server tokens (those starting with `ghs_`).
+   * Discriminator: managed-server child spawned successfully
    */
-  login?: string;
+  kind: "spawned";
+  entry: AgentRegistryLiveTargetEntry;
   /**
-   * The token value itself. Treat as a secret.
+   * Whether the delegate already sent the initial prompt. Always omitted in the current wiring: the controller sends the prompt post-attach via the standard LocalRpcSession.send path.
    */
-  token: string;
+  initialPromptSent?: boolean;
   /**
-   * Name of the environment variable the token was sourced from.
+   * If the delegate attempted to send the initial prompt and failed, the categorized error message.
    */
-  envVar: string;
-  copilotUser?: CopilotUserResponse;
+  initialPromptError?: string;
+  logCapture?: AgentRegistryLogCapture;
 }
 /**
- * Schema for the `TokenAuthInfo` type.
+ * Synchronous pre-validation rejected the spawn request.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "TokenAuthInfo".
+ * via the `definition` "AgentRegistrySpawnValidationError".
  */
 /** @experimental */
-export interface TokenAuthInfo {
+export interface AgentRegistrySpawnValidationError {
   /**
-   * SDK-side token authentication; the host configured the token directly via the SDK.
+   * Discriminator: synchronous pre-validation rejected the request
    */
-  type: "token";
+  kind: "validation-error";
+  reason: AgentRegistrySpawnValidationErrorReason;
+  field?: AgentRegistrySpawnValidationErrorField;
   /**
-   * Authentication host.
+   * Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.
    */
-  host: string;
+  message: string;
+}
+/**
+ * Custom agents available to the session after reloading definitions from disk.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentReloadResult".
+ */
+/** @experimental */
+export interface AgentReloadResult {
   /**
-   * The token value itself. Treat as a secret.
+   * Reloaded custom agents
    */
-  token: string;
-  copilotUser?: CopilotUserResponse;
+  agents: AgentInfo[];
 }
 /**
- * Schema for the `CopilotApiTokenAuthInfo` type.
+ * Optional project paths to include in agent discovery.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "CopilotApiTokenAuthInfo".
+ * via the `definition` "AgentsDiscoverRequest".
  */
 /** @experimental */
-export interface CopilotApiTokenAuthInfo {
+export interface AgentsDiscoverRequest {
   /**
-   * Direct Copilot API authentication via the `GITHUB_COPILOT_API_TOKEN` + `COPILOT_API_URL` environment-variable pair. The token itself is read from the environment by the runtime, not carried in this struct.
+   * Optional list of project directory paths to scan for project-scoped agents. When omitted or empty, only user/plugin/remote-independent agents are returned (no project scan).
    */
-  type: "copilot-api-token";
+  projectPaths?: string[];
   /**
-   * Authentication host (always the public GitHub host).
+   * When true, omit the host's agents (the user-level agent directory and all plugin agents), leaving only project and remote agents. For multitenant deployments.
    */
-  host: "https://github.com";
-  copilotUser?: CopilotUserResponse;
+  excludeHostAgents?: boolean;
 }
 /**
- * Schema for the `UserAuthInfo` type.
+ * Name of the custom agent to select for subsequent turns.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UserAuthInfo".
+ * via the `definition` "AgentSelectRequest".
  */
 /** @experimental */
-export interface UserAuthInfo {
+export interface AgentSelectRequest {
   /**
-   * OAuth user authentication. The token itself is held in the runtime's secret token store (keyed by host+login) and is NOT carried in this struct.
+   * Name of the custom agent to select
    */
-  type: "user";
+  name: string;
+}
+/**
+ * The newly selected custom agent.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentSelectResult".
+ */
+/** @experimental */
+export interface AgentSelectResult {
+  agent: AgentInfo;
+}
+/**
+ * Optional project paths to include when enumerating agent discovery directories.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsGetDiscoveryPathsRequest".
+ */
+/** @experimental */
+export interface AgentsGetDiscoveryPathsRequest {
   /**
-   * Authentication host.
+   * Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.
    */
-  host: string;
+  projectPaths?: string[];
   /**
-   * OAuth user login.
+   * When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
    */
-  login: string;
-  copilotUser?: CopilotUserResponse;
+  excludeHostAgents?: boolean;
 }
 /**
- * Schema for the `GhCliAuthInfo` type.
+ * Indicates whether the operation succeeded and reports the post-mutation state.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "GhCliAuthInfo".
+ * via the `definition` "AllowAllPermissionSetResult".
  */
 /** @experimental */
-export interface GhCliAuthInfo {
-  /**
-   * Authentication via the `gh` CLI's saved credentials.
-   */
-  type: "gh-cli";
+export interface AllowAllPermissionSetResult {
   /**
-   * Authentication host.
+   * Whether the operation succeeded
    */
-  host: string;
+  success: boolean;
   /**
-   * User login as reported by `gh auth status`.
+   * Authoritative allow-all state after the mutation
    */
-  login: string;
+  enabled: boolean;
+}
+/**
+ * Current full allow-all permission state.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AllowAllPermissionState".
+ */
+/** @experimental */
+export interface AllowAllPermissionState {
   /**
-   * The token returned by `gh auth token`. Treat as a secret.
+   * Whether full allow-all permissions are currently active
    */
-  token: string;
-  copilotUser?: CopilotUserResponse;
+  enabled: boolean;
 }
 /**
  * Cancellation result for a user-requested shell command.
@@ -6250,7 +6322,8 @@ export interface ModelBillingTokenPrices {
    */
   outputPrice?: number;
   /**
-   * Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens
+   * @deprecated
+   * Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
    */
   cachePrice?: number;
   /**
@@ -6266,7 +6339,8 @@ export interface ModelBillingTokenPrices {
    */
   batchSize?: number;
   /**
-   * Deprecated: use maxPromptTokens. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.
+   * @deprecated
+   * Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.
    */
   contextMax?: number;
   /**
@@ -6291,7 +6365,8 @@ export interface ModelBillingTokenPricesLongContext {
    */
   outputPrice?: number;
   /**
-   * Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens
+   * @deprecated
+   * Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
    */
   cachePrice?: number;
   /**
@@ -6303,7 +6378,8 @@ export interface ModelBillingTokenPricesLongContext {
    */
   cacheWritePrice?: number;
   /**
-   * Deprecated: use maxPromptTokens. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
+   * @deprecated
+   * Use maxPromptTokens instead. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
    */
   contextMax?: number;
   /**
@@ -8373,6 +8449,78 @@ export interface SessionsPollSpawnedSessionsEvent {
    */
   sessionId: string;
 }
+/**
+ * BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ProviderAddRequest".
+ */
+/** @experimental */
+export interface ProviderAddRequest {
+  /**
+   * Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'.
+   */
+  providers?: NamedProviderConfig[];
+  /**
+   * BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry.
+   */
+  models?: ProviderModelConfig[];
+}
+/**
+ * A BYOK model definition referencing a named provider.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ProviderModelConfig".
+ */
+/** @experimental */
+export interface ProviderModelConfig {
+  /**
+   * Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.
+   */
+  id: string;
+  /**
+   * Name of the NamedProviderConfig that serves this model.
+   */
+  provider: string;
+  /**
+   * The model name sent to the provider API for inference. Defaults to `id`.
+   */
+  wireModel?: string;
+  /**
+   * Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.
+   */
+  modelId?: string;
+  /**
+   * Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).
+   */
+  name?: string;
+  /**
+   * Maximum prompt/input tokens for the model.
+   */
+  maxPromptTokens?: number;
+  /**
+   * Maximum context window tokens for the model.
+   */
+  maxContextWindowTokens?: number;
+  /**
+   * Maximum output tokens for the model.
+   */
+  maxOutputTokens?: number;
+  capabilities?: ModelCapabilitiesOverride;
+}
+/**
+ * The selectable model entries synthesized for the models added by this call.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ProviderAddResult".
+ */
+/** @experimental */
+export interface ProviderAddResult {
+  /**
+   * Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.
+   */
+  models: unknown[];
+}
 /**
  * Custom model-provider configuration (BYOK).
  *
@@ -8487,48 +8635,6 @@ export interface ProviderGetEndpointRequest {
    */
   modelId?: string;
 }
-/**
- * A BYOK model definition referencing a named provider.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "ProviderModelConfig".
- */
-/** @experimental */
-export interface ProviderModelConfig {
-  /**
-   * Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.
-   */
-  id: string;
-  /**
-   * Name of the NamedProviderConfig that serves this model.
-   */
-  provider: string;
-  /**
-   * The model name sent to the provider API for inference. Defaults to `id`.
-   */
-  wireModel?: string;
-  /**
-   * Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.
-   */
-  modelId?: string;
-  /**
-   * Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).
-   */
-  name?: string;
-  /**
-   * Maximum prompt/input tokens for the model.
-   */
-  maxPromptTokens?: number;
-  /**
-   * Maximum context window tokens for the model.
-   */
-  maxContextWindowTokens?: number;
-  /**
-   * Maximum output tokens for the model.
-   */
-  maxOutputTokens?: number;
-  capabilities?: ModelCapabilitiesOverride;
-}
 /**
  * File attachment
  *
@@ -9550,6 +9656,10 @@ export interface ServerSkill {
    * The project path this skill belongs to (only for project/inherited skills)
    */
   projectPath?: string;
+  /**
+   * Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
+   */
+  argumentHint?: string;
 }
 /**
  * Skills discovered across global and project sources.
@@ -11630,6 +11740,10 @@ export interface Skill {
    * Name of the plugin that provides the skill, when source is 'plugin'
    */
   pluginName?: string;
+  /**
+   * Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
+   */
+  argumentHint?: string;
 }
 /**
  * Schema for the `SkillDiscoveryPath` type.
@@ -13576,6 +13690,38 @@ export function createServerRpc(connection: MessageConnection) {
              */
             getQuota: async (params: AccountGetQuotaRequest): Promise<AccountGetQuotaResult> =>
                 connection.sendRequest("account.getQuota", params),
+            /**
+             * Gets the currently active authentication credentials from the global auth manager.
+             *
+             * @returns Current authentication state
+             */
+            getCurrentAuth: async (): Promise<AccountGetCurrentAuthResult> =>
+                connection.sendRequest("account.getCurrentAuth", {}),
+            /**
+             * Gets all authenticated users available for account switching.
+             *
+             * @returns List of all authenticated users
+             */
+            getAllUsers: async (): Promise<AccountGetAllUsersResult> =>
+                connection.sendRequest("account.getAllUsers", {}),
+            /**
+             * Stores authentication credentials after successful login (e.g., device code flow).
+             *
+             * @param params Credentials to store after successful authentication
+             *
+             * @returns Result of a successful login; throws on failure
+             */
+            login: async (params: AccountLoginRequest): Promise<AccountLoginResult> =>
+                connection.sendRequest("account.login", params),
+            /**
+             * Removes user authentication from keychain and persisted state.
+             *
+             * @param params User to log out
+             *
+             * @returns Logout result indicating if more users remain
+             */
+            logout: async (params: AccountLogoutRequest): Promise<AccountLogoutResult> =>
+                connection.sendRequest("account.logout", params),
         },
         secrets: {
             /**
@@ -14846,6 +14992,15 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              */
             getEndpoint: async (params?: ProviderGetEndpointRequest): Promise<ProviderEndpoint> =>
                 connection.sendRequest("session.provider.getEndpoint", { sessionId, ...params }),
+            /**
+             * Adds BYOK providers and/or models to the session's registry at runtime, extending the additive registry built from the session's `providers`/`models` options. Both fields are optional, so a call may add providers only, models only, or both. Within a single call providers are registered before models, so a model may reference a provider added in the same call; across calls a model may reference any provider already registered (from session creation or a prior add). A model whose referenced provider is not registered by the end of the call is rejected. Newly added models become selectable via `model.list` / `model.switchTo` and are inherited by sub-agents spawned afterwards.
+             *
+             * @param params BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+             *
+             * @returns The selectable model entries synthesized for the models added by this call.
+             */
+            add: async (params: ProviderAddRequest): Promise<ProviderAddResult> =>
+                connection.sendRequest("session.provider.add", { sessionId, ...params }),
         },
         /** @experimental */
         options: {
diff --git a/nodejs/src/generated/session-events.ts b/nodejs/src/generated/session-events.ts
index cd74a7b48..d4faf7d4b 100644
--- a/nodejs/src/generated/session-events.ts
+++ b/nodejs/src/generated/session-events.ts
@@ -3441,6 +3441,7 @@ export interface ModelCallFailureData {
    * GitHub request tracing ID (x-github-request-id header) for server-side log correlation
    */
   providerCallId?: string;
+  requestFingerprint?: ModelCallFailureRequestFingerprint;
   /**
    * Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
    */
@@ -3451,6 +3452,39 @@ export interface ModelCallFailureData {
    */
   statusCode?: number;
 }
+/**
+ * Content-free structural summary of the failing request for diagnosing malformed 4xx calls
+ */
+export interface ModelCallFailureRequestFingerprint {
+  /**
+   * Total number of image content parts
+   */
+  imagePartCount: number;
+  /**
+   * Image parts whose media type cannot be determined (rejected by strict providers)
+   */
+  imagePartsMissingMediaType: number;
+  /**
+   * Role of the final message in the request
+   */
+  lastMessageRole?: string;
+  /**
+   * Total number of messages in the request
+   */
+  messageCount: number;
+  /**
+   * Tool calls whose name is missing or empty (rejected by strict providers)
+   */
+  namelessToolCallCount: number;
+  /**
+   * Total number of tool calls across assistant messages
+   */
+  toolCallCount: number;
+  /**
+   * Number of "tool" result messages in the request
+   */
+  toolResultMessageCount: number;
+}
 /**
  * Session event "abort". Turn abort information including the reason for termination
  */
@@ -7091,6 +7125,10 @@ export interface SkillsLoadedData {
  * Schema for the `SkillsLoadedSkill` type.
  */
 export interface SkillsLoadedSkill {
+  /**
+   * Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
+   */
+  argumentHint?: string;
   /**
    * Description of what the skill does
    */
diff --git a/nodejs/src/session.ts b/nodejs/src/session.ts
index 8ae19755a..0ba42ab76 100644
--- a/nodejs/src/session.ts
+++ b/nodejs/src/session.ts
@@ -134,6 +134,7 @@ export class CopilotSession {
     private traceContextProvider?: TraceContextProvider;
     private _capabilities: SessionCapabilities = {};
     private openCanvasInstances: OpenCanvasInstance[] = [];
+    private disconnected = false;
 
     /** @internal Client session API handlers, populated by CopilotClient during create/resume. */
     clientSessionApis: ClientSessionApiHandlers = {};
@@ -326,6 +327,22 @@ export class CopilotSession {
         }
     }
 
+    /** @internal */
+    _markDisconnected(): void {
+        this.disconnected = true;
+        this.eventHandlers.clear();
+        this.typedEventHandlers.clear();
+        this.toolHandlers.clear();
+        this.permissionHandler = undefined;
+        this.userInputHandler = undefined;
+        this.elicitationHandler = undefined;
+        this.exitPlanModeHandler = undefined;
+        this.autoModeSwitchHandler = undefined;
+        this.commandHandlers.clear();
+        this.canvases.clear();
+        this.transformCallbacks?.clear();
+    }
+
     /**
      * Subscribes to events from this session.
      *
@@ -443,6 +460,9 @@ export class CopilotSession {
      * @internal
      */
     private _handleBroadcastEvent(event: SessionEvent): void {
+        if (this.disconnected) {
+            return;
+        }
         if (event.type === "external_tool.requested") {
             const { requestId, toolName } = event.data as {
                 requestId: string;
@@ -582,8 +602,14 @@ export class CopilotSession {
             } else {
                 result = JSON.stringify(rawResult);
             }
+            if (this.disconnected) {
+                return;
+            }
             await this.rpc.tools.handlePendingToolCall({ requestId, result });
         } catch (error) {
+            if (this.disconnected) {
+                return;
+            }
             const message = error instanceof Error ? error.message : String(error);
             try {
                 await this.rpc.tools.handlePendingToolCall({ requestId, error: message });
@@ -611,8 +637,14 @@ export class CopilotSession {
             if (result.kind === "no-result") {
                 return;
             }
+            if (this.disconnected) {
+                return;
+            }
             await this.rpc.permissions.handlePendingPermissionRequest({ requestId, result });
         } catch (_error) {
+            if (this.disconnected) {
+                return;
+            }
             try {
                 await this.rpc.permissions.handlePendingPermissionRequest({
                     requestId,
@@ -656,8 +688,14 @@ export class CopilotSession {
 
         try {
             await handler({ sessionId: this.sessionId, command, commandName, args });
+            if (this.disconnected) {
+                return;
+            }
             await this.rpc.commands.handlePendingCommand({ requestId });
         } catch (error) {
+            if (this.disconnected) {
+                return;
+            }
             const message = error instanceof Error ? error.message : String(error);
             try {
                 await this.rpc.commands.handlePendingCommand({ requestId, error: message });
@@ -1170,17 +1208,13 @@ export class CopilotSession {
      * ```
      */
     async disconnect(): Promise<void> {
+        if (this.disconnected) {
+            return;
+        }
         await this.connection.sendRequest("session.destroy", {
             sessionId: this.sessionId,
         });
-        this.eventHandlers.clear();
-        this.typedEventHandlers.clear();
-        this.toolHandlers.clear();
-        this.permissionHandler = undefined;
-        this.userInputHandler = undefined;
-        this.elicitationHandler = undefined;
-        this.exitPlanModeHandler = undefined;
-        this.autoModeSwitchHandler = undefined;
+        this._markDisconnected();
     }
 
     /** Enables `await using session = ...` syntax for automatic cleanup. */
diff --git a/python/copilot/generated/rpc.py b/python/copilot/generated/rpc.py
index de42808b4..38100f534 100644
--- a/python/copilot/generated/rpc.py
+++ b/python/copilot/generated/rpc.py
@@ -48,10 +48,6 @@ def from_bool(x: Any) -> bool:
     assert isinstance(x, bool)
     return x
 
-def from_int(x: Any) -> int:
-    assert isinstance(x, int) and not isinstance(x, bool)
-    return x
-
 def from_float(x: Any) -> float:
     assert isinstance(x, (float, int)) and not isinstance(x, bool)
     return float(x)
@@ -64,13 +60,17 @@ def from_dict(f: Callable[[Any], T], x: Any) -> dict[str, T]:
     assert isinstance(x, dict)
     return { k: f(v) for (k, v) in x.items() }
 
+def from_list(f: Callable[[Any], T], x: Any) -> list[T]:
+    assert isinstance(x, list)
+    return [f(y) for y in x]
+
 def to_enum(c: type[EnumT], x: Any) -> EnumT:
     assert isinstance(x, c)
     return x.value
 
-def from_list(f: Callable[[Any], T], x: Any) -> list[T]:
-    assert isinstance(x, list)
-    return [f(y) for y in x]
+def from_int(x: Any) -> int:
+    assert isinstance(x, int) and not isinstance(x, bool)
+    return x
 
 def from_datetime(x: Any) -> datetime:
     return dateutil.parser.parse(x)
@@ -120,6 +120,99 @@ def to_dict(self) -> dict:
             result["error"] = from_union([from_str, from_none], self.error)
         return result
 
+@dataclass
+class CopilotUserResponseEndpoints:
+    """Schema for the `CopilotUserResponseEndpoints` type."""
+
+    api: str | None = None
+    origin_tracker: str | None = None
+    proxy: str | None = None
+    telemetry: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'CopilotUserResponseEndpoints':
+        assert isinstance(obj, dict)
+        api = from_union([from_str, from_none], obj.get("api"))
+        origin_tracker = from_union([from_str, from_none], obj.get("origin-tracker"))
+        proxy = from_union([from_str, from_none], obj.get("proxy"))
+        telemetry = from_union([from_str, from_none], obj.get("telemetry"))
+        return CopilotUserResponseEndpoints(api, origin_tracker, proxy, telemetry)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.api is not None:
+            result["api"] = from_union([from_str, from_none], self.api)
+        if self.origin_tracker is not None:
+            result["origin-tracker"] = from_union([from_str, from_none], self.origin_tracker)
+        if self.proxy is not None:
+            result["proxy"] = from_union([from_str, from_none], self.proxy)
+        if self.telemetry is not None:
+            result["telemetry"] = from_union([from_str, from_none], self.telemetry)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class AuthInfoType(Enum):
+    """Authentication type"""
+
+    API_KEY = "api-key"
+    COPILOT_API_TOKEN = "copilot-api-token"
+    ENV = "env"
+    GH_CLI = "gh-cli"
+    HMAC = "hmac"
+    TOKEN = "token"
+    USER = "user"
+
+@dataclass
+class AccountAllUsers:
+    """Schema for the `AccountAllUsers` type.
+
+    List of all authenticated users
+    """
+    auth_info: AuthInfo
+    """Authentication information for this user"""
+
+    token: str | None = None
+    """Associated token, if available"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AccountAllUsers':
+        assert isinstance(obj, dict)
+        auth_info = _load_AuthInfo(obj.get("authInfo"))
+        token = from_union([from_str, from_none], obj.get("token"))
+        return AccountAllUsers(auth_info, token)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authInfo"] = (self.auth_info).to_dict()
+        if self.token is not None:
+            result["token"] = from_union([from_str, from_none], self.token)
+        return result
+
+@dataclass
+class AccountGetCurrentAuthResult:
+    """Current authentication state"""
+
+    auth_errors: list[str] | None = None
+    """Authentication errors from the last auth attempt, if any"""
+
+    auth_info: AuthInfo | None = None
+    """Current authentication information, if authenticated"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AccountGetCurrentAuthResult':
+        assert isinstance(obj, dict)
+        auth_errors = from_union([lambda x: from_list(from_str, x), from_none], obj.get("authErrors"))
+        auth_info = from_union([_load_AuthInfo, from_none], obj.get("authInfo"))
+        return AccountGetCurrentAuthResult(auth_errors, auth_info)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.auth_errors is not None:
+            result["authErrors"] = from_union([lambda x: from_list(from_str, x), from_none], self.auth_errors)
+        if self.auth_info is not None:
+            result["authInfo"] = from_union([lambda x: (x).to_dict(), from_none], self.auth_info)
+        return result
+
 @dataclass
 class AccountGetQuotaRequest:
     git_hub_token: str | None = None
@@ -193,6 +286,91 @@ def to_dict(self) -> dict:
             result["resetDate"] = from_union([from_str, from_none], self.reset_date)
         return result
 
+@dataclass
+class AccountLoginRequest:
+    """Credentials to store after successful authentication"""
+
+    host: str
+    """GitHub host URL"""
+
+    login: str
+    """User login/username"""
+
+    token: str
+    """GitHub authentication token"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AccountLoginRequest':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        login = from_str(obj.get("login"))
+        token = from_str(obj.get("token"))
+        return AccountLoginRequest(host, login, token)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["login"] = from_str(self.login)
+        result["token"] = from_str(self.token)
+        return result
+
+@dataclass
+class AccountLoginResult:
+    """Result of a successful login; throws on failure"""
+
+    stored_in_vault: bool
+    """Whether the credential was persisted to a secure store (system keychain, or the config
+    file when plaintext storage is enabled). False when no secure store was available and the
+    token was not saved, so the consumer can decide how to proceed.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AccountLoginResult':
+        assert isinstance(obj, dict)
+        stored_in_vault = from_bool(obj.get("storedInVault"))
+        return AccountLoginResult(stored_in_vault)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["storedInVault"] = from_bool(self.stored_in_vault)
+        return result
+
+@dataclass
+class AccountLogoutRequest:
+    """User to log out"""
+
+    auth_info: AuthInfo
+    """Authentication information for the user to log out"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AccountLogoutRequest':
+        assert isinstance(obj, dict)
+        auth_info = _load_AuthInfo(obj.get("authInfo"))
+        return AccountLogoutRequest(auth_info)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authInfo"] = (self.auth_info).to_dict()
+        return result
+
+@dataclass
+class AccountLogoutResult:
+    """Logout result indicating if more users remain"""
+
+    has_more_users: bool
+    """Whether other authenticated users remain after logout"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AccountLogoutResult':
+        assert isinstance(obj, dict)
+        has_more_users = from_bool(obj.get("hasMoreUsers"))
+        return AccountLogoutResult(has_more_users)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["hasMoreUsers"] = from_bool(self.has_more_users)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class AgentDiscoveryPathScope(Enum):
     """Which tier this directory belongs to"""
@@ -422,52 +600,9 @@ def to_dict(self) -> dict:
         result["enabled"] = from_bool(self.enabled)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class CopilotUserResponseEndpoints:
-    """Schema for the `CopilotUserResponseEndpoints` type."""
-
-    api: str | None = None
-    origin_tracker: str | None = None
-    proxy: str | None = None
-    telemetry: str | None = None
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'CopilotUserResponseEndpoints':
-        assert isinstance(obj, dict)
-        api = from_union([from_str, from_none], obj.get("api"))
-        origin_tracker = from_union([from_str, from_none], obj.get("origin-tracker"))
-        proxy = from_union([from_str, from_none], obj.get("proxy"))
-        telemetry = from_union([from_str, from_none], obj.get("telemetry"))
-        return CopilotUserResponseEndpoints(api, origin_tracker, proxy, telemetry)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        if self.api is not None:
-            result["api"] = from_union([from_str, from_none], self.api)
-        if self.origin_tracker is not None:
-            result["origin-tracker"] = from_union([from_str, from_none], self.origin_tracker)
-        if self.proxy is not None:
-            result["proxy"] = from_union([from_str, from_none], self.proxy)
-        if self.telemetry is not None:
-            result["telemetry"] = from_union([from_str, from_none], self.telemetry)
-        return result
-
 class APIKeyAuthInfoType(Enum):
     API_KEY = "api-key"
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-class AuthInfoType(Enum):
-    """Authentication type"""
-
-    API_KEY = "api-key"
-    COPILOT_API_TOKEN = "copilot-api-token"
-    ENV = "env"
-    GH_CLI = "gh-cli"
-    HMAC = "hmac"
-    TOKEN = "token"
-    USER = "user"
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CancelUserRequestedShellCommandResult:
@@ -974,7 +1109,6 @@ class Host(Enum):
 class CopilotAPITokenAuthInfoType(Enum):
     COPILOT_API_TOKEN = "copilot-api-token"
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CopilotUserResponseQuotaSnapshotsChat:
     """Schema for the `CopilotUserResponseQuotaSnapshotsChat` type."""
@@ -1037,7 +1171,6 @@ def to_dict(self) -> dict:
             result["unlimited"] = from_union([from_bool, from_none], self.unlimited)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CopilotUserResponseQuotaSnapshotsCompletions:
     """Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type."""
@@ -1100,7 +1233,6 @@ def to_dict(self) -> dict:
             result["unlimited"] = from_union([from_bool, from_none], self.unlimited)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CopilotUserResponseQuotaSnapshotsPremiumInteractions:
     """Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type."""
@@ -3367,7 +3499,7 @@ class ModelBillingTokenPricesLongContext:
     """Long context tier pricing (available for models with extended context windows)"""
 
     cache_price: float | None = None
-    """Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens"""
+    """Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens"""
 
     cache_read_price: float | None = None
     """AI Credits cost per billing batch of cached (read) tokens"""
@@ -3376,7 +3508,7 @@ class ModelBillingTokenPricesLongContext:
     """AI Credits cost per billing batch of cache-write (cache creation) tokens."""
 
     context_max: int | None = None
-    """Deprecated: use maxPromptTokens. Prompt token budget for the long context tier. The total
+    """Use maxPromptTokens instead. Prompt token budget for the long context tier. The total
     context window is this value plus the model's max_output_tokens.
     """
     input_price: float | None = None
@@ -4957,6 +5089,27 @@ def to_dict(self) -> dict:
         result["sessionId"] = from_str(self.session_id)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ProviderAddResult:
+    """The selectable model entries synthesized for the models added by this call."""
+
+    models: list[Any]
+    """Synthesized selectable model entries for the newly added BYOK models, each under its
+    provider-qualified selection id (`provider/id`). Empty when only providers were added.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ProviderAddResult':
+        assert isinstance(obj, dict)
+        models = from_list(lambda x: x, obj.get("models"))
+        return ProviderAddResult(models)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["models"] = from_list(lambda x: x, self.models)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ProviderSessionToken:
@@ -5818,6 +5971,10 @@ class ServerSkill:
     user_invocable: bool
     """Whether the skill can be invoked by the user as a slash command"""
 
+    argument_hint: str | None = None
+    """Optional freeform hint describing the skill's expected arguments, from the
+    `argument-hint` frontmatter field
+    """
     path: str | None = None
     """Absolute path to the skill file"""
 
@@ -5832,9 +5989,10 @@ def from_dict(obj: Any) -> 'ServerSkill':
         name = from_str(obj.get("name"))
         source = SkillSource(obj.get("source"))
         user_invocable = from_bool(obj.get("userInvocable"))
+        argument_hint = from_union([from_str, from_none], obj.get("argumentHint"))
         path = from_union([from_str, from_none], obj.get("path"))
         project_path = from_union([from_str, from_none], obj.get("projectPath"))
-        return ServerSkill(description, enabled, name, source, user_invocable, path, project_path)
+        return ServerSkill(description, enabled, name, source, user_invocable, argument_hint, path, project_path)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -5843,6 +6001,8 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         result["source"] = to_enum(SkillSource, self.source)
         result["userInvocable"] = from_bool(self.user_invocable)
+        if self.argument_hint is not None:
+            result["argumentHint"] = from_union([from_str, from_none], self.argument_hint)
         if self.path is not None:
             result["path"] = from_union([from_str, from_none], self.path)
         if self.project_path is not None:
@@ -7492,6 +7652,10 @@ class Skill:
     user_invocable: bool
     """Whether the skill can be invoked by the user as a slash command"""
 
+    argument_hint: str | None = None
+    """Optional freeform hint describing the skill's expected arguments, from the
+    `argument-hint` frontmatter field
+    """
     path: str | None = None
     """Absolute path to the skill file"""
 
@@ -7506,9 +7670,10 @@ def from_dict(obj: Any) -> 'Skill':
         name = from_str(obj.get("name"))
         source = SkillSource(obj.get("source"))
         user_invocable = from_bool(obj.get("userInvocable"))
+        argument_hint = from_union([from_str, from_none], obj.get("argumentHint"))
         path = from_union([from_str, from_none], obj.get("path"))
         plugin_name = from_union([from_str, from_none], obj.get("pluginName"))
-        return Skill(description, enabled, name, source, user_invocable, path, plugin_name)
+        return Skill(description, enabled, name, source, user_invocable, argument_hint, path, plugin_name)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -7517,6 +7682,8 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         result["source"] = to_enum(SkillSource, self.source)
         result["userInvocable"] = from_bool(self.user_invocable)
+        if self.argument_hint is not None:
+            result["argumentHint"] = from_union([from_str, from_none], self.argument_hint)
         if self.path is not None:
             result["path"] = from_union([from_str, from_none], self.path)
         if self.plugin_name is not None:
@@ -8918,6 +9085,55 @@ def to_dict(self) -> dict:
         result["sizeBytes"] = from_int(self.size_bytes)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionAuthStatus:
+    """Authentication status and account metadata for the session."""
+
+    is_authenticated: bool
+    """Whether the session has resolved authentication"""
+
+    auth_type: AuthInfoType | None = None
+    """Authentication type"""
+
+    copilot_plan: str | None = None
+    """Copilot plan tier (e.g., individual_pro, business)"""
+
+    host: str | None = None
+    """Authentication host URL"""
+
+    login: str | None = None
+    """Authenticated login/username, if available"""
+
+    status_message: str | None = None
+    """Human-readable authentication status description"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionAuthStatus':
+        assert isinstance(obj, dict)
+        is_authenticated = from_bool(obj.get("isAuthenticated"))
+        auth_type = from_union([AuthInfoType, from_none], obj.get("authType"))
+        copilot_plan = from_union([from_str, from_none], obj.get("copilotPlan"))
+        host = from_union([from_str, from_none], obj.get("host"))
+        login = from_union([from_str, from_none], obj.get("login"))
+        status_message = from_union([from_str, from_none], obj.get("statusMessage"))
+        return SessionAuthStatus(is_authenticated, auth_type, copilot_plan, host, login, status_message)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["isAuthenticated"] = from_bool(self.is_authenticated)
+        if self.auth_type is not None:
+            result["authType"] = from_union([lambda x: to_enum(AuthInfoType, x), from_none], self.auth_type)
+        if self.copilot_plan is not None:
+            result["copilotPlan"] = from_union([from_str, from_none], self.copilot_plan)
+        if self.host is not None:
+            result["host"] = from_union([from_str, from_none], self.host)
+        if self.login is not None:
+            result["login"] = from_union([from_str, from_none], self.login)
+        if self.status_message is not None:
+            result["statusMessage"] = from_union([from_str, from_none], self.status_message)
+        return result
+
 @dataclass
 class AccountGetQuotaResult:
     """Quota usage snapshots for the resolved user, keyed by quota type."""
@@ -9075,55 +9291,6 @@ def to_dict(self) -> dict:
             result["field"] = from_union([lambda x: to_enum(AgentRegistrySpawnValidationErrorField, x), from_none], self.field)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class SessionAuthStatus:
-    """Authentication status and account metadata for the session."""
-
-    is_authenticated: bool
-    """Whether the session has resolved authentication"""
-
-    auth_type: AuthInfoType | None = None
-    """Authentication type"""
-
-    copilot_plan: str | None = None
-    """Copilot plan tier (e.g., individual_pro, business)"""
-
-    host: str | None = None
-    """Authentication host URL"""
-
-    login: str | None = None
-    """Authenticated login/username, if available"""
-
-    status_message: str | None = None
-    """Human-readable authentication status description"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'SessionAuthStatus':
-        assert isinstance(obj, dict)
-        is_authenticated = from_bool(obj.get("isAuthenticated"))
-        auth_type = from_union([AuthInfoType, from_none], obj.get("authType"))
-        copilot_plan = from_union([from_str, from_none], obj.get("copilotPlan"))
-        host = from_union([from_str, from_none], obj.get("host"))
-        login = from_union([from_str, from_none], obj.get("login"))
-        status_message = from_union([from_str, from_none], obj.get("statusMessage"))
-        return SessionAuthStatus(is_authenticated, auth_type, copilot_plan, host, login, status_message)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["isAuthenticated"] = from_bool(self.is_authenticated)
-        if self.auth_type is not None:
-            result["authType"] = from_union([lambda x: to_enum(AuthInfoType, x), from_none], self.auth_type)
-        if self.copilot_plan is not None:
-            result["copilotPlan"] = from_union([from_str, from_none], self.copilot_plan)
-        if self.host is not None:
-            result["host"] = from_union([from_str, from_none], self.host)
-        if self.login is not None:
-            result["login"] = from_union([from_str, from_none], self.login)
-        if self.status_message is not None:
-            result["statusMessage"] = from_union([from_str, from_none], self.status_message)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class DiscoveredCanvas:
@@ -9408,7 +9575,6 @@ def to_dict(self) -> dict:
             result["canvases"] = from_union([from_bool, from_none], self.canvases)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CopilotUserResponseQuotaSnapshots:
     """Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.
@@ -11353,7 +11519,7 @@ class ModelBillingTokenPrices:
     """Number of tokens per standard billing batch"""
 
     cache_price: float | None = None
-    """Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens"""
+    """Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens"""
 
     cache_read_price: float | None = None
     """AI Credits cost per billing batch of cached (read) tokens"""
@@ -11362,8 +11528,8 @@ class ModelBillingTokenPrices:
     """AI Credits cost per billing batch of cache-write (cache creation) tokens."""
 
     context_max: int | None = None
-    """Deprecated: use maxPromptTokens. Prompt token budget for the default tier. The total
-    context window is this value plus the model's max_output_tokens.
+    """Use maxPromptTokens instead. Prompt token budget for the default tier. The total context
+    window is this value plus the model's max_output_tokens.
     """
     input_price: float | None = None
     """AI Credits cost per billing batch of input tokens"""
@@ -15468,7 +15634,6 @@ def to_dict(self) -> dict:
             result["capabilities"] = from_union([lambda x: to_class(CanvasHostContextCapabilities, x), from_none], self.capabilities)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CopilotUserResponse:
     """Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the
@@ -17803,7 +17968,6 @@ def to_dict(self) -> dict:
             result["session"] = from_union([lambda x: to_class(CanvasSessionContext, x), from_none], self.session)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class APIKeyAuthInfo:
     """Schema for the `ApiKeyAuthInfo` type."""
@@ -17840,7 +18004,6 @@ def to_dict(self) -> dict:
             result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CopilotAPITokenAuthInfo:
     """Schema for the `CopilotApiTokenAuthInfo` type."""
@@ -17874,7 +18037,6 @@ def to_dict(self) -> dict:
             result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class EnvAuthInfo:
     """Schema for the `EnvAuthInfo` type."""
@@ -17924,7 +18086,6 @@ def to_dict(self) -> dict:
             result["login"] = from_union([from_str, from_none], self.login)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class GhCLIAuthInfo:
     """Schema for the `GhCliAuthInfo` type."""
@@ -17966,7 +18127,6 @@ def to_dict(self) -> dict:
             result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HMACAuthInfo:
     """Schema for the `HMACAuthInfo` type."""
@@ -18003,7 +18163,6 @@ def to_dict(self) -> dict:
             result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class TokenAuthInfo:
     """Schema for the `TokenAuthInfo` type."""
@@ -18040,7 +18199,6 @@ def to_dict(self) -> dict:
             result["copilotUser"] = from_union([lambda x: to_class(CopilotUserResponse, x), from_none], self.copilot_user)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class UserAuthInfo:
     """Schema for the `UserAuthInfo` type."""
@@ -18775,6 +18933,37 @@ def to_dict(self) -> dict:
         result["plugins"] = from_list(lambda x: to_class(InstalledPlugin, x), self.plugins)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ProviderAddRequest:
+    """BYOK providers and/or models to add to the session's registry at runtime. Both fields are
+    optional; provide providers, models, or both.
+    """
+    models: list[ProviderModelConfig] | None = None
+    """BYOK model definitions to register. Each must reference a provider that is already
+    registered or included in this same call. Selection ids (`provider/id`) must be unique
+    across the registry.
+    """
+    providers: list[NamedProviderConfig] | None = None
+    """Named BYOK provider connections to register, additive to any providers already in the
+    registry. Each name must be unique across the registry and must not contain '/'.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ProviderAddRequest':
+        assert isinstance(obj, dict)
+        models = from_union([lambda x: from_list(ProviderModelConfig.from_dict, x), from_none], obj.get("models"))
+        providers = from_union([lambda x: from_list(NamedProviderConfig.from_dict, x), from_none], obj.get("providers"))
+        return ProviderAddRequest(models, providers)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.models is not None:
+            result["models"] = from_union([lambda x: from_list(lambda x: to_class(ProviderModelConfig, x), x), from_none], self.models)
+        if self.providers is not None:
+            result["providers"] = from_union([lambda x: from_list(lambda x: to_class(NamedProviderConfig, x), x), from_none], self.providers)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionOpenOptions:
@@ -20560,8 +20749,15 @@ def to_dict(self) -> dict:
 class RPC:
     abort_request: AbortRequest
     abort_result: AbortResult
+    account_all_users: AccountAllUsers
+    account_get_all_users_result: list[AccountAllUsers]
+    account_get_current_auth_result: AccountGetCurrentAuthResult
     account_get_quota_request: AccountGetQuotaRequest
     account_get_quota_result: AccountGetQuotaResult
+    account_login_request: AccountLoginRequest
+    account_login_result: AccountLoginResult
+    account_logout_request: AccountLogoutRequest
+    account_logout_result: AccountLogoutResult
     account_quota_snapshot: AccountQuotaSnapshot
     agent_discovery_path: AgentDiscoveryPath
     agent_discovery_path_list: AgentDiscoveryPathList
@@ -20983,6 +21179,8 @@ class RPC:
     plugin_update_all_result: PluginUpdateAllResult
     plugin_update_result: PluginUpdateResult
     poll_spawned_sessions_result: PollSpawnedSessionsResult
+    provider_add_request: ProviderAddRequest
+    provider_add_result: ProviderAddResult
     provider_config: ProviderConfig
     provider_config_azure: ProviderConfigAzure
     provider_config_type: ProviderType
@@ -21317,8 +21515,15 @@ def from_dict(obj: Any) -> 'RPC':
         assert isinstance(obj, dict)
         abort_request = AbortRequest.from_dict(obj.get("AbortRequest"))
         abort_result = AbortResult.from_dict(obj.get("AbortResult"))
+        account_all_users = AccountAllUsers.from_dict(obj.get("AccountAllUsers"))
+        account_get_all_users_result = from_list(AccountAllUsers.from_dict, obj.get("AccountGetAllUsersResult"))
+        account_get_current_auth_result = AccountGetCurrentAuthResult.from_dict(obj.get("AccountGetCurrentAuthResult"))
         account_get_quota_request = AccountGetQuotaRequest.from_dict(obj.get("AccountGetQuotaRequest"))
         account_get_quota_result = AccountGetQuotaResult.from_dict(obj.get("AccountGetQuotaResult"))
+        account_login_request = AccountLoginRequest.from_dict(obj.get("AccountLoginRequest"))
+        account_login_result = AccountLoginResult.from_dict(obj.get("AccountLoginResult"))
+        account_logout_request = AccountLogoutRequest.from_dict(obj.get("AccountLogoutRequest"))
+        account_logout_result = AccountLogoutResult.from_dict(obj.get("AccountLogoutResult"))
         account_quota_snapshot = AccountQuotaSnapshot.from_dict(obj.get("AccountQuotaSnapshot"))
         agent_discovery_path = AgentDiscoveryPath.from_dict(obj.get("AgentDiscoveryPath"))
         agent_discovery_path_list = AgentDiscoveryPathList.from_dict(obj.get("AgentDiscoveryPathList"))
@@ -21740,6 +21945,8 @@ def from_dict(obj: Any) -> 'RPC':
         plugin_update_all_result = PluginUpdateAllResult.from_dict(obj.get("PluginUpdateAllResult"))
         plugin_update_result = PluginUpdateResult.from_dict(obj.get("PluginUpdateResult"))
         poll_spawned_sessions_result = PollSpawnedSessionsResult.from_dict(obj.get("PollSpawnedSessionsResult"))
+        provider_add_request = ProviderAddRequest.from_dict(obj.get("ProviderAddRequest"))
+        provider_add_result = ProviderAddResult.from_dict(obj.get("ProviderAddResult"))
         provider_config = ProviderConfig.from_dict(obj.get("ProviderConfig"))
         provider_config_azure = ProviderConfigAzure.from_dict(obj.get("ProviderConfigAzure"))
         provider_config_type = ProviderType(obj.get("ProviderConfigType"))
@@ -22068,14 +22275,21 @@ def from_dict(obj: Any) -> 'RPC':
         subagent_settings = from_union([SubagentSettings.from_dict, from_none], obj.get("SubagentSettings"))
         task_progress = from_union([TaskProgress.from_dict, from_none], obj.get("TaskProgress"))
         workspace_summary = from_union([WorkspaceSummary.from_dict, from_none], obj.get("WorkspaceSummary"))
-        return RPC(abort_request, abort_result, account_get_quota_request, account_get_quota_result, account_quota_snapshot, agent_discovery_path, agent_discovery_path_list, agent_discovery_path_scope, agent_get_current_result, agent_info, agent_info_source, agent_list, agent_registry_live_target_entry, agent_registry_live_target_entry_attention_kind, agent_registry_live_target_entry_kind, agent_registry_live_target_entry_last_terminal_event, agent_registry_live_target_entry_status, agent_registry_log_capture, agent_registry_log_capture_open_error_reason, agent_registry_spawn_error, agent_registry_spawn_permission_mode, agent_registry_spawn_registry_timeout, agent_registry_spawn_request, agent_registry_spawn_result, agent_registry_spawn_spawned, agent_registry_spawn_validation_error, agent_registry_spawn_validation_error_field, agent_registry_spawn_validation_error_reason, agent_reload_result, agents_discover_request, agent_select_request, agent_select_result, agents_get_discovery_paths_request, allow_all_permission_set_result, allow_all_permission_state, api_key_auth_info, auth_info, auth_info_type, cancel_user_requested_shell_command_result, canvas_action, canvas_action_invoke_request, canvas_action_invoke_result, canvas_close_request, canvas_host_context, canvas_host_context_capabilities, canvas_instance_availability, canvas_json_schema, canvas_list, canvas_list_open_result, canvas_open_request, canvas_provider_close_request, canvas_provider_invoke_action_request, canvas_provider_open_request, canvas_provider_open_result, canvas_session_context, command_list, commands_handle_pending_command_request, commands_handle_pending_command_result, commands_invoke_request, commands_list_request, commands_respond_to_queued_command_request, commands_respond_to_queued_command_result, configure_session_extensions_params, connected_remote_session_metadata, connected_remote_session_metadata_kind, connected_remote_session_metadata_repository, connect_remote_session_params, connect_request, connect_result, content_filter_mode, copilot_api_token_auth_info, copilot_user_response, copilot_user_response_endpoints, copilot_user_response_quota_snapshots, copilot_user_response_quota_snapshots_chat, copilot_user_response_quota_snapshots_completions, copilot_user_response_quota_snapshots_premium_interactions, current_model, current_tool_metadata, discovered_canvas, discovered_mcp_server, discovered_mcp_server_type, enqueue_command_params, enqueue_command_result, env_auth_info, event_log_read_request, event_log_release_interest_result, event_log_tail_result, event_log_types, events_agent_scope, events_cursor_status, events_read_result, execute_command_params, execute_command_result, extension, extension_context_push_input, extension_list, extensions_disable_request, extensions_enable_request, extension_source, extension_status, external_tool_result, external_tool_text_result_for_llm, external_tool_text_result_for_llm_binary_results_for_llm, external_tool_text_result_for_llm_binary_results_for_llm_type, external_tool_text_result_for_llm_content, external_tool_text_result_for_llm_content_audio, external_tool_text_result_for_llm_content_image, external_tool_text_result_for_llm_content_resource, external_tool_text_result_for_llm_content_resource_details, external_tool_text_result_for_llm_content_resource_link, external_tool_text_result_for_llm_content_resource_link_icon, external_tool_text_result_for_llm_content_resource_link_icon_theme, external_tool_text_result_for_llm_content_terminal, external_tool_text_result_for_llm_content_text, filter_mapping, fleet_start_request, fleet_start_result, folder_trust_add_params, folder_trust_check_params, folder_trust_check_result, gh_cli_auth_info, handle_pending_tool_call_request, handle_pending_tool_call_result, history_abort_manual_compaction_result, history_cancel_background_compaction_result, history_compact_context_window, history_compact_request, history_compact_result, history_summarize_for_handoff_result, history_truncate_request, history_truncate_result, hmac_auth_info, installed_plugin, installed_plugin_info, installed_plugin_source, installed_plugin_source_git_hub, installed_plugin_source_local, installed_plugin_source_url, instruction_discovery_path, instruction_discovery_path_kind, instruction_discovery_path_list, instruction_discovery_path_location, instructions_discover_request, instructions_get_discovery_paths_request, instructions_get_sources_result, instruction_source, instruction_source_location, instruction_source_type, llm_inference_headers, llm_inference_http_request_chunk_request, llm_inference_http_request_chunk_result, llm_inference_http_request_start_request, llm_inference_http_request_start_result, llm_inference_http_request_start_transport, llm_inference_http_response_chunk_error, llm_inference_http_response_chunk_request, llm_inference_http_response_chunk_result, llm_inference_http_response_start_request, llm_inference_http_response_start_result, llm_inference_set_provider_result, local_session_metadata_value, log_request, log_result, lsp_initialize_request, marketplace_add_result, marketplace_browse_result, marketplace_info, marketplace_list_result, marketplace_plugin_info, marketplace_refresh_entry, marketplace_refresh_result, marketplace_remove_result, mcp_allowed_server, mcp_apps_call_tool_request, mcp_apps_diagnose_capability, mcp_apps_diagnose_request, mcp_apps_diagnose_result, mcp_apps_diagnose_server, mcp_apps_host_context, mcp_apps_host_context_details, mcp_apps_host_context_details_available_display_mode, mcp_apps_host_context_details_display_mode, mcp_apps_host_context_details_platform, mcp_apps_host_context_details_theme, mcp_apps_list_tools_request, mcp_apps_list_tools_result, mcp_apps_read_resource_request, mcp_apps_read_resource_result, mcp_apps_resource_content, mcp_apps_set_host_context_details, mcp_apps_set_host_context_details_available_display_mode, mcp_apps_set_host_context_details_display_mode, mcp_apps_set_host_context_details_platform, mcp_apps_set_host_context_details_theme, mcp_apps_set_host_context_request, mcp_cancel_sampling_execution_params, mcp_cancel_sampling_execution_result, mcp_config_add_request, mcp_config_disable_request, mcp_config_enable_request, mcp_config_list, mcp_config_remove_request, mcp_config_update_request, mcp_configure_git_hub_request, mcp_configure_git_hub_result, mcp_disable_request, mcp_discover_request, mcp_discover_result, mcp_enable_request, mcp_execute_sampling_params, mcp_execute_sampling_request, mcp_execute_sampling_result, mcp_filtered_server, mcp_host_state, mcp_is_server_running_request, mcp_is_server_running_result, mcp_list_tools_request, mcp_list_tools_result, mcp_oauth_handle_pending_request, mcp_oauth_handle_pending_result, mcp_oauth_login_request, mcp_oauth_login_result, mcp_oauth_pending_request_response, mcp_oauth_respond_request, mcp_oauth_respond_result, mcp_register_external_client_request, mcp_reload_with_config_request, mcp_remove_git_hub_result, mcp_restart_server_request, mcp_sampling_execution_action, mcp_sampling_execution_result, mcp_server, mcp_server_auth_config, mcp_server_auth_config_redirect_port, mcp_server_config, mcp_server_config_defer_tools, mcp_server_config_http, mcp_server_config_http_oauth_grant_type, mcp_server_config_http_type, mcp_server_config_stdio, mcp_server_failure_info, mcp_server_list, mcp_server_needs_auth_info, mcp_set_env_value_mode_details, mcp_set_env_value_mode_params, mcp_set_env_value_mode_result, mcp_start_server_request, mcp_start_servers_result, mcp_stop_server_request, mcp_tools, mcp_unregister_external_client_request, memory_configuration, metadata_context_info_request, metadata_context_info_result, metadata_is_processing_result, metadata_recompute_context_tokens_request, metadata_recompute_context_tokens_result, metadata_record_context_change_request, metadata_record_context_change_result, metadata_set_working_directory_request, metadata_set_working_directory_result, metadata_snapshot_current_mode, metadata_snapshot_remote_metadata, metadata_snapshot_remote_metadata_repository, metadata_snapshot_remote_metadata_task_type, model, model_billing, model_billing_token_prices, model_billing_token_prices_long_context, model_capabilities, model_capabilities_limits, model_capabilities_limits_vision, model_capabilities_override, model_capabilities_override_limits, model_capabilities_override_limits_vision, model_capabilities_override_supports, model_capabilities_supports, model_list, model_list_request, model_picker_category, model_picker_price_category, model_policy, model_policy_state, model_set_reasoning_effort_request, model_set_reasoning_effort_result, models_list_request, model_switch_to_request, model_switch_to_result, mode_set_request, named_provider_config, name_get_result, name_set_auto_request, name_set_auto_result, name_set_request, open_canvas_instance, options_update_additional_content_exclusion_policy, options_update_additional_content_exclusion_policy_rule, options_update_additional_content_exclusion_policy_rule_source, options_update_additional_content_exclusion_policy_scope, options_update_context_tier, options_update_env_value_mode, options_update_reasoning_summary, options_update_tool_filter_precedence, pending_permission_request, pending_permission_request_list, permission_decision, permission_decision_approved, permission_decision_approved_for_location, permission_decision_approved_for_session, permission_decision_approve_for_location, permission_decision_approve_for_location_approval, permission_decision_approve_for_location_approval_commands, permission_decision_approve_for_location_approval_custom_tool, permission_decision_approve_for_location_approval_extension_management, permission_decision_approve_for_location_approval_extension_permission_access, permission_decision_approve_for_location_approval_mcp, permission_decision_approve_for_location_approval_mcp_sampling, permission_decision_approve_for_location_approval_memory, permission_decision_approve_for_location_approval_read, permission_decision_approve_for_location_approval_write, permission_decision_approve_for_session, permission_decision_approve_for_session_approval, permission_decision_approve_for_session_approval_commands, permission_decision_approve_for_session_approval_custom_tool, permission_decision_approve_for_session_approval_extension_management, permission_decision_approve_for_session_approval_extension_permission_access, permission_decision_approve_for_session_approval_mcp, permission_decision_approve_for_session_approval_mcp_sampling, permission_decision_approve_for_session_approval_memory, permission_decision_approve_for_session_approval_read, permission_decision_approve_for_session_approval_write, permission_decision_approve_once, permission_decision_approve_permanently, permission_decision_cancelled, permission_decision_denied_by_content_exclusion_policy, permission_decision_denied_by_permission_request_hook, permission_decision_denied_by_rules, permission_decision_denied_interactively_by_user, permission_decision_denied_no_approval_rule_and_could_not_request_from_user, permission_decision_reject, permission_decision_request, permission_decision_user_not_available, permission_location_add_tool_approval_params, permission_location_apply_params, permission_location_apply_result, permission_location_resolve_params, permission_location_resolve_result, permission_location_type, permission_paths_add_params, permission_paths_allowed_check_params, permission_paths_allowed_check_result, permission_paths_config, permission_paths_list, permission_paths_update_primary_params, permission_paths_workspace_check_params, permission_paths_workspace_check_result, permission_prompt_shown_notification, permission_request_result, permission_rules_set, permissions_configure_additional_content_exclusion_policy, permissions_configure_additional_content_exclusion_policy_rule, permissions_configure_additional_content_exclusion_policy_rule_source, permissions_configure_additional_content_exclusion_policy_scope, permissions_configure_params, permissions_configure_result, permissions_folder_trust_add_trusted_result, permissions_get_allow_all_request, permissions_locations_add_tool_approval_details, permissions_locations_add_tool_approval_details_commands, permissions_locations_add_tool_approval_details_custom_tool, permissions_locations_add_tool_approval_details_extension_management, permissions_locations_add_tool_approval_details_extension_permission_access, permissions_locations_add_tool_approval_details_mcp, permissions_locations_add_tool_approval_details_mcp_sampling, permissions_locations_add_tool_approval_details_memory, permissions_locations_add_tool_approval_details_read, permissions_locations_add_tool_approval_details_write, permissions_locations_add_tool_approval_result, permissions_modify_rules_params, permissions_modify_rules_result, permissions_modify_rules_scope, permissions_notify_prompt_shown_result, permissions_paths_add_result, permissions_paths_list_request, permissions_paths_update_primary_result, permissions_pending_requests_request, permissions_reset_session_approvals_request, permissions_reset_session_approvals_result, permissions_set_allow_all_request, permissions_set_allow_all_source, permissions_set_approve_all_request, permissions_set_approve_all_result, permissions_set_approve_all_source, permissions_set_required_request, permissions_set_required_result, permissions_urls_set_unrestricted_mode_result, permission_urls_config, permission_urls_set_unrestricted_mode_params, ping_request, ping_result, plan_read_result, plan_read_sql_todos_result, plan_read_sql_todos_with_dependencies_result, plan_sql_todo_dependency, plan_sql_todos_row, plan_update_request, plugin, plugin_install_result, plugin_list, plugin_list_result, plugins_disable_request, plugins_enable_request, plugins_install_request, plugins_marketplaces_add_request, plugins_marketplaces_browse_request, plugins_marketplaces_refresh_request, plugins_marketplaces_remove_request, plugins_reload_request, plugins_uninstall_request, plugins_update_request, plugin_update_all_entry, plugin_update_all_result, plugin_update_result, poll_spawned_sessions_result, provider_config, provider_config_azure, provider_config_type, provider_config_wire_api, provider_endpoint, provider_endpoint_type, provider_endpoint_wire_api, provider_get_endpoint_request, provider_model_config, provider_session_token, push_attachment, push_attachment_blob, push_attachment_directory, push_attachment_file, push_attachment_file_line_range, push_attachment_git_hub_reference, push_attachment_git_hub_reference_type, push_attachment_selection, push_attachment_selection_details, push_attachment_selection_details_end, push_attachment_selection_details_start, queued_command_handled, queued_command_not_handled, queued_command_result, queue_pending_items, queue_pending_items_kind, queue_pending_items_result, queue_remove_most_recent_result, register_event_interest_params, register_event_interest_result, register_extension_tools_params, register_extension_tools_result, release_event_interest_params, remote_control_config, remote_control_config_existing_mc_session, remote_control_status, remote_control_status_active, remote_control_status_connecting, remote_control_status_error, remote_control_status_off, remote_control_status_result, remote_control_stop_result, remote_control_transfer_result, remote_enable_request, remote_enable_result, remote_notify_steerable_changed_request, remote_notify_steerable_changed_result, remote_session_connection_result, remote_session_metadata_repository, remote_session_metadata_task_type, remote_session_metadata_value, remote_session_mode, remote_session_repository, sandbox_config, sandbox_config_user_policy, sandbox_config_user_policy_experimental, sandbox_config_user_policy_experimental_seatbelt, sandbox_config_user_policy_filesystem, sandbox_config_user_policy_network, schedule_entry, schedule_list, schedule_stop_request, schedule_stop_result, secrets_add_filter_values_request, secrets_add_filter_values_result, send_agent_mode, send_attachments_to_message_params, send_mode, send_request, send_result, server_agent_list, server_instruction_source_list, server_skill, server_skill_list, session_activity, session_auth_status, session_bulk_delete_result, session_capability, session_context, session_context_host_type, session_enrich_metadata_result, session_fs_append_file_request, session_fs_error, session_fs_error_code, session_fs_exists_request, session_fs_exists_result, session_fs_mkdir_request, session_fs_readdir_request, session_fs_readdir_result, session_fs_readdir_with_types_entry, session_fs_readdir_with_types_entry_type, session_fs_readdir_with_types_request, session_fs_readdir_with_types_result, session_fs_read_file_request, session_fs_read_file_result, session_fs_rename_request, session_fs_rm_request, session_fs_set_provider_capabilities, session_fs_set_provider_conventions, session_fs_set_provider_request, session_fs_set_provider_result, session_fs_sqlite_exists_request, session_fs_sqlite_exists_result, session_fs_sqlite_query_request, session_fs_sqlite_query_result, session_fs_sqlite_query_type, session_fs_stat_request, session_fs_stat_result, session_fs_write_file_request, session_installed_plugin, session_installed_plugin_source, session_installed_plugin_source_git_hub, session_installed_plugin_source_local, session_installed_plugin_source_url, session_list, session_list_entry, session_list_filter, session_load_deferred_repo_hooks_result, session_log_level, session_mcp_apps_call_tool_result, session_metadata_snapshot, session_mode, session_model_list, session_open_options, session_open_options_additional_content_exclusion_policy, session_open_options_additional_content_exclusion_policy_rule, session_open_options_additional_content_exclusion_policy_rule_source, session_open_options_additional_content_exclusion_policy_scope, session_open_options_env_value_mode, session_open_options_reasoning_summary, session_open_params, session_open_result, session_prune_result, sessions_bulk_delete_request, sessions_check_in_use_request, sessions_check_in_use_result, sessions_close_request, sessions_close_result, sessions_enrich_metadata_request, session_set_credentials_params, session_set_credentials_result, sessions_find_by_prefix_request, sessions_find_by_prefix_result, sessions_find_by_task_id_request, sessions_find_by_task_id_result, sessions_fork_request, sessions_fork_result, sessions_get_board_entry_count_request, sessions_get_board_entry_count_result, sessions_get_event_file_path_request, sessions_get_event_file_path_result, sessions_get_last_for_context_request, sessions_get_last_for_context_result, sessions_get_persisted_remote_steerable_request, sessions_get_persisted_remote_steerable_result, session_sizes, sessions_list_request, sessions_load_deferred_repo_hooks_request, sessions_open_attach, sessions_open_cloud, sessions_open_create, sessions_open_handoff, sessions_open_handoff_task_type, sessions_open_progress, sessions_open_progress_status, sessions_open_progress_step, sessions_open_remote, sessions_open_resume, sessions_open_resume_last, sessions_open_status, session_source, sessions_poll_spawned_sessions_event, sessions_poll_spawned_sessions_request, sessions_prune_old_request, sessions_register_extension_tools_on_session_options, sessions_release_lock_request, sessions_release_lock_result, sessions_reload_plugin_hooks_request, sessions_reload_plugin_hooks_result, sessions_save_request, sessions_save_result, sessions_set_additional_plugins_request, sessions_set_additional_plugins_result, sessions_set_remote_control_steering_request, sessions_start_remote_control_request, sessions_stop_remote_control_request, sessions_transfer_remote_control_request, session_telemetry_engagement, session_update_options_params, session_update_options_result, session_working_directory_context, session_working_directory_context_host_type, shell_cancel_user_requested_request, shell_exec_request, shell_exec_result, shell_execute_user_requested_request, shell_kill_request, shell_kill_result, shell_kill_signal, shutdown_request, skill, skill_discovery_path, skill_discovery_path_list, skill_discovery_scope, skill_list, skills_config_set_disabled_skills_request, skills_disable_request, skills_discover_request, skills_enable_request, skills_get_discovery_paths_request, skills_get_invoked_result, skills_invoked_skill, skills_load_diagnostics, slash_command_agent_prompt_result, slash_command_completed_result, slash_command_info, slash_command_input, slash_command_input_completion, slash_command_invocation_result, slash_command_kind, slash_command_select_subcommand_option, slash_command_select_subcommand_result, slash_command_text_result, subagent_settings_entry, subagent_settings_entry_context_tier, task_agent_info, task_agent_progress, task_execution_mode, task_info, task_list, task_progress_line, tasks_cancel_request, tasks_cancel_result, tasks_get_current_promotable_result, tasks_get_progress_request, tasks_get_progress_result, task_shell_info, task_shell_info_attachment_mode, task_shell_progress, tasks_promote_current_to_background_result, tasks_promote_to_background_request, tasks_promote_to_background_result, tasks_refresh_result, tasks_remove_request, tasks_remove_result, tasks_send_message_request, tasks_send_message_result, tasks_start_agent_request, tasks_start_agent_result, task_status, tasks_wait_for_pending_result, telemetry_set_feature_overrides_request, token_auth_info, tool, tool_list, tools_get_current_metadata_result, tools_initialize_and_validate_result, tools_list_request, tools_update_subagent_settings_result, ui_auto_mode_switch_response, ui_elicitation_array_any_of_field, ui_elicitation_array_any_of_field_items, ui_elicitation_array_any_of_field_items_any_of, ui_elicitation_array_enum_field, ui_elicitation_array_enum_field_items, ui_elicitation_field_value, ui_elicitation_request, ui_elicitation_response, ui_elicitation_response_action, ui_elicitation_response_content, ui_elicitation_result, ui_elicitation_schema, ui_elicitation_schema_property, ui_elicitation_schema_property_boolean, ui_elicitation_schema_property_number, ui_elicitation_schema_property_number_type, ui_elicitation_schema_property_string, ui_elicitation_schema_property_string_format, ui_elicitation_string_enum_field, ui_elicitation_string_one_of_field, ui_elicitation_string_one_of_field_one_of, ui_ephemeral_query_request, ui_ephemeral_query_result, ui_exit_plan_mode_action, ui_exit_plan_mode_response, ui_handle_pending_auto_mode_switch_request, ui_handle_pending_elicitation_request, ui_handle_pending_exit_plan_mode_request, ui_handle_pending_result, ui_handle_pending_sampling_request, ui_handle_pending_sampling_response, ui_handle_pending_user_input_request, ui_register_direct_auto_mode_switch_handler_result, ui_unregister_direct_auto_mode_switch_handler_request, ui_unregister_direct_auto_mode_switch_handler_result, ui_user_input_response, update_subagent_settings_request, usage_get_metrics_result, usage_metrics_code_changes, usage_metrics_model_metric, usage_metrics_model_metric_requests, usage_metrics_model_metric_token_detail, usage_metrics_model_metric_usage, usage_metrics_token_detail, user_auth_info, user_requested_shell_command_result, workspace_diff_file_change, workspace_diff_file_change_type, workspace_diff_mode, workspace_diff_result, workspaces_checkpoints, workspaces_create_file_request, workspaces_diff_request, workspaces_get_workspace_result, workspaces_list_checkpoints_result, workspaces_list_files_result, workspaces_read_checkpoint_request, workspaces_read_checkpoint_result, workspaces_read_file_request, workspaces_read_file_result, workspaces_save_large_paste_request, workspaces_save_large_paste_result, workspace_summary_host_type, workspaces_workspace_details_host_type, session_context_info, subagent_settings, task_progress, workspace_summary)
+        return RPC(abort_request, abort_result, account_all_users, account_get_all_users_result, account_get_current_auth_result, account_get_quota_request, account_get_quota_result, account_login_request, account_login_result, account_logout_request, account_logout_result, account_quota_snapshot, agent_discovery_path, agent_discovery_path_list, agent_discovery_path_scope, agent_get_current_result, agent_info, agent_info_source, agent_list, agent_registry_live_target_entry, agent_registry_live_target_entry_attention_kind, agent_registry_live_target_entry_kind, agent_registry_live_target_entry_last_terminal_event, agent_registry_live_target_entry_status, agent_registry_log_capture, agent_registry_log_capture_open_error_reason, agent_registry_spawn_error, agent_registry_spawn_permission_mode, agent_registry_spawn_registry_timeout, agent_registry_spawn_request, agent_registry_spawn_result, agent_registry_spawn_spawned, agent_registry_spawn_validation_error, agent_registry_spawn_validation_error_field, agent_registry_spawn_validation_error_reason, agent_reload_result, agents_discover_request, agent_select_request, agent_select_result, agents_get_discovery_paths_request, allow_all_permission_set_result, allow_all_permission_state, api_key_auth_info, auth_info, auth_info_type, cancel_user_requested_shell_command_result, canvas_action, canvas_action_invoke_request, canvas_action_invoke_result, canvas_close_request, canvas_host_context, canvas_host_context_capabilities, canvas_instance_availability, canvas_json_schema, canvas_list, canvas_list_open_result, canvas_open_request, canvas_provider_close_request, canvas_provider_invoke_action_request, canvas_provider_open_request, canvas_provider_open_result, canvas_session_context, command_list, commands_handle_pending_command_request, commands_handle_pending_command_result, commands_invoke_request, commands_list_request, commands_respond_to_queued_command_request, commands_respond_to_queued_command_result, configure_session_extensions_params, connected_remote_session_metadata, connected_remote_session_metadata_kind, connected_remote_session_metadata_repository, connect_remote_session_params, connect_request, connect_result, content_filter_mode, copilot_api_token_auth_info, copilot_user_response, copilot_user_response_endpoints, copilot_user_response_quota_snapshots, copilot_user_response_quota_snapshots_chat, copilot_user_response_quota_snapshots_completions, copilot_user_response_quota_snapshots_premium_interactions, current_model, current_tool_metadata, discovered_canvas, discovered_mcp_server, discovered_mcp_server_type, enqueue_command_params, enqueue_command_result, env_auth_info, event_log_read_request, event_log_release_interest_result, event_log_tail_result, event_log_types, events_agent_scope, events_cursor_status, events_read_result, execute_command_params, execute_command_result, extension, extension_context_push_input, extension_list, extensions_disable_request, extensions_enable_request, extension_source, extension_status, external_tool_result, external_tool_text_result_for_llm, external_tool_text_result_for_llm_binary_results_for_llm, external_tool_text_result_for_llm_binary_results_for_llm_type, external_tool_text_result_for_llm_content, external_tool_text_result_for_llm_content_audio, external_tool_text_result_for_llm_content_image, external_tool_text_result_for_llm_content_resource, external_tool_text_result_for_llm_content_resource_details, external_tool_text_result_for_llm_content_resource_link, external_tool_text_result_for_llm_content_resource_link_icon, external_tool_text_result_for_llm_content_resource_link_icon_theme, external_tool_text_result_for_llm_content_terminal, external_tool_text_result_for_llm_content_text, filter_mapping, fleet_start_request, fleet_start_result, folder_trust_add_params, folder_trust_check_params, folder_trust_check_result, gh_cli_auth_info, handle_pending_tool_call_request, handle_pending_tool_call_result, history_abort_manual_compaction_result, history_cancel_background_compaction_result, history_compact_context_window, history_compact_request, history_compact_result, history_summarize_for_handoff_result, history_truncate_request, history_truncate_result, hmac_auth_info, installed_plugin, installed_plugin_info, installed_plugin_source, installed_plugin_source_git_hub, installed_plugin_source_local, installed_plugin_source_url, instruction_discovery_path, instruction_discovery_path_kind, instruction_discovery_path_list, instruction_discovery_path_location, instructions_discover_request, instructions_get_discovery_paths_request, instructions_get_sources_result, instruction_source, instruction_source_location, instruction_source_type, llm_inference_headers, llm_inference_http_request_chunk_request, llm_inference_http_request_chunk_result, llm_inference_http_request_start_request, llm_inference_http_request_start_result, llm_inference_http_request_start_transport, llm_inference_http_response_chunk_error, llm_inference_http_response_chunk_request, llm_inference_http_response_chunk_result, llm_inference_http_response_start_request, llm_inference_http_response_start_result, llm_inference_set_provider_result, local_session_metadata_value, log_request, log_result, lsp_initialize_request, marketplace_add_result, marketplace_browse_result, marketplace_info, marketplace_list_result, marketplace_plugin_info, marketplace_refresh_entry, marketplace_refresh_result, marketplace_remove_result, mcp_allowed_server, mcp_apps_call_tool_request, mcp_apps_diagnose_capability, mcp_apps_diagnose_request, mcp_apps_diagnose_result, mcp_apps_diagnose_server, mcp_apps_host_context, mcp_apps_host_context_details, mcp_apps_host_context_details_available_display_mode, mcp_apps_host_context_details_display_mode, mcp_apps_host_context_details_platform, mcp_apps_host_context_details_theme, mcp_apps_list_tools_request, mcp_apps_list_tools_result, mcp_apps_read_resource_request, mcp_apps_read_resource_result, mcp_apps_resource_content, mcp_apps_set_host_context_details, mcp_apps_set_host_context_details_available_display_mode, mcp_apps_set_host_context_details_display_mode, mcp_apps_set_host_context_details_platform, mcp_apps_set_host_context_details_theme, mcp_apps_set_host_context_request, mcp_cancel_sampling_execution_params, mcp_cancel_sampling_execution_result, mcp_config_add_request, mcp_config_disable_request, mcp_config_enable_request, mcp_config_list, mcp_config_remove_request, mcp_config_update_request, mcp_configure_git_hub_request, mcp_configure_git_hub_result, mcp_disable_request, mcp_discover_request, mcp_discover_result, mcp_enable_request, mcp_execute_sampling_params, mcp_execute_sampling_request, mcp_execute_sampling_result, mcp_filtered_server, mcp_host_state, mcp_is_server_running_request, mcp_is_server_running_result, mcp_list_tools_request, mcp_list_tools_result, mcp_oauth_handle_pending_request, mcp_oauth_handle_pending_result, mcp_oauth_login_request, mcp_oauth_login_result, mcp_oauth_pending_request_response, mcp_oauth_respond_request, mcp_oauth_respond_result, mcp_register_external_client_request, mcp_reload_with_config_request, mcp_remove_git_hub_result, mcp_restart_server_request, mcp_sampling_execution_action, mcp_sampling_execution_result, mcp_server, mcp_server_auth_config, mcp_server_auth_config_redirect_port, mcp_server_config, mcp_server_config_defer_tools, mcp_server_config_http, mcp_server_config_http_oauth_grant_type, mcp_server_config_http_type, mcp_server_config_stdio, mcp_server_failure_info, mcp_server_list, mcp_server_needs_auth_info, mcp_set_env_value_mode_details, mcp_set_env_value_mode_params, mcp_set_env_value_mode_result, mcp_start_server_request, mcp_start_servers_result, mcp_stop_server_request, mcp_tools, mcp_unregister_external_client_request, memory_configuration, metadata_context_info_request, metadata_context_info_result, metadata_is_processing_result, metadata_recompute_context_tokens_request, metadata_recompute_context_tokens_result, metadata_record_context_change_request, metadata_record_context_change_result, metadata_set_working_directory_request, metadata_set_working_directory_result, metadata_snapshot_current_mode, metadata_snapshot_remote_metadata, metadata_snapshot_remote_metadata_repository, metadata_snapshot_remote_metadata_task_type, model, model_billing, model_billing_token_prices, model_billing_token_prices_long_context, model_capabilities, model_capabilities_limits, model_capabilities_limits_vision, model_capabilities_override, model_capabilities_override_limits, model_capabilities_override_limits_vision, model_capabilities_override_supports, model_capabilities_supports, model_list, model_list_request, model_picker_category, model_picker_price_category, model_policy, model_policy_state, model_set_reasoning_effort_request, model_set_reasoning_effort_result, models_list_request, model_switch_to_request, model_switch_to_result, mode_set_request, named_provider_config, name_get_result, name_set_auto_request, name_set_auto_result, name_set_request, open_canvas_instance, options_update_additional_content_exclusion_policy, options_update_additional_content_exclusion_policy_rule, options_update_additional_content_exclusion_policy_rule_source, options_update_additional_content_exclusion_policy_scope, options_update_context_tier, options_update_env_value_mode, options_update_reasoning_summary, options_update_tool_filter_precedence, pending_permission_request, pending_permission_request_list, permission_decision, permission_decision_approved, permission_decision_approved_for_location, permission_decision_approved_for_session, permission_decision_approve_for_location, permission_decision_approve_for_location_approval, permission_decision_approve_for_location_approval_commands, permission_decision_approve_for_location_approval_custom_tool, permission_decision_approve_for_location_approval_extension_management, permission_decision_approve_for_location_approval_extension_permission_access, permission_decision_approve_for_location_approval_mcp, permission_decision_approve_for_location_approval_mcp_sampling, permission_decision_approve_for_location_approval_memory, permission_decision_approve_for_location_approval_read, permission_decision_approve_for_location_approval_write, permission_decision_approve_for_session, permission_decision_approve_for_session_approval, permission_decision_approve_for_session_approval_commands, permission_decision_approve_for_session_approval_custom_tool, permission_decision_approve_for_session_approval_extension_management, permission_decision_approve_for_session_approval_extension_permission_access, permission_decision_approve_for_session_approval_mcp, permission_decision_approve_for_session_approval_mcp_sampling, permission_decision_approve_for_session_approval_memory, permission_decision_approve_for_session_approval_read, permission_decision_approve_for_session_approval_write, permission_decision_approve_once, permission_decision_approve_permanently, permission_decision_cancelled, permission_decision_denied_by_content_exclusion_policy, permission_decision_denied_by_permission_request_hook, permission_decision_denied_by_rules, permission_decision_denied_interactively_by_user, permission_decision_denied_no_approval_rule_and_could_not_request_from_user, permission_decision_reject, permission_decision_request, permission_decision_user_not_available, permission_location_add_tool_approval_params, permission_location_apply_params, permission_location_apply_result, permission_location_resolve_params, permission_location_resolve_result, permission_location_type, permission_paths_add_params, permission_paths_allowed_check_params, permission_paths_allowed_check_result, permission_paths_config, permission_paths_list, permission_paths_update_primary_params, permission_paths_workspace_check_params, permission_paths_workspace_check_result, permission_prompt_shown_notification, permission_request_result, permission_rules_set, permissions_configure_additional_content_exclusion_policy, permissions_configure_additional_content_exclusion_policy_rule, permissions_configure_additional_content_exclusion_policy_rule_source, permissions_configure_additional_content_exclusion_policy_scope, permissions_configure_params, permissions_configure_result, permissions_folder_trust_add_trusted_result, permissions_get_allow_all_request, permissions_locations_add_tool_approval_details, permissions_locations_add_tool_approval_details_commands, permissions_locations_add_tool_approval_details_custom_tool, permissions_locations_add_tool_approval_details_extension_management, permissions_locations_add_tool_approval_details_extension_permission_access, permissions_locations_add_tool_approval_details_mcp, permissions_locations_add_tool_approval_details_mcp_sampling, permissions_locations_add_tool_approval_details_memory, permissions_locations_add_tool_approval_details_read, permissions_locations_add_tool_approval_details_write, permissions_locations_add_tool_approval_result, permissions_modify_rules_params, permissions_modify_rules_result, permissions_modify_rules_scope, permissions_notify_prompt_shown_result, permissions_paths_add_result, permissions_paths_list_request, permissions_paths_update_primary_result, permissions_pending_requests_request, permissions_reset_session_approvals_request, permissions_reset_session_approvals_result, permissions_set_allow_all_request, permissions_set_allow_all_source, permissions_set_approve_all_request, permissions_set_approve_all_result, permissions_set_approve_all_source, permissions_set_required_request, permissions_set_required_result, permissions_urls_set_unrestricted_mode_result, permission_urls_config, permission_urls_set_unrestricted_mode_params, ping_request, ping_result, plan_read_result, plan_read_sql_todos_result, plan_read_sql_todos_with_dependencies_result, plan_sql_todo_dependency, plan_sql_todos_row, plan_update_request, plugin, plugin_install_result, plugin_list, plugin_list_result, plugins_disable_request, plugins_enable_request, plugins_install_request, plugins_marketplaces_add_request, plugins_marketplaces_browse_request, plugins_marketplaces_refresh_request, plugins_marketplaces_remove_request, plugins_reload_request, plugins_uninstall_request, plugins_update_request, plugin_update_all_entry, plugin_update_all_result, plugin_update_result, poll_spawned_sessions_result, provider_add_request, provider_add_result, provider_config, provider_config_azure, provider_config_type, provider_config_wire_api, provider_endpoint, provider_endpoint_type, provider_endpoint_wire_api, provider_get_endpoint_request, provider_model_config, provider_session_token, push_attachment, push_attachment_blob, push_attachment_directory, push_attachment_file, push_attachment_file_line_range, push_attachment_git_hub_reference, push_attachment_git_hub_reference_type, push_attachment_selection, push_attachment_selection_details, push_attachment_selection_details_end, push_attachment_selection_details_start, queued_command_handled, queued_command_not_handled, queued_command_result, queue_pending_items, queue_pending_items_kind, queue_pending_items_result, queue_remove_most_recent_result, register_event_interest_params, register_event_interest_result, register_extension_tools_params, register_extension_tools_result, release_event_interest_params, remote_control_config, remote_control_config_existing_mc_session, remote_control_status, remote_control_status_active, remote_control_status_connecting, remote_control_status_error, remote_control_status_off, remote_control_status_result, remote_control_stop_result, remote_control_transfer_result, remote_enable_request, remote_enable_result, remote_notify_steerable_changed_request, remote_notify_steerable_changed_result, remote_session_connection_result, remote_session_metadata_repository, remote_session_metadata_task_type, remote_session_metadata_value, remote_session_mode, remote_session_repository, sandbox_config, sandbox_config_user_policy, sandbox_config_user_policy_experimental, sandbox_config_user_policy_experimental_seatbelt, sandbox_config_user_policy_filesystem, sandbox_config_user_policy_network, schedule_entry, schedule_list, schedule_stop_request, schedule_stop_result, secrets_add_filter_values_request, secrets_add_filter_values_result, send_agent_mode, send_attachments_to_message_params, send_mode, send_request, send_result, server_agent_list, server_instruction_source_list, server_skill, server_skill_list, session_activity, session_auth_status, session_bulk_delete_result, session_capability, session_context, session_context_host_type, session_enrich_metadata_result, session_fs_append_file_request, session_fs_error, session_fs_error_code, session_fs_exists_request, session_fs_exists_result, session_fs_mkdir_request, session_fs_readdir_request, session_fs_readdir_result, session_fs_readdir_with_types_entry, session_fs_readdir_with_types_entry_type, session_fs_readdir_with_types_request, session_fs_readdir_with_types_result, session_fs_read_file_request, session_fs_read_file_result, session_fs_rename_request, session_fs_rm_request, session_fs_set_provider_capabilities, session_fs_set_provider_conventions, session_fs_set_provider_request, session_fs_set_provider_result, session_fs_sqlite_exists_request, session_fs_sqlite_exists_result, session_fs_sqlite_query_request, session_fs_sqlite_query_result, session_fs_sqlite_query_type, session_fs_stat_request, session_fs_stat_result, session_fs_write_file_request, session_installed_plugin, session_installed_plugin_source, session_installed_plugin_source_git_hub, session_installed_plugin_source_local, session_installed_plugin_source_url, session_list, session_list_entry, session_list_filter, session_load_deferred_repo_hooks_result, session_log_level, session_mcp_apps_call_tool_result, session_metadata_snapshot, session_mode, session_model_list, session_open_options, session_open_options_additional_content_exclusion_policy, session_open_options_additional_content_exclusion_policy_rule, session_open_options_additional_content_exclusion_policy_rule_source, session_open_options_additional_content_exclusion_policy_scope, session_open_options_env_value_mode, session_open_options_reasoning_summary, session_open_params, session_open_result, session_prune_result, sessions_bulk_delete_request, sessions_check_in_use_request, sessions_check_in_use_result, sessions_close_request, sessions_close_result, sessions_enrich_metadata_request, session_set_credentials_params, session_set_credentials_result, sessions_find_by_prefix_request, sessions_find_by_prefix_result, sessions_find_by_task_id_request, sessions_find_by_task_id_result, sessions_fork_request, sessions_fork_result, sessions_get_board_entry_count_request, sessions_get_board_entry_count_result, sessions_get_event_file_path_request, sessions_get_event_file_path_result, sessions_get_last_for_context_request, sessions_get_last_for_context_result, sessions_get_persisted_remote_steerable_request, sessions_get_persisted_remote_steerable_result, session_sizes, sessions_list_request, sessions_load_deferred_repo_hooks_request, sessions_open_attach, sessions_open_cloud, sessions_open_create, sessions_open_handoff, sessions_open_handoff_task_type, sessions_open_progress, sessions_open_progress_status, sessions_open_progress_step, sessions_open_remote, sessions_open_resume, sessions_open_resume_last, sessions_open_status, session_source, sessions_poll_spawned_sessions_event, sessions_poll_spawned_sessions_request, sessions_prune_old_request, sessions_register_extension_tools_on_session_options, sessions_release_lock_request, sessions_release_lock_result, sessions_reload_plugin_hooks_request, sessions_reload_plugin_hooks_result, sessions_save_request, sessions_save_result, sessions_set_additional_plugins_request, sessions_set_additional_plugins_result, sessions_set_remote_control_steering_request, sessions_start_remote_control_request, sessions_stop_remote_control_request, sessions_transfer_remote_control_request, session_telemetry_engagement, session_update_options_params, session_update_options_result, session_working_directory_context, session_working_directory_context_host_type, shell_cancel_user_requested_request, shell_exec_request, shell_exec_result, shell_execute_user_requested_request, shell_kill_request, shell_kill_result, shell_kill_signal, shutdown_request, skill, skill_discovery_path, skill_discovery_path_list, skill_discovery_scope, skill_list, skills_config_set_disabled_skills_request, skills_disable_request, skills_discover_request, skills_enable_request, skills_get_discovery_paths_request, skills_get_invoked_result, skills_invoked_skill, skills_load_diagnostics, slash_command_agent_prompt_result, slash_command_completed_result, slash_command_info, slash_command_input, slash_command_input_completion, slash_command_invocation_result, slash_command_kind, slash_command_select_subcommand_option, slash_command_select_subcommand_result, slash_command_text_result, subagent_settings_entry, subagent_settings_entry_context_tier, task_agent_info, task_agent_progress, task_execution_mode, task_info, task_list, task_progress_line, tasks_cancel_request, tasks_cancel_result, tasks_get_current_promotable_result, tasks_get_progress_request, tasks_get_progress_result, task_shell_info, task_shell_info_attachment_mode, task_shell_progress, tasks_promote_current_to_background_result, tasks_promote_to_background_request, tasks_promote_to_background_result, tasks_refresh_result, tasks_remove_request, tasks_remove_result, tasks_send_message_request, tasks_send_message_result, tasks_start_agent_request, tasks_start_agent_result, task_status, tasks_wait_for_pending_result, telemetry_set_feature_overrides_request, token_auth_info, tool, tool_list, tools_get_current_metadata_result, tools_initialize_and_validate_result, tools_list_request, tools_update_subagent_settings_result, ui_auto_mode_switch_response, ui_elicitation_array_any_of_field, ui_elicitation_array_any_of_field_items, ui_elicitation_array_any_of_field_items_any_of, ui_elicitation_array_enum_field, ui_elicitation_array_enum_field_items, ui_elicitation_field_value, ui_elicitation_request, ui_elicitation_response, ui_elicitation_response_action, ui_elicitation_response_content, ui_elicitation_result, ui_elicitation_schema, ui_elicitation_schema_property, ui_elicitation_schema_property_boolean, ui_elicitation_schema_property_number, ui_elicitation_schema_property_number_type, ui_elicitation_schema_property_string, ui_elicitation_schema_property_string_format, ui_elicitation_string_enum_field, ui_elicitation_string_one_of_field, ui_elicitation_string_one_of_field_one_of, ui_ephemeral_query_request, ui_ephemeral_query_result, ui_exit_plan_mode_action, ui_exit_plan_mode_response, ui_handle_pending_auto_mode_switch_request, ui_handle_pending_elicitation_request, ui_handle_pending_exit_plan_mode_request, ui_handle_pending_result, ui_handle_pending_sampling_request, ui_handle_pending_sampling_response, ui_handle_pending_user_input_request, ui_register_direct_auto_mode_switch_handler_result, ui_unregister_direct_auto_mode_switch_handler_request, ui_unregister_direct_auto_mode_switch_handler_result, ui_user_input_response, update_subagent_settings_request, usage_get_metrics_result, usage_metrics_code_changes, usage_metrics_model_metric, usage_metrics_model_metric_requests, usage_metrics_model_metric_token_detail, usage_metrics_model_metric_usage, usage_metrics_token_detail, user_auth_info, user_requested_shell_command_result, workspace_diff_file_change, workspace_diff_file_change_type, workspace_diff_mode, workspace_diff_result, workspaces_checkpoints, workspaces_create_file_request, workspaces_diff_request, workspaces_get_workspace_result, workspaces_list_checkpoints_result, workspaces_list_files_result, workspaces_read_checkpoint_request, workspaces_read_checkpoint_result, workspaces_read_file_request, workspaces_read_file_result, workspaces_save_large_paste_request, workspaces_save_large_paste_result, workspace_summary_host_type, workspaces_workspace_details_host_type, session_context_info, subagent_settings, task_progress, workspace_summary)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["AbortRequest"] = to_class(AbortRequest, self.abort_request)
         result["AbortResult"] = to_class(AbortResult, self.abort_result)
+        result["AccountAllUsers"] = to_class(AccountAllUsers, self.account_all_users)
+        result["AccountGetAllUsersResult"] = from_list(lambda x: to_class(AccountAllUsers, x), self.account_get_all_users_result)
+        result["AccountGetCurrentAuthResult"] = to_class(AccountGetCurrentAuthResult, self.account_get_current_auth_result)
         result["AccountGetQuotaRequest"] = to_class(AccountGetQuotaRequest, self.account_get_quota_request)
         result["AccountGetQuotaResult"] = to_class(AccountGetQuotaResult, self.account_get_quota_result)
+        result["AccountLoginRequest"] = to_class(AccountLoginRequest, self.account_login_request)
+        result["AccountLoginResult"] = to_class(AccountLoginResult, self.account_login_result)
+        result["AccountLogoutRequest"] = to_class(AccountLogoutRequest, self.account_logout_request)
+        result["AccountLogoutResult"] = to_class(AccountLogoutResult, self.account_logout_result)
         result["AccountQuotaSnapshot"] = to_class(AccountQuotaSnapshot, self.account_quota_snapshot)
         result["AgentDiscoveryPath"] = to_class(AgentDiscoveryPath, self.agent_discovery_path)
         result["AgentDiscoveryPathList"] = to_class(AgentDiscoveryPathList, self.agent_discovery_path_list)
@@ -22497,6 +22711,8 @@ def to_dict(self) -> dict:
         result["PluginUpdateAllResult"] = to_class(PluginUpdateAllResult, self.plugin_update_all_result)
         result["PluginUpdateResult"] = to_class(PluginUpdateResult, self.plugin_update_result)
         result["PollSpawnedSessionsResult"] = to_class(PollSpawnedSessionsResult, self.poll_spawned_sessions_result)
+        result["ProviderAddRequest"] = to_class(ProviderAddRequest, self.provider_add_request)
+        result["ProviderAddResult"] = to_class(ProviderAddResult, self.provider_add_result)
         result["ProviderConfig"] = to_class(ProviderConfig, self.provider_config)
         result["ProviderConfigAzure"] = to_class(ProviderConfigAzure, self.provider_config_azure)
         result["ProviderConfigType"] = to_enum(ProviderType, self.provider_config_type)
@@ -23046,6 +23262,7 @@ def _load_TaskInfo(obj: Any) -> "TaskInfo":
         case _: raise ValueError(f"Unknown TaskInfo type: {kind!r}")
 
 
+AccountGetAllUsersResult = list
 CanvasActionInvokeResult = Any
 CanvasJsonSchema = Any
 ExternalToolResult = ExternalToolTextResultForLlm
@@ -23146,6 +23363,24 @@ async def get_quota(self, params: AccountGetQuotaRequest, *, timeout: float | No
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         return AccountGetQuotaResult.from_dict(await self._client.request("account.getQuota", params_dict, **_timeout_kwargs(timeout)))
 
+    async def get_current_auth(self, *, timeout: float | None = None) -> AccountGetCurrentAuthResult:
+        "Gets the currently active authentication credentials from the global auth manager.\n\nReturns:\n    Current authentication state"
+        return AccountGetCurrentAuthResult.from_dict(await self._client.request("account.getCurrentAuth", {}, **_timeout_kwargs(timeout)))
+
+    async def get_all_users(self, *, timeout: float | None = None) -> list:
+        "Gets all authenticated users available for account switching.\n\nReturns:\n    List of all authenticated users"
+        return list(await self._client.request("account.getAllUsers", {}, **_timeout_kwargs(timeout)))
+
+    async def login(self, params: AccountLoginRequest, *, timeout: float | None = None) -> AccountLoginResult:
+        "Stores authentication credentials after successful login (e.g., device code flow).\n\nArgs:\n    params: Credentials to store after successful authentication\n\nReturns:\n    Result of a successful login; throws on failure"
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return AccountLoginResult.from_dict(await self._client.request("account.login", params_dict, **_timeout_kwargs(timeout)))
+
+    async def logout(self, params: AccountLogoutRequest, *, timeout: float | None = None) -> AccountLogoutResult:
+        "Removes user authentication from keychain and persisted state.\n\nArgs:\n    params: User to log out\n\nReturns:\n    Logout result indicating if more users remain"
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return AccountLogoutResult.from_dict(await self._client.request("account.logout", params_dict, **_timeout_kwargs(timeout)))
+
 
 class ServerSecretsApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -24106,6 +24341,12 @@ async def get_endpoint(self, params: ProviderGetEndpointRequest | None = None, *
         params_dict["sessionId"] = self._session_id
         return ProviderEndpoint.from_dict(await self._client.request("session.provider.getEndpoint", params_dict, **_timeout_kwargs(timeout)))
 
+    async def add(self, params: ProviderAddRequest, *, timeout: float | None = None) -> ProviderAddResult:
+        "Adds BYOK providers and/or models to the session's registry at runtime, extending the additive registry built from the session's `providers`/`models` options. Both fields are optional, so a call may add providers only, models only, or both. Within a single call providers are registered before models, so a model may reference a provider added in the same call; across calls a model may reference any provider already registered (from session creation or a prior add). A model whose referenced provider is not registered by the end of the call is rejected. Newly added models become selectable via `model.list` / `model.switchTo` and are inherited by sub-agents spawned afterwards.\n\nArgs:\n    params: BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.\n\nReturns:\n    The selectable model entries synthesized for the models added by this call."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
+        params_dict["sessionId"] = self._session_id
+        return ProviderAddResult.from_dict(await self._client.request("session.provider.add", params_dict, **_timeout_kwargs(timeout)))
+
 
 # Experimental: this API group is experimental and may change or be removed.
 class OptionsApi:
@@ -24976,8 +25217,15 @@ async def handle_canvas_action_invoke(params: dict) -> dict | None:
     "APIKeyAuthInfoType",
     "AbortRequest",
     "AbortResult",
+    "AccountAllUsers",
+    "AccountGetAllUsersResult",
+    "AccountGetCurrentAuthResult",
     "AccountGetQuotaRequest",
     "AccountGetQuotaResult",
+    "AccountLoginRequest",
+    "AccountLoginResult",
+    "AccountLogoutRequest",
+    "AccountLogoutResult",
     "AccountQuotaSnapshot",
     "AdditionalContentExclusionPolicyScope",
     "AgentApi",
@@ -25475,6 +25723,8 @@ async def handle_canvas_action_invoke(params: dict) -> dict | None:
     "PluginsUninstallRequest",
     "PluginsUpdateRequest",
     "PollSpawnedSessionsResult",
+    "ProviderAddRequest",
+    "ProviderAddResult",
     "ProviderApi",
     "ProviderConfig",
     "ProviderConfigAzure",
diff --git a/python/copilot/generated/session_events.py b/python/copilot/generated/session_events.py
index 14da3d634..cb4851ec3 100644
--- a/python/copilot/generated/session_events.py
+++ b/python/copilot/generated/session_events.py
@@ -2798,6 +2798,7 @@ class ModelCallFailureData:
     initiator: str | None = None
     model: str | None = None
     provider_call_id: str | None = None
+    request_fingerprint: ModelCallFailureRequestFingerprint | None = None
     service_request_id: str | None = None
     status_code: int | None = None
 
@@ -2814,6 +2815,7 @@ def from_dict(obj: Any) -> "ModelCallFailureData":
         initiator = from_union([from_none, from_str], obj.get("initiator"))
         model = from_union([from_none, from_str], obj.get("model"))
         provider_call_id = from_union([from_none, from_str], obj.get("providerCallId"))
+        request_fingerprint = from_union([from_none, ModelCallFailureRequestFingerprint.from_dict], obj.get("requestFingerprint"))
         service_request_id = from_union([from_none, from_str], obj.get("serviceRequestId"))
         status_code = from_union([from_none, from_int], obj.get("statusCode"))
         return ModelCallFailureData(
@@ -2827,6 +2829,7 @@ def from_dict(obj: Any) -> "ModelCallFailureData":
             initiator=initiator,
             model=model,
             provider_call_id=provider_call_id,
+            request_fingerprint=request_fingerprint,
             service_request_id=service_request_id,
             status_code=status_code,
         )
@@ -2852,6 +2855,8 @@ def to_dict(self) -> dict:
             result["model"] = from_union([from_none, from_str], self.model)
         if self.provider_call_id is not None:
             result["providerCallId"] = from_union([from_none, from_str], self.provider_call_id)
+        if self.request_fingerprint is not None:
+            result["requestFingerprint"] = from_union([from_none, lambda x: to_class(ModelCallFailureRequestFingerprint, x)], self.request_fingerprint)
         if self.service_request_id is not None:
             result["serviceRequestId"] = from_union([from_none, from_str], self.service_request_id)
         if self.status_code is not None:
@@ -2859,6 +2864,50 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class ModelCallFailureRequestFingerprint:
+    "Content-free structural summary of the failing request for diagnosing malformed 4xx calls"
+    image_part_count: int
+    image_parts_missing_media_type: int
+    message_count: int
+    nameless_tool_call_count: int
+    tool_call_count: int
+    tool_result_message_count: int
+    last_message_role: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "ModelCallFailureRequestFingerprint":
+        assert isinstance(obj, dict)
+        image_part_count = from_int(obj.get("imagePartCount"))
+        image_parts_missing_media_type = from_int(obj.get("imagePartsMissingMediaType"))
+        message_count = from_int(obj.get("messageCount"))
+        nameless_tool_call_count = from_int(obj.get("namelessToolCallCount"))
+        tool_call_count = from_int(obj.get("toolCallCount"))
+        tool_result_message_count = from_int(obj.get("toolResultMessageCount"))
+        last_message_role = from_union([from_none, from_str], obj.get("lastMessageRole"))
+        return ModelCallFailureRequestFingerprint(
+            image_part_count=image_part_count,
+            image_parts_missing_media_type=image_parts_missing_media_type,
+            message_count=message_count,
+            nameless_tool_call_count=nameless_tool_call_count,
+            tool_call_count=tool_call_count,
+            tool_result_message_count=tool_result_message_count,
+            last_message_role=last_message_role,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["imagePartCount"] = to_int(self.image_part_count)
+        result["imagePartsMissingMediaType"] = to_int(self.image_parts_missing_media_type)
+        result["messageCount"] = to_int(self.message_count)
+        result["namelessToolCallCount"] = to_int(self.nameless_tool_call_count)
+        result["toolCallCount"] = to_int(self.tool_call_count)
+        result["toolResultMessageCount"] = to_int(self.tool_result_message_count)
+        if self.last_message_role is not None:
+            result["lastMessageRole"] = from_union([from_none, from_str], self.last_message_role)
+        return result
+
+
 @dataclass
 class PendingMessagesModifiedData:
     "Empty payload; the event signals that the pending message queue has changed"
@@ -5681,6 +5730,7 @@ class SkillsLoadedSkill:
     name: str
     source: SkillSource
     user_invocable: bool
+    argument_hint: str | None = None
     path: str | None = None
 
     @staticmethod
@@ -5691,6 +5741,7 @@ def from_dict(obj: Any) -> "SkillsLoadedSkill":
         name = from_str(obj.get("name"))
         source = parse_enum(SkillSource, obj.get("source"))
         user_invocable = from_bool(obj.get("userInvocable"))
+        argument_hint = from_union([from_none, from_str], obj.get("argumentHint"))
         path = from_union([from_none, from_str], obj.get("path"))
         return SkillsLoadedSkill(
             description=description,
@@ -5698,6 +5749,7 @@ def from_dict(obj: Any) -> "SkillsLoadedSkill":
             name=name,
             source=source,
             user_invocable=user_invocable,
+            argument_hint=argument_hint,
             path=path,
         )
 
@@ -5708,6 +5760,8 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         result["source"] = to_enum(SkillSource, self.source)
         result["userInvocable"] = from_bool(self.user_invocable)
+        if self.argument_hint is not None:
+            result["argumentHint"] = from_union([from_none, from_str], self.argument_hint)
         if self.path is not None:
             result["path"] = from_union([from_none, from_str], self.path)
         return result
@@ -8191,6 +8245,7 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "McpServersLoadedServer",
     "ModelCallFailureBadRequestKind",
     "ModelCallFailureData",
+    "ModelCallFailureRequestFingerprint",
     "ModelCallFailureSource",
     "OmittedBinaryOmittedReason",
     "OmittedBinaryResult",
diff --git a/rust/src/generated/api_types.rs b/rust/src/generated/api_types.rs
index e9bd5ed86..522222b32 100644
--- a/rust/src/generated/api_types.rs
+++ b/rust/src/generated/api_types.rs
@@ -27,6 +27,14 @@ pub mod rpc_methods {
     pub const TOOLS_LIST: &str = "tools.list";
     /// `account.getQuota`
     pub const ACCOUNT_GETQUOTA: &str = "account.getQuota";
+    /// `account.getCurrentAuth`
+    pub const ACCOUNT_GETCURRENTAUTH: &str = "account.getCurrentAuth";
+    /// `account.getAllUsers`
+    pub const ACCOUNT_GETALLUSERS: &str = "account.getAllUsers";
+    /// `account.login`
+    pub const ACCOUNT_LOGIN: &str = "account.login";
+    /// `account.logout`
+    pub const ACCOUNT_LOGOUT: &str = "account.logout";
     /// `secrets.addFilterValues`
     pub const SECRETS_ADDFILTERVALUES: &str = "secrets.addFilterValues";
     /// `mcp.config.list`
@@ -331,6 +339,8 @@ pub mod rpc_methods {
     pub const SESSION_PLUGINS_RELOAD: &str = "session.plugins.reload";
     /// `session.provider.getEndpoint`
     pub const SESSION_PROVIDER_GETENDPOINT: &str = "session.provider.getEndpoint";
+    /// `session.provider.add`
+    pub const SESSION_PROVIDER_ADD: &str = "session.provider.add";
     /// `session.options.update`
     pub const SESSION_OPTIONS_UPDATE: &str = "session.options.update";
     /// `session.lsp.initialize`
@@ -571,6 +581,29 @@ pub struct AbortResult {
     pub success: bool,
 }
 
+/// Schema for the `AccountAllUsers` type.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AccountAllUsers {
+    /// Authentication information for this user
+    pub auth_info: serde_json::Value,
+    /// Associated token, if available
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token: Option<String>,
+}
+
+/// Current authentication state
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AccountGetCurrentAuthResult {
+    /// Authentication errors from the last auth attempt, if any
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_errors: Option<Vec<String>>,
+    /// Current authentication information, if authenticated
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_info: Option<serde_json::Value>,
+}
+
 /// Optional GitHub token used to look up quota for a specific user instead of the global auth context.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -611,6 +644,42 @@ pub struct AccountGetQuotaResult {
     pub quota_snapshots: HashMap<String, AccountQuotaSnapshot>,
 }
 
+/// Credentials to store after successful authentication
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AccountLoginRequest {
+    /// GitHub host URL
+    pub host: String,
+    /// User login/username
+    pub login: String,
+    /// GitHub authentication token
+    pub token: String,
+}
+
+/// Result of a successful login; throws on failure
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AccountLoginResult {
+    /// Whether the credential was persisted to a secure store (system keychain, or the config file when plaintext storage is enabled). False when no secure store was available and the token was not saved, so the consumer can decide how to proceed.
+    pub stored_in_vault: bool,
+}
+
+/// User to log out
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AccountLogoutRequest {
+    /// Authentication information for the user to log out
+    pub auth_info: serde_json::Value,
+}
+
+/// Logout result indicating if more users remain
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AccountLogoutResult {
+    /// Whether other authenticated users remain after logout
+    pub has_more_users: bool,
+}
+
 /// Schema for the `AgentDiscoveryPath` type.
 ///
 /// <div class="warning">
@@ -1045,13 +1114,6 @@ pub struct AllowAllPermissionState {
 }
 
 /// Schema for the `CopilotUserResponseEndpoints` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CopilotUserResponseEndpoints {
@@ -1066,13 +1128,6 @@ pub struct CopilotUserResponseEndpoints {
 }
 
 /// Schema for the `CopilotUserResponseQuotaSnapshotsChat` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CopilotUserResponseQuotaSnapshotsChat {
@@ -1106,13 +1161,6 @@ pub struct CopilotUserResponseQuotaSnapshotsChat {
 }
 
 /// Schema for the `CopilotUserResponseQuotaSnapshotsCompletions` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CopilotUserResponseQuotaSnapshotsCompletions {
@@ -1146,13 +1194,6 @@ pub struct CopilotUserResponseQuotaSnapshotsCompletions {
 }
 
 /// Schema for the `CopilotUserResponseQuotaSnapshotsPremiumInteractions` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CopilotUserResponseQuotaSnapshotsPremiumInteractions {
@@ -1186,13 +1227,6 @@ pub struct CopilotUserResponseQuotaSnapshotsPremiumInteractions {
 }
 
 /// Schema for the `CopilotUserResponseQuotaSnapshots` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CopilotUserResponseQuotaSnapshots {
@@ -1211,13 +1245,6 @@ pub struct CopilotUserResponseQuotaSnapshots {
 }
 
 /// Snapshot of the authenticated user's Copilot subscription info, if known. Mirrors the GitHub API `/copilot_internal/v2/token` user response shape — the runtime trusts this verbatim and does not re-fetch when set.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CopilotUserResponse {
@@ -1312,13 +1339,6 @@ pub struct CopilotUserResponse {
 }
 
 /// Schema for the `ApiKeyAuthInfo` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ApiKeyAuthInfo {
@@ -2224,13 +2244,6 @@ pub(crate) struct ConnectResult {
 }
 
 /// Schema for the `CopilotApiTokenAuthInfo` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CopilotApiTokenAuthInfo {
@@ -2349,13 +2362,6 @@ pub struct EnqueueCommandResult {
 }
 
 /// Schema for the `EnvAuthInfo` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct EnvAuthInfo {
@@ -2863,13 +2869,6 @@ pub struct FolderTrustCheckResult {
 }
 
 /// Schema for the `GhCliAuthInfo` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GhCliAuthInfo {
@@ -3067,13 +3066,6 @@ pub struct HistoryTruncateResult {
 }
 
 /// Schema for the `HMACAuthInfo` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct HMACAuthInfo {
@@ -5129,7 +5121,9 @@ pub struct MetadataSnapshotRemoteMetadata {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ModelBillingTokenPricesLongContext {
-    /// Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens
+    /// Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
+    #[doc(hidden)]
+    #[deprecated]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_price: Option<f64>,
     /// AI Credits cost per billing batch of cached (read) tokens
@@ -5138,7 +5132,9 @@ pub struct ModelBillingTokenPricesLongContext {
     /// AI Credits cost per billing batch of cache-write (cache creation) tokens.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_write_price: Option<f64>,
-    /// Deprecated: use maxPromptTokens. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
+    /// Use maxPromptTokens instead. Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.
+    #[doc(hidden)]
+    #[deprecated]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub context_max: Option<i64>,
     /// AI Credits cost per billing batch of input tokens
@@ -5159,7 +5155,9 @@ pub struct ModelBillingTokenPrices {
     /// Number of tokens per standard billing batch
     #[serde(skip_serializing_if = "Option::is_none")]
     pub batch_size: Option<i64>,
-    /// Deprecated: use cacheReadPrice. AI Credits cost per billing batch of cached tokens
+    /// Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens
+    #[doc(hidden)]
+    #[deprecated]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_price: Option<f64>,
     /// AI Credits cost per billing batch of cached (read) tokens
@@ -5168,7 +5166,9 @@ pub struct ModelBillingTokenPrices {
     /// AI Credits cost per billing batch of cache-write (cache creation) tokens.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_write_price: Option<f64>,
-    /// Deprecated: use maxPromptTokens. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.
+    /// Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.
+    #[doc(hidden)]
+    #[deprecated]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub context_max: Option<i64>,
     /// AI Credits cost per billing batch of input tokens
@@ -7588,6 +7588,78 @@ pub struct PollSpawnedSessionsResult {
     pub events: Vec<SessionsPollSpawnedSessionsEvent>,
 }
 
+/// A BYOK model definition referencing a named provider.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProviderModelConfig {
+    /// Optional capability overrides (vision, tool_calls, reasoning, etc.).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub capabilities: Option<ModelCapabilitiesOverride>,
+    /// Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.
+    pub id: String,
+    /// Maximum context window tokens for the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_context_window_tokens: Option<f64>,
+    /// Maximum output tokens for the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_output_tokens: Option<f64>,
+    /// Maximum prompt/input tokens for the model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_prompt_tokens: Option<f64>,
+    /// Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_id: Option<String>,
+    /// Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Name of the NamedProviderConfig that serves this model.
+    pub provider: String,
+    /// The model name sent to the provider API for inference. Defaults to `id`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wire_model: Option<String>,
+}
+
+/// BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProviderAddRequest {
+    /// BYOK model definitions to register. Each must reference a provider that is already registered or included in this same call. Selection ids (`provider/id`) must be unique across the registry.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub models: Option<Vec<ProviderModelConfig>>,
+    /// Named BYOK provider connections to register, additive to any providers already in the registry. Each name must be unique across the registry and must not contain '/'.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub providers: Option<Vec<NamedProviderConfig>>,
+}
+
+/// The selectable model entries synthesized for the models added by this call.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProviderAddResult {
+    /// Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.
+    pub models: Vec<serde_json::Value>,
+}
+
 /// Custom model-provider configuration (BYOK).
 ///
 /// <div class="warning">
@@ -7703,44 +7775,6 @@ pub struct ProviderGetEndpointRequest {
     pub model_id: Option<String>,
 }
 
-/// A BYOK model definition referencing a named provider.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ProviderModelConfig {
-    /// Optional capability overrides (vision, tool_calls, reasoning, etc.).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub capabilities: Option<ModelCapabilitiesOverride>,
-    /// Provider-local model id, unique within its provider. The session-wide selection id (shown in the model list and passed to switchTo) is the provider-qualified `provider/id`.
-    pub id: String,
-    /// Maximum context window tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_context_window_tokens: Option<f64>,
-    /// Maximum output tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_output_tokens: Option<f64>,
-    /// Maximum prompt/input tokens for the model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_prompt_tokens: Option<f64>,
-    /// Well-known base model id used for behavior/capability/config lookup. Defaults to `id`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_id: Option<String>,
-    /// Display name for model pickers. Defaults to the provider-qualified selection id (`provider/id`).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// Name of the NamedProviderConfig that serves this model.
-    pub provider: String,
-    /// The model name sent to the provider API for inference. Defaults to `id`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wire_model: Option<String>,
-}
-
 /// Blob attachment with inline base64-encoded data
 ///
 /// <div class="warning">
@@ -8783,6 +8817,9 @@ pub struct ServerInstructionSourceList {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ServerSkill {
+    /// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub argument_hint: Option<String>,
     /// Description of what the skill does
     pub description: String,
     /// Whether the skill is currently enabled (based on global config)
@@ -11035,6 +11072,9 @@ pub struct ShutdownRequest {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Skill {
+    /// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub argument_hint: Option<String>,
     /// Description of what the skill does
     pub description: String,
     /// Whether the skill is currently enabled
@@ -11836,13 +11876,6 @@ pub struct TelemetrySetFeatureOverridesRequest {
 }
 
 /// Schema for the `TokenAuthInfo` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TokenAuthInfo {
@@ -12692,13 +12725,6 @@ pub struct UsageGetMetricsResult {
 }
 
 /// Schema for the `UserAuthInfo` type.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is part of an experimental wire-protocol surface
-/// and may change or be removed in future SDK or CLI releases.
-///
-/// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct UserAuthInfo {
@@ -15187,6 +15213,21 @@ pub struct SessionProviderGetEndpointResult {
     pub wire_api: Option<ProviderEndpointWireApi>,
 }
 
+/// The selectable model entries synthesized for the models added by this call.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is part of an experimental wire-protocol surface
+/// and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionProviderAddResult {
+    /// Synthesized selectable model entries for the newly added BYOK models, each under its provider-qualified selection id (`provider/id`). Empty when only providers were added.
+    pub models: Vec<serde_json::Value>,
+}
+
 /// Indicates whether the session options patch was applied successfully.
 ///
 /// <div class="warning">
@@ -16751,6 +16792,9 @@ pub type McpExecuteSamplingResult = HashMap<String, serde_json::Value>;
 /// </div>
 pub type UIElicitationResponseContent = HashMap<String, serde_json::Value>;
 
+/// List of all authenticated users
+pub type AccountGetAllUsersResult = Vec<AccountAllUsers>;
+
 /// Standard MCP CallToolResult
 ///
 /// <div class="warning">
diff --git a/rust/src/generated/rpc.rs b/rust/src/generated/rpc.rs
index fc969c188..608dfa939 100644
--- a/rust/src/generated/rpc.rs
+++ b/rust/src/generated/rpc.rs
@@ -212,6 +212,78 @@ impl<'a> ClientRpcAccount<'a> {
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+
+    /// Gets the currently active authentication credentials from the global auth manager.
+    ///
+    /// Wire method: `account.getCurrentAuth`.
+    ///
+    /// # Returns
+    ///
+    /// Current authentication state
+    pub async fn get_current_auth(&self) -> Result<AccountGetCurrentAuthResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::ACCOUNT_GETCURRENTAUTH, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Gets all authenticated users available for account switching.
+    ///
+    /// Wire method: `account.getAllUsers`.
+    ///
+    /// # Returns
+    ///
+    /// List of all authenticated users
+    pub async fn get_all_users(&self) -> Result<AccountGetAllUsersResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::ACCOUNT_GETALLUSERS, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Stores authentication credentials after successful login (e.g., device code flow).
+    ///
+    /// Wire method: `account.login`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Credentials to store after successful authentication
+    ///
+    /// # Returns
+    ///
+    /// Result of a successful login; throws on failure
+    pub async fn login(&self, params: AccountLoginRequest) -> Result<AccountLoginResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::ACCOUNT_LOGIN, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Removes user authentication from keychain and persisted state.
+    ///
+    /// Wire method: `account.logout`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - User to log out
+    ///
+    /// # Returns
+    ///
+    /// Logout result indicating if more users remain
+    pub async fn logout(&self, params: AccountLogoutRequest) -> Result<AccountLogoutResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::ACCOUNT_LOGOUT, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
 }
 
 /// `agentRegistry.*` RPCs.
@@ -6284,6 +6356,36 @@ impl<'a> SessionRpcProvider<'a> {
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+
+    /// Adds BYOK providers and/or models to the session's registry at runtime, extending the additive registry built from the session's `providers`/`models` options. Both fields are optional, so a call may add providers only, models only, or both. Within a single call providers are registered before models, so a model may reference a provider added in the same call; across calls a model may reference any provider already registered (from session creation or a prior add). A model whose referenced provider is not registered by the end of the call is rejected. Newly added models become selectable via `model.list` / `model.switchTo` and are inherited by sub-agents spawned afterwards.
+    ///
+    /// Wire method: `session.provider.add`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+    ///
+    /// # Returns
+    ///
+    /// The selectable model entries synthesized for the models added by this call.
+    ///
+    /// <div class="warning">
+    ///
+    /// **Experimental.** This API is part of an experimental wire-protocol surface
+    /// and may change or be removed in future SDK or CLI releases. Pin both the
+    /// SDK and CLI versions if your code depends on it.
+    ///
+    /// </div>
+    pub async fn add(&self, params: ProviderAddRequest) -> Result<ProviderAddResult, Error> {
+        let mut wire_params = serde_json::to_value(params)?;
+        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_PROVIDER_ADD, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
 }
 
 /// `session.queue.*` RPCs.
diff --git a/rust/src/generated/session_events.rs b/rust/src/generated/session_events.rs
index 0fe47f263..78269cb6c 100644
--- a/rust/src/generated/session_events.rs
+++ b/rust/src/generated/session_events.rs
@@ -1602,6 +1602,27 @@ pub struct AssistantUsageData {
     pub time_to_first_token_ms: Option<i64>,
 }
 
+/// Content-free structural summary of the failing request for diagnosing malformed 4xx calls
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelCallFailureRequestFingerprint {
+    /// Total number of image content parts
+    pub image_part_count: i64,
+    /// Image parts whose media type cannot be determined (rejected by strict providers)
+    pub image_parts_missing_media_type: i64,
+    /// Role of the final message in the request
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub last_message_role: Option<String>,
+    /// Total number of messages in the request
+    pub message_count: i64,
+    /// Tool calls whose name is missing or empty (rejected by strict providers)
+    pub nameless_tool_call_count: i64,
+    /// Total number of tool calls across assistant messages
+    pub tool_call_count: i64,
+    /// Number of "tool" result messages in the request
+    pub tool_result_message_count: i64,
+}
+
 /// Session event "model.call_failure". Failed LLM API call metadata for telemetry
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -1633,6 +1654,9 @@ pub struct ModelCallFailureData {
     /// GitHub request tracing ID (x-github-request-id header) for server-side log correlation
     #[serde(skip_serializing_if = "Option::is_none")]
     pub provider_call_id: Option<String>,
+    /// Content-free structural summary of the failing request. Contains only counts and shape flags (no prompt content), so it is safe for unrestricted telemetry. Populated only for client-error (4xx) failures.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_fingerprint: Option<ModelCallFailureRequestFingerprint>,
     /// Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
     #[serde(skip_serializing_if = "Option::is_none")]
     pub service_request_id: Option<String>,
@@ -3369,6 +3393,9 @@ pub struct SessionBackgroundTasksChangedData {}
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SkillsLoadedSkill {
+    /// Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub argument_hint: Option<String>,
     /// Description of what the skill does
     pub description: String,
     /// Whether the skill is currently enabled
diff --git a/rust/tests/session_test.rs b/rust/tests/session_test.rs
index 6677b3c98..99d8c1391 100644
--- a/rust/tests/session_test.rs
+++ b/rust/tests/session_test.rs
@@ -1213,12 +1213,12 @@ async fn list_models_returns_typed_model_info() {
                             "outputPrice": 8.0,
                             "cachePrice": 0.5,
                             "batchSize": 1000000,
-                            "contextMax": 128000,
+                            "maxPromptTokens": 128000,
                             "longContext": {
                                 "inputPrice": 4.0,
                                 "outputPrice": 16.0,
                                 "cachePrice": 1.0,
-                                "contextMax": 1000000
+                                "maxPromptTokens": 1000000
                             }
                         }
                     }
@@ -1244,11 +1244,11 @@ async fn list_models_returns_typed_model_info() {
         .expect("token prices");
     assert_eq!(token_prices.input_price, Some(2.0));
     assert_eq!(token_prices.batch_size, Some(1000000));
-    assert_eq!(token_prices.context_max, Some(128000));
+    assert_eq!(token_prices.max_prompt_tokens, Some(128000));
     let long_context: &github_copilot_sdk::types::ModelBillingTokenPricesLongContext =
         token_prices.long_context.as_ref().expect("long context");
     assert_eq!(long_context.output_price, Some(16.0));
-    assert_eq!(long_context.context_max, Some(1000000));
+    assert_eq!(long_context.max_prompt_tokens, Some(1000000));
 }
 
 #[tokio::test]
diff --git a/scripts/codegen/rust.ts b/scripts/codegen/rust.ts
index e8543c5cf..b8a1c6d6d 100644
--- a/scripts/codegen/rust.ts
+++ b/scripts/codegen/rust.ts
@@ -474,6 +474,21 @@ function isRustMapSchema(schema: JSONSchema7): boolean {
 	);
 }
 
+function isRustArraySchema(schema: JSONSchema7): boolean {
+	return schema.type === "array";
+}
+
+function rustArrayType(
+	schema: JSONSchema7,
+	parentTypeName: string,
+	ctx: RustCodegenCtx,
+): string {
+	const items = schema.items as JSONSchema7 | undefined;
+	if (!items) return "Vec<serde_json::Value>";
+
+	return `Vec<${resolveRustType(items, parentTypeName, "item", true, ctx)}>`;
+}
+
 function rustMapValueType(
 	schema: JSONSchema7,
 	parentTypeName: string,
@@ -528,6 +543,22 @@ function emitRustTypeAlias(
 	ctx.typeAliases.push(lines.join("\n"));
 }
 
+function emitRustArrayAlias(
+	typeName: string,
+	schema: JSONSchema7,
+	ctx: RustCodegenCtx,
+	description?: string,
+): void {
+	if (ctx.generatedNames.has(typeName)) return;
+	emitRustTypeAlias(
+		typeName,
+		schema,
+		rustArrayType(schema, typeName, ctx),
+		ctx,
+		description,
+	);
+}
+
 function emitRustMapAlias(
 	typeName: string,
 	schema: JSONSchema7,
@@ -1469,6 +1500,8 @@ function generateApiTypesCode(
 				getEnumValueDescriptions(schema),
 				isSchemaExperimental(schema),
 			);
+		} else if (isRustArraySchema(schema)) {
+			emitRustArrayAlias(name, schema, ctx, schema.description);
 		} else if (isRustMapSchema(schema)) {
 			emitRustMapAlias(name, schema, ctx, schema.description);
 		} else if (asGeneratedObjectSchema(schema, defCollections)) {
@@ -1531,6 +1564,8 @@ function generateApiTypesCode(
 			if (resolved) {
 				if (resolved.enum && Array.isArray(resolved.enum)) {
 					// Already generated from definitions
+				} else if (isRustArraySchema(resolved)) {
+					emitRustArrayAlias(resultName, resolved, ctx, resolved.description);
 				} else if (isRustMapSchema(resolved)) {
 					emitRustMapAlias(resultName, resolved, ctx, resolved.description);
 				} else if (isObjectSchema(resolved)) {
diff --git a/test/harness/package-lock.json b/test/harness/package-lock.json
index a71ef1835..865c67bc9 100644
--- a/test/harness/package-lock.json
+++ b/test/harness/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "@github/copilot": "^1.0.64-1",
+        "@github/copilot": "^1.0.64-3",
         "@modelcontextprotocol/sdk": "^1.26.0",
         "@types/node": "^25.3.3",
         "@types/node-forge": "^1.3.14",
@@ -501,9 +501,9 @@
       }
     },
     "node_modules/@github/copilot": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.64-1.tgz",
-      "integrity": "sha512-lojV4Cb7oT4VJnYPEKBRH8KI3W43Q4Lh0Pc+V6sej+xjPJkoqwm68sNKn73/p3wXPBSTVTzPeCm9WhIisgf1Jw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.64-3.tgz",
+      "integrity": "sha512-Q9nBMYEHX1bJLXzzJocQx2nZvORJ0E9gvK6ly/FCtmtA7ad96BWZvf4EHzkCNDsn56aI3zNaUSfKHUKcmIAzSg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
@@ -513,20 +513,20 @@
         "copilot": "npm-loader.js"
       },
       "optionalDependencies": {
-        "@github/copilot-darwin-arm64": "1.0.64-1",
-        "@github/copilot-darwin-x64": "1.0.64-1",
-        "@github/copilot-linux-arm64": "1.0.64-1",
-        "@github/copilot-linux-x64": "1.0.64-1",
-        "@github/copilot-linuxmusl-arm64": "1.0.64-1",
-        "@github/copilot-linuxmusl-x64": "1.0.64-1",
-        "@github/copilot-win32-arm64": "1.0.64-1",
-        "@github/copilot-win32-x64": "1.0.64-1"
+        "@github/copilot-darwin-arm64": "1.0.64-3",
+        "@github/copilot-darwin-x64": "1.0.64-3",
+        "@github/copilot-linux-arm64": "1.0.64-3",
+        "@github/copilot-linux-x64": "1.0.64-3",
+        "@github/copilot-linuxmusl-arm64": "1.0.64-3",
+        "@github/copilot-linuxmusl-x64": "1.0.64-3",
+        "@github/copilot-win32-arm64": "1.0.64-3",
+        "@github/copilot-win32-x64": "1.0.64-3"
       }
     },
     "node_modules/@github/copilot-darwin-arm64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.64-1.tgz",
-      "integrity": "sha512-MQHZT9LhmCiq+ogO1E8cPCWrurZ6x+r9lPJfYUSnOyMO+EHbREpiJwOOChxtLHgL2/tKJSZdId2pg3tDgUlcsw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.64-3.tgz",
+      "integrity": "sha512-wlV6mRoAd/wG2V08TG+BOJ0nyOjroya24FSyA5A49z7PnUUuQXYRpa/GljvI5j3PM8aUl0DyBkXuB/DcFU818g==",
       "cpu": [
         "arm64"
       ],
@@ -541,9 +541,9 @@
       }
     },
     "node_modules/@github/copilot-darwin-x64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.64-1.tgz",
-      "integrity": "sha512-kOQY7CvI7He0eO3ObQAHePWdkNLWAOegCSzUqUmdcpa1SNVqbZ3GBMsQ7uAZQip2cQxnGZ7pS1v6tKQ0HJdkYw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.64-3.tgz",
+      "integrity": "sha512-mk48PIESL2keeemX7tLRmWRDxKwl0q3cFI1ORD2QcrieNK7pSqI3eVbfoB7MqoUUI27yzIkl67xqgl8Qq28IUQ==",
       "cpu": [
         "x64"
       ],
@@ -558,9 +558,9 @@
       }
     },
     "node_modules/@github/copilot-linux-arm64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.64-1.tgz",
-      "integrity": "sha512-hIfuO7Q+pWs0SKfIRYqT+CjMaupudnhp4RMS6XoJ5s/e33rvpj2tkTkXYlHJo1PMDI823vvbqgpEdr+KeewMwg==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.64-3.tgz",
+      "integrity": "sha512-rCgtK3/rofQW5StSbeU0TwDUlOl2bvS2HGKyapVxow1Nvz3Q/TDB+eFRQc5ocBdv5tNSor+Caw2JGkRx5v508w==",
       "cpu": [
         "arm64"
       ],
@@ -575,9 +575,9 @@
       }
     },
     "node_modules/@github/copilot-linux-x64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.64-1.tgz",
-      "integrity": "sha512-VHaE62pha0rDDvuNN3bd97gf0EZ+EJebstM1ejHsMYoPT1IOUkYEXlNfGGHY+GfUGYxAiy/+Uew4xw5mJyy/Sw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.64-3.tgz",
+      "integrity": "sha512-FAiBMw1h07mURSBLi3ztj5yzbP+uTbo9mhxOym1Xysut5LDpO2kYUzTYk2DlIyLGZhmH/HDOZE+b6U7lOUQy0g==",
       "cpu": [
         "x64"
       ],
@@ -592,9 +592,9 @@
       }
     },
     "node_modules/@github/copilot-linuxmusl-arm64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.64-1.tgz",
-      "integrity": "sha512-L/YrZPotRujAP0QERq+DlkR1SLr7abbTSz/56JqKKOqEdjKZPdQW1bUlhL/w1CZg1gXlTNUsNVyKz/fUfrEBgw==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-arm64/-/copilot-linuxmusl-arm64-1.0.64-3.tgz",
+      "integrity": "sha512-vn8P6grPf0y2mNskkdVbAz0i46b1sP9uSXv7z6kgycjprl0CdIYPDf3WEkG60vpyopfQna+iCqCLMWRnNyCk3g==",
       "cpu": [
         "arm64"
       ],
@@ -609,9 +609,9 @@
       }
     },
     "node_modules/@github/copilot-linuxmusl-x64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.64-1.tgz",
-      "integrity": "sha512-AGMjXqR128oyjiJhoI6Gd7JP5ddWkib+P4YH/JoHm05iNn23ZYl4tSc0XihHzeyMI1ix7Aacn8UINYB7lGOGOA==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linuxmusl-x64/-/copilot-linuxmusl-x64-1.0.64-3.tgz",
+      "integrity": "sha512-atdHimNd6nzRRwHybXUY6/84bYzXeKbDOeYN/N/DsX23+AQOPSu5BD8MD8166I/5kNHui0XOmeTSydVNBUwcJw==",
       "cpu": [
         "x64"
       ],
@@ -626,9 +626,9 @@
       }
     },
     "node_modules/@github/copilot-win32-arm64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.64-1.tgz",
-      "integrity": "sha512-vvv+gnemi9WKaxF41zz7Xmq6a493n8Yjps5UFaOY6a3WR222kKXZXfOpeRvIYsDgnIPHGBHIj1TBOmnHQT4V4w==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.64-3.tgz",
+      "integrity": "sha512-jUTS9meoHEXQR8nMDOjwC0baqV273lYtLxY46W7TiOFszhsqhbhWxQMkNQBfT3GEfPp+40igzMPq3reaUTuvag==",
       "cpu": [
         "arm64"
       ],
@@ -643,9 +643,9 @@
       }
     },
     "node_modules/@github/copilot-win32-x64": {
-      "version": "1.0.64-1",
-      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.64-1.tgz",
-      "integrity": "sha512-mcHvD0fjGDuqr/YXzy8mKuDmah1F+qjPujxoFuGmabmTJZ33cSIJ3nq7RRvxZNIdp8YJ57NkbcW30WvIcOeJ3w==",
+      "version": "1.0.64-3",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.64-3.tgz",
+      "integrity": "sha512-gHUhS500Q91hjtH9fqKDblaIs0mO09G4ifpZ1woDPXbkdKe/W29uwB7g2fn0+KczNRyPxFSWlqjnOon4Fe8svA==",
       "cpu": [
         "x64"
       ],
diff --git a/test/harness/package.json b/test/harness/package.json
index af588a91c..f1506e95d 100644
--- a/test/harness/package.json
+++ b/test/harness/package.json
@@ -14,7 +14,7 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "devDependencies": {
-    "@github/copilot": "^1.0.64-1",
+    "@github/copilot": "^1.0.64-3",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "@types/node": "^25.3.3",
     "@types/node-forge": "^1.3.14",