fcop 3.2.0__tar.gz → 3.2.2__tar.gz

{fcop-3.2.0 → fcop-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fcop
-Version: 3.2.0
+Version: 3.2.2
 Summary: FCoP protocol: official Python library — Project API, task/report/issue files, filename parsing, bundled rules. PyYAML only; not an MCP server.
 Project-URL: Homepage, https://github.com/joinwell52-AI/FCoP
 Project-URL: Repository, https://github.com/joinwell52-AI/FCoP

{fcop-3.2.0 → fcop-3.2.2}/src/fcop/_version.py

@@ -13,4 +13,4 @@ The ``dev0`` / ``rc1`` / ``a1`` / ``b1`` suffixes are allowed during
 development per PEP 440.
 """
 
-__version__ = "3.2.0"
+__version__ = "3.2.2"

{fcop-3.2.0 → fcop-3.2.2}/src/fcop/project.py

@@ -968,6 +968,7 @@ class Project:
             self.reports_dir,
             self.issues_dir,
             self.shared_dir,
+            self.history_dir,
         ):
             directory.mkdir(parents=True, exist_ok=True)
 
@@ -2913,26 +2914,40 @@ class Project:
         target_task = target_dir / source.name
         source.replace(target_task)
 
-        # ── 5. Move matching reports from reports/ ─────────────────────
-        # Derive the canonical task_id from the filename we just moved.
+        # ── 5. Move matching reports ────────────────────────────────────
+        # Scan both reports/ and _lifecycle/archive/ so that manually
+        # pre-archived reports are picked up even if they haven't gone
+        # through the standard reports/ → history/ path.
         parsed = parse_task_filename(source.name)
-        if parsed is not None and self.reports_dir.is_dir():
-            task_id = parsed.task_id
-            for entry in self.reports_dir.iterdir():
-                if not entry.is_file():
-                    continue
-                if entry.suffix.lower() not in _FCOP_SUFFIXES:
-                    continue
-                if not REPORT_FILENAME_RE.match(entry.name):
-                    continue
-                try:
-                    text = entry.read_text(encoding="utf-8")
-                    fm, _ = parse_task_frontmatter(text)
-                except Exception:
-                    continue
-                if task_id not in fm.references:
-                    continue
-                entry.replace(target_dir / entry.name)
+        if parsed is not None:
+            task_id_key = parsed.task_id
+            search_dirs = [
+                d for d in (self.reports_dir, self.archive_dir) if d.is_dir()
+            ]
+            for search_dir in search_dirs:
+                for entry in search_dir.iterdir():
+                    if not entry.is_file():
+                        continue
+                    if entry.suffix.lower() not in _FCOP_SUFFIXES:
+                        continue
+                    if not REPORT_FILENAME_RE.match(entry.name):
+                        continue
+                    # Try matching by frontmatter references first,
+                    # then fall back to task-id substring in filename.
+                    matched = False
+                    try:
+                        text = entry.read_text(encoding="utf-8")
+                        fm, _ = parse_task_frontmatter(text)
+                        matched = task_id_key in fm.references
+                    except Exception:
+                        pass
+                    if not matched:
+                        # Heuristic: report filename contains the task date+seq
+                        matched = task_id_key in entry.stem
+                    if matched:
+                        dest = target_dir / entry.name
+                        if not dest.exists():
+                            entry.replace(dest)
 
         return target_dir
 

{fcop-3.2.0 → fcop-3.2.2}/src/fcop/rules/_data/agent-bringup-prompt.zh.md

@@ -234,6 +234,9 @@ init_* 工具返回 "ok" **不等于** 文件真的生成了。3.0.0 / 3.0.1 那
   │   ├── review/
   │   ├── done/
   │   └── archive/
+  ├── history/                       ← 深度历史归档（日期分片，v3 新增）
+  │   └── YYYY-MM-DD/
+  │       └── TASK-XXX/             ← 一对任务+报告存一个子目录
   ├── shared/
   │   ├── TEAM-README.md
   │   ├── TEAM-ROLES.md
@@ -295,30 +298,34 @@ init_* 工具返回 "ok" **不等于** 文件真的生成了。3.0.0 / 3.0.1 那
 
 MCP 工具对应表：
 
-  create_task            创建任务           → _lifecycle/inbox/
-  claim_task             Agent 认领任务      inbox → active
-  submit_task            Agent 提交审查      active → review
-  finish_task            Agent 直接完成      active → done（跳过审查）
-  approve_task           ADMIN 批准          review → done
-  reject_task            ADMIN 退回（撤回）  review → active（重做）
-  archive_task           归档已完成          done → archive
+  create_task              创建任务           → _lifecycle/inbox/
+  claim_task               Agent 认领任务      inbox → active
+  submit_task              Agent 提交审查      active → review
+  finish_task              Agent 直接完成      active → done（跳过审查）
+  approve_task             ADMIN 批准          review → done
+  reject_task              ADMIN 退回（撤回）  review → active（重做）
+  archive_task             归档已完成          done → _lifecycle/archive/
+  archive_to_history       推入历史归档（单条）_lifecycle/archive/ → history/YYYY-MM-DD/TASK-XXX/
+  bulk_archive_to_history  批量推入历史归档    清空 _lifecycle/archive/，全部移入 history/ 日期分片
 
 典型 Agent 工作流（有审查）：
 
-  1. ADMIN 调 write_task     → _lifecycle/inbox/ 落盘
-  2. Agent 调 claim_task     → 移到 active/，开始工作
-  3. Agent 调 submit_task    → 移到 review/，等审查
-  4. ADMIN 调 approve_task   → 移到 done/
-  5. 任一方调 archive_task   → 移到 archive/，归档完毕
+  1. ADMIN 调 write_task       → _lifecycle/inbox/ 落盘
+  2. Agent 调 claim_task       → 移到 active/，开始工作
+  3. Agent 调 submit_task      → 移到 review/，等审查
+  4. ADMIN 调 approve_task     → 移到 done/
+  5. 任一方调 archive_task     → 移到 _lifecycle/archive/，归档完毕
+  6. （可选）archive_to_history → 推入 history/ 日期分片，长期保存
 
 快速工作流（无需审查，Agent 直接完成）：
 
-  1. ADMIN 调 write_task    → inbox/
-  2. Agent 调 claim_task    → active/
-  3. Agent 调 finish_task   → done/（跳过 review）
-  4. archive_task           → archive/
+  1. ADMIN 调 write_task              → inbox/
+  2. Agent 调 claim_task              → active/
+  3. Agent 调 finish_task             → done/（跳过 review）
+  4. archive_task                     → _lifecycle/archive/
+  5. （可选）bulk_archive_to_history  → 批量推入 history/
 
-所有工具均已在 fcop-mcp 3.1.0 可用。不要自己 mkdir 或 mv
+所有工具均已在 fcop-mcp 3.2.2 可用。不要自己 mkdir 或 mv
 ——只用 MCP 工具操作，否则 fcop_audit 会报 P0 违规。
 ```
 

{fcop-3.2.0 → fcop-3.2.2}/src/fcop/rules/_data/letter-to-admin.en.md

@@ -6,7 +6,7 @@ I'm **FCoP** (File-based Coordination Protocol) — a protocol that lets
 you and an AI team collaborate through **files**. Your one job:
 **tell me how many people this project has and how they split the work.**
 
-> **v3.0.2 summary** (current, 2026-05-22; covers v2.0.0 philosophical era + 3.0.2 init topology fix):
+> **v3.2.2 summary** (current, 2026-05-23; covers deep archiving / v3 lifecycle + v2.0.0 philosophical era):
 > - **"Two-diagram era"**: `2.0.0` is a *philosophical* major release.
 >   All v1.x public APIs keep working (per ADR-0003 additive expansion);
 >   the major bump records that FCoP now formally acknowledges **two**
@@ -61,18 +61,24 @@ you and an AI team collaborate through **files**. Your one job:
 >   `TASK-20260512-025-PM-to-OPS-phase-a-fix.md`). The slug is not part
 >   of routing — it's a human-readable label. Pre-1.6 filenames remain
 >   valid.
-> - **MCP tool count**: 35 (unchanged since v1.5.0). Full list:
->   `docs/mcp-tools.md`.
+> - **MCP tool count**: 45 (v3.2.2). Full list: `docs/mcp-tools.md`.
+> - **Deep archiving (3.2.x new)**: `archive_to_history(task_id)` /
+>   `bulk_archive_to_history()` move completed task-report pairs into
+>   `history/YYYY-MM-DD/TASK-XXX/` (date-sharded).
+>   `list_history` / `read_history_task` provide index and retrieval.
+> - **v3 lifecycle tools (3.2.x new)**: `create_task` → `claim_task` →
+>   `submit_task` → `approve_task` / `reject_task` → `finish_task`;
+>   files flow through `_lifecycle/inbox/` → `active/` → `review/` →
+>   `done/`.
 > - **Rule versions**: `fcop-rules.mdc 3.0.0` / `fcop-protocol.mdc 3.0.0`.
 >   Run `redeploy_rules()` after upgrading to refresh the four local rule
 >   files.
 > - **v3 topology (3.0.2 fix)**: fresh init now creates
->   `_lifecycle/{inbox,active,review,done,archive}/` immediately
->   (per spec §1.1). Fresh inits on 3.0.0 / 3.0.1 missed this layer
->   — run `python -m fcop migrate --to-v3` on those projects to
->   upgrade; new projects on 3.0.2+ are v3-native from day one.
+>   `_lifecycle/{inbox,active,review,done,archive}/` and `history/`
+>   immediately (per spec §1.1). Run `python -m fcop migrate --to-v3`
+>   on older projects to upgrade.
 >
-> _(Earlier summaries: v1.3 / v1.4 / v1.5 and older — see `CHANGELOG.md`)_
+> _(Earlier summaries: v1.3 / v1.4 / v1.5 / v3.0.x / v3.1.x and older — see `CHANGELOG.md`)_
 
 ---
 
@@ -526,7 +532,7 @@ Output shows each slug's title and creation time.
 
 ## How you actually use FCoP: just talk
 
-**First, the important part**: FCoP ships 32 tools — **all of them are
+**First, the important part**: FCoP ships 45 tools — **all of them are
 for the agent, not for you**. You talk in plain language from start to
 finish; the agent translates your intent into the right tool call.
 
@@ -559,10 +565,12 @@ agent forgets what to do, you can spot it and nudge it back.
 | "assign a task to CODER" / "ask X to do Y" | `write_task(recipient="CODER", body="...")` | Drops a `TASK-*-to-CODER.md` |
 | "what's the state of the project" | `get_team_status()` | Task / report / issue / workspace counts + recent activity |
 | "how many workspaces do we have?" | `list_workspaces()` | Lists every `workspace/<slug>/` with create time |
-| "what tasks are still pending?" | `list_tasks()` | Lists unarchived `tasks/` |
+| "what tasks are still pending?" | `list_tasks()` | Lists pending tasks (v3: `_lifecycle/inbox/active/review/`) |
 | "what does task X say?" | `read_task("TASK-...")` | Reads body |
 | "any open issues?" | `list_issues()` | Lists `issues/` |
-| "archive X, it's done" | `archive_task("TASK-...")` | Moves to `log/` |
+| "archive X, it's done" | `archive_task("TASK-...")` | Moves to `_lifecycle/archive/` (v3) |
+| "push this archive file to history" | `archive_to_history("TASK-...")` | Single: `_lifecycle/archive/` → `history/YYYY-MM-DD/TASK-XXX/` |
+| "bulk-push all archives to history" | `bulk_archive_to_history()` | Bulk: drains `_lifecycle/archive/`, moves all into date-sharded `history/` |
 | "show me the completion reports" | `list_reports()` / `read_report(...)` | Reads `reports/` |
 
 ### Rescue / edge cases
@@ -640,7 +648,7 @@ correction takes one line.
 
 ### ⚠️ Cursor's "click-to-grey-out" switches: 2 you must never grey
 
-Cursor's MCP panel shows these 32 tools as buttons. Click → greyed =
+Cursor's MCP panel shows these 45 tools as buttons. Click → greyed =
 disabled. **Greying these two will hurt you**:
 
 - `fcop_report` — greyed out, Rule 0 breaks; agents can't take

{fcop-3.2.0 → fcop-3.2.2}/src/fcop/rules/_data/letter-to-admin.zh.md

@@ -6,7 +6,7 @@
 通过**文件**协作的协议。你唯一要做的事：**告诉我你这个项目是几个人、
 怎么分工。**
 
-> **v3.0.2 摘要**（当前版本，2026-05-22；含 v2.0.0 哲学纪元 + 3.0.2 init 拓扑修复）：
+> **v3.2.2 摘要**（当前版本，2026-05-23；含深度归档/v3 生命周期 + v2.0.0 哲学纪元）：
 > - **"两图对偶"纪元**：`2.0.0` 是 *philosophical* major release。1.x
 >   的全部 API 继续工作（per ADR-0003 附加性扩展），主版本号跨越的
 >   原因是协议哲学的固化——FCoP 现在同时承认**两张图**：
@@ -48,15 +48,20 @@
 >   `ISSUE` 三种 envelope 在路由字段尾部可追加一个**可选**的
 >   `-{slug}` 段（如 `TASK-20260512-025-PM-to-OPS-phase-a-fix.md`）。
 >   slug 不参与路由，只是人类可读标签；旧文件名继续合法。
-> - **MCP 工具总数**：35 个（v1.5.0 起未变）。完整清单见 `docs/mcp-tools.md`。
+> - **MCP 工具总数**：45 个（v3.2.2）。完整清单见 `docs/mcp-tools.md`。
+> - **深度归档（3.2.x 新增）**：`archive_to_history(task_id)` / `bulk_archive_to_history()`
+>   把已完成任务-回执对推入 `history/YYYY-MM-DD/TASK-XXX/`，按日期分片，
+>   `list_history` / `read_history_task` 提供索引和读取。
+> - **v3 生命周期工具（3.2.x 新增）**：`create_task` → `claim_task` → `submit_task`
+>   → `approve_task` / `reject_task` → `finish_task`，文件状态在
+>   `_lifecycle/inbox/` → `active/` → `review/` → `done/` 流转。
 > - **规则版本**：`fcop-rules.mdc 3.0.0` / `fcop-protocol.mdc 3.0.0`。
 >   升级后跑 `redeploy_rules()` 刷新本地四件套规则文件。
 > - **v3 拓扑（3.0.2 修复）**：fresh init 立即创建 `_lifecycle/{inbox,active,
->   review,done,archive}/`（per spec §1.1）。3.0.0 / 3.0.1 的 fresh init 漏建
->   了这一层，磁盘上仍是 v2 形态——已落项目跑 `python -m fcop migrate --to-v3`
->   升到 v3，新项目 3.0.2 起直接产 v3。
+>   review,done,archive}/` 及 `history/`（per spec §1.1）。已落项目跑
+>   `python -m fcop migrate --to-v3` 升到 v3。
 >
-> _(历史摘要：v1.3 / v1.4 / v1.5 及更早版本的变更见 `CHANGELOG.md`)_
+> _(历史摘要：v1.3 / v1.4 / v1.5 / v3.0.x / v3.1.x 及更早版本的变更见 `CHANGELOG.md`)_
 
 ---
 
@@ -498,10 +503,12 @@ list_workspaces()
 | "派个任务给 CODER" / "让 XXX 做 YYY" | `write_task(recipient="CODER", body="...")` | 落一份 `TASK-*-to-CODER.md` |
 | "看看现在项目什么状态" | `get_team_status()` | 任务/回执/问题/工作区数量 + 最近活跃 |
 | "有几个工作区？" / "做过几个东西了？" | `list_workspaces()` | 列所有 `workspace/<slug>/` 和创建时间 |
-| "还有哪些任务没做？" | `list_tasks()` | 列 `tasks/` 下未归档任务 |
+| "还有哪些任务没做？" | `list_tasks()` | 列未完成任务（v3: `_lifecycle/inbox/active/review/`）|
 | "xxx 任务说了什么？" | `read_task("TASK-...")` | 读正文 |
 | "问题单有啥" | `list_issues()` | 列 `issues/` |
-| "xxx 任务做完了归档吧" | `archive_task("TASK-...")` | 移到 `log/` |
+| "xxx 任务做完了归档吧" | `archive_task("TASK-...")` | 移到 `_lifecycle/archive/`（v3）|
+| "把归档文件推进历史存档" | `archive_to_history("TASK-...")` | 单条：`_lifecycle/archive/` → `history/YYYY-MM-DD/TASK-XXX/` |
+| "把所有归档文件批量推进历史" | `bulk_archive_to_history()` | 批量：清空 `_lifecycle/archive/`，全部移入 `history/` 日期分片 |
 | "看看完成回执" | `list_reports()` / `read_report(...)` | 查 `reports/` |
 
 ### 救场 / 特殊情况