Skip to content

refactor: consolidate util packages and simplify bootstrap structure #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ikjeong merged 4 commits into from
Dec 9, 2025
Merged

refactor: consolidate util packages and simplify bootstrap structure #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ba36f6
refactor: consolidate util packages under internal/util
ikjeong Dec 9, 2025
c84815b
refactor: move bootstrap to cmd/sym
ikjeong Dec 9, 2025
bfe683a
chore: remove test-linter
ikjeong Dec 9, 2025
b4d3168
chore: remove CLAUDE.md file
ikjeong Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions CLAUDE.md
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions internal/bootstrap/linters.go → cmd/sym/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bootstrap
package main

import (
// Import linters for registration side-effects.
Expand All @@ -10,7 +10,9 @@ import (
_ "github.com/DevSymphony/sym-cli/internal/linter/prettier"
_ "github.com/DevSymphony/sym-cli/internal/linter/pylint"
_ "github.com/DevSymphony/sym-cli/internal/linter/tsc"
)

// This package only imports linter packages for their init() side-effects.
// Import this package from main.go to ensure all linters are registered.
// Import LLM providers for registration side-effects.
_ "github.com/DevSymphony/sym-cli/internal/llm/claudecode"
_ "github.com/DevSymphony/sym-cli/internal/llm/geminicli"
_ "github.com/DevSymphony/sym-cli/internal/llm/openaiapi"
)
3 changes: 0 additions & 3 deletions cmd/sym/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ package main

import (
"github.com/DevSymphony/sym-cli/internal/cmd"

// Bootstrap: register all adapters
_ "github.com/DevSymphony/sym-cli/internal/bootstrap"
)

// Version is set by build -ldflags "-X main.Version=x.y.z"
Expand Down
123 changes: 0 additions & 123 deletions cmd/test-linter/main.go
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions internal/bootstrap/providers.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion internal/cmd/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"os"
"time"

"github.com/DevSymphony/sym-cli/internal/config"
"github.com/DevSymphony/sym-cli/internal/converter"
"github.com/DevSymphony/sym-cli/internal/llm"
"github.com/DevSymphony/sym-cli/internal/util/config"
"github.com/DevSymphony/sym-cli/pkg/schema"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"os"
"path/filepath"

"github.com/DevSymphony/sym-cli/internal/config"
"github.com/DevSymphony/sym-cli/internal/git"
"github.com/DevSymphony/sym-cli/internal/linter"
"github.com/DevSymphony/sym-cli/internal/policy"
"github.com/DevSymphony/sym-cli/internal/roles"
"github.com/DevSymphony/sym-cli/internal/util/config"
"github.com/DevSymphony/sym-cli/internal/util/git"
"github.com/DevSymphony/sym-cli/pkg/schema"

"github.com/spf13/cobra"
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/llm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"time"

"github.com/AlecAivazis/survey/v2"
"github.com/DevSymphony/sym-cli/internal/config"
"github.com/DevSymphony/sym-cli/internal/envutil"
"github.com/DevSymphony/sym-cli/internal/llm"
"github.com/DevSymphony/sym-cli/internal/util/config"
"github.com/DevSymphony/sym-cli/internal/util/env"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -300,7 +300,7 @@ func promptAndSaveAPIKey(providerName string) error {

// Save to .env file
envPath := config.GetProjectEnvPath()
if err := envutil.SaveKeyToEnvFile(envPath, envVarName, apiKey); err != nil {
if err := env.SaveKeyToEnvFile(envPath, envVarName, apiKey); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"path/filepath"

"github.com/DevSymphony/sym-cli/internal/git"
"github.com/DevSymphony/sym-cli/internal/mcp"
"github.com/DevSymphony/sym-cli/internal/util/git"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

"github.com/DevSymphony/sym-cli/internal/config"
"github.com/DevSymphony/sym-cli/internal/policy"
"github.com/DevSymphony/sym-cli/internal/util/config"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"path/filepath"

"github.com/DevSymphony/sym-cli/internal/git"
"github.com/DevSymphony/sym-cli/internal/llm"
"github.com/DevSymphony/sym-cli/internal/util/git"
"github.com/DevSymphony/sym-cli/internal/validator"
"github.com/DevSymphony/sym-cli/pkg/schema"
"github.com/spf13/cobra"
Expand Down
8 changes: 0 additions & 8 deletions internal/config/README.md
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions internal/git/README.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion internal/linter/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func init() {
### Step 5: Add Import to Bootstrap

```go
// internal/bootstrap/linters.go
// cmd/sym/bootstrap.go
import (
_ "github.com/DevSymphony/sym-cli/internal/linter/mylinter"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/llm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func newProvider(cfg llm.Config) (llm.RawProvider, error) {
### Step 4: Add Import to Bootstrap

```go
// internal/bootstrap/providers.go
// cmd/sym/bootstrap.go
import (
_ "github.com/DevSymphony/sym-cli/internal/llm/myprovider"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/llm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package llm
import (
"fmt"

"github.com/DevSymphony/sym-cli/internal/config"
"github.com/DevSymphony/sym-cli/internal/util/config"
)

// Validate checks if the configuration is valid.
Expand Down
6 changes: 3 additions & 3 deletions internal/llm/openaiapi/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"strings"
"time"

"github.com/DevSymphony/sym-cli/internal/envutil"
"github.com/DevSymphony/sym-cli/internal/llm"
"github.com/DevSymphony/sym-cli/internal/util/env"
)

const (
Expand All @@ -36,7 +36,7 @@ func init() {
Name: providerName,
DisplayName: displayName,
DefaultModel: defaultModel,
Available: envutil.GetAPIKey("OPENAI_API_KEY") != "",
Available: env.GetAPIKey("OPENAI_API_KEY") != "",
Path: "",
Models: []llm.ModelInfo{
{ID: "gpt-4o-mini", DisplayName: "gpt-4o-mini", Description: "Fast and efficient", Recommended: true},
Expand Down Expand Up @@ -67,7 +67,7 @@ var _ llm.RawProvider = (*Provider)(nil)
// Returns ErrAPIKeyRequired if API key is not provided.
func newProvider(cfg llm.Config) (llm.RawProvider, error) {
// Provider handles its own API key loading from env vars and .sym/.env
apiKey := envutil.GetAPIKey("OPENAI_API_KEY")
apiKey := env.GetAPIKey("OPENAI_API_KEY")
if apiKey == "" {
return nil, ErrAPIKeyRequired
}
Expand Down
Loading