bookmark-research 0.5.0-beta.18 → 0.5.0-beta.20

package/.agents/plugins/marketplace.json

@@ -9,7 +9,7 @@
       "source": {
         "source": "npm",
         "package": "bookmark-research",
-        "version": "0.5.0-beta.18",
+        "version": "0.5.0-beta.20",
         "registry": "https://registry.npmjs.org"
       },
       "policy": {

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "bookmark-research",
-  "version": "0.5.0-beta.18",
+  "version": "0.5.0-beta.20",
   "description": "Check bookmark URLs or Canvas packages, compare sources with host-led research, and retain verifiable reports.",
   "author": {
     "name": "kwenxu"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bookmark-research",
-  "version": "0.5.0-beta.18",
+  "version": "0.5.0-beta.20",
   "description": "Check bookmark URLs or Canvas packages, compare sources with host-led research, and retain verifiable reports.",
   "license": "GPL-3.0-only",
   "repository": {

package/scripts/install.py

@@ -583,8 +583,16 @@ def _run_target(args, target, language):
 
 
 def _run_setup(args, installed, host, language, guided):
+    from settings import Settings
+    existing_config = Settings().path.is_file()
+    interactive = guided and (getattr(args, "interaction", "auto") == "always" or not existing_config)
+    if guided and existing_config and getattr(args, "interaction", "auto") != "always":
+        print(_message(language,
+                       "Retained existing configuration (%s). Run `bookmark-research setup` to modify preferences or keys." % Settings().path,
+                       "✓ 沿用已有研究偏好与密钥配置（%s）；如需修改请运行 bookmark-research setup。" % Settings().path),
+              file=sys.stderr)
     command = [sys.executable, "-B", str(installed / "src/cli.py"), "setup", "--lang", language,
-               "--host", _setup_host(host), "--interactive" if guided else "--non-interactive"]
+               "--host", _setup_host(host), "--interactive" if interactive else "--non-interactive"]
     if args.preferences:
         command.extend(["--input", args.preferences])
     if args.skip_checks:
@@ -592,7 +600,7 @@ def _run_setup(args, installed, host, language, guided):
     if args.test_retrieval:
         command.append("--test-retrieval")
     if not (installed / "src/onboarding.py").is_file():
-        requested = guided or bool(args.preferences) or args.test_retrieval
+        requested = interactive or bool(args.preferences) or args.test_retrieval
         return {"completed": False if requested else None, "status": "unsupported",
                 "message": "The installed version predates guided setup; install a newer version to use setup."}
     # The installed version owns its settings schema. Do not use the

package/src/onboarding.py

@@ -108,7 +108,7 @@ class Console(Prompter):
             with reader, writer:
                 yield cls(reader, writer, language)
 
-    def install_targets(self, args):
+    def install_targets(self, args, existing_targets=None):
         self.intro("Bookmark Research — guided installation", "Bookmark Research — 引导安装")
         requested = args.host
         if isinstance(requested, str):
@@ -119,57 +119,171 @@ class Console(Prompter):
         client = resolve_dsh(getattr(args, "dsh", None))
         if client["source"] == "desktop":
             args.dsh = client["binary"]
-        if requested:
-            hosts = list(dict.fromkeys(requested))
-        else:
-            found = {name: bool(shutil.which(getattr(args, name, None) or name)) for name, _, _ in HOSTS}
-            hints = {name: ("", None) if found[name] else ("CLI not found", "未找到 CLI") for name in found}
-            found["dsh"], hints["dsh"] = client["usable"], _dsh_hint(client)
-            if not any(found.values()):
-                self.warn("No supported host CLI (codex, claude, dsh) was found on PATH.",
-                          "PATH 中未找到任何受支持的宿主 CLI（codex、claude、dsh）。")
-                raise ValueError("No host CLI found; install Codex, Claude Code or DeepSeek Harness (dsh), "
-                                 "or pass --codex/--claude/--dsh PATH to point at its executable")
-            hosts = self.multiselect("Install into which hosts?", "安装到哪些宿主？", [
-                Option(name, en, zh, *hints[name], disabled=not found[name]) for name, en, zh in HOSTS],
-                [name for name, _, _ in HOSTS if found[name]])
-        # A carrier that ships its own pnpm is the Desktop CLI, however it was found:
-        # only that CLI may manage the profile name Desktop reserves for itself.
-        desktop = client["bundled_pnpm"] is not None
-        targets = []
-        for host in hosts:
-            label = next((en for name, en, _ in HOSTS if name == host), host)
-            target = {"host": host, "scope": None, "project": None, "profile": None}
-            if host == "claude":
-                scope = args.scope
-                if scope is None:
-                    options = [Option("user", "This user", "当前用户"), Option("project", "This project", "指定项目")]
-                    if host == "claude":
-                        options.append(Option("local", "This project, only for me", "指定项目（仅自己）"))
-                    scope = self.select(label + ": installation scope", label + "：安装范围", options, "user")
-                target["scope"] = scope
-                if scope in ("project", "local"):
-                    target["project"] = args.project or self.input(
-                        label + ": project directory", label + "：项目目录", str(Path.cwd()), _directory_problem)
-            elif host == "dsh":
-                # Never guess a DSH profile: it selects a distinct composed runtime.
-                target["profile"] = args.profile or self.dsh_profile(desktop)
-            targets.append(target)
-        lines = []
-        for target in targets:
-            label = next((en for name, en, _ in HOSTS if name == target["host"]), target["host"])
-            detail = ", ".join(key + "=" + target[key] for key in ("scope", "project", "profile") if target[key])
-            lines.append((label + (": " + detail if detail else ""), label + ("：" + detail if detail else "")))
-        self.note("Installation plan", "安装计划", lines)
-        if client["source"] == "desktop" and any(target["host"] == "dsh" for target in targets):
-            self.note("DeepSeek Harness (dsh) CLI", "DeepSeek Harness (dsh) CLI", [(client["binary"], client["binary"])])
-        if not self.confirm("Install now?", "现在安装？", True):
-            raise KeyboardInterrupt
-        first = targets[0]
-        args.host, args.scope, args.project, args.profile = first["host"], first["scope"], first["project"], first["profile"]
-        return targets
-
-    def dsh_profile(self, desktop):
+        if existing_targets is None and not requested:
+            try:
+                scripts_dir = Path(__file__).resolve().parents[1] / "scripts"
+                if str(scripts_dir) not in sys.path:
+                    sys.path.insert(0, str(scripts_dir))
+                from launcher import installed_targets
+                existing_targets = installed_targets(codex=getattr(args, "codex", "codex"))
+            except Exception:
+                existing_targets = []
+        if existing_targets and not requested:
+            target_version = None
+            try:
+                from export_bundle import read_plugin_manifest
+                target_version = read_plugin_manifest(Path(__file__).resolve().parents[1]).get("version")
+            except Exception:
+                pass
+            desc_lines = []
+            upgrade_options = []
+            for idx, row in enumerate(existing_targets):
+                h_name = row.get("host")
+                label = next((en for name, en, _ in HOSTS if name == h_name), h_name)
+                zh_label = next((zh for name, _, zh in HOSTS if name == h_name), h_name)
+                details = []
+                for k in ("scope", "project", "profile"):
+                    if row.get(k):
+                        details.append(k + "=" + str(row[k]))
+                ver = row.get("version")
+                ver_str = (" (v" + ver + ")") if ver else ""
+                det_str = (" [" + ", ".join(details) + "]") if details else ""
+                desc_lines.append((label + det_str + ver_str, zh_label + det_str + ver_str))
+
+                if target_version and ver:
+                    if target_version != ver.split("+")[0]:
+                        ver_hint_en = "v%s → v%s (upgrade)" % (ver, target_version)
+                        ver_hint_zh = "当前 v%s → 目标 v%s（升级覆盖）" % (ver, target_version)
+                    else:
+                        ver_hint_en = "v%s (latest) · overwrite" % ver
+                        ver_hint_zh = "当前已是最新 v%s · 覆盖更新" % ver
+                elif ver:
+                    ver_hint_en = "v%s" % ver
+                    ver_hint_zh = "当前版本 v%s" % ver
+                else:
+                    ver_hint_en = "installed"
+                    ver_hint_zh = "已安装"
+                upgrade_options.append(Option(
+                    str(idx),
+                    label + det_str,
+                    zh_label + det_str,
+                    ver_hint_en,
+                    ver_hint_zh,
+                    hint_always=True
+                ))
+
+            self.note("Detected existing installations", "检测到已安装宿主", desc_lines)
+            host_summary = ", ".join(row.get("host") for row in existing_targets)
+            mode = self.select("Installation mode", "请选择操作", [
+                Option("upgrade",
+                       "Upgrade / overwrite installed hosts (%d detected: %s)" % (len(existing_targets), host_summary),
+                       "升级覆盖已安装宿主（检测到 %d 个：%s）" % (len(existing_targets), host_summary),
+                       "select which hosts to upgrade, defaults to all",
+                       "回车默认全选升级，也可自选指定宿主",
+                       hint_always=True),
+                Option("custom",
+                       "Re-select hosts and customize options from scratch",
+                       "重新选择宿主与自定义配置",
+                       "choose hosts and options from scratch",
+                       "从头重新勾选宿主与参数")
+            ], "upgrade")
+            if mode == "upgrade":
+                if len(existing_targets) == 1:
+                    chosen = ["0"]
+                else:
+                    chosen = self.multiselect(
+                        "Select installed hosts to upgrade (Space to toggle, Enter to confirm)",
+                        "选择要升级覆盖的宿主？（空格 勾选/取消，回车 确认）",
+                        upgrade_options,
+                        defaults=[str(i) for i in range(len(existing_targets))]
+                    )
+                targets = [{"host": existing_targets[int(i)]["host"],
+                            "scope": existing_targets[int(i)].get("scope"),
+                            "project": existing_targets[int(i)].get("project"),
+                            "profile": existing_targets[int(i)].get("profile")}
+                           for i in chosen]
+                lines = []
+                for target in targets:
+                    label = next((en for name, en, _ in HOSTS if name == target["host"]), target["host"])
+                    detail = ", ".join(key + "=" + str(target[key]) for key in ("scope", "project", "profile") if target.get(key))
+                    lines.append((label + (": " + detail if detail else ""), label + ("：" + detail if detail else "")))
+                self.note("Upgrade plan", "升级覆盖计划", lines)
+                if client["source"] == "desktop" and any(target["host"] == "dsh" for target in targets):
+                    self.note("DeepSeek Harness (dsh) CLI", "DeepSeek Harness (dsh) CLI", [(client["binary"], client["binary"])])
+                if not self.confirm("Upgrade now?", "现在升级覆盖？", True):
+                    if not self.confirm("Re-select hosts and options?", "重新选择宿主与选项？", True):
+                        raise KeyboardInterrupt
+                else:
+                    first = targets[0]
+                    args.host, args.scope, args.project, args.profile = first["host"], first.get("scope"), first.get("project"), first.get("profile")
+                    return targets
+        while True:
+            if requested:
+                hosts = list(dict.fromkeys(requested))
+            else:
+                found = {name: bool(shutil.which(getattr(args, name, None) or name)) for name, _, _ in HOSTS}
+                hints = {name: ("", None) if found[name] else ("CLI not found", "未找到 CLI") for name in found}
+                found["dsh"], hints["dsh"] = client["usable"], _dsh_hint(client)
+                if not any(found.values()):
+                    self.warn("No supported host CLI (codex, claude, dsh) was found on PATH.",
+                              "PATH 中未找到任何受支持的宿主 CLI（codex、claude、dsh）。")
+                    raise ValueError("No host CLI found; install Codex, Claude Code or DeepSeek Harness (dsh), "
+                                     "or pass --codex/--claude/--dsh PATH to point at its executable")
+                preselected = [row["host"] for row in (existing_targets or []) if found.get(row.get("host"))] or [name for name, _, _ in HOSTS if found[name]]
+                hosts = self.multiselect("Install into which hosts? (Space to toggle, Enter to confirm)",
+                                         "安装到哪些宿主？（空格 勾选/取消，回车 确认）", [
+                    Option(name, en, zh, *hints[name], disabled=not found[name]) for name, en, zh in HOSTS],
+                    preselected)
+            # A carrier that ships its own pnpm is the Desktop CLI, however it was found:
+            # only that CLI may manage the profile name Desktop reserves for itself.
+            desktop = client["bundled_pnpm"] is not None
+            targets = []
+            go_back = False
+            for host in hosts:
+                label = next((en for name, en, _ in HOSTS if name == host), host)
+                target = {"host": host, "scope": None, "project": None, "profile": None}
+                if host == "claude":
+                    scope = args.scope
+                    if scope is None:
+                        options = [Option("user", "This user", "当前用户"), Option("project", "This project", "指定项目"),
+                                   Option("local", "This project, only for me", "指定项目（仅自己）")]
+                        if not requested:
+                            options.append(Option("back", "← Back to host selection", "← 返回重新选择宿主"))
+                        scope = self.select(label + ": installation scope", label + "：安装范围", options, "user")
+                        if scope == "back":
+                            go_back = True
+                            break
+                    target["scope"] = scope
+                    if scope in ("project", "local"):
+                        target["project"] = args.project or self.input(
+                            label + ": project directory", label + "：项目目录", str(Path.cwd()), _directory_problem)
+                elif host == "dsh":
+                    # Never guess a DSH profile: it selects a distinct composed runtime.
+                    profile = args.profile or self.dsh_profile(desktop, allow_back=not requested)
+                    if profile == "back":
+                        go_back = True
+                        break
+                    target["profile"] = profile
+                targets.append(target)
+            if go_back:
+                continue
+            lines = []
+            for target in targets:
+                label = next((en for name, en, _ in HOSTS if name == target["host"]), target["host"])
+                detail = ", ".join(key + "=" + target[key] for key in ("scope", "project", "profile") if target[key])
+                lines.append((label + (": " + detail if detail else ""), label + ("：" + detail if detail else "")))
+            self.note("Installation plan", "安装计划", lines)
+            if client["source"] == "desktop" and any(target["host"] == "dsh" for target in targets):
+                self.note("DeepSeek Harness (dsh) CLI", "DeepSeek Harness (dsh) CLI", [(client["binary"], client["binary"])])
+            if not self.confirm("Install now?", "现在安装？", True):
+                if not requested and self.confirm("Re-select hosts and options?", "重新选择宿主与选项？", True):
+                    continue
+                raise KeyboardInterrupt
+            first = targets[0]
+            args.host, args.scope, args.project, args.profile = first["host"], first["scope"], first["project"], first["profile"]
+            return targets
+
+    def dsh_profile(self, desktop, allow_back=False):
         """Choose an initialized DSH profile, or name a new one.
 
         `dsh plugin` initializes a profile on first use, so the profiles on disk
@@ -186,8 +300,12 @@ class Console(Prompter):
             return self.input(question[0], question[1], "desktop" if desktop else "", check)
         options = [Option(row["name"], row["name"], row["name"], *_profile_hint(row)) for row in rows]
         options.append(Option("", "Another profile name…", "其他 profile 名称…"))
+        if allow_back:
+            options.append(Option("back", "← Back to host selection", "← 返回重新选择宿主"))
         default = "desktop" if any(row["name"] == "desktop" for row in rows) else None
         chosen = self.select("Install into which DeepSeek Harness (dsh) profile?", "安装到哪个 DeepSeek Harness (dsh) profile？", options, default)
+        if chosen == "back":
+            return "back"
         if chosen:
             return chosen
         return self.input(question[0], question[1], "desktop" if desktop else "", check)

package/src/tui.py

@@ -449,8 +449,11 @@ class Prompter:
             while True:
                 lines = self._render_list(question, options, cursor, chosen, True, message)
                 if not message:
-                    lines[-1] = "%s  %s" % (self._color("36", "└"), self._color("2", self.text(
-                        "space toggle · a all · enter confirm", "空格 切换 · a 全选 · 回车 确认")))
+                    shortcut_hint = self.text(
+                        "[Space] toggle  [a] all/none  [Enter] confirm",
+                        "[空格] 勾选/取消  [a] 全选/全不选  [回车] 确认",
+                    )
+                    lines[-1] = "%s  %s" % (self._color("36", "└"), self._color("36", shortcut_hint))
                 drawn = self._redraw(lines, drawn)
                 key = self._key()
                 message = None