Skip to content

Carry over the remaining SessionConfig fields in copilot copyResumeSessionConfig so multi-turn options persist #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gdams merged 2 commits into from
Jul 29, 2026
Merged

Carry over the remaining SessionConfig fields in copilot copyResumeSessionConfig so multi-turn options persist #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a4db4
Carry over remaining SessionConfig fields when resuming copilot sessions
PratikDhanave Jul 24, 2026
9f49289
copilotprovider: clone Tools in copyResumeSessionConfig to avoid muta…
PratikDhanave Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 54 additions & 18 deletions provider/copilotprovider/copilot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,24 +261,60 @@ func copyResumeSessionConfig(source *copilot.SessionConfig) copilot.ResumeSessio
return copilot.ResumeSessionConfig{Streaming: copilot.Bool(true)}
}
return copilot.ResumeSessionConfig{
Model: source.Model,
ReasoningEffort: source.ReasoningEffort,
Tools: source.Tools,
SystemMessage: source.SystemMessage,
AvailableTools: source.AvailableTools,
ExcludedTools: source.ExcludedTools,
Provider: source.Provider,
OnPermissionRequest: source.OnPermissionRequest,
OnUserInputRequest: source.OnUserInputRequest,
Hooks: source.Hooks,
WorkingDirectory: source.WorkingDirectory,
ConfigDirectory: source.ConfigDirectory,
MCPServers: source.MCPServers,
CustomAgents: source.CustomAgents,
SkillDirectories: source.SkillDirectories,
DisabledSkills: source.DisabledSkills,
InfiniteSessions: source.InfiniteSessions,
Streaming: copyBoolDefaultTrue(source.Streaming),
ClientName: source.ClientName,
Model: source.Model,
ReasoningEffort: source.ReasoningEffort,
ReasoningSummary: source.ReasoningSummary,
ContextTier: source.ContextTier,
Tools: slices.Clone(source.Tools),
SystemMessage: source.SystemMessage,
AvailableTools: source.AvailableTools,
ExcludedTools: source.ExcludedTools,
ExcludedBuiltInAgents: source.ExcludedBuiltInAgents,
Provider: source.Provider,
Capi: source.Capi,
Providers: source.Providers,
Models: source.Models,
ModelCapabilities: source.ModelCapabilities,
EnableSessionTelemetry: source.EnableSessionTelemetry,
EnableCitations: source.EnableCitations,
SessionLimits: source.SessionLimits,
SkipCustomInstructions: source.SkipCustomInstructions,
CustomAgentsLocalOnly: source.CustomAgentsLocalOnly,
CoauthorEnabled: source.CoauthorEnabled,
ManageScheduleEnabled: source.ManageScheduleEnabled,
OnPermissionRequest: source.OnPermissionRequest,
OnMCPAuthRequest: source.OnMCPAuthRequest,
OnUserInputRequest: source.OnUserInputRequest,
Hooks: source.Hooks,
WorkingDirectory: source.WorkingDirectory,
ConfigDirectory: source.ConfigDirectory,
EnableConfigDiscovery: source.EnableConfigDiscovery,
SkipEmbeddingRetrieval: source.SkipEmbeddingRetrieval,
EmbeddingCacheStorage: source.EmbeddingCacheStorage,
OrganizationCustomInstructions: source.OrganizationCustomInstructions,
EnableOnDemandInstructionDiscovery: source.EnableOnDemandInstructionDiscovery,
EnableFileHooks: source.EnableFileHooks,
EnableHostGitOperations: source.EnableHostGitOperations,
EnableSessionStore: source.EnableSessionStore,
EnableSkills: source.EnableSkills,
IncludeSubAgentStreamingEvents: source.IncludeSubAgentStreamingEvents,
MCPServers: source.MCPServers,
MCPOAuthTokenStorage: source.MCPOAuthTokenStorage,
CustomAgents: source.CustomAgents,
DefaultAgent: source.DefaultAgent,
Agent: source.Agent,
SkillDirectories: source.SkillDirectories,
PluginDirectories: source.PluginDirectories,
InstructionDirectories: source.InstructionDirectories,
DisabledSkills: source.DisabledSkills,
InfiniteSessions: source.InfiniteSessions,
LargeOutput: source.LargeOutput,
ToolSearch: source.ToolSearch,
Memory: source.Memory,
GitHubToken: source.GitHubToken,
RemoteSession: source.RemoteSession,
Streaming: copyBoolDefaultTrue(source.Streaming),
}
}

Expand Down
71 changes: 70 additions & 1 deletion provider/copilotprovider/copilot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,40 @@ func TestCopyResumeSessionConfig_CopiesAllProperties(t *testing.T) {
}
assertStringSlice(t, request["disabledSkills"], []string{"skill1"}, "disabledSkills")
assertEqual(t, request["streaming"], true, "streaming")

// Fields beyond the originally hand-copied set must also carry over so that
// multi-turn options keep taking effect after the first turn.
assertEqual(t, request["clientName"], "test-client", "clientName")
assertEqual(t, request["reasoningSummary"], "concise", "reasoningSummary")
assertEqual(t, request["contextTier"], "long_context", "contextTier")
assertEqual(t, request["mcpOAuthTokenStorage"], "in-memory", "mcpOAuthTokenStorage")
assertStringSlice(t, request["excludedBuiltinAgents"], []string{"builtin1"}, "excludedBuiltinAgents")
assertEqual(t, request["enableSessionTelemetry"], true, "enableSessionTelemetry")
assertEqual(t, request["enableCitations"], true, "enableCitations")
assertEqual(t, request["enableConfigDiscovery"], true, "enableConfigDiscovery")
assertEqual(t, request["skipEmbeddingRetrieval"], true, "skipEmbeddingRetrieval")
assertEqual(t, request["embeddingCacheStorage"], "in-memory", "embeddingCacheStorage")
assertEqual(t, request["organizationCustomInstructions"], "org instructions", "organizationCustomInstructions")
assertEqual(t, request["enableOnDemandInstructionDiscovery"], true, "enableOnDemandInstructionDiscovery")
assertEqual(t, request["enableFileHooks"], true, "enableFileHooks")
assertEqual(t, request["enableHostGitOperations"], true, "enableHostGitOperations")
assertEqual(t, request["enableSessionStore"], true, "enableSessionStore")
assertEqual(t, request["enableSkills"], true, "enableSkills")
assertEqual(t, request["skipCustomInstructions"], true, "skipCustomInstructions")
assertEqual(t, request["customAgentsLocalOnly"], true, "customAgentsLocalOnly")
assertEqual(t, request["coauthorEnabled"], true, "coauthorEnabled")
assertEqual(t, request["manageScheduleEnabled"], true, "manageScheduleEnabled")
assertEqual(t, request["includeSubAgentStreamingEvents"], false, "includeSubAgentStreamingEvents")
assertEqual(t, request["agent"], "custom-agent", "agent")
assertStringSlice(t, request["pluginDirectories"], []string{"/plugins"}, "pluginDirectories")
assertStringSlice(t, request["instructionDirectories"], []string{"/instructions"}, "instructionDirectories")
assertEqual(t, request["gitHubToken"], "gh-token-123", "gitHubToken")
assertEqual(t, request["remoteSession"], "on", "remoteSession")
for _, key := range []string{"providers", "models", "capi", "modelCapabilities", "sessionLimits", "defaultAgent", "largeOutput", "toolSearch", "memory"} {
if request[key] == nil {
t.Fatalf("%s was not sent on resume", key)
}
}
}

func TestCopySessionConfig_WithStreamingDisabled_PreservesStreamingValue(t *testing.T) {
Expand Down Expand Up @@ -609,8 +643,11 @@ func dataContent(t *testing.T, name, value string) *message.DataContent {

func richSessionConfig() *copilot.SessionConfig {
return &copilot.SessionConfig{
ClientName: "test-client",
Model: "gpt-4o",
ReasoningEffort: "high",
ReasoningSummary: copilot.ReasoningSummaryConcise,
ContextTier: copilot.ContextTierLongContext,
SystemMessage: &copilot.SystemMessageConfig{Mode: "append", Content: "Be helpful"},
AvailableTools: []string{"tool1", "tool2"},
ExcludedTools: []string{"tool3"},
Expand All @@ -631,7 +668,39 @@ func richSessionConfig() *copilot.SessionConfig {
MCPServers: map[string]copilot.MCPServerConfig{
"server1": copilot.MCPStdioServerConfig{Command: "npx"},
},
DisabledSkills: []string{"skill1"},
MCPOAuthTokenStorage: "in-memory",
DisabledSkills: []string{"skill1"},
ExcludedBuiltInAgents: []string{"builtin1"},
Providers: []copilot.NamedProviderConfig{{Name: "prov1", BaseURL: "https://example.com"}},
Models: []copilot.ProviderModelConfig{{ID: "m1", Provider: "prov1"}},
Capi: &copilot.CapiSessionOptions{EnableWebSocketResponses: copilot.Bool(true)},
ModelCapabilities: &rpc.ModelCapabilitiesOverride{},
SessionLimits: &rpc.SessionLimitsConfig{},
EnableSessionTelemetry: copilot.Bool(true),
EnableCitations: copilot.Bool(true),
EnableConfigDiscovery: copilot.Bool(true),
SkipEmbeddingRetrieval: copilot.Bool(true),
EmbeddingCacheStorage: copilot.String("in-memory"),
OrganizationCustomInstructions: copilot.String("org instructions"),
EnableOnDemandInstructionDiscovery: copilot.Bool(true),
EnableFileHooks: copilot.Bool(true),
EnableHostGitOperations: copilot.Bool(true),
EnableSessionStore: copilot.Bool(true),
EnableSkills: copilot.Bool(true),
SkipCustomInstructions: copilot.Bool(true),
CustomAgentsLocalOnly: copilot.Bool(true),
CoauthorEnabled: copilot.Bool(true),
ManageScheduleEnabled: copilot.Bool(true),
IncludeSubAgentStreamingEvents: copilot.Bool(false),
DefaultAgent: &copilot.DefaultAgentConfig{ExcludedTools: []string{"dtool"}},
Agent: "custom-agent",
PluginDirectories: []string{"/plugins"},
InstructionDirectories: []string{"/instructions"},
LargeOutput: &copilot.LargeToolOutputConfig{Enabled: copilot.Bool(true)},
ToolSearch: &copilot.ToolSearchConfig{Enabled: copilot.Bool(true)},
Memory: &copilot.MemoryConfiguration{Enabled: true},
GitHubToken: "gh-token-123",
RemoteSession: rpc.RemoteSessionModeOn,
}
}

Expand Down
Loading