maestro-flow 0.3.21 → 0.3.23

package/dist/src/tools/spec-loader.js

@@ -56,43 +56,28 @@ export function resolveSpecDir(projectPath, scope, uid) {
         default: return join(projectPath, SPECS_DIR);
     }
 }
-/**
- * Load spec files from one or more directories.
- *
- * Layer scanning order (lowest → highest priority):
- *   0. ~/.maestro/specs/             (global — when `scope` includes global)
- *   1. .workflow/specs/              (baseline)
- *   2. .workflow/collab/specs/       (team shared — when `uid` is provided)
- *   3. .workflow/collab/specs/{uid}/ (personal — when `uid` is provided)
- *
- * Content from later layers is appended (never replaces earlier content).
- * Each layer's content is prefixed with a header for clarity.
- *
- * @param scope   Controls which extra layers to include beyond baseline.
- *                - 'project': baseline only (default)
- *                - 'global': global + baseline
- *                - 'team': baseline + team shared
- *                - 'personal': baseline + team shared + personal (requires uid)
- *                - undefined: same as 'project'; uid alone still triggers team+personal for backward compat
- */
-export function loadSpecs(projectPath, category, uid, keyword, scope) {
+export function loadSpecs(projectPath, category, uid, keyword, scope, options) {
+    const globalDir = options?.globalDir ?? paths.specs;
     // Build ordered list of (directory, label) pairs to scan
-    const layers = buildLayers(projectPath, uid, scope);
-    // Auto-init only baseline and global layers.
+    const layers = buildLayers(projectPath, uid, scope, globalDir);
+    // Auto-init baseline and global layers.
     // Team/personal are per-user — auto-creating them for arbitrary uids is wrong.
     autoInitSeeds(join(projectPath, SPECS_DIR));
-    if (scope === 'global') {
-        autoInitSeeds(paths.specs);
+    autoInitSeeds(globalDir);
+    // First pass: collect results per layer (skip empty)
+    const layerResults = [];
+    for (const { dir, label } of layers) {
+        const { sections, matched } = loadFromDir(dir, category, keyword);
+        if (sections.length > 0) {
+            layerResults.push({ label, sections, matched });
+        }
     }
+    // Only show layer headers when multiple layers have actual content
+    const multiLayer = layerResults.length > 1;
     const allSections = [];
     const allMatched = [];
     let totalCount = 0;
-    const multiLayer = layers.length > 1;
-    for (const { dir, label } of layers) {
-        const { sections, matched } = loadFromDir(dir, category, keyword);
-        if (sections.length === 0)
-            continue;
-        // Add layer headers when multi-layer mode is active (global or uid)
+    for (const { label, sections, matched } of layerResults) {
         if (multiLayer) {
             allSections.push(`${label}\n\n${sections.join('\n\n---\n\n')}`);
         }
@@ -110,12 +95,10 @@ export function loadSpecs(projectPath, category, uid, keyword, scope) {
         totalLoaded: totalCount,
     };
 }
-function buildLayers(projectPath, uid, scope) {
+function buildLayers(projectPath, uid, scope, globalDir) {
     const layers = [];
-    // Global layer — lowest priority
-    if (scope === 'global') {
-        layers.push({ dir: paths.specs, label: LAYER_LABELS.global });
-    }
+    // Global layer — always included as lowest priority
+    layers.push({ dir: globalDir ?? paths.specs, label: LAYER_LABELS.global });
     // Baseline — always included
     layers.push({
         dir: join(projectPath, SPECS_DIR),
@@ -161,16 +144,9 @@ function loadFromDir(specsDir, category, keyword) {
         const body = stripFrontmatter(raw).trim();
         if (!body)
             continue;
-        if (keyword) {
-            // Entry-level keyword filtering
-            const filtered = filterByKeyword(body, keyword);
-            if (filtered) {
-                sections.push(filtered);
-                matched.push(file);
-            }
-        }
-        else {
-            sections.push(body);
+        const formatted = formatFileContent(body, keyword);
+        if (formatted) {
+            sections.push(formatted);
             matched.push(file);
         }
     }
@@ -190,25 +166,37 @@ function shouldInclude(filename, category) {
     return false;
 }
 /**
- * Filter file content by keyword. Returns matched entry content or null.
- * Handles both <spec-entry> tags (keyword attribute match) and legacy entries (text grep).
+ * Parse file body, strip <spec-entry> tags, format clean output with metadata.
+ * When keyword is provided, only return matching entries.
+ * Falls back to raw body for files with no structured entries.
  */
-function filterByKeyword(body, keyword) {
-    const kw = keyword.toLowerCase();
+function formatFileContent(body, keyword) {
     const { entries, legacy } = parseSpecEntries(body);
-    const matchedSections = [];
-    // New-format: match by keywords attribute
-    const matchedEntries = entries.filter(e => e.keywords.includes(kw));
-    if (matchedEntries.length > 0) {
-        matchedSections.push(formatSpecEntries(matchedEntries));
+    // No structured entries → pass through raw body (or keyword-grep it)
+    if (entries.length === 0 && legacy.length === 0) {
+        if (keyword) {
+            return body.toLowerCase().includes(keyword.toLowerCase()) ? body : null;
+        }
+        return body;
     }
-    // Legacy: grep text match
-    for (const leg of legacy) {
-        if (leg.content.toLowerCase().includes(kw)) {
-            matchedSections.push(leg.content);
+    const parts = [];
+    if (keyword) {
+        const kw = keyword.toLowerCase();
+        const matchedEntries = entries.filter(e => e.keywords.includes(kw));
+        if (matchedEntries.length > 0)
+            parts.push(formatSpecEntries(matchedEntries));
+        for (const leg of legacy) {
+            if (leg.content.toLowerCase().includes(kw))
+                parts.push(leg.content);
         }
     }
-    return matchedSections.length > 0 ? matchedSections.join('\n\n---\n\n') : null;
+    else {
+        if (entries.length > 0)
+            parts.push(formatSpecEntries(entries));
+        for (const leg of legacy)
+            parts.push(leg.content);
+    }
+    return parts.length > 0 ? parts.join('\n\n---\n\n') : null;
 }
 function stripFrontmatter(raw) {
     const trimmed = raw.trimStart();

package/dist/src/tools/spec-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"spec-loader.js","sourceRoot":"","sources":["../../../src/tools/spec-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spec-loader.js","sourceRoot":"","sources":["../../../src/tools/spec-loader.ts"],"names":[],"mappings":"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"}

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/cli.ts","../src/index.ts","../src/agents/cli-agent-runner.ts","../src/agents/cli-history-store.ts","../src/agents/dashboard-bridge.ts","../src/agents/parallel-cli-runner.ts","../src/agents/terminal-adapter.ts","../src/agents/terminal-backend.ts","../src/async/delegate-broker-client.ts","../src/async/delegate-broker.ts","../src/async/delegate-control.ts","../src/async/index.ts","../src/brainstorm-visualize/frame.ts","../src/brainstorm-visualize/server.ts","../src/commands/brainstorm-visualize.ts","../src/commands/cli.ts","../src/commands/collab.ts","../src/commands/coordinate.ts","../src/commands/delegate.ts","../src/commands/ext.ts","../src/commands/hooks.ts","../src/commands/install-backend.ts","../src/commands/install.ts","../src/commands/knowhow.ts","../src/commands/launcher.ts","../src/commands/msg.ts","../src/commands/overlay.ts","../src/commands/run.ts","../src/commands/serve.ts","../src/commands/spec.ts","../src/commands/stop.ts","../src/commands/tool.ts","../src/commands/uninstall.ts","../src/commands/update.ts","../src/commands/view.ts","../src/commands/wiki.ts","../src/commands/install-ui/backupconfig.tsx","../src/commands/install-ui/blueprintpreview.logic.ts","../src/commands/install-ui/blueprintpreview.tsx","../src/commands/install-ui/componentgrid.logic.ts","../src/commands/install-ui/componentgrid.tsx","../src/commands/install-ui/configpanel.tsx","../src/commands/install-ui/cyberitem.tsx","../src/commands/install-ui/cyberdeckblueprint.tsx","../src/commands/install-ui/executionview.tsx","../src/commands/install-ui/gradientheader.tsx","../src/commands/install-ui/hooksconfig.tsx","../src/commands/install-ui/installconfirm.tsx","../src/commands/install-ui/installexecution.tsx","../src/commands/install-ui/installflow.tsx","../src/commands/install-ui/installhub.tsx","../src/commands/install-ui/installresult.tsx","../src/commands/install-ui/mcpconfig.tsx","../src/commands/install-ui/resultdashboard.tsx","../src/commands/install-ui/reviewpanel.tsx","../src/commands/install-ui/shortcutfooter.tsx","../src/commands/install-ui/statuslineconfig.tsx","../src/commands/install-ui/stepselector.tsx","../src/commands/install-ui/index.ts","../src/commands/install-ui/types.ts","../src/commands/overlay-ui/overlaylist.tsx","../src/commands/overlay-ui/index.ts","../src/commands/uninstall-ui/uninstallflow.tsx","../src/commands/uninstall-ui/index.ts","../src/config/cli-tools-config.ts","../src/config/index.ts","../src/config/paths.ts","../src/config/template-discovery.ts","../src/coordinator/cli-executor.ts","../src/coordinator/coordinate-broker-adapter.ts","../src/coordinator/expr-evaluator.ts","../src/coordinator/graph-loader.ts","../src/coordinator/graph-types.ts","../src/coordinator/graph-walker.ts","../src/coordinator/index.ts","../src/coordinator/intent-router.ts","../src/coordinator/llm-decider.ts","../src/coordinator/output-parser.ts","../src/coordinator/parallel-executor.ts","../src/coordinator/prompt-assembler.ts","../src/coordinator/step-analyzer.ts","../src/core/component-defs.ts","../src/core/extension-loader.ts","../src/core/manifest.ts","../src/core/tag-injector.ts","../src/core/tool-registry.ts","../src/core/overlay/applier.ts","../src/core/overlay/loader.ts","../src/core/overlay/patcher.ts","../src/core/overlay/section-parser.ts","../src/core/overlay/types.ts","../src/db/connection-pool.ts","../src/db/index.ts","../src/db/tenant-migrator.ts","../src/db/tenant-schema.ts","../src/db/schema/core/index.ts","../src/db/schema/core/organizations.ts","../src/db/schema/core/permissions.ts","../src/db/schema/core/refresh-tokens.ts","../src/db/schema/core/users.ts","../src/hooks/auto-mode.ts","../src/hooks/constants.ts","../src/hooks/context-budget.ts","../src/hooks/context-monitor.ts","../src/hooks/coordinator-tracker.ts","../src/hooks/delegate-monitor.ts","../src/hooks/hook-engine.ts","../src/hooks/hook-manager.ts","../src/hooks/index.ts","../src/hooks/keyword-spec-injector.ts","../src/hooks/preflight-core.ts","../src/hooks/session-context.ts","../src/hooks/skill-context.ts","../src/hooks/spec-bridge.ts","../src/hooks/spec-injector.ts","../src/hooks/statusline.ts","../src/hooks/team-monitor.ts","../src/hooks/workflow-hooks.ts","../src/hooks/workspace.ts","../src/hooks/__tests__/statusline-visual-test.ts","../src/hooks/guards/index.ts","../src/hooks/guards/preflight-guard.ts","../src/hooks/guards/prompt-guard.ts","../src/hooks/guards/spec-validator.ts","../src/hooks/guards/workflow-guard.ts","../src/hooks/plugins/index.ts","../src/hooks/plugins/spec-injection-plugin.ts","../src/hooks/plugins/telemetry-plugin.ts","../src/i18n/detect.ts","../src/i18n/index.ts","../src/i18n/types.ts","../src/i18n/locales/en.ts","../src/i18n/locales/zh.ts","../src/mcp/delegate-channel-relay.ts","../src/mcp/server.ts","../src/middleware/auth.ts","../src/middleware/permission.ts","../src/middleware/rate-limit.ts","../src/middleware/tenant.ts","../src/middleware/validation.ts","../src/migrations/_template.ts","../src/migrations/index.ts","../src/migrations/run.ts","../src/migrations/v1-to-v2.ts","../src/routes/auth.ts","../src/routes/members.ts","../src/routes/organizations.ts","../src/services/auth.service.ts","../src/services/password.service.ts","../src/services/rbac.service.ts","../src/services/token.service.ts","../src/team/phase-orchestrator.ts","../src/team/phase-types.ts","../src/tools/collab-adapter.ts","../src/tools/edit-file.ts","../src/tools/index.ts","../src/tools/merge-validator.ts","../src/tools/namespace-guard.ts","../src/tools/phase-gate-evaluator.ts","../src/tools/read-file.ts","../src/tools/read-many-files.ts","../src/tools/spec-entry-parser.ts","../src/tools/spec-init.ts","../src/tools/spec-keyword-index.ts","../src/tools/spec-loader.ts","../src/tools/store-knowhow.ts","../src/tools/team-activity.ts","../src/tools/team-agents.ts","../src/tools/team-mailbox.ts","../src/tools/team-members.ts","../src/tools/team-msg.ts","../src/tools/team-tasks-mcp.ts","../src/tools/team-tasks.ts","../src/tools/transition-recorder.ts","../src/tools/write-file.ts","../src/types/hono.d.ts","../src/types/index.ts","../src/types/tool-schema.ts","../src/utils/cli-format.ts","../src/utils/file-reader.ts","../src/utils/get-version.ts","../src/utils/jsonl-log.ts","../src/utils/migration-registry.ts","../src/utils/path-validator.ts","../src/utils/state-schema.ts","../shared/agent-types.ts"],"version":"5.9.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maestro-flow",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "description": "Workflow orchestration CLI with MCP endpoint support and extensible architecture",
   "type": "module",
   "imports": {

package/templates/cli/prompts/workflow-skill-conflict-patterns.txt

@@ -77,7 +77,7 @@ MODE: analysis
 CONTEXT: @.workflow/.archives/*/IMPL_PLAN.md @.workflow/.archives/manifest.json
 EXPECTED: Conflict patterns with frequency and resolution
 CONSTRAINTS: analysis=READ-ONLY
-" --to gemini --mode analysis --rule workflow-skill-aggregation --cd .workflow/.archives
+" --role analyze --mode analysis --rule workflow-skill-aggregation --cd .workflow/.archives
 ```
 
 **Pattern Grouping**:

package/templates/cli/prompts/workflow-skill-lessons-learned.txt

@@ -73,7 +73,7 @@ MODE: analysis
 CONTEXT: @.workflow/.archives/manifest.json
 EXPECTED: Aggregated lessons with frequency counts
 CONSTRAINTS: analysis=READ-ONLY
-" --to gemini --mode analysis --rule workflow-skill-aggregation --cd .workflow/.archives
+" --role analyze --mode analysis --rule workflow-skill-aggregation --cd .workflow/.archives
 ```
 
 **Severity Classification**:

package/templates/search-tools.md

@@ -17,7 +17,7 @@ Semantic Search → Grep (pattern) → Glob (files) → CLI (deep analysis)
 | Find by intent/behavior | Semantic search tool (see above) |
 | Known identifier/regex | `Grep` |
 | Find files by name/ext | `Glob` |
-| Complex cross-file reasoning | `maestro delegate --to gemini --mode analysis` |
+| Complex cross-file reasoning | `maestro delegate --role analyze --mode analysis` |
 | Read identified file | `Read` |
 
 ## Fallback

package/templates/workflows/specs/node-catalog.md

@@ -128,7 +128,7 @@ Deliver: [specify expected output format]
 | `testing` | skill | `quality-test` |
 | `review` | skill | `quality-review` |
 | `brainstorm` | skill | `maestro-brainstorm` |
-| `analysis` | cli | `maestro delegate --to gemini --mode analysis` |
+| `analysis` | cli | `maestro delegate --role analyze --mode analysis` |
 | `spec` | skill | `maestro-spec-generate` |
 | `refactor` | skill | `quality-refactor` |
 | `integration-test` | skill | `quality-integration-test` |

package/workflows/brainstorm.md

@@ -432,7 +432,7 @@ Execute analysis for ONE specified role with optional interactive context gather
 - Enhancements applied (EP-IDs)
 - Complexity score and review status
 - Next:
-  Skill({ skill: "maestro-spec-generate", args: "--from-brainstorm {sessionId}" })  — Generate full spec package
+  Skill({ skill: "maestro-roadmap", args: "--mode full --from-brainstorm {sessionId}" })  — Generate full spec package
   Skill({ skill: "maestro-analyze", args: "{topic}" })   — Evaluate feasibility + lock decisions
   Skill({ skill: "maestro-analyze", args: "{phase} -q" })   — Quick decision extraction only
   Skill({ skill: "maestro-plan", args: "{phase}" })       — Plan directly (if scope is clear)

package/{.claude/CLAUDE.md → workflows/claude-instructions.md}

@@ -1,26 +1,25 @@
-# Maestro
-
-Workflow orchestration CLI with MCP endpoint support and extensible architecture.
-
-- **Coding Philosophy**: @~/.maestro/workflows/coding-philosophy.md
-
-## Delegate & CLI
-
-- **Delegate Usage**: @~/.maestro/workflows/delegate-usage.md
-- **CLI Endpoints Config**: @~/.maestro/cli-tools.json
-
-**Strictly follow the cli-tools.json configuration**
-
-Available CLI endpoints are dynamically defined by the config file
-
-## Code Diagnostics
-
-- **Prefer `mcp__ide__getDiagnostics`** for code error checking over shell-based TypeScript compilation
-
-## Knowledge Capture
-
-- **Spec writes** → always `<spec-entry>` closed-tag format with `category`, `keywords`, `date`, `source`. Never raw Markdown. Route through `spec-add` when possible.
-- **Capture signal** → when execution surfaces non-obvious knowledge (plan deviation, retry pattern, root cause, constraint violation), ask user once whether to persist it. Match category to content: decisions→`arch`, pitfalls→`debug`/`learning`, patterns→`coding`, rules→`quality`.
-- **Promotion** → at milestone close, scan learnings for repeated keywords (≥2 entries) and offer to graduate them into formal conventions.
-- **Traceability** → every entry needs a source anchor: `file:line`, `INS-{id}`, commit, or phase path.
-
+# Maestro
+
+Workflow orchestration CLI with MCP endpoint support and extensible architecture.
+
+- **Coding Philosophy**: @~/.maestro/workflows/coding-philosophy.md
+
+## Delegate & CLI
+
+- **Delegate Usage**: @~/.maestro/workflows/delegate-usage.md
+- **CLI Endpoints Config**: @~/.maestro/cli-tools.json
+
+**Strictly follow the cli-tools.json configuration**
+
+Available CLI endpoints are dynamically defined by the config file
+
+## Code Diagnostics
+
+- **Prefer `mcp__ide__getDiagnostics`** for code error checking over shell-based TypeScript compilation
+
+## Knowledge Capture
+
+- **Spec writes** → always `<spec-entry>` closed-tag format with `category`, `keywords`, `date`, `source`. Never raw Markdown. Route through `spec-add` when possible.
+- **Capture signal** → when execution surfaces non-obvious knowledge (plan deviation, retry pattern, root cause, constraint violation), ask user once whether to persist it. Match category to content: decisions→`arch`, pitfalls→`debug`/`learning`, patterns→`coding`, rules→`quality`.
+- **Promotion** → at milestone close, scan learnings for repeated keywords (≥2 entries) and offer to graduate them into formal conventions.
+- **Traceability** → every entry needs a source anchor: `file:line`, `INS-{id}`, commit, or phase path.

package/workflows/cli-tools-usage.md

@@ -22,7 +22,8 @@ maestro delegate "<PROMPT>" [options]
 
 | Option | Description | Default |
 |--------|-------------|---------|
-| `--to <name>` | Tool: gemini, qwen, codex, claude, opencode | First enabled in config |
+| `--to <tool>` | Explicit tool: gemini, qwen, codex, claude, opencode | First enabled in config |
+| `--role <role>` | Capability role: analyze, explore, review, implement, plan, brainstorm, research | — (resolves via config) |
 | `--mode <mode>` | `analysis` (read-only) or `write` (create/modify/delete) | `analysis` |
 | `--model <model>` | Model override | Tool's `primaryModel` |
 | `--cd <dir>` | Working directory | Current directory |
@@ -32,6 +33,19 @@ maestro delegate "<PROMPT>" [options]
 | `--resume [id]` | Resume session (last if no id, comma-separated for merge) | — |
 | `--backend <type>` | Adapter backend: `direct` or `terminal` (tmux/wezterm) | `direct` |
 
+### Tool Resolution Priority
+
+1. `--to <tool>` — explicit tool selection (backward compat, highest priority)
+2. `--role <role>` — capability-based auto-selection via config
+3. No flag — first enabled tool in config
+
+### Role-Based Tool Selection
+
+Roles map to tools via `cli-tools.json` configuration:
+- User-defined roles in `roles` section override built-in defaults
+- Workspace `.maestro/cli-tools.json` overrides global `~/.maestro/cli-tools.json`
+- Built-in roles: `analyze`, `explore`, `review`, `implement`, `plan`, `brainstorm`, `research`
+
 ### Mode Definition (Authoritative)
 
 | Mode | Permission | Auto-Invoke Safe | Use For |
@@ -236,6 +250,6 @@ Proactively invoke `maestro delegate` when these conditions are met — no user
 
 - Default `--mode analysis` (safe, read-only)
 - Wait for results before next action
-- Tool fallback: `gemini` → `qwen` → `codex`
+- Use `--role` for capability-based tool selection; fallback chain is config-driven
 - Rule suggestions are guidelines — choose the best fit
 </execution>

package/workflows/codex-instructions.md

@@ -0,0 +1,150 @@
+# Codex Code Guidelines
+
+
+## Code Quality Standards
+
+### Code Quality
+- Follow project's existing patterns
+- Match import style and naming conventions
+- Single responsibility per function/class
+- DRY (Don't Repeat Yourself)
+- YAGNI (You Aren't Gonna Need It)
+
+### Testing
+- Test all public functions
+- Test edge cases and error conditions
+- Mock external dependencies
+- Target 80%+ coverage
+
+### Error Handling
+- Proper try-catch blocks
+- Clear error messages
+- Graceful degradation
+- Don't expose sensitive info
+
+## Core Principles
+
+**Incremental Progress**:
+- Small, testable changes
+- Commit working code frequently
+- Build on previous work (subtasks)
+
+**Evidence-Based**:
+- Study 3+ similar patterns before implementing
+- Match project style exactly
+- Verify with existing code
+
+**Pragmatic**:
+- Boring solutions over clever code
+- Simple over complex
+- Adapt to project reality
+
+**Context Continuity** (Multi-Task):
+- Leverage resume for consistency
+- Maintain established patterns
+- Test integration between subtasks
+
+**Git Operations** (Parallel Task Safety):
+- Only stage/commit files directly produced by current task
+- Never touch unrelated changes or other task outputs
+- Use `git add <specific-files>` instead of `git add .`
+- Verify staged files before commit to avoid cross-task conflicts
+
+**Multi-CLI Coexistence** (CRITICAL):
+- If your task conflicts with existing uncommitted changes, **STOP and report the conflict** instead of overwriting
+- Treat all pre-existing uncommitted changes as intentional work-in-progress by other tools
+
+
+## System Optimization
+
+**Direct Binary Calls**: Always call binaries directly in `functions.shell`, set `workdir`, avoid shell wrappers (`bash -lc`, `cmd /c`, etc.)
+
+**Text Editing Priority**:
+1. Use `apply_patch` tool for all routine text edits
+2. Fall back to `sed` for single-line substitutions if unavailable
+3. Avoid Python editing scripts unless both fail
+
+**apply_patch invocation**:
+```json
+{
+  "command": ["apply_patch", "*** Begin Patch\n*** Update File: path/to/file\n@@\n- old\n+ new\n*** End Patch\n"],
+  "workdir": "<workdir>",
+  "justification": "Brief reason"
+}
+```
+
+**Windows UTF-8 Encoding** (before commands):
+```powershell
+[Console]::InputEncoding  = [Text.UTF8Encoding]::new($false)
+[Console]::OutputEncoding = [Text.UTF8Encoding]::new($false)
+chcp 65001 > $null
+```
+
+## Context Acquisition (MCP Tools Priority)
+
+**For task context gathering and analysis, ALWAYS prefer MCP tools**:
+
+1. **mcp__ace-tool__search_context** - HIGHEST PRIORITY for code discovery
+   - Semantic search with real-time codebase index
+   - Use for: finding implementations, understanding architecture, locating patterns
+   - Example: `mcp__ace-tool__search_context(project_root_path="/path", query="authentication logic")`
+
+2. **smart_search** - Fallback for structured search
+   - Use `smart_search(query="...")` for keyword/regex search
+   - Use `smart_search(action="find_files", pattern="*.ts")` for file discovery
+   - Supports modes: `auto`, `hybrid`, `exact`, `ripgrep`
+
+3. **read_file** - Batch file reading
+   - Read multiple files in parallel: `read_file(path="file1.ts")`, `read_file(path="file2.ts")`
+   - Supports glob patterns: `read_file(path="src/**/*.config.ts")`
+
+**Priority Order**:
+```
+ACE search_context (semantic) → smart_search (structured) → read_file (batch read) → shell commands (fallback)
+```
+
+**NEVER** use shell commands (`cat`, `find`, `grep`) when MCP tools are available.
+
+## Workflow Session Awareness
+
+| Workflow | Directory | Summary File |
+|----------|-----------|-------------|
+| `workflow-plan` | `.workflow/active/WFS-*/` | `workflow-session.json` |
+| `workflow-lite-plan` | `.workflow/.lite-plan/{date}-{slug}/` | `plan.json` |
+| `analyze-with-file` | `.workflow/.analysis/ANL-*/` | `conclusions.json` |
+| `multi-cli-plan` | `.workflow/.multi-cli-plan/*/` | `session-state.json` |
+| `lite-fix` | `.workflow/.lite-fix/*/` | `fix-plan.json` |
+| Other | `.workflow/.debug/`, `.workflow/.scratchpad/`, `.workflow/archives/` | — |
+
+Before starting work, scan recent sessions (7 days) to avoid conflicts and reuse prior work:
+- Overlapping file scope → warn, suggest referencing prior session
+- Complementary findings → feed into current task context
+
+
+## Knowledge Capture
+
+- **Spec writes** → always `<spec-entry>` closed-tag format with `category`, `keywords`, `date`, `source`. Never raw Markdown. Route through `spec-add` when possible.
+- **Capture signal** → when execution surfaces non-obvious knowledge (plan deviation, retry pattern, root cause, constraint violation), ask user once whether to persist it. Match category to content: decisions→`arch`, pitfalls→`debug`/`learning`, patterns→`coding`, rules→`quality`.
+- **Promotion** → at milestone close, scan learnings for repeated keywords (≥2 entries) and offer to graduate them into formal conventions.
+- **Traceability** → every entry needs a source anchor: `file:line`, `INS-{id}`, commit, or phase path.
+
+## Execution Checklist
+
+**Before**:
+- [ ] Understand PURPOSE and TASK clearly
+- [ ] Use ACE search_context first, fallback to smart_search for discovery
+- [ ] Use read_file to batch read context files, find 3+ patterns
+- [ ] Check RULES templates and constraints
+
+**During**:
+- [ ] Follow existing patterns exactly
+- [ ] Write tests alongside code
+- [ ] Run tests after every change
+- [ ] Commit working code incrementally
+
+**After**:
+- [ ] All tests pass
+- [ ] Coverage meets target
+- [ ] Build succeeds
+- [ ] All EXPECTED deliverables met
+- [ ] Non-obvious knowledge surfaced? → offer `spec-add`

package/workflows/delegate-usage.md

@@ -22,7 +22,8 @@ maestro delegate "<PROMPT>" [options]
 
 | Option | Description | Default |
 |--------|-------------|---------|
-| `--to <tool>` | Tool: gemini, qwen, codex, claude, opencode | First enabled in config |
+| `--to <tool>` | Explicit tool: gemini, qwen, codex, claude, opencode | First enabled in config |
+| `--role <role>` | Capability role: analyze, explore, review, implement, plan, brainstorm, research | — (resolves via config) |
 | `--mode <mode>` | `analysis` (read-only) or `write` (create/modify/delete) | `analysis` |
 | `--model <model>` | Model override | Tool's `primaryModel` |
 | `--cd <dir>` | Working directory | Current directory |
@@ -32,6 +33,19 @@ maestro delegate "<PROMPT>" [options]
 | `--includeDirs <dirs>` | Additional directories (comma-separated) | — |
 | `--backend <type>` | Adapter backend: `direct` or `terminal` (tmux/wezterm) | `direct` |
 
+### Tool Resolution Priority
+
+1. `--to <tool>` — explicit tool selection (backward compat, highest priority)
+2. `--role <role>` — capability-based auto-selection via config
+3. No flag — first enabled tool in config
+
+### Role-Based Tool Selection
+
+Roles map to tools via `cli-tools.json` configuration:
+- User-defined roles in `roles` section override built-in defaults
+- Workspace `.maestro/cli-tools.json` overrides global `~/.maestro/cli-tools.json`
+- Built-in roles: `analyze`, `explore`, `review`, `implement`, `plan`, `brainstorm`, `research`
+
 ### Mode Definition (Authoritative)
 
 | Mode | Permission | Auto-Invoke Safe | Use For |
@@ -284,7 +298,7 @@ Proactively invoke `maestro delegate` when these conditions are met — no user
 
 - Default `--mode analysis` (safe, read-only)
 - Always `Bash(run_in_background: true)` — stop immediately, wait for callback
-- Tool fallback: `gemini` → `qwen` → `codex`
+- Use `--role` for capability-based tool selection; fallback chain is config-driven
 - Rule suggestions are guidelines — choose the best fit
 - Use `inject` for supplementary context mid-execution; `after_complete` for chained multi-step tasks
 </execution>