Skip to content

Merge latest develop into release-3.97.7 #12259

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
haoozhang merged 3 commits into from
Jul 30, 2026
+32 −1
Merged

Merge latest develop into release-3.97.7 #12259

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93211a5
route appmod prompt to local agent
Jul 28, 2026
52b9068
with local agent provider via reflection
Jul 29, 2026
762787d
Merge pull request #12253 from microsoft/haozhan/route-local
wangmingliang-ms Jul 29, 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
33 changes: 32 additions & 1 deletion ...oft/azure/toolkit/intellij/appmod/javaupgrade/service/JavaVersionNotificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.util.HashSet;
import java.util.Set;

import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemeter;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -503,6 +502,7 @@ private boolean tryReflectionCopilotCall(@Nonnull Project project, @Nonnull Stri
try {
builder.getClass().getMethod("withInput", String.class).invoke(builder, prompt);
builder.getClass().getMethod("withNewSession").invoke(builder);
withLocalAgentProvider(builder, copilotClassLoader);
withModelCompatibility(builder, DEFAULT_MODEL_NAME);
Method withSessionIdReceiverMethod = findMethodByName(builder.getClass(), "withSessionIdReceiver");
if (withSessionIdReceiverMethod != null) {
Expand Down Expand Up @@ -798,6 +798,37 @@ private void showGenericUpgradeGuidance(@Nonnull Project project, @Nonnull Strin
Notifications.Bus.notify(guidanceNotification, project);
}

/**
* Pins the query to the LOCAL agent provider via reflection.
* This ensures the Java Upgrade prompt runs on the local (CLS) agent which hosts the
* modernize-java-upgrade custom agent, instead of inheriting the home session's provider.
* Requires Copilot plugin version that includes QueryOptionBuilder.withAgentProvider().
* Silently no-ops on older versions.
*
* @param builder the query option builder
* @param copilotClassLoader the Copilot plugin's classloader
*/
private static void withLocalAgentProvider(@Nonnull Object builder, @Nonnull ClassLoader copilotClassLoader) {
try {
final Class<?> typeClass = copilotClassLoader.loadClass("com.github.copilot.session.ChatTarget$Type");
final Object localProvider = typeClass.getField("LOCAL").get(null);
final Method withAgentProvider = findAccessibleMethod(builder.getClass(), "withAgentProvider", 1);
if (withAgentProvider != null) {
withAgentProvider.invoke(builder, localProvider);
log.info("withLocalAgentProvider: pinned query to ChatTarget.Type.LOCAL");
} else {
log.info("withLocalAgentProvider: withAgentProvider() not exposed by this Copilot version; skipping.");
}
} catch (ClassNotFoundException ex) {
// Older Copilot without ChatTarget.Type; silently skip.
log.info("withLocalAgentProvider: ChatTarget.Type class not found; skipping.");
} catch (NoSuchFieldException ex) {
log.info("withLocalAgentProvider: ChatTarget.Type.LOCAL field not found; skipping.");
} catch (Exception ex) {
log.warn("withLocalAgentProvider failed: " + ex.getMessage());
}
}

/**
* Sets the model for the query builder using reflection for compatibility with older versions of GitHub Copilot.
* Note: The API 'withModel' is supported starting from Copilot version '1.5.63'.
Expand Down
Loading