@traisetech/autopilot 2.0.1 → 2.1.1

package/package.json

@@ -1,69 +1,69 @@
-{
-  "name": "@traisetech/autopilot",
-  "version": "2.0.1",
-  "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.1",
+  "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';
@@ -10,6 +10,7 @@ import git from '../core/git.js';
 import HistoryManager from '../core/history.js';
 import processUtils from '../utils/process.js';
 
+const { useState, useEffect } = React;
 const { getRunningPid } = processUtils;
 
 const e = React.createElement;
@@ -18,7 +19,7 @@ const e = React.createElement;
 const Dashboard = () => {
   const { exit } = useApp();
   const root = process.cwd();
-  
+
   const [status, setStatus] = useState('loading');
   const [pid, setPid] = useState(null);
   const [lastCommit, setLastCommit] = useState(null);
@@ -33,18 +34,18 @@ const Dashboard = () => {
         // 1. Check process status
         const currentPid = await getRunningPid(root);
         setPid(currentPid);
-        
+
         // 2. Check Paused State
         const stateManager = new StateManager(root);
         if (stateManager.isPaused()) {
-           setStatus('paused');
-           setPausedState(stateManager.getState());
+          setStatus('paused');
+          setPausedState(stateManager.getState());
         } else if (currentPid) {
-           setStatus('running');
-           setPausedState(null);
+          setStatus('running');
+          setPausedState(null);
         } else {
-           setStatus('stopped');
-           setPausedState(null);
+          setStatus('stopped');
+          setPausedState(null);
         }
 
         // 3. Last Commit
@@ -55,7 +56,7 @@ const Dashboard = () => {
         // 4. Pending Files
         const statusObj = await git.getPorcelainStatus(root);
         if (statusObj.ok) {
-           setPendingFiles(statusObj.files);
+          setPendingFiles(statusObj.files);
         }
 
         // 5. Today Stats (Simple count from history)
@@ -124,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, idx) =>
+            e(Text, { key: `${f.file}-${idx}`, color: "yellow" }, ` ${f.status} ${f.file}`)
+          )
+      ),
       pendingFiles.length > 5 && e(Text, { color: "gray" }, ` ...and ${pendingFiles.length - 5} more`)
     ),
 
@@ -140,5 +143,9 @@ const Dashboard = () => {
 };
 
 export default function runDashboard() {
+  if (!process.stdin.isTTY && !process.env.AUTOPILOT_TEST_MODE) {
+    console.error('Error: Dashboard requires an interactive terminal (TTY).');
+    process.exit(1);
+  }
   render(e(Dashboard));
 }

package/src/commands/doctor.js

@@ -13,7 +13,7 @@ const git = require('../core/git');
 const doctor = async () => {
   const repoPath = process.cwd();
   let issues = 0;
-  
+
   logger.section('Autopilot Doctor');
   logger.info('Diagnosing environment...');
 
@@ -50,7 +50,17 @@ const doctor = async () => {
 
     // Check remote type
     if (remoteUrl.startsWith('http')) {
-      logger.warn('Remote uses HTTPS. Ensure credential helper is configured for non-interactive push.');
+      let hasHelper = false;
+      try {
+        const { stdout: helper } = await execa('git', ['config', '--get', 'credential.helper'], { cwd: repoPath });
+        if (helper.trim()) hasHelper = true;
+      } catch (e) { /* ignore */ }
+
+      if (hasHelper) {
+        logger.success('Remote uses HTTPS with credential helper configured.');
+      } else {
+        logger.warn('Remote uses HTTPS. Ensure credential helper is configured for non-interactive push.');
+      }
     } else if (remoteUrl.startsWith('git@') || remoteUrl.startsWith('ssh://')) {
       logger.success('Remote uses SSH (recommended).');
     } else {
@@ -102,8 +112,8 @@ const doctor = async () => {
         logger.success('Branch is up to date with remote.');
       }
     } else {
-       // Could be no upstream configured, which is fine for local-only initially
-       logger.info('Could not check remote status (upstream might not be set).');
+      // Could be no upstream configured, which is fine for local-only initially
+      logger.info('Could not check remote status (upstream might not be set).');
     }
   } catch (error) {
     logger.info('Skipping remote status check.');

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

@@ -6,48 +6,54 @@ const { createObjectCsvWriter } = require('csv-writer');
 
 async function getGitStats(repoPath) {
   try {
-    // Get commit log with stats
-    // Format: hash|author|date|subject|body
     const { stdout } = await git.runGit(repoPath, [
       'log',
-      '--pretty=format:%H|%an|%ad|%s',
+      '--pretty=format:===C===%H|%an|%ad|%s|%b===E===',
       '--date=iso',
       '--numstat'
     ]);
 
-    const lines = stdout.split('\n');
+    if (!stdout) return [];
+
     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('===C===').filter(Boolean);
+
+    for (const raw of rawCommits) {
+      const [metadataPlusBody, ...statsParts] = raw.split('===E===');
+      if (!metadataPlusBody) continue;
+
+      const [hash, author, dateStr, subject, ...bodyParts] = metadataPlusBody.trim().split('|');
+      const body = bodyParts.join('|'); // Rejoin in case body had pipes
+
+      // Trust Verification: Only process autopilot commits
+      if (!body.includes('Autopilot-Commit: true')) continue;
+
+      const commit = {
+        hash,
+        author,
+        date: new Date(dateStr),
+        message: `${subject}\n${body}`.trim(),
+        files: [],
+        additions: 0,
+        deletions: 0
+      };
+
+      const statsText = statsParts.join('===E===').trim();
+      if (statsText) {
+        const statLines = statsText.split('\n');
+        for (const line of statLines) {
+          const [add, del, file] = line.trim().split(/\s+/);
+          if (file) {
+            const additions = parseInt(add) || 0;
+            const deletions = parseInt(del) || 0;
+            commit.files.push({ file, additions, deletions });
+            commit.additions += additions;
+            commit.deletions += deletions;
+          }
+        }
       }
+      commits.push(commit);
     }
-    if (currentCommit) commits.push(currentCommit);
 
     return commits;
   } catch (error) {
@@ -90,7 +96,7 @@ function calculateMetrics(commits) {
     // Time analysis
     const dateStr = c.date.toISOString().split('T')[0];
     const hour = c.date.getHours();
-    
+
     stats.commitsByDay[dateStr] = (stats.commitsByDay[dateStr] || 0) + 1;
     stats.commitsByHour[hour] = (stats.commitsByHour[hour] || 0) + 1;
     dates.add(dateStr);
@@ -105,7 +111,7 @@ function calculateMetrics(commits) {
   // Calculate Averages
   stats.totalFilesCount = stats.totalFilesChanged.size;
   stats.quality.avgLength = commits.length ? Math.round(totalMessageLength / commits.length) : 0;
-  
+
   // Calculate Score (0-100)
   // 40% Conventional, 30% Message Length (>30 chars), 30% Consistency
   const convScore = commits.length ? (stats.quality.conventional / commits.length) * 40 : 0;
@@ -125,7 +131,7 @@ function calculateMetrics(commits) {
       currentStreak = 1;
     } else {
       const diffTime = Math.abs(d - lastDate);
-      const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)); 
+      const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
       if (diffDays === 1) {
         currentStreak++;
       } else {
@@ -136,12 +142,12 @@ function calculateMetrics(commits) {
     lastDate = d;
   });
   stats.streak.max = Math.max(maxStreak, currentStreak);
-  
+
   // Check if streak is active (last commit today or yesterday)
   const today = new Date().toISOString().split('T')[0];
   const yesterday = new Date(Date.now() - 86400000).toISOString().split('T')[0];
   const lastCommitDate = sortedDates[sortedDates.length - 1];
-  
+
   if (lastCommitDate === today || lastCommitDate === yesterday) {
     stats.streak.current = currentStreak;
   } else {
@@ -177,10 +183,10 @@ async function insights(options) {
     console.log(`Lines Added:      ${metrics.totalAdditions}`);
     console.log(`Lines Deleted:    ${metrics.totalDeletions}`);
     console.log(`Current Streak:   ${metrics.streak.current} days (Max: ${metrics.streak.max})`);
-    
+
     // Find most productive hour
     const productiveHour = Object.entries(metrics.commitsByHour)
-      .sort(([,a], [,b]) => b - a)[0];
+      .sort(([, a], [, b]) => b - a)[0];
     console.log(`Peak Productivity: ${productiveHour ? productiveHour[0] + ':00' : 'N/A'}`);
 
     console.log('');
@@ -201,12 +207,12 @@ async function insights(options) {
       const csvWriter = createObjectCsvWriter({
         path: csvPath,
         header: [
-          {id: 'hash', title: 'Hash'},
-          {id: 'date', title: 'Date'},
-          {id: 'author', title: 'Author'},
-          {id: 'message', title: 'Message'},
-          {id: 'additions', title: 'Additions'},
-          {id: 'deletions', title: 'Deletions'}
+          { id: 'hash', title: 'Hash' },
+          { id: 'date', title: 'Date' },
+          { id: 'author', title: 'Author' },
+          { id: 'message', title: 'Message' },
+          { id: 'additions', title: 'Additions' },
+          { id: 'deletions', title: 'Deletions' }
         ]
       });