diff --git a/internal/agent/common_test.go b/internal/agent/common_test.go
index 6d326ed0e5e3af195fbcbfa16c4165d2156dfc78..c7762e21bff36fabf5bf1557e5ee648f8e1357be 100644
--- a/internal/agent/common_test.go
+++ b/internal/agent/common_test.go
@@ -175,8 +175,15 @@ func coderAgent(r *recorder.Recorder, env fakeEnv, large, small fantasy.Language
 	if err != nil {
 		return nil, err
 	}
+
+	// Get the model name for the bash tool
+	modelName := large.Model() // fallback to ID if Name not available
+	if model := cfg.GetModel(large.Provider(), large.Model()); model != nil {
+		modelName = model.Name
+	}
+
 	allTools := []fantasy.AgentTool{
-		tools.NewBashTool(env.permissions, env.workingDir, cfg.Options.Attribution, large.Model()),
+		tools.NewBashTool(env.permissions, env.workingDir, cfg.Options.Attribution, modelName),
 		tools.NewDownloadTool(env.permissions, env.workingDir, r.GetDefaultClient()),
 		tools.NewEditTool(env.lspClients, env.permissions, env.history, env.workingDir),
 		tools.NewMultiEditTool(env.lspClients, env.permissions, env.history, env.workingDir),
diff --git a/internal/agent/coordinator.go b/internal/agent/coordinator.go
index f313a6e397177e0553da69869156dea6e6bd43f8..4bfcc0062ae9a06dc858989f2cce925976d6d32b 100644
--- a/internal/agent/coordinator.go
+++ b/internal/agent/coordinator.go
@@ -330,7 +330,9 @@ func (c *coordinator) buildTools(ctx context.Context, agent config.Agent) ([]fan
 	// Get the model name for the agent
 	modelName := ""
 	if modelCfg, ok := c.cfg.Models[agent.Model]; ok {
-		modelName = modelCfg.Model
+		if model := c.cfg.GetModel(modelCfg.Provider, modelCfg.Model); model != nil {
+			modelName = model.Name
+		}
 	}
 
 	allTools = append(allTools,