fix: refresh sync state on session restart

Author: acmore

docs/command-reference.md

@@ -13,7 +13,7 @@
 ## Commands
 
 - `okdev version`
-- `okdev init [--template basic|gpu|llm-stack] [--force]`
+- `okdev init [--template basic|gpu|llm-stack] [--stignore-preset default|python|node|go|rust] [--force]`
 - `okdev validate`
 - `okdev up [--wait-timeout 10m] [--dry-run]`
 - `okdev down [--delete-pvc] [--dry-run]`
@@ -23,21 +23,23 @@
 - `okdev connect [--shell /bin/bash] [--cmd "..."] [--no-tty]`
 - `okdev ssh [--setup-key] [--user root] [--cmd "..."] [--no-tmux]`
 - `okdev ports`
-- `okdev sync [--mode up|down|bi] [--background] [--reset] [--dry-run]`
+- `okdev sync [--mode up|down|bi] [--foreground] [--reset] [--dry-run]`
 - `okdev prune [--ttl-hours 72] [--all-namespaces] [--all-users] [--include-pvc] [--dry-run]`
 
-### `okdev init [--template basic|gpu|llm-stack] [--force]`
+### `okdev init [--template basic|gpu|llm-stack] [--stignore-preset default|python|node|go|rust] [--force]`
 
 - Writes a starter `.okdev.yaml`.
 - For built-in templates, it also writes a starter local `.stignore` file for the initialized sync root.
+- `--stignore-preset`: override the starter `.stignore` patterns with a project-oriented preset.
+- When `--stignore-preset` is omitted, `okdev init` tries to detect a preset from common repo markers like `go.mod`, `package.json`, `Cargo.toml`, and `pyproject.toml`.
 
 ### `okdev up [--wait-timeout 10m] [--dry-run]`
 
 - Reconciles Pod/PVC resources, updates SSH config, initializes managed forwarding/sync, then exits.
 - tmux-backed persistent interactive shells are enabled by default.
 - `--tmux`: explicitly enable tmux mode in the dev container.
 - `--no-tmux`: disable tmux mode for this pod.
-- When `sync.engine=syncthing`, `okdev up` starts background sync in bidirectional mode by default.
+- When `sync.engine=syncthing`, `okdev up` refreshes the session's local Syncthing processes and starts background sync in bidirectional mode by default.
 - `spec.ports` is materialized as SSH `LocalForward`.
 
 ### `okdev ssh [--setup-key] [--user root] [--cmd "..."] [--no-tmux]`
@@ -51,9 +53,10 @@
 - Advanced/recovery command. Rebuilds managed SSH `LocalForward` state from `spec.ports` after disconnects or local port changes.
 - No-op when managed forwards are already healthy and config is unchanged.
 
-### `okdev sync [--mode up|down|bi] [--background] [--reset] [--dry-run]`
+### `okdev sync [--mode up|down|bi] [--foreground] [--reset] [--dry-run]`
 
-- Advanced command. Use for foreground sync debugging, or explicit one-way sync (`up`/`down`).
+- Advanced command. Starts detached background sync by default; use `--foreground` for sync debugging, or explicit one-way sync (`up`/`down`).
 - For default `--mode bi`, no-op when background sync is already active for the session.
+- `--background`: explicitly request detached background mode.
 - `--reset`: stop the session's existing local sync processes and local Syncthing state, then bootstrap sync again.
-- `okdev init` writes the starter config and, when `spec.sync.exclude` is populated, a local `.stignore` file for the initialized sync root.
+- `okdev init` writes the starter config and, for built-in templates, a starter local `.stignore` file for the initialized sync root.

docs/quickstart.md

@@ -27,11 +27,14 @@ go build -o bin/okdev ./cmd/okdev
 okdev init
 # GPU/LLM-focused scaffold
 okdev init --template gpu
+# Go project with a Go-oriented local sync ignore preset
+okdev init --template basic --stignore-preset go
 ```
 
 This generates `.okdev.yaml` in the current directory. See [Config Manifest](config-manifest.md) for the full field reference and examples.
 
-For built-in templates, `okdev init` also writes a starter local `.stignore` file for the initialized sync root.
+For built-in templates, `okdev init` also writes a starter local `.stignore` file for the initialized sync root. Use `--stignore-preset` to override that starter with a project-oriented preset like `python`, `node`, `go`, or `rust`.
+When `--stignore-preset` is omitted, `okdev init` will try to detect a preset from common repo markers like `go.mod`, `package.json`, `Cargo.toml`, or `pyproject.toml`.
 
 okdev discovers configuration in this order:
 
@@ -111,11 +114,11 @@ Use `okdev ssh` when you want the tmux-backed interactive shell managed by okdev
 `okdev up` starts bidirectional Syncthing sync automatically. For manual control:
 
 ```bash
-# Foreground sync (useful for troubleshooting)
+# Detached background sync (default)
 okdev sync
 
-# Detached background sync
-okdev sync --background
+# Foreground sync (useful for troubleshooting)
+okdev sync --foreground
 
 # One-way sync (local → remote or remote → local)
 okdev sync --mode up

internal/cli/sync.go

@@ -19,6 +19,7 @@ import (
 func newSyncCmd(opts *Options) *cobra.Command {
 	var mode string
 	var background bool
+	var foreground bool
 	var dryRun bool
 	var reset bool
 
@@ -49,6 +50,12 @@ func newSyncCmd(opts *Options) *cobra.Command {
 			if engine != "syncthing" {
 				return fmt.Errorf("unsupported sync engine %q (only syncthing is supported)", engine)
 			}
+			if foreground && cmd.Flags().Changed("background") {
+				return fmt.Errorf("--background and --foreground cannot be used together")
+			}
+			if foreground {
+				background = false
+			}
 			pairs, err := syncengine.ParsePairs(cfg.Spec.Sync.Paths, cfg.WorkspaceMountPath())
 			if err != nil {
 				return err
@@ -101,7 +108,8 @@ func newSyncCmd(opts *Options) *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&mode, "mode", "bi", "Sync mode: up|down|bi")
-	cmd.Flags().BoolVar(&background, "background", false, "Run syncthing sync as a detached background process")
+	cmd.Flags().BoolVar(&background, "background", true, "Run syncthing sync as a detached background process")
+	cmd.Flags().BoolVar(&foreground, "foreground", false, "Run syncthing sync in the foreground for troubleshooting")
 	cmd.Flags().BoolVar(&reset, "reset", false, "Stop existing local sync state for this session and bootstrap again")
 	cmd.Flags().BoolVar(&dryRun, "dry-run", false, "Preview sync actions without transferring files")
 	return cmd

internal/cli/sync_test.go

@@ -6,6 +6,20 @@ import (
 	"testing"
 )
 
+func TestNewSyncCmdDefaultsToBackground(t *testing.T) {
+	cmd := newSyncCmd(&Options{})
+	flag := cmd.Flags().Lookup("background")
+	if flag == nil {
+		t.Fatal("expected background flag")
+	}
+	if flag.DefValue != "true" {
+		t.Fatalf("expected background default true, got %q", flag.DefValue)
+	}
+	if cmd.Flags().Lookup("foreground") == nil {
+		t.Fatal("expected foreground flag")
+	}
+}
+
 func TestResetSyncthingSessionStateRemovesLocalState(t *testing.T) {
 	home := t.TempDir()
 	origHome := os.Getenv("HOME")
@@ -42,3 +56,42 @@ func TestResetSyncthingSessionStateRemovesLocalState(t *testing.T) {
 		t.Fatalf("expected session home to remain a directory")
 	}
 }
+
+func TestRefreshSyncthingSessionProcessesPreservesLocalState(t *testing.T) {
+	home := t.TempDir()
+	origHome := os.Getenv("HOME")
+	if err := os.Setenv("HOME", home); err != nil {
+		t.Fatalf("set HOME: %v", err)
+	}
+	defer func() {
+		_ = os.Setenv("HOME", origHome)
+	}()
+
+	sessionName := "test-sync-refresh"
+	sessionHome, err := localSyncthingHome(sessionName)
+	if err != nil {
+		t.Fatalf("localSyncthingHome: %v", err)
+	}
+	stateFile := filepath.Join(sessionHome, "config.xml")
+	if err := os.WriteFile(stateFile, []byte("<config/>"), 0o644); err != nil {
+		t.Fatalf("write state file: %v", err)
+	}
+	pidPath, err := syncthingPIDPath(sessionName)
+	if err != nil {
+		t.Fatalf("syncthingPIDPath: %v", err)
+	}
+	if err := os.WriteFile(pidPath, []byte("999999\n"), 0o644); err != nil {
+		t.Fatalf("write pid file: %v", err)
+	}
+
+	if err := refreshSyncthingSessionProcesses(sessionName); err != nil {
+		t.Fatalf("refreshSyncthingSessionProcesses: %v", err)
+	}
+
+	if _, err := os.Stat(stateFile); err != nil {
+		t.Fatalf("expected state file to remain after refresh: %v", err)
+	}
+	if _, err := os.Stat(pidPath); !os.IsNotExist(err) {
+		t.Fatalf("expected stale pid file to be removed, got err=%v", err)
+	}
+}

internal/cli/syncthing.go

@@ -294,6 +294,16 @@ func resetSyncthingSessionState(sessionName string) error {
 	return nil
 }
 
+func refreshSyncthingSessionProcesses(sessionName string) error {
+	if err := stopDetachedSyncthingSync(sessionName); err != nil {
+		return fmt.Errorf("stop background sync: %w", err)
+	}
+	if err := stopLocalSyncthingForSession(sessionName); err != nil {
+		return fmt.Errorf("stop local syncthing: %w", err)
+	}
+	return nil
+}
+
 func startSyncthingPortForward(opts *Options, namespace, pod string) (context.CancelFunc, string, string, error) {
 	lastErr := error(nil)
 	for i := 0; i < 5; i++ {

internal/cli/up.go

@@ -196,6 +196,9 @@ func newUpCmd(opts *Options) *cobra.Command {
 			syncSummary := "disabled"
 			syncModeSymbol := ""
 			if cfg.Spec.Sync.Engine == "" || cfg.Spec.Sync.Engine == "syncthing" {
+				if err := refreshSyncthingSessionProcesses(sn); err != nil {
+					return fmt.Errorf("refresh local syncthing session state: %w", err)
+				}
 				logPath, started, err := startDetachedSyncthingSync(opts, upDefaultSyncMode, sn, ns, cfgPath)
 				if err != nil {
 					return fmt.Errorf("start syncthing background sync: %w", err)