trellis-hgl 0.6.0-beta.18 → 0.6.0-beta.20

package/dist/templates/claude/agents/trellis-check.md

@@ -3,6 +3,7 @@ name: trellis-check
 description: |
   Code quality check expert. Reviews code changes against specs and self-fixes issues.
 tools: Read, Write, Edit, Bash, Glob, Grep, mcp__exa__web_search_exa, mcp__exa__get_code_context_exa
+model: opus
 ---
 # Check Agent
 

package/dist/templates/claude/agents/trellis-research.md

@@ -3,6 +3,7 @@ name: trellis-research
 description: |
   Code and tech search expert. Finds files, patterns, and tech solutions, and PERSISTS every finding to the current task's research/ directory. No code modifications outside that directory.
 tools: Read, Write, Glob, Grep, Bash, mcp__exa__web_search_exa, mcp__exa__get_code_context_exa, Skill, mcp__chrome-devtools__*
+model: opus
 ---
 # Research Agent
 

package/dist/templates/common/skills/brainstorm.md

@@ -49,7 +49,7 @@ Use a concise title from the user's request. Use a slug without a date prefix. `
 6. After each user answer, update `prd.md` before continuing.
 7. Once repository-answerable questions are exhausted, tighten the remaining requirement gaps with `trellis-grill-me`: one question at a time, each with a recommendation, while still updating `prd.md` after each answer.
 8. Do not switch into development strategy decisions until the requirement-clarification pass has converged in `prd.md`.
-9. Before implementation starts on the Claude Code path, record the development strategy decisions in the task documents: development mode, branch vs worktree, default flow vs TDD. Lightweight tasks may keep that record in `prd.md`; complex tasks should keep it in `implement.md` together with the review-gate plan: `trellis-spec-review` → `trellis-code-review` → `trellis-code-architecture-review`. If the strategy is `subagent + worktree`, pin `./.claude/worktree`. If the strategy is TDD, record `trellis-tdd` as the reference flow.
+9. Before implementation starts on the Claude Code path, record the development strategy decisions in the task documents: development mode, branch vs worktree, default flow vs TDD. Lightweight tasks may keep that record in `prd.md`; complex tasks should keep it in `implement.md` together with the review-gate plan: `trellis-spec-review` → `trellis-code-review` → `trellis-code-architecture-review`. If the strategy is `subagent + worktree`, pin `./.claude/worktree`. If the strategy is TDD, record `trellis-tdd` as the reference flow. Also ask: "是否需要在开发前进行架构指导？" — if yes, dispatch `trellis-improve-codebase-architecture` with `架构审查模式: guidance` before `task.py start`, append its output to `design.md`, and add `架构审查：enabled` plus `trellis-improve-codebase-architecture（深度）` to the review-gate order in `implement.md`.
 10. For complex tasks, create or update `design.md` and `implement.md` before implementation starts.
 
 Do not invent a project-specific product/spec hierarchy. If the repository already has product, domain, or spec docs, use them. If it does not, proceed with the evidence that exists.

package/dist/templates/common/skills/improve-codebase-architecture.md

@@ -1,38 +1,158 @@
+---
+name: trellis-improve-codebase-architecture
+description: "Active codebase architecture analysis and review. Three modes: (A) Active Analysis — explore codebase, build spec, generate refactor candidates; (B) Pre-dev Guidance — provide architecture guidance before implementation; (C) Deep Review — audit changed code against spec after code-architecture-review passes."
+---
+
 # Trellis Improve Codebase Architecture
 
-Use this skill when the user explicitly asks for architecture improvement, when a refactor is structurally risky, or when the workflow identifies a task as architecture-sensitive.
+This skill operates in three modes depending on context. Read the dispatch prompt to determine which mode applies.
+
+---
+
+## Mode A: Active Analysis（主动分析）
+
+**触发条件**：用户直接调用，dispatch prompt 中不含 `架构审查模式:`
+
+### 流程
+
+**第一步：检查活跃任务**
+
+```bash
+{{PYTHON_CMD}} ./.trellis/scripts/task.py current
+```
+
+- 有活跃任务 → 询问用户："当前有活跃任务 `[任务名]`，是否切换到架构分析任务？"
+  - 用户拒绝 → 终止，不做任何操作
+  - 用户同意 → 执行 `{{PYTHON_CMD}} ./.trellis/scripts/task.py finish` 结束当前会话，再继续
+- 无活跃任务 → 直接继续
+
+**第二步：询问分析范围**
+
+让用户指定要分析的目录、模块，或整个代码库。根据项目结构给出建议范围。
+
+**第三步：创建架构分析任务**
+
+```bash
+{{PYTHON_CMD}} ./.trellis/scripts/task.py create "架构分析: <scope>" --slug arch-analysis-<MMDD>
+```
+
+**第四步：通过 trellis-research 探索代码库**
+
+dispatch `trellis-research` 子代理，探索指定范围，识别：
+
+- 模块边界和依赖关系
+- 现有的架构模式和开发风格
+- 接口复杂度 vs 实现复杂度（shallow module 信号）
+- 耦合点和测试困难区域
+
+研究结果自动持久化到 `{TASK_DIR}/research/`，供后续步骤引用。
+
+**第五步：Spec 驱动分析**
+
+检查 `.trellis/spec/` 是否有相关规范：
+
+**如果存在 spec**：
+- 读取相关 spec 文档
+- 以 spec 为评判标准分析代码
+- 识别不符合 spec 的架构问题
+- 生成编号的重构候选清单
+
+**如果 spec 不存在或不完整**：
+- 基于 `research/` 里的探索结果，识别现有模式和开发风格
+- 与用户进行对话式讨论，每次只确认一个规范点
+- 每确认一个规范点后，立即写入 `.trellis/spec/`（遵循现有 spec 格式，同步更新对应 `index.md`）
+- 基于新建的 spec 给出候选清单
+
+**第六步：输出候选清单**
+
+将候选清单记录到任务 PRD 中：
+
+```markdown
+## 架构分析候选清单
+
+1. **[模块名]** - 问题描述
+   - 涉及文件：`path/to/file.ts`
+   - 问题：[具体问题，如接口比实现复杂]
+   - 建议：[改进方向]
+   - 预期收益：[可维护性、可测试性等收益]
+```
+
+候选清单不是实现指令，需要用户选择后再创建具体实现任务。
+
+---
+
+## Mode B: Pre-dev Guidance（前置架构指导）
+
+**触发条件**：dispatch prompt 中包含 `架构审查模式: guidance`
+
+### 流程
+
+1. 读取活跃任务的 `prd.md` 和 `design.md`
+2. 读取 `.trellis/spec/` 中的相关规范
+3. 基于 PRD 和 design 的内容，输出架构指导
+4. 将指导内容追加到活跃任务的 `design.md`：
+
+```markdown
+## 架构指导（Pre-development）
+
+### 模块边界建议
+[基于 PRD 范围的建议]
+
+### 关键抽象设计
+[需要明确的接口和契约]
+
+### 潜在架构风险
+[可能导致结构漂移的设计决策]
+```
+
+### 禁止操作
+
+- 不创建新的 Trellis 任务
+- 不调用 `task.py create` 或 `task.py start`
+- 不修改实现代码
+
+---
+
+## Mode C: Deep Review（深度审查）
+
+**触发条件**：dispatch prompt 中包含 `架构审查模式: deep-review`
+
+### 流程
+
+1. 从 dispatch prompt 读取改动文件列表
+2. 读取活跃任务的 `prd.md` 和 `design.md`（含 `## 架构指导` 段落，如有）
+3. 读取 `.trellis/spec/` 中的相关规范
+4. 审查改动代码，检查：
+   - 是否遵循了 `design.md` 中的架构指导
+   - 是否引入了不必要的抽象或中间层
+   - 模块边界是否清晰
+   - 是否产生了架构漂移（偏离 spec 或架构指导）
+5. 输出审查报告
 
-## Purpose
+### 报告格式
 
-Reduce structural drift, prevent AI-generated spaghetti code, and converge on a simpler long-term shape before or during refactoring.
+```markdown
+## 深度架构审查报告
 
-## Core Responsibilities
+**结论：通过 / 失败**
 
-1. Identify the architectural problem being solved.
-2. Distinguish real structural issues from cosmetic cleanup.
-3. Reduce unnecessary abstraction, indirection, and speculative flexibility.
-4. Propose the smallest structural change that improves maintainability.
-5. Preserve task alignment — do not widen scope without a concrete reason.
+### 审查范围
+- 改动文件：[列表]
+- 对照标准：[spec 文件列表]
 
-## Review Lens
+### 发现的问题
+1. `<file>:<line>` - [问题描述]
+   - 违反了：[spec 条目 / 架构指导段落]
+   - 建议：[修改方向]
 
-Challenge changes that introduce:
-- wrappers with no clear ownership value
-- abstractions created for hypothetical future reuse
-- configuration or strategy layers without current need
-- defensive branching for impossible internal states
-- refactors that move code around without improving boundaries
+### 阻断性问题
+[必须修复才能通过的问题，如无则写"无"]
+```
 
-Prefer:
-- direct control flow
-- explicit boundaries
-- behavior-centered module seams
-- changes justified by current requirements or proven maintenance pain
+**审查失败时**：报告阻断性问题，主 session 将把代码打回 `trellis-implement` 修改，并重新进入完整的 review 循环。
 
-## Output Standard
+### 禁止操作
 
-When this skill is used, it should produce:
-- the architectural concern in plain language
-- the smallest acceptable direction to fix it
-- what not to add
-- what must stay aligned with current task scope
+- 不创建新的 Trellis 任务
+- 不调用 `task.py`
+- 不直接修改实现代码

package/dist/templates/trellis/workflow.md

@@ -187,7 +187,7 @@ Sub-agent mode: curate `implement.jsonl` and `check.jsonl` as spec/research mani
 
 Planning order for this Claude Code path: `task.py create` → `trellis-brainstorm` → `trellis-grill-me` → development strategy decision.
 Do not enter development strategy decisions until `prd.md` has been tightened through repository-first clarification and one-question-at-a-time follow-up.
-Before `task.py start`, record the development strategy decisions in the task documents. Complex tasks should store them in `implement.md`: development mode (current session / subagent), branch vs worktree, default flow vs TDD, plus the planned review-gate order: `trellis-spec-review` → `trellis-code-review` → `trellis-code-architecture-review`. If the strategy is `subagent + worktree`, pin the shared path to `./.claude/worktree` and require every code-development subagent to use it. If the strategy is TDD, record `trellis-tdd` as the reference flow.
+Before `task.py start`, record the development strategy decisions in the task documents. Complex tasks should store them in `implement.md`: development mode (current session / subagent), branch vs worktree, default flow vs TDD, plus the planned review-gate order: `trellis-spec-review` → `trellis-code-review` → `trellis-code-architecture-review`. If the strategy is `subagent + worktree`, pin the shared path to `./.claude/worktree` and require every code-development subagent to use it. If the strategy is TDD, record `trellis-tdd` as the reference flow. If the task has `架构审查：enabled` in `implement.md`, dispatch `trellis-improve-codebase-architecture` with `架构审查模式: guidance` before `task.py start`, then append its output to `design.md`.
 [/workflow-state:planning]
 
 <!-- Per-turn breadcrumb: shown throughout Phase 1 when codex.dispatch_mode=inline.
@@ -226,6 +226,7 @@ Dispatch prompt starts with `Active task: <task path from task.py current>`. Rea
 If the chosen strategy is `subagent + worktree`, all code-development subagents must use the same `./.claude/worktree` path.
 If the chosen strategy is TDD, align implementation and review expectations to `trellis-tdd`.
 If the task is architecture-sensitive or enters structural refactoring, route the architecture pass through `trellis-improve-codebase-architecture` before widening the change.
+If `implement.md` records `架构审查：enabled`, after `trellis-code-architecture-review` passes dispatch `trellis-improve-codebase-architecture` with `架构审查模式: deep-review` plus the changed file list from `git diff --name-only <base_branch>...HEAD`. On failure, report blocking issues and return to `trellis-implement`; re-run the full review loop until deep-review passes.
 If the user asks to archive the current task, do not block on commit; archive is allowed even when code is not committed.
 [/workflow-state:in_progress]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trellis-hgl",
-  "version": "0.6.0-beta.18",
+  "version": "0.6.0-beta.20",
   "description": "AI capabilities grow like ivy — Trellis provides the structure to guide them along a disciplined path",
   "type": "module",
   "main": "./dist/index.js",
@@ -12,31 +12,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "pnpm run clean && tsc && pnpm run copy-templates",
-    "clean": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\"",
-    "copy-templates": "node scripts/copy-templates.js",
-    "dev": "tsc --watch",
-    "start": "node ./dist/cli/index.js",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage",
-    "lint": "eslint src/ test/",
-    "lint:fix": "eslint src/ test/ --fix",
-    "format": "prettier --write src/",
-    "format:check": "prettier --check src/",
-    "typecheck": "tsc --noEmit",
-    "lint:py": "basedpyright",
-    "lint:all": "pnpm lint && pnpm lint:py",
-    "prepublishOnly": "pnpm run build && node -e \"const fs=require('node:fs'); fs.copyFileSync('../../README.md','README.md'); fs.copyFileSync('../../LICENSE','LICENSE');\"",
-    "release": "node scripts/release.js patch",
-    "release:minor": "node scripts/release.js minor",
-    "release:major": "node scripts/release.js major",
-    "release:beta": "node scripts/release.js beta",
-    "release:rc": "node scripts/release.js rc",
-    "release:promote": "node scripts/release.js promote",
-    "manifest": "node scripts/create-manifest.js"
-  },
   "keywords": [
     "ai",
     "workflow",
@@ -52,14 +27,14 @@
   "author": "Mindfold LLC",
   "license": "AGPL-3.0-only",
   "dependencies": {
-    "trellis-hgl-core": "workspace:*",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "figlet": "^1.9.4",
     "giget": "^3.1.1",
     "inquirer": "^9.3.7",
     "undici": "^6.21.0",
-    "zod": "^4.4.2"
+    "zod": "^4.4.2",
+    "trellis-hgl-core": "0.6.0-beta.20"
   },
   "devDependencies": {
     "@eslint/js": "^9.18.0",
@@ -86,5 +61,29 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/mindfold-ai/trellis.git"
+  },
+  "scripts": {
+    "build": "pnpm run clean && tsc && pnpm run copy-templates",
+    "clean": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\"",
+    "copy-templates": "node scripts/copy-templates.js",
+    "dev": "tsc --watch",
+    "start": "node ./dist/cli/index.js",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "lint": "eslint src/ test/",
+    "lint:fix": "eslint src/ test/ --fix",
+    "format": "prettier --write src/",
+    "format:check": "prettier --check src/",
+    "typecheck": "tsc --noEmit",
+    "lint:py": "basedpyright",
+    "lint:all": "pnpm lint && pnpm lint:py",
+    "release": "node scripts/release.js patch",
+    "release:minor": "node scripts/release.js minor",
+    "release:major": "node scripts/release.js major",
+    "release:beta": "node scripts/release.js beta",
+    "release:rc": "node scripts/release.js rc",
+    "release:promote": "node scripts/release.js promote",
+    "manifest": "node scripts/create-manifest.js"
   }
-}
+}