cowork-flow 0.0.28 → 0.0.29

package/README.md

@@ -99,7 +99,7 @@ OpenCode 项目级固定 agent、slash command 和系统上下文注入插件。
 npx cowork-flow init ./my-project --platform codex
 ```
 
-`init` 会显式要求平台和开发者身份。平台可选 `codex`、`opencode`、`claude-code`、`all`，其中 `both` 仍作为兼容别名表示 `codex,opencode`。交互式终端会提示输入；脚本或 CI 请传入：
+`init` 会显式要求平台和开发者身份。平台可选 `codex`、`opencode`、`claude-code`、`all`。交互式终端会提示输入；脚本或 CI 请传入：
 
 ```bash
 npx cowork-flow init ./my-project --platform codex --developer <your-name>
@@ -134,7 +134,7 @@ npx cowork-flow --help
 cowork-flow init ./my-project --platform codex
 ```
 
-`init` 会直接复制模板中的通用 `.cowork-flow/`，并按 `--platform` 只复制对应 host 资产：`codex` 复制 `.codex/`、`.agents/skills/` 与 `.cowork-flow/adapters/codex/`，`opencode` 复制 `.opencode/`、`.agents/skills/` 与 `.cowork-flow/adapters/opencode/`，`claude-code` 复制 `CLAUDE.md`、`.claude/`（含 `.claude/settings.json`、`.claude/hooks/`、`.claude/skills/`）与 `.cowork-flow/adapters/claude-code/`，不复制 `.agents/skills/`。`all` 或 `--platform codex,opencode,claude-code` 同时复制三者和 `.agents/skills/`。`both` 保持兼容，只复制 Codex 和 OpenCode。它还会初始化 `.cowork-flow/.developer` 与 `.cowork-flow/workspace/<developer>/`。交互式终端会先显示 checkbox 多选界面选择平台，再提示开发者名称；非交互式环境必须传入 `--platform <codex|opencode|claude-code|all>` 与 `--developer <name>`。`init` 不会复制额外技能包。
+`init` 会直接复制模板中的通用 `.cowork-flow/`，并按 `--platform` 只复制对应 host 资产：`codex` 复制 `.codex/`、`.agents/skills/` 与 `.cowork-flow/adapters/codex/`，`opencode` 复制 `.opencode/`、`.agents/skills/` 与 `.cowork-flow/adapters/opencode/`，`claude-code` 复制 `CLAUDE.md`、`.claude/`（含 `.claude/settings.json`、`.claude/hooks/`、`.claude/skills/`）与 `.cowork-flow/adapters/claude-code/`，不复制 `.agents/skills/`。`all` 或 `--platform codex,opencode,claude-code` 同时复制三者和 `.agents/skills/`。它还会初始化 `.cowork-flow/.developer` 与 `.cowork-flow/workspace/<developer>/`。交互式终端会先显示 checkbox 多选界面选择平台，再提示开发者名称；非交互式环境必须传入 `--platform <codex|opencode|claude-code|all>` 与 `--developer <name>`。`init` 不会复制额外技能包。
 
 初始化到当前项目：
 
@@ -185,6 +185,16 @@ cowork-flow sync . --dry-run
 下面示例使用 macOS / Linux 写法；Windows 原生命令行中把
 `./.cowork-flow/run` 替换为 `.\.cowork-flow\run.cmd`。
 
+当前主流程以 `.cowork-flow/workflow.md` 为准。默认路径是：
+
+```text
+changes -> brainstorming -> read spec -> plan -> tasks -> implement -> check -> complete
+```
+
+L0 文档、格式、小范围重构或测试补充可简化为
+`brainstorming -> read spec -> implement -> check -> complete`；L1/L2 在完成后继续
+`archive -> add session`。
+
 初始化或查看开发者身份：
 
 ```bash
@@ -196,7 +206,6 @@ cowork-flow sync . --dry-run
 
 ```bash
 ./.cowork-flow/run get-context
-./.cowork-flow/run project-context refresh
 ./.cowork-flow/run task list
 ./.cowork-flow/run task next
 ```
@@ -216,18 +225,35 @@ cowork-flow sync . --dry-run
 ./.cowork-flow/run task start <task-dir>
 ```
 
-`task next` is read-only. It reports the active task, status, blockers, and the
-next safe command before the main session starts work, dispatches fixed agents,
-checks, archives, or records the session.
-
-`project-context refresh` 会创建或刷新 `.cowork-flow/project-context.md`。生成块由
-本地项目文件确定，`Manual Notes` 区保留人工补充；该文件是项目索引，不替代
-`AGENTS.md`、`.cowork-flow/workflow.md` 或 `.cowork-flow/spec/`。
+`task next` 只读，不推进状态。它根据当前会话任务和 `task.json.status`
+报告当前任务、阻塞项和下一条安全命令；主会话在启动工作、派发固定代理、
+进入检查、归档或记录 session 前都应先看它。
 
 L2 任务的 readiness gate 会在 `task start` 前阻塞缺失的 proposal/spec/design、
 计划、任务链接、边界、假设、验收标准或 verification commands；同一 blocker
 会出现在 `task next` 输出中。
 
+任务状态流转：
+
+```mermaid
+stateDiagram-v2
+    [*] --> NoTask
+    state "无当前任务" as NoTask
+    state "planning" as Planning
+    state "in_progress" as InProgress
+    state "review" as Review
+    state "completed" as Completed
+    state "已归档" as Archived
+
+    NoTask --> Planning: task create
+    Planning --> InProgress: task start
+    InProgress --> Review: task review
+    Review --> Completed: task complete
+    Completed --> Archived: task archive
+    Completed --> NoTask: task finish
+    Archived --> [*]
+```
+
 任务状态由阶段命令推进，`task next` 只读取状态：
 
 | 阶段 | 命令 | `task.json.status` |
@@ -236,11 +262,13 @@ L2 任务的 readiness gate 会在 `task start` 前阻塞缺失的 proposal/spec
 | 开始执行 | `task start <task-dir>` | `in_progress` |
 | 进入检查 | `task review [task-dir]` | `review` |
 | 检查完成 | `task complete [task-dir]` | `completed` |
+| 归档任务 | `task archive <task-name>` | 归档副本保持 `completed` |
 | 清会话指针 | `task finish` | 不改变状态 |
 
 执行 plan 时使用固定 cowork agents：
 
-主会话负责创建/启动任务、维护计划与收口验证；可并行的实现或检查工作通过 Codex subagent 交给固定角色 agent。
+主会话负责创建/启动任务、维护计划与收口验证；实现和检查默认通过当前 Host Adapter
+派发给固定角色 agent。固定 agent 是叶子执行者，不能再派发其他 agent，也不能替代主会话完成归档、记录 session 或提交。
 
 ```text
 ./.cowork-flow/run subagent init --role implement --agent-type cowork-implement --execution-task-dir <task-dir> --title "<title>"
@@ -255,7 +283,7 @@ cowork_host_context_key: <host_context_key>
 
 子代理首步执行 `./.cowork-flow/run subagent bind <runtime_context_id> <host_context_key>`；主会话验收前必须确认 runtime context 中 `status=bound` 且 `bound_context_key` 匹配。默认角色为 `cowork-research`、`cowork-implement`、`cowork-check`，任务上下文来自已绑定 runtime context，而不是 prompt 形状。
 
-Codex hook 启用后，每轮会自动注入 `<workflow-state>`，其中包含入口分类、当前任务、状态来源和下一步流程提示。状态文本来自 `.cowork-flow/spec/contracts/workflow-state-templates.md`；`workflow.md` 只描述流程，不内联状态片段。hook 不替代主会话验收；它只负责把 task 状态和 workflow gate 放进上下文。
+Host hook/plugin 启用后，每轮会自动注入 workflow state，其中包含入口分类、当前任务、状态来源和下一步流程提示。状态文本来自 `.cowork-flow/spec/contracts/workflow-state-templates.md`；`workflow.md` 只描述流程，不内联状态片段。hook 不替代主会话验收；它只负责把 task 状态和 workflow gate 放进上下文。
 
 记录 session：
 

package/package.json

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

package/src/commands/init.js

@@ -195,7 +195,7 @@ function initialIndexContent(name) {
 - Sessions are appended to the journal file
 - A new journal file is created automatically after the current file exceeds 2000 lines
 - Use \`add_session.py\` to record sessions
-- New records use English text; legacy records can remain as they are
+- New records use English text; existing records can remain as they are
 `;
 }
 

package/src/commands/update.js

@@ -6,10 +6,8 @@ import {
 } from '../lib/package-info.js';
 
 function validateUpdateArgs(args) {
-  for (const arg of args) {
-    if (arg !== '--global' && arg !== '--yes') {
-      throw new Error(`Unknown update option: ${arg}`);
-    }
+  if (args.length > 0) {
+    throw new Error(`Unknown update option: ${args[0]}`);
   }
 }
 

package/src/lib/copy-template.js

@@ -1,5 +1,5 @@
 import { constants } from 'node:fs';
-import { access, chmod, copyFile, mkdir, readFile, readdir, stat, writeFile } from 'node:fs/promises';
+import { access, chmod, copyFile, mkdir, readFile, readdir, rm, stat, writeFile } from 'node:fs/promises';
 import { dirname, join, relative } from 'node:path';
 
 import { templateRoot } from './paths.js';
@@ -99,6 +99,41 @@ const SAFE_SYNC_FILES = new Set([
   '.cowork-flow/spec/contracts/workflow-state-templates.md'
 ]);
 
+const OBSOLETE_SYNC_FILES = new Set([
+  '.cowork-flow/project-context.md',
+  '.cowork-flow/scripts/add_session.py',
+  '.cowork-flow/scripts/change.py',
+  '.cowork-flow/scripts/doctor.py',
+  '.cowork-flow/scripts/get_context.py',
+  '.cowork-flow/scripts/get_developer.py',
+  '.cowork-flow/scripts/init_developer.py',
+  '.cowork-flow/scripts/party_mode_v2.py',
+  '.cowork-flow/scripts/project_context.py',
+  '.cowork-flow/scripts/resume.py',
+  '.cowork-flow/scripts/subagent.py',
+  '.cowork-flow/scripts/task.py',
+  '.cowork-flow/scripts/common/active_task.py',
+  '.cowork-flow/scripts/common/archive_utils.py',
+  '.cowork-flow/scripts/common/coding_standards.py',
+  '.cowork-flow/scripts/common/config.py',
+  '.cowork-flow/scripts/common/developer.py',
+  '.cowork-flow/scripts/common/execution_context.py',
+  '.cowork-flow/scripts/common/files.py',
+  '.cowork-flow/scripts/common/gates.py',
+  '.cowork-flow/scripts/common/git_context.py',
+  '.cowork-flow/scripts/common/git_snapshot.py',
+  '.cowork-flow/scripts/common/paths.py',
+  '.cowork-flow/scripts/common/readiness.py',
+  '.cowork-flow/scripts/common/state_machine.py',
+  '.cowork-flow/scripts/common/task_utils.py',
+  '.cowork-flow/scripts/common/tdd_evidence.py',
+  '.cowork-flow/scripts/common/test_intent.py',
+  '.cowork-flow/scripts/common/validate_coding_standards.py',
+  '.cowork-flow/scripts/common/validate_implementation.py',
+  '.cowork-flow/scripts/common/validate_rules.py',
+  '.cowork-flow/spec/contracts/entry-contract.md'
+]);
+
 const COWORK_FLOW_START = '<!-- COWORK-FLOW:START -->';
 const COWORK_FLOW_END = '<!-- COWORK-FLOW:END -->';
 
@@ -200,6 +235,13 @@ export async function buildSyncPlan(targetDir, options = {}) {
     }
   }
 
+  for (const file of OBSOLETE_SYNC_FILES) {
+    const destination = join(targetDir, file);
+    if (await pathExists(destination)) {
+      actions.push({ action: 'delete', source: null, destination, relativePath: file });
+    }
+  }
+
   actions.push({
     action: 'update',
     source: null,
@@ -226,7 +268,7 @@ export async function detectInstalledPlatforms(targetDir) {
 }
 
 export function summarizePlan(actions, dryRun = false) {
-  const counts = { create: 0, update: 0, skip: 0, protected: 0 };
+  const counts = { create: 0, update: 0, skip: 0, protected: 0, delete: 0 };
   for (const action of actions) {
     counts[action.action] += 1;
   }
@@ -234,7 +276,8 @@ export function summarizePlan(actions, dryRun = false) {
   const prefix = dryRun ? 'dry-run ' : '';
   const createLabel = dryRun ? 'would-create' : 'created';
   const updateLabel = dryRun ? 'would-update' : 'updated';
-  return `${prefix}${createLabel}=${counts.create} ${updateLabel}=${counts.update} skipped=${counts.skip} protected=${counts.protected}\n`;
+  const deleteLabel = dryRun ? 'would-delete' : 'deleted';
+  return `${prefix}${createLabel}=${counts.create} ${updateLabel}=${counts.update} ${deleteLabel}=${counts.delete} skipped=${counts.skip} protected=${counts.protected}\n`;
 }
 
 export async function applyPlan(actions, options = {}) {
@@ -246,6 +289,10 @@ export async function applyPlan(actions, options = {}) {
     if (item.action === 'skip' || item.action === 'protected') {
       continue;
     }
+    if (item.action === 'delete') {
+      await rm(item.destination, { force: true });
+      continue;
+    }
 
     await mkdir(dirname(item.destination), { recursive: true });
     if (item.content !== undefined) {

package/src/lib/platforms.js

@@ -1,10 +1,7 @@
 export const SUPPORTED_PLATFORMS = ['codex', 'opencode', 'claude-code'];
 
-const LEGACY_BOTH_PLATFORMS = ['codex', 'opencode'];
-
 const PLATFORM_ALIASES = new Map([
   ['all', SUPPORTED_PLATFORMS],
-  ['both', LEGACY_BOTH_PLATFORMS],
   ['codex', ['codex']],
   ['opencode', ['opencode']],
   ['claude', ['claude-code']],

package/template/.claude/agents/cowork-check.md

@@ -24,9 +24,9 @@ state is injected. The first child step must still run:
 ```
 
 If the explicit bind fails, or if the bound context is missing, closed, invalid,
-or names another agent type, report `needs_context` and stop. Do not use
-`COWORK_ENTRY_CONTRACT_V1` to infer subagent identity; that contract classifies
-main-session prompts only.
+or names another agent type, report `needs_context` and stop. Do not infer
+subagent identity from prompt shape; runtime context binding is the only formal
+signal.
 
 Rules:
 

package/template/.claude/agents/cowork-implement.md

@@ -24,9 +24,9 @@ state is injected. The first child step must still run:
 ```
 
 If the explicit bind fails, or if the bound context is missing, closed, invalid,
-or names another agent type, report `needs_context` and stop. Do not use
-`COWORK_ENTRY_CONTRACT_V1` to infer subagent identity; that contract classifies
-main-session prompts only.
+or names another agent type, report `needs_context` and stop. Do not infer
+subagent identity from prompt shape; runtime context binding is the only formal
+signal.
 
 ---
 

package/template/.claude/agents/cowork-research.md

@@ -24,9 +24,9 @@ state is injected. The first child step must still run:
 ```
 
 If the explicit bind fails, or if the bound context is missing, closed, invalid,
-or names another agent type, report `needs_context` and stop. Do not use
-`COWORK_ENTRY_CONTRACT_V1` to infer subagent identity; that contract classifies
-main-session prompts only.
+or names another agent type, report `needs_context` and stop. Do not infer
+subagent identity from prompt shape; runtime context binding is the only formal
+signal.
 
 Rules:
 

package/template/.claude/hooks/inject-workflow-state.py

@@ -17,15 +17,6 @@ TAG_RE = re.compile(
 )
 DEFAULT_CONTRACT_REGISTRY = {
     "contracts": [
-        {
-            "id": "COWORK_ENTRY_CONTRACT_V1",
-            "path": ".cowork-flow/spec/contracts/entry-contract.md",
-            "digest": [
-                "Classify main-session requests before task start, resume, archive, or commit.",
-                "Runtime context, not prompt labels, identifies formal subagent sessions.",
-            ],
-            "readWhen": ["before task start/resume/archive", "when prompt and bootstrap text conflict"],
-        },
         {
             "id": "RUNTIME_CONTEXT_DISPATCH_V2",
             "path": ".cowork-flow/spec/contracts/subagent-dispatch.md",
@@ -170,7 +161,7 @@ def _load_common(root: Path) -> None:
 def _get_active_task(root: Path, hook_input: dict[str, Any]) -> tuple[str | None, str, str]:
     _load_common(root)
     try:
-        from common.active_task import get_active_task  # type: ignore[import-not-found]
+        from common.task.active_task import get_active_task  # type: ignore[import-not-found]
     except Exception:
         return None, "no_task", "unavailable"
 
@@ -194,7 +185,7 @@ def _get_active_task(root: Path, hook_input: dict[str, Any]) -> tuple[str | None
 def _resolve_runtime_context(root: Path, hook_input: dict[str, Any]) -> tuple[dict[str, Any] | None, str | None]:
     _load_common(root)
     try:
-        from common.active_task import (  # type: ignore[import-not-found]
+        from common.task.active_task import (  # type: ignore[import-not-found]
             bind_runtime_context,
             read_runtime_context,
             resolve_runtime_context_id,

package/template/.codex/hooks/inject-workflow-state.py

@@ -18,15 +18,6 @@ TAG_RE = re.compile(
 )
 DEFAULT_CONTRACT_REGISTRY = {
     "contracts": [
-        {
-            "id": "COWORK_ENTRY_CONTRACT_V1",
-            "path": ".cowork-flow/spec/contracts/entry-contract.md",
-            "digest": [
-                "Classify main-session requests before task start, resume, archive, or commit.",
-                "Runtime context, not prompt labels, identifies formal subagent sessions.",
-            ],
-            "readWhen": ["before task start/resume/archive", "when prompt and bootstrap text conflict"],
-        },
         {
             "id": "RUNTIME_CONTEXT_DISPATCH_V2",
             "path": ".cowork-flow/spec/contracts/subagent-dispatch.md",
@@ -154,7 +145,7 @@ def _load_common(root: Path) -> None:
 def _get_dispatch_mode(root: Path) -> str:
     _load_common(root)
     try:
-        from common.config import get_codex_dispatch_mode  # type: ignore[import-not-found]
+        from common.core.config import get_codex_dispatch_mode  # type: ignore[import-not-found]
     except Exception:
         return "sub-agent"
     try:
@@ -166,7 +157,7 @@ def _get_dispatch_mode(root: Path) -> str:
 def _get_active_task(root: Path, hook_input: dict[str, Any]) -> tuple[str | None, str, str]:
     _load_common(root)
     try:
-        from common.active_task import get_active_task  # type: ignore[import-not-found]
+        from common.task.active_task import get_active_task  # type: ignore[import-not-found]
     except Exception:
         return None, "no_task", "unavailable"
 
@@ -190,7 +181,7 @@ def _get_active_task(root: Path, hook_input: dict[str, Any]) -> tuple[str | None
 def _resolve_runtime_context(root: Path, hook_input: dict[str, Any]) -> tuple[dict[str, Any] | None, str | None]:
     _load_common(root)
     try:
-        from common.active_task import (  # type: ignore[import-not-found]
+        from common.task.active_task import (  # type: ignore[import-not-found]
             bind_runtime_context,
             read_runtime_context,
             resolve_runtime_context_id,

package/template/.cowork-flow/.version

@@ -1 +1 @@
-0.0.28
+0.0.29

package/template/.cowork-flow/adapters/claude-code/adapter.yaml

@@ -27,7 +27,6 @@ runtimeContext:
   envKey: COWORK_FLOW_RUNTIME_CONTEXT_ID
   metadataKey: cowork_runtime_context_id
 contracts:
-  entry: COWORK_ENTRY_CONTRACT_V1
   dispatch: RUNTIME_CONTEXT_DISPATCH_V2
   leafExecutor: true
 fallback:

package/template/.cowork-flow/adapters/codex/adapter.yaml

@@ -27,7 +27,6 @@ runtimeContext:
   envKey: COWORK_FLOW_RUNTIME_CONTEXT_ID
   metadataKey: cowork_runtime_context_id
 contracts:
-  entry: COWORK_ENTRY_CONTRACT_V1
   dispatch: RUNTIME_CONTEXT_DISPATCH_V2
   leafExecutor: true
 fallback:

package/template/.cowork-flow/adapters/opencode/adapter.yaml

@@ -25,7 +25,6 @@ runtimeContext:
   envKey: COWORK_FLOW_RUNTIME_CONTEXT_ID
   metadataKey: cowork_runtime_context_id
 contracts:
-  entry: COWORK_ENTRY_CONTRACT_V1
   dispatch: RUNTIME_CONTEXT_DISPATCH_V2
   leafExecutor: true
 fallback:

package/template/.cowork-flow/scripts/commands/__init__.py

@@ -0,0 +1 @@
+"""Command entrypoints for cowork-flow."""

package/template/.cowork-flow/scripts/commands/_bootstrap.py

@@ -0,0 +1,10 @@
+"""Allow command scripts to import the sibling common package when run directly."""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+SCRIPTS_DIR = Path(__file__).resolve().parents[1]
+if str(SCRIPTS_DIR) not in sys.path:
+    sys.path.insert(0, str(SCRIPTS_DIR))

package/template/.cowork-flow/scripts/{add_session.py → commands/add_session.py}

@@ -17,7 +17,11 @@ import sys
 from datetime import datetime
 from pathlib import Path
 
-from common.paths import (
+if __package__:
+    from . import _bootstrap as _bootstrap  # noqa: F401
+else:
+    import _bootstrap  # noqa: F401
+from common.core.paths import (
     DIR_TASKS,
     DIR_WORKFLOW,
     DIR_WORKSPACE,
@@ -27,8 +31,8 @@ from common.paths import (
     get_developer,
     get_workspace_dir,
 )
-from common.developer import ensure_developer
-from common.config import get_session_commit_message, get_max_journal_lines
+from common.core.developer import ensure_developer
+from common.core.config import get_session_commit_message, get_max_journal_lines
 
 MARKER_CURRENT_STATUS_START = "@@@auto:current-status"
 MARKER_CURRENT_STATUS_END = "@@@/auto:current-status"
@@ -428,12 +432,6 @@ def main() -> int:
         action="store_true",
         help="Auto git commit after recording workspace metadata",
     )
-    parser.add_argument(
-        "--no-commit",
-        action="store_true",
-        help="Deprecated no-op; add-session no longer commits by default",
-    )
-
     args = parser.parse_args()
 
     extra_content = "(add details)"
@@ -446,7 +444,7 @@ def main() -> int:
 
     return add_session(
         args.title, args.commit, args.summary, extra_content,
-        auto_commit=args.auto_commit and not args.no_commit,
+        auto_commit=args.auto_commit,
     )
 
 

package/template/.cowork-flow/scripts/{change.py → commands/change.py}

@@ -11,8 +11,12 @@ from datetime import datetime
 from pathlib import Path
 from typing import Iterable
 
-from common.archive_utils import archive_directory_resumable
-from common.paths import (
+if __package__:
+    from . import _bootstrap as _bootstrap  # noqa: F401
+else:
+    import _bootstrap  # noqa: F401
+from common.task.archive_utils import archive_directory_resumable
+from common.core.paths import (
     DIR_ARCHIVE,
     DIR_CHANGES,
     DIR_WORKFLOW,

package/template/.cowork-flow/scripts/{doctor.py → commands/doctor.py}

@@ -13,7 +13,11 @@ try:
 except ModuleNotFoundError:  # pragma: no cover - Python < 3.11
     tomllib = None  # type: ignore[assignment]
 
-from common.paths import get_repo_root
+if __package__:
+    from . import _bootstrap as _bootstrap  # noqa: F401
+else:
+    import _bootstrap  # noqa: F401
+from common.core.paths import get_repo_root
 
 
 ENTRY_BOUNDARY_DIR = "entry" + "-boundary"
@@ -101,22 +105,12 @@ REQUIRED_WORKFLOW_STATE_TEMPLATE_SNIPPETS = [
     "UNKNOWN is not a delegated",
 ]
 
-REQUIRED_ENTRY_CONTRACT_SNIPPETS = [
-    "COWORK_ENTRY_CONTRACT_V1",
-    "main-session prompts",
-    "resolved by runtime context binding",
-    "`UNKNOWN` is not subagent evidence",
-    "Runtime context binding overrides project bootstrap text",
-]
-
 REQUIRED_CONTRACT_REGISTRY_SNIPPETS = [
     '"schemaVersion": 1',
-    '"COWORK_ENTRY_CONTRACT_V1"',
     '"RUNTIME_CONTEXT_DISPATCH_V2"',
     '"HOST_ADAPTER_CAPABILITIES_V1"',
     '"HOST_ADAPTER_SCHEMA_V1"',
     '"readWhen"',
-    '".cowork-flow/spec/contracts/entry-contract.md"',
     '".cowork-flow/spec/contracts/subagent-dispatch.md"',
     '".cowork-flow/spec/contracts/capabilities.md"',
     '".cowork-flow/spec/schemas/adapter.schema.json"',
@@ -216,11 +210,6 @@ def _check_toml_parseable(path: Path, errors: list[str]) -> dict | None:
 
 
 def _check_common_contracts(repo_root: Path, errors: list[str]) -> None:
-    for rel in (
-        ".cowork-flow/spec/contracts/entry-contract.md",
-        "template/.cowork-flow/spec/contracts/entry-contract.md",
-    ):
-        _check_file_contains(repo_root / rel, REQUIRED_ENTRY_CONTRACT_SNIPPETS, errors)
     for rel in (
         ".cowork-flow/spec/runtime/contract-registry.json",
         "template/.cowork-flow/spec/runtime/contract-registry.json",
@@ -273,23 +262,6 @@ def _check_host_adapters(repo_root: Path, errors: list[str]) -> None:
         )
 
 
-def cmd_entry_contract(_: argparse.Namespace) -> int:
-    repo_root = get_repo_root()
-    errors: list[str] = []
-    _check_common_contracts(repo_root, errors)
-    for rel in (
-        f".agents/skills/{ENTRY_BOUNDARY_DIR}/SKILL.md",
-        f"template/.agents/skills/{ENTRY_BOUNDARY_DIR}/SKILL.md",
-    ):
-        _check_file_absent(repo_root / rel, errors)
-    if errors:
-        for error in errors:
-            print(f"ERROR: {error}", file=sys.stderr)
-        return 1
-    print("entry contract checks passed")
-    return 0
-
-
 def cmd_host_adapters(_: argparse.Namespace) -> int:
     repo_root = get_repo_root()
     errors: list[str] = []
@@ -459,12 +431,12 @@ def cmd_subagent_safety(_: argparse.Namespace) -> int:
     ):
         _check_file_contains(repo_root / rel, REQUIRED_RUNTIME_HOOK_SNIPPETS, errors)
     for rel in (
-        ".cowork-flow/scripts/subagent.py",
-        "template/.cowork-flow/scripts/subagent.py",
-        ".cowork-flow/scripts/common/execution_context.py",
-        "template/.cowork-flow/scripts/common/execution_context.py",
-        ".cowork-flow/scripts/common/active_task.py",
-        "template/.cowork-flow/scripts/common/active_task.py",
+        ".cowork-flow/scripts/commands/subagent.py",
+        "template/.cowork-flow/scripts/commands/subagent.py",
+        ".cowork-flow/scripts/common/core/execution_context.py",
+        "template/.cowork-flow/scripts/common/core/execution_context.py",
+        ".cowork-flow/scripts/common/task/active_task.py",
+        "template/.cowork-flow/scripts/common/task/active_task.py",
     ):
         if not (repo_root / rel).is_file():
             errors.append(f"missing file: {rel}")
@@ -479,7 +451,6 @@ def cmd_subagent_safety(_: argparse.Namespace) -> int:
 def build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(description="cowork-flow diagnostics")
     parser.add_argument("--subagent-safety", action="store_true", help="Check subagent safety wiring")
-    parser.add_argument("--entry-contract", action="store_true", help="Check entry classification contract")
     parser.add_argument("--host-adapters", action="store_true", help="Check host adapter declarations")
     return parser
 
@@ -489,8 +460,6 @@ def main() -> int:
     args = parser.parse_args()
     if args.subagent_safety:
         return cmd_subagent_safety(args)
-    if args.entry_contract:
-        return cmd_entry_contract(args)
     if args.host_adapters:
         return cmd_host_adapters(args)
     parser.print_help()

package/template/.cowork-flow/scripts/{get_context.py → commands/get_context.py}

@@ -9,7 +9,11 @@ Usage:
 
 from __future__ import annotations
 
-from common.git_context import main
+if __package__:
+    from . import _bootstrap as _bootstrap  # noqa: F401
+else:
+    import _bootstrap  # noqa: F401
+from common.git.git_context import main
 
 
 if __name__ == "__main__":

package/template/.cowork-flow/scripts/{get_developer.py → commands/get_developer.py}

@@ -2,14 +2,18 @@
 """
 Get current developer name.
 
-This is a wrapper that uses common/paths.py
+This is a wrapper that uses common/core/paths.py
 """
 
 from __future__ import annotations
 
 import sys
 
-from common.paths import get_developer
+if __package__:
+    from . import _bootstrap as _bootstrap  # noqa: F401
+else:
+    import _bootstrap  # noqa: F401
+from common.core.paths import get_developer
 
 
 def main() -> None:

package/template/.cowork-flow/scripts/{init_developer.py → commands/init_developer.py}

@@ -14,12 +14,16 @@ from __future__ import annotations
 
 import sys
 
-from common.paths import (
+if __package__:
+    from . import _bootstrap as _bootstrap  # noqa: F401
+else:
+    import _bootstrap  # noqa: F401
+from common.core.paths import (
     DIR_WORKFLOW,
     FILE_DEVELOPER,
     get_developer,
 )
-from common.developer import init_developer
+from common.core.developer import init_developer
 
 
 def main() -> None:

package/template/.cowork-flow/scripts/{party_mode_v2.py → commands/party_mode_v2.py}

@@ -18,8 +18,12 @@ from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any
 
-from common.config import get_party_mode_v2_config
-from common.paths import DIR_WORKFLOW, get_repo_root
+if __package__:
+    from . import _bootstrap as _bootstrap  # noqa: F401
+else:
+    import _bootstrap  # noqa: F401
+from common.core.config import get_party_mode_v2_config
+from common.core.paths import DIR_WORKFLOW, get_repo_root
 
 RUNTIME_DIR = ".runtime"
 MODE_DIR = "party-mode-v2"