chattool 7.0.3__tar.gz → 7.0.5__tar.gz

{chattool-7.0.3/src/chattool.egg-info → chattool-7.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chattool
-Version: 7.0.3
+Version: 7.0.5
 Summary: Toolkit for Chat API
 Author-email: Rex Wang <1073853456@qq.com>
 License: MIT license
@@ -17,6 +17,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Click>=7.0
+Requires-Dist: chatgh>=0.2.4
 Requires-Dist: chatstyle>=0.1.0
 Requires-Dist: chatenv>=0.1.1
 Requires-Dist: requests>=2.20
@@ -58,8 +59,6 @@ Requires-Dist: uvicorn; extra == "serve"
 Requires-Dist: pydantic>=2.0.0; extra == "serve"
 Provides-Extra: mcp
 Requires-Dist: fastmcp; python_version >= "3.10" and extra == "mcp"
-Provides-Extra: github
-Requires-Dist: PyGithub; extra == "github"
 Provides-Extra: client
 Requires-Dist: gitpython; extra == "client"
 Requires-Dist: rich; extra == "client"
@@ -67,7 +66,7 @@ Provides-Extra: pypi
 Requires-Dist: build; extra == "pypi"
 Requires-Dist: twine; extra == "pypi"
 Provides-Extra: tools
-Requires-Dist: chattool[batch,browser,client,dns,github,images,interactive,lark,mcp,screenshot,serve]; extra == "tools"
+Requires-Dist: chattool[batch,browser,client,dns,images,interactive,lark,mcp,screenshot,serve]; extra == "tools"
 Provides-Extra: tests
 Requires-Dist: coverage; extra == "tests"
 Requires-Dist: pytest>=3; extra == "tests"
@@ -81,6 +80,7 @@ Requires-Dist: mkdocs-static-i18n>=0.53; extra == "docs"
 Requires-Dist: mkdocs-awesome-pages-plugin>=2.8.0; extra == "docs"
 Requires-Dist: mkdocs-redirects>=1.2.0; extra == "docs"
 Requires-Dist: mike>=1.1.2; extra == "docs"
+Requires-Dist: pyparsing>=3.0; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: wheel; extra == "dev"
 Requires-Dist: build; extra == "dev"
@@ -231,10 +231,11 @@ chattool nginx -i  # 交互式选择模板并逐项填写
 ```bash
 chattool image pollinations generate "a cat in space" -o cat.png
 chattool image siliconflow generate "a cute dog" -o dog.png
+chattool image codex generate "a watercolor fox"
 chattool image huggingface generate
 ```
 
-交互终端里，各家 `generate` 命令缺少 `prompt` 时会自动补问；`huggingface generate` 缺少 `-o/--output` 也会自动补问。显式传 `-I` 时保持直接报错。
+交互终端里，各家 `generate` 命令缺少 `prompt` 时会自动补问；`huggingface generate` 与 `codex generate` 未传 `-o` 时会默认写到当前目录下的 `generated/image_<provider>_<model>_<timestamp>.png`。显式传 `-I` 时保持直接报错。
 
 ### 数据探索 (`chattool explore`)
 
@@ -267,7 +268,7 @@ chattool serve local . --html index.html --dry-run
 | PyPI 工具 | `chattool pypi` | 创建、构建、校验、上传与探测 Python 包 |
 | MCP 服务 | `chattool mcp start` | 标准 MCP Server，供 Claude/Cursor 调用 |
 | 环境安装 | `chattool setup zsh/codex/claude/opencode/hermes/lark-cli/docker` | 配置 zsh，安装或检查常用 Agent CLI / WebUI / Docker 环境，并在确认后执行建议的系统命令；`setup hermes` 封装 Hermes 官方 installer，WebUI 需显式启用；`setup opencode/codex/claude/hermes` 支持 `--install-only` 纯安装/升级，`setup opencode` 也支持 `--plugin auto-loop` 追加写入 `opencode-auto-loop` |
-| Workspace | `chattool setup workspace` | 初始化围绕核心项目的人类-AI 协作工作区骨架；当前默认使用 `projects/` 作为实际工作的执行容器，workspace 根目录则保留 general-use 协议与上下文；可选 `--with-opencode-loop` 启用 OpenCode loop-aware 模板并安装本地 `chatloop` 资产 |
+| Workspace | `chattool setup workspace` | 初始化围绕核心项目的人类-AI 协作工作区骨架；当前默认使用 `projects/` 作为实际工作的执行容器，workspace 根目录则保留 general-use 协议与上下文；可选 `--with-chattool`、`--with-chatblog` 分别挂载 ChatTool 和 ChatBlog |
 | Skills | `chattool skill install` | 安装 ChatTool skills 到 Codex / Claude / OpenCode |
 | CC-Connect | `chattool cc` | cc-connect 快速配置与启动 |
 | CRS 查询 | `chattool crs` | 查询 Claude Relay Service API key 用量、模型统计和只读 admin 信息 |
@@ -297,7 +298,7 @@ chatpypi mychat
 
 默认模板生成的 `pyproject.toml` 会写入 `requires-python = ">=3.9"`；`chatarch` 模板依赖 `chatstyle>=0.1.0` 与 `chatenv>=0.1.1`，默认写入 `requires-python = ">=3.10"`。
 
-`chatarch` 模板会额外生成 `DEVELOP.md`、`CHANGELOG.md`、`AGENTS.md`、`README.en.md`、`mkdocs.yml`、`docs/`、`tests/cli-tests/`、`tests/mock-cli-tests/`、`tests/code-tests/` 与 `.github/workflows/` 骨架，并默认依赖 `chatstyle>=0.1.0` 与 `chatenv>=0.1.1` 作为 ChatArch CLI/env 运行时；其中发布 workflow 会在合并到 `main` / `master` 后按包内 `__version__` 创建 `vX.Y.Z` tag，并通过 PyPI Trusted Publishing 发布尚未存在的版本。
+`chatarch` 模板会额外生成 `DEVELOP.md`、`CHANGELOG.md`、`AGENTS.md`、`README.en.md`、`mkdocs.yml`、`docs/`、`tests/cli-tests/`、`tests/mock-cli-tests/`、`tests/code-tests/` 与 `.github/workflows/` 骨架，并默认依赖 `chatstyle>=0.1.0` 与 `chatenv>=0.1.1` 作为 ChatArch CLI/env 运行时；其中发布 workflow 由显式 `v*` tag 或 `workflow_dispatch` 触发，校验 tag 与包内 `__version__` 一致，并通过 PyPI Trusted Publishing 的 `environment: pypi` 发布尚未存在的版本，不依赖仓库级 PyPI token secret。
 
 如只想生成代码与测试骨架，可以用 `--without-mkdocs` 跳过 mkdocs/docs，用 `--without-workflows` 跳过 `.github/workflows/`。
 

{chattool-7.0.3 → chattool-7.0.5}/README.md

@@ -141,10 +141,11 @@ chattool nginx -i  # 交互式选择模板并逐项填写
 ```bash
 chattool image pollinations generate "a cat in space" -o cat.png
 chattool image siliconflow generate "a cute dog" -o dog.png
+chattool image codex generate "a watercolor fox"
 chattool image huggingface generate
 ```
 
-交互终端里，各家 `generate` 命令缺少 `prompt` 时会自动补问；`huggingface generate` 缺少 `-o/--output` 也会自动补问。显式传 `-I` 时保持直接报错。
+交互终端里，各家 `generate` 命令缺少 `prompt` 时会自动补问；`huggingface generate` 与 `codex generate` 未传 `-o` 时会默认写到当前目录下的 `generated/image_<provider>_<model>_<timestamp>.png`。显式传 `-I` 时保持直接报错。
 
 ### 数据探索 (`chattool explore`)
 
@@ -177,7 +178,7 @@ chattool serve local . --html index.html --dry-run
 | PyPI 工具 | `chattool pypi` | 创建、构建、校验、上传与探测 Python 包 |
 | MCP 服务 | `chattool mcp start` | 标准 MCP Server，供 Claude/Cursor 调用 |
 | 环境安装 | `chattool setup zsh/codex/claude/opencode/hermes/lark-cli/docker` | 配置 zsh，安装或检查常用 Agent CLI / WebUI / Docker 环境，并在确认后执行建议的系统命令；`setup hermes` 封装 Hermes 官方 installer，WebUI 需显式启用；`setup opencode/codex/claude/hermes` 支持 `--install-only` 纯安装/升级，`setup opencode` 也支持 `--plugin auto-loop` 追加写入 `opencode-auto-loop` |
-| Workspace | `chattool setup workspace` | 初始化围绕核心项目的人类-AI 协作工作区骨架；当前默认使用 `projects/` 作为实际工作的执行容器，workspace 根目录则保留 general-use 协议与上下文；可选 `--with-opencode-loop` 启用 OpenCode loop-aware 模板并安装本地 `chatloop` 资产 |
+| Workspace | `chattool setup workspace` | 初始化围绕核心项目的人类-AI 协作工作区骨架；当前默认使用 `projects/` 作为实际工作的执行容器，workspace 根目录则保留 general-use 协议与上下文；可选 `--with-chattool`、`--with-chatblog` 分别挂载 ChatTool 和 ChatBlog |
 | Skills | `chattool skill install` | 安装 ChatTool skills 到 Codex / Claude / OpenCode |
 | CC-Connect | `chattool cc` | cc-connect 快速配置与启动 |
 | CRS 查询 | `chattool crs` | 查询 Claude Relay Service API key 用量、模型统计和只读 admin 信息 |
@@ -207,7 +208,7 @@ chatpypi mychat
 
 默认模板生成的 `pyproject.toml` 会写入 `requires-python = ">=3.9"`；`chatarch` 模板依赖 `chatstyle>=0.1.0` 与 `chatenv>=0.1.1`，默认写入 `requires-python = ">=3.10"`。
 
-`chatarch` 模板会额外生成 `DEVELOP.md`、`CHANGELOG.md`、`AGENTS.md`、`README.en.md`、`mkdocs.yml`、`docs/`、`tests/cli-tests/`、`tests/mock-cli-tests/`、`tests/code-tests/` 与 `.github/workflows/` 骨架，并默认依赖 `chatstyle>=0.1.0` 与 `chatenv>=0.1.1` 作为 ChatArch CLI/env 运行时；其中发布 workflow 会在合并到 `main` / `master` 后按包内 `__version__` 创建 `vX.Y.Z` tag，并通过 PyPI Trusted Publishing 发布尚未存在的版本。
+`chatarch` 模板会额外生成 `DEVELOP.md`、`CHANGELOG.md`、`AGENTS.md`、`README.en.md`、`mkdocs.yml`、`docs/`、`tests/cli-tests/`、`tests/mock-cli-tests/`、`tests/code-tests/` 与 `.github/workflows/` 骨架，并默认依赖 `chatstyle>=0.1.0` 与 `chatenv>=0.1.1` 作为 ChatArch CLI/env 运行时；其中发布 workflow 由显式 `v*` tag 或 `workflow_dispatch` 触发，校验 tag 与包内 `__version__` 一致，并通过 PyPI Trusted Publishing 的 `environment: pypi` 发布尚未存在的版本，不依赖仓库级 PyPI token secret。
 
 如只想生成代码与测试骨架，可以用 `--without-mkdocs` 跳过 mkdocs/docs，用 `--without-workflows` 跳过 `.github/workflows/`。
 

{chattool-7.0.3 → chattool-7.0.5}/pyproject.toml

@@ -23,6 +23,7 @@ keywords = ["chattool"]
 license = {text = "MIT license"}
 dependencies = [
     "Click>=7.0",
+    "chatgh>=0.2.4",
     "chatstyle>=0.1.0",
     "chatenv>=0.1.1",
     "requests>=2.20",
@@ -76,9 +77,6 @@ serve = [
 mcp = [
     "fastmcp; python_version >= '3.10'",
 ]
-github = [
-    "PyGithub",
-]
 client = [
     "gitpython",
     "rich",
@@ -88,7 +86,7 @@ pypi = [
     "twine",
 ]
 tools = [
-    "chattool[batch,browser,client,dns,github,images,interactive,lark,mcp,serve,screenshot]",
+    "chattool[batch,browser,client,dns,images,interactive,lark,mcp,serve,screenshot]",
 ]
 tests = [
     "coverage",
@@ -104,6 +102,7 @@ docs = [
     "mkdocs-awesome-pages-plugin>=2.8.0",
     "mkdocs-redirects>=1.2.0",
     "mike>=1.1.2",
+    "pyparsing>=3.0",
 ]
 dev = [
     "wheel",

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/__init__.py

@@ -4,7 +4,7 @@ import importlib
 
 __author__ = """Rex Wang"""
 __email__ = "1073853456@qq.com"
-__version__ = "7.0.3"
+__version__ = "7.0.5"
 
 from dotenv import load_dotenv
 

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/client/main.py

@@ -98,7 +98,6 @@ cli._lazy_commands.update(
         "lark": lambda: _load_attr("chattool.tools.lark.cli", "cli"),
         "image": lambda: _load_attr("chattool.tools.image.cli", "cli"),
         "tplogin": lambda: _load_attr("chattool.tools.tplogin_cli", "cli"),
-        "gh": lambda: _load_attr("chattool.tools.github.cli", "cli"),
         "browser": lambda: _load_attr("chattool.tools.browser.cli", "cli"),
         "zulip": lambda: _load_attr("chattool.tools.zulip.cli", "cli"),
         "skill": lambda: _load_attr("chattool.skill.cli", "skill_cli"),

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/config/__init__.py

@@ -14,7 +14,6 @@ from .liblib import LiblibConfig
 from .siliconflow import SiliconFlowConfig
 from .tplink import TPLinkConfig
 from .browser import BrowserConfig
-from .github import GitHubConfig
 
 __all__ = [
     "EnvField",
@@ -32,7 +31,6 @@ __all__ = [
     "PollinationsConfig",
     "LiblibConfig",
     "SiliconFlowConfig",
-    "GitHubConfig",
     "BrowserConfig",
     "TPLinkConfig",
     "SkillsConfig",

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/config/elements.py

@@ -16,7 +16,6 @@ from .liblib import LiblibConfig
 from .siliconflow import SiliconFlowConfig
 from .tplink import TPLinkConfig
 from .browser import BrowserConfig
-from .github import GitHubConfig
 
 __all__ = [
     "EnvField",
@@ -34,7 +33,6 @@ __all__ = [
     "PollinationsConfig",
     "LiblibConfig",
     "SiliconFlowConfig",
-    "GitHubConfig",
     "BrowserConfig",
     "TPLinkConfig",
     "SkillsConfig",

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/config/openai.py

@@ -11,7 +11,31 @@ class OpenAIConfig(BaseEnvConfig):
 
     OPENAI_API_BASE = EnvField("OPENAI_API_BASE", desc="The base url of the API (with suffix /v1).")
     OPENAI_API_KEY = EnvField("OPENAI_API_KEY", desc="Your API key", is_sensitive=True)
-    OPENAI_API_MODEL = EnvField("OPENAI_API_MODEL", default="gpt-3.5-turbo", desc="The default model name")
+    OPENAI_API_MODEL = EnvField("OPENAI_API_MODEL", default="gpt-5.5", desc="The default model name")
+    OPENAI_ACCESS_TOKEN = EnvField(
+        "OPENAI_ACCESS_TOKEN",
+        desc="OpenAI OAuth access token for OAuth-backed capabilities.",
+        is_sensitive=True,
+    )
+    OPENAI_REFRESH_TOKEN = EnvField(
+        "OPENAI_REFRESH_TOKEN",
+        desc="OpenAI OAuth refresh token for OAuth-backed capabilities.",
+        is_sensitive=True,
+    )
+    OPENAI_OAUTH_BASE_URL = EnvField(
+        "OPENAI_OAUTH_BASE_URL",
+        default="https://auth.openai.com",
+        desc="OpenAI OAuth auth server base URL used to refresh access tokens.",
+    )
+    OPENAI_ACCESS_TOKEN_EXPIRES_AT = EnvField(
+        "OPENAI_ACCESS_TOKEN_EXPIRES_AT",
+        desc="UTC ISO timestamp when the OpenAI OAuth access token expires.",
+    )
+    OPENAI_IMAGE_MODEL = EnvField(
+        "OPENAI_IMAGE_MODEL",
+        default="gpt-image-2-medium",
+        desc="Default OpenAI image model preset.",
+    )
 
     @classmethod
     def _parse_responses_stream_event(cls, line: str):

chattool-7.0.5/src/chattool/explore/__init__.py

@@ -0,0 +1,5 @@
+"""Explore module — arxiv and wordpress helpers."""
+
+from . import arxiv, wordpress
+
+__all__ = ["arxiv", "wordpress"]

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/serve/__init__.py

@@ -7,6 +7,8 @@ _LAZY_ATTRS = {
     "cert_app": ("chattool.serve.cert_server", "cert_app"),
     "serve_cli": ("chattool.serve.cli", "serve_cli"),
     "lark_serve_cli": ("chattool.serve.lark_serve", "cli"),
+    "oauth_app": ("chattool.serve.oauth", "app"),
+    "oauth_serve_cli": ("chattool.serve.oauth", "oauth"),
     "svg2gif_app": ("chattool.serve.svg2gif", "svg2gif_app"),
 }
 
@@ -26,5 +28,7 @@ __all__ = [
     "cert_app",
     "serve_cli",
     "lark_serve_cli",
+    "oauth_app",
+    "oauth_serve_cli",
     "svg2gif_app",
 ]

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/serve/cli.py

@@ -33,6 +33,12 @@ def _load_local():
     return command
 
 
+def _load_oauth():
+    command = _load_attr("chattool.serve.oauth", "oauth")
+    command.short_help = "Run the local OAuth token service."
+    return command
+
+
 def _load_svg2gif():
     command = _load_attr("chattool.serve.svg2gif", "svg2gif_app")
     command.short_help = "Run the SVG-to-GIF conversion service."
@@ -51,6 +57,7 @@ serve_cli._lazy_commands.update(
         "cert": _load_cert,
         "lark": _load_lark,
         "local": _load_local,
+        "oauth": _load_oauth,
         "svg2gif": _load_svg2gif,
     }
 )
@@ -60,6 +67,7 @@ serve_cli._lazy_command_help.update(
         "cert": "Run the certificate service.",
         "lark": "Run the Lark webhook service.",
         "local": "Serve a local directory or HTML file.",
+        "oauth": "Run the local OAuth token service.",
         "svg2gif": "Run the SVG-to-GIF conversion service.",
     }
 )

chattool-7.0.5/src/chattool/serve/oauth.py

@@ -0,0 +1,249 @@
+from __future__ import annotations
+
+from datetime import datetime, timezone
+import os
+from pathlib import Path
+import secrets
+from typing import Any
+
+import click
+from fastapi import Depends, FastAPI, Header, HTTPException
+from pydantic import BaseModel, Field
+
+from chattool.config import BaseEnvConfig, OpenAIConfig  # type: ignore[attr-defined]
+from chattool.const import CHATARCH_ENV_DIR
+from chattool.tools.crs.openai_oauth import (
+    build_openai_oauth_refresh_result,
+    build_openai_oauth_status,
+    refresh_openai_oauth_token,
+    save_openai_oauth_token_data,
+)
+
+config: dict[str, Any] = {
+    "token": None,
+    "env_dir": CHATARCH_ENV_DIR,
+    "oauth_base_url": None,
+    "timeout_seconds": 20.0,
+}
+
+app = FastAPI(
+    title="ChatTool OAuth Token Service",
+    description="Local auth service for OAuth token status, refresh, and access-token retrieval.",
+    version="0.1.0",
+)
+
+
+class OAuthConfigRequest(BaseModel):
+    access_token: str | None = Field(default=None)
+    refresh_token: str | None = Field(default=None)
+    oauth_base_url: str | None = Field(default=None)
+    access_token_expires_at: str | None = Field(default=None)
+
+
+class OAuthRefreshRequest(BaseModel):
+    refresh_token: str | None = Field(default=None)
+    oauth_base_url: str | None = Field(default=None)
+    timeout_seconds: float | None = Field(default=None)
+    save: bool = Field(default=True)
+
+
+def _env_dir() -> Path:
+    return Path(config.get("env_dir") or CHATARCH_ENV_DIR)
+
+
+def _active_openai_env_file() -> Path:
+    return OpenAIConfig.get_active_env_file(_env_dir())
+
+
+def _load_openai_env() -> None:
+    if _active_openai_env_file().exists():
+        BaseEnvConfig.load_all(_env_dir())
+
+
+def _configured_oauth_base_url(override: str | None = None) -> str:
+    value = (
+        override
+        or config.get("oauth_base_url")
+        or OpenAIConfig.OPENAI_OAUTH_BASE_URL.value
+        or "https://auth.openai.com"
+    )
+    return str(value).strip().rstrip("/")
+
+
+def _service_token() -> str | None:
+    value = config.get("token") or os.getenv("CHATTOOL_OAUTH_SERVICE_TOKEN")
+    return str(value) if value else None
+
+
+async def require_service_token(
+    x_chattool_token: str | None = Header(default=None),
+    authorization: str | None = Header(default=None),
+) -> str:
+    expected = _service_token()
+    if not expected:
+        raise HTTPException(status_code=403, detail="Service token is not configured")
+    provided = x_chattool_token
+    if not provided and authorization:
+        prefix = "Bearer "
+        if authorization.startswith(prefix):
+            provided = authorization[len(prefix):]
+    if not provided or not secrets.compare_digest(str(provided), expected):
+        raise HTTPException(status_code=403, detail="Invalid or missing service token")
+    return str(provided)
+
+
+def _parse_iso(value: str | None) -> datetime | None:
+    if not value:
+        return None
+    text = value.strip()
+    if not text:
+        return None
+    if text.endswith("Z"):
+        text = text[:-1] + "+00:00"
+    try:
+        parsed = datetime.fromisoformat(text)
+    except ValueError:
+        return None
+    if parsed.tzinfo is None:
+        parsed = parsed.replace(tzinfo=timezone.utc)
+    return parsed.astimezone(timezone.utc)
+
+
+def _is_expired_or_missing(expires_at: str | None) -> bool:
+    parsed = _parse_iso(expires_at)
+    if parsed is None:
+        return True
+    return parsed <= datetime.now(timezone.utc)
+
+
+def _save_current_openai_values(target_path: Path) -> None:
+    target_path.parent.mkdir(parents=True, exist_ok=True)
+    target_path.write_text(OpenAIConfig.render_env_file(), encoding="utf-8")
+
+
+@app.get("/health")
+def health() -> dict[str, str]:
+    return {"status": "ok"}
+
+
+@app.get("/oauth/status")
+def oauth_status(_: str = Depends(require_service_token)) -> dict[str, str]:
+    _load_openai_env()
+    return build_openai_oauth_status(env_file=_active_openai_env_file())
+
+
+@app.post("/oauth/config")
+def oauth_config(
+    request: OAuthConfigRequest,
+    _: str = Depends(require_service_token),
+) -> dict[str, str]:
+    _load_openai_env()
+    if request.access_token is not None:
+        OpenAIConfig.OPENAI_ACCESS_TOKEN.value = request.access_token
+    if request.refresh_token is not None:
+        OpenAIConfig.OPENAI_REFRESH_TOKEN.value = request.refresh_token
+    if request.oauth_base_url is not None:
+        OpenAIConfig.OPENAI_OAUTH_BASE_URL.value = request.oauth_base_url.strip().rstrip("/")
+    elif config.get("oauth_base_url"):
+        OpenAIConfig.OPENAI_OAUTH_BASE_URL.value = _configured_oauth_base_url()
+    if request.access_token_expires_at is not None:
+        OpenAIConfig.OPENAI_ACCESS_TOKEN_EXPIRES_AT.value = request.access_token_expires_at
+    target_path = _active_openai_env_file()
+    _save_current_openai_values(target_path)
+    return build_openai_oauth_status(env_file=target_path)
+
+
+@app.post("/oauth/refresh")
+def oauth_refresh(
+    request: OAuthRefreshRequest | None = None,
+    _: str = Depends(require_service_token),
+) -> dict[str, Any]:
+    _load_openai_env()
+    request = request or OAuthRefreshRequest()
+    refresh_token = (request.refresh_token or OpenAIConfig.OPENAI_REFRESH_TOKEN.value or "").strip()
+    if not refresh_token:
+        raise HTTPException(status_code=400, detail="OPENAI_REFRESH_TOKEN is required")
+    oauth_base_url = _configured_oauth_base_url(request.oauth_base_url)
+    timeout_seconds = request.timeout_seconds or float(config.get("timeout_seconds") or 20.0)
+    try:
+        token_data = refresh_openai_oauth_token(
+            refresh_token,
+            base_url=oauth_base_url,
+            timeout_seconds=timeout_seconds,
+        )
+    except (RuntimeError, ValueError) as exc:
+        raise HTTPException(status_code=502, detail=str(exc)) from exc
+    target_path = _active_openai_env_file()
+    if request.save:
+        save_openai_oauth_token_data(
+            token_data=token_data,
+            oauth_base_url=oauth_base_url,
+            target_path=target_path,
+        )
+    return build_openai_oauth_refresh_result(
+        token_data=token_data,
+        oauth_base_url=oauth_base_url,
+        saved=request.save,
+        env_file=target_path if request.save else None,
+    )
+
+
+@app.get("/oauth/access-token")
+def oauth_access_token(_: str = Depends(require_service_token)) -> dict[str, Any]:
+    _load_openai_env()
+    access_token = (OpenAIConfig.OPENAI_ACCESS_TOKEN.value or "").strip()
+    expires_at = OpenAIConfig.OPENAI_ACCESS_TOKEN_EXPIRES_AT.value
+    refreshed = False
+    if not access_token or _is_expired_or_missing(expires_at):
+        refresh_token = (OpenAIConfig.OPENAI_REFRESH_TOKEN.value or "").strip()
+        if not refresh_token:
+            raise HTTPException(status_code=400, detail="No valid access token and no refresh token configured")
+        oauth_base_url = _configured_oauth_base_url()
+        try:
+            token_data = refresh_openai_oauth_token(
+                refresh_token,
+                base_url=oauth_base_url,
+                timeout_seconds=float(config.get("timeout_seconds") or 20.0),
+            )
+        except (RuntimeError, ValueError) as exc:
+            raise HTTPException(status_code=502, detail=str(exc)) from exc
+        save_openai_oauth_token_data(
+            token_data=token_data,
+            oauth_base_url=oauth_base_url,
+            target_path=_active_openai_env_file(),
+        )
+        access_token = str(token_data.get("access_token") or "")
+        expires_at = str(token_data.get("access_token_expires_at") or "")
+        refreshed = True
+    return {
+        "access_token": access_token,
+        "access_token_expires_at": expires_at,
+        "refreshed": refreshed,
+    }
+
+
+@click.command(name="oauth")
+@click.option("--host", default="127.0.0.1", show_default=True, help="Bind host.")
+@click.option("--port", default=8787, show_default=True, type=int, help="Bind port.")
+@click.option("--token", default=None, help="Service token required by protected endpoints. Defaults to CHATTOOL_OAUTH_SERVICE_TOKEN.")
+@click.option("--env-dir", default=None, help="ChatArch env directory. Defaults to the active ChatTool env dir.")
+@click.option("--oauth-base-url", default=None, help="Default OAuth auth server base URL.")
+@click.option("--timeout", "timeout_seconds", default=20.0, type=float, show_default=True)
+@click.option("--dry-run", is_flag=True, help="Print resolved server settings without starting uvicorn.")
+def oauth(host: str, port: int, token: str | None, env_dir: str | None, oauth_base_url: str | None, timeout_seconds: float, dry_run: bool) -> None:
+    """Run the local OAuth token service."""
+    config["token"] = token
+    config["env_dir"] = Path(env_dir).expanduser() if env_dir else CHATARCH_ENV_DIR
+    config["oauth_base_url"] = oauth_base_url
+    config["timeout_seconds"] = timeout_seconds
+    click.echo(f"OAuth service: http://{host}:{port}")
+    click.echo(f"Env dir: {config['env_dir']}")
+    click.echo(f"OAuth base: {_configured_oauth_base_url()}")
+    click.echo(f"Service token: {'configured' if _service_token() else 'missing'}")
+    if dry_run:
+        return
+    if not _service_token():
+        raise click.ClickException("--token or CHATTOOL_OAUTH_SERVICE_TOKEN is required unless --dry-run is used.")
+    import uvicorn
+
+    uvicorn.run(app, host=host, port=port)

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/setup/alias.py

@@ -20,7 +20,6 @@ ALIAS_MAP = {
     "chatskill": "chattool skill",
     "chatdns": "chattool dns",
     "chattp": "chattool tplogin",
-    "chatgh": "chattool gh",
     "chatcc": "chattool cc",
     "chatcli": "chattool client",
     "chatpypi": "chatpypi",

{chattool-7.0.3 → chattool-7.0.5}/src/chattool/setup/elements.py

@@ -194,6 +194,10 @@ def workspace_setup(
     dry_run,
     with_chattool,
     chattool_source,
+    with_chatblog,
+    chatblog_source,
+    with_memory,
+    memory_source,
 ):
     setup_workspace(
         profile_name=profile,
@@ -204,6 +208,10 @@ def workspace_setup(
         dry_run=dry_run,
         with_chattool=with_chattool,
         chattool_source=chattool_source,
+        with_chatblog=with_chatblog,
+        chatblog_source=chatblog_source,
+        with_memory=with_memory,
+        memory_source=memory_source,
     )
 
 
@@ -678,7 +686,7 @@ SETUP_COMMAND_ELEMENTS = (
                 param_decls=("--with-chattool/--no-chattool",),
                 kwargs={
                     "default": False,
-                    "help": "Optionally clone/update ChatTool in the workspace root and sync its skills into docs/skills/.",
+                    "help": "Optionally clone/update ChatTool into core/ChatTool and sync its skills into workspace skills/.",
                 },
             ),
             SetupOptionElement(
@@ -688,6 +696,34 @@ SETUP_COMMAND_ELEMENTS = (
                     "help": "Git URL or local ChatTool repo path used when --with-chattool is enabled.",
                 },
             ),
+            SetupOptionElement(
+                param_decls=("--with-chatblog/--no-chatblog",),
+                kwargs={
+                    "default": False,
+                    "help": "Optionally clone/update ChatBlog and link its posts into public/chatblog.",
+                },
+            ),
+            SetupOptionElement(
+                param_decls=("--chatblog-source",),
+                kwargs={
+                    "default": None,
+                    "help": "Git URL or local ChatBlog repo path used when --with-chatblog is enabled.",
+                },
+            ),
+            SetupOptionElement(
+                param_decls=("--with-memory/--no-memory",),
+                kwargs={
+                    "default": False,
+                    "help": "Optionally clone/update ChatMemory, link shared groups chatarch/common/agents, and create local skills.",
+                },
+            ),
+            SetupOptionElement(
+                param_decls=("--memory-source",),
+                kwargs={
+                    "default": None,
+                    "help": "Git URL or local ChatMemory repo path used when --with-memory is enabled.",
+                },
+            ),
         ),
     ),
 )