From f2f7286f47fdf24ce2f24fd229be1e926bb4eabc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 10 Jul 2026 12:13:17 +0000
Subject: [PATCH 1/2] Initial plan


From 5b2a1fdb7b5d302059fb019ae599e406ef89a46e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 10 Jul 2026 12:35:36 +0000
Subject: [PATCH 2/2] refactor: migrate deprecated RequiredSubcommand and
 GetGeminiAPITarget callsites
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- pip.go: RequiredSubcommand: "install" → RequiredSubcommands: []string{"install"} (canonical slice form)
- pip.go: remove redundant RequiredSubcommand: "" from uvxExtractor (zero value)
- npm.go: remove redundant RequiredSubcommand: "" from extractNpxFromCommands (zero value)
- awf_config.go: remove deprecated GetGeminiAPITarget warning comparison block (lines 516-519)
  The else-if fallback for gemini engine backward compat is retained per ADR-34693.

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 pkg/workflow/awf_config.go |  4 ----
 pkg/workflow/npm.go        |  5 ++---
 pkg/workflow/pip.go        | 11 +++++------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkg/workflow/awf_config.go b/pkg/workflow/awf_config.go
index d0e3e4846e7..eea7a0bbd2b 100644
--- a/pkg/workflow/awf_config.go
+++ b/pkg/workflow/awf_config.go
@@ -513,10 +513,6 @@ func BuildAWFConfigJSON(config AWFCommandConfig) (string, error) {
 	if antigravityTarget := GetAntigravityAPITarget(config.WorkflowData, config.EngineName); antigravityTarget != "" {
 		// Route the Antigravity-resolved API target through the "gemini" provider key
 		// to match AWF's supported target providers.
-		geminiTarget := GetGeminiAPITarget(config.WorkflowData, config.EngineName)
-		if geminiTarget != "" && geminiTarget != antigravityTarget {
-			awfConfigLog.Printf("API proxy: overriding gemini target %s with antigravity target %s; configure only one of GEMINI_API_BASE_URL or ANTIGRAVITY_API_BASE_URL to avoid ambiguity", geminiTarget, antigravityTarget)
-		}
 		awfConfigLog.Printf("API proxy: mapped antigravity target to gemini provider target=%s", antigravityTarget)
 		targets["gemini"] = &AWFAPITargetConfig{Host: antigravityTarget}
 	} else if geminiTarget := GetGeminiAPITarget(config.WorkflowData, config.EngineName); geminiTarget != "" {
diff --git a/pkg/workflow/npm.go b/pkg/workflow/npm.go
index d30a4de0f74..b8a166f3979 100644
--- a/pkg/workflow/npm.go
+++ b/pkg/workflow/npm.go
@@ -33,9 +33,8 @@ func extractNpxPackages(workflowData *WorkflowData) []string {
 // extractNpxFromCommands extracts npx package names from command strings
 func extractNpxFromCommands(commands string) []string {
 	extractor := PackageExtractor{
-		CommandNames:       []string{"npx"},
-		RequiredSubcommand: "",
-		TrimSuffixes:       "&|;",
+		CommandNames: []string{"npx"},
+		TrimSuffixes: "&|;",
 	}
 	return extractor.ExtractPackages(commands)
 }
diff --git a/pkg/workflow/pip.go b/pkg/workflow/pip.go
index b8384794885..6cbe0cf5e9b 100644
--- a/pkg/workflow/pip.go
+++ b/pkg/workflow/pip.go
@@ -46,9 +46,9 @@ func extractPipPackages(workflowData *WorkflowData) []string {
 // extractPipFromCommands extracts pip package names from command strings
 func extractPipFromCommands(commands string) []string {
 	extractor := PackageExtractor{
-		CommandNames:       []string{"pip", "pip3"},
-		RequiredSubcommand: "install",
-		TrimSuffixes:       "&|;",
+		CommandNames:        []string{"pip", "pip3"},
+		RequiredSubcommands: []string{"install"},
+		TrimSuffixes:        "&|;",
 	}
 	return extractor.ExtractPackages(commands)
 }
@@ -68,9 +68,8 @@ func extractUvFromCommands(commands string) []string {
 	lines := strings.Split(commands, "\n")
 
 	uvxExtractor := PackageExtractor{
-		CommandNames:       []string{"uvx"},
-		RequiredSubcommand: "",
-		TrimSuffixes:       "&|;",
+		CommandNames: []string{"uvx"},
+		TrimSuffixes: "&|;",
 	}
 
 	uvPipHelper := PackageExtractor{TrimSuffixes: "&|;"}