aiwcli 0.9.5 → 0.9.7

package/dist/templates/cc-native/_cc-native/lib/orchestrator.py

@@ -129,7 +129,7 @@ def run_orchestrator(
     Args:
         plan: The plan content to analyze
         agent_library: List of available agents
-        config: Orchestrator configuration (model, timeout, max_turns)
+        config: Orchestrator configuration (model, timeout)
         settings: Agent review settings (agentSelection, complexityCategories)
 
     Returns:
@@ -154,9 +154,11 @@ def run_orchestrator(
 
     eprint(f"[orchestrator] Found Claude CLI at: {claude_path}")
 
-    # Build agent list for prompt
+    # Build agent list for prompt with rich descriptions
     agent_list = "\n".join([
-        f"- {a.name}: {a.focus} (categories: {', '.join(a.categories)})"
+        f"- {a.name} [{', '.join(a.categories)}]\n"
+        f"  Focus: {a.focus}\n"
+        f"  Expertise: {a.description}"
         for a in agent_library if a.enabled
     ])
     category_list = "/".join(categories)
@@ -164,43 +166,48 @@ def run_orchestrator(
     medium_range = f"{selection.get('medium', {}).get('min', 1)}-{selection.get('medium', {}).get('max', 2)}"
     high_range = f"{selection.get('high', {}).get('min', 2)}-{selection.get('high', {}).get('max', 4)}"
 
-    prompt = f"""IMPORTANT: Analyze this plan and output your decision immediately using StructuredOutput. Do NOT ask questions.
+    # System prompt with orchestrator instructions
+    system_prompt = """You are a plan orchestrator for code review. Your job is to analyze plans and select appropriate reviewer agents.
 
-You are a plan orchestrator. Analyze the plan below and determine:
-1. Complexity level (simple/medium/high)
-2. Category ({category_list})
-3. Which agents (if any) should review this plan
+You MUST call StructuredOutput immediately with your analysis. Do NOT ask questions or use any other tools.
+
+When selecting agents:
+- Match agent expertise to plan requirements
+- Consider what each agent specializes in
+- Only select agents whose categories match the plan category
+- Fewer agents for simple plans, more for complex plans"""
+
+    # User prompt with plan and agent list
+    prompt = f"""Analyze this plan and select appropriate reviewer agents.
 
 Available agents:
 {agent_list}
 
-Rules:
-- simple complexity = {simple_range} agents (CLI review sufficient)
+Selection rules:
+- simple complexity = {simple_range} agents
 - medium complexity = {medium_range} agents
 - high complexity = {high_range} agents
-- Only select agents whose categories match the plan category
+- Only select agents whose categories match the plan category ({category_list})
 - Non-technical plans (life, business) typically need 0 code-focused agents
 
-Analyze and call StructuredOutput with your decision now.
-
 PLAN:
 <<<
 {plan}
 >>>
-"""
+
+Call StructuredOutput now with: complexity, category, selectedAgents, reasoning"""
 
     schema_json = json.dumps(ORCHESTRATOR_SCHEMA, ensure_ascii=False)
 
     cmd_args = [
         claude_path,
         "-p",  # Enable print mode to read prompt from stdin
-        "--agent", "plan-orchestrator",
         "--model", config.model,
-        "--permission-mode", "bypassPermissions",
         "--output-format", "json",
-        "--max-turns", str(config.max_turns),
         "--json-schema", schema_json,
-        "--settings", "{}",
+        "--max-turns", "3",  # Single-turn with buffer for tool call + result
+        "--setting-sources", "",  # Disable PAI context interference
+        "--system-prompt", system_prompt,
     ]
 
     eprint(f"[orchestrator] Running with model: {config.model}, timeout: {config.timeout}s")
@@ -245,6 +252,17 @@ PLAN:
         eprint(f"[orchestrator] stderr: {p.stderr[:300]}")
 
     obj = _parse_claude_output(raw)
+
+    # Debug logging to diagnose empty selectedAgents issue
+    eprint(f"[orchestrator:debug] Raw output length: {len(raw)} chars")
+    if raw:
+        eprint(f"[orchestrator:debug] Raw output (first 500 chars): {raw[:500]}")
+    eprint(f"[orchestrator:debug] Parsed obj: {obj}")
+    if obj:
+        eprint(f"[orchestrator:debug] obj keys: {list(obj.keys())}")
+        eprint(f"[orchestrator:debug] selectedAgents value: {obj.get('selectedAgents', 'MISSING')}")
+        eprint(f"[orchestrator:debug] reasoning value: {obj.get('reasoning', 'MISSING')}")
+
     if not obj:
         eprint("[orchestrator] Failed to parse output, falling back to medium complexity")
         return OrchestratorResult(

package/dist/templates/cc-native/_cc-native/lib/reviewers/agent.py

@@ -81,7 +81,6 @@ def run_agent_review(
     agent: AgentConfig,
     schema: Dict[str, Any],
     timeout: int,
-    max_turns: int = 3,
     context_path: Optional[Path] = None,
     session_name: str = "unknown",
 ) -> ReviewerResult:
@@ -92,7 +91,6 @@ def run_agent_review(
         agent: Agent configuration (name, model, etc.)
         schema: JSON schema for the review output
         timeout: Timeout in seconds
-        max_turns: Maximum agent turns
         context_path: Optional path to context folder for debug logging
         session_name: Session name for debug logging
 
@@ -113,7 +111,9 @@ def run_agent_review(
 
     eprint(f"[{agent.name}] Found Claude CLI at: {claude_path}")
 
-    prompt = f"""{AGENT_REVIEW_PROMPT_PREFIX}
+    # User prompt - direct instruction to call StructuredOutput immediately
+    prompt = f"""IMMEDIATELY call StructuredOutput with your review of the plan below.
+Do NOT output any text before calling StructuredOutput.
 
 PLAN:
 <<<
@@ -122,19 +122,24 @@ PLAN:
 """
 
     schema_json = json.dumps(schema, ensure_ascii=False)
+
+    # Build command args - use --system-prompt with the markdown body as persona
     cmd_args = [
         claude_path,
         "-p",  # Enable print mode to read prompt from stdin
-        "--agent", agent.name,
         "--model", agent.model,
-        "--permission-mode", "plan",
         "--output-format", "json",
-        "--max-turns", str(max_turns),
         "--json-schema", schema_json,
-        "--settings", "{}",
+        "--max-turns", "3",  # Allow buffer for tool call + result (usually completes in 2)
+        "--setting-sources", "",  # Disable user/project settings to avoid PAI context interference
     ]
 
-    eprint(f"[{agent.name}] Running with model: {agent.model}, timeout: {timeout}s, max-turns: {max_turns}")
+    # Add system prompt: prefix with single-turn instructions, then agent's persona
+    if agent.system_prompt:
+        full_prompt = AGENT_REVIEW_PROMPT_PREFIX + "\n\n---\n\n" + agent.system_prompt
+        cmd_args.extend(["--system-prompt", full_prompt])
+
+    eprint(f"[{agent.name}] Running with model: {agent.model}, timeout: {timeout}s")
 
     # Get environment for internal subprocess (bypasses hooks)
     env = get_internal_subprocess_env()
@@ -176,7 +181,6 @@ PLAN:
             "stderr_len": len(err),
             "model": agent.model,
             "timeout": timeout,
-            "max_turns": max_turns,
         })
 
     if raw:

package/dist/templates/cc-native/_cc-native/lib/reviewers/base.py

@@ -39,7 +39,7 @@ class AgentConfig:
     enabled: bool = True
     categories: List[str] = field(default_factory=lambda: ["code"])
     description: str = ""
-    tools: str = ""
+    system_prompt: str = ""  # Markdown body content for --system-prompt
 
 
 @dataclass
@@ -48,7 +48,6 @@ class OrchestratorConfig:
     enabled: bool = True
     model: str = "haiku"
     timeout: int = 30
-    max_turns: int = 3
 
 
 # ---------------------------

package/dist/templates/cc-native/_cc-native/lib/state.py

@@ -21,6 +21,17 @@ except ImportError:
     from constants import validate_plan_path, PLANS_DIR
     from atomic_write import atomic_write
 
+# Import canonical eprint from shared lib
+try:
+    from ...lib.base.utils import eprint
+except ImportError:
+    # Fallback for direct execution
+    import sys as _sys
+    from pathlib import Path as _Path
+    _shared_lib = _Path(__file__).resolve().parent.parent.parent / "_shared" / "lib"
+    _sys.path.insert(0, str(_shared_lib))
+    from base.utils import eprint
+
 
 # ---------------------------
 # Constants
@@ -35,15 +46,6 @@ DEFAULT_REVIEW_ITERATIONS: Dict[str, int] = {
 }
 
 
-# ---------------------------
-# Utilities
-# ---------------------------
-
-def eprint(*args: Any) -> None:
-    """Print to stderr."""
-    print(*args, file=sys.stderr)
-
-
 # ---------------------------
 # State File Management
 # ---------------------------

package/dist/templates/cc-native/_cc-native/lib/utils.py

@@ -29,6 +29,29 @@ except ImportError:
     from atomic_write import atomic_write
     from constants import ENABLE_ROBUST_PLAN_WRITES
 
+# Import canonical utilities from shared lib (with Windows bug fixes)
+try:
+    from ...lib.base.utils import (
+        eprint,
+        now_local,
+        project_dir,
+        sanitize_filename,
+        sanitize_title,
+    )
+except ImportError:
+    # Fallback for direct execution
+    import sys
+    from pathlib import Path
+    _shared_lib = Path(__file__).resolve().parent.parent.parent / "_shared" / "lib"
+    sys.path.insert(0, str(_shared_lib))
+    from base.utils import (
+        eprint,
+        now_local,
+        project_dir,
+        sanitize_filename,
+        sanitize_title,
+    )
+
 
 # ---------------------------
 # Constants
@@ -87,68 +110,6 @@ class ReviewerResult:
     err: str
 
 
-# ---------------------------
-# Core utilities
-# ---------------------------
-
-def eprint(*args: Any) -> None:
-    """Print to stderr."""
-    print(*args, file=sys.stderr)
-
-
-def now_local() -> datetime:
-    """Get current local datetime."""
-    return datetime.now()
-
-
-def project_dir(payload: Dict[str, Any]) -> Path:
-    """Get project directory from payload or environment."""
-    p = os.environ.get("CLAUDE_PROJECT_DIR") or payload.get("cwd") or os.getcwd()
-    return Path(p)
-
-
-def sanitize_filename(s: str, max_len: int = 32) -> str:
-    """Sanitize string for use in filename."""
-    s = re.sub(r"[^A-Za-z0-9._-]+", "_", s)
-    return s.strip("._-")[:max_len] or "unknown"
-
-
-def sanitize_title(s: str, max_len: int = 50) -> str:
-    """Sanitize title for use in filename (with space-to-dash conversion)."""
-    s = s.replace(' ', '-')
-    s = re.sub(r"[^A-Za-z0-9._-]+", "_", s)
-    s = re.sub(r"[-_]+", "-", s)
-    return s.strip("._-")[:max_len] or "unknown"
-
-
-def extract_plan_title(plan: str) -> Optional[str]:
-    """Extract title from '# Plan: <title>' line in plan content."""
-    for line in plan.split('\n'):
-        line = line.strip()
-        if line.startswith('# Plan:'):
-            title = line[7:].strip()
-            return title if title else None
-    return None
-
-
-def extract_task_from_context(plan: str) -> Optional[str]:
-    """Extract Task from Evaluation Context section as fallback title."""
-    # Look for **Task**: ... or **Task Summary**: ... patterns
-    patterns = [
-        r'\*\*Task\*\*:\s*(.+?)(?:\n|$)',
-        r'\*\*Task Summary\*\*:\s*(.+?)(?:\n|$)',
-    ]
-    for pattern in patterns:
-        match = re.search(pattern, plan)
-        if match:
-            task = match.group(1).strip()
-            # Truncate to reasonable title length
-            if len(task) > 50:
-                task = task[:47] + "..."
-            return task
-    return None
-
-
 # ---------------------------
 # Plan hash deduplication
 # ---------------------------
@@ -398,50 +359,6 @@ def get_state_path_from_plan(plan_path: str) -> Path:
     return plan_file.with_suffix('.state.json')
 
 
-def load_state(plan_path: str) -> Optional[Dict[str, Any]]:
-    """Load state file for this plan if it exists."""
-    state_file = get_state_path_from_plan(plan_path)
-
-    if not state_file.exists():
-        return None
-
-    try:
-        return json.loads(state_file.read_text(encoding="utf-8"))
-    except Exception as e:
-        eprint(f"[utils] Failed to read state file: {e}")
-        return None
-
-
-def save_state(plan_path: str, state: Dict[str, Any]) -> bool:
-    """Save state file for this plan.
-
-    Returns True on success, False on failure.
-    """
-    state_file = get_state_path_from_plan(plan_path)
-    try:
-        state_file.write_text(json.dumps(state, indent=2), encoding="utf-8")
-        return True
-    except Exception as e:
-        eprint(f"[utils] Failed to save state file: {e}")
-        return False
-
-
-def delete_state(plan_path: str) -> bool:
-    """Delete state file after successful archive.
-
-    Returns True if deleted or didn't exist, False on error.
-    """
-    state_file = get_state_path_from_plan(plan_path)
-    try:
-        if state_file.exists():
-            state_file.unlink()
-            eprint(f"[utils] Deleted state file: {state_file}")
-        return True
-    except Exception as e:
-        eprint(f"[utils] Warning: failed to delete state file: {e}")
-        return False
-
-
 def format_review_markdown(
     results: List[ReviewerResult],
     overall: str,

package/dist/templates/cc-native/_cc-native/plan-review.config.json

@@ -22,14 +22,12 @@
   },
   "agentReview": {
     "enabled": true,
-    "timeout": 120,
+    "timeout": 180,
     "blockOnFail": true,
-    "maxTurns": 2,
     "orchestrator": {
       "enabled": true,
       "model": "haiku",
-      "timeout": 30,
-      "maxTurns": 6
+      "timeout": 30
     },
     "legacyMode": false,
     "mandatoryAgents": ["handoff-readiness", "clarity-auditor", "skeptic"],

package/dist/templates/cc-native/_cc-native/scripts/aggregate_agents.py

@@ -93,16 +93,31 @@ def extract_frontmatter(content: str) -> dict[str, Any] | None:
         return None
 
 
+def extract_body(content: str) -> str:
+    """Extract markdown body (after frontmatter) from content.
+
+    Args:
+        content: Raw markdown file content
+
+    Returns:
+        Markdown body content (everything after the closing ---)
+    """
+    match = re.match(r'^---\s*\n.*?\n---\s*\n(.*)$', content, re.DOTALL)
+    if match:
+        return match.group(1).strip()
+    return content.strip()
+
+
 def aggregate_agents(agents_dir: Path | None = None) -> list[dict[str, Any]]:
     """Read all agent files and return aggregated metadata.
-    
+
     Scans the agents directory for .md files, extracts frontmatter from each,
     and returns a list of agent configurations.
-    
+
     Args:
         agents_dir: Path to agents directory. If None, uses default
-                   .claude/agents relative to project root.
-                   
+                   _cc-native/agents/ relative to this script.
+
     Returns:
         List of agent configuration dicts with fields:
         - name: Agent identifier (lowercase)
@@ -111,14 +126,14 @@ def aggregate_agents(agents_dir: Path | None = None) -> list[dict[str, Any]]:
         - focus: Brief focus for orchestrator
         - enabled: Whether agent is available
         - categories: Work categories for filtering
-        - tools: Available tools
+        - system_prompt: Full markdown body (persona content)
     """
     if agents_dir is None:
-        # Default to .claude/agents/cc-native relative to this script's location
+        # Default to _cc-native/agents/ relative to this script's location
         # Script is at: _cc-native/scripts/aggregate_agents.py
-        # Agents are at: .claude/agents/cc-native/
+        # Agents are at: _cc-native/agents/
         script_dir = Path(__file__).parent
-        agents_dir = script_dir.parent.parent / ".claude" / "agents" / "cc-native"
+        agents_dir = script_dir.parent / "agents"
 
     agents = []
 
@@ -135,6 +150,8 @@ def aggregate_agents(agents_dir: Path | None = None) -> list[dict[str, Any]]:
                     frontmatter["categories"] = ["code"]
                 elif isinstance(frontmatter["categories"], str):
                     frontmatter["categories"] = [frontmatter["categories"]]
+                # Extract markdown body as system_prompt
+                frontmatter["system_prompt"] = extract_body(content)
                 agents.append(frontmatter)
         except Exception:
             # Skip files that can't be read or parsed

package/oclif.manifest.json

@@ -401,5 +401,5 @@
       ]
     }
   },
-  "version": "0.9.5"
+  "version": "0.9.7"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aiwcli",
   "description": "AI Workflow CLI - Command-line interface for AI-powered workflows",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "author": "jofu-tofu",
   "bin": {
     "aiw": "./bin/run.js"