chatup 0.2.14__tar.gz → 0.2.16__tar.gz

{chatup-0.2.14/src/chatup.egg-info → chatup-0.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatup
-Version: 0.2.14
+Version: 0.2.16
 Summary: ChatArch setup CLI extracted from ChatTool
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -62,6 +62,8 @@ chatup playwright install 1.61.1 -I
 chatup workspace default ~/Playground
 ```
 
+`chatup uv` 默认更新已有 `~/.bashrc`、`~/.zshrc` 的自动激活块；使用 `chatup uv --no-activate` 可保持启动配置不变。不会创建缺失的 rc 文件，Windows 跳过此项。
+
 常见安装命令：
 
 ```bash
@@ -74,16 +76,29 @@ chatup nginx proxy-pass ./gitea-local.conf --set SERVER_NAME=gitea.local.example
 chatup crs --install-dir ~/.chatarch/crs/local --port 12392 --redis-port 6379
 ```
 
+## ChatGPT / Codex 桌面应用
+
+```bash
+chatup chatgpt --dry-run
+chatup chatgpt
+chatup chatgpt --yes  # Windows 首次安装时接受 Store 协议
+```
+
+安装包含 Codex 的新版官方 ChatGPT 桌面应用。macOS 需要 Homebrew，Windows 需要 WinGet；Linux preview 暂按[官方说明](https://learn.chatgpt.com/docs/linux/linux-app)手动安装。现有 `chatup codex` 仍安装/配置 Codex CLI。不会自动启动、登录或升级已有应用；[完整约定](https://arch.gh.wzhecnu.cn/ChatUp/commands/#chatgpt-desktop)。
+
+`chatup codex`、`chatup hermes` 未配置模型时默认使用 `gpt-5.6-terra`；用户指定的模型和已有配置仍优先。
+
 ## 当前能力
 
 | 能力组 | 命令 |
 | --- | --- |
 | 基础运行环境 | `doctor`、`uv`、`nodejs`、`docker`、`zsh`、`chrome-for-testing`、`chromedriver`、`playwright`、`frp` |
 | 工作区脚手架 | `workspace` |
+| 官方桌面应用 | `chatgpt`（含 Codex） |
 | 本地服务安装 | `gitea`、`discourse`、`zulip`、`mysql`、`nginx`、`crs` |
 | Agent 工具链 | `cc-connect`、`claude`、`codex`、`cursor-agent`、`opencode`、`hermes`、`lark-cli` |
 
-所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
+桌面应用使用系统包管理器的原生目录；ChatArch 自管安装项默认目录收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
 
 ## 开发
 

{chatup-0.2.14 → chatup-0.2.16}/README.md

@@ -31,6 +31,8 @@ chatup playwright install 1.61.1 -I
 chatup workspace default ~/Playground
 ```
 
+`chatup uv` 默认更新已有 `~/.bashrc`、`~/.zshrc` 的自动激活块；使用 `chatup uv --no-activate` 可保持启动配置不变。不会创建缺失的 rc 文件，Windows 跳过此项。
+
 常见安装命令：
 
 ```bash
@@ -43,16 +45,29 @@ chatup nginx proxy-pass ./gitea-local.conf --set SERVER_NAME=gitea.local.example
 chatup crs --install-dir ~/.chatarch/crs/local --port 12392 --redis-port 6379
 ```
 
+## ChatGPT / Codex 桌面应用
+
+```bash
+chatup chatgpt --dry-run
+chatup chatgpt
+chatup chatgpt --yes  # Windows 首次安装时接受 Store 协议
+```
+
+安装包含 Codex 的新版官方 ChatGPT 桌面应用。macOS 需要 Homebrew，Windows 需要 WinGet；Linux preview 暂按[官方说明](https://learn.chatgpt.com/docs/linux/linux-app)手动安装。现有 `chatup codex` 仍安装/配置 Codex CLI。不会自动启动、登录或升级已有应用；[完整约定](https://arch.gh.wzhecnu.cn/ChatUp/commands/#chatgpt-desktop)。
+
+`chatup codex`、`chatup hermes` 未配置模型时默认使用 `gpt-5.6-terra`；用户指定的模型和已有配置仍优先。
+
 ## 当前能力
 
 | 能力组 | 命令 |
 | --- | --- |
 | 基础运行环境 | `doctor`、`uv`、`nodejs`、`docker`、`zsh`、`chrome-for-testing`、`chromedriver`、`playwright`、`frp` |
 | 工作区脚手架 | `workspace` |
+| 官方桌面应用 | `chatgpt`（含 Codex） |
 | 本地服务安装 | `gitea`、`discourse`、`zulip`、`mysql`、`nginx`、`crs` |
 | Agent 工具链 | `cc-connect`、`claude`、`codex`、`cursor-agent`、`opencode`、`hermes`、`lark-cli` |
 
-所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
+桌面应用使用系统包管理器的原生目录；ChatArch 自管安装项默认目录收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
 
 ## 开发
 

{chatup-0.2.14 → chatup-0.2.16}/src/chatup/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.14"
+__version__ = "0.2.16"

chatup-0.2.16/src/chatup/setup/chatgpt.py

@@ -0,0 +1,132 @@
+"""Install the official ChatGPT desktop app (the successor to Codex App).
+
+The OS package manager owns downloads, signatures, application paths and state.
+This module never launches the app or changes Codex CLI configuration/auth.
+"""
+from __future__ import annotations
+
+import platform
+import shutil
+import subprocess
+from typing import Any
+
+CHATGPT_CASK = "homebrew/cask/chatgpt"
+CHATGPT_STORE_ID = "9PLM9XGG6VKS"
+DOWNLOAD_URL = "https://chatgpt.com/download/"
+LINUX_GUIDE_URL = "https://learn.chatgpt.com/docs/linux/linux-app"
+
+
+def plan_chatgpt_install(*, yes: bool = False) -> dict[str, Any]:
+    """Return a side-effect-free install plan for the current OS.
+
+    ``yes`` explicitly accepts Microsoft Store source/package agreements.
+    Homebrew/WinGet resolve the current release and enforce OS/CPU requirements.
+    Linux preview installation is deliberately not automated here.
+    """
+    system = platform.system()
+    if system == "Darwin":
+        manager = "brew"
+        package = CHATGPT_CASK
+        command = [manager, "install", "--cask", package]
+        verify_command = [manager, "list", "--cask", "--versions", package]
+        manager_url = "https://brew.sh/"
+    elif system == "Windows":
+        manager = "winget"
+        package = CHATGPT_STORE_ID
+        selector = ["--id", package, "--exact", "--source", "msstore", "--disable-interactivity"]
+        command = [manager, "install", *selector, "--no-upgrade"]
+        verify_command = [manager, "list", *selector]
+        if yes:
+            command += ["--accept-package-agreements", "--accept-source-agreements"]
+            verify_command += ["--accept-source-agreements"]
+        manager_url = "https://aka.ms/getwinget"
+    else:
+        guide = LINUX_GUIDE_URL if system == "Linux" else DOWNLOAD_URL
+        raise RuntimeError(
+            f"ChatUp automates ChatGPT desktop installation on macOS and Windows only; "
+            f"current platform: {system}. Official downloads/instructions: {guide}"
+        )
+    return {
+        "app": "ChatGPT (includes Codex)",
+        "platform": system,
+        "manager": manager,
+        "manager_url": manager_url,
+        "package": package,
+        "command": command,
+        "verify_command": verify_command,
+        "download_url": DOWNLOAD_URL,
+    }
+
+
+def _is_installed(plan: dict[str, Any], executable: str) -> bool:
+    result = subprocess.run(
+        [executable, *plan["verify_command"][1:]],
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+        check=False,
+        timeout=60,
+    )
+    if result.returncode != 0 or not result.stdout.strip():
+        return False
+    if plan["manager"] == "brew":
+        for line in result.stdout.splitlines():
+            parts = line.split()
+            if len(parts) < 2 or parts[0] != "chatgpt":
+                continue
+            if any(version.startswith("1.") for version in parts[1:]):
+                raise RuntimeError(
+                    "An older ChatGPT Classic cask is registered as chatgpt. "
+                    "Migrate it manually with Homebrew before installing the new "
+                    f"ChatGPT/Codex app: {DOWNLOAD_URL}"
+                )
+            return True
+        return False
+    # WinGet's exact Store selector exits zero only when a matching package exists.
+    return True
+
+
+def setup_chatgpt(*, dry_run: bool = False, yes: bool = False) -> dict[str, Any]:
+    """Install if absent, then verify registration with the package manager.
+
+    Returns the plan plus ``status`` (planned/already_installed/installed) and
+    ``verified``. Dry-run does not require or invoke a package manager. Existing
+    installations are not upgraded, overwritten or migrated; authentication and
+    launching remain user actions. Raises RuntimeError on failed/unknown results.
+    """
+    plan = plan_chatgpt_install(yes=yes)
+    result = {**plan, "status": "planned", "verified": False}
+    if dry_run:
+        return result
+    executable = shutil.which(plan["manager"])
+    if not executable:
+        raise RuntimeError(
+            f"Required package manager {plan['manager']} is not on PATH. "
+            f"Install it first: {plan['manager_url']} or download manually: {DOWNLOAD_URL}"
+        )
+    try:
+        if _is_installed(plan, executable):
+            return {**result, "status": "already_installed", "verified": True}
+        installed = subprocess.run(
+            [executable, *plan["command"][1:]], check=False, timeout=1800,
+        )
+        if installed.returncode != 0:
+            hint = " Use --yes to accept Store agreements." if plan["manager"] == "winget" and not yes else ""
+            raise RuntimeError(
+                f"ChatGPT installer failed (exit {installed.returncode}). "
+                f"Check the package manager output above.{hint}"
+            )
+        if not _is_installed(plan, executable):
+            raise RuntimeError(
+                "ChatGPT installation verification failed. Check the package manager "
+                "state before retrying; installation success is not confirmed."
+            )
+    except subprocess.TimeoutExpired as exc:
+        raise RuntimeError(
+            "ChatGPT package manager timed out; the installation state is unknown. "
+            "Check the package manager before retrying."
+        ) from exc
+    except OSError as exc:
+        raise RuntimeError(f"Cannot execute {plan['manager']}: {exc}") from exc
+    return {**result, "status": "installed", "verified": True}

{chatup-0.2.14 → chatup-0.2.16}/src/chatup/setup/claude.py

@@ -1,6 +1,8 @@
 import json
 from pathlib import Path
 
+from chatup.utils.platforming import chmod_private
+
 DEFAULT_BASE_URL = "https://api.anthropic.com/v1"
 DEFAULT_SMALL_FAST_MODEL = "claude-opus-4-6"
 
@@ -223,7 +225,7 @@ def setup_claude(
     settings_path.write_text(
         json.dumps(settings_json, ensure_ascii=False, indent=2) + "\n", encoding="utf-8"
     )
-    settings_path.chmod(0o600)
+    chmod_private(settings_path)
     logger.info(f"Wrote settings file: {settings_path}")
 
     config_json = {"primaryApiKey": primary_api_key}
@@ -231,7 +233,7 @@ def setup_claude(
     config_path.write_text(
         json.dumps(config_json, ensure_ascii=False, indent=2) + "\n", encoding="utf-8"
     )
-    config_path.chmod(0o600)
+    chmod_private(config_path)
     logger.info(f"Wrote config file: {config_path}")
 
     click.echo("Claude Code setup completed.")

{chatup-0.2.14 → chatup-0.2.16}/src/chatup/setup/codex.py

@@ -28,8 +28,9 @@ from chatup.setup.nodejs import (
     should_install_global_npm_package,
 )
 from chatup.utils.custom_logger import setup_logger
+from chatup.utils.platforming import chmod_private
 
-DEFAULT_MODEL = "gpt-5.5"
+DEFAULT_MODEL = "gpt-5.6-terra"
 DEFAULT_BASE_URL = "https://api.openai.com/v1"
 DEFAULT_AUTH_METHOD = "apikey"
 _ENV_VAR_REF_RE = re.compile(r"\$(?:\{[^}]+\}|[A-Za-z_][A-Za-z0-9_]*)")
@@ -207,7 +208,7 @@ def _write_codex_config(config_path: Path, *, model: str, base_url: str) -> list
     )
     config_path.parent.mkdir(parents=True, exist_ok=True)
     config_path.write_text(content, encoding="utf-8")
-    config_path.chmod(0o600)
+    chmod_private(config_path)
     logger.info(f"Patched config file: {config_path}")
     return changed_root + changed_provider
 
@@ -216,13 +217,13 @@ def _write_private_text(path: Path, content: str) -> None:
     path.parent.mkdir(parents=True, exist_ok=True)
     fd, tmp_name = tempfile.mkstemp(prefix=f".{path.name}.", dir=path.parent)
     try:
-        os.chmod(tmp_name, 0o600)
+        chmod_private(Path(tmp_name))
         with os.fdopen(fd, "w", encoding="utf-8") as handle:
             handle.write(content)
             handle.flush()
             os.fsync(handle.fileno())
         os.replace(tmp_name, path)
-        path.chmod(0o600)
+        chmod_private(path)
     except Exception:
         try:
             os.close(fd)

{chatup-0.2.14 → chatup-0.2.16}/src/chatup/setup/crs.py

@@ -12,6 +12,7 @@ import click
 from chatup.interaction import abort_if_force_without_tty, resolve_interactive_mode
 from chatup.setup.nodejs import ensure_nodejs_requirement
 from chatup.utils.custom_logger import setup_logger
+from chatup.utils.platforming import chmod_private, require_non_windows
 
 logger = setup_logger("setup_crs")
 
@@ -146,7 +147,7 @@ def write_secret_file(path: Path) -> dict[str, str]:
     old_umask = os.umask(0o077)
     try:
         path.write_text("".join(f"{key}={value}\n" for key, value in values.items()), encoding="utf-8")
-        path.chmod(0o600)
+        chmod_private(path)
     finally:
         os.umask(old_umask)
     return values
@@ -178,7 +179,7 @@ def write_env_file(crs_root: Path, *, port: int, redis_port: int, secrets_values
         ),
         encoding="utf-8",
     )
-    env_path.chmod(0o600)
+    chmod_private(env_path)
     return env_path
 
 
@@ -234,6 +235,7 @@ def setup_crs(
 
     if smoke and not start:
         raise click.ClickException("--smoke requires --start; pass --no-smoke when using --no-start.")
+    require_non_windows("chatup crs")
 
     node_runtime = ensure_nodejs_requirement(
         interactive=interactive,
@@ -302,7 +304,7 @@ def setup_crs(
             stdout=log_file,
             stderr=subprocess.STDOUT,
         )
-    setup_log.chmod(0o600)
+    chmod_private(setup_log)
 
     run_command(npm_command(node_runtime, "run", "install:web"), cwd=crs_root, env=npm_env)
     run_command(npm_command(node_runtime, "run", "build:web"), cwd=crs_root, env=npm_env)

{chatup-0.2.14 → chatup-0.2.16}/src/chatup/setup/cursor_agent.py

@@ -5,7 +5,6 @@ import os
 from pathlib import Path
 import shutil
 import shlex
-import stat
 import subprocess
 from typing import Any
 
@@ -15,6 +14,7 @@ from chatenv.store import EnvStore
 
 from chatup.config import CursorAgentConfig
 from chatup.utils.custom_logger import setup_logger
+from chatup.utils.platforming import chmod_executable, chmod_private, is_windows, user_bin_candidates
 
 DEFAULT_INSTALL_URL = "https://cursor.com/install"
 CREDENTIAL_STORE_CHOICES = ("native", "file-wrapper")
@@ -44,10 +44,7 @@ def _cursor_agent_state_path() -> Path:
 
 
 def _chmod_private(path: Path) -> None:
-    try:
-        path.chmod(0o600)
-    except PermissionError:
-        logger.warning(f"Could not chmod private file: {path}")
+    chmod_private(path)
 
 
 def _read_json_file(path: Path) -> dict[str, Any]:
@@ -168,9 +165,16 @@ def _resolve_command_or_user_bin(name: str) -> Path | None:
     found = shutil.which(name)
     if found:
         candidates.append(Path(found).expanduser())
-    candidates.append(Path.home() / ".local" / "bin" / name)
+    candidates.extend(user_bin_candidates(name))
+    if is_windows():
+        candidates.extend(
+            [
+                Path.home() / ".local" / "bin" / f"{name}.cmd",
+                Path.home() / ".local" / "bin" / f"{name}.bat",
+            ]
+        )
     for candidate in candidates:
-        if candidate.exists() and os.access(candidate, os.X_OK):
+        if candidate.exists() and (is_windows() or os.access(candidate, os.X_OK)):
             return candidate
     return None
 
@@ -190,14 +194,19 @@ def _managed_wrapper_official_target(entrypoint: Path) -> Path | None:
     if WRAPPER_MARKER not in text:
         return None
     for line in text.splitlines():
-        if line.startswith("CHATUP_CURSOR_AGENT_OFFICIAL="):
-            value = line.split("=", 1)[1]
+        stripped = line.strip()
+        if stripped.startswith("CHATUP_CURSOR_AGENT_OFFICIAL="):
+            value = stripped.split("=", 1)[1]
             try:
                 parts = shlex.split(value)
             except ValueError:
                 return None
             if parts:
                 return Path(parts[0])
+        if stripped.lower().startswith('set "chatup_cursor_agent_official=') and stripped.endswith('"'):
+            value = stripped.split("=", 1)[1][:-1]
+            if value:
+                return Path(value)
     return None
 
 
@@ -231,7 +240,24 @@ def _write_file_credential_wrapper(entrypoint: Path, official_binary: Path, auth
     if existing_target and existing_target == entrypoint:
         raise click.ClickException(f"Refusing to wrap Cursor Agent entrypoint that resolves to itself: {entrypoint}")
     official = official_binary.expanduser()
-    script = f'''#!/usr/bin/env bash
+    if is_windows():
+        script = f'''@echo off
+rem {WRAPPER_MARKER}.
+rem This wrapper does not store token values; it reads Cursor auth.json at runtime.
+set "CHATUP_CURSOR_AGENT_OFFICIAL={official}"
+if "%CURSOR_AGENT_AUTH_JSON%"=="" (
+  set "CHATUP_CURSOR_AGENT_AUTH_JSON={auth_path}"
+) else (
+  set "CHATUP_CURSOR_AGENT_AUTH_JSON=%CURSOR_AGENT_AUTH_JSON%"
+)
+if "%AGENT_CLI_CREDENTIAL_STORE%"=="" set "AGENT_CLI_CREDENTIAL_STORE=file"
+if "%CURSOR_AUTH_TOKEN%"=="" if exist "%CHATUP_CURSOR_AGENT_AUTH_JSON%" (
+  for /f "usebackq delims=" %%T in (`python -c "import json,sys; print(json.load(open(sys.argv[1], encoding='utf-8')).get('accessToken',''), end='')" "%CHATUP_CURSOR_AGENT_AUTH_JSON%"`) do set "CURSOR_AUTH_TOKEN=%%T"
+)
+"%CHATUP_CURSOR_AGENT_OFFICIAL%" %*
+'''
+    else:
+        script = f'''#!/usr/bin/env bash
 set -euo pipefail
 # {WRAPPER_MARKER}.
 # This wrapper does not store token values; it reads Cursor auth.json at runtime.
@@ -256,13 +282,19 @@ fi
 exec -a "$0" "$CHATUP_CURSOR_AGENT_OFFICIAL" "$@"
 '''
     entrypoint.write_text(script, encoding="utf-8")
-    entrypoint.chmod(0o755)
+    chmod_executable(entrypoint)
     return True
 
 
 def _write_file_credential_wrappers(binary: str) -> list[str]:
     official = _resolve_official_cursor_agent_binary(binary)
     written: list[str] = []
+    if is_windows():
+        for name in ("cursor-agent", "agent"):
+            entrypoint = official.parent / f"{name}.cmd"
+            if _write_file_credential_wrapper(entrypoint, official, _cursor_auth_path()):
+                written.append(str(entrypoint))
+        return written
     for name in ("cursor-agent", "agent"):
         entrypoint = _entrypoint_for(name)
         if not entrypoint:
@@ -278,6 +310,10 @@ def _write_file_credential_wrappers(binary: str) -> list[str]:
 def _install_cursor_agent_if_needed(*, install_url: str = DEFAULT_INSTALL_URL) -> bool:
     if _resolve_cursor_agent_binary():
         return False
+    if is_windows():
+        raise click.ClickException(
+            "Cursor Agent was not found on PATH. Install Cursor Agent for Windows first, then rerun ChatUp."
+        )
     script = subprocess.run(
         ["bash", "-lc", f"curl -fsSL {install_url!r} | bash"],
         text=True,

{chatup-0.2.14 → chatup-0.2.16}/src/chatup/setup/discourse.py

@@ -105,7 +105,9 @@ def ensure_directories(home: Path) -> dict[str, Path]:
     }
     for path in paths.values():
         path.mkdir(parents=True, exist_ok=True)
-    paths["secrets"].chmod(0o700)
+    from chatup.utils.platforming import chmod_private_dir
+
+    chmod_private_dir(paths["secrets"])
     return paths
 
 
@@ -162,7 +164,9 @@ def setup_discourse(
                 render_app_yml(hostname=hostname, port=port, shared_dir=paths["shared"], with_ai=with_ai),
                 encoding="utf-8",
             )
-            app_yml.chmod(0o640)
+            from chatup.utils.platforming import chmod_private
+
+            chmod_private(app_yml)
 
     if clone:
         clone_or_update_discourse_docker(paths["docker"], repo)

{chatup-0.2.14 → chatup-0.2.16}/src/chatup/setup/docker.py

@@ -14,6 +14,7 @@ from chatup.interaction import (
     resolve_interactive_mode,
 )
 from chatup.utils.custom_logger import setup_logger
+from chatup.utils.platforming import is_windows
 
 logger = setup_logger("setup_docker")
 DOCKER_COMPOSE_VERSION = "v2.22.0"
@@ -26,7 +27,10 @@ def _configure_logger(log_level="INFO"):
 
 
 def _run(command: list[str]) -> subprocess.CompletedProcess:
-    return subprocess.run(command, capture_output=True, text=True)
+    try:
+        return subprocess.run(command, capture_output=True, text=True)
+    except FileNotFoundError as exc:
+        return subprocess.CompletedProcess(command, 127, "", str(exc))
 
 
 def _ensure_success(result: subprocess.CompletedProcess, step_name: str) -> None:
@@ -103,6 +107,20 @@ def setup_docker(interactive=None, use_sudo=False, log_level="INFO"):
     )
     abort_if_force_without_tty(force_interactive, can_prompt, usage)
 
+    if is_windows():
+        docker_version = _docker_version()
+        if docker_version:
+            click.echo(f"Docker already installed: {docker_version}")
+        else:
+            click.echo("Docker CLI not found. Install Docker Desktop for Windows and ensure `docker` is on PATH.")
+        compose_version = _docker_compose_version()
+        if compose_version:
+            click.echo(f"Docker Compose already installed: {compose_version}")
+        else:
+            click.echo("Docker Compose not found. Docker Desktop usually provides `docker compose`.")
+        click.echo("Docker group/systemd checks are skipped on Windows.")
+        return {"docker": docker_version, "compose": compose_version, "platform": "windows"}
+
     logger.info("Start docker setup")
     user_name = _get_user_name()
 

{chatup-0.2.14 → chatup-0.2.16}/src/chatup/setup/elements.py

@@ -6,7 +6,8 @@ import click
 from chatstyle import INTERACTIVE_OPTION_HELP
 
 from chatup.setup.claude import setup_claude
-from chatup.setup.codex import setup_codex
+from chatup.setup.codex import DEFAULT_MODEL as DEFAULT_CODEX_MODEL, setup_codex
+from chatup.setup.chatgpt import setup_chatgpt
 from chatup.setup.cursor_agent import CREDENTIAL_STORE_CHOICES, setup_cursor_agent
 from chatup.setup.cc_connect import setup_cc_connect
 import chatup.setup.crs as crs_module
@@ -37,7 +38,7 @@ from chatup.setup.gitea import (
     DEFAULT_WORK_DIR as DEFAULT_GITEA_WORK_DIR,
     setup_gitea,
 )
-from chatup.setup.hermes import setup_hermes
+from chatup.setup.hermes import DEFAULT_MODEL as DEFAULT_HERMES_MODEL, setup_hermes
 from chatup.setup.lark_cli import setup_lark_cli
 from chatup.setup.mysql import (
     DEFAULT_MYSQL_BIND_ADDRESS,
@@ -62,7 +63,7 @@ from chatup.setup.twikoo import (
     DEFAULT_TWIKOO_VERSION,
     setup_twikoo,
 )
-from chatup.setup.uv import DEFAULT_PYTHON_VERSION, DEFAULT_VENV_PATH, setup_uv
+from chatup.setup.uv import DEFAULT_PYTHON_VERSION, setup_uv
 from chatup.setup.workspace import setup_workspace
 from chatup.setup.zsh import setup_zsh
 from chatup.setup.zulip import (
@@ -102,8 +103,14 @@ def nodejs_setup(interactive, log_level):
     setup_nodejs(interactive=interactive, log_level=log_level)
 
 
-def uv_setup(venv, python_version, force, log_level):
-    setup_uv(venv=venv, python_version=python_version, force=force, log_level=log_level)
+def uv_setup(venv, python_version, force, log_level, shell_activate):
+    setup_uv(
+        venv=venv,
+        python_version=python_version,
+        force=force,
+        log_level=log_level,
+        shell_activate=shell_activate,
+    )
 
 
 def docker_setup(sudo, interactive, log_level):
@@ -120,6 +127,20 @@ def zsh_setup(omz, aliases, login_shell, interactive, log_level):
     )
 
 
+def chatgpt_setup(dry_run, yes):
+    try:
+        result = setup_chatgpt(dry_run=dry_run, yes=yes)
+    except RuntimeError as exc:
+        raise click.ClickException(str(exc)) from exc
+    click.echo(result["app"])
+    if result["status"] == "planned":
+        click.echo("预览安装命令（未执行）：" + " ".join(result["command"]))
+    elif result["status"] == "already_installed":
+        click.echo("已安装，并已通过包管理器回读确认；未升级或启动应用。")
+    else:
+        click.echo("安装完成，已通过包管理器回读确认。请手动打开 ChatGPT 并登录。")
+
+
 def codex_setup(api_key, base_url, model, env, interactive, install_only, log_level):
     setup_codex(
         api_key=api_key,
@@ -1231,7 +1252,7 @@ SETUP_COMMAND_ELEMENTS = (
             SetupOptionElement(
                 param_decls=("--venv", "--venv-path"),
                 kwargs={
-                    "default": str(DEFAULT_VENV_PATH),
+                    "default": "~/.chatarch/venv",
                     "show_default": True,
                     "help": "Target ChatArch Python virtual environment path.",
                 },
@@ -1251,6 +1272,29 @@ SETUP_COMMAND_ELEMENTS = (
                     "help": "Clear and recreate the target environment if it already exists.",
                 },
             ),
+            SetupOptionElement(
+                param_decls=("--activate/--no-activate", "shell_activate"),
+                kwargs={
+                    "default": True,
+                    "show_default": True,
+                    "help": "Update auto-activation in existing ~/.bashrc and ~/.zshrc (POSIX only).",
+                },
+            ),
+        ),
+    ),
+    SetupCommandElement(
+        name="chatgpt",
+        help="Install the official ChatGPT desktop app (includes Codex), not the Codex CLI.",
+        callback=chatgpt_setup,
+        options=(
+            SetupOptionElement(
+                param_decls=("--dry-run",),
+                kwargs={"is_flag": True, "help": "Show the install plan without executing or downloading anything."},
+            ),
+            SetupOptionElement(
+                param_decls=("--yes", "-y"),
+                kwargs={"is_flag": True, "help": "Accept Microsoft Store source/package agreements on Windows."},
+            ),
         ),
     ),
     SetupCommandElement(
@@ -1282,7 +1326,10 @@ SETUP_COMMAND_ELEMENTS = (
             ),
             SetupOptionElement(
                 param_decls=("--model",),
-                kwargs={"default": None, "help": "Optional default model name."},
+                kwargs={
+                    "default": None,
+                    "help": f"Optional model override; fallback: {DEFAULT_CODEX_MODEL}.",
+                },
             ),
             SetupOptionElement(
                 param_decls=("-e", "--env"),
@@ -1545,7 +1592,7 @@ SETUP_COMMAND_ELEMENTS = (
             ),
             SetupOptionElement(
                 param_decls=("--model",),
-                kwargs={"default": None, "help": "Hermes default model."},
+                kwargs={"default": None, "help": f"Hermes model override; fallback: {DEFAULT_HERMES_MODEL}."},
             ),
             SetupOptionElement(
                 param_decls=("--with-webui-env",),