aiwcli 0.9.6 → 0.9.7

package/dist/commands/init/index.d.ts

@@ -45,10 +45,6 @@ export default class Init extends BaseCommand {
      * @param templatePath - Template source path
      */
     private mergeWindsurfTemplateHooks;
-    /**
-     * Check if a path exists
-     */
-    private pathExists;
     /**
      * Perform post-installation actions.
      *
@@ -90,10 +86,6 @@ export default class Init extends BaseCommand {
      * @returns Wizard configuration result
      */
     private runInteractiveWizard;
-    /**
-     * Check if a file should be excluded from copying
-     */
-    private shouldExcludeFile;
     /**
      * Track method installation in settings.json
      *

package/dist/commands/init/index.js

@@ -8,8 +8,9 @@ import { detectUsername } from '../../lib/user-utils.js';
 import { updateGitignore } from '../../lib/gitignore-manager.js';
 import { mergeClaudeSettings } from '../../lib/hooks-merger.js';
 import { IdePathResolver } from '../../lib/ide-path-resolver.js';
+import { pathExists } from '../../lib/paths.js';
 import { getTargetSettingsFile, readClaudeSettings, writeClaudeSettings } from '../../lib/settings-hierarchy.js';
-import { checkTemplateStatus, installTemplate } from '../../lib/template-installer.js';
+import { checkTemplateStatus, installTemplate, shouldExclude } from '../../lib/template-installer.js';
 import { getAvailableTemplates, getTemplatePath } from '../../lib/template-resolver.js';
 import { getTargetHooksFile, readWindsurfHooks, writeWindsurfHooks } from '../../lib/windsurf-hooks-hierarchy.js';
 import { mergeWindsurfHooks } from '../../lib/windsurf-hooks-merger.js';
@@ -91,13 +92,13 @@ export default class Init extends BaseCommand {
                 const containerDir = resolver.getAiwcliContainer();
                 await fs.mkdir(containerDir, { recursive: true });
                 const sharedDestPath = resolver.getSharedFolder();
-                const sharedExists = await this.pathExists(sharedDestPath);
+                const sharedExists = await pathExists(sharedDestPath);
                 if (!sharedExists) {
                     const currentFilePath = fileURLToPath(import.meta.url);
                     const currentDir = dirname(currentFilePath);
                     const templatesRoot = join(dirname(dirname(currentDir)), 'templates');
                     const sharedSrcPath = join(templatesRoot, '_shared');
-                    if (!(await this.pathExists(sharedSrcPath))) {
+                    if (!(await pathExists(sharedSrcPath))) {
                         this.error(`Shared folder not found at ${sharedSrcPath}. This indicates a corrupted installation.`, {
                             exit: EXIT_CODES.ENVIRONMENT_ERROR,
                         });
@@ -235,7 +236,7 @@ export default class Init extends BaseCommand {
         const operations = entries
             .filter((entry) => {
             // Standard exclusions (test files, cache, etc.)
-            if (this.shouldExcludeFile(entry.name)) {
+            if (shouldExclude(entry.name)) {
                 return false;
             }
             // Exclude IDE config folders if requested (used for _shared folder)
@@ -352,18 +353,6 @@ export default class Init extends BaseCommand {
             // Don't fail the entire installation if hook merging fails
         }
     }
-    /**
-     * Check if a path exists
-     */
-    async pathExists(path) {
-        try {
-            await fs.access(path);
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
     /**
      * Perform post-installation actions.
      *
@@ -511,25 +500,6 @@ export default class Init extends BaseCommand {
             confirmed,
         };
     }
-    /**
-     * Check if a file should be excluded from copying
-     */
-    shouldExcludeFile(name) {
-        const excludedPatterns = [
-            '_output',
-            '__pycache__',
-            '.pytest_cache',
-            'conftest.py',
-            /^test_.*\.py$/,
-            /.*\.pyc$/,
-        ];
-        return excludedPatterns.some((pattern) => {
-            if (typeof pattern === 'string') {
-                return name === pattern;
-            }
-            return pattern.test(name);
-        });
-    }
     /**
      * Track method installation in settings.json
      *

package/dist/lib/index.d.ts

@@ -3,11 +3,10 @@
  * Re-exports all library modules from this barrel file.
  */
 export { type AiwcliConfig, getAiwDir, loadConfig, validateAiwDir, } from './config.js';
-export { debug, debugConfig, debugSpawn, debugVersion, isDebugEnabled, setDebugEnabled } from './debug.js';
-export { getAiwConfig, getAiwDir as getAiwDirFromEnv, isUsingLegacyEnvVars, loadEnvWithCompatibility, } from './env-compat.js';
-export { AiwError, ConfigNotFoundError, EnvironmentError, formatErrorMessage, InvalidUsageError, ProcessSpawnError, } from './errors.js';
+export { debug, debugSpawn, debugVersion, isDebugEnabled, setDebugEnabled } from './debug.js';
+export { AiwError, ConfigNotFoundError, EnvironmentError, InvalidUsageError, ProcessSpawnError, } from './errors.js';
 export { mergeArraysWithDedup, mergeConfigByEventType } from './generic-merge.js';
 export { branchExists, createWorktree, deleteBranch, deleteWorktreeFolder, getAllWorktrees, getCurrentBranch, getMainBranch, getWorktreePath, type GitCommandOptions, hasMergeRequest, hasUnpushedCommits, type WorktreeInfo, } from './git/index.js';
-export { expandPath, findWorkspaceRoot, getHomePath, getWorkspacePath, isWorkspace, normalizePath, pathExists, resolvePath, toUnixPath, toWindowsPath, } from './paths.js';
+export { findWorkspaceRoot, isWorkspace, pathExists, resolvePath, } from './paths.js';
 export { spawnProcess, type SpawnProcessOptions } from './spawn.js';
 export { escapeShellArg, launchTerminal, type TerminalLaunchOptions, type TerminalLaunchResult, } from './terminal.js';

package/dist/lib/index.js

@@ -5,17 +5,15 @@
 // Configuration resolution
 export { getAiwDir, loadConfig, validateAiwDir, } from './config.js';
 // Debug logging
-export { debug, debugConfig, debugSpawn, debugVersion, isDebugEnabled, setDebugEnabled } from './debug.js';
-// Environment variable compatibility
-export { getAiwConfig, getAiwDir as getAiwDirFromEnv, isUsingLegacyEnvVars, loadEnvWithCompatibility, } from './env-compat.js';
+export { debug, debugSpawn, debugVersion, isDebugEnabled, setDebugEnabled } from './debug.js';
 // Custom error classes and utilities
-export { AiwError, ConfigNotFoundError, EnvironmentError, formatErrorMessage, InvalidUsageError, ProcessSpawnError, } from './errors.js';
+export { AiwError, ConfigNotFoundError, EnvironmentError, InvalidUsageError, ProcessSpawnError, } from './errors.js';
 // Generic merge utilities
 export { mergeArraysWithDedup, mergeConfigByEventType } from './generic-merge.js';
 // Git utilities
 export { branchExists, createWorktree, deleteBranch, deleteWorktreeFolder, getAllWorktrees, getCurrentBranch, getMainBranch, getWorktreePath, hasMergeRequest, hasUnpushedCommits, } from './git/index.js';
 // Cross-platform path utilities
-export { expandPath, findWorkspaceRoot, getHomePath, getWorkspacePath, isWorkspace, normalizePath, pathExists, resolvePath, toUnixPath, toWindowsPath, } from './paths.js';
+export { findWorkspaceRoot, isWorkspace, pathExists, resolvePath, } from './paths.js';
 // Process spawning utilities
 export { spawnProcess } from './spawn.js';
 // Cross-platform terminal launching

package/dist/lib/settings-hierarchy.js

@@ -2,6 +2,7 @@ import { promises as fs } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { IdePathResolver } from './ide-path-resolver.js';
+import { pathExists } from './paths.js';
 /**
  * Discover Claude settings files in the hierarchy
  *
@@ -20,36 +21,24 @@ export async function discoverSettingsFiles(projectDir) {
     locations.push({
         type: 'user',
         path: userSettingsPath,
-        exists: await fileExists(userSettingsPath),
+        exists: await pathExists(userSettingsPath),
     });
     // Project settings (shared)
     const projectSettingsPath = join(projectDir, '.claude', 'settings.json');
     locations.push({
         type: 'project',
         path: projectSettingsPath,
-        exists: await fileExists(projectSettingsPath),
+        exists: await pathExists(projectSettingsPath),
     });
     // Local project settings (gitignored)
     const localSettingsPath = join(projectDir, '.claude', 'settings.local.json');
     locations.push({
         type: 'local',
         path: localSettingsPath,
-        exists: await fileExists(localSettingsPath),
+        exists: await pathExists(localSettingsPath),
     });
     return locations;
 }
-/**
- * Check if file exists
- */
-async function fileExists(path) {
-    try {
-        await fs.access(path);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 /**
  * Read Claude settings from file
  *
@@ -81,7 +70,7 @@ export async function writeClaudeSettings(path, settings) {
     const dir = join(path, '..');
     await fs.mkdir(dir, { recursive: true });
     // Backup existing file if it exists
-    if (await fileExists(path)) {
+    if (await pathExists(path)) {
         const backupPath = `${path}.backup`;
         await fs.copyFile(path, backupPath);
     }

package/dist/lib/template-installer.d.ts

@@ -67,6 +67,15 @@ export interface InstallationResult {
  * @returns Status of template items
  */
 export declare function checkTemplateStatus(templatePath: string, targetDir: string, ides: string[], templateName: string): Promise<TemplateInstallationStatus>;
+/**
+ * Patterns to exclude when copying template directories.
+ * These are development/test artifacts that shouldn't be packaged.
+ */
+export declare const EXCLUDED_PATTERNS: (string | RegExp)[];
+/**
+ * Check if a filename should be excluded from copying
+ */
+export declare function shouldExclude(name: string): boolean;
 /**
  * Copy directory recursively with proper error handling.
  * Excludes test files, cache directories, and output folders.

package/dist/lib/template-installer.js

@@ -1,6 +1,7 @@
 import { promises as fs } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { IdePathResolver } from './ide-path-resolver.js';
+import { pathExists } from './paths.js';
 import { mergeTemplateContent } from './template-merger.js';
 /**
  * Deep merge two settings objects, combining hook arrays.
@@ -93,18 +94,6 @@ async function mergeSharedSettingsFromSource(targetDir, sourceSettingsPath) {
         return false;
     }
 }
-/**
- * Check if a path exists
- */
-async function pathExists(path) {
-    try {
-        await fs.access(path);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 /**
  * Check template installation status for a method.
  * Returns which items exist and which are missing.
@@ -178,7 +167,7 @@ export async function checkTemplateStatus(templatePath, targetDir, ides, templat
  * Patterns to exclude when copying template directories.
  * These are development/test artifacts that shouldn't be packaged.
  */
-const EXCLUDED_PATTERNS = [
+export const EXCLUDED_PATTERNS = [
     '_output',
     '__pycache__',
     '.pytest_cache',
@@ -189,7 +178,7 @@ const EXCLUDED_PATTERNS = [
 /**
  * Check if a filename should be excluded from copying
  */
-function shouldExclude(name) {
+export function shouldExclude(name) {
     return EXCLUDED_PATTERNS.some((pattern) => {
         if (typeof pattern === 'string') {
             return name === pattern;

package/dist/lib/template-merger.js

@@ -1,22 +1,11 @@
 import { promises as fs } from 'node:fs';
 import { join } from 'node:path';
+import { pathExists } from './paths.js';
 /**
  * Content folder types that should be recursively merged rather than skipped.
  * These are the canonical folder names used in templates for organizing content.
  */
 export const CONTENT_FOLDER_TYPES = ['agents', 'commands', 'workflows', 'tasks'];
-/**
- * Check if a path exists
- */
-async function pathExists(path) {
-    try {
-        await fs.access(path);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 /**
  * Recursively find folders matching the method name within a directory tree.
  * This finds folders like `.claude/commands/bmad/` when methodName is 'bmad'.

package/dist/lib/windsurf-hooks-hierarchy.js

@@ -1,17 +1,6 @@
 import { promises as fs } from 'node:fs';
 import { join } from 'node:path';
-/**
- * Check if file exists
- */
-async function fileExists(path) {
-    try {
-        await fs.access(path);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
+import { pathExists } from './paths.js';
 /**
  * Read Windsurf hooks from file
  *
@@ -43,7 +32,7 @@ export async function writeWindsurfHooks(path, hooks) {
     const dir = join(path, '..');
     await fs.mkdir(dir, { recursive: true });
     // Backup existing file if it exists
-    if (await fileExists(path)) {
+    if (await pathExists(path)) {
         const backupPath = `${path}.backup`;
         await fs.copyFile(path, backupPath);
     }

package/dist/templates/_shared/hooks/context_enforcer.py

@@ -49,7 +49,6 @@ SCRIPT_DIR = Path(__file__).resolve().parent
 SHARED_LIB = SCRIPT_DIR.parent / "lib"
 sys.path.insert(0, str(SHARED_LIB.parent))
 
-from lib.base.hook_utils import load_hook_input
 from lib.base.subprocess_utils import is_internal_call
 from lib.context.context_manager import (
     Context,
@@ -300,18 +299,13 @@ def format_context_picker_stderr(contexts: List[Context]) -> str:
     return "\n".join(lines)
 
 
-def format_command_feedback(
-    ended_contexts: List[Context],
-    selected_context: Optional[Context],
-    remaining_prompt: Optional[str] = None
-) -> str:
+def format_command_feedback(ended_contexts: List[Context], selected_context: Optional[Context]) -> str:
     """
     Format feedback about what context operations were performed.
 
     Args:
         ended_contexts: Contexts that were ended/completed
         selected_context: Context that was selected (if any)
-        remaining_prompt: User's actual request after caret command (if any)
 
     Returns:
         Formatted feedback message
@@ -344,14 +338,6 @@ def format_command_feedback(
         lines.append(f'All work belongs to context "{selected_context.id}".')
         lines.append("Tasks created with TaskCreate will be persisted to this context.")
 
-    # Add user's actual request if provided after caret command
-    if remaining_prompt and remaining_prompt.strip():
-        lines.append("")
-        lines.append("---")
-        lines.append("")
-        lines.append("**User's actual request:**")
-        lines.append(f"> {remaining_prompt}")
-
     return "\n".join(lines)
 
 
@@ -359,7 +345,7 @@ def determine_context(
     user_prompt: str,
     project_root: Path = None,
     session_id: str = None
-) -> Tuple[Optional[str], str, Optional[str], Optional[str]]:
+) -> Tuple[Optional[str], str, Optional[str]]:
     """
     Determine which context this prompt belongs to.
 
@@ -369,7 +355,6 @@ def determine_context(
         - method: How context was determined (session_match, in_flight, caret_select,
                   auto_created, single_context, blocked)
         - output: System reminder to inject, or None
-        - remaining_prompt: Actual user request after caret command, or None
 
     Raises:
         BlockRequest: When request should be blocked to show picker to user
@@ -377,7 +362,7 @@ def determine_context(
     # 0. Skip context creation for internal subprocess calls (orchestrator, agents)
     if is_internal_call():
         eprint("[context_enforcer] Skipping: internal subprocess call")
-        return (None, "skip_internal", None, None)
+        return (None, "skip_internal", None)
 
     # 1. Check if session already belongs to a context (HIGHEST PRIORITY)
     # This prevents context switching on subsequent prompts - one context per session
@@ -388,20 +373,11 @@ def determine_context(
             return (
                 session_context.id,
                 "session_match",
-                format_active_context_reminder(session_context),
-                None
+                format_active_context_reminder(session_context)
             )
 
     # 2. Check for bare "^" - show context picker
     if user_prompt.strip() == "^":
-        # Pre-transition: Move any pending_implementation contexts to implementing
-        # This ensures they appear selectable when user opens the picker
-        in_flight = get_all_in_flight_contexts(project_root)
-        for ctx in in_flight:
-            if ctx.in_flight and ctx.in_flight.mode == "pending_implementation":
-                update_plan_status(ctx.id, "implementing", project_root=project_root)
-                eprint(f"[context_enforcer] Pre-transitioned {ctx.id} to implementing (bare caret)")
-
         contexts = get_all_contexts(status="active", project_root=project_root)
         if not contexts:
             raise BlockRequest(
@@ -431,7 +407,7 @@ def determine_context(
 
         # Don't auto-create for greetings or help commands
         if any(prompt_lower.startswith(p) or prompt_lower == p for p in skip_patterns):
-            return (None, "no_context_needed", None, None)
+            return (None, "no_context_needed", None)
 
         # Auto-create context from prompt
         try:
@@ -443,12 +419,11 @@ def determine_context(
             return (
                 new_context.id,
                 "auto_created",
-                format_context_created(new_context),
-                None
+                format_context_created(new_context)
             )
         except Exception as e:
             eprint(f"[context_enforcer] Failed to create context: {e}")
-            return (None, "creation_failed", None, None)
+            return (None, "creation_failed", None)
 
     elif len(in_flight_contexts) == 1:
         # Single in-flight context - auto-select it
@@ -456,15 +431,6 @@ def determine_context(
         mode = ctx.in_flight.mode if ctx.in_flight else "none"
         eprint(f"[context_enforcer] Auto-selected single in-flight context: {ctx.id} (mode={mode})")
 
-        # Auto-transition pending_implementation to implementing
-        # This ensures state updates immediately when context is selected,
-        # rather than waiting for _update_in_flight_status() which has conditions
-        if mode == "pending_implementation":
-            update_plan_status(ctx.id, "implementing", project_root=project_root)
-            ctx.in_flight.mode = "implementing"  # Update local copy for display
-            mode = "implementing"  # Update local var for formatter selection
-            eprint(f"[context_enforcer] Transitioned {ctx.id} to implementing")
-
         # Use mode-specific formatter for better continuation context
         if mode == "pending_implementation":
             output = format_pending_plan_continuation(ctx)
@@ -473,7 +439,7 @@ def determine_context(
         else:
             output = format_active_context_reminder(ctx)
 
-        return (ctx.id, "auto_selected", output, None)
+        return (ctx.id, "auto_selected", output)
 
     else:
         # Multiple in-flight contexts - block and show picker
@@ -489,7 +455,7 @@ def _handle_caret_command(
     user_prompt: str,
     contexts: List[Context],
     project_root: Path
-) -> Tuple[Optional[str], str, Optional[str], Optional[str]]:
+) -> Tuple[Optional[str], str, Optional[str]]:
     """
     Handle explicit caret commands (^E, ^S, ^0, ^N).
 
@@ -499,7 +465,7 @@ def _handle_caret_command(
         project_root: Project root directory
 
     Returns:
-        Tuple of (context_id, method, output, remaining_prompt)
+        Tuple of (context_id, method, output)
 
     Raises:
         BlockRequest: When command is invalid or selection needed
@@ -539,8 +505,7 @@ def _handle_caret_command(
             return (
                 new_context.id,
                 "caret_new",
-                format_context_created(new_context),
-                None
+                format_context_created(new_context)
             )
         except Exception as e:
             eprint(f"[context_enforcer] Failed to create context: {e}")
@@ -577,8 +542,7 @@ def _handle_caret_command(
             return (
                 new_context.id,
                 "caret_new",
-                output,
-                None
+                output
             )
         except Exception as e:
             eprint(f"[context_enforcer] Failed to create context: {e}")
@@ -588,24 +552,11 @@ def _handle_caret_command(
     if cmd.select:
         selected_ctx = contexts[cmd.select - 1]  # 1-indexed
         eprint(f"[context_enforcer] Caret-selected context: {selected_ctx.id}")
-
-        # Auto-transition pending_implementation to implementing
-        mode = selected_ctx.in_flight.mode if selected_ctx.in_flight else "none"
-        if mode == "pending_implementation":
-            update_plan_status(selected_ctx.id, "implementing", project_root=project_root)
-            selected_ctx.in_flight.mode = "implementing"
-            eprint(f"[context_enforcer] Transitioned {selected_ctx.id} to implementing")
-
-        output = format_command_feedback(
-            ended_contexts,
-            selected_ctx,
-            cmd.remaining_prompt if cmd.remaining_prompt else None
-        )
+        output = format_command_feedback(ended_contexts, selected_ctx)
         return (
             selected_ctx.id,
             "caret_select",
-            output,
-            cmd.remaining_prompt if cmd.remaining_prompt else None
+            output
         )
 
     # Only ended contexts, no selection - refresh context list and block
@@ -637,10 +588,11 @@ def main():
     In production, use user_prompt_submit.py as the unified entry point.
     """
     try:
-        hook_input = load_hook_input()
-        if not hook_input:
+        input_data = sys.stdin.read().strip()
+        if not input_data:
             return
 
+        hook_input = json.loads(input_data)
         user_prompt = hook_input.get("prompt", "")
         if not user_prompt:
             return
@@ -648,10 +600,8 @@ def main():
         project_root = project_dir(hook_input)
 
         try:
-            context_id, method, output, remaining_prompt = determine_context(user_prompt, project_root)
+            context_id, method, output = determine_context(user_prompt, project_root)
             eprint(f"[context_enforcer] Method: {method}, Context: {context_id}")
-            if remaining_prompt:
-                eprint(f"[context_enforcer] Remaining prompt: {remaining_prompt[:50]}...")
 
             if output:
                 print(output)

package/dist/templates/_shared/lib/base/hook_utils.py

@@ -19,30 +19,6 @@ from .utils import eprint
 F = TypeVar('F', bound=Callable[..., Any])
 
 
-def setup_hook_paths() -> Path:
-    """
-    Setup import paths for hooks.
-
-    Call this at module level in hook scripts to ensure
-    the shared lib directory is in sys.path.
-
-    Returns:
-        Path to the lib directory
-
-    Example:
-        SCRIPT_DIR = Path(__file__).resolve().parent
-        SHARED_LIB = SCRIPT_DIR.parent / "lib"
-        sys.path.insert(0, str(SHARED_LIB.parent))
-    """
-    # This function exists mainly for documentation
-    # Actual path setup must happen at module level before imports
-    hook_dir = Path(__file__).resolve().parent.parent.parent / "hooks"
-    lib_dir = hook_dir.parent / "lib"
-    if str(lib_dir.parent) not in sys.path:
-        sys.path.insert(0, str(lib_dir.parent))
-    return lib_dir
-
-
 def load_hook_input() -> Optional[Dict[str, Any]]:
     """
     Load and parse JSON from stdin.

package/dist/templates/_shared/lib/base/stop_words.py

@@ -187,4 +187,27 @@ STOP_WORDS = {
     # FRAGMENT WORDS (artifacts from contractions/tokenization)
     # ========================================================================
     're', 'pl', 'aiw', 've', 'll', 'doesn', 't', 's',
+
+    # ========================================================================
+    # CORPUS-DERIVED SHORT NOISE (2026-02 analysis of 131 docs)
+    # ========================================================================
+    # Contractions with punctuation stripped (I'm -> im, etc.)
+    'im', 'ive', 'id', 'ill', 'youre', 'youve', 'youll',
+    'hes', 'shes', 'weve', 'theyre', 'theyve', 'dont', 'doesnt',
+    'didnt', 'wont', 'wouldnt', 'cant', 'couldnt', 'shouldnt', 'isnt',
+    'arent', 'wasnt', 'werent', 'hasnt', 'havent', 'hadnt', 'lets',
+    'thats', 'whats', 'heres', 'theres', 'whos',
+
+    # Filler/noise from corpus (>10% frequency, non-action)
+    'etc', 'up', 'as', 'cc',
+
+    # Number words (common in plans but don't identify task)
+    'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten',
+
+    # Single letters (artifacts from lists, paths, variables)
+    'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 'u', 'v', 'w', 'x', 'y', 'z',
+
+    # Short adverbs/fillers from review
+    'too', 'yes', 'ok', 'okay',
 }

package/dist/templates/_shared/lib/context/__init__.py

@@ -50,10 +50,6 @@ from .task_sync import (
 )
 from .plan_archive import (
     archive_plan_to_context,
-    get_active_context_for_plan,
-    create_context_from_plan,
-    mark_plan_implementation_started,
-    mark_plan_completed,
 )
 from .context_extractor import (
     extract_context_id,
@@ -108,10 +104,6 @@ __all__ = [
     "generate_next_task_id",
     # Plan Archive
     "archive_plan_to_context",
-    "get_active_context_for_plan",
-    "create_context_from_plan",
-    "mark_plan_implementation_started",
-    "mark_plan_completed",
     # Context Extractor
     "extract_context_id",
     "extract_context_id_for_session",

package/dist/templates/_shared/lib/context/plan_archive.py

@@ -99,149 +99,3 @@ def archive_plan_to_context(
     return str(archive_path), plan_hash
 
 
-def get_active_context_for_plan(
-    plan_path: str,
-    project_root: Path = None
-) -> Optional[str]:
-    """
-    Determine which context a plan belongs to.
-
-    Logic:
-    1. If exactly one active context exists -> use it
-    2. Check if plan path contains context hints
-    3. Return None if ambiguous
-
-    Args:
-        plan_path: Path to plan file
-        project_root: Project root directory
-
-    Returns:
-        Context ID or None if cannot determine
-    """
-    active_contexts = get_all_contexts(status="active", project_root=project_root)
-
-    # If exactly one active context, use it
-    if len(active_contexts) == 1:
-        return active_contexts[0].id
-
-    # Check if plan path contains a context ID
-    plan_path_lower = plan_path.lower()
-    for ctx in active_contexts:
-        if ctx.id.lower() in plan_path_lower:
-            return ctx.id
-
-    # Check plan filename for context hints
-    plan_file = Path(plan_path)
-    filename_lower = plan_file.stem.lower()
-    for ctx in active_contexts:
-        if ctx.id.lower() in filename_lower:
-            return ctx.id
-
-    # If no active contexts, return None (caller should create new context)
-    if not active_contexts:
-        return None
-
-    # Multiple active contexts, cannot determine
-    eprint(f"[plan_archive] Multiple active contexts, cannot determine target")
-    return None
-
-
-def create_context_from_plan(
-    plan_path: str,
-    project_root: Path = None
-) -> Optional[str]:
-    """
-    Create a new context based on a plan file.
-
-    Extracts context ID and summary from plan filename/content.
-
-    Args:
-        plan_path: Path to plan file
-        project_root: Project root directory
-
-    Returns:
-        Created context ID or None on error
-    """
-    plan_file = Path(plan_path)
-    if not plan_file.exists():
-        eprint(f"[plan_archive] Plan file not found: {plan_path}")
-        return None
-
-    # Generate context ID from plan filename
-    context_id = sanitize_title(plan_file.stem, max_len=50)
-
-    # Try to extract summary from plan content
-    try:
-        content = plan_file.read_text(encoding='utf-8')
-        # Look for first heading as summary
-        for line in content.splitlines():
-            line = line.strip()
-            if line.startswith('#'):
-                summary = line.lstrip('#').strip()[:100]
-                break
-        else:
-            summary = f"Implementation of {plan_file.stem}"
-    except Exception:
-        summary = f"Implementation of {plan_file.stem}"
-
-    # Create the context
-    try:
-        context = create_context(
-            context_id=context_id,
-            summary=summary,
-            method="cc-native",
-            project_root=project_root
-        )
-        return context.id
-    except ValueError as e:
-        eprint(f"[plan_archive] Failed to create context: {e}")
-        return None
-
-
-def mark_plan_implementation_started(
-    context_id: str,
-    project_root: Path = None
-) -> bool:
-    """
-    Mark that plan implementation has started.
-
-    Called by SessionStart after detecting pending_implementation.
-    Prevents re-triggering on subsequent /clear commands.
-
-    Args:
-        context_id: Context identifier
-        project_root: Project root directory
-
-    Returns:
-        True if successful
-    """
-    context = update_plan_status(
-        context_id,
-        status="implementing",
-        project_root=project_root
-    )
-    return context is not None
-
-
-def mark_plan_completed(
-    context_id: str,
-    project_root: Path = None
-) -> bool:
-    """
-    Mark that plan has been fully implemented.
-
-    Called when all plan tasks are completed.
-
-    Args:
-        context_id: Context identifier
-        project_root: Project root directory
-
-    Returns:
-        True if successful
-    """
-    context = update_plan_status(
-        context_id,
-        status="none",
-        project_root=project_root
-    )
-    return context is not None

package/dist/templates/cc-native/.claude/settings.json

@@ -14,7 +14,7 @@
       "ides": [
         "claude"
       ],
-      "installedAt": "2026-01-25T22:27:03.688Z"
+      "installedAt": "{{INSTALLED_AT}}"
     }
   },
   "hooks": {
@@ -51,16 +51,6 @@
           }
         ]
       },
-      {
-        "matcher": "Bash|Edit",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "python .aiwcli/_cc-native/hooks/suggest-fresh-perspective.py",
-            "timeout": 5000
-          }
-        ]
-      },
       {
         "matcher": "TaskCreate",
         "hooks": [
@@ -90,6 +80,16 @@
             "timeout": 5000
           }
         ]
+      },
+      {
+        "matcher": "Bash|Edit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python .aiwcli/_cc-native/hooks/suggest-fresh-perspective.py",
+            "timeout": 5000
+          }
+        ]
       }
     ],
     "PermissionRequest": [
@@ -137,4 +137,4 @@
       }
     ]
   }
-}
+}

package/dist/templates/cc-native/_cc-native/hooks/add_plan_context.py

@@ -29,6 +29,7 @@ from utils import (
     eprint,
     was_questions_offered,
     mark_questions_offered,
+    project_dir,
 )
 from templates.plan_context import (
     get_evaluation_context_reminder,
@@ -43,12 +44,6 @@ def is_plan_file_write(payload: Dict[str, Any]) -> bool:
     return ".claude/plans/" in file_path.replace("\\", "/") and file_path.endswith(".md")
 
 
-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 load_plan_context_config(proj_dir: Path) -> Dict[str, Any]:
     """Load planContext config with defaults."""
     config_path = proj_dir / "_cc-native" / "config.json"

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

@@ -11,8 +11,6 @@ from .utils import (
     eprint,
     sanitize_filename,
     sanitize_title,
-    extract_plan_title,
-    extract_task_from_context,
     find_plan_file,
     ReviewerResult,
     OrchestratorResult,
@@ -36,8 +34,6 @@ __all__ = [
     "eprint",
     "sanitize_filename",
     "sanitize_title",
-    "extract_plan_title",
-    "extract_task_from_context",
     "find_plan_file",
     # Dataclasses
     "ReviewerResult",

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

@@ -111,8 +111,9 @@ def run_agent_review(
 
     eprint(f"[{agent.name}] Found Claude CLI at: {claude_path}")
 
-    # User prompt contains just the task and plan
-    prompt = f"""Review the plan below and provide your assessment using StructuredOutput.
+    # 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:
 <<<
@@ -133,9 +134,10 @@ PLAN:
         "--setting-sources", "",  # Disable user/project settings to avoid PAI context interference
     ]
 
-    # Add system prompt if available (the markdown body with full persona)
+    # Add system prompt: prefix with single-turn instructions, then agent's persona
     if agent.system_prompt:
-        cmd_args.extend(["--system-prompt", 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")
 

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/oclif.manifest.json

@@ -401,5 +401,5 @@
       ]
     }
   },
-  "version": "0.9.6"
+  "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.6",
+  "version": "0.9.7",
   "author": "jofu-tofu",
   "bin": {
     "aiw": "./bin/run.js"