管理器接入组件补全与问题反馈功能

README.en.md

@@ -73,7 +73,7 @@ modavd [--root <dir>] [--json] [--quiet] [--verbose] <command> [args]
 | `check [--memory M]` | Computer check before starting |
 | `report-config [--no-clipboard]` | Copy the computer configuration and the game info from the running instances (read-only) |
 | `collect-info [--out-dir D] [--stage-dir D] [--keep-stage] [--no-explorer]` | Collect a problem report and zip it (read-only). Ctrl+C before ZIP completion returns `canceled`, deletes the unfinished ZIP and removes staging; `--keep-stage` preserves staging and includes its path in the error |
-| `components [status]`, `components fetch [--accept-license] [--mirror ID] [--mirror-url URL] [--keep-downloads]` | View or fetch the Google components (adb and the system image); does what `补全组件.bat` (fetches the Google components) does (see "Fetching the Google components") |
+| `components [status]`, `components source [auto\|googledownloads_cn\|tencent\|google]`, `components fetch [--accept-license] [--mirror ID] [--mirror-url URL] [--keep-downloads]` | View, choose, or fetch the Google components (adb and the system image; see "Fetching the Google components") |
 | `window <i> show\|hide`, `install <i> <apk>`, `shell <i> <command>`, `adb <i> -- <args>` | Window, install an APK, guest command, adb passthrough |
 | `update [status\|check\|prepare\|install\|recover] [--automas-version V]` | Update the whole ModAVD package in the root folder, using the update source from "Settings" (`设置`) (see "Updating ModAVD") |
 | `servers`, `version`, `mcp`, `help [command]` | |
@@ -247,7 +247,7 @@ Double-click `ModAVD.exe` in the package root: it starts a local server that lis
 
 ## Fetching the Google components
 
-The ModAVD release package does not include adb (platform-tools 37.0.1) or the Android 14 Google APIs x86_64 system image (r14, about 1.5 GB, about 4.2 GB unpacked): they belong to Google, are governed by the Android Software Development Kit License Agreement, and cannot be redistributed. `modavd components fetch` downloads them from official channels and installs them into `sdk\`; its rules match the bundled `fetch-components.ps1` (`补全组件.bat`) one for one:
+The ModAVD release package does not include adb (platform-tools 37.0.1) or the Android 14 Google APIs x86_64 system image (r14, about 1.5 GB, about 4.2 GB unpacked): they belong to Google, are governed by the Android Software Development Kit License Agreement, and cannot be redistributed. `modavd components fetch` downloads them from official channels and installs them into `sdk\`. The manager's "补全组件" button and this command share the same logic; the first interactive run asks for a download source and remembers it:
 
 - First it fetches the full license text from `repository2-3.xml` on a mirror and displays it (stating which mirror it came from and which components will be downloaded), and continues only if you type `y`; otherwise nothing is downloaded and `downloads\` gets no extra files. `--accept-license` skips the prompt, but the full text is still fetched and displayed, and if it cannot be fetched it still exits; with `--json` it is required, otherwise the command always reports `usage` (exit code 2), before it even looks at the root folder and whether or not components are missing (up to 0.3.0 it succeeded when nothing was missing). The license text and the prompt are not affected by `--quiet`.
 - Mirrors are tried in this order: googledownloads.cn → Tencent Cloud mirror → dl.google.com. When something is to be downloaded, a line "下载源：…" (download source) first says which ones this run uses and why (default / `--mirror` / `--mirror-url`). `--mirror` uses only one of them (case-insensitive); `--mirror-url` uses your own directory URL in place of those three (it can be given several times or comma-separated, and the URLs are tried in order). A mirror from which the license manifest could not be fetched is moved to the end when downloading.

README.md

@@ -75,7 +75,7 @@ modavd [--root <目录>] [--json] [--quiet] [--verbose] <命令> [参数]
 | `check [--memory M]` | 开机前的电脑检查 |
 | `report-config [--no-clipboard]` | 复制电脑配置和开着实例里的游戏信息（只读） |
 | `collect-info [--out-dir D] [--stage-dir D] [--keep-stage] [--no-explorer]` | 收集问题信息并打包（只读）；ZIP 完成前的 Ctrl+C 返回 `canceled`，删除未完成 ZIP 并清理暂存目录；`--keep-stage` 则保留暂存目录并在错误中给出路径 |
-| `components [status]`、`components fetch [--accept-license] [--mirror ID] [--mirror-url URL] [--keep-downloads]` | 查看或补全 Google 组件（adb 和系统镜像），做的是「补全组件.bat」做的事（见「补全 Google 组件」） |
+| `components [status]`、`components source [auto\|googledownloads_cn\|tencent\|google]`、`components fetch [--accept-license] [--mirror ID] [--mirror-url URL] [--keep-downloads]` | 查看、选择或补全 Google 组件（adb 和系统镜像；见「补全 Google 组件」） |
 | `window <i> show\|hide`、`install <i> <apk>`、`shell <i> <命令>`、`adb <i> -- <参数>` | 窗口、装 APK、客体命令、adb 透传 |
 | `update [status\|check\|prepare\|install\|recover] [--automas-version V]` | 更新根目录里的整个 ModAVD 包，按「设置」里的更新源（见「更新 ModAVD」） |
 | `servers`、`version`、`mcp`、`help [命令]` | |
@@ -249,7 +249,7 @@ claude mcp add --transport stdio --scope user modavd '--' D:\ModAVD\tools\modavd
 
 ## 补全 Google 组件
 
-ModAVD 的发布包里没有 adb（平台工具 37.0.1）和 Android 14 Google APIs x86_64 系统镜像（r14，约 1.5 GB，解压后约 4.2 GB）：它们属于 Google，受《Android 软件开发套件许可协议》约束，不能再分发。`modavd components fetch` 从官方渠道下载、装进 `sdk\`，规则和随包的 `fetch-components.ps1`（「补全组件.bat」）一条一条对上：
+ModAVD 的发布包里没有 adb（平台工具 37.0.1）和 Android 14 Google APIs x86_64 系统镜像（r14，约 1.5 GB，解压后约 4.2 GB）：它们属于 Google，受《Android 软件开发套件许可协议》约束，不能再分发。`modavd components fetch` 从官方渠道下载、装进 `sdk\`。管理器检测页的「补全组件」按钮和这个命令共用同一套逻辑；首次交互运行会询问下载源并记住选择：
 
 - 先从镜像取 `repository2-3.xml` 里的许可协议全文并显示（注明取自哪个镜像、要下载哪些组件），输入 `y` 才继续，否则什么也不下，`downloads\` 里也不多出文件。`--accept-license` 不询问，但协议全文照样取回、照样显示，取不到照样退出；`--json` 时必须给，否则一律报 `usage`（退出码 2）：在看根目录之前就报，组件齐不齐都一样（0.3.0 及以前组件齐的时候会成功）。协议和提问不受 `--quiet` 影响。
 - 镜像依次试 googledownloads.cn → 腾讯云镜像 → dl.google.com，要下载时先打一行「下载源：…」说明这次用哪些、为什么（默认 / `--mirror` / `--mirror-url`）；`--mirror` 只用其中一个（不分大小写），`--mirror-url` 用自己的目录地址代替这三个（可写多次或用逗号隔开，按顺序试）。取不到许可协议清单的镜像，下载时排到最后。

internal/cli/cli.go

@@ -148,6 +148,7 @@ type deps struct {
 	resolveRoot     func(flag string) (*root.Root, error)
 	serveMCP        func(ctx context.Context, in io.Reader, out io.Writer, opt mcp.Options) error
 	fetchComponents func(ctx context.Context, r *root.Root, opt components.Options) (*components.Result, error)
+	stdinTerminal   func(io.Reader) bool
 }
 
 func defaultDeps() deps {
@@ -162,9 +163,17 @@ func defaultDeps() deps {
 		resolveRoot:     root.Resolve,
 		serveMCP:        mcp.Serve,
 		fetchComponents: components.Fetch,
+		stdinTerminal:   readerIsTerminal,
 	}
 }
 
+// readerIsTerminal: stdin is someone at a console (components fetch may ask which mirror to use), not a pipe, a
+// file or NUL. Platform part in terminal_*.go.
+func readerIsTerminal(r io.Reader) bool {
+	f, ok := r.(*os.File)
+	return ok && f != nil && fileIsTerminal(f)
+}
+
 // Main runs one command and returns the process exit code (errs.ExitCode, see the package comment).
 func Main(args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 	if len(args) > 0 {
@@ -242,6 +251,9 @@ func newLogger(w io.Writer, g globals) *logx.Logger {
 
 // run is Main without the process-wide setup.
 func run(ctx context.Context, args []string, stdin io.Reader, stdout, stderr io.Writer, d deps) int {
+	if d.stdinTerminal == nil {
+		d.stdinTerminal = readerIsTerminal
+	}
 	inv, perr := parseArgs(args)
 	log := newLogger(stderr, inv.globals)
 	out := &output{stdout: stdout, stderr: stderr, json: inv.json, raw: inv.cmd != nil && inv.cmd.raw, log: log}

internal/cli/commands.go

@@ -1,8 +1,10 @@
 package cli
 
 import (
+	"bufio"
 	"fmt"
 	"io"
+	"os"
 	"path/filepath"
 	"runtime"
 	"slices"
@@ -193,7 +195,7 @@ func init() {
 			run:     runCheck, human: humanOf(formatCheck),
 		},
 		{
-			name: "report-config", args: "[--no-clipboard]", summary: "复制电脑配置和实例里装的游戏（同「复制配置信息.bat」）",
+			name: "report-config", args: "[--no-clipboard]", summary: "复制电脑配置和实例里装的游戏",
 			details: "电脑、模拟器、硬件加速和开着的实例里装的游戏，显示出来并复制到剪贴板（--no-clipboard 不复制）。" +
 				"只读：只在实例开着、它的 adb server 已经在监听时按 adb 主机协议去问，不起 adb server、不调用 adb.exe、不碰 5037；" +
 				"不带用户名、电脑名和完整路径。目前只支持 Windows。",
@@ -202,25 +204,26 @@ func init() {
 		},
 		{
 			name: "collect-info", args: "[--out-dir 目录] [--stage-dir 目录] [--keep-stage] [--no-explorer]",
-			summary: "收集问题信息，打成 zip（同「收集问题信息.bat」）",
+			summary: "收集问题信息，打成 zip",
 			details: "打成「魔改AVD问题信息-<时间>.zip」，默认放桌面，再打开资源管理器选中它（--no-explorer 不打开）。" +
 				"--stage-dir 是暂存目录的父目录（默认 %TEMP%），--keep-stage 保留暂存目录。每一节单独收，出错写进 summary.txt 接着收下一节。" +
 				"只读：不收磁盘镜像，不收 AUTO-MAS 的配置和账号数据，不起 adb server、不碰 5037。目前只支持 Windows。",
 			flags: []flagSpec{optOutDir, optStageDir, optKeepStage, optNoExplorer}, final: true,
 			run: runCollectInfo, human: humanCollectInfo,
 		},
 		{
-			name: "components", args: "[status] | fetch [--accept-license] [--mirror ID] [--mirror-url URL] [--keep-downloads]",
+			name: "components", args: "[status] | source [auto|googledownloads_cn|tencent|google] | fetch [--accept-license] [--mirror ID] [--mirror-url URL] [--keep-downloads]",
 			summary: "查看或补全 Google 组件（adb 和系统镜像）",
-			details: "status（默认）查看组件，和 check 里的组件一样。fetch 做随包「补全组件.bat」做的事：" +
+			details: "status（默认）查看组件，和 check 里的组件一样。fetch 补全缺少的组件：" +
 				"先从镜像取《Android 软件开发套件许可协议》全文并显示，输入 y 同意才继续，否则什么也不下；" +
 				"再依次试 googledownloads.cn、腾讯云镜像、dl.google.com，下载缺少的 adb 和系统镜像（约 1.5 GB，中断了再运行会接着下），" +
 				"校验后装进 sdk\\。已经齐全的跳过；不完整的旧目录改名为 <目录>.incomplete-<时间> 留着，不删。" +
-				"--json 时必须给 --accept-license。只有 Windows 有组件清单，darwin、linux 返回 unsupported。" +
+				"不带参数时默认查看组件；source 查看或修改记住的下载源（auto、googledownloads_cn、tencent、google）。" +
+				"--json 时必须给 --accept-license（仅 fetch）。只有 Windows 有组件清单，darwin、linux 返回 unsupported。" +
 				"退出码：没同意许可协议是 2（license_declined），路径有中文、空间不够、不是魔改 AVD 的文件夹是 4，" +
 				"正在补全是 5，下不成是 9（components_unavailable），下载或解压后没通过校验也是 9（components_rejected）。",
 			flags:    fetchFlags,
-			posNames: []string{"status 或 fetch"}, maxPos: 1,
+			posNames: []string{"status、source 或 fetch", "下载源"}, maxPos: 2,
 			final: true,
 			run:   runComponents, human: formatComponents,
 		},
@@ -440,6 +443,15 @@ type ComponentsStatusResult struct {
 	Components []emu.ComponentStatus `json:"components"`
 }
 
+// ComponentsSourceResult is `components source`: the saved per-user choice.
+// Source is auto, one of the built-in mirror IDs, or custom when URLs are set.
+type ComponentsSourceResult struct {
+	Source     string   `json:"source"`
+	Mirror     string   `json:"mirror"`
+	MirrorURLs []string `json:"mirror_urls"`
+	Configured bool     `json:"configured"`
+}
+
 // ---- request building (pure, tested directly) --------------------------------------------------------------------
 
 func buildCreateRequest(inv *invocation) (emu.CreateRequest, error) {
@@ -880,8 +892,39 @@ func runComponents(c *cmdCtx) (any, error) {
 	if len(c.inv.pos) > 0 {
 		action = strings.ToLower(c.inv.pos[0])
 	}
-	if action != "fetch" && action != "status" {
-		return nil, errs.Newf(errs.Usage, "只能是 status 或 fetch，收到「%s」", c.inv.pos[0]).WithAdvice(findCommand("components").usageAdvice())
+	if action != "fetch" && action != "status" && action != "source" {
+		return nil, errs.Newf(errs.Usage, "只能是 status、source 或 fetch，收到「%s」", c.inv.pos[0]).WithAdvice(findCommand("components").usageAdvice())
+	}
+	if action == "source" {
+		for _, f := range fetchFlags {
+			if c.inv.isSet(f.name) {
+				return nil, errs.Newf(errs.Usage, "%s 只用于 components fetch", strings.Join([]string{"--" + f.name}, "、")).
+					WithAdvice(findCommand("components").usageAdvice())
+			}
+		}
+		if len(c.inv.pos) > 2 {
+			return nil, errs.New(errs.Usage, "components source 最多带一个下载源").WithAdvice(findCommand("components").usageAdvice())
+		}
+		if len(c.inv.pos) == 1 {
+			return componentsSourceResult(components.LoadSourceSettings()), nil
+		}
+		choice := strings.ToLower(strings.TrimSpace(c.inv.pos[1]))
+		if choice == "auto" {
+			choice = ""
+		}
+		if choice != "" {
+			if _, err := components.ChooseMirrors(choice, nil); err != nil {
+				return nil, err
+			}
+		}
+		s, err := components.SaveSourceSettings(choice, nil)
+		if err != nil {
+			return nil, err
+		}
+		return componentsSourceResult(s), nil
+	}
+	if len(c.inv.pos) > 1 {
+		return nil, errs.Newf(errs.Usage, "components %s 只接受一个参数", action).WithAdvice(findCommand("components").usageAdvice())
 	}
 	if action == "status" {
 		var given []string
@@ -900,13 +943,30 @@ func runComponents(c *cmdCtx) (any, error) {
 		}
 		return &ComponentsStatusResult{Root: r.Dir, Components: emu.ComponentStatuses(r.Components())}, nil
 	}
+	var (
+		r   *root.Root
+		err error
+	)
+	// Legacy releases kept the choice in <root>\downloads\source.txt. Read it
+	// once before the first interactive fetch, then use the per-user setting.
+	if !c.inv.isSet("mirror") && !c.inv.isSet("mirror-url") && !c.inv.json && !c.inv.boolOpt("accept-license") && c.deps.stdinTerminal(c.stdin) {
+		r, err = c.deps.resolveRoot(c.inv.root)
+		if err != nil {
+			return nil, err
+		}
+		if _, _, err := components.ImportLegacySource(r.Dir); err != nil {
+			return nil, err
+		}
+	}
 	opt, err := fetchOptions(c)
 	if err != nil {
 		return nil, err
 	}
-	r, err := c.deps.resolveRoot(c.inv.root)
-	if err != nil {
-		return nil, err
+	if r == nil {
+		r, err = c.deps.resolveRoot(c.inv.root)
+		if err != nil {
+			return nil, err
+		}
 	}
 	fetch := c.deps.fetchComponents
 	if fetch == nil {
@@ -919,16 +979,52 @@ func runComponents(c *cmdCtx) (any, error) {
 	return result, nil
 }
 
+func componentsSourceResult(s components.SourceSettings) *ComponentsSourceResult {
+	source := "auto"
+	if len(s.MirrorURLs) > 0 {
+		source = "custom"
+	} else if strings.TrimSpace(s.Mirror) != "" {
+		source = strings.ToLower(strings.TrimSpace(s.Mirror))
+	}
+	urls := append([]string{}, s.MirrorURLs...)
+	return &ComponentsSourceResult{Source: source, Mirror: s.Mirror, MirrorURLs: urls, Configured: s.Set}
+}
+
 // fetchOptions checks every option of components fetch (before the root is looked up) and wires the output: the
 // script's messages and progress lines go to the log, progress at most every 2 s like update; the license text and
 // the question are written whatever the log level (raw on stderr, or one log line each with --json).
 func fetchOptions(c *cmdCtx) (components.Options, error) {
 	inv := c.inv
+	input := c.stdin
+	if input == nil {
+		input = os.Stdin
+	}
 	o := components.Options{
-		AcceptLicense: inv.boolOpt("accept-license"), JSON: inv.json, Input: c.stdin,
+		AcceptLicense: inv.boolOpt("accept-license"), JSON: inv.json, Input: input,
 		KeepDownloads: inv.boolOpt("keep-downloads"), Mirror: inv.strOpt("mirror"), MirrorURLs: inv.strsOpt("mirror-url"),
 		Log: c.log,
 	}
+	// --mirror / --mirror-url win. Otherwise the saved per-user source; with none saved, someone at a console is
+	// asked once (and the answer saved), while --accept-license (automation), --json and a stdin that is not a
+	// console (pipe, file, NUL) are never asked: they use the default order and save nothing.
+	if !inv.isSet("mirror") && !inv.isSet("mirror-url") {
+		saved := components.LoadSourceSettings()
+		if !saved.Set && !o.AcceptLicense && !o.JSON && c.deps.stdinTerminal(input) {
+			buffered := bufio.NewReader(input)
+			choice, err := askComponentSource(c, buffered)
+			if err != nil {
+				return o, err
+			}
+			// Keep the reader that may already have buffered the answer to the
+			// subsequent license question.
+			o.Input = buffered
+			saved = choice
+		}
+		if saved.Set {
+			o.Mirror, o.MirrorURLs = saved.Mirror, append([]string(nil), saved.MirrorURLs...)
+			o.SourceOrigin = components.SourceFromSettings
+		}
+	}
 	for _, t := range []struct {
 		name string
 		d    *time.Duration
@@ -981,6 +1077,31 @@ func fetchOptions(c *cmdCtx) (components.Options, error) {
 	return o, nil
 }
 
+func askComponentSource(c *cmdCtx, input io.Reader) (components.SourceSettings, error) {
+	fmt.Fprintln(c.stderr, "组件下载源还没有设置，请选择：")
+	fmt.Fprintln(c.stderr, "  1. 自动（googledownloads_cn、tencent、google，按顺序尝试）")
+	fmt.Fprintln(c.stderr, "  2. googledownloads_cn")
+	fmt.Fprintln(c.stderr, "  3. tencent")
+	fmt.Fprintln(c.stderr, "  4. google")
+	fmt.Fprint(c.stderr, "选择 [1]：")
+	line, err := bufio.NewReader(input).ReadString('\n')
+	if err == io.EOF {
+		// EOF without an interactive answer means automatic order for this run;
+		// do not persist a choice inferred from a closed pipe.
+		return components.SourceSettings{}, nil
+	}
+	choice := strings.TrimSpace(line)
+	if choice == "" || choice == "1" {
+		return components.SaveSourceSettings("", nil)
+	}
+	ids := map[string]string{"2": "googledownloads_cn", "3": "tencent", "4": "google"}
+	mirror, ok := ids[choice]
+	if !ok {
+		return components.SourceSettings{}, errs.Newf(errs.InvalidArgument, "组件下载源编号无效：%s", choice)
+	}
+	return components.SaveSourceSettings(mirror, nil)
+}
+
 func runWindow(c *cmdCtx) (any, error) {
 	i, err := parseIndex(c.inv.pos[0])
 	if err != nil {