chore: quick update feat/genai at 2025-12-29 23:45:52

Author: kooksee

.goreleaser.yaml

@@ -13,10 +13,10 @@ builds:
       - "linux_amd64"
       - "linux_arm64"
     ldflags:
-      - -X 'github.com/pubgo/funk/version.version=v{{ .Version }}'
-      - -X 'github.com/pubgo/funk/version.project=fastcommit'
-      - -X 'github.com/pubgo/funk/version.buildTime={{ .CommitDate }}'
-      - -X 'github.com/pubgo/funk/version.commitID={{ .ShortCommit }}'
+      - -X 'github.com/pubgo/funk/v2/buildinfo.version=v{{ .Version }}'
+      - -X 'github.com/pubgo/funk/v2/buildinfo.project=fastcommit'
+      - -X 'github.com/pubgo/funk/v2/buildinfo.buildTime={{ .CommitDate }}'
+      - -X 'github.com/pubgo/funk/v2/buildinfo.commitID={{ .ShortCommit }}'
     flags:
       - -trimpath
       - -tags=releaser

.version

@@ -0,0 +1 @@
+v0.0.9

.version/VERSION

@@ -9,4 +9,3 @@ agentic git commit generate tool
 - OPENAI_API_KEY
 - OPENAI_BASE_URL, default: https://api.deepseek.com/v1
 - OPENAI_MODEL, default: deepseek-chat
-

Makefile

@@ -1,44 +1,80 @@
 package bootstrap
 
 import (
-	"log/slog"
+	"context"
+	"fmt"
+	"os"
 
 	_ "github.com/adrg/xdg"
 	_ "github.com/charmbracelet/bubbletea"
-	"github.com/pubgo/dix"
-	"github.com/pubgo/funk/config"
-	"github.com/pubgo/funk/log"
-	"github.com/pubgo/funk/recovery"
-	_ "github.com/sashabaranov/go-openai"
-
+	"github.com/charmbracelet/x/term"
+	"github.com/pubgo/dix/v2"
+	"github.com/pubgo/dix/v2/dixcontext"
 	"github.com/pubgo/fastcommit/cmds/configcmd"
-	"github.com/pubgo/fastcommit/cmds/envcmd"
-	"github.com/pubgo/fastcommit/cmds/fastcommit"
+	"github.com/pubgo/fastcommit/cmds/fastcommitcmd"
 	"github.com/pubgo/fastcommit/cmds/historycmd"
+	"github.com/pubgo/fastcommit/cmds/pullcmd"
 	"github.com/pubgo/fastcommit/cmds/tagcmd"
 	"github.com/pubgo/fastcommit/cmds/upgradecmd"
 	"github.com/pubgo/fastcommit/cmds/versioncmd"
-	"github.com/pubgo/fastcommit/configs"
 	"github.com/pubgo/fastcommit/utils"
+	"github.com/pubgo/funk/v2/assert"
+	"github.com/pubgo/funk/v2/config"
+	"github.com/pubgo/funk/v2/errors"
+	"github.com/pubgo/funk/v2/log"
+	"github.com/pubgo/funk/v2/recovery"
+	"github.com/pubgo/redant"
+	_ "github.com/sashabaranov/go-openai"
 )
 
-func Main(ver string) {
-	defer recovery.Exit()
-
-	slog.SetDefault(slog.New(log.NewSlog(log.GetLogger("fastcommit"))))
-
-	initConfig()
-
-	var di = dix.New(dix.WithValuesNull())
-	di.Provide(versioncmd.New)
-	di.Provide(upgradecmd.New)
-	di.Provide(configs.New)
-	di.Provide(tagcmd.New)
-	di.Provide(config.Load[ConfigProvider])
-	di.Provide(utils.NewOpenaiClient)
-	di.Provide(envcmd.New)
-	di.Provide(historycmd.New)
-	di.Provide(fastcommit.New(ver))
-	di.Provide(configcmd.New)
-	di.Inject(func(cmd *fastcommit.Command) { cmd.Run() })
+func Main() {
+	run(
+		versioncmd.New(),
+		upgradecmd.New(),
+		tagcmd.New(),
+		historycmd.New(),
+		fastcommitcmd.New(),
+		configcmd.New(),
+		pullcmd.New(),
+	)
+}
+
+func run(cmds ...*redant.Command) {
+	defer recovery.Exit(func(err error) error {
+		if errors.Is(err, context.Canceled) {
+			return nil
+		}
+
+		if err.Error() == "signal: interrupt" {
+			return nil
+		}
+
+		log.Err(err).Msg("failed to run command")
+		return nil
+	})
+
+	app := &redant.Command{
+		Use:      "fastcommit",
+		Short:    "Intelligent generation of git commit message",
+		Children: cmds,
+		Middleware: func(next redant.HandlerFunc) redant.HandlerFunc {
+			return func(ctx context.Context, i *redant.Invocation) error {
+				if utils.IsHelp() {
+					return redant.DefaultHelpFn()(ctx, i)
+				}
+
+				if !term.IsTerminal(os.Stdin.Fd()) {
+					return fmt.Errorf("stdin is not terminal")
+				}
+
+				initConfig()
+				di := dix.New(dix.WithValuesNull())
+				di.Provide(config.Load[configProvider])
+				di.Provide(utils.NewOpenaiClient)
+				return next(dixcontext.Create(ctx, di), i)
+			}
+		},
+	}
+
+	assert.Must(app.Run(utils.Context()))
 }

README.md

@@ -1,49 +1,65 @@
 package bootstrap
 
 import (
+	"context"
+	"log/slog"
 	"os"
 
-	"github.com/pubgo/dix/dixinternal"
-	"github.com/pubgo/funk/assert"
-	"github.com/pubgo/funk/config"
-	"github.com/pubgo/funk/log"
-	"github.com/pubgo/funk/pathutil"
-	"github.com/rs/zerolog"
+	"github.com/pubgo/funk/v2/assert"
+	"github.com/pubgo/funk/v2/config"
+	"github.com/pubgo/funk/v2/env"
+	"github.com/pubgo/funk/v2/log"
+	"github.com/pubgo/funk/v2/pathutil"
+	"github.com/pubgo/funk/v2/running"
 	"gopkg.in/yaml.v3"
 
+	"github.com/pubgo/fastcommit/cmds/fastcommitcmd"
 	"github.com/pubgo/fastcommit/configs"
 	"github.com/pubgo/fastcommit/utils"
 )
 
-type ConfigProvider struct {
-	Version      *configs.Version    `yaml:"version"`
-	OpenaiConfig *utils.OpenaiConfig `yaml:"openai"`
+type configProvider struct {
+	Version      *configs.Version      `yaml:"version"`
+	OpenaiConfig *utils.OpenaiConfig   `yaml:"openai"`
+	CommitConfig *fastcommitcmd.Config `yaml:"commit"`
 }
 
 func initConfig() {
-	configs.InitEnv()
+	slog.SetDefault(slog.New(log.NewSlog(log.GetLogger(""))))
+	log.SetEnableChecker(func(ctx context.Context, lvl log.Level, name, message string, fields log.Fields) bool {
+		if running.Debug() {
+			return true
+		}
 
-	dixinternal.SetLog(func(logger log.Logger) log.Logger {
-		if configs.IsDebug() {
-			return logger.WithLevel(zerolog.DebugLevel)
+		if name == "dix" || name == "env" || fields["module"] == "env" {
+			return false
 		}
-		return logger.WithLevel(zerolog.InfoLevel)
+		return true
 	})
 
+	env.MustSet("LC_ALL", "C")
+	env.LoadFiles(configs.GetLocalEnvPath()).Must()
+
 	configPath := configs.GetConfigPath()
-	defaultConfigData := configs.GetDefaultConfig()
+	envPath := configs.GetEnvPath()
 	if pathutil.IsNotExist(configPath) {
-		assert.Must(os.WriteFile(configPath, defaultConfigData, 0644))
+		assert.Must(os.WriteFile(configPath, configs.GetDefaultConfig(), 0644))
+		assert.Must(os.WriteFile(envPath, configs.GetEnvConfig(), 0644))
 		return
 	}
 
-	var cfg ConfigProvider
+	type versionConfigProvider struct {
+		Version *configs.Version `yaml:"version"`
+	}
+	var cfg versionConfigProvider
 	config.LoadFromPath(&cfg, configPath)
 
-	var defaultCfg ConfigProvider
+	var defaultCfg versionConfigProvider
+	defaultConfigData := configs.GetDefaultConfig()
 	assert.Must(yaml.Unmarshal(defaultConfigData, &defaultCfg))
 	if cfg.Version == nil || cfg.Version.Name == "" || defaultCfg.Version.Name != cfg.Version.Name {
 		assert.Must(os.WriteFile(configPath, defaultConfigData, 0644))
+		assert.Must(os.WriteFile(envPath, configs.GetEnvConfig(), 0644))
 	}
 
 	config.SetConfigPath(configPath)