@suwujs/codex-vault 0.1.0 → 0.3.0

package/README.md

@@ -25,14 +25,22 @@ Agent: "You're working on the API redesign. Last session you decided
 
 ```bash
 # From your project directory:
-git clone https://github.com/sukbearai/codex-vault.git /tmp/codex-vault
-bash /tmp/codex-vault/plugin/install.sh   # integrated mode — installs vault + hooks into your project
+npx @suwujs/codex-vault init
 claude                                  # or: codex
 ```
 
 Fill in `vault/brain/North Star.md` with your goals, then start talking.
 
+<details>
+<summary>Alternative: install from source</summary>
+
+```bash
+git clone https://github.com/sukbearai/codex-vault.git /tmp/codex-vault
+bash /tmp/codex-vault/plugin/install.sh
+```
+
 > **Standalone mode**: run `install.sh` from inside the codex-vault repo itself to use `vault/` as the working directory.
+</details>
 
 ## How It Works
 
@@ -167,7 +175,6 @@ See [docs/usage.md](docs/usage.md) — 7 real scenarios from first session to pr
 ## Inspired By
 
 - [llm-wiki](https://gist.github.com/karpathy/442a6bf555914893e9891c11519de94f) by Karpathy — the pattern
-- [obsidian-mind](https://github.com/sukbearai/obsidian-mind) — full-featured implementation for engineer performance tracking
 
 ## License
 

package/README.zh-CN.md

@@ -62,14 +62,22 @@ LLM agent 每次对话都从零开始。上次做的决策忘了，讨论过的
 
 ```bash
 # 在你的项目目录下：
-git clone https://github.com/sukbearai/codex-vault.git /tmp/codex-vault
-bash /tmp/codex-vault/plugin/install.sh   # 集成模式 — 自动安装 vault + hooks
+npx @suwujs/codex-vault init
 claude                                  # 或: codex
 ```
 
 填好 `vault/brain/North Star.md`，开始对话。
 
+<details>
+<summary>其他安装方式：从源码安装</summary>
+
+```bash
+git clone https://github.com/sukbearai/codex-vault.git /tmp/codex-vault
+bash /tmp/codex-vault/plugin/install.sh
+```
+
 > **独立模式**：在 codex-vault 仓库内运行 `install.sh`，以 `vault/` 为工作目录。
+</details>
 
 ## 工作原理
 
@@ -148,7 +156,6 @@ vault/
 ## 灵感来源
 
 - [llm-wiki](https://gist.github.com/karpathy/442a6bf555914893e9891c11519de94f) by Karpathy — 这个模式的起源
-- [obsidian-mind](https://github.com/sukbearai/obsidian-mind) — 面向工程师效能追踪的完整实现
 
 ## License
 

package/bin/cli.js

@@ -28,8 +28,11 @@ switch (cmd) {
     break;
 
   case 'upgrade':
+    cmdUpgrade();
+    break;
+
   case 'uninstall':
-    console.log(`"${cmd}" is coming in v0.2.0.`);
+    cmdUninstall();
     break;
 
   default:
@@ -43,20 +46,23 @@ function printHelp() {
 
 Usage:
   codex-vault init          Install vault into current directory (default)
-  codex-vault upgrade       Upgrade vault (coming in v0.2.0)
-  codex-vault uninstall     Remove vault  (coming in v0.2.0)
+  codex-vault upgrade       Upgrade existing vault to latest version
+  codex-vault uninstall     Remove vault integration (preserves vault data)
   codex-vault -v, --version Print version
   codex-vault -h, --help    Print this help`);
 }
 
-function runInit() {
-  // Check bash availability
+function assertBash() {
   const bashCheck = spawnSync('bash', ['--version'], { stdio: 'ignore' });
   if (bashCheck.error) {
     console.error('Error: bash is not available.');
     console.error('On Windows, please install Git Bash or WSL.');
     process.exit(1);
   }
+}
+
+function runInit() {
+  assertBash();
 
   // Check if already installed
   const versionFile = path.join(process.cwd(), 'vault', '.codex-vault', 'version');
@@ -88,3 +94,344 @@ function runInit() {
   fs.writeFileSync(versionFile, VERSION + '\n');
   console.log(`\ncodex-vault v${VERSION} installed successfully.`);
 }
+
+function cmdUpgrade() {
+  assertBash();
+
+  // Check if installed
+  const versionFile = path.join(process.cwd(), 'vault', '.codex-vault', 'version');
+  if (!fs.existsSync(versionFile)) {
+    console.error('codex-vault is not installed in this directory.');
+    console.error('Run "codex-vault init" first.');
+    process.exit(1);
+  }
+
+  const installedVersion = fs.readFileSync(versionFile, 'utf8').trim();
+
+  // Already up to date?
+  if (installedVersion === VERSION) {
+    console.log(`Already at v${VERSION}.`);
+    return;
+  }
+
+  console.log(`Upgrading: v${installedVersion} → v${VERSION}`);
+
+  // Backup hooks directory
+  const hooksDir = path.join(process.cwd(), 'vault', '.codex-vault', 'hooks');
+  const backupDir = path.join(process.cwd(), 'vault', '.codex-vault', `backup-${installedVersion}`, 'hooks');
+  const backupRoot = path.join(process.cwd(), 'vault', '.codex-vault', `backup-${installedVersion}`);
+
+  if (fs.existsSync(hooksDir)) {
+    fs.mkdirSync(backupDir, { recursive: true });
+    fs.cpSync(hooksDir, backupDir, { recursive: true });
+    console.log(`Hooks backed up to vault/.codex-vault/backup-${installedVersion}/hooks/`);
+  }
+
+  // Run install.sh
+  const result = spawnSync('bash', [INSTALL_SH], {
+    cwd: process.cwd(),
+    stdio: 'inherit',
+  });
+
+  if (result.error) {
+    console.error('Failed to run install.sh:', result.error.message);
+    if (fs.existsSync(backupRoot)) {
+      console.error(`Backup available at: vault/.codex-vault/backup-${installedVersion}/`);
+    }
+    process.exit(1);
+  }
+
+  if (result.status !== 0) {
+    console.error('install.sh exited with errors.');
+    if (fs.existsSync(backupRoot)) {
+      console.error(`Backup available at: vault/.codex-vault/backup-${installedVersion}/`);
+    }
+    process.exit(result.status);
+  }
+
+  // Update version file
+  fs.writeFileSync(versionFile, VERSION + '\n');
+
+  console.log(`\nUpgraded to v${VERSION} successfully.`);
+  if (fs.existsSync(backupRoot)) {
+    console.log(`Backup at: vault/.codex-vault/backup-${installedVersion}/`);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// uninstall
+// ---------------------------------------------------------------------------
+
+function cmdUninstall() {
+  const cwd = process.cwd();
+  const versionFile = path.join(cwd, 'vault', '.codex-vault', 'version');
+
+  // 1. Check installation
+  if (!fs.existsSync(versionFile)) {
+    console.error('codex-vault is not installed in this directory.');
+    console.error('Nothing to uninstall.');
+    process.exit(1);
+  }
+
+  const installedVersion = fs.readFileSync(versionFile, 'utf8').trim();
+  console.log(`Uninstalling codex-vault v${installedVersion}...`);
+  console.log('NOTE: vault/ data (brain/, work/, sources/) is preserved.\n');
+
+  // 2. Remove vault/.codex-vault/ (hooks + version + backups)
+  const codexVaultDir = path.join(cwd, 'vault', '.codex-vault');
+  if (fs.existsSync(codexVaultDir)) {
+    fs.rmSync(codexVaultDir, { recursive: true, force: true });
+    console.log('  [x] Removed vault/.codex-vault/');
+  }
+
+  // 3. Clean .claude/settings.json
+  cleanHooksJson(path.join(cwd, '.claude', 'settings.json'), '.claude/settings.json');
+
+  // 4. Clean .codex/hooks.json
+  cleanHooksJson(path.join(cwd, '.codex', 'hooks.json'), '.codex/hooks.json');
+
+  // 5. Clean .codex/config.toml
+  cleanCodexConfigToml(cwd);
+
+  // 6. Remove skills
+  const SKILL_NAMES = ['dump', 'ingest', 'recall', 'wrap-up'];
+  removeSkills(path.join(cwd, '.claude'), '.claude', SKILL_NAMES);
+  removeSkills(path.join(cwd, '.codex'), '.codex', SKILL_NAMES);
+
+  // 7. Clean CLAUDE.md
+  cleanInstructionFile(path.join(cwd, 'CLAUDE.md'), 'CLAUDE.md');
+
+  // 8. Clean AGENTS.md
+  cleanAgentsMd(cwd);
+
+  // Summary
+  console.log('\ncodex-vault has been uninstalled.');
+  console.log('Vault data preserved at vault/');
+}
+
+// ---------------------------------------------------------------------------
+// helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Remove codex-vault hook entries from a JSON hooks file
+ * (.claude/settings.json or .codex/hooks.json).
+ */
+function cleanHooksJson(filePath, label) {
+  if (!fs.existsSync(filePath)) return;
+
+  let data;
+  try {
+    data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+  } catch (e) {
+    console.log(`  [!] Could not parse ${label} — skipping (${e.message})`);
+    return;
+  }
+
+  if (!data.hooks || typeof data.hooks !== 'object') return;
+
+  let changed = false;
+  for (const event of Object.keys(data.hooks)) {
+    const entries = data.hooks[event];
+    if (!Array.isArray(entries)) continue;
+
+    const filtered = entries.filter((entry) => {
+      const hooks = entry.hooks || [];
+      // Keep the entry only if none of its hook commands belong to codex-vault
+      const isVaultEntry = hooks.some(
+        (h) => typeof h.command === 'string' && h.command.includes('codex-vault/hooks/')
+      );
+      return !isVaultEntry;
+    });
+
+    if (filtered.length !== entries.length) {
+      changed = true;
+      if (filtered.length === 0) {
+        delete data.hooks[event];
+      } else {
+        data.hooks[event] = filtered;
+      }
+    }
+  }
+
+  if (!changed) return;
+
+  // If hooks object is now empty, remove it
+  if (Object.keys(data.hooks).length === 0) {
+    delete data.hooks;
+  }
+
+  // If entire JSON is now empty, delete the file
+  if (Object.keys(data).length === 0) {
+    fs.unlinkSync(filePath);
+    console.log(`  [x] Removed ${label} (empty after cleanup)`);
+    cleanEmptyParents(path.dirname(filePath));
+  } else {
+    fs.writeFileSync(filePath, JSON.stringify(data, null, 2) + '\n');
+    console.log(`  [x] Cleaned codex-vault hooks from ${label}`);
+  }
+}
+
+/**
+ * Remove codex_hooks feature flag from .codex/config.toml.
+ */
+function cleanCodexConfigToml(cwd) {
+  const filePath = path.join(cwd, '.codex', 'config.toml');
+  if (!fs.existsSync(filePath)) return;
+
+  let content = fs.readFileSync(filePath, 'utf8');
+  const original = content;
+
+  // Remove lines containing codex_hooks
+  content = content.replace(/^.*codex_hooks.*\n?/gm, '');
+
+  // Remove empty [features] section (only whitespace/empty lines after header until next section or EOF)
+  content = content.replace(/^\[features\]\s*\n(?=\[|$)/gm, '');
+  // Also handle [features] at very end of file with nothing after it
+  content = content.replace(/^\[features\]\s*$/gm, '');
+
+  // Trim trailing whitespace
+  content = content.replace(/\n+$/, content.trim() === '' ? '' : '\n');
+
+  if (content === original) return;
+
+  if (content.trim() === '') {
+    fs.unlinkSync(filePath);
+    console.log('  [x] Removed .codex/config.toml (empty after cleanup)');
+    cleanEmptyParents(path.dirname(filePath));
+  } else {
+    fs.writeFileSync(filePath, content);
+    console.log('  [x] Cleaned codex_hooks from .codex/config.toml');
+  }
+}
+
+/**
+ * Remove codex-vault skill directories from an agent config dir.
+ */
+function removeSkills(agentDir, label, skillNames) {
+  const skillsDir = path.join(agentDir, 'skills');
+  if (!fs.existsSync(skillsDir)) return;
+
+  let removed = 0;
+  for (const name of skillNames) {
+    const skillDir = path.join(skillsDir, name);
+    if (fs.existsSync(skillDir)) {
+      fs.rmSync(skillDir, { recursive: true, force: true });
+      removed++;
+    }
+  }
+
+  if (removed === 0) return;
+
+  console.log(`  [x] Removed ${removed} skills from ${label}/skills/`);
+
+  // Clean up empty directories
+  if (isDirEmpty(skillsDir)) {
+    fs.rmdirSync(skillsDir);
+    if (isDirEmpty(agentDir)) {
+      fs.rmdirSync(agentDir);
+    }
+  }
+}
+
+/**
+ * Remove the # Codex-Vault section from CLAUDE.md.
+ * The section may be preceded by a --- separator (appended by install.sh).
+ * Removes from the separator (or heading) through EOF or the next --- + # heading.
+ */
+function cleanInstructionFile(filePath, label) {
+  if (!fs.existsSync(filePath)) return;
+
+  const content = fs.readFileSync(filePath, 'utf8');
+  const lines = content.split('\n');
+
+  // Find the "# Codex-Vault" heading
+  let sectionStart = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (/^# Codex-Vault/.test(lines[i])) {
+      sectionStart = i;
+      break;
+    }
+  }
+
+  if (sectionStart === -1) return;
+
+  // Check if preceded by --- separator (possibly with blank lines between)
+  let cutStart = sectionStart;
+  for (let i = sectionStart - 1; i >= 0; i--) {
+    if (lines[i].trim() === '') continue;
+    if (lines[i].trim() === '---') {
+      cutStart = i;
+    }
+    break;
+  }
+
+  // Find the end: next --- followed by # heading, or EOF
+  let cutEnd = lines.length;
+  for (let i = sectionStart + 1; i < lines.length; i++) {
+    if (lines[i].trim() === '---' && i + 1 < lines.length && /^# /.test(lines[i + 1])) {
+      cutEnd = i;
+      break;
+    }
+  }
+
+  // Build remaining content
+  const before = lines.slice(0, cutStart);
+  const after = lines.slice(cutEnd);
+  let remaining = before.concat(after).join('\n');
+
+  // Trim trailing whitespace/newlines
+  remaining = remaining.replace(/\s+$/, '');
+
+  if (remaining === '') {
+    fs.unlinkSync(filePath);
+    console.log(`  [x] Removed ${label} (empty after cleanup)`);
+  } else {
+    fs.writeFileSync(filePath, remaining + '\n');
+    console.log(`  [x] Cleaned codex-vault section from ${label}`);
+  }
+}
+
+/**
+ * Handle AGENTS.md: if it's just "@CLAUDE.md", delete it.
+ * Otherwise apply the same section-removal logic as CLAUDE.md.
+ */
+function cleanAgentsMd(cwd) {
+  const filePath = path.join(cwd, 'AGENTS.md');
+  if (!fs.existsSync(filePath)) return;
+
+  const content = fs.readFileSync(filePath, 'utf8');
+
+  // If content is just @CLAUDE.md (possibly with whitespace), delete the file
+  if (content.trim() === '@CLAUDE.md') {
+    fs.unlinkSync(filePath);
+    console.log('  [x] Removed AGENTS.md (@CLAUDE.md reference)');
+    return;
+  }
+
+  // Otherwise, apply the same section-removal logic
+  cleanInstructionFile(filePath, 'AGENTS.md');
+}
+
+/**
+ * Check if a directory is empty.
+ */
+function isDirEmpty(dirPath) {
+  try {
+    const entries = fs.readdirSync(dirPath);
+    return entries.length === 0;
+  } catch (e) {
+    return false;
+  }
+}
+
+/**
+ * Remove empty parent directories up to (but not including) cwd.
+ */
+function cleanEmptyParents(dirPath) {
+  const cwd = process.cwd();
+  if (dirPath === cwd || !dirPath.startsWith(cwd)) return;
+  if (isDirEmpty(dirPath)) {
+    fs.rmdirSync(dirPath);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suwujs/codex-vault",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Persistent knowledge vault for LLM agents (Claude Code, Codex CLI)",
   "license": "MIT",
   "repository": {

package/plugin/VERSION

@@ -1 +1 @@
-0.1.0
+0.3.0

package/plugin/hooks/classify-message.py

@@ -17,6 +17,7 @@ SIGNALS = [
     {
         "name": "DECISION",
         "message": "DECISION detected — suggest the user run /dump to capture this decision",
+        "auto_message": "DECISION detected — execute /dump now to capture this decision from the user's message",
         "patterns": [
             "decided", "deciding", "decision", "we chose", "agreed to",
             "let's go with", "the call is", "we're going with",
@@ -25,6 +26,7 @@ SIGNALS = [
     {
         "name": "WIN",
         "message": "WIN detected — suggest the user run /dump to record this achievement",
+        "auto_message": "WIN detected — execute /dump now to record this achievement from the user's message",
         "patterns": [
             "achieved", "won", "praised",
             "kudos", "shoutout", "great feedback", "recognized",
@@ -33,6 +35,7 @@ SIGNALS = [
     {
         "name": "PROJECT UPDATE",
         "message": "PROJECT UPDATE detected — suggest the user run /dump to log this progress",
+        "auto_message": "PROJECT UPDATE detected — execute /dump now to log this progress from the user's message",
         "patterns": [
             "project update", "sprint", "milestone",
             "shipped", "shipping", "launched", "launching",
@@ -44,6 +47,7 @@ SIGNALS = [
     {
         "name": "QUERY",
         "message": "QUERY detected — suggest the user run /recall to check existing knowledge first",
+        "auto_message": "QUERY detected — execute /recall now to search vault for relevant information before answering",
         "patterns": [
             "what is", "how does", "why did", "compare", "analyze",
             "explain the", "what's the difference", "summarize the",
@@ -53,6 +57,7 @@ SIGNALS = [
     {
         "name": "INGEST",
         "message": "INGEST detected — suggest the user run /ingest to process the source",
+        "auto_message": "INGEST detected — execute /ingest now to process the source from the user's message",
         "patterns": [
             "ingest", "process this", "read this article",
             "summarize this", "new source", "clip this", "web clip",
@@ -90,6 +95,23 @@ def _find_vault_root():
     return None
 
 
+def _read_mode():
+    """Read classify mode from vault config. Default: suggest."""
+    vault_root = _find_vault_root()
+    if not vault_root:
+        return "suggest"
+    config_path = os.path.join(vault_root, ".codex-vault", "config.json")
+    try:
+        with open(config_path) as f:
+            config = json.load(f)
+        mode = config.get("classify_mode", "suggest")
+        if mode in ("suggest", "auto"):
+            return mode
+    except (OSError, ValueError, KeyError):
+        pass
+    return "suggest"
+
+
 def _get_changed_files(vault_root):
     """Get list of changed/new .md files relative to vault root."""
     files = set()
@@ -172,9 +194,10 @@ def _check_vault_integrity(vault_root):
     return warnings
 
 
-def classify(prompt):
+def classify(prompt, mode="suggest"):
     p = prompt.lower()
-    return [s["message"] for s in SIGNALS if _match(s["patterns"], p)]
+    key = "auto_message" if mode == "auto" else "message"
+    return [s[key] for s in SIGNALS if _match(s["patterns"], p)]
 
 
 def is_session_end(prompt):
@@ -192,39 +215,63 @@ def main():
     if not isinstance(prompt, str) or not prompt:
         sys.exit(0)
 
-    messages = []
+    signal_messages = []
+    session_end_messages = []
 
     try:
+        mode = _read_mode()
+
         # Regular signal classification
-        signals = classify(prompt)
-        messages.extend(signals)
+        signals = classify(prompt, mode)
+        signal_messages.extend(signals)
 
-        # Session-end check
+        # Session-end check (always suggest mode — never auto-execute wrap-up)
         if is_session_end(prompt):
             vault_root = _find_vault_root()
             if vault_root:
                 integrity_warnings = _check_vault_integrity(vault_root)
                 if integrity_warnings:
-                    messages.append(
+                    session_end_messages.append(
                         "SESSION END — vault integrity check found issues:\n"
                         + "\n".join(f"  - {w}" for w in integrity_warnings)
                         + "\nFix these before wrapping up."
                     )
                 else:
-                    messages.append("SESSION END — vault integrity check passed.")
+                    session_end_messages.append("SESSION END — vault integrity check passed.")
     except Exception:
         sys.exit(0)
 
-    if messages:
-        hints = "\n".join(f"- {s}" for s in messages)
+    parts = []
+
+    if signal_messages:
+        hints = "\n".join(f"- {s}" for s in signal_messages)
+        if mode == "auto":
+            parts.append(
+                "Auto-execute the following skills based on user intent:\n"
+                + hints
+                + "\n\nExecute the skill immediately with the user's message as input. Do not ask for confirmation."
+            )
+        else:
+            parts.append(
+                "Skill suggestions (do NOT auto-execute — suggest the skill to the user and let them decide):\n"
+                + hints
+                + "\n\nWait for the user to invoke the skill. Do not create vault notes without explicit user action."
+            )
+
+    if session_end_messages:
+        hints = "\n".join(f"- {s}" for s in session_end_messages)
+        parts.append(
+            "Skill suggestions (do NOT auto-execute — suggest the skill to the user and let them decide):\n"
+            + hints
+            + "\n\nWait for the user to invoke the skill. Do not create vault notes without explicit user action."
+        )
+
+    if parts:
+        context = "\n\n".join(parts)
         output = {
             "hookSpecificOutput": {
                 "hookEventName": "UserPromptSubmit",
-                "additionalContext": (
-                    "Skill suggestions (do NOT auto-execute — suggest the skill to the user and let them decide):\n"
-                    + hints
-                    + "\n\nWait for the user to invoke the skill. Do not create vault notes without explicit user action."
-                )
+                "additionalContext": context
             }
         }
         json.dump(output, sys.stdout)

package/vault/.codex-vault/hooks/classify-message.py

@@ -17,6 +17,7 @@ SIGNALS = [
     {
         "name": "DECISION",
         "message": "DECISION detected — suggest the user run /dump to capture this decision",
+        "auto_message": "DECISION detected — execute /dump now to capture this decision from the user's message",
         "patterns": [
             "decided", "deciding", "decision", "we chose", "agreed to",
             "let's go with", "the call is", "we're going with",
@@ -25,6 +26,7 @@ SIGNALS = [
     {
         "name": "WIN",
         "message": "WIN detected — suggest the user run /dump to record this achievement",
+        "auto_message": "WIN detected — execute /dump now to record this achievement from the user's message",
         "patterns": [
             "achieved", "won", "praised",
             "kudos", "shoutout", "great feedback", "recognized",
@@ -33,6 +35,7 @@ SIGNALS = [
     {
         "name": "PROJECT UPDATE",
         "message": "PROJECT UPDATE detected — suggest the user run /dump to log this progress",
+        "auto_message": "PROJECT UPDATE detected — execute /dump now to log this progress from the user's message",
         "patterns": [
             "project update", "sprint", "milestone",
             "shipped", "shipping", "launched", "launching",
@@ -44,6 +47,7 @@ SIGNALS = [
     {
         "name": "QUERY",
         "message": "QUERY detected — suggest the user run /recall to check existing knowledge first",
+        "auto_message": "QUERY detected — execute /recall now to search vault for relevant information before answering",
         "patterns": [
             "what is", "how does", "why did", "compare", "analyze",
             "explain the", "what's the difference", "summarize the",
@@ -53,6 +57,7 @@ SIGNALS = [
     {
         "name": "INGEST",
         "message": "INGEST detected — suggest the user run /ingest to process the source",
+        "auto_message": "INGEST detected — execute /ingest now to process the source from the user's message",
         "patterns": [
             "ingest", "process this", "read this article",
             "summarize this", "new source", "clip this", "web clip",
@@ -90,6 +95,23 @@ def _find_vault_root():
     return None
 
 
+def _read_mode():
+    """Read classify mode from vault config. Default: suggest."""
+    vault_root = _find_vault_root()
+    if not vault_root:
+        return "suggest"
+    config_path = os.path.join(vault_root, ".codex-vault", "config.json")
+    try:
+        with open(config_path) as f:
+            config = json.load(f)
+        mode = config.get("classify_mode", "suggest")
+        if mode in ("suggest", "auto"):
+            return mode
+    except (OSError, ValueError, KeyError):
+        pass
+    return "suggest"
+
+
 def _get_changed_files(vault_root):
     """Get list of changed/new .md files relative to vault root."""
     files = set()
@@ -172,9 +194,10 @@ def _check_vault_integrity(vault_root):
     return warnings
 
 
-def classify(prompt):
+def classify(prompt, mode="suggest"):
     p = prompt.lower()
-    return [s["message"] for s in SIGNALS if _match(s["patterns"], p)]
+    key = "auto_message" if mode == "auto" else "message"
+    return [s[key] for s in SIGNALS if _match(s["patterns"], p)]
 
 
 def is_session_end(prompt):
@@ -192,39 +215,63 @@ def main():
     if not isinstance(prompt, str) or not prompt:
         sys.exit(0)
 
-    messages = []
+    signal_messages = []
+    session_end_messages = []
 
     try:
+        mode = _read_mode()
+
         # Regular signal classification
-        signals = classify(prompt)
-        messages.extend(signals)
+        signals = classify(prompt, mode)
+        signal_messages.extend(signals)
 
-        # Session-end check
+        # Session-end check (always suggest mode — never auto-execute wrap-up)
         if is_session_end(prompt):
             vault_root = _find_vault_root()
             if vault_root:
                 integrity_warnings = _check_vault_integrity(vault_root)
                 if integrity_warnings:
-                    messages.append(
+                    session_end_messages.append(
                         "SESSION END — vault integrity check found issues:\n"
                         + "\n".join(f"  - {w}" for w in integrity_warnings)
                         + "\nFix these before wrapping up."
                     )
                 else:
-                    messages.append("SESSION END — vault integrity check passed.")
+                    session_end_messages.append("SESSION END — vault integrity check passed.")
     except Exception:
         sys.exit(0)
 
-    if messages:
-        hints = "\n".join(f"- {s}" for s in messages)
+    parts = []
+
+    if signal_messages:
+        hints = "\n".join(f"- {s}" for s in signal_messages)
+        if mode == "auto":
+            parts.append(
+                "Auto-execute the following skills based on user intent:\n"
+                + hints
+                + "\n\nExecute the skill immediately with the user's message as input. Do not ask for confirmation."
+            )
+        else:
+            parts.append(
+                "Skill suggestions (do NOT auto-execute — suggest the skill to the user and let them decide):\n"
+                + hints
+                + "\n\nWait for the user to invoke the skill. Do not create vault notes without explicit user action."
+            )
+
+    if session_end_messages:
+        hints = "\n".join(f"- {s}" for s in session_end_messages)
+        parts.append(
+            "Skill suggestions (do NOT auto-execute — suggest the skill to the user and let them decide):\n"
+            + hints
+            + "\n\nWait for the user to invoke the skill. Do not create vault notes without explicit user action."
+        )
+
+    if parts:
+        context = "\n\n".join(parts)
         output = {
             "hookSpecificOutput": {
                 "hookEventName": "UserPromptSubmit",
-                "additionalContext": (
-                    "Skill suggestions (do NOT auto-execute — suggest the skill to the user and let them decide):\n"
-                    + hints
-                    + "\n\nWait for the user to invoke the skill. Do not create vault notes without explicit user action."
-                )
+                "additionalContext": context
             }
         }
         json.dump(output, sys.stdout)