@only1btayy/g2w 1.0.29 → 1.0.30

package/hooks/g2w-commit-guard.js

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+// G2W Commit Guard — PreToolUse hook
+// Fires before Bash commands. Hard blocks git commit and git push
+// unless the user has explicitly approved. Exit code 1 = blocked.
+
+let input = '';
+const stdinTimeout = setTimeout(() => process.exit(0), 3000);
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', chunk => (input += chunk));
+process.stdin.on('end', () => {
+  clearTimeout(stdinTimeout);
+  try {
+    const data = JSON.parse(input);
+    if (data.tool_name !== 'Bash') {
+      process.exit(0);
+    }
+
+    const cmd = data.tool_input?.command || '';
+
+    // Detect git commit or git push (with optional flags/args)
+    const isCommit = /\bgit\s+commit\b/.test(cmd);
+    const isPush = /\bgit\s+push\b/.test(cmd);
+
+    if (isCommit || isPush) {
+      const action = isCommit ? 'commit' : 'push';
+      const output = {
+        hookSpecificOutput: {
+          hookEventName: 'PreToolUse',
+          additionalContext:
+            `🚫 G2W COMMIT GUARD: You are about to run git ${action}. ` +
+            'This requires explicit user approval. ' +
+            'Stop and ask the user before proceeding. Do not bypass this check.',
+        },
+      };
+      process.stdout.write(JSON.stringify(output));
+      process.exit(1);
+    }
+
+    process.exit(0);
+  } catch {
+    process.exit(0);
+  }
+});

package/lib/install.js

@@ -42,22 +42,12 @@ const G2W_HOOKS = {
       ]
     },
     {
-      matcher: 'Edit|Write',
+      matcher: 'Bash',
       hooks: [
         {
-          type: 'prompt',
-          prompt: 'Trust Layer: answer the user\'s question first before acting. Declare scope (exact files you will touch). Stop if scope creeps beyond what was declared. Say "I don\'t know" instead of guessing. No commits without explicit user approval. If the user seems stuck or frustrated — remind them of their vision, not just fix the code.'
-        }
-      ]
-    }
-  ],
-  PostMessage: [
-    {
-      matcher: '.*',
-      hooks: [
-        {
-          type: 'prompt',
-          prompt: 'If the context window is at or above 80%, tell the user: "Hey — we\'re getting close to the context limit. Want me to run /g2w:ready2save to save progress and clear context?" If below 80%, do nothing.'
+          type: 'command',
+          command: 'node "{{HOOKS_DIR}}/g2w-commit-guard.js"',
+          timeout: 5
         }
       ]
     }
@@ -123,6 +113,13 @@ function mergeMcpServers(targetBase) {
   return added;
 }
 
+// Unique identifiers for each G2W hook — used for merge and removal
+const HOOK_SIGNATURES = {
+  scopeGuard:  h => h.hooks?.some(hh => hh.command?.includes('g2w-scope-guard')),
+  aGame:       h => h.hooks?.some(hh => hh.command?.includes('g2w-agame')),
+  commitGuard: h => h.hooks?.some(hh => hh.command?.includes('g2w-commit-guard')),
+};
+
 function mergeHooks(targetBase) {
   const settingsPath = path.join(targetBase, '.claude', 'settings.json');
   const hooksDir = path.join(targetBase, '.claude', 'hooks');
@@ -140,22 +137,48 @@ function mergeHooks(targetBase) {
     JSON.stringify(G2W_HOOKS).replace(/\{\{HOOKS_DIR\}\}/g, hooksDir.replace(/\\/g, '/'))
   );
 
-  // Merge PreToolUse — append if not already present (check by scope-guard command)
-  if (!existing.hooks.PreToolUse) existing.hooks.PreToolUse = [];
-  const alreadyHasPreHook = existing.hooks.PreToolUse.some(h =>
-    h.hooks && h.hooks.some(hh => hh.command && hh.command.includes('g2w-scope-guard'))
-  );
-  if (!alreadyHasPreHook) {
-    existing.hooks.PreToolUse.push(...resolvedHooks.PreToolUse);
+  // --- Migration: clean up old hook formats from previous G2W versions ---
+
+  // Remove old PostMessage hooks (no longer used)
+  if (existing.hooks.PostMessage) {
+    existing.hooks.PostMessage = existing.hooks.PostMessage.filter(h =>
+      !(h.hooks && h.hooks.some(hh => hh.prompt && hh.prompt.includes('ready2save')))
+    );
+    if (existing.hooks.PostMessage.length === 0) delete existing.hooks.PostMessage;
   }
 
-  // Merge PostMessage — append if not already present
-  if (!existing.hooks.PostMessage) existing.hooks.PostMessage = [];
-  const alreadyHasPostHook = existing.hooks.PostMessage.some(h =>
-    h.hooks && h.hooks.some(hh => hh.prompt && hh.prompt.includes('ready2save'))
-  );
-  if (!alreadyHasPostHook) {
-    existing.hooks.PostMessage.push(...resolvedHooks.PostMessage);
+  // Remove old UserPromptSubmit hooks (broke chat — Trust Layer + context warning)
+  if (existing.hooks.UserPromptSubmit) {
+    existing.hooks.UserPromptSubmit = existing.hooks.UserPromptSubmit.filter(h =>
+      !(h.hooks && h.hooks.some(hh =>
+        hh.prompt && (hh.prompt.includes('G2W Trust Layer') || hh.prompt.includes('Context check'))
+      ))
+    );
+    if (existing.hooks.UserPromptSubmit.length === 0) delete existing.hooks.UserPromptSubmit;
+  }
+
+  // Remove old Trust Layer prompt from PreToolUse (was there in early versions)
+  if (existing.hooks.PreToolUse) {
+    existing.hooks.PreToolUse = existing.hooks.PreToolUse.filter(h =>
+      !(h.hooks && h.hooks.some(hh => hh.prompt && hh.prompt.includes('Trust Layer')))
+    );
+  }
+
+  // --- Merge current hooks: scope-guard, a-game, commit-guard on PreToolUse ---
+
+  if (!existing.hooks.PreToolUse) existing.hooks.PreToolUse = [];
+  for (const hook of resolvedHooks.PreToolUse) {
+    const isScopeGuard = HOOK_SIGNATURES.scopeGuard(hook);
+    const isAGame = HOOK_SIGNATURES.aGame(hook);
+    const isCommitGuard = HOOK_SIGNATURES.commitGuard(hook);
+    const alreadyExists = existing.hooks.PreToolUse.some(h =>
+      (isScopeGuard && HOOK_SIGNATURES.scopeGuard(h)) ||
+      (isAGame && HOOK_SIGNATURES.aGame(h)) ||
+      (isCommitGuard && HOOK_SIGNATURES.commitGuard(h))
+    );
+    if (!alreadyExists) {
+      existing.hooks.PreToolUse.push(hook);
+    }
   }
 
   fs.writeFileSync(settingsPath, JSON.stringify(existing, null, 2));
@@ -189,7 +212,7 @@ function removeHooks(targetBase) {
   const hooksDir = path.join(targetBase, '.claude', 'hooks');
 
   // Remove hook scripts
-  ['g2w-scope-guard.js', 'g2w-agame.js'].forEach(file => {
+  ['g2w-scope-guard.js', 'g2w-agame.js', 'g2w-commit-guard.js'].forEach(file => {
     const p = path.join(hooksDir, file);
     if (fs.existsSync(p)) fs.rmSync(p);
   });
@@ -199,18 +222,31 @@ function removeHooks(targetBase) {
   try { existing = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); } catch { return; }
 
   if (existing.hooks) {
+    // Remove all G2W PreToolUse hooks (scope-guard, a-game, commit-guard, old Trust Layer prompt)
     if (existing.hooks.PreToolUse) {
       existing.hooks.PreToolUse = existing.hooks.PreToolUse.filter(h =>
+        !HOOK_SIGNATURES.scopeGuard(h) &&
+        !HOOK_SIGNATURES.aGame(h) &&
+        !HOOK_SIGNATURES.commitGuard(h) &&
+        !(h.hooks && h.hooks.some(hh => hh.prompt && hh.prompt.includes('Trust Layer')))
+      );
+      if (existing.hooks.PreToolUse.length === 0) delete existing.hooks.PreToolUse;
+    }
+    // Clean up old UserPromptSubmit hooks (broke chat — removed in v1.0.29+)
+    if (existing.hooks.UserPromptSubmit) {
+      existing.hooks.UserPromptSubmit = existing.hooks.UserPromptSubmit.filter(h =>
         !(h.hooks && h.hooks.some(hh =>
-          (hh.command && (hh.command.includes('g2w-scope-guard') || hh.command.includes('g2w-agame'))) ||
-          (hh.prompt && hh.prompt.includes('Trust Layer'))
+          hh.prompt && (hh.prompt.includes('G2W Trust Layer') || hh.prompt.includes('Context check'))
         ))
       );
+      if (existing.hooks.UserPromptSubmit.length === 0) delete existing.hooks.UserPromptSubmit;
     }
+    // Clean up old PostMessage hooks from early versions
     if (existing.hooks.PostMessage) {
       existing.hooks.PostMessage = existing.hooks.PostMessage.filter(h =>
         !(h.hooks && h.hooks.some(hh => hh.prompt && hh.prompt.includes('ready2save')))
       );
+      if (existing.hooks.PostMessage.length === 0) delete existing.hooks.PostMessage;
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@only1btayy/g2w",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "G2W — a relationship protocol for building trust with AI",
   "bin": {
     "g2w": "bin/g2w.js"

package/skills/ready2save.md

@@ -16,10 +16,8 @@ You are closing out this session. Leave the project in a state where any future
 
    Do NOT ask the user what was done, what to save, or what decisions were made. You witnessed the entire session — extract it yourself and present it. The user confirms or corrects your summary. Never ask them to recall.
 
-2. **Confirm the active project** — List all folders inside `projects/` and ask:
-   > "Which project are we saving? (pick one)"
-
-   Wait for the user to confirm. Do not assume based on what was discussed — the user decides.
+2. **Identify the active project** — Read `~/.g2w/CURRENT.md` (Windows: `C:/Users/[username]/.g2w/CURRENT.md`). If it has an `active:` line, that's the project. Use it. Do NOT ask.
+   - Only if the file doesn't exist or has no `active:` line: list folders in `~/.g2w/projects/` and ask which one. This is the ONLY scenario where you ask.
 
 3. **Update `.g2w/CURRENT.md`** in the confirmed project folder with exactly three sections:
    ```
@@ -56,7 +54,14 @@ You are closing out this session. Leave the project in a state where any future
    - Verified: [how it was verified]
    ```
 
-   Keep it lean: do NOT run git status, git diff, or git log — you already know what changed. One `git add` for the files you touched + one `git commit` = done. Present the commit message to the user. Wait for approval before running.
+   Keep it lean: do NOT run git status, git diff, or git log — you already know what changed. Present the commit message to the user. Wait for approval. Then run it as **one single Bash call**:
+   ```
+   git add [files] && git commit -m "type: summary
+
+   - What changed
+   - Verified: [how]"
+   ```
+   Never split git add and git commit into separate Bash calls.
 
 6. **Announce with personality:**
    End the session with a closing quote. Pick ONE at random from this list: