refactor: overhaul diff, remove shell from snapshot, fix install flow

- diff: default to remote config (logged in) instead of useless local
  snapshot comparison. Error with guidance when not logged in.
- diff: add dotfiles comparison (repo URL mismatch, uncommitted changes,
  unpushed commits)
- diff: add macOS preferences comparison for remote configs
- diff: fix formulae/casks mixing by filtering casks from remote packages
- snapshot: remove ShellSnapshot from data structure — shell plugins and
  theme are part of dotfiles, not a separate concern
- installer: stepShell now only installs oh-my-zsh; skips .zshrc
  modification when dotfiles are present (dotfiles manage .zshrc)
- sync: remove shell diff and shell restore from sync plan
- cleanup: remove SnapshotShellConfig, ShellDiff, GitDiff types and all
  related capture/compare/format/restore code (~600 lines removed)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: fullstackjam

internal/cli/diff.go

@@ -18,14 +18,15 @@ var diffCmd = &cobra.Command{
 
 Sources (checked in order):
   1. --from <file>         Compare against a snapshot file
-  2. --user <username>     Compare against your openboot.dev config
-  3. Local snapshot         Compare against ~/.openboot/snapshot.json
+  2. --user <username>     Compare against a specific openboot.dev config
+  3. Logged in             Compare against your own openboot.dev config
+  4. Not logged in         Error with guidance
 
 This is a read-only operation — nothing is installed or removed.
 
 Examples:
-  openboot diff                              Diff against local snapshot
-  openboot diff --user alice/my-config       Diff against cloud config
+  openboot diff                              Diff against your openboot.dev config (requires login)
+  openboot diff --user alice/my-config       Diff against someone else's config
   openboot diff --from my-setup.json         Diff against a snapshot file
   openboot diff --json                       Output as JSON
   openboot diff --packages-only              Only compare packages`,
@@ -61,7 +62,12 @@ func runDiff(cmd *cobra.Command) error {
 	case user != "":
 		result, err = diffFromRemote(system, user)
 	default:
-		result, err = diffFromLocalSnapshot(system)
+		// If logged in, diff against the user's own remote config
+		stored, authErr := auth.LoadToken()
+		if authErr != nil || stored == nil {
+			return fmt.Errorf("no comparison target specified\n\n  Log in to diff against your openboot.dev config:\n    openboot login\n\n  Or specify a target explicitly:\n    openboot diff --user <username>     Compare against a remote config\n    openboot diff --from <file>         Compare against a snapshot file")
+		}
+		result, err = diffFromRemote(system, stored.Username)
 	}
 
 	if err != nil {
@@ -111,12 +117,3 @@ func diffFromRemote(system *snapshot.Snapshot, userSlug string) (*diff.DiffResul
 	return diff.CompareSnapshotToRemote(system, rc, source), nil
 }
 
-func diffFromLocalSnapshot(system *snapshot.Snapshot) (*diff.DiffResult, error) {
-	reference, err := snapshot.LoadLocal()
-	if err != nil {
-		return nil, fmt.Errorf("no local snapshot found — run 'openboot snapshot --local' first, or use --from or --user flags: %w", err)
-	}
-
-	source := diff.Source{Kind: "local", Path: snapshot.LocalPath()}
-	return diff.CompareSnapshots(system, reference, source), nil
-}

internal/cli/snapshot.go

@@ -450,19 +450,6 @@ func showSnapshotSummary(snap *snapshot.Snapshot) {
 			snapBoldStyle.Render("Preset:"))
 	}
 
-	omzStatus := "not installed"
-	if snap.Shell.OhMyZsh {
-		theme := snap.Shell.Theme
-		if theme == "" {
-			theme = "default"
-		}
-		pluginCount := len(snap.Shell.Plugins)
-		omzStatus = fmt.Sprintf("Oh-My-Zsh (%s theme, %d plugins)", theme, pluginCount)
-	}
-	fmt.Fprintf(os.Stderr, "  %s %s + %s\n",
-		snapBoldStyle.Render("Shell:"),
-		snap.Shell.Default, omzStatus)
-
 	if snap.Git.UserName != "" || snap.Git.UserEmail != "" {
 		fmt.Fprintf(os.Stderr, "  %s %s <%s>\n",
 			snapBoldStyle.Render("Git:"),
@@ -521,21 +508,6 @@ func showSnapshotPreview(snap *snapshot.Snapshot) {
 		fmt.Fprintf(os.Stderr, "    %s.%s = %s\n", pref.Domain, pref.Key, pref.Value)
 	}
 
-	omzStatus := "not installed"
-	if snap.Shell.OhMyZsh {
-		omzStatus = "installed"
-	}
-	theme := snap.Shell.Theme
-	if theme == "" {
-		theme = "none"
-	}
-	plugins := "none"
-	if len(snap.Shell.Plugins) > 0 {
-		plugins = strings.Join(snap.Shell.Plugins, ", ")
-	}
-	fmt.Fprintf(os.Stderr, "  %s %s (Oh-My-Zsh: %s, Theme: %s, Plugins: %s)\n",
-		snapBoldStyle.Render("Shell:"), snap.Shell.Default, omzStatus, theme, plugins)
-
 	fmt.Fprintf(os.Stderr, "  %s %s <%s>\n",
 		snapBoldStyle.Render("Git:"), snap.Git.UserName, snap.Git.UserEmail)
 
@@ -663,18 +635,6 @@ func showRestoreInfo(snap *snapshot.Snapshot, source string) {
 		fmt.Fprintf(os.Stderr, "  %s %s <%s>\n",
 			snapBoldStyle.Render("Git:"), snap.Git.UserName, snap.Git.UserEmail)
 	}
-	if snap.Shell.OhMyZsh {
-		theme := snap.Shell.Theme
-		if theme == "" {
-			theme = "default"
-		}
-		plugins := "none"
-		if len(snap.Shell.Plugins) > 0 {
-			plugins = strings.Join(snap.Shell.Plugins, ", ")
-		}
-		fmt.Fprintf(os.Stderr, "  %s Oh-My-Zsh (theme: %s, plugins: %s)\n",
-			snapBoldStyle.Render("Shell:"), theme, plugins)
-	}
 	fmt.Fprintln(os.Stderr)
 }
 
@@ -749,12 +709,6 @@ func buildImportConfig(edited *snapshot.Snapshot, dryRun bool) *config.Config {
 		UserEmail: edited.Git.UserEmail,
 	}
 
-	cfg.SnapshotShell = &config.SnapshotShellConfig{
-		OhMyZsh: edited.Shell.OhMyZsh,
-		Theme:   edited.Shell.Theme,
-		Plugins: edited.Shell.Plugins,
-	}
-
 	if edited.Dotfiles.RepoURL != "" {
 		if err := config.ValidateDotfilesURL(edited.Dotfiles.RepoURL); err == nil {
 			cfg.SnapshotDotfiles = edited.Dotfiles.RepoURL

internal/cli/snapshot_test.go

@@ -37,25 +37,18 @@ func TestBuildImportConfig_EmptyDotfiles(t *testing.T) {
 	assert.Empty(t, cfg.DotfilesURL)
 }
 
-func TestBuildImportConfig_GitAndShellPopulated(t *testing.T) {
+func TestBuildImportConfig_GitPopulated(t *testing.T) {
 	snap := &snapshot.Snapshot{
 		Git: snapshot.GitSnapshot{
 			UserName:  "Test User",
 			UserEmail: "test@example.com",
 		},
-		Shell: snapshot.ShellSnapshot{
-			OhMyZsh: true,
-			Theme:   "robbyrussell",
-			Plugins: []string{"git"},
-		},
 	}
 
 	cfg := buildImportConfig(snap, false)
 
 	require.NotNil(t, cfg.SnapshotGit)
 	assert.Equal(t, "Test User", cfg.SnapshotGit.UserName)
-	require.NotNil(t, cfg.SnapshotShell)
-	assert.True(t, cfg.SnapshotShell.OhMyZsh)
 }
 
 func TestBuildImportConfig_EmptySnapshot(t *testing.T) {

internal/cli/sync.go

@@ -200,21 +200,6 @@ func printSyncDiff(d *syncpkg.SyncDiff) {
 		fmt.Println()
 	}
 
-	// Shell changes
-	if d.ShellChanged && d.ShellDiff != nil {
-		fmt.Printf("  %s\n", ui.Green("Shell Changes"))
-		if d.ShellDiff.ThemeChanged {
-			fmt.Printf("    Theme: %s %s %s\n", d.ShellDiff.LocalTheme, ui.Yellow("→"), d.ShellDiff.RemoteTheme)
-		}
-		if len(d.ShellDiff.MissingPlugins) > 0 {
-			fmt.Printf("    New plugins: %s\n", strings.Join(d.ShellDiff.MissingPlugins, ", "))
-		}
-		if len(d.ShellDiff.ExtraPlugins) > 0 {
-			fmt.Printf("    Extra plugins: %s\n", strings.Join(d.ShellDiff.ExtraPlugins, ", "))
-		}
-		fmt.Println()
-	}
-
 	// macOS changes
 	if len(d.MacOSChanged) > 0 {
 		fmt.Printf("  %s\n", ui.Green("macOS Changes"))
@@ -290,30 +275,6 @@ func buildSyncPlan(d *syncpkg.SyncDiff, rc *config.RemoteConfig, dryRun bool, in
 		}
 	}
 
-	// Shell changes
-	if d.ShellChanged && d.ShellDiff != nil {
-		if d.ShellDiff.ThemeChanged {
-			apply, err := ui.Confirm(
-				fmt.Sprintf("Update theme: %s → %s?", d.ShellDiff.LocalTheme, d.ShellDiff.RemoteTheme), true)
-			if err != nil {
-				return nil, fmt.Errorf("confirm theme: %w", err)
-			}
-			if apply {
-				plan.UpdateTheme = d.ShellDiff.RemoteTheme
-			}
-		}
-		if len(d.ShellDiff.MissingPlugins) > 0 {
-			apply, err := ui.Confirm(
-				fmt.Sprintf("Install plugins: %s?", strings.Join(d.ShellDiff.MissingPlugins, ", ")), true)
-			if err != nil {
-				return nil, fmt.Errorf("confirm plugins: %w", err)
-			}
-			if apply {
-				plan.InstallPlugins = d.ShellDiff.MissingPlugins
-			}
-		}
-	}
-
 	// macOS changes
 	if len(d.MacOSChanged) > 0 {
 		apply, err := ui.Confirm(fmt.Sprintf("Apply %d macOS preference change(s)?", len(d.MacOSChanged)), true)
@@ -357,13 +318,6 @@ func buildDryRunPlan(d *syncpkg.SyncDiff) *syncpkg.SyncPlan {
 		InstallTaps:     d.MissingTaps,
 	}
 
-	if d.ShellDiff != nil {
-		if d.ShellDiff.ThemeChanged {
-			plan.UpdateTheme = d.ShellDiff.RemoteTheme
-		}
-		plan.InstallPlugins = d.ShellDiff.MissingPlugins
-	}
-
 	if d.DotfilesChanged {
 		plan.UpdateDotfiles = d.RemoteDotfiles
 	}

internal/cli/sync_test.go

@@ -343,29 +343,6 @@ func TestPrintSyncDiffPackages(t *testing.T) {
 	assert.Contains(t, output, "htop")
 }
 
-func TestPrintSyncDiffShell(t *testing.T) {
-	d := &syncpkg.SyncDiff{
-		ShellChanged: true,
-		ShellDiff: &syncpkg.ShellDiff{
-			ThemeChanged:   true,
-			RemoteTheme:    "agnoster",
-			LocalTheme:     "robbyrussell",
-			MissingPlugins: []string{"zsh-autosuggestions"},
-			ExtraPlugins:   []string{"old-plugin"},
-		},
-	}
-
-	output := captureStdout(func() {
-		printSyncDiff(d)
-	})
-
-	assert.Contains(t, output, "Theme:")
-	assert.Contains(t, output, "robbyrussell")
-	assert.Contains(t, output, "agnoster")
-	assert.Contains(t, output, "New plugins: zsh-autosuggestions")
-	assert.Contains(t, output, "Extra plugins: old-plugin")
-}
-
 func TestPrintSyncDiffMacOS(t *testing.T) {
 	d := &syncpkg.SyncDiff{
 		MacOSChanged: []syncpkg.MacOSPrefDiff{
@@ -469,13 +446,6 @@ func TestBuildDryRunPlan(t *testing.T) {
 		MissingTaps:     []string{"homebrew/cask-fonts"},
 		DotfilesChanged: true,
 		RemoteDotfiles:  "https://github.com/user/dots",
-		ShellChanged:    true,
-		ShellDiff: &syncpkg.ShellDiff{
-			ThemeChanged:   true,
-			RemoteTheme:    "agnoster",
-			LocalTheme:     "robbyrussell",
-			MissingPlugins: []string{"zsh-autosuggestions"},
-		},
 		MacOSChanged: []syncpkg.MacOSPrefDiff{
 			{Domain: "com.apple.dock", Key: "autohide", RemoteValue: "true", Desc: "Dock auto-hide"},
 		},
@@ -487,8 +457,6 @@ func TestBuildDryRunPlan(t *testing.T) {
 	assert.Equal(t, []string{"raycast"}, plan.InstallCasks)
 	assert.Equal(t, []string{"turbo"}, plan.InstallNpm)
 	assert.Equal(t, []string{"homebrew/cask-fonts"}, plan.InstallTaps)
-	assert.Equal(t, "agnoster", plan.UpdateTheme)
-	assert.Equal(t, []string{"zsh-autosuggestions"}, plan.InstallPlugins)
 	assert.Equal(t, "https://github.com/user/dots", plan.UpdateDotfiles)
 	assert.Len(t, plan.UpdateMacOSPrefs, 1)
 	assert.Equal(t, "com.apple.dock", plan.UpdateMacOSPrefs[0].Domain)
@@ -500,12 +468,10 @@ func TestBuildDryRunPlanEmpty(t *testing.T) {
 	assert.True(t, plan.IsEmpty())
 }
 
-func TestBuildDryRunPlanNoShellDiff(t *testing.T) {
+func TestBuildDryRunPlanPackagesOnly(t *testing.T) {
 	d := &syncpkg.SyncDiff{
 		MissingFormulae: []string{"ripgrep"},
 	}
 	plan := buildDryRunPlan(d)
 	assert.Equal(t, []string{"ripgrep"}, plan.InstallFormulae)
-	assert.Empty(t, plan.UpdateTheme)
-	assert.Empty(t, plan.InstallPlugins)
 }

internal/config/config.go

@@ -48,7 +48,6 @@ type Config struct {
 	RemoteConfig *RemoteConfig
 	PackagesOnly bool
 
-	SnapshotShell    *SnapshotShellConfig
 	SnapshotGit      *SnapshotGitConfig
 	SnapshotMacOS    []RemoteMacOSPref
 	SnapshotDotfiles string
@@ -57,12 +56,6 @@ type Config struct {
 	AllowPostInstall bool
 }
 
-type SnapshotShellConfig struct {
-	OhMyZsh bool
-	Theme   string
-	Plugins []string
-}
-
 type SnapshotGitConfig struct {
 	UserName  string
 	UserEmail string