cowork-flow 0.0.22 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cowork-flow",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "CLI for installing and maintaining cowork-flow collaboration templates.",
   "type": "module",
   "bin": {

package/template/.cowork-flow/.version

@@ -1 +1 @@
-0.0.22
+0.0.23

package/template/.cowork-flow/scripts/change.py

@@ -9,6 +9,7 @@ import re
 import sys
 from datetime import datetime
 from pathlib import Path
+from typing import Iterable
 
 from common.archive_utils import archive_directory_resumable
 from common.paths import (
@@ -161,6 +162,63 @@ def _normalize_archive_metadata(repo_root: Path, change_dir: Path) -> None:
         _write_metadata(change_dir, metadata)
 
 
+def _same_path(left: Path, right: Path) -> bool:
+    try:
+        return left.resolve() == right.resolve()
+    except OSError:
+        return left.absolute() == right.absolute()
+
+
+def _task_link_matches(repo_root: Path, value: object, task_paths: Iterable[Path]) -> bool:
+    resolved = _resolve_link(repo_root, "tasks", value)
+    if resolved is None:
+        return False
+    return any(_same_path(resolved, task_path) for task_path in task_paths)
+
+
+def linked_active_changes_for_task(repo_root: Path, task_paths: Iterable[Path]) -> list[str]:
+    """Return active change slugs whose metadata points at one of the task paths."""
+    changes_dir = _changes_dir(repo_root)
+    if not changes_dir.is_dir():
+        return []
+
+    paths = tuple(task_paths)
+    slugs: list[str] = []
+    for change_dir in sorted(changes_dir.iterdir()):
+        if not change_dir.is_dir() or change_dir.name == DIR_ARCHIVE:
+            continue
+        metadata = _read_metadata(change_dir)
+        if metadata.get("status") == "archived":
+            continue
+        if _task_link_matches(repo_root, metadata.get("task"), paths):
+            slugs.append(change_dir.name)
+    return slugs
+
+
+def archive_change_by_slug(repo_root: Path, slug: str) -> Path | None:
+    source = _change_dir(repo_root, slug)
+    if source.is_dir():
+        _normalize_archive_metadata(repo_root, source)
+
+    if not validate_change(repo_root, slug, quiet=True):
+        return None
+
+    month = datetime.now().astimezone().strftime("%Y-%m")
+    destination = _archive_dir(repo_root) / month / slug
+    result = archive_directory_resumable(source, destination)
+    if not result.ok:
+        level = "Warning" if result.partial else "Error"
+        print(f"{level}: {result.message}", file=sys.stderr)
+        return None
+
+    metadata = _read_metadata(destination)
+    metadata["status"] = "archived"
+    metadata["archived_at"] = _now_iso()
+    metadata["task"] = _normalize_task_link(repo_root, metadata.get("task"))
+    _write_metadata(destination, metadata)
+    return destination
+
+
 
 def _display_path(repo_root: Path, path: Path) -> str:
     try:
@@ -272,27 +330,9 @@ def validate_command(args: argparse.Namespace) -> int:
 def archive_change(args: argparse.Namespace) -> int:
     repo_root = get_repo_root()
     slug = args.slug
-    source = _change_dir(repo_root, slug)
-    if source.is_dir():
-        _normalize_archive_metadata(repo_root, source)
-
-    if not validate_change(repo_root, slug, quiet=True):
+    if archive_change_by_slug(repo_root, slug) is None:
         return 1
 
-    month = datetime.now().astimezone().strftime("%Y-%m")
-    destination = _archive_dir(repo_root) / month / slug
-    result = archive_directory_resumable(source, destination)
-    if not result.ok:
-        level = "Warning" if result.partial else "Error"
-        print(f"{level}: {result.message}", file=sys.stderr)
-        return 1
-
-    metadata = _read_metadata(destination)
-    metadata["status"] = "archived"
-    metadata["archived_at"] = _now_iso()
-    metadata["task"] = _normalize_task_link(repo_root, metadata.get("task"))
-    _write_metadata(destination, metadata)
-
     print(f"archived {slug}")
     return 0
 

package/template/.cowork-flow/scripts/task.py

@@ -14,7 +14,7 @@ Usage:
     ./.cowork-flow/run task complete [dir]              # Mark task completed
     ./.cowork-flow/run task current                     # Show active session task
     ./.cowork-flow/run task finish                      # Clear active session task
-    ./.cowork-flow/run task archive <task-name>         # Archive completed task
+    ./.cowork-flow/run task archive <task-name>         # Archive completed task and linked changes
     ./.cowork-flow/run task list                        # List active tasks
     ./.cowork-flow/run task list-archive [month]        # List archived tasks
     ./.cowork-flow/run task add-subtask <parent-dir> <child-dir>     # Link child to parent
@@ -47,6 +47,7 @@ from common.active_task import (
 from common.paths import (
     DIR_WORKFLOW,
     DIR_AGENTS,
+    DIR_CHANGES,
     DIR_TASKS,
     DIR_SPEC,
     DIR_ARCHIVE,
@@ -1120,6 +1121,40 @@ def _print_blockers(blockers: list[str]) -> None:
         print(f"  - {blocker}")
 
 
+def _linked_active_changes_for_task(repo_root: Path, task_dir: Path) -> list[str]:
+    from change import linked_active_changes_for_task
+
+    return linked_active_changes_for_task(repo_root, (task_dir,))
+
+
+def _linked_changes_ready_for_archive(repo_root: Path, slugs: list[str]) -> bool:
+    from change import validate_change
+
+    ready = True
+    for slug in slugs:
+        if not validate_change(repo_root, slug, quiet=True):
+            print(
+                colored(f"Error: Linked change is not ready to archive: {slug}", Colors.RED),
+                file=sys.stderr,
+            )
+            ready = False
+    return ready
+
+
+def _archive_linked_changes(repo_root: Path, slugs: list[str]) -> bool:
+    from change import archive_change_by_slug
+
+    for slug in slugs:
+        if archive_change_by_slug(repo_root, slug) is None:
+            print(
+                colored(f"Error: Failed to archive linked change: {slug}", Colors.RED),
+                file=sys.stderr,
+            )
+            return False
+        print(colored(f"Archived linked change: {slug}", Colors.GREEN), file=sys.stderr)
+    return True
+
+
 def cmd_next(args: argparse.Namespace) -> int:
     """Print the next safe workflow action without mutating state."""
     repo_root = get_repo_root()
@@ -1216,7 +1251,10 @@ def cmd_next(args: argparse.Namespace) -> int:
     if status in DONE_STATUSES:
         print("Next action: finalize, commit, archive, and record session")
         print("Command: git status --short")
+        linked_changes = _linked_active_changes_for_task(repo_root, task_dir)
         print(f"Then: ./.cowork-flow/run task archive {Path(task_path).name}")
+        for slug in linked_changes:
+            print(f"Then: ./.cowork-flow/run change archive {slug} (handled by task archive)")
         _print_blockers(blockers)
         return 0
 
@@ -1231,7 +1269,7 @@ def cmd_next(args: argparse.Namespace) -> int:
 # =============================================================================
 
 def cmd_archive(args: argparse.Namespace) -> int:
-    """Archive completed task."""
+    """Archive completed task and linked changes."""
     repo_root = get_repo_root()
     task_name = args.name
 
@@ -1258,6 +1296,10 @@ def cmd_archive(args: argparse.Namespace) -> int:
     if task_json_path.is_file():
         task_data = _read_json_file(task_json_path)
 
+    linked_changes = _linked_active_changes_for_task(repo_root, task_dir)
+    if linked_changes and not _linked_changes_ready_for_archive(repo_root, linked_changes):
+        return 1
+
     # Archive
     result = archive_task_complete(task_dir, repo_root)
     if "archived_to" not in result:
@@ -1284,6 +1326,9 @@ def cmd_archive(args: argparse.Namespace) -> int:
     year_month = archive_dest.parent.name
     print(colored(f"Archived: {dir_name} -> archive/{year_month}/", Colors.GREEN), file=sys.stderr)
 
+    if linked_changes and not _archive_linked_changes(repo_root, linked_changes):
+        return 1
+
     # Auto-commit only when explicitly requested.
     if getattr(args, "commit", False) and not getattr(args, "no_commit", False):
         _auto_commit_archive(dir_name, repo_root)
@@ -1297,13 +1342,19 @@ def cmd_archive(args: argparse.Namespace) -> int:
 
 
 def _auto_commit_archive(task_name: str, repo_root: Path) -> None:
-    """Stage .cowork-flow/tasks/ changes and commit after archive."""
+    """Stage task/change archive changes and commit after archive."""
     tasks_rel = f"{DIR_WORKFLOW}/{DIR_TASKS}"
-    _run_git_command(["add", "-A", tasks_rel], cwd=repo_root)
+    changes_rel = f"{DIR_WORKFLOW}/{DIR_CHANGES}"
+    archive_rels = [
+        rel
+        for rel in (tasks_rel, changes_rel)
+        if (repo_root / rel).exists()
+    ]
+    _run_git_command(["add", "-A", *archive_rels], cwd=repo_root)
 
     # Check if there are staged changes
     rc, _, _ = _run_git_command(
-        ["diff", "--cached", "--quiet", "--", tasks_rel], cwd=repo_root
+        ["diff", "--cached", "--quiet", "--", *archive_rels], cwd=repo_root
     )
     if rc == 0:
         print("[OK] No task changes to commit.", file=sys.stderr)
@@ -1564,7 +1615,7 @@ Usage:
   ./.cowork-flow/run task complete [dir]                     Mark task completed
   ./.cowork-flow/run task finish                             Clear active session task
   ./.cowork-flow/run task next [dir]                         Show next safe workflow action
-  ./.cowork-flow/run task archive <task-name>                Archive completed task
+  ./.cowork-flow/run task archive <task-name>                Archive completed task and linked changes
   ./.cowork-flow/run task add-subtask <parent> <child>       Link child task to parent
   ./.cowork-flow/run task remove-subtask <parent> <child>    Unlink child from parent
   ./.cowork-flow/run task list [--mine] [--status <status>]  List tasks

package/template/.cowork-flow/workflow.md

@@ -214,6 +214,8 @@ L2 任务在 `task start` 前必须通过 readiness gate；同一 blocker 列表
     git add <expected files>
     git commit -m "<message>"
     ```
+   `task archive <task-name>` 会归档 task，并自动归档 `change.yaml.task`
+   指向该 task 的 active change；无法通过 `change validate` 的 change 不会被自动归档。
 
 ## 9. 恢复规则