prjct-cli 0.54.2 → 0.55.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.55.0] - 2026-01-30
+
+### Features
+
+- modular CLAUDE.md for reduced token usage - PRJ-94 (#86)
+
+
+## [0.54.4] - 2026-01-30
+
+### Improved
+
+- **Modular CLAUDE.md for reduced token usage** (PRJ-94)
+  - Split global template into 5 modules: core, git, storage, commands, intelligence
+  - Added profile-based composition: minimal (84% reduction), standard (56%), full (23%)
+  - FAST commands (sync, next, dash) use minimal profile (~394 tokens)
+  - SMART commands (task, ship, bug) dynamically inject additional modules
+  - Target 40-60% token reduction achieved for simple commands
+
+## [0.54.3] - 2026-01-30
+
+### Bug Fixes
+
+- standardize confirmation pattern across all commands (#85)
+
+
+## [0.54.3] - 2026-01-30
+
+### Fixed
+
+- Standardize confirmation pattern across all commands to use AskUserQuestion
+  - Updated `ship.md`, `merge.md`, `git.md`, `task.md` templates
+  - Replaces inconsistent "Proceed? (yes/no)" text prompts
+  - All confirmations now use consistent options: "Yes (Recommended)", "No, cancel"
+
 ## [0.54.2] - 2026-01-30
 
 ### Bug Fixes

package/core/agentic/prompt-builder.ts

@@ -26,6 +26,7 @@ import type {
   ThinkBlock,
 } from '../types'
 import { isNotFoundError } from '../types/fs'
+import { getPackageRoot } from '../utils/version'
 
 // Re-export types for convenience
 export type {
@@ -125,6 +126,31 @@ class PromptBuilder {
     this._currentContext = context
   }
 
+  /**
+   * Load a specific CLAUDE module for SMART commands (PRJ-94)
+   * These modules extend the base global CLAUDE.md for complex operations
+   */
+  loadModule(moduleName: string): string | null {
+    const modulePath = path.join(getPackageRoot(), 'templates/global/modules', moduleName)
+    return this.getTemplate(modulePath)
+  }
+
+  /**
+   * Get additional modules needed for SMART commands (PRJ-94)
+   * Returns array of module names that should be injected
+   */
+  getModulesForCommand(commandName: string): string[] {
+    const smartCommands: Record<string, string[]> = {
+      task: ['CLAUDE-intelligence.md', 'CLAUDE-storage.md'],
+      ship: ['CLAUDE-intelligence.md', 'CLAUDE-storage.md'],
+      bug: ['CLAUDE-intelligence.md'],
+      done: ['CLAUDE-storage.md'],
+      work: ['CLAUDE-intelligence.md', 'CLAUDE-storage.md'],
+      spec: ['CLAUDE-intelligence.md'],
+    }
+    return smartCommands[commandName] || []
+  }
+
   /**
    * Load quality checklists from templates/checklists/
    * Uses lazy loading with TTL cache.
@@ -561,6 +587,18 @@ class PromptBuilder {
     // CRITICAL: Compressed rules
     parts.push(this.buildCriticalRules())
 
+    // PRJ-94: Inject additional modules for SMART commands
+    const additionalModules = this.getModulesForCommand(commandName)
+    if (additionalModules.length > 0) {
+      for (const moduleName of additionalModules) {
+        const moduleContent = this.loadModule(moduleName)
+        if (moduleContent) {
+          parts.push('\n')
+          parts.push(moduleContent)
+        }
+      }
+    }
+
     // P1.1: Learned Patterns
     if (learnedPatterns && Object.keys(learnedPatterns).some((k) => learnedPatterns[k])) {
       parts.push('\n## PROJECT DEFAULTS (apply automatically)\n')

package/core/infrastructure/command-installer.ts

@@ -25,6 +25,101 @@ import type {
 import { isNotFoundError } from '../types/fs'
 import { getPackageRoot } from '../utils/version'
 
+// =============================================================================
+// Module Types
+// =============================================================================
+
+interface ModuleProfile {
+  description: string
+  modules: string[]
+}
+
+interface ModuleConfig {
+  description: string
+  version: string
+  profiles: Record<string, ModuleProfile>
+  default: string
+  commandProfiles: Record<string, string>
+}
+
+// =============================================================================
+// Modular Template Composition (PRJ-94)
+// =============================================================================
+
+/**
+ * Load module configuration
+ */
+async function loadModuleConfig(): Promise<ModuleConfig | null> {
+  try {
+    const configPath = path.join(getPackageRoot(), 'templates/global/modules/module-config.json')
+    const content = await fs.readFile(configPath, 'utf-8')
+    return JSON.parse(content) as ModuleConfig
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Compose global template from modules based on profile
+ * @param profile - Profile name ('full', 'standard', 'minimal') or null for default
+ * @returns Composed template content with markers
+ */
+export async function composeGlobalTemplate(profile?: string): Promise<string> {
+  const config = await loadModuleConfig()
+  const modulesDir = path.join(getPackageRoot(), 'templates/global/modules')
+
+  // Fallback to legacy template if config not found
+  if (!config) {
+    const legacyPath = path.join(getPackageRoot(), 'templates/global/CLAUDE.md')
+    return fs.readFile(legacyPath, 'utf-8')
+  }
+
+  const profileName = profile || config.default
+  const selectedProfile = config.profiles[profileName]
+
+  if (!selectedProfile) {
+    // Fallback to default profile
+    const defaultProfile = config.profiles[config.default]
+    if (!defaultProfile) {
+      const legacyPath = path.join(getPackageRoot(), 'templates/global/CLAUDE.md')
+      return fs.readFile(legacyPath, 'utf-8')
+    }
+  }
+
+  const modules = (selectedProfile || config.profiles[config.default]).modules
+
+  // Load and compose modules
+  const parts: string[] = []
+  parts.push('<!-- prjct:start - DO NOT REMOVE THIS MARKER -->')
+
+  for (const moduleName of modules) {
+    try {
+      const modulePath = path.join(modulesDir, moduleName)
+      const content = await fs.readFile(modulePath, 'utf-8')
+      parts.push('')
+      parts.push(content)
+    } catch {
+      // Module not found, skip
+      console.warn(`Module not found: ${moduleName}`)
+    }
+  }
+
+  parts.push('')
+  parts.push('<!-- prjct:end - DO NOT REMOVE THIS MARKER -->')
+  parts.push('')
+
+  return parts.join('\n')
+}
+
+/**
+ * Get recommended profile for a command
+ */
+export async function getProfileForCommand(command: string): Promise<string> {
+  const config = await loadModuleConfig()
+  if (!config) return 'standard'
+  return config.commandProfiles[command] || config.default
+}
+
 // =============================================================================
 // Global Config
 // =============================================================================
@@ -89,17 +184,29 @@ export async function installGlobalConfig(): Promise<GlobalConfigResult> {
       activeProvider.contextFile
     )
 
-    // Read template content
+    // Read template content - use modular composition (PRJ-94)
     let templateContent = ''
     try {
+      // First try provider-specific template
       templateContent = await fs.readFile(templatePath, 'utf-8')
     } catch (_error) {
-      // Fallback if provider-specific template not found
-      const fallbackTemplatePath = path.join(getPackageRoot(), 'templates/global/CLAUDE.md')
-      templateContent = await fs.readFile(fallbackTemplatePath, 'utf-8')
-      // If it is Gemini, we should rename Claude to Gemini in the fallback content
-      if (providerName === 'gemini') {
-        templateContent = templateContent.replace(/Claude/g, 'Gemini')
+      // Use modular composition for Claude (PRJ-94)
+      if (providerName === 'claude') {
+        try {
+          templateContent = await composeGlobalTemplate('standard')
+        } catch {
+          // Final fallback to legacy template
+          const fallbackTemplatePath = path.join(getPackageRoot(), 'templates/global/CLAUDE.md')
+          templateContent = await fs.readFile(fallbackTemplatePath, 'utf-8')
+        }
+      } else {
+        // Fallback for other providers
+        const fallbackTemplatePath = path.join(getPackageRoot(), 'templates/global/CLAUDE.md')
+        templateContent = await fs.readFile(fallbackTemplatePath, 'utf-8')
+        // If it is Gemini, we should rename Claude to Gemini in the fallback content
+        if (providerName === 'gemini') {
+          templateContent = templateContent.replace(/Claude/g, 'Gemini')
+        }
       }
     }
 

package/dist/bin/prjct.mjs

@@ -5525,6 +5525,49 @@ var init_doctor_service = __esm({
 import fs16 from "node:fs/promises";
 import os5 from "node:os";
 import path16 from "node:path";
+async function loadModuleConfig() {
+  try {
+    const configPath = path16.join(getPackageRoot(), "templates/global/modules/module-config.json");
+    const content = await fs16.readFile(configPath, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return null;
+  }
+}
+async function composeGlobalTemplate(profile) {
+  const config = await loadModuleConfig();
+  const modulesDir = path16.join(getPackageRoot(), "templates/global/modules");
+  if (!config) {
+    const legacyPath = path16.join(getPackageRoot(), "templates/global/CLAUDE.md");
+    return fs16.readFile(legacyPath, "utf-8");
+  }
+  const profileName = profile || config.default;
+  const selectedProfile = config.profiles[profileName];
+  if (!selectedProfile) {
+    const defaultProfile = config.profiles[config.default];
+    if (!defaultProfile) {
+      const legacyPath = path16.join(getPackageRoot(), "templates/global/CLAUDE.md");
+      return fs16.readFile(legacyPath, "utf-8");
+    }
+  }
+  const modules = (selectedProfile || config.profiles[config.default]).modules;
+  const parts = [];
+  parts.push("<!-- prjct:start - DO NOT REMOVE THIS MARKER -->");
+  for (const moduleName of modules) {
+    try {
+      const modulePath = path16.join(modulesDir, moduleName);
+      const content = await fs16.readFile(modulePath, "utf-8");
+      parts.push("");
+      parts.push(content);
+    } catch {
+      console.warn(`Module not found: ${moduleName}`);
+    }
+  }
+  parts.push("");
+  parts.push("<!-- prjct:end - DO NOT REMOVE THIS MARKER -->");
+  parts.push("");
+  return parts.join("\n");
+}
 async function installDocs() {
   try {
     const docsDir = path16.join(os5.homedir(), ".prjct-cli", "docs");
@@ -5569,10 +5612,19 @@ async function installGlobalConfig2() {
     try {
       templateContent = await fs16.readFile(templatePath, "utf-8");
     } catch (_error) {
-      const fallbackTemplatePath = path16.join(getPackageRoot(), "templates/global/CLAUDE.md");
-      templateContent = await fs16.readFile(fallbackTemplatePath, "utf-8");
-      if (providerName === "gemini") {
-        templateContent = templateContent.replace(/Claude/g, "Gemini");
+      if (providerName === "claude") {
+        try {
+          templateContent = await composeGlobalTemplate("standard");
+        } catch {
+          const fallbackTemplatePath = path16.join(getPackageRoot(), "templates/global/CLAUDE.md");
+          templateContent = await fs16.readFile(fallbackTemplatePath, "utf-8");
+        }
+      } else {
+        const fallbackTemplatePath = path16.join(getPackageRoot(), "templates/global/CLAUDE.md");
+        templateContent = await fs16.readFile(fallbackTemplatePath, "utf-8");
+        if (providerName === "gemini") {
+          templateContent = templateContent.replace(/Claude/g, "Gemini");
+        }
       }
     }
     let existingContent = "";
@@ -5655,6 +5707,8 @@ var init_command_installer = __esm({
     "use strict";
     init_fs();
     init_version();
+    __name(loadModuleConfig, "loadModuleConfig");
+    __name(composeGlobalTemplate, "composeGlobalTemplate");
     __name(installDocs, "installDocs");
     __name(installGlobalConfig2, "installGlobalConfig");
     CommandInstaller = class {
@@ -12510,6 +12564,7 @@ var init_prompt_builder = __esm({
     init_outcomes2();
     init_storage2();
     init_fs();
+    init_version();
     PromptBuilder = class {
       static {
         __name(this, "PromptBuilder");
@@ -12572,6 +12627,29 @@ var init_prompt_builder = __esm({
       setContext(context2) {
         this._currentContext = context2;
       }
+      /**
+       * Load a specific CLAUDE module for SMART commands (PRJ-94)
+       * These modules extend the base global CLAUDE.md for complex operations
+       */
+      loadModule(moduleName) {
+        const modulePath = path25.join(getPackageRoot(), "templates/global/modules", moduleName);
+        return this.getTemplate(modulePath);
+      }
+      /**
+       * Get additional modules needed for SMART commands (PRJ-94)
+       * Returns array of module names that should be injected
+       */
+      getModulesForCommand(commandName) {
+        const smartCommands = {
+          task: ["CLAUDE-intelligence.md", "CLAUDE-storage.md"],
+          ship: ["CLAUDE-intelligence.md", "CLAUDE-storage.md"],
+          bug: ["CLAUDE-intelligence.md"],
+          done: ["CLAUDE-storage.md"],
+          work: ["CLAUDE-intelligence.md", "CLAUDE-storage.md"],
+          spec: ["CLAUDE-intelligence.md"]
+        };
+        return smartCommands[commandName] || [];
+      }
       /**
        * Load quality checklists from templates/checklists/
        * Uses lazy loading with TTL cache.
@@ -12926,6 +13004,16 @@ Stack: ${stack}
           }
         }
         parts.push(this.buildCriticalRules());
+        const additionalModules = this.getModulesForCommand(commandName);
+        if (additionalModules.length > 0) {
+          for (const moduleName of additionalModules) {
+            const moduleContent = this.loadModule(moduleName);
+            if (moduleContent) {
+              parts.push("\n");
+              parts.push(moduleContent);
+            }
+          }
+        }
         if (learnedPatterns && Object.keys(learnedPatterns).some((k) => learnedPatterns[k])) {
           parts.push("\n## PROJECT DEFAULTS (apply automatically)\n");
           for (const [key, value] of Object.entries(learnedPatterns)) {
@@ -25073,7 +25161,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "prjct-cli",
-      version: "0.54.2",
+      version: "0.55.0",
       description: "Context layer for AI agents. Project context for Claude Code, Gemini CLI, and more.",
       main: "core/index.ts",
       bin: {

package/dist/core/infrastructure/command-installer.js

@@ -393,7 +393,9 @@ var init_ai_provider = __esm({
 var command_installer_exports = {};
 __export(command_installer_exports, {
   CommandInstaller: () => CommandInstaller,
+  composeGlobalTemplate: () => composeGlobalTemplate,
   default: () => command_installer_default,
+  getProfileForCommand: () => getProfileForCommand,
   getProviderPaths: () => getProviderPaths,
   installDocs: () => installDocs,
   installGlobalConfig: () => installGlobalConfig,
@@ -459,6 +461,57 @@ var VERSION = getVersion();
 var PACKAGE_ROOT = getPackageRoot();
 
 // core/infrastructure/command-installer.ts
+async function loadModuleConfig() {
+  try {
+    const configPath = import_node_path3.default.join(getPackageRoot(), "templates/global/modules/module-config.json");
+    const content = await import_promises.default.readFile(configPath, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return null;
+  }
+}
+__name(loadModuleConfig, "loadModuleConfig");
+async function composeGlobalTemplate(profile) {
+  const config = await loadModuleConfig();
+  const modulesDir = import_node_path3.default.join(getPackageRoot(), "templates/global/modules");
+  if (!config) {
+    const legacyPath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
+    return import_promises.default.readFile(legacyPath, "utf-8");
+  }
+  const profileName = profile || config.default;
+  const selectedProfile = config.profiles[profileName];
+  if (!selectedProfile) {
+    const defaultProfile = config.profiles[config.default];
+    if (!defaultProfile) {
+      const legacyPath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
+      return import_promises.default.readFile(legacyPath, "utf-8");
+    }
+  }
+  const modules = (selectedProfile || config.profiles[config.default]).modules;
+  const parts = [];
+  parts.push("<!-- prjct:start - DO NOT REMOVE THIS MARKER -->");
+  for (const moduleName of modules) {
+    try {
+      const modulePath = import_node_path3.default.join(modulesDir, moduleName);
+      const content = await import_promises.default.readFile(modulePath, "utf-8");
+      parts.push("");
+      parts.push(content);
+    } catch {
+      console.warn(`Module not found: ${moduleName}`);
+    }
+  }
+  parts.push("");
+  parts.push("<!-- prjct:end - DO NOT REMOVE THIS MARKER -->");
+  parts.push("");
+  return parts.join("\n");
+}
+__name(composeGlobalTemplate, "composeGlobalTemplate");
+async function getProfileForCommand(command) {
+  const config = await loadModuleConfig();
+  if (!config) return "standard";
+  return config.commandProfiles[command] || config.default;
+}
+__name(getProfileForCommand, "getProfileForCommand");
 async function installDocs() {
   try {
     const docsDir = import_node_path3.default.join(import_node_os2.default.homedir(), ".prjct-cli", "docs");
@@ -504,10 +557,19 @@ async function installGlobalConfig() {
     try {
       templateContent = await import_promises.default.readFile(templatePath, "utf-8");
     } catch (_error) {
-      const fallbackTemplatePath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
-      templateContent = await import_promises.default.readFile(fallbackTemplatePath, "utf-8");
-      if (providerName === "gemini") {
-        templateContent = templateContent.replace(/Claude/g, "Gemini");
+      if (providerName === "claude") {
+        try {
+          templateContent = await composeGlobalTemplate("standard");
+        } catch {
+          const fallbackTemplatePath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
+          templateContent = await import_promises.default.readFile(fallbackTemplatePath, "utf-8");
+        }
+      } else {
+        const fallbackTemplatePath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
+        templateContent = await import_promises.default.readFile(fallbackTemplatePath, "utf-8");
+        if (providerName === "gemini") {
+          templateContent = templateContent.replace(/Claude/g, "Gemini");
+        }
       }
     }
     let existingContent = "";
@@ -919,6 +981,8 @@ var command_installer_default = commandInstaller;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CommandInstaller,
+  composeGlobalTemplate,
+  getProfileForCommand,
   getProviderPaths,
   installDocs,
   installGlobalConfig,

package/dist/core/infrastructure/setup.js

@@ -470,6 +470,51 @@ init_ai_provider();
 var import_promises = __toESM(require("node:fs/promises"));
 var import_node_os2 = __toESM(require("node:os"));
 var import_node_path3 = __toESM(require("node:path"));
+async function loadModuleConfig() {
+  try {
+    const configPath = import_node_path3.default.join(getPackageRoot(), "templates/global/modules/module-config.json");
+    const content = await import_promises.default.readFile(configPath, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return null;
+  }
+}
+__name(loadModuleConfig, "loadModuleConfig");
+async function composeGlobalTemplate(profile) {
+  const config = await loadModuleConfig();
+  const modulesDir = import_node_path3.default.join(getPackageRoot(), "templates/global/modules");
+  if (!config) {
+    const legacyPath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
+    return import_promises.default.readFile(legacyPath, "utf-8");
+  }
+  const profileName = profile || config.default;
+  const selectedProfile = config.profiles[profileName];
+  if (!selectedProfile) {
+    const defaultProfile = config.profiles[config.default];
+    if (!defaultProfile) {
+      const legacyPath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
+      return import_promises.default.readFile(legacyPath, "utf-8");
+    }
+  }
+  const modules = (selectedProfile || config.profiles[config.default]).modules;
+  const parts = [];
+  parts.push("<!-- prjct:start - DO NOT REMOVE THIS MARKER -->");
+  for (const moduleName of modules) {
+    try {
+      const modulePath = import_node_path3.default.join(modulesDir, moduleName);
+      const content = await import_promises.default.readFile(modulePath, "utf-8");
+      parts.push("");
+      parts.push(content);
+    } catch {
+      console.warn(`Module not found: ${moduleName}`);
+    }
+  }
+  parts.push("");
+  parts.push("<!-- prjct:end - DO NOT REMOVE THIS MARKER -->");
+  parts.push("");
+  return parts.join("\n");
+}
+__name(composeGlobalTemplate, "composeGlobalTemplate");
 async function installDocs() {
   try {
     const docsDir = import_node_path3.default.join(import_node_os2.default.homedir(), ".prjct-cli", "docs");
@@ -515,10 +560,19 @@ async function installGlobalConfig() {
     try {
       templateContent = await import_promises.default.readFile(templatePath, "utf-8");
     } catch (_error) {
-      const fallbackTemplatePath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
-      templateContent = await import_promises.default.readFile(fallbackTemplatePath, "utf-8");
-      if (providerName === "gemini") {
-        templateContent = templateContent.replace(/Claude/g, "Gemini");
+      if (providerName === "claude") {
+        try {
+          templateContent = await composeGlobalTemplate("standard");
+        } catch {
+          const fallbackTemplatePath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
+          templateContent = await import_promises.default.readFile(fallbackTemplatePath, "utf-8");
+        }
+      } else {
+        const fallbackTemplatePath = import_node_path3.default.join(getPackageRoot(), "templates/global/CLAUDE.md");
+        templateContent = await import_promises.default.readFile(fallbackTemplatePath, "utf-8");
+        if (providerName === "gemini") {
+          templateContent = templateContent.replace(/Claude/g, "Gemini");
+        }
       }
     }
     let existingContent = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prjct-cli",
-  "version": "0.54.2",
+  "version": "0.55.0",
   "description": "Context layer for AI agents. Project context for Claude Code, Gemini CLI, and more.",
   "main": "core/index.ts",
   "bin": {

package/templates/commands/git.md

@@ -91,9 +91,8 @@ ABORT.
 git diff --stat
 ```
 
+Show the user:
 ```
-OUTPUT:
-"""
 ## Commit Plan
 
 Branch: {currentBranch}
@@ -101,13 +100,38 @@ Changes:
 {git diff --stat output}
 
 Will create commit with prjct footer.
-Proceed? (yes/no)
-"""
+```
+
+Then ask for confirmation:
+
+```
+AskUserQuestion:
+  question: "Create this commit?"
+  header: "Commit"
+  options:
+    - label: "Yes, commit (Recommended)"
+      description: "Stage all changes and commit"
+    - label: "No, cancel"
+      description: "Abort commit"
+    - label: "Show full diff"
+      description: "See detailed changes"
+```
+
+**Handle responses:**
 
-WAIT for explicit approval.
-DO NOT assume.
+**If "Show full diff":**
+- Run `git diff` to show full changes
+- Ask again with Yes/No options only
+
+**If "No, cancel":**
+```
+OUTPUT: "✅ Commit cancelled"
+STOP - Do not continue
 ```
 
+**If "Yes, commit":**
+CONTINUE to Step 3
+
 ### Step 3: Stage and Commit
 
 ```bash
@@ -159,20 +183,38 @@ ABORT.
 git log origin/{currentBranch}..HEAD --oneline 2>/dev/null || git log --oneline -3
 ```
 
+Show the user:
 ```
-OUTPUT:
-"""
 ## Push Plan
 
 Branch: {currentBranch}
 Commits to push:
 {commits}
+```
+
+Then ask for confirmation:
+
+```
+AskUserQuestion:
+  question: "Push these commits?"
+  header: "Push"
+  options:
+    - label: "Yes, push (Recommended)"
+      description: "Push to remote origin"
+    - label: "No, cancel"
+      description: "Keep commits local"
+```
 
-Proceed? (yes/no)
-"""
+**Handle responses:**
 
-WAIT for explicit approval.
+**If "No, cancel":**
 ```
+OUTPUT: "✅ Push cancelled"
+STOP - Do not continue
+```
+
+**If "Yes, push":**
+CONTINUE to Step 3
 
 ### Step 3: Execute Push
 

package/templates/commands/merge.md

@@ -79,11 +79,31 @@ Will do:
 1. Merge PR with squash
 2. Delete feature branch
 3. Update local main
+```
+
+Then ask for confirmation:
 
-Proceed? (yes/no)
+```
+AskUserQuestion:
+  question: "Merge this PR?"
+  header: "Merge"
+  options:
+    - label: "Yes, merge (Recommended)"
+      description: "Squash merge and delete branch"
+    - label: "No, cancel"
+      description: "Keep PR open"
+```
+
+**Handle responses:**
+
+**If "No, cancel":**
+```
+OUTPUT: "✅ Merge cancelled"
+STOP - Do not continue
 ```
 
-**⛔ WAIT for explicit approval. Do not assume.**
+**If "Yes, merge":**
+CONTINUE to Step 4
 
 ---
 

package/templates/commands/ship.md

@@ -69,11 +69,37 @@ Will do:
 4. Commit with prjct footer
 5. Push branch
 6. Create PR to main
+```
+
+Then ask for confirmation:
+
+```
+AskUserQuestion:
+  question: "Ready to ship these changes?"
+  header: "Ship"
+  options:
+    - label: "Yes, ship it (Recommended)"
+      description: "Run tests, bump version, create PR"
+    - label: "No, cancel"
+      description: "Abort ship operation"
+    - label: "Show full diff"
+      description: "See all file changes before deciding"
+```
+
+**Handle responses:**
 
-Proceed? (yes/no)
+**If "Show full diff":**
+- Run `git diff` to show full changes
+- Ask again with Yes/No options only
+
+**If "No, cancel":**
+```
+OUTPUT: "✅ Ship cancelled"
+STOP - Do not continue
 ```
 
-**⛔ WAIT for explicit "yes" or approval. Do not assume.**
+**If "Yes, ship it":**
+CONTINUE to Step 3
 
 ---
 

package/templates/commands/task.md

@@ -123,9 +123,8 @@ ELSE:
 
 **⛔ DO NOT create branches or modify state without user approval.**
 
+Show the user:
 ```
-OUTPUT:
-"""
 ## Task Plan
 
 Description: $ARGUMENTS
@@ -137,13 +136,38 @@ Will do:
 2. Initialize task tracking in state.json
 3. Break down into subtasks
 4. {If Linear: Update issue status to In Progress}
+```
+
+Then ask for confirmation:
+
+```
+AskUserQuestion:
+  question: "Start this task?"
+  header: "Task"
+  options:
+    - label: "Yes, start task (Recommended)"
+      description: "Create branch and begin tracking"
+    - label: "No, cancel"
+      description: "Don't create task"
+    - label: "Modify plan"
+      description: "Change type, branch name, or subtasks"
+```
+
+**Handle responses:**
 
-Proceed? (yes/no)
-"""
+**If "Modify plan":**
+- Ask: "What would you like to change?"
+- Update plan accordingly
+- Ask again with Yes/No options only
 
-WAIT for explicit "yes" or approval
-DO NOT assume
+**If "No, cancel":**
 ```
+OUTPUT: "✅ Task creation cancelled"
+STOP - Do not continue
+```
+
+**If "Yes, start task":**
+CONTINUE to Step B
 
 ### Step B: Explore Codebase
 

package/templates/global/modules/CLAUDE-commands.md

@@ -0,0 +1,70 @@
+## FAST vs SMART COMMANDS (CRITICAL)
+
+**Some commands just run a CLI. Others need intelligence. Know the difference.**
+
+### FAST COMMANDS (Execute Immediately - NO planning, NO exploration)
+
+| Command | Action | Time |
+|---------|--------|------|
+| `p. sync` | Run `prjct sync` | <5s |
+| `p. next` | Run `prjct next` | <2s |
+| `p. dash` | Run `prjct dash` | <2s |
+| `p. pause` | Run `prjct pause` | <2s |
+| `p. resume` | Run `prjct resume` | <2s |
+
+**For these commands:**
+```
+1. Read template
+2. Run the CLI command shown
+3. Done
+```
+
+**DO NOT:** explore codebase, create plans, ask questions, read project files
+
+### SMART COMMANDS (Require intelligence)
+
+| Command | Why it needs intelligence |
+|---------|--------------------------|
+| `p. task` | Must explore codebase, break down work |
+| `p. ship` | Must validate changes, create PR |
+| `p. bug` | Must classify severity, find affected files |
+| `p. done` | Must verify completion, update state |
+
+**For these commands:** Follow the full INTELLIGENT BEHAVIOR rules.
+
+### Decision Rule
+```
+IF template just says "run CLI command":
+  → Execute immediately, no planning
+ELSE:
+  → Use intelligent behavior (explore, ask, plan)
+```
+
+---
+
+## CORE WORKFLOW
+
+```
+p. sync  →  p. task "description"  →  [work]  →  p. done  →  p. ship
+   │              │                                  │            │
+   │              └─ Creates branch, breaks down     │            │
+   │                 task, starts tracking           │            │
+   │                                                 │            │
+   └─ Analyzes project, generates agents             │            │
+                                                     │            │
+                              Completes subtask ─────┘            │
+                                                                  │
+                                        Ships feature, PR, tag ───┘
+```
+
+### Quick Reference
+
+| Trigger | What It Does |
+|---------|--------------|
+| `p. sync` | Analyze project, generate domain agents |
+| `p. task <desc>` | Start task with auto-classification |
+| `p. done` | Complete current subtask |
+| `p. ship [name]` | Ship feature with PR + version bump |
+| `p. pause` | Pause current task |
+| `p. resume` | Resume paused task |
+| `p. bug <desc>` | Report bug with auto-priority |

package/templates/global/modules/CLAUDE-core.md

@@ -0,0 +1,86 @@
+# prjct-cli
+
+**Context layer for AI agents** - Project context for Claude Code, Gemini CLI, and more.
+
+## HOW TO USE PRJCT
+
+When user types `p. <command>`, load the template from `templates/commands/{command}.md` and execute it.
+
+```
+p. sync     → templates/commands/sync.md
+p. task X   → templates/commands/task.md
+p. done     → templates/commands/done.md
+p. ship X   → templates/commands/ship.md
+```
+
+---
+
+## CRITICAL RULES
+
+### 0. FOLLOW TEMPLATES STEP BY STEP (NON-NEGOTIABLE)
+
+**Templates are MANDATORY WORKFLOWS, not suggestions.**
+
+```
+1. READ the template file COMPLETELY
+2. FOLLOW each step IN ORDER
+3. DO NOT skip steps - even "obvious" ones
+4. STOP at any BLOCKING condition
+```
+
+### 1. Path Resolution (MOST IMPORTANT)
+
+**ALL writes go to global storage**: `~/.prjct-cli/projects/{projectId}/`
+
+- **NEVER** write to `.prjct/` (config only, read-only)
+- **NEVER** write to `./` (current directory)
+- **ALWAYS** resolve projectId first from `.prjct/prjct.config.json`
+
+### 2. Before Any Command
+
+```
+1. Read .prjct/prjct.config.json → get projectId
+2. Set globalPath = ~/.prjct-cli/projects/{projectId}
+3. Execute command using globalPath for all writes
+4. Log to {globalPath}/memory/events.jsonl
+```
+
+### 3. Timestamps & UUIDs
+
+```bash
+# Timestamp (NEVER hardcode)
+bun -e "console.log(new Date().toISOString())" 2>/dev/null || node -e "console.log(new Date().toISOString())"
+
+# UUID
+bun -e "console.log(crypto.randomUUID())" 2>/dev/null || node -e "console.log(require('crypto').randomUUID())"
+```
+
+---
+
+## OUTPUT FORMAT
+
+Concise responses (< 4 lines):
+```
+[What was done]
+
+[Key metrics]
+Next: [suggested action]
+```
+
+---
+
+## CLEAN TERMINAL UX
+
+**Tool calls MUST be user-friendly.**
+
+1. **ALWAYS use clear descriptions** in Bash tool calls:
+   - GOOD: `description: "Building project"`
+   - BAD: `description: "bun run build 2>&1 | tail -5"`
+
+2. **Hide implementation details** - Users don't need to see pipe chains, internal paths, JSON parsing
+
+3. **Use action verbs**: "Building project", "Running tests", "Checking git status"
+
+---
+
+**Auto-managed by prjct-cli** | https://prjct.app

package/templates/global/modules/CLAUDE-git.md

@@ -0,0 +1,50 @@
+## GIT WORKFLOW RULES (CRITICAL)
+
+**NEVER commit directly to main/master**
+- Always create a feature branch first
+- Always create a PR for review
+- Direct pushes to main are FORBIDDEN
+
+**NEVER push without a PR**
+- All changes go through pull requests
+- No exceptions for "small fixes"
+
+**NEVER skip version bump on ship**
+- Every ship requires version update
+- Every ship requires CHANGELOG entry
+
+### Git Commit Footer (CRITICAL - ALWAYS INCLUDE)
+
+**Every commit made with prjct MUST include this footer:**
+
+```
+Generated with [p/](https://www.prjct.app/)
+```
+
+**This is NON-NEGOTIABLE. The prjct signature must appear in ALL commits.**
+
+### PLAN BEFORE DESTRUCTIVE ACTIONS
+
+For commands that modify git state (ship, merge, done):
+```
+1. Show the user what will happen
+2. List all changes/files affected
+3. WAIT for explicit approval ("yes", "proceed", "do it")
+4. Only then execute
+```
+
+**DO NOT assume approval. WAIT for it.**
+
+### BLOCKING CONDITIONS
+
+When a template says "STOP" or has a blocking symbol:
+```
+1. HALT execution immediately
+2. TELL the user why you stopped
+3. DO NOT proceed until the condition is resolved
+```
+
+**Examples of blockers:**
+- `p. ship` on main branch → STOP, tell user to create branch
+- `gh auth status` fails → STOP, tell user to authenticate
+- No changes to commit → STOP, tell user nothing to ship

package/templates/global/modules/CLAUDE-intelligence.md

@@ -0,0 +1,92 @@
+## INTELLIGENT BEHAVIOR (For SMART commands only)
+
+### When Starting Tasks (`p. task`)
+1. **Analyze** - Understand what user wants to achieve
+2. **Classify** - Determine type: feature, bug, improvement, refactor, chore
+3. **Explore** - Find similar code, patterns, affected files
+4. **Ask** - Clarify ambiguities (use AskUserQuestion)
+5. **Design** - Propose 2-3 approaches, get approval
+6. **Break down** - Create actionable subtasks
+7. **Track** - Update storage/state.json
+
+### When Completing Tasks (`p. done`)
+1. Check if there are more subtasks
+2. If yes, advance to next subtask
+3. If no, task is complete
+4. Update storage, generate context
+
+### When Shipping (`p. ship`)
+1. Run tests (if configured)
+2. Create PR (if on feature branch)
+3. Bump version
+4. Update CHANGELOG
+5. Create git tag
+
+### Key Intelligence Rules
+- **Read before write** - Always read existing files before modifying
+- **Explore before coding** - Use Task(Explore) to understand codebase
+- **Ask when uncertain** - Use AskUserQuestion to clarify
+- **Log everything** - Append to memory/events.jsonl
+
+---
+
+## ARCHITECTURE: Write-Through Pattern
+
+```
+User Action → Storage (JSON) → Context (MD) → Sync Events
+```
+
+| Layer | Path | Purpose |
+|-------|------|---------|
+| **Storage** | `storage/*.json` | Source of truth |
+| **Context** | `context/*.md` | Claude-readable summaries |
+| **Memory** | `memory/events.jsonl` | Audit trail (append-only) |
+| **Agents** | `agents/*.md` | Domain specialists |
+| **Sync** | `sync/pending.json` | Backend sync queue |
+
+### File Structure
+```
+~/.prjct-cli/projects/{projectId}/
+├── storage/
+│   ├── state.json      # Current task (SOURCE OF TRUTH)
+│   ├── queue.json      # Task queue
+│   └── shipped.json    # Shipped features
+├── context/
+│   ├── now.md          # Current task (generated)
+│   └── next.md         # Queue (generated)
+├── memory/
+│   └── events.jsonl    # Audit trail
+├── agents/             # Domain specialists (auto-generated)
+└── sync/
+    └── pending.json    # Events for backend
+```
+
+---
+
+## LOADING DOMAIN AGENTS
+
+When working on tasks, load relevant agents from `{globalPath}/agents/`:
+- `frontend.md` - Frontend patterns, components
+- `backend.md` - Backend patterns, APIs
+- `database.md` - Database patterns, queries
+- `uxui.md` - UX/UI guidelines
+- `testing.md` - Testing patterns
+- `devops.md` - CI/CD, containers
+
+These agents contain project-specific patterns. **USE THEM**.
+
+---
+
+## SKILL INTEGRATION
+
+Agents are linked to Claude Code skills from claude-plugins.dev.
+
+### How Skills Work
+
+1. **During `p. sync`**: Search claude-plugins.dev, install best matches
+2. **During `p. task`**: Skills are auto-invoked for domain expertise
+3. **Agent frontmatter** has `skills: [discovered-skill-name]` field
+
+### Skill Location
+
+Skills are markdown files in `~/.claude/skills/`

package/templates/global/modules/CLAUDE-storage.md

@@ -0,0 +1,50 @@
+## STORAGE RULES (CROSS-AGENT COMPATIBILITY)
+
+**NEVER use temporary files** - Write directly to final destination:
+- WRONG: Create `.tmp/file.json`, then `mv` to final path
+- CORRECT: Write directly to `{globalPath}/storage/state.json`
+
+**JSON formatting** - Always use consistent format:
+- 2-space indentation
+- No trailing commas
+- Keys in logical order (as defined in storage schemas)
+
+**Atomic writes for JSON**:
+```javascript
+// Read → Modify → Write (no temp files)
+const data = JSON.parse(fs.readFileSync(path, 'utf-8'))
+data.newField = value
+fs.writeFileSync(path, JSON.stringify(data, null, 2))
+```
+
+**Timestamps**: Always ISO-8601 with milliseconds (`.000Z`)
+**UUIDs**: Always v4 format (lowercase)
+**Line endings**: LF (not CRLF)
+**Encoding**: UTF-8 without BOM
+
+**NEVER**:
+- Use `.tmp/` directories
+- Use `mv` or `rename` operations for storage files
+- Create backup files like `*.bak` or `*.old`
+- Modify existing lines in `events.jsonl`
+
+**Full specification**: See `{npm root -g}/prjct-cli/templates/global/STORAGE-SPEC.md`
+
+---
+
+## Preserve Markers (User Customizations)
+
+User customizations in context files and agents survive regeneration using preserve markers:
+
+```markdown
+<!-- prjct:preserve -->
+# My Custom Rules
+- Always use tabs
+- Prefer functional patterns
+<!-- /prjct:preserve -->
+```
+
+**How it works:**
+- Content between markers is extracted before regeneration
+- After regeneration, preserved content is appended under "Your Customizations"
+- Named sections: `<!-- prjct:preserve:my-rules -->` for identification

package/templates/global/modules/module-config.json

@@ -0,0 +1,36 @@
+{
+  "description": "Configuration for modular CLAUDE.md composition",
+  "version": "1.0.0",
+  "profiles": {
+    "full": {
+      "description": "All modules - maximum context (~2300 tokens)",
+      "modules": [
+        "CLAUDE-core.md",
+        "CLAUDE-commands.md",
+        "CLAUDE-git.md",
+        "CLAUDE-storage.md",
+        "CLAUDE-intelligence.md"
+      ]
+    },
+    "standard": {
+      "description": "Standard modules - balanced (~1400 tokens)",
+      "modules": ["CLAUDE-core.md", "CLAUDE-commands.md", "CLAUDE-git.md"]
+    },
+    "minimal": {
+      "description": "Core only - minimum context (~500 tokens)",
+      "modules": ["CLAUDE-core.md"]
+    }
+  },
+  "default": "standard",
+  "commandProfiles": {
+    "sync": "minimal",
+    "next": "minimal",
+    "dash": "minimal",
+    "pause": "minimal",
+    "resume": "minimal",
+    "task": "full",
+    "done": "standard",
+    "ship": "full",
+    "bug": "full"
+  }
+}