@@ -195,28 +195,63 @@ func main() {
195195 // Initialize provider registry
196196 registry := initializeProviders(cfg, creds)
197197
198- // Select provider
199- selectedProvider := providerName
200- if selectedProvider == "" {
201- // Use first provider from config
202- for name := range cfg.Providers {
203- selectedProvider = name
204- break
198+ // Determine provider and model - check if resuming session first
199+ var selectedProvider string
200+ var selectedModel string
201+
202+ // Check if we're resuming a session to use its provider
203+ if sessionName != "" && providerName == "" {
204+ sess, err := db.GetSessionByName(sessionName)
205+ if err != nil {
206+ fmt.Fprintln(os.Stderr, styles.Error.Render("Failed to check session: "+err.Error()))
207+ os.Exit(1)
208+ }
209+ if sess != nil {
210+ // Resuming existing session - use its provider
211+ selectedProvider = sess.Provider
212+ selectedModel = sess.Model
213+ log.Debug().
214+ Str("session", sessionName).
215+ Str("provider", selectedProvider).
216+ Str("model", selectedModel).
217+ Msg("Using provider from existing session")
205218 }
206219 }
207220
221+ // If provider not determined from session, use flag or default
208222 if selectedProvider == "" {
209- fmt.Fprintln(os.Stderr, styles.Error.Render("Error: no provider configured"))
210- os.Exit(1)
223+ selectedProvider = providerName
224+ if selectedProvider == "" {
225+ // Use default provider from config (first one)
226+ for name := range cfg.Providers {
227+ selectedProvider = name
228+ break
229+ }
230+ }
231+
232+ if selectedProvider == "" {
233+ fmt.Fprintln(os.Stderr, styles.Error.Render("Error: no provider configured"))
234+ os.Exit(1)
235+ }
236+
237+ // Get model from config
238+ providerCfg, ok := cfg.Providers[selectedProvider]
239+ if !ok {
240+ fmt.Fprintln(os.Stderr, styles.Error.Render(fmt.Sprintf("Error: provider '%s' not found in config", selectedProvider)))
241+ os.Exit(1)
242+ }
243+ selectedModel = providerCfg.Model
211244 }
212245
246+ // Verify provider exists in config
213247 providerCfg, ok := cfg.Providers[selectedProvider]
214248 if !ok {
215249 fmt.Fprintln(os.Stderr, styles.Error.Render(fmt.Sprintf("Error: provider '%s' not found in config", selectedProvider)))
216250 os.Exit(1)
217251 }
218252
219- prov, err := registry.Create(selectedProvider, providerCfg.Model, providerCfg.Temperature)
253+ // Create provider instance
254+ prov, err := registry.Create(selectedProvider, selectedModel, providerCfg.Temperature)
220255 if err != nil {
221256 fmt.Fprintln(os.Stderr, styles.Error.Render("Failed to create provider: "+err.Error()))
222257 os.Exit(1)
@@ -225,7 +260,7 @@ func main() {
225260
226261 log.Info().
227262 Str("provider", selectedProvider).
228- Str("model", providerCfg.Model).
263+ Str("model", selectedModel).
229264 Msg("Provider initialized")
230265
231266 // Initialize MCP client
@@ -266,7 +301,7 @@ func main() {
266301 } else {
267302 // Create new named session
268303 sessionID = uuid.New().String()
269- if err := db.CreateSession(sessionID, selectedProvider, providerCfg.Model, &sessionName); err != nil {
304+ if err := db.CreateSession(sessionID, selectedProvider, selectedModel, &sessionName); err != nil {
270305 fmt.Fprintln(os.Stderr, styles.Error.Render("Failed to create session: "+err.Error()))
271306 os.Exit(1)
272307 }
@@ -276,7 +311,7 @@ func main() {
276311 } else {
277312 // Create anonymous session
278313 sessionID = uuid.New().String()
279- if err := db.CreateSession(sessionID, selectedProvider, providerCfg.Model, nil); err != nil {
314+ if err := db.CreateSession(sessionID, selectedProvider, selectedModel, nil); err != nil {
280315 fmt.Fprintln(os.Stderr, styles.Error.Render("Failed to create session: "+err.Error()))
281316 os.Exit(1)
282317 }
@@ -299,7 +334,7 @@ func main() {
299334 fmt.Println(styles.Brand.Render("║") + " " + styles.BrandBold.Render("Mysis") + " - SpaceMolt Agent CLI " + styles.Brand.Render("║"))
300335 fmt.Println(styles.Brand.Render("╚══════════════════════════════════════╝"))
301336 fmt.Println()
302- fmt.Println(styles.Muted.Render(fmt.Sprintf("Provider: %s (%s)", selectedProvider, providerCfg.Model)))
337+ fmt.Println(styles.Muted.Render(fmt.Sprintf("Provider: %s (%s)", selectedProvider, selectedModel)))
303338 fmt.Println(styles.Muted.Render(fmt.Sprintf("Tools: %d available", len(tools))))
304339 fmt.Println(styles.Muted.Render(sessionInfo))
305340 fmt.Println()