@traisetech/autopilot 2.0.0 → 2.1.0

package/package.json

@@ -1,69 +1,69 @@
-{
-  "name": "@traisetech/autopilot",
-  "version": "2.0.0",
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "bin",
-    "src",
-    "docs",
-    "README.md",
-    "LICENSE",
-    "CHANGELOG.md"
-  ],
-  "description": "An intelligent CLI tool that automatically commits and pushes your code so you can focus on building.",
-  "keywords": [
-    "git",
-    "automation",
-    "autocommit",
-    "autopush",
-    "developer-tools",
-    "cli",
-    "productivity",
-    "git-workflow"
-  ],
-  "author": "Praise Masunga (PraiseTechzw)",
-  "license": "MIT",
-  "type": "commonjs",
-  "bin": {
-    "autopilot": "bin/autopilot.js"
-  },
-  "main": "src/index.js",
-  "scripts": {
-    "dev": "node bin/autopilot.js",
-    "test": "node --test",
-    "lint": "node -c bin/autopilot.js && node -c src/index.js",
-    "verify": "node bin/autopilot.js --help && node bin/autopilot.js doctor && node --test",
-    "prepublishOnly": "npm run verify",
-    "release:patch": "npm run verify && npm version patch && git push --follow-tags && echo \"\n🚀 Release initiated! GitHub Action will publish to NPM.\"",
-    "release:minor": "npm run verify && npm version minor && git push --follow-tags && echo \"\n🚀 Release initiated! GitHub Action will publish to NPM.\"",
-    "release:major": "npm run verify && npm version major && git push --follow-tags && echo \"\n🚀 Release initiated! GitHub Action will publish to NPM.\""
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/PraiseTechzw/autopilot-cli.git"
-  },
-  "bugs": {
-    "url": "https://github.com/PraiseTechzw/autopilot-cli/issues"
-  },
-  "homepage": "https://github.com/PraiseTechzw/autopilot-cli#readme",
-  "dependencies": {
-    "@traisetech/autopilot": "^0.1.7",
-    "chokidar": "^3.6.0",
-    "commander": "^14.0.3",
-    "csv-writer": "^1.6.0",
-    "execa": "^5.1.1",
-    "fs-extra": "^11.3.3",
-    "ink": "^6.6.0",
-    "ink-big-text": "^2.0.0",
-    "ink-gradient": "^4.0.0",
-    "ink-spinner": "^5.0.0",
-    "open": "^11.0.0",
-    "prop-types": "^15.8.1",
-    "react": "^19.2.4"
-  }
-}
+{
+  "name": "@traisetech/autopilot",
+  "version": "2.1.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "bin",
+    "src",
+    "docs",
+    "README.md",
+    "LICENSE",
+    "CHANGELOG.md"
+  ],
+  "description": "An intelligent Git automation CLI that safely commits and pushes your code so you can focus on building.",
+  "keywords": [
+    "git",
+    "automation",
+    "autocommit",
+    "autopush",
+    "developer-tools",
+    "cli",
+    "productivity",
+    "git-workflow"
+  ],
+  "author": "Praise Masunga (PraiseTechzw)",
+  "license": "MIT",
+  "type": "commonjs",
+  "bin": {
+    "autopilot": "bin/autopilot.js"
+  },
+  "main": "src/index.js",
+  "scripts": {
+    "dev": "node bin/autopilot.js",
+    "test": "node --test --test-concurrency=1",
+    "lint": "node -c bin/autopilot.js && node -c src/index.js",
+    "verify": "node bin/autopilot.js --help && node bin/autopilot.js doctor && npm test",
+    "prepublishOnly": "npm run verify",
+    "release:patch": "npm run verify && npm version patch && git push --follow-tags && echo \"\n🚀 Release initiated! GitHub Action will publish to NPM.\"",
+    "release:minor": "npm run verify && npm version minor && git push --follow-tags && echo \"\n🚀 Release initiated! GitHub Action will publish to NPM.\"",
+    "release:major": "npm run verify && npm version major && git push --follow-tags && echo \"\n🚀 Release initiated! GitHub Action will publish to NPM.\""
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/PraiseTechzw/autopilot-cli.git"
+  },
+  "bugs": {
+    "url": "https://github.com/PraiseTechzw/autopilot-cli/issues"
+  },
+  "homepage": "https://github.com/PraiseTechzw/autopilot-cli#readme",
+  "dependencies": {
+    "@traisetech/autopilot": "^0.1.7",
+    "chokidar": "^3.6.0",
+    "commander": "^14.0.3",
+    "csv-writer": "^1.6.0",
+    "execa": "^5.1.1",
+    "fs-extra": "^11.3.3",
+    "ink": "^6.6.0",
+    "ink-big-text": "^2.0.0",
+    "ink-gradient": "^4.0.0",
+    "ink-spinner": "^5.0.0",
+    "open": "^11.0.0",
+    "prop-types": "^15.8.1",
+    "react": "^19.2.4"
+  }
+}

package/src/commands/config.js

@@ -0,0 +1,110 @@
+/**
+ * Config Command
+ * View and modify Autopilot configuration
+ */
+
+const logger = require('../utils/logger');
+const { loadConfig, saveConfig, getGlobalConfigPath } = require('../config/loader');
+const fs = require('fs-extra');
+const { getConfigPath } = require('../utils/paths');
+
+/**
+ * Helper to get value by dot notation
+ */
+const getByDot = (obj, path) => {
+  return path.split('.').reduce((acc, part) => acc && acc[part], obj);
+};
+
+/**
+ * Helper to set value by dot notation
+ */
+const setByDot = (obj, path, value) => {
+  const parts = path.split('.');
+  const last = parts.pop();
+  const target = parts.reduce((acc, part) => {
+    if (!acc[part]) acc[part] = {};
+    return acc[part];
+  }, obj);
+  target[last] = value;
+};
+
+/**
+ * Parse value string to appropriate type
+ */
+const parseValue = (val) => {
+  if (val === 'true') return true;
+  if (val === 'false') return false;
+  if (!isNaN(val) && val.trim() !== '') return Number(val);
+  return val;
+};
+
+async function config(cmd, key, value, options) {
+  const repoPath = options?.cwd || process.cwd();
+  const isGlobal = options?.global || false;
+
+  if (cmd === 'list') {
+    // If list --global, show only global config?
+    // Or just show effective config?
+    // Let's show effective config, maybe annotated if we had time.
+    // But for now, just loadConfig which merges them.
+    const currentConfig = await loadConfig(repoPath);
+    console.log(JSON.stringify(currentConfig, null, 2));
+    if (isGlobal) {
+        logger.info('(Note: Showing effective merged config. Use --global to set global values.)');
+    }
+    return;
+  }
+
+  if (cmd === 'get') {
+    if (!key) {
+      logger.error('Usage: autopilot config get <key>');
+      return;
+    }
+    // Get always shows effective value
+    const currentConfig = await loadConfig(repoPath);
+    const val = getByDot(currentConfig, key);
+    if (val === undefined) {
+      logger.warn(`Key '${key}' not set`);
+    } else {
+      console.log(typeof val === 'object' ? JSON.stringify(val, null, 2) : val);
+    }
+    return;
+  }
+
+  if (cmd === 'set') {
+    if (!key || value === undefined) {
+      logger.error('Usage: autopilot config set <key> <value>');
+      return;
+    }
+
+    const typedValue = parseValue(value);
+    
+    // We need to read the specific file (local or global) to avoid merging defaults into it
+    let rawConfig = {};
+    let configPath;
+
+    if (isGlobal) {
+        configPath = getGlobalConfigPath();
+    } else {
+        configPath = getConfigPath(repoPath);
+    }
+    
+    if (await fs.pathExists(configPath)) {
+      try {
+        rawConfig = await fs.readJson(configPath);
+      } catch (e) {
+        // Ignore read errors, start fresh
+      }
+    }
+    
+    setByDot(rawConfig, key, typedValue);
+    
+    await saveConfig(repoPath, rawConfig, isGlobal);
+    logger.success(`Set ${key} = ${typedValue} ${isGlobal ? '(Global)' : '(Local)'}`);
+    return;
+  }
+
+  logger.error('Unknown config command. Use list, get, or set.');
+}
+
+module.exports = config;

package/src/commands/dashboard.mjs

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 import { render, Box, Text, useInput, useApp } from 'ink';
 import Gradient from 'ink-gradient';
 import BigText from 'ink-big-text';
@@ -8,7 +8,10 @@ import path from 'path';
 import StateManager from '../core/state.js';
 import git from '../core/git.js';
 import HistoryManager from '../core/history.js';
-import { getPid } from '../utils/process.js';
+import processUtils from '../utils/process.js';
+
+const { useState, useEffect } = React;
+const { getRunningPid } = processUtils;
 
 const e = React.createElement;
 
@@ -29,7 +32,7 @@ const Dashboard = () => {
     const fetchData = async () => {
       try {
         // 1. Check process status
-        const currentPid = await getPid(root);
+        const currentPid = await getRunningPid(root);
         setPid(currentPid);
         
         // 2. Check Paused State
@@ -122,11 +125,13 @@ const Dashboard = () => {
     // Pending Changes
     e(Box, { flexDirection: "column", marginBottom: 1 },
       e(Text, { underline: true }, `Pending Changes (${pendingFiles.length})`),
-      pendingFiles.length === 0 ? 
-        e(Text, { color: "gray" }, "No pending changes") :
-        pendingFiles.slice(0, 5).map((f, i) => 
-          e(Text, { key: i, color: "yellow" }, ` ${f.status} ${f.file}`)
-        ),
+      e(Box, { flexDirection: "column" },
+        pendingFiles.length === 0 ? 
+          e(Text, { color: "gray" }, "No pending changes") :
+          pendingFiles.slice(0, 5).map((f) => 
+            e(Text, { key: f.file, color: "yellow" }, ` ${f.status} ${f.file}`)
+          )
+      ),
       pendingFiles.length > 5 && e(Text, { color: "gray" }, ` ...and ${pendingFiles.length - 5} more`)
     ),
 

package/src/commands/init.js

@@ -9,7 +9,8 @@ const readline = require('readline');
 const logger = require('../utils/logger');
 const { getConfigPath, getIgnorePath, getGitPath } = require('../utils/paths');
 const { DEFAULT_CONFIG, DEFAULT_IGNORE_PATTERNS } = require('../config/defaults');
-const { validateApiKey } = require('../core/gemini');
+const gemini = require('../core/gemini');
+const grok = require('../core/grok');
 
 function askQuestion(query) {
   if (!process.stdin.isTTY) {
@@ -137,17 +138,27 @@ async function initRepo() {
     const useTeamMode = teamMode.toLowerCase() === 'y';
 
     // Phase 3: AI Configuration
-    const enableAI = await askQuestion('Enable AI commit messages (Gemini)? [y/N]: ');
+    const enableAI = await askQuestion('Enable AI commit messages? [y/N]: ');
     let useAI = enableAI.toLowerCase() === 'y';
     
     let apiKey = '';
+    let grokApiKey = '';
+    let provider = 'gemini';
     let interactive = false;
     
     if (useAI) {
+      // Select Provider
+      const providerAns = await askQuestion('Select AI Provider (gemini/grok) [gemini]: ');
+      provider = providerAns.toLowerCase() === 'grok' ? 'grok' : 'gemini';
+      
       while (true) {
-        apiKey = await askQuestion('Enter your Google Gemini API Key: ');
+        const keyPrompt = provider === 'grok' 
+          ? 'Enter your xAI Grok API Key: ' 
+          : 'Enter your Google Gemini API Key: ';
+          
+        const keyInput = await askQuestion(keyPrompt);
         
-        if (!apiKey) {
+        if (!keyInput) {
            logger.warn('API Key cannot be empty if AI is enabled.');
            const retry = await askQuestion('Try again? (n to disable AI) [Y/n]: ');
            if (retry.toLowerCase() === 'n') {
@@ -157,11 +168,18 @@ async function initRepo() {
            continue;
         }
 
-        logger.info('Verifying API Key...');
-        const result = await validateApiKey(apiKey);
+        logger.info(`Verifying ${provider} API Key...`);
+        let result;
+        if (provider === 'grok') {
+          result = await grok.validateGrokApiKey(keyInput);
+        } else {
+          result = await gemini.validateApiKey(keyInput);
+        }
         
         if (result.valid) {
           logger.success('API Key verified successfully! ✨');
+          if (provider === 'grok') grokApiKey = keyInput;
+          else apiKey = keyInput;
           break;
         } else {
           logger.warn(`API Key validation failed: ${result.error}`);
@@ -173,6 +191,8 @@ async function initRepo() {
             break;
           } else if (choice === 'p') {
             logger.warn('Proceeding with potentially invalid API key.');
+            if (provider === 'grok') grokApiKey = keyInput;
+            else apiKey = keyInput;
             break;
           }
           // Default is retry (loop)
@@ -189,8 +209,10 @@ async function initRepo() {
       teamMode: useTeamMode,
       ai: {
         enabled: useAI,
+        provider: provider,
         apiKey: apiKey,
-        model: 'gemini-2.5-flash',
+        grokApiKey: grokApiKey,
+        model: provider === 'grok' ? 'grok-beta' : 'gemini-2.5-flash',
         interactive: interactive
       },
       commitMessageMode: useAI ? 'ai' : 'smart'

package/src/commands/insights.js

@@ -7,47 +7,87 @@ const { createObjectCsvWriter } = require('csv-writer');
 async function getGitStats(repoPath) {
   try {
     // Get commit log with stats
-    // Format: hash|author|date|subject|body
+    // We use custom delimiters to safely parse multi-line bodies and stats
     const { stdout } = await git.runGit(repoPath, [
       'log',
-      '--pretty=format:%H|%an|%ad|%s',
+      '--pretty=format:====COMMIT====%n%H|%an|%ad|%s|%b%n====BODY_END====',
       '--date=iso',
       '--numstat'
     ]);
 
-    const lines = stdout.split('\n');
     const commits = [];
-    let currentCommit = null;
-
-    // Parse git log output
-    for (const line of lines) {
-      if (!line.trim()) continue;
-
-      // Check if line is a commit header (hash|author|date|subject)
-      // Hashes are 40 chars hex.
-      const parts = line.split('|');
-      if (parts.length >= 4 && /^[0-9a-f]{40}$/.test(parts[0])) {
-        if (currentCommit) commits.push(currentCommit);
-        currentCommit = {
-          hash: parts[0],
-          author: parts[1],
-          date: new Date(parts[2]),
-          message: parts.slice(3).join('|'),
-          files: [],
-          additions: 0,
-          deletions: 0
-        };
-      } else if (currentCommit && /^\d+\s+\d+\s+/.test(line)) {
-        // Stat line: "10  5   src/file.js"
-        const [add, del, file] = line.split(/\s+/);
-        const additions = parseInt(add) || 0;
-        const deletions = parseInt(del) || 0;
-        currentCommit.files.push({ file, additions, deletions });
-        currentCommit.additions += additions;
-        currentCommit.deletions += deletions;
+    const rawCommits = stdout.split('====COMMIT====');
+
+    for (const raw of rawCommits) {
+      if (!raw.trim()) continue;
+
+      const [metadataPart, statsPart] = raw.split('====BODY_END====');
+      if (!metadataPart) continue;
+
+      const lines = metadataPart.trim().split('\n');
+      const header = lines[0]; // hash|author|date|subject|body_start...
+      // The body might continue on next lines if %b has newlines.
+      // Actually, my format puts %b starting on the first line.
+      // But let's be safer: split header by | first 4 times only.
+      
+      // header format: hash|author|date|subject|rest...
+      // But wait, if body has newlines, "lines" array has them.
+      
+      // Let's reconstruct the full message body
+      const fullMetadata = metadataPart.trim();
+      const firstPipe = fullMetadata.indexOf('|');
+      const secondPipe = fullMetadata.indexOf('|', firstPipe + 1);
+      const thirdPipe = fullMetadata.indexOf('|', secondPipe + 1);
+      const fourthPipe = fullMetadata.indexOf('|', thirdPipe + 1);
+      
+      if (firstPipe === -1 || fourthPipe === -1) continue;
+
+      const hash = fullMetadata.substring(0, firstPipe);
+      const author = fullMetadata.substring(firstPipe + 1, secondPipe);
+      const dateStr = fullMetadata.substring(secondPipe + 1, thirdPipe);
+      const subject = fullMetadata.substring(thirdPipe + 1, fourthPipe);
+      const body = fullMetadata.substring(fourthPipe + 1);
+
+      // TRUST VERIFICATION
+      // Check for Autopilot trailers
+      if (!body.includes('Autopilot-Commit: true')) {
+        continue; // Skip non-autopilot commits
       }
+
+      // TODO: Verify Signature (Optional but recommended for strict mode)
+      // const signature = extractTrailer(body, 'Autopilot-Signature');
+      // if (!verifySignature(signature, ...)) continue;
+
+      const commit = {
+        hash,
+        author,
+        date: new Date(dateStr),
+        message: subject + '\n' + body,
+        files: [],
+        additions: 0,
+        deletions: 0
+      };
+
+      // Parse Stats
+      if (statsPart) {
+        const statLines = statsPart.trim().split('\n');
+        for (const statLine of statLines) {
+          if (!statLine.trim()) continue;
+          const parts = statLine.split(/\s+/);
+          if (parts.length >= 3) {
+            const additions = parseInt(parts[0]) || 0;
+            const deletions = parseInt(parts[1]) || 0;
+            const file = parts.slice(2).join(' '); // handle spaces in filenames
+            
+            commit.files.push({ file, additions, deletions });
+            commit.additions += additions;
+            commit.deletions += deletions;
+          }
+        }
+      }
+
+      commits.push(commit);
     }
-    if (currentCommit) commits.push(currentCommit);
 
     return commits;
   } catch (error) {

package/src/commands/leaderboard.js

@@ -1,10 +1,40 @@
+const fs = require('fs-extra');
+const path = require('path');
 const { getGitStats, calculateMetrics } = require('./insights');
 const logger = require('../utils/logger');
 const open = require('open');
+const crypto = require('crypto');
 
 // Default API URL (can be overridden by config)
 const DEFAULT_API_URL = 'http://localhost:3000';
 
+async function calculateFocusTime(repoPath) {
+  const logPath = path.join(repoPath, 'autopilot.log');
+  if (!await fs.pathExists(logPath)) return 0;
+
+  try {
+    const content = await fs.readFile(logPath, 'utf8');
+    const lines = content.split('\n').filter(l => l.trim());
+    let totalMs = 0;
+    
+    for (const line of lines) {
+      try {
+        const entry = JSON.parse(line);
+        if (entry.type === 'FOCUS_SESSION_END' && entry.totalActiveMs) {
+          totalMs += entry.totalActiveMs;
+        }
+      } catch (e) {
+        // ignore bad lines
+      }
+    }
+    
+    return Math.round(totalMs / 60000); // minutes
+  } catch (error) {
+    logger.warn(`Failed to parse autopilot.log: ${error.message}`);
+    return 0;
+  }
+}
+
 async function leaderboard(options) {
   const apiUrl = process.env.AUTOPILOT_API_URL || DEFAULT_API_URL;
 
@@ -12,6 +42,7 @@ async function leaderboard(options) {
     await syncLeaderboard(apiUrl, options);
   } else {
     logger.info(`Opening leaderboard at ${apiUrl}/leaderboard...`);
+    const { default: open } = await import('open');
     await open(`${apiUrl}/leaderboard`);
   }
 }
@@ -34,19 +65,28 @@ async function syncLeaderboard(apiUrl, options) {
     const { stdout: username } = await git.runGit(repoPath, ['config', 'user.name']);
     const { stdout: email } = await git.runGit(repoPath, ['config', 'user.email']);
     
+    const userEmail = email.trim() || 'unknown';
+    const userName = username.trim() || 'Anonymous';
+    
+    // Anonymize ID using hash
+    const userId = crypto.createHash('sha256').update(userEmail).digest('hex').substring(0, 12);
+
+    // Get focus time from logs (or fallback to git stats proxy)
+    const logFocusMinutes = await calculateFocusTime(repoPath);
+    const gitFocusMinutes = Math.round(metrics.totalAdditions / 10);
+    const focusMinutes = logFocusMinutes > 0 ? logFocusMinutes : gitFocusMinutes;
+
     const stats = {
-      id: email.trim() || username.trim() || 'unknown_user', // Simple ID generation
-      username: username.trim() || 'Anonymous',
+      id: userId,
+      username: userName, // Display name (can be public)
       score: metrics.quality.score * 100 + metrics.totalCommits * 10, // Example scoring
       commits: metrics.totalCommits,
-      focusMinutes: Math.round(metrics.totalAdditions / 10), // Rough proxy if focus engine not linked
+      focusMinutes: focusMinutes,
       streak: metrics.streak.current
     };
 
-    // If Focus Engine logs exist, use them for more accurate focus time
-    // TODO: Read autopilot.log for accurate focus time
-
-    logger.info(`Syncing stats for ${stats.username}...`);
+    logger.info(`Syncing stats for ${stats.username} (ID: ${userId})...`);
+    logger.info('Note: Only metrics are shared. No code or file contents are transmitted.');
     
     const response = await fetch(`${apiUrl}/api/leaderboard/sync`, {
       method: 'POST',

package/src/config/defaults.js

@@ -13,8 +13,11 @@ const DEFAULT_CONFIG = {
   commitMessageMode: 'smart', // smart | simple | ai
   ai: {
     enabled: false,
-    apiKey: '', // Store in env var or secure config
-    model: 'gemini-2.5-flash',
+    provider: 'gemini', // gemini | grok
+    apiKey: '', 
+    grokApiKey: '',
+    model: 'gemini-2.5-flash', // default for gemini
+    grokModel: 'grok-beta', // default for grok
     interactive: true
   },
   // Phase 1: Team Mode

package/src/config/ignore.js

@@ -79,20 +79,20 @@ const createIgnoredFilter = (repoPath, userPatterns = []) => {
   ];
 
   return (absolutePath) => {
-    // 1. Normalize paths
-    const normalizedAbs = normalizePath(absolutePath);
+    // 1. Get relative path safely using path.relative
+    // This handles Windows casing and separators correctly
+    const relativeRaw = path.relative(repoPath, absolutePath);
     
-    // 2. Get relative path
-    let relativePath = normalizedAbs;
-    if (normalizedAbs.startsWith(normalizedRepoPath)) {
-      relativePath = normalizedAbs.slice(normalizedRepoPath.length);
-      if (relativePath.startsWith('/')) {
-        relativePath = relativePath.slice(1);
-      }
+    // If outside repo, ignore (or handle differently? Chokidar usually stays inside)
+    if (relativeRaw.startsWith('..') || path.isAbsolute(relativeRaw)) {
+        return false;
     }
 
+    // Normalize to forward slashes for matching
+    const relativePath = normalizePath(relativeRaw);
+
     // Handle root path case
-    if (!relativePath) return false;
+    if (!relativePath || relativePath === '.') return false;
 
     // 3. Check critical matches
     const parts = relativePath.split('/');