Skip to content

fix(copilot): single-task copilot uses filename instead of copilot_list #492

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
wangl-cc merged 3 commits into from
Feb 25, 2026
Merged

fix(copilot): single-task copilot uses filename instead of copilot_list #492

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
901a185
fix(copilot): single-task copilot uses `filename` instead of `copilot…
travellerse Feb 16, 2026
ba3f573
fix(copilot): address review comments for copilot raid mode and stage…
travellerse Feb 16, 2026
effd2d3
fix(copilot): simplify single‑file filename conversion with `?`
travellerse Feb 25, 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
75 changes: 31 additions & 44 deletions crates/maa-cli/src/run/preset/copilot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ const COPILOT_API: &str = "http://127.0.0.1:18080/copilot/get/";
#[cfg(test)]
const COPILOT_SET_API: &str = "http://127.0.0.1:18080/set/get?id=";

// Raid mode constants
const RAID_MODE_NORMAL: u8 = 0;
const RAID_MODE_RAID: u8 = 1;
const RAID_MODE_BOTH: u8 = 2;

#[cfg_attr(test, derive(Default))]
#[derive(clap::Args)]
pub struct CopilotParams {
Expand Down Expand Up @@ -185,12 +190,12 @@ impl IntoParameters for CopilotParams {
}

match self.raid {
0 | 1 => stage_list.push(StageOpts {
RAID_MODE_NORMAL | RAID_MODE_RAID => stage_list.push(StageOpts {
filename: file.to_path_buf(),
stage_name: stage_code.to_owned(),
is_raid: self.raid == 1,
is_raid: self.raid == RAID_MODE_RAID,
}),
2 => {
RAID_MODE_BOTH => {
stage_list.push(StageOpts {
filename: file.to_path_buf(),
stage_name: stage_code.to_owned(),
Expand All @@ -213,12 +218,26 @@ impl IntoParameters for CopilotParams {
"use_sanity_potion" => use_sanity_potion,
"add_trust" => add_trust,
"ignore_requirements" => ignore_requirements,
"copilot_list" => stage_list?,
"formation_index" =>? self.formation_index,
"support_unit_usage" =>? self.support_unit_usage,
"support_unit_name" =>? self.support_unit_name
);

// Use single file mode when there's only one stage in the list
if stage_list.len() == 1 {
let stage_opt = stage_list
.into_iter()
.next()
.expect("single-file mode requires exactly one copilot stage");
insert!(params,
"filename" => stage_opt.filename?
);
} else {
insert!(params,
"copilot_list" => stage_list?
);
}

Ok(params)
}
}
Expand Down Expand Up @@ -717,11 +736,7 @@ found"}"#,
assert_eq!(
params,
object!(
"copilot_list" => [object!(
"filename" => path_from_cache_dir("40051.json"),
"stage_name" => "AS-EX-1",
"is_raid" => false,
)],
"filename" => path_from_cache_dir("40051.json"),
"formation" => false,
"use_sanity_potion" => false,
"add_trust" => false,
Expand Down Expand Up @@ -757,11 +772,7 @@ found"}"#,
assert_eq!(
params,
object!(
"copilot_list" => [object!(
"filename" => path_from_cache_dir("40051.json"),
"stage_name" => "AS-EX-1",
"is_raid" => true,
)],
"filename" => path_from_cache_dir("40051.json"),
"formation" => true,
"use_sanity_potion" => true,
"add_trust" => true,
Expand All @@ -787,11 +798,7 @@ found"}"#,
assert_eq!(
params,
object!(
"copilot_list" => [object!(
"filename" => path_from_cache_dir("40051.json"),
"stage_name" => "AS-EX-1",
"is_raid" => false,
)],
"filename" => path_from_cache_dir("40051.json"),
"formation" => false,
"use_sanity_potion" => false,
"add_trust" => false,
Expand Down Expand Up @@ -915,11 +922,7 @@ found"}"#,
assert_eq!(
params,
object!(
"copilot_list" => [object!(
"filename" => path_from_cache_dir("40051.json"),
"stage_name" => "AS-EX-1",
"is_raid" => false,
)],
"filename" => path_from_cache_dir("40051.json"),
"formation" => true,
"use_sanity_potion" => false,
"add_trust" => false,
Expand All @@ -944,11 +947,7 @@ found"}"#,
assert_eq!(
params,
object!(
"copilot_list" => [object!(
"filename" => path_from_cache_dir("40051.json"),
"stage_name" => "AS-EX-1",
"is_raid" => false,
)],
"filename" => path_from_cache_dir("40051.json"),
"formation" => false,
"use_sanity_potion" => true,
"add_trust" => false,
Expand All @@ -973,11 +972,7 @@ found"}"#,
assert_eq!(
params,
object!(
"copilot_list" => [object!(
"filename" => path_from_cache_dir("40051.json"),
"stage_name" => "AS-EX-1",
"is_raid" => false,
)],
"filename" => path_from_cache_dir("40051.json"),
"formation" => false,
"use_sanity_potion" => false,
"add_trust" => true,
Expand All @@ -1002,11 +997,7 @@ found"}"#,
assert_eq!(
params,
object!(
"copilot_list" => [object!(
"filename" => path_from_cache_dir("40051.json"),
"stage_name" => "AS-EX-1",
"is_raid" => false,
)],
"filename" => path_from_cache_dir("40051.json"),
"formation" => false,
"use_sanity_potion" => false,
"add_trust" => false,
Expand Down Expand Up @@ -1038,11 +1029,7 @@ found"}"#,
assert_eq!(
params,
object!(
"copilot_list" => [object!(
"filename" => path_from_cache_dir("40051.json"),
"stage_name" => "AS-EX-1",
"is_raid" => false,
)],
"filename" => path_from_cache_dir("40051.json"),
"formation" => true,
"use_sanity_potion" => true,
"add_trust" => false,
Expand Down