Merge pull request #164 from cubenlp/rex/workspace

Rex/workspace

Author: RexWzh

.gitignore

@@ -1,6 +1,8 @@
 ##### user defined ######
 *.jsonl
 playground/
+Playground/
+workspace/
 
 
 ##### seperated line ######

CHANGELOG.md

@@ -15,6 +15,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 - `chattool setup opencode` 现支持 `-e/--env`，可显式复用 ChatTool 的 OpenAI 配置来源；支持 `.env` 文件路径或 `OpenAI` profile 名称，并按 `显式参数 > -e 指定的 OpenAI 配置 > 当前 OpenAI 配置 > 现有 opencode 配置 > 默认值` 回退
 - 新增 `chattool setup workspace [PROFILE] [WORKSPACE_DIR]`，用于在核心项目外围初始化人类-AI 协作工作区骨架；支持 `base` profile、默认中文模板、显式 `--language en`、`--dry-run` 与已完成 `setup.md` 的保护覆盖语义
 
+### Changed
+- `chattool setup workspace` 默认生成的 workspace scaffold 现改为按任务隔离的多任务协作约定：去掉单一 `task.md`，默认使用 `reports/MM-DD-<task-name>/` 与 `playgrounds/<task-name>/`；对于长期系列工作，可升级为 `reports/task-sets/<set-name>/` 与 `playgrounds/task-sets/<set-name>/` 并维护任务集级进展
+- `chattool setup playground` 的外层工作区结构现对齐 `setup workspace`：默认使用 `reports/`、`playgrounds/`、`knowledge/`，并把工作区 skills 副本收口到 `knowledge/skills/`；同时继续保留 `ChatTool/` 仓库和 skills 同步逻辑
+- `chattool setup workspace` 与 `chattool setup playground` 现移除全局 `thoughts/` 面，避免并发任务时出现一个共享的“当前关注点”入口；相关角色统一收口到各任务或任务集的 `reports/` 结构
+
 ## [6.5.0] - 2026-03-31
 
 ### Changed

README.md

@@ -133,8 +133,8 @@ chattool explore arxiv get 1706.03762 -v
 | PyPI 工具 | `chattool pypi` | 创建、构建、校验、上传与探测 Python 包 |
 | MCP 服务 | `chattool mcp start` | 标准 MCP Server，供 Claude/Cursor 调用 |
 | 环境安装 | `chattool setup codex/claude/lark-cli` | 安装 Codex / Claude Code / 官方 lark-cli 并写入配置 |
-| Playground | `chattool setup playground` | 初始化工作区，并可在完成后复用 `chatenv` 中的 GitHub token 配置 Git HTTPS 鉴权 |
-| Workspace | `chattool setup workspace` | 初始化围绕核心项目的人类-AI 协作工作区骨架，沉淀协议、任务面与知识目录 |
+| Playground | `chattool setup playground` | 初始化带 `ChatTool/` 仓库的协作工作区，外层结构对齐 `reports/`、`playgrounds/`、`knowledge/`，并可复用 GitHub token 配置 Git HTTPS 鉴权 |
+| Workspace | `chattool setup workspace` | 初始化围绕核心项目的人类-AI 协作工作区骨架，默认采用 `reports/` 和 `playgrounds/` 的多任务并发结构 |
 | Skills | `chattool skill install` | 安装 ChatTool skills 到 Codex / Claude Code |
 | CC-Connect | `chattool cc` | cc-connect 快速配置与启动 |
 

README_en.md

@@ -166,6 +166,8 @@ chattool image siliconflow generate "a cute dog" -o dog.png
 | Screenshot | `chattool serve capture` | Local webpage screenshot service |
 | Cert Mgmt | `chattool serve cert` / `chattool client cert` | SSL certificate distribution |
 | Setup | `chattool setup codex` | Install Codex CLI and write config (supports `--base-url` / `--model`) |
+| Workspace | `chattool setup workspace` | Create a collaboration workspace around a core project with task-isolated `reports/` and `playgrounds/` directories |
+| Playground | `chattool setup playground` | Create a ChatTool-centered collaboration workspace with `ChatTool/`, `reports/`, `playgrounds/`, and `knowledge/skills/` |
 | Skills | `chattool skill install` | Install ChatTool skills to Codex / Claude Code |
 | CC-Connect | `chattool cc` | Quick cc-connect setup and start |
 

cli-tests/conftest.py

@@ -2,6 +2,7 @@
 
 import json
 import re
+import sys
 import time
 from pathlib import Path
 from types import SimpleNamespace
@@ -10,6 +11,12 @@
 from click.testing import CliRunner
 from dotenv import dotenv_values
 
+
+REPO_ROOT = Path(__file__).resolve().parents[1]
+SRC_DIR = REPO_ROOT / "src"
+if str(SRC_DIR) not in sys.path:
+    sys.path.insert(0, str(SRC_DIR))
+
 from chattool.client.main import cli
 from chattool.config import BaseEnvConfig, FeishuConfig
 from chattool.const import CHATTOOL_ENV_DIR, CHATTOOL_ENV_FILE, CHATTOOL_REPO_DIR
@@ -90,15 +97,19 @@ def create_document(prefix: str = "cli-doc", *, title: str | None = None):
             output=create.output,
         )
 
-    def wait_doc_raw_contains(document_id: str, text: str, *, attempts: int = 5, delay: float = 1.0):
+    def wait_doc_raw_contains(
+        document_id: str, text: str, *, attempts: int = 5, delay: float = 1.0
+    ):
         last_output = ""
         for _ in range(attempts):
             raw = invoke("lark", "doc", "raw", document_id)
             last_output = raw.output
             if text in last_output:
                 return raw
             time.sleep(delay)
-        raise AssertionError(f"{text!r} not found in document raw output:\n{last_output}")
+        raise AssertionError(
+            f"{text!r} not found in document raw output:\n{last_output}"
+        )
 
     return SimpleNamespace(
         tmp_path=tmp_path,

cli-tests/setup/test_chattool_setup_basic.md

@@ -97,20 +97,20 @@ chattool setup lark-cli -i
   - `<workspace>/AGENTS.md`
   - `<workspace>/CHATTOOL.md`
   - `<workspace>/MEMORY.md`
-  - `<workspace>/Memory/`
-  - `<workspace>/skills/`
-  - `<workspace>/scratch/`
+  - `<workspace>/reports/`
+  - `<workspace>/playgrounds/`
+  - `<workspace>/knowledge/`
   - `<workspace>/ChatTool/`
 
 预期过程和结果：
   1. 首次执行 `chattool setup playground --workspace-dir <workspace> --chattool-source <repo-or-url>`，预期在目标目录下 clone `ChatTool/`。
   2. 若目标目录只是普通非空目录且当前终端可交互，预期先提示是否继续；确认后继续初始化，并保留已有文件。
   3. 若目标目录中已经存在 `ChatTool/`（或历史遗留的 `chattool/`），预期进入更新模式：优先更新仓库，并在交互模式下提示是否同步工作区 `skills/`。
   4. 预期生成 `AGENTS.md`、`CHATTOOL.md`、`MEMORY.md`。
-  5. 预期创建 `Memory/`、`skills/`、`scratch/`。
-  6. 预期从 `ChatTool/skills/` 复制或更新 skills 到工作区 `skills/`，并给每个 skill 创建 `experience/` 目录。
+  5. 预期创建 `reports/`、`playgrounds/`、`knowledge/`。
+  6. 预期从 `ChatTool/skills/` 复制或更新 skills 到工作区 `knowledge/skills/`，并给每个 skill 创建 `experience/` 目录。
   7. 预期 skills 同步只替换常规文件，不修改已有 `experience/` 内容。
-  8. 执行 `chattool setup workspace [PROFILE] [WORKSPACE_DIR]`，预期可生成围绕核心项目的独立协作骨架，包括 `AGENTS.md`、`MEMORY.md`、`setup.md`、`task.md`、`thoughts/`、`tasks/`、`playground/`、`knowledge/`。
+  8. 执行 `chattool setup workspace [PROFILE] [WORKSPACE_DIR]`，预期可生成围绕核心项目的独立协作骨架，包括 `AGENTS.md`、`MEMORY.md`、`setup.md`、`reports/`、`playgrounds/`、`knowledge/`，并默认采用按任务隔离的并发协作结构。
   9. 执行 `chattool setup workspace <workspace> --dry-run -I`，预期仅打印将创建的目录与文件，不实际写入。
 
 参考执行脚本（伪代码）：

cli-tests/setup/test_chattool_setup_playground_real_basic.md

@@ -0,0 +1,36 @@
+# test_chattool_setup_playground_real_basic
+
+验证 `chattool setup playground` 在真实 CLI 下会生成与 workspace 类似的外层协作骨架，同时保留 `ChatTool/` 仓库和同步到 `knowledge/skills/` 的工作区 skills。
+
+## 元信息
+
+- 命令：`chattool setup playground`
+- 目的：验证 playground 骨架目录、`knowledge/skills/` 同步位置，以及 ChatTool 仓库 clone 的真实行为。
+- 标签：`cli`
+- 前置条件：可从本地 ChatTool 仓库作为 clone 源。
+- 环境准备：使用临时目录作为 workspace 根目录，不污染仓库。
+- 回滚：测试结束后临时目录自动删除。
+
+## 用例 1：基础 playground 落盘新骨架
+
+- 初始环境准备：
+  - 创建空临时目录作为 workspace 根目录。
+  - 使用当前本地 ChatTool 仓库作为 `--chattool-source`。
+
+预期过程和结果：
+  1. 执行 `chattool setup playground --workspace-dir <workspace-dir> --chattool-source <repo-dir> -I`，预期命令成功。
+  2. 预期生成 `AGENTS.md`、`CHATTOOL.md`、`MEMORY.md`、`reports/README.md`、`playgrounds/README.md`、`knowledge/README.md`。
+  3. 预期在目标目录下 clone `ChatTool/`。
+  4. 预期 `knowledge/memory/`、`knowledge/skills/`、`playgrounds/scratch/` 存在。
+  5. 预期 skills 从 clone 出来的 `ChatTool/skills/` 同步到 `knowledge/skills/`，并给每个 skill 创建 `experience/README.md`。
+  6. 预期不再创建旧的顶层 `Memory/`、`skills/`、`scratch/`。
+
+参考执行脚本（伪代码）：
+
+```sh
+chattool setup playground --workspace-dir /tmp/my-playground --chattool-source /path/to/ChatTool -I
+assert new scaffold files exist
+assert ChatTool repo exists
+assert knowledge/skills contains copied skills with experience readmes
+assert legacy top-level Memory/ skills/ scratch/ do not exist
+```

cli-tests/setup/test_chattool_setup_playground_real_basic.py

@@ -0,0 +1,61 @@
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+
+def _run_chattool_setup_playground(args: list[str]):
+    repo_root = Path(__file__).resolve().parents[2]
+    env = os.environ.copy()
+    src_dir = str(repo_root / "src")
+    existing = env.get("PYTHONPATH")
+    env["PYTHONPATH"] = src_dir if not existing else f"{src_dir}:{existing}"
+    return subprocess.run(
+        [sys.executable, "-m", "chattool.client.main", "setup", "playground", *args],
+        text=True,
+        capture_output=True,
+        check=False,
+        env=env,
+    )
+
+
+def test_setup_playground_creates_workspace_style_scaffold(tmp_path: Path):
+    workspace_dir = tmp_path / "playground"
+    source_dir = Path(__file__).resolve().parents[2]
+
+    result = _run_chattool_setup_playground(
+        [
+            "--workspace-dir",
+            str(workspace_dir),
+            "--chattool-source",
+            str(source_dir),
+            "-I",
+        ]
+    )
+
+    assert result.returncode == 0, result.stderr
+    assert (workspace_dir / "AGENTS.md").exists()
+    assert (workspace_dir / "CHATTOOL.md").exists()
+    assert (workspace_dir / "MEMORY.md").exists()
+    assert (workspace_dir / "reports" / "README.md").exists()
+    assert (workspace_dir / "playgrounds" / "README.md").exists()
+    assert (workspace_dir / "playgrounds" / "scratch" / "README.md").exists()
+    assert (workspace_dir / "knowledge" / "README.md").exists()
+    assert (workspace_dir / "knowledge" / "memory" / "README.md").exists()
+    assert (workspace_dir / "knowledge" / "skills" / "README.md").exists()
+    assert (workspace_dir / "ChatTool").exists()
+
+    assert not (workspace_dir / "Memory").exists()
+    assert not (workspace_dir / "skills").exists()
+    assert not (workspace_dir / "scratch").exists()
+
+    agents = (workspace_dir / "AGENTS.md").read_text(encoding="utf-8")
+    memory_md = (workspace_dir / "MEMORY.md").read_text(encoding="utf-8")
+    assert "reports/MM-DD-<task-name>/" in agents
+    assert "reports/task-sets/<set-name>/" in agents
+    assert "knowledge/skills/" in agents
+    assert "knowledge/memory/" in memory_md
+
+    copied_skill = workspace_dir / "knowledge" / "skills" / "practice-make-perfact"
+    assert copied_skill.exists()
+    assert (copied_skill / "experience" / "README.md").exists()

cli-tests/setup/test_chattool_setup_workspace_real_basic.md

@@ -1,11 +1,11 @@
 # test_chattool_setup_workspace_real_basic
 
-验证 `chattool setup workspace` 在真实 CLI 下的基础落盘、默认中文模板、显式英文模板、`--dry-run` 与 `setup.md` 保护语义。
+验证 `chattool setup workspace` 在真实 CLI 下的基础落盘、支持“默认常规任务 + 可选任务集”的并发 workspace 模板、显式英文模板、`--dry-run` 与 `setup.md` 保护语义。
 
 ## 元信息
 
 - 命令：`chattool setup workspace`
-- 目的：验证 workspace 骨架目录、关键模板文件、语言选项，以及 `--force` / `--dry-run` 的真实行为。
+- 目的：验证 workspace 骨架目录、默认常规任务与任务集并存的 `reports/` / `playgrounds/` 模板、语言选项，以及 `--force` / `--dry-run` 的真实行为。
 - 标签：`cli`
 - 前置条件：无
 - 环境准备：使用临时目录作为 workspace 根目录，不污染仓库。
@@ -18,16 +18,16 @@
 
 预期过程和结果：
   1. 执行 `chattool setup workspace <workspace-dir> -I`，预期命令成功。
-  2. 预期生成 `AGENTS.md`、`MEMORY.md`、`setup.md`、`task.md`、`thoughts/current.md`、`tasks/README.md`、`playground/README.md`、`knowledge/README.md`。
-  3. `AGENTS.md` 默认应包含中文的 5 层协作架构和知识写入规则。
-  4. `setup.md` 应包含 Discover / Ask / Adapt / Initialise / Set first task / Done 六步清单。
+  2. 预期生成 `AGENTS.md`、`MEMORY.md`、`setup.md`、`reports/README.md`、`playgrounds/README.md`、`knowledge/README.md`。
+  3. `AGENTS.md` 默认应包含中文的多任务协作架构，并同时说明常规任务 `reports/MM-DD-<task-name>/` / `playgrounds/<task-name>/` 与任务集 `reports/task-sets/<set-name>/` / `playgrounds/task-sets/<set-name>/` 规则。
+  4. `setup.md` 应包含 Discover / Ask / Adapt / Initialise / Create first task lanes / Done 六步清单，并明确默认先创建常规任务，只有长期系列任务才改用任务集。
 
 参考执行脚本（伪代码）：
 
 ```sh
 chattool setup workspace /tmp/demo-workspace -I
 assert workspace files exist
-assert AGENTS.md contains architecture and write rules
+assert AGENTS.md contains reports/playgrounds task isolation rules
 assert setup.md contains six-step checklist
 ```
 

cli-tests/setup/test_chattool_setup_workspace_real_basic.py

@@ -1,14 +1,21 @@
+import os
 import subprocess
 import sys
 from pathlib import Path
 
 
 def _run_chattool_setup_workspace(args: list[str]):
+    repo_root = Path(__file__).resolve().parents[2]
+    env = os.environ.copy()
+    src_dir = str(repo_root / "src")
+    existing = env.get("PYTHONPATH")
+    env["PYTHONPATH"] = src_dir if not existing else f"{src_dir}:{existing}"
     return subprocess.run(
         [sys.executable, "-m", "chattool.client.main", "setup", "workspace", *args],
         text=True,
         capture_output=True,
         check=False,
+        env=env,
     )
 
 
@@ -21,24 +28,32 @@ def test_setup_workspace_base_creates_scaffold(tmp_path: Path):
     assert (workspace_dir / "AGENTS.md").exists()
     assert (workspace_dir / "MEMORY.md").exists()
     assert (workspace_dir / "setup.md").exists()
-    assert (workspace_dir / "task.md").exists()
-    assert (workspace_dir / "thoughts" / "current.md").exists()
-    assert (workspace_dir / "tasks" / "README.md").exists()
-    assert (workspace_dir / "playground" / "README.md").exists()
+    assert (workspace_dir / "reports" / "README.md").exists()
+    assert (workspace_dir / "playgrounds" / "README.md").exists()
     assert (workspace_dir / "knowledge" / "README.md").exists()
+    assert not (workspace_dir / "knowledge" / "report").exists()
 
     agents = (workspace_dir / "AGENTS.md").read_text(encoding="utf-8")
     setup_md = (workspace_dir / "setup.md").read_text(encoding="utf-8")
     assert "## 架构" in agents
     assert "## 知识写入规则" in agents
+    assert "reports/MM-DD-<task-name>/" in agents
+    assert "reports/task-sets/<set-name>/" in agents
+    assert "playgrounds/<task-name>/" in agents
+    assert "playgrounds/task-sets/<set-name>/" in agents
+    assert "knowledge/memory/YYYY-MM-DD-status.md" in agents
     assert "1. **Discover**" in setup_md
     assert "6. **Done**" in setup_md
+    assert "Create first task lanes" in setup_md
+    assert "默认创建一个常规任务" in setup_md
 
 
 def test_setup_workspace_english_language_creates_english_templates(tmp_path: Path):
     workspace_dir = tmp_path / "workspace"
 
-    result = _run_chattool_setup_workspace([str(workspace_dir), "--language", "en", "-I"])
+    result = _run_chattool_setup_workspace(
+        [str(workspace_dir), "--language", "en", "-I"]
+    )
 
     assert result.returncode == 0, result.stderr
     agents = (workspace_dir / "AGENTS.md").read_text(encoding="utf-8")
@@ -47,6 +62,7 @@ def test_setup_workspace_english_language_creates_english_templates(tmp_path: Pa
     assert "## 架构" not in agents
     assert "# Workspace Setup Checklist" in setup_md
 
+
 def test_setup_workspace_force_does_not_overwrite_completed_setup_md(tmp_path: Path):
     workspace_dir = tmp_path / "workspace"