gmgauthier/grokkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 23 Wiki Activity

Merge pull request 'fix/markdown_awareness_for_edit' (#7) from fix/markdown_awareness_for_edit into master
All checks were successful
CI / Test (push) Successful in 33s
Details
CI / Lint (push) Successful in 25s
Details
CI / Build (push) Successful in 21s
Details
Release / Create Release (push) Successful in 38s
Details

Browse Source 
Reviewed-on: #7
This commit is contained in:
Greg Gauthier 2026-03-30 13:05:09 +00:00
commit 1e495551e7
2 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cmd/analyze.go
View File

@ -14,7 +14,7 @@ import (
"gmgauthier.com/grokkit/internal/git"
"gmgauthier.com/grokkit/internal/grok"
"gmgauthier.com/grokkit/internal/linter"
"gmgauthier.com/grokkit/internal/logger" // note: we use package-level funcs
"gmgauthier.com/grokkit/internal/logger"
"gmgauthier.com/grokkit/internal/prompts"
)
@ -30,22 +30,15 @@ Uses language-specific prompts discovered in .grokkit/prompts/ or ~/.config/grok
}
output := viper.GetString("output")
if output == "" {
// Default to project-local context file inside .grokkit/
output = filepath.Join(".grokkit", "analysis.md")
}
// Fixed: config.GetModel takes (commandName, flagModel)
model := config.GetModel("analyze", viper.GetString("model"))
yes := viper.GetBool("yes")
// Logger (use the package-level logger as done in other commands)
// (remove the old "log := logger.Get()")
// Safety check
if !git.IsRepo() { // IsRepo takes no arguments
if !git.IsRepo() {
logger.Warn("Not inside a git repository. Git metadata in report will be limited.")
}
// 1. Discover source files
files, err := discoverSourceFiles(dir)
if err != nil {
logger.Error("Failed to discover source files", "dir", dir, "error", err)
@ -56,13 +49,11 @@ Uses language-specific prompts discovered in .grokkit/prompts/ or ~/.config/grok
os.Exit(1)
}
// 2. Detect primary language
lang := linter.DetectPrimaryLanguage(files)
if lang == "" {
lang = "unknown"
}
// 3. Load language-specific prompt (project → global)
promptPath, promptContent, err := prompts.LoadAnalysisPrompt(dir, lang)
if err != nil {
fmt.Printf("Error: Could not find analysis prompt for language '%s'.\n\n", lang)
@ -74,27 +65,21 @@ Uses language-specific prompts discovered in .grokkit/prompts/ or ~/.config/grok
os.Exit(1)
}
logger.Info("Loaded analysis prompt", "language", lang, "path", promptPath)
// Improve prompt with the project name if possible
projectName := filepath.Base(dir)
if projectName == "." {
projectName = "Current Project"
}
promptContent = strings.Replace(promptContent, "[Inferred Project Name]", projectName, 1)
// 4. Build rich project context
context := buildProjectContext(dir, files)
// 5. Call Grok — use the exact working pattern you provided
messages := []map[string]string{
{"role": "system", "content": promptContent},
{"role": "user", "content": fmt.Sprintf("Analyze this %s project and generate the full educational Markdown report now:\n\n%s", lang, context)},
}
// Fixed: NewClient() + Stream() (or StreamSilent if you prefer no live output)
// For a long report, StreamSilent is usually better (no live printing)
report := grok.NewClient().StreamSilent(messages, model)
// 6. Transactional preview + confirmation
if !yes {
fmt.Println("\n=== Proposed Analysis Report Preview (first 60 lines) ===")
previewLines(report, 60)
@ -110,18 +95,15 @@ Uses language-specific prompts discovered in .grokkit/prompts/ or ~/.config/grok
}
}
// 7. Output
if output == "-" {
fmt.Println(report)
return
}
// Ensure .grokkit directory exists
if err := os.MkdirAll(".grokkit", 0755); err != nil {
logger.Error("Failed to create .grokkit directory", "error", err)
os.Exit(1)
}
// Write the file
if err := os.WriteFile(output, []byte(report), 0644); err != nil {
logger.Error("Failed to write report", "file", output, "error", err)
os.Exit(1)
@ -138,8 +120,6 @@ func init() {
analyzeCmd.Flags().BoolP("yes", "y", false, "Skip confirmation prompt")
}
// discoverSourceFiles walks the directory and collects all supported source files.
// It skips common noise directories but DOES descend into cmd/, internal/, etc.
func discoverSourceFiles(root string) ([]string, error) {
var files []string
err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
@ -147,17 +127,15 @@ func discoverSourceFiles(root string) ([]string, error) {
return err
}
// Skip common hidden/noise directories but still allow descent into source dirs
name := info.Name()
if info.IsDir() {
if strings.HasPrefix(name, ".") && name != "." && name != ".." || // skip .git, .grokkit (except we want .grokkit/prompts? but for source we skip)
if strings.HasPrefix(name, ".") && name != "." && name != ".." ||
name == "node_modules" || name == "vendor" || name == "build" || name == "dist" {
return filepath.SkipDir
}
return nil
}
// Check if this is a supported source file
if _, detectErr := linter.DetectLanguage(path); detectErr == nil {
files = append(files, path)
}
@ -166,7 +144,6 @@ func discoverSourceFiles(root string) ([]string, error) {
return files, err
}
// previewLines prints the first N lines of the report (unchanged)
func previewLines(content string, n int) {
scanner := bufio.NewScanner(strings.NewReader(content))
for i := 0; i < n && scanner.Scan(); i++ {
@ -177,11 +154,13 @@ func previewLines(content string, n int) {
}
}
// buildProjectContext — small improvement for better context (optional but nice)
func buildProjectContext(dir string, files []string) string {
var sb strings.Builder
sb.WriteString("Project Root: " + dir + "\n\n")
sb.WriteString(fmt.Sprintf("Total source files discovered: %d\n\n", len(files)))
_, err := fmt.Fprintf(&sb, "Total source files discovered: %d\n\n", len(files))
if err != nil {
return ""
}
sb.WriteString("Key files (top-level view):\n")
for _, f := range files {
@ -194,7 +173,6 @@ func buildProjectContext(dir string, files []string) string {
}
}
// Git remotes
if out, err := git.Run([]string{"remote", "-v"}); err == nil && out != "" {
sb.WriteString("\nGit Remotes:\n" + out + "\n")
}

27
cmd/edit.go
View File

@ -35,7 +35,6 @@ var editCmd = &cobra.Command{
os.Exit(1)
}
// nolint:gosec // intentional file read from user input
original, err := os.ReadFile(filePath)
if err != nil {
logger.Error("failed to read file", "file", filePath, "error", err)
@ -46,14 +45,28 @@ var editCmd = &cobra.Command{
cleanedOriginal := removeLastModifiedComments(string(original))
client := grok.NewClient()
messages := []map[string]string{
isMarkdown := filepath.Ext(filePath) == ".md"
var messages []map[string]string
if isMarkdown {
messages = []map[string]string{
{"role": "system", "content": "You are an expert technical writer. Edit markdown content clearly and concisely. Return only the edited markdown with no explanations, no markdown formatting, no extra text."},
{"role": "user", "content": fmt.Sprintf("File: %s\n\nOriginal content:\n%s\n\nTask: %s", filepath.Base(filePath), cleanedOriginal, instruction)},
}
} else {
messages = []map[string]string{
{"role": "system", "content": "You are an expert programmer. Remove all unnecessary comments including last modified timestamps and ownership comments. Return only the cleaned code with no explanations, no markdown, no extra text."},
{"role": "user", "content": fmt.Sprintf("File: %s\n\nOriginal content:\n%s\n\nTask: %s", filepath.Base(filePath), cleanedOriginal, instruction)},
}
}
color.Yellow("Asking Grok to %s...\n", instruction)
raw := client.StreamSilent(messages, model)
newContent := grok.CleanCodeResponse(raw)
var newContent string
if isMarkdown {
newContent = strings.TrimSpace(raw)
} else {
newContent = grok.CleanCodeResponse(raw)
}
color.Green("✓ Response received")
color.Cyan("\nProposed changes:")
@ -90,13 +103,11 @@ var editCmd = &cobra.Command{
func removeLastModifiedComments(content string) string {
lines := strings.Split(content, "\n")
cleanedLines := make([]string, 0, len(lines))
for _, line := range lines {
if strings.Contains(line, "Last modified") {
continue
}
trimmed := strings.TrimSpace(line)
if !strings.Contains(strings.ToLower(trimmed), "last modified") {
cleanedLines = append(cleanedLines, line)
}
}
return strings.Join(cleanedLines, "\n")
}