🚀 UPDATE: v0.2.5

Merge pull request #13 from warengonzaga/dev

Author: warengonzaga

.gitignore

@@ -14,3 +14,10 @@ dist
 ## env
 .env
 .env.*
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*

package.json

@@ -1,13 +1,15 @@
 {
 	"name": "magicc",
-	"version": "0.2.1",
+	"version": "0.2.5",
 	"author": "Waren Gonzaga",
 	"description": "You can do `magicc`, you can build anything that you desire.",
 	"keywords": [
+		"magic",
 		"magicc",
 		"openai",
 		"git",
 		"commit",
+		"message",
 		"tool",
 		"ai",
 		"cli"
@@ -21,11 +23,14 @@
 	"scripts": {
 		"build": "babel --out-dir=dist source",
 		"dev": "babel --out-dir=dist --watch source",
-		"clean": "rm -rf dist",
-		"setup": "npm run setup:ubuntu",
-		"setup:ubuntu": "npm run clean && npm run build && npm i -g .",
-		"reset": "npm run reset:ubuntu",
-		"reset:ubuntu": "npm uninstall -g magicc && npm run setup:ubuntu",
+		"clean":"npm run clean:linux",
+		"clean:linux": "rm -rf dist",
+    "clean:windows": "rmdir /s /q dist",
+		"setup": "npm run setup:linux",
+		"setup:linux": "npm run clean:linux && npm run build && npm i -g .",
+		"setup:windows":"npm run clean:windows && npm run build",
+		"reset": "npm run reset:linux",
+		"reset:linux": "npm uninstall -g magicc && npm run setup:linux",
 		"test": "prettier --check . && xo && ava"
 	},
 	"files": [
@@ -38,6 +43,7 @@
 		"ink": "^4.1.0",
 		"ink-big-text": "^2.0.0",
 		"ink-gradient": "^3.0.0",
+		"ink-select-input": "^6.0.0",
 		"is-git-repository": "^2.0.0",
 		"meow": "^11.0.0",
 		"openai": "^4.28.4",

source/cli.js

@@ -1,35 +1,61 @@
-import generatePrompt from "./openai.js";
+import generatePrompt from './openai.js';
 import {execa} from 'execa';
-import readline from "readline";
+import readline from 'readline';
+import React from 'react';
+import {Box, render, Text, useApp} from 'ink';
+import SelectInput from 'ink-select-input';
 
 async function askForCommitMessage() {
-  const prompt = await generatePrompt();
+	const prompt = await generatePrompt();
 
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
+	const rl = readline.createInterface({
+		input: process.stdin,
+		output: process.stdout,
+	});
 
-  if (prompt) {
-    rl.question(`Suggested commit message: ${prompt}\nDo you want to proceed? (y/N) `, (answer) => {
-      if (answer.toLowerCase() === "y") {
-        execa("git", ["commit", "-m", prompt])
-          .then(() => {
-            console.log("Changes committed successfully!");
-          })
-          .catch((error) => {
-            console.error("Failed to commit changes:", error);
-          });
-      } else {
-        console.log("Changes not committed.");
-      }
+	const SelectSuggestedCommit = () => {
+		const {exit} = useApp();
+		const handleSelect = item => {
+			if (item.value) {
+				execa('git', ['commit', '-m', prompt])
+					.then(() => {
+						console.log('Changes committed successfully!');
+					})
+					.catch(error => {
+						console.error('Failed to commit changes:', error);
+					});
+			} 
+			else {
+				console.log('Changes not committed.');
+			}
+			exit();
+		};
 
-      rl.close();
-    });
-  } else {
-    console.log("No changes to commit...");
-    rl.close();
-  }
+		const items = [
+			{
+				label: 'No',
+				value: false,
+			},
+			{
+				label: 'Yes',
+				value: true,
+			},
+		];
+
+		return (
+			<Box flexDirection="column">
+				<Text>{`Suggested commit message: ${prompt}\nDo you want to proceed?`}</Text>
+				<SelectInput items={items} onSelect={handleSelect} />
+			</Box>
+		);
+	};
+	
+	if (prompt) {
+		render(<SelectSuggestedCommit />);
+	} else {
+		console.log('No changes to commit...');
+		rl.close();
+	}
 }
 
-export default askForCommitMessage;
+export default askForCommitMessage;

source/utils/commit.js

@@ -3,4 +3,4 @@
   "message": "You are the author of the changes, you are going to provide a professional git commit message that is no longer than 25 characters in imperative present tense. Stricly no emojis are allowed and no conventional commit message as prefix is already provided. For example, instead of 'fix: fix a bug' make it 'fix a bug'. The message should be in lower case and no period at the end.",
   "default_model": "gpt-4o-mini",
   "maxDiffSize": 4000
-}
+}

source/utils/config.json

@@ -67,7 +67,7 @@ async function generatePrompt() {
 
 	if (gitDiffContent.length > maxDiffSize) {
 		console.log('Diff content is too large. Skipping OpenAI request.');
-		return `✨ tweak: update ${firstFilePath}`;
+		return `✨ tweak (${firstFilePath}): update ${firstFilePath}`;
 	}
 
 	// use the prompt from the config file emoji and send to openai
@@ -88,7 +88,7 @@ async function generatePrompt() {
 	});
 
 	if (await gitStatus() !== false) {
-		return `${category.choices[0].message.content}: ${message.choices[0].message.content}`;
+		return `${category.choices[0].message.content} (${firstFilePath}): ${message.choices[0].message.content}`;
 	} else {
 		return false;
 	}