fix(slack): unify workspace name sanitization, improve credential handling

- Extract SanitizeWorkspaceName to source/slack for shared use
- DeleteCredentials now returns non-"not found" keyring errors
- Require cookie when xoxc- token is used in manual login
- Remove dead Workspace field from SlackToolDeps

Author: priyanshujain

channel/telegram/session.go

@@ -263,7 +263,7 @@ func (sm *SessionManager) registerSlackTools(reg *tools.Registry) {
 		return
 	}
 	client := slacksrc.NewClient(creds.Token, creds.Cookie)
-	deps := tools.SlackToolDeps{Client: client, Interactor: sm.interactor, Workspace: sm.cfg.Slack.DefaultWorkspace}
+	deps := tools.SlackToolDeps{Client: client, Interactor: sm.interactor}
 	reg.Register(tools.NewSlackSearchTool(deps))
 	reg.Register(tools.NewSlackReadChannelTool(deps))
 	reg.Register(tools.NewSlackReadThreadTool(deps))

internal/cli/auth/slack.go

@@ -65,7 +65,7 @@ func slackLoginDesktop() error {
 		return fmt.Errorf("desktop extraction failed: %w", err)
 	}
 
-	workspace := sanitizeWorkspaceName(creds.TeamName)
+	workspace := slacksrc.SanitizeWorkspaceName(creds.TeamName)
 	if err := slacksrc.SaveCredentials(workspace, creds.Token, creds.Cookie); err != nil {
 		return fmt.Errorf("save credentials: %w", err)
 	}
@@ -120,7 +120,7 @@ func slackLoginToken() error {
 		return err
 	}
 
-	workspace = sanitizeWorkspaceName(strings.TrimSpace(workspace))
+	workspace = slacksrc.SanitizeWorkspaceName(strings.TrimSpace(workspace))
 	token = strings.TrimSpace(token)
 	cookie = strings.TrimSpace(cookie)
 
@@ -130,6 +130,9 @@ func slackLoginToken() error {
 	if err := slacksrc.ValidateToken(token); err != nil {
 		return err
 	}
+	if strings.HasPrefix(token, "xoxc-") && cookie == "" {
+		return fmt.Errorf("xoxc- tokens require a cookie (xoxd-) value")
+	}
 
 	client := slacksrc.NewClient(token, cookie)
 	teamID, teamName, _, err := client.AuthTest(context.Background())
@@ -248,12 +251,6 @@ var slackStatusCmd = &cobra.Command{
 	},
 }
 
-func sanitizeWorkspaceName(name string) string {
-	name = strings.ToLower(name)
-	name = strings.ReplaceAll(name, " ", "-")
-	return name
-}
-
 func init() {
 	slackCmd.AddCommand(slackLoginCmd)
 	slackCmd.AddCommand(slackLogoutCmd)

internal/cli/chat.go

@@ -205,7 +205,7 @@ func registerSlackTools(cfg *config.Config, reg *tools.Registry, ch *clicli.Chan
 	}
 	client := slacksrc.NewClient(creds.Token, creds.Cookie)
 	inter := &cliInteractor{ch: ch}
-	deps := tools.SlackToolDeps{Client: client, Interactor: inter, Workspace: cfg.Slack.DefaultWorkspace}
+	deps := tools.SlackToolDeps{Client: client, Interactor: inter}
 
 	reg.Register(tools.NewSlackSearchTool(deps))
 	reg.Register(tools.NewSlackReadChannelTool(deps))

internal/cli/setup.go

@@ -435,7 +435,7 @@ func setupSlack(cfg *config.Config) error {
 
 		creds, err := desktop.Extract()
 		if err == nil {
-			workspace := strings.ToLower(strings.ReplaceAll(creds.TeamName, " ", "-"))
+			workspace := slacksrc.SanitizeWorkspaceName(creds.TeamName)
 			if err := slacksrc.SaveCredentials(workspace, creds.Token, creds.Cookie); err != nil {
 				return fmt.Errorf("save credentials: %w", err)
 			}

source/slack/credential.go

@@ -39,11 +39,26 @@ func LoadCredentials(workspace string) (*Credentials, error) {
 }
 
 func DeleteCredentials(workspace string) error {
-	_ = keyring.Delete(keyringService, tokenAccount(workspace))
-	_ = keyring.Delete(keyringService, cookieAccount(workspace))
+	var errs []error
+	if err := keyring.Delete(keyringService, tokenAccount(workspace)); err != nil && err != keyring.ErrNotFound {
+		errs = append(errs, fmt.Errorf("delete token: %w", err))
+	}
+	if err := keyring.Delete(keyringService, cookieAccount(workspace)); err != nil && err != keyring.ErrNotFound {
+		errs = append(errs, fmt.Errorf("delete cookie: %w", err))
+	}
+	if len(errs) > 0 {
+		return errs[0]
+	}
 	return nil
 }
 
+// SanitizeWorkspaceName normalizes a workspace name for use as a key.
+func SanitizeWorkspaceName(name string) string {
+	name = strings.ToLower(name)
+	name = strings.ReplaceAll(name, " ", "-")
+	return name
+}
+
 func ListWorkspaces() ([]string, error) {
 	// go-keyring doesn't support listing, so we rely on config.
 	// This is a helper that callers fill from config.Slack.Workspaces keys.