diff --git a/cmd/clawdroid/main.go b/cmd/clawdroid/main.go
index db97bf537..8a5178461 100644
--- a/cmd/clawdroid/main.go
+++ b/cmd/clawdroid/main.go
@@ -20,7 +20,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chzyer/readline"
 	"github.com/KarakuriAgent/clawdroid/pkg/agent"
 	"github.com/KarakuriAgent/clawdroid/pkg/bus"
 	"github.com/KarakuriAgent/clawdroid/pkg/channels"
@@ -31,6 +30,7 @@ import (
 	"github.com/KarakuriAgent/clawdroid/pkg/providers"
 	"github.com/KarakuriAgent/clawdroid/pkg/skills"
 	"github.com/KarakuriAgent/clawdroid/pkg/tools"
+	"github.com/chzyer/readline"
 )
 
 //go:generate cp -r ../../workspace .
diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index 8722ba0a0..b966c6fce 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -38,7 +38,7 @@ type AgentLoop struct {
 	model          string
 	maxTokens      int     // Maximum tokens for API response
 	temperature    float64 // Temperature for LLM (0 = not sent)
-	contextWindow  int // Maximum context window size in tokens (for summarization)
+	contextWindow  int     // Maximum context window size in tokens (for summarization)
 	maxIterations  int
 	sessions       *session.SessionManager
 	state          *state.Manager
diff --git a/pkg/channels/discord.go b/pkg/channels/discord.go
index 3aa33e1f4..48e077d37 100644
--- a/pkg/channels/discord.go
+++ b/pkg/channels/discord.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/bwmarrin/discordgo"
 	"github.com/KarakuriAgent/clawdroid/pkg/bus"
 	"github.com/KarakuriAgent/clawdroid/pkg/config"
 	"github.com/KarakuriAgent/clawdroid/pkg/logger"
 	"github.com/KarakuriAgent/clawdroid/pkg/utils"
+	"github.com/bwmarrin/discordgo"
 )
 
 const (
@@ -20,9 +20,9 @@ const (
 
 type DiscordChannel struct {
 	*BaseChannel
-	session     *discordgo.Session
-	config config.DiscordConfig
-	ctx    context.Context
+	session *discordgo.Session
+	config  config.DiscordConfig
+	ctx     context.Context
 }
 
 func NewDiscordChannel(cfg config.DiscordConfig, bus *bus.MessageBus) (*DiscordChannel, error) {
@@ -36,8 +36,8 @@ func NewDiscordChannel(cfg config.DiscordConfig, bus *bus.MessageBus) (*DiscordC
 	return &DiscordChannel{
 		BaseChannel: base,
 		session:     session,
-		config: cfg,
-		ctx:    context.Background(),
+		config:      cfg,
+		ctx:         context.Background(),
 	}, nil
 }
 
diff --git a/pkg/channels/slack.go b/pkg/channels/slack.go
index c357f5caf..a2200c0fe 100644
--- a/pkg/channels/slack.go
+++ b/pkg/channels/slack.go
@@ -22,8 +22,8 @@ type SlackChannel struct {
 	config       config.SlackConfig
 	api          *slack.Client
 	socketClient *socketmode.Client
-	botUserID string
-	ctx       context.Context
+	botUserID    string
+	ctx          context.Context
 	cancel       context.CancelFunc
 	pendingAcks  sync.Map
 }
diff --git a/pkg/channels/telegram_commands.go b/pkg/channels/telegram_commands.go
index cbe9544bc..ea512100a 100644
--- a/pkg/channels/telegram_commands.go
+++ b/pkg/channels/telegram_commands.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mymmrac/telego"
 	"github.com/KarakuriAgent/clawdroid/pkg/config"
+	"github.com/mymmrac/telego"
 )
 
 type TelegramCommander interface {
diff --git a/pkg/channels/websocket.go b/pkg/channels/websocket.go
index 288aa6cac..b25de2016 100644
--- a/pkg/channels/websocket.go
+++ b/pkg/channels/websocket.go
@@ -7,13 +7,13 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/google/uuid"
-	"github.com/gorilla/websocket"
 	"github.com/KarakuriAgent/clawdroid/pkg/broadcast"
 	"github.com/KarakuriAgent/clawdroid/pkg/bus"
 	"github.com/KarakuriAgent/clawdroid/pkg/config"
 	"github.com/KarakuriAgent/clawdroid/pkg/logger"
 	"github.com/KarakuriAgent/clawdroid/pkg/tools"
+	"github.com/google/uuid"
+	"github.com/gorilla/websocket"
 )
 
 // wsIncoming is the JSON message sent from APK to clawdroid.
diff --git a/pkg/mcp/manager.go b/pkg/mcp/manager.go
index 198490a81..f8a846621 100644
--- a/pkg/mcp/manager.go
+++ b/pkg/mcp/manager.go
@@ -11,9 +11,9 @@ import (
 	"sync"
 	"time"
 
-	sdkmcp "github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/KarakuriAgent/clawdroid/pkg/config"
 	"github.com/KarakuriAgent/clawdroid/pkg/logger"
+	sdkmcp "github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 // ServerInstance manages a connected MCP server session.
diff --git a/pkg/tools/subagent.go b/pkg/tools/subagent.go
index 876e6e1a4..159ac0859 100644
--- a/pkg/tools/subagent.go
+++ b/pkg/tools/subagent.go
@@ -131,7 +131,7 @@ After completing the task, provide a clear summary of what was done.`
 		Tools:         tools,
 		MaxIterations: maxIter,
 		LLMOptions: map[string]any{
-			"max_tokens":  4096,
+			"max_tokens": 4096,
 		},
 	}, messages, task.OriginChannel, task.OriginChatID)
 
@@ -288,7 +288,7 @@ func (t *SubagentTool) Execute(ctx context.Context, args map[string]interface{})
 		Tools:         tools,
 		MaxIterations: maxIter,
 		LLMOptions: map[string]any{
-			"max_tokens":  4096,
+			"max_tokens": 4096,
 		},
 	}, messages, t.originChannel, t.originChatID)
 
diff --git a/pkg/utils/media.go b/pkg/utils/media.go
index 71b42e646..bcebc661b 100644
--- a/pkg/utils/media.go
+++ b/pkg/utils/media.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/KarakuriAgent/clawdroid/pkg/logger"
+	"github.com/google/uuid"
 )
 
 const maxImageFileSize = 50 * 1024 * 1024 // 50MB