@claudemini/shit-cli 1.4.0 → 1.6.0

package/lib/rewind.js

@@ -5,54 +5,71 @@
  * Similar to 'entire rewind' - rollback to known good state
  */
 
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
 import { execSync } from 'child_process';
-
-function findProjectRoot() {
-  let dir = process.cwd();
-  while (dir !== '/') {
-    if (existsSync(join(dir, '.git'))) {
-      return dir;
-    }
-    dir = join(dir, '..');
-  }
-  throw new Error('Not in a git repository');
-}
+import { getProjectRoot } from './config.js';
 
 function git(cmd, cwd) {
   return execSync(`git ${cmd}`, { cwd, encoding: 'utf-8', timeout: 10000 }).trim();
 }
 
+function parseCheckpointRef(projectRoot, branch) {
+  const shadowMatch = branch.match(/^shit\/([a-f0-9]+)-([a-f0-9]+)$/);
+  if (shadowMatch) {
+    return {
+      type: 'shadow',
+      baseCommit: shadowMatch[1],
+      sessionShort: shadowMatch[2],
+      lookupKey: shadowMatch[2],
+    };
+  }
+
+  const checkpointMatch = branch.match(/^shit\/checkpoints\/v1\/(\d{4}-\d{2}-\d{2})-([a-f0-9]+)$/);
+  if (checkpointMatch) {
+    const message = git(`log ${branch} --format=%B -1`, projectRoot);
+    const linkedMatch = message.match(/@ ([a-f0-9]+)/);
+    const date = checkpointMatch[1];
+    const sessionShort = checkpointMatch[2];
+    return {
+      type: 'checkpoint',
+      baseCommit: linkedMatch ? linkedMatch[1] : null,
+      sessionShort,
+      lookupKey: `${date}-${sessionShort}`,
+    };
+  }
+
+  return null;
+}
+
 function listCheckpoints(projectRoot) {
   try {
-    // Get shadow branches
-    const branches = git('branch --list "shit/*"', projectRoot)
+    const branches = git('branch --list "shit/checkpoints/v1/*" "shit/*"', projectRoot)
       .split('\n')
       .map(b => b.trim().replace(/^\*?\s*/, ''))
       .filter(Boolean);
+    const uniqueBranches = [...new Set(branches)];
 
     const checkpoints = [];
 
-    for (const branch of branches) {
+    for (const branch of uniqueBranches) {
       try {
+        const parsed = parseCheckpointRef(projectRoot, branch);
+        if (!parsed) {
+          continue;
+        }
+
         const log = git(`log ${branch} --oneline -1`, projectRoot);
         const [commit, ...messageParts] = log.split(' ');
         const message = messageParts.join(' ');
-
-        // Extract session info from branch name: shit/<commit>-<session>
-        const match = branch.match(/^shit\/([a-f0-9]+)-([a-f0-9]+)$/);
-        if (match) {
-          const [, baseCommit, sessionShort] = match;
-          checkpoints.push({
-            branch,
-            commit,
-            baseCommit,
-            sessionShort,
-            message,
-            timestamp: git(`log ${branch} --format=%ci -1`, projectRoot)
-          });
-        }
+        checkpoints.push({
+          branch,
+          commit,
+          baseCommit: parsed.baseCommit,
+          sessionShort: parsed.sessionShort,
+          lookupKey: parsed.lookupKey,
+          type: parsed.type,
+          message,
+          timestamp: git(`log ${branch} --format=%ci -1`, projectRoot)
+        });
       } catch {
         // Skip invalid branches
       }
@@ -84,6 +101,10 @@ function hasUncommittedChanges(projectRoot) {
 function rewindToCheckpoint(projectRoot, checkpoint, force = false) {
   const currentCommit = getCurrentCommit(projectRoot);
 
+  if (!checkpoint.baseCommit) {
+    throw new Error(`Checkpoint ${checkpoint.lookupKey || checkpoint.sessionShort} is missing a linked base commit`);
+  }
+
   if (!force && hasUncommittedChanges(projectRoot)) {
     throw new Error('Working directory has uncommitted changes. Use --force to override or commit changes first.');
   }
@@ -100,7 +121,7 @@ function rewindToCheckpoint(projectRoot, checkpoint, force = false) {
 
 export default async function rewind(args) {
   try {
-    const projectRoot = findProjectRoot();
+    const projectRoot = getProjectRoot();
     const force = args.includes('--force') || args.includes('-f');
     const interactive = args.includes('--interactive') || args.includes('-i');
 
@@ -112,7 +133,7 @@ export default async function rewind(args) {
 
     if (checkpoints.length === 0) {
       console.log('❌ No checkpoints found');
-      console.log('   Checkpoints are created automatically when sessions end.');
+      console.log('   Checkpoints are created when you run "shit commit".');
       process.exit(1);
     }
 
@@ -120,7 +141,8 @@ export default async function rewind(args) {
       // Find specific checkpoint
       targetCheckpoint = checkpoints.find(cp =>
         cp.sessionShort.startsWith(checkpointArg) ||
-        cp.baseCommit.startsWith(checkpointArg)
+        cp.lookupKey.startsWith(checkpointArg) ||
+        (cp.baseCommit && cp.baseCommit.startsWith(checkpointArg))
       );
 
       if (!targetCheckpoint) {
@@ -132,22 +154,25 @@ export default async function rewind(args) {
       console.log('📋 Available checkpoints:\n');
       checkpoints.forEach((cp, i) => {
         const date = new Date(cp.timestamp).toLocaleString();
-        console.log(`${i + 1}. ${cp.sessionShort} (${cp.baseCommit.slice(0, 7)}) - ${date}`);
+        const base = cp.baseCommit ? cp.baseCommit.slice(0, 7) : 'unknown';
+        const key = cp.lookupKey || cp.sessionShort;
+        console.log(`${i + 1}. ${key} (${base}) - ${date}`);
         console.log(`   ${cp.message}`);
         console.log();
       });
 
       // For now, just use the most recent
       targetCheckpoint = checkpoints[0];
-      console.log(`Using most recent checkpoint: ${targetCheckpoint.sessionShort}`);
+      console.log(`Using most recent checkpoint: ${targetCheckpoint.lookupKey || targetCheckpoint.sessionShort}`);
     } else {
       // Use most recent checkpoint
       targetCheckpoint = checkpoints[0];
     }
 
-    console.log(`🔄 Rewinding to checkpoint: ${targetCheckpoint.sessionShort}`);
+    const selectedKey = targetCheckpoint.lookupKey || targetCheckpoint.sessionShort;
+    console.log(`🔄 Rewinding to checkpoint: ${selectedKey}`);
     console.log(`   Branch: ${targetCheckpoint.branch}`);
-    console.log(`   Base commit: ${targetCheckpoint.baseCommit}`);
+    console.log(`   Base commit: ${targetCheckpoint.baseCommit || 'unknown'}`);
     console.log(`   Created: ${new Date(targetCheckpoint.timestamp).toLocaleString()}`);
     console.log();
 
@@ -164,7 +189,7 @@ export default async function rewind(args) {
     console.log(`   git reset --hard ${previousCommit}`);
     console.log();
     console.log('💡 To resume from this checkpoint:');
-    console.log(`   shit resume ${targetCheckpoint.sessionShort}`);
+    console.log(`   shit resume ${selectedKey}`);
 
   } catch (error) {
     console.error('❌ Failed to rewind:', error.message);

package/lib/session.js

@@ -105,6 +105,12 @@ export function processEvent(state, event, hookType, projectRoot) {
     return;
   }
 
+  // Mark session as ended for end/stop hooks.
+  if (hookType === 'session-end' || hookType === 'SessionEnd' || hookType === 'stop' || hookType === 'session_end' || hookType === 'end') {
+    state.end_time = now;
+    return;
+  }
+
   // Tool events
   if (hookType === 'post-tool-use' && toolName) {
     state.tool_counts[toolName] = (state.tool_counts[toolName] || 0) + 1;

package/lib/status.js

@@ -5,20 +5,10 @@
  * Similar to 'entire status' - displays active session info
  */
 
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, readdirSync, statSync } from 'fs';
 import { join } from 'path';
 import { execSync } from 'child_process';
-
-function findProjectRoot() {
-  let dir = process.cwd();
-  while (dir !== '/') {
-    if (existsSync(join(dir, '.git'))) {
-      return dir;
-    }
-    dir = join(dir, '..');
-  }
-  throw new Error('Not in a git repository');
-}
+import { getProjectRoot, SESSION_ID_REGEX } from './config.js';
 
 function getCurrentSession(projectRoot) {
   const shitLogsDir = join(projectRoot, '.shit-logs');
@@ -27,9 +17,11 @@ function getCurrentSession(projectRoot) {
   }
 
   // Find the most recent session directory
-  const { readdirSync, statSync } = await import('fs');
   const sessions = readdirSync(shitLogsDir)
-    .filter(name => name.match(/^\d{4}-\d{2}-\d{2}-[a-f0-9-]+$/)) // session format
+    .filter(name => {
+      const fullPath = join(shitLogsDir, name);
+      return SESSION_ID_REGEX.test(name) && statSync(fullPath).isDirectory();
+    })
     .map(name => ({
       name,
       path: join(shitLogsDir, name),
@@ -90,11 +82,45 @@ function formatDuration(startTime) {
   }
 }
 
+function getTouchedFileCount(state) {
+  const ops = state?.file_ops;
+  if (!ops || typeof ops !== 'object') {
+    return 0;
+  }
+
+  const touched = new Set([
+    ...(Array.isArray(ops.write) ? ops.write : []),
+    ...(Array.isArray(ops.edit) ? ops.edit : []),
+    ...(Array.isArray(ops.read) ? ops.read : []),
+  ].filter(Boolean));
+
+  return touched.size;
+}
+
+function hasShitHooks(settings) {
+  if (!settings?.hooks || typeof settings.hooks !== 'object') {
+    return false;
+  }
+
+  return Object.values(settings.hooks).some(value => {
+    if (typeof value === 'string') {
+      return value.includes('shit log');
+    }
+    if (!Array.isArray(value)) {
+      return false;
+    }
+    return value.some(entry =>
+      Array.isArray(entry?.hooks) &&
+      entry.hooks.some(hook => typeof hook?.command === 'string' && hook.command.includes('shit log'))
+    );
+  });
+}
+
 export default async function status(args) {
   try {
-    const projectRoot = findProjectRoot();
+    const projectRoot = getProjectRoot();
     const gitInfo = getGitInfo(projectRoot);
-    const currentSession = await getCurrentSession(projectRoot);
+    const currentSession = getCurrentSession(projectRoot);
 
     console.log('📊 shit-cli Status\n');
 
@@ -121,7 +147,7 @@ export default async function status(args) {
         console.log(`   Started: ${new Date(state.start_time).toLocaleString()}`);
         console.log(`   Duration: ${formatDuration(state.start_time)}`);
         console.log(`   Events: ${state.event_count || 0}`);
-        console.log(`   Files: ${Object.keys(state.files || {}).length}`);
+        console.log(`   Files: ${getTouchedFileCount(state)}`);
 
         if (state.shadow_branch) {
           console.log(`   Shadow: ${state.shadow_branch}`);
@@ -149,8 +175,7 @@ export default async function status(args) {
     if (existsSync(claudeSettings)) {
       try {
         const settings = JSON.parse(readFileSync(claudeSettings, 'utf-8'));
-        const hasHooks = settings.hooks &&
-          (settings.hooks.session_start || settings.hooks.session_end);
+        const hasHooks = hasShitHooks(settings);
 
         console.log();
         if (hasHooks) {

package/lib/summarize.js

@@ -8,7 +8,7 @@
 
 import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
-import { execSync } from 'child_process';
+import { getProjectRoot } from './config.js';
 
 // Default configuration
 const DEFAULT_CONFIG = {
@@ -294,7 +294,7 @@ export async function summarizeSession(projectRoot, sessionId, sessionDir) {
  * CLI command for manual summarization
  */
 export default async function summarize(args) {
-  const projectRoot = findProjectRoot();
+  const projectRoot = getProjectRoot();
   const sessionId = args[0];
 
   if (!sessionId) {
@@ -329,14 +329,3 @@ export default async function summarize(args) {
     process.exit(1);
   }
 }
-
-function findProjectRoot() {
-  let dir = process.cwd();
-  while (dir !== '/') {
-    if (existsSync(join(dir, '.git'))) {
-      return dir;
-    }
-    dir = join(dir, '..');
-  }
-  throw new Error('Not in a git repository');
-}

package/package.json

@@ -1,22 +1,38 @@
 {
   "name": "@claudemini/shit-cli",
-  "version": "1.4.0",
-  "description": "Session-based Hook Intelligence Tracker - CLI tool for logging Claude Code hooks",
+  "version": "1.6.0",
+  "description": "Session-based Hook Intelligence Tracker - Zero-dependency memory system for human-AI coding sessions",
   "type": "module",
   "bin": {
     "shit": "./bin/shit.js"
   },
+  "files": [
+    "bin/",
+    "lib/",
+    "README.md"
+  ],
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
     "claude-code",
+    "gemini-cli",
+    "cursor",
+    "ai-coding",
     "hooks",
-    "logging",
-    "session-tracking"
+    "session-tracking",
+    "code-review",
+    "checkpoint"
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anthropics/shit-cli.git"
+  },
   "author": "",
-  "license": "MIT",
+  "license": "UNLICENSED",
   "dependencies": {},
   "devDependencies": {}
 }

package/.claude/settings.json

@@ -1,81 +0,0 @@
-{
-  "hooks": {
-    "SessionStart": [
-      {
-        "matcher": "",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "shit log session-start"
-          }
-        ]
-      }
-    ],
-    "SessionEnd": [
-      {
-        "matcher": "",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "shit log session-end"
-          }
-        ]
-      }
-    ],
-    "UserPromptSubmit": [
-      {
-        "matcher": "",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "shit log user-prompt-submit"
-          }
-        ]
-      }
-    ],
-    "PreToolUse": [
-      {
-        "matcher": "",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "shit log pre-tool-use"
-          }
-        ]
-      }
-    ],
-    "PostToolUse": [
-      {
-        "matcher": "",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "shit log post-tool-use"
-          }
-        ]
-      }
-    ],
-    "Notification": [
-      {
-        "matcher": "",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "shit log notification"
-          }
-        ]
-      }
-    ],
-    "Stop": [
-      {
-        "matcher": "",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "shit log stop"
-          }
-        ]
-      }
-    ]
-  }
-}

package/.claude/settings.local.json

@@ -1,20 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(git remote add:*)",
-      "Bash(git push:*)",
-      "Bash(npm publish:*)",
-      "Bash(npm whoami:*)",
-      "WebFetch(domain:www.npmjs.com)",
-      "Bash(npm config delete:*)",
-      "Bash(sudo chown:*)",
-      "Bash(npm cache clean:*)",
-      "Bash(npm install:*)",
-      "Bash(git add:*)",
-      "Bash(git commit -m \"$\\(cat <<''EOF''\n更新包名和版本号\n\n- 包名改为 @cluademini/shit-cli\n- 版本号升至 1.0.3\nEOF\n\\)\")",
-      "Bash(git commit:*)",
-      "Bash(npm config set:*)",
-      "WebFetch(domain:github.com)"
-    ]
-  }
-}

package/COMPARISON.md

@@ -1,92 +0,0 @@
-# Project Structure Comparison
-
-## Directory Layout
-
-```
-your-project/
-├── .claude/                    # Claude Code configuration
-│   └── settings.json           # Hook configurations
-├── .entire/                    # Entire tool (session management)
-│   ├── metadata/
-│   │   └── <session-id>/
-│   │       ├── full.jsonl      # Complete transcript
-│   │       ├── prompt.txt      # User prompts
-│   │       ├── context.md      # Session context
-│   │       └── summary.txt     # Session summary
-│   ├── logs/
-│   └── settings.json
-└── .shit-logs/                 # shit-cli (hook event logging)
-    ├── <session-id>/
-    │   ├── events.jsonl        # Hook events only
-    │   ├── prompts.txt         # User prompts
-    │   ├── context.md          # Session context
-    │   ├── summary.txt         # Session summary
-    │   └── metadata.json       # Session metadata
-    └── index.txt               # Global index
-```
-
-## Feature Comparison
-
-| Feature | `.entire` | `.shit-logs` |
-|---------|-----------|--------------|
-| **Scope** | Complete session transcript | Hook events only |
-| **Location** | Project root | Project root ✓ |
-| **Session-based** | ✓ | ✓ |
-| **Transcript** | `full.jsonl` (all messages) | `events.jsonl` (hooks only) |
-| **Prompts** | `prompt.txt` | `prompts.txt` |
-| **Context** | `context.md` | `context.md` |
-| **Summary** | `summary.txt` | `summary.txt` |
-| **Checkpoints** | Git shadow branches | Not implemented |
-| **CLI** | `entire` commands | `shit` commands |
-| **Auto-init** | `entire enable` | `shit init` |
-
-## Key Differences
-
-### `.entire` (Entire Tool)
-- **Purpose**: Complete session management and checkpointing
-- **Data**: Full conversation transcript (user + assistant messages)
-- **Features**: Git integration, checkpoints, session replay
-- **Trigger**: Automatic (entire daemon)
-
-### `.shit-logs` (shit-cli)
-- **Purpose**: Hook event logging and analysis
-- **Data**: Hook events only (tool calls, session events)
-- **Features**: Session aggregation, event filtering, cleanup
-- **Trigger**: Hook-based (Claude Code hooks)
-
-## Use Cases
-
-### Use `.entire` when you need:
-- Complete session history
-- Git-based checkpointing
-- Session replay and analysis
-- Cross-session context
-
-### Use `.shit-logs` when you need:
-- Hook event debugging
-- Tool usage analysis
-- Session statistics
-- Lightweight logging
-
-## Both Together
-
-Running both systems provides:
-- **Complete coverage**: Full transcript + hook events
-- **Different perspectives**: Conversation flow + tool execution
-- **Complementary data**: `.entire` for context, `.shit-logs` for debugging
-
-## .gitignore
-
-Both directories are typically excluded from git:
-
-```gitignore
-# Entire tool
-.entire/store/
-.entire/monitor.pid
-.entire/monitor.sessions.json
-
-# shit-cli logs
-.shit-logs/
-```
-
-Note: `.entire/settings.json` and `.entire/.gitignore` are usually committed.