chattool 7.0.4__tar.gz → 7.0.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chattool
-Version: 7.0.4
+Version: 7.0.5
 Summary: Toolkit for Chat API
 Author-email: Rex Wang <1073853456@qq.com>
 License: MIT license
@@ -268,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 信息 |

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

@@ -178,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 信息 |

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

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

{chattool-7.0.4 → 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.",
+                },
+            ),
         ),
     ),
 )

{chattool-7.0.4 → chattool-7.0.5}/src/chattool/setup/workspace/cli.py

@@ -102,6 +102,10 @@ def setup_workspace(
     dry_run=False,
     with_chattool=False,
     chattool_source=None,
+    with_chatblog=False,
+    chatblog_source=None,
+    with_memory=False,
+    memory_source=None,
 ):
     profile_name, workspace_dir = coerce_profile_and_workspace(
         profile_name, workspace_dir
@@ -112,6 +116,8 @@ def setup_workspace(
     usage = (
         "Usage: chattool setup workspace [PROFILE] [WORKSPACE_DIR] "
         "[--language zh|en] [--with-chattool] [--chattool-source <path-or-url>] "
+        "[--with-chatblog] [--chatblog-source <path-or-url>] "
+        "[--with-memory] [--memory-source <path-or-url>] "
         "[--force] [--dry-run] [-i|-I]"
     )
     interactive, can_prompt, force_interactive, _, need_prompt = (
@@ -128,7 +134,14 @@ def setup_workspace(
             "enabled": bool(with_chattool),
             "source": chattool_source or workspace_options.CHATTOOL_REPO_URL,
         },
-        "rexblog": {"enabled": False, "source": workspace_options.REXBLOG_REPO_URL},
+        "chatblog": {
+            "enabled": bool(with_chatblog),
+            "source": chatblog_source or workspace_options.CHATBLOG_REPO_URL,
+        },
+        "memory": {
+            "enabled": bool(with_memory),
+            "source": memory_source or workspace_options.CHATMEMORY_REPO_URL,
+        },
     }
 
     if need_prompt:
@@ -178,11 +191,20 @@ def setup_workspace(
                 can_prompt,
             )
         )
-    if option_settings["rexblog"]["enabled"]:
+    if option_settings["chatblog"]["enabled"]:
+        applied.append(
+            workspace_options.apply_chatblog_option(
+                workspace_path,
+                option_settings["chatblog"]["source"],
+                interactive,
+                can_prompt,
+            )
+        )
+    if option_settings["memory"]["enabled"]:
         applied.append(
-            workspace_options.apply_rexblog_option(
+            workspace_options.apply_memory_option(
                 workspace_path,
-                option_settings["rexblog"]["source"],
+                option_settings["memory"]["source"],
                 interactive,
                 can_prompt,
             )
@@ -203,7 +225,21 @@ def setup_workspace(
             click.echo(f"Repo action: {item['repo_action']}")
             click.echo(f"Skills: {workspace_path / 'skills'}")
             click.echo(f"Copied skills: {len(item['copied_skills'])}")
-        if item["name"] == "rexblog":
-            click.echo(f"RexBlog repo: {item['repo_dir']}")
+        if item["name"] == "chatblog":
+            click.echo(f"ChatBlog repo: {item['repo_dir']}")
             click.echo(f"Repo action: {item['repo_action']}")
             click.echo(f"Public link: {item['public_link']}")
+        if item["name"] == "memory":
+            click.echo(f"ChatMemory repo: {item['repo_dir']}")
+            click.echo(f"Repo action: {item['repo_action']}")
+            click.echo(
+                "Linked memory skill groups: "
+                f"{', '.join(item['linked_groups']) if item['linked_groups'] else 'none'}"
+            )
+            if item.get("local_group"):
+                click.echo(f"Local skill group: {item['local_group']}")
+            if item["skipped_groups"]:
+                click.echo(
+                    "Skipped missing memory skill groups: "
+                    f"{', '.join(item['skipped_groups'])}"
+                )

{chattool-7.0.4 → chattool-7.0.5}/src/chattool/setup/workspace/options.py

@@ -15,7 +15,15 @@ from chattool.interaction import (
 
 
 CHATTOOL_REPO_URL = "https://github.com/cubenlp/ChatTool.git"
-REXBLOG_REPO_URL = "https://github.com/RexWzh/RexBlog"
+CHATBLOG_REPO_URL = "https://github.com/ChatArch/ChatBlog.git"
+CHATMEMORY_REPO_URL = "https://github.com/ChatArch/ChatMemory.git"
+DEFAULT_MEMORY_SKILL_GROUPS = ("chatarch", "common", "agents")
+LOCAL_SKILL_GROUP_README = """# Local Skills
+
+Use this directory for machine-specific, workspace-specific, or private skills that should not be shared through ChatMemory.
+
+Shared skills should live in one of the linked ChatMemory groups: `chatarch`, `common`, or `agents`.
+"""
 
 
 def _run_git(
@@ -106,46 +114,100 @@ def apply_chattool_option(
 
 def _ensure_symlink(source: Path, target: Path) -> None:
     target.parent.mkdir(parents=True, exist_ok=True)
-    if target.exists() or target.is_symlink():
-        if target.is_symlink() or target.is_file():
-            target.unlink()
-        else:
-            shutil.rmtree(target)
+    if target.is_symlink():
+        target.unlink()
+    elif target.exists():
+        raise click.ClickException(
+            f"Refusing to replace existing non-symlink path: {target}"
+        )
     target.symlink_to(source)
 
 
-def apply_rexblog_option(
+def _ensure_local_skill_group(workspace_dir: Path) -> Path:
+    local_dir = workspace_dir / "skills" / "local"
+    if local_dir.is_symlink():
+        raise click.ClickException(
+            f"Refusing to use symlink for local-only skill group: {local_dir}"
+        )
+    local_dir.mkdir(parents=True, exist_ok=True)
+    readme = local_dir / "README.md"
+    if not readme.exists():
+        readme.write_text(LOCAL_SKILL_GROUP_README, encoding="utf-8")
+    return local_dir
+
+
+def apply_chatblog_option(
     workspace_dir: Path,
     source: str,
     interactive,
     can_prompt: bool,
 ) -> dict:
-    repo_dir = workspace_dir / "core" / "RexBlog"
+    repo_dir = workspace_dir / "core" / "ChatBlog"
     repo_action = _clone_or_update_repo(source, repo_dir, interactive, can_prompt)
     posts_dir = repo_dir / "source" / "_posts"
     if not posts_dir.exists():
         raise click.ClickException(
-            f"RexBlog repo does not contain source/_posts: {posts_dir}"
+            f"ChatBlog repo does not contain source/_posts: {posts_dir}"
         )
-    public_link = workspace_dir / "public" / "hexo_blog"
+    public_link = workspace_dir / "public" / "chatblog"
     _ensure_symlink(posts_dir, public_link)
     return {
-        "name": "rexblog",
+        "name": "chatblog",
         "repo_dir": repo_dir,
         "repo_action": repo_action,
         "public_link": public_link,
     }
 
 
+def apply_memory_option(
+    workspace_dir: Path,
+    source: str,
+    interactive,
+    can_prompt: bool,
+) -> dict:
+    repo_dir = workspace_dir / "core" / "ChatMemory"
+    repo_action = _clone_or_update_repo(source, repo_dir, interactive, can_prompt)
+    skills_root = repo_dir / "Skills"
+    if not skills_root.exists():
+        raise click.ClickException(
+            f"ChatMemory repo does not contain Skills/: {skills_root}"
+        )
+
+    linked_groups: list[str] = []
+    skipped_groups: list[str] = []
+    for group in DEFAULT_MEMORY_SKILL_GROUPS:
+        group_source = skills_root / group
+        if not group_source.exists():
+            skipped_groups.append(group)
+            continue
+        _ensure_symlink(group_source, workspace_dir / "skills" / group)
+        linked_groups.append(group)
+
+    local_group = _ensure_local_skill_group(workspace_dir)
+
+    return {
+        "name": "memory",
+        "repo_dir": repo_dir,
+        "repo_action": repo_action,
+        "linked_groups": linked_groups,
+        "skipped_groups": skipped_groups,
+        "local_group": local_group,
+    }
+
+
 def prompt_optional_modules(language: str) -> dict[str, dict]:
     results = {
         "chattool": {
             "enabled": False,
             "source": CHATTOOL_REPO_URL,
         },
-        "rexblog": {
+        "chatblog": {
+            "enabled": False,
+            "source": CHATBLOG_REPO_URL,
+        },
+        "memory": {
             "enabled": False,
-            "source": REXBLOG_REPO_URL,
+            "source": CHATMEMORY_REPO_URL,
         },
     }
 
@@ -166,7 +228,8 @@ def prompt_optional_modules(language: str) -> dict[str, dict]:
         else "选择额外的 workspace 模块",
         choices=[
             create_choice("ChatTool -> core/ChatTool + ./skills", "chattool"),
-            create_choice("RexBlog -> core/RexBlog + public/hexo_blog", "rexblog"),
+            create_choice("ChatBlog -> core/ChatBlog + public/chatblog", "chatblog"),
+            create_choice("ChatMemory -> core/ChatMemory + skills/chatarch, skills/common, skills/agents + local", "memory"),
         ],
         default_values=[],
         instruction="",

{chattool-7.0.4 → chattool-7.0.5}/src/chattool/setup/workspace/render.py

@@ -159,8 +159,8 @@ def base_file_map(
         "public/README.md": render_public_readme(language),
     }
     skill_md, skill_zh = render_workspace_maintenance_skill()
-    file_map["skills/workspace-maintenance/SKILL.md"] = skill_md
-    file_map["skills/workspace-maintenance/SKILL.zh.md"] = skill_zh
+    file_map["skills/local/workspace-maintenance/SKILL.md"] = skill_md
+    file_map["skills/local/workspace-maintenance/SKILL.zh.md"] = skill_zh
     agents_content = render_agents_md(workspace_dir, profile, language, enabled_options)
     if helper_agents_path:
         file_map[helper_agents_path] = agents_content

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chattool
-Version: 7.0.4
+Version: 7.0.5
 Summary: Toolkit for Chat API
 Author-email: Rex Wang <1073853456@qq.com>
 License: MIT license
@@ -268,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 信息 |