Merge remote-tracking branch 'origin/main'

# Conflicts:
#	README.md
#	cmd/dispatch/config.go
#	cmd/dispatch/man.go
#	internal/config/config_test.go
#	internal/tui/keys.go
#	internal/tui/model.go

Author: jongio

.playwright-mcp/console-2026-06-24T18-22-06-010Z.log

@@ -0,0 +1,2 @@
+[  733013ms] [LOG] [vite] server connection lost. Polling for restart... @ http://localhost:4321/@vite/client:1598
+[ 1673030ms] [LOG] [vite] server connection lost. Polling for restart... @ http://localhost:4321/@vite/client:1598

.playwright-mcp/page-2026-06-24T18-19-10-290Z.yml

@@ -41,7 +41,7 @@ Dispatch reads your local Copilot CLI session store and presents every past sess
 - **Session favorites** (`*`) — star sessions as favorites. Filter to show only favorites via the `!` status picker
 - **Session tags** (`#`) — attach comma-separated tags to sessions and filter to a tag with the `tag:` search token
 - **Session aliases** (`A`) — give a session a short, memorable alias and resume it from the CLI with `dispatch open <alias>` instead of the full session ID
-- **Settings panel** (`,`) — 19 fields: Yolo Mode, Agent, Model, Launch Mode, Pane Direction, Terminal, Shell, Custom Command, Theme, Crash Recovery, Preview Position, Redact Secrets, Excluded Words, Auto Refresh, Notify On Waiting, and column toggles for Repo, Folder, Turns, and Host
+- **Settings panel** (`,`) — 20 fields: Yolo Mode, Agent, Model, Launch Mode, Pane Direction, Terminal, Shell, Resume Session Command, New Session Command, Theme, Crash Recovery, Preview Position, Redact Secrets, Excluded Words, Auto Refresh, Notify On Waiting, and column toggles for Repo, Folder, Turns, and Host
 - **Configurable list columns** (`,` settings) — choose which optional columns (repo, folder, turns, host) appear in the session list. Defaults show every column, and the session name and attention indicator are always visible
 - **Shell picker** — auto-detects installed shells, modal picker when multiple available
 - **5 built-in themes** — Dispatch Dark, Dispatch Light, Campbell, One Half Dark, One Half Light + custom via Windows Terminal JSON
@@ -677,7 +677,7 @@ Configuration is stored in the platform-specific config directory:
 - **macOS**: `~/Library/Application Support/dispatch/config.json`
 - **Windows**: `%APPDATA%\dispatch\config.json`
 
-Set `DISPATCH_CONFIG` to an absolute file path to use a different config file, for example to keep separate work and personal profiles. `config path`, `config get`/`set`/`edit`, and `doctor` all follow the override. A relative or UNC value is ignored and the default location is used.
+Set `DISPATCH_CONFIG` to an absolute file path to use a different config file, for example to keep separate work and personal profiles. `config path`, `config get`/`set`/`edit`/`export`/`import`, and `doctor` all follow the override. A relative or UNC value is ignored and the default location is used.
 
 ### From the command line
 
@@ -694,9 +694,11 @@ dispatch config path            # print the config file path
 dispatch config validate        # validate config.json before launching the TUI
 dispatch config validate --json # machine-readable diagnostics for CI/scripts
 dispatch config schema          # print the JSON Schema for editor integration
+dispatch config export --out dispatch-config.json
+dispatch config import --in dispatch-config.json
 ```
 
-`set` validates the value and writes through the same save path the TUI uses, so migrations and checks still run. `unset` resets one key to its default through that same save path. Unknown keys and invalid values exit non-zero with a clear message. The keys match the option names in the table below. Set `auto_refresh_seconds` to `default` to clear it back to unset. `edit` opens the file in `$VISUAL` or `$EDITOR` (falling back to a platform default) and re-checks it after you save, which is handy for list and map settings that `set` does not cover.
+`set` validates the value and writes through the same save path the TUI uses, so migrations and checks still run. `unset` resets one key to its default through that same save path. `export` prints the full JSON config to stdout, or writes it to `--out <file>`. `import` reads JSON from stdin, or from `--in <file>`, then saves it through the normal config path. Unknown keys and invalid values exit non-zero with a clear message. The keys match the option names in the table below. Set `auto_refresh_seconds` to `default` to clear it back to unset. `edit` opens the file in `$VISUAL` or `$EDITOR` (falling back to a platform default) and re-checks it after you save, which is handy for list and map settings that `set` does not cover.
 
 Use `dispatch config validate --path <file>` to check another config file without changing your active profile. The generated schema is published at [`docs/config.schema.json`](docs/config.schema.json); point your editor's JSON Schema integration at that file, or run `dispatch config schema` to emit the same schema from your installed binary.
 
@@ -721,7 +723,8 @@ Use `dispatch config validate --path <file>` to check another config file withou
 | `model` | string | `""` | Pass `--model <name>` to Copilot CLI |
 | `launch_mode` | string | `"tab"` | How to open sessions: `in-place`, `tab`, `window`, `pane` |
 | `pane_direction` | string | `"auto"` | Split direction for pane mode: `auto`, `right`, `down`, `left`, `up` (see note below) |
-| `custom_command` | string | `""` | Custom launch command (`{sessionId}` is replaced) |
+| `resume_session_command` | string | `""` | Custom resume command (`{sessionId}` is replaced). Defaults to `copilot --resume` |
+| `new_session_command` | string | `""` | Command to launch new sessions (`{cwd}` is replaced). Defaults to `copilot` |
 | `excluded_dirs` | array | `[]` | Directory paths to hide from session list |
 | `excluded_words` | array | `[]` | Comma-separated words; sessions containing any word are hidden |
 | `attention_threshold` | string | `"15m"` | Duration after which an inactive running session is marked stale |
@@ -784,7 +787,8 @@ The split starts in the session's working directory (`-c`) and runs the resume c
   "model": "",
   "launch_mode": "tab",
   "pane_direction": "auto",
-  "custom_command": "",
+  "resume_session_command": "",
+  "new_session_command": "",
   "excluded_dirs": [],
   "theme": "auto",
   "workspace_recovery": true,
@@ -798,12 +802,20 @@ The split starts in the session's working directory (`-c`) and runs the resume c
 }
 ```
 
-### Custom Command
+### Resume Session Command
 
-Set `custom_command` to replace the default Copilot CLI launch entirely. Use `{sessionId}` as the placeholder. When set, Agent, Model, and Yolo Mode fields are ignored.
+Set `resume_session_command` to replace the default Copilot CLI resume command. Use `{sessionId}` as the placeholder for the session to resume. When set, Agent, Model, and Yolo Mode fields are ignored.
 
 ```json
-"custom_command": "my-tool resume {sessionId}"
+"resume_session_command": "my-tool resume {sessionId}"
+```
+
+### New Session Command
+
+Set `new_session_command` to customize the command used when launching a brand new session from dispatch (the `+` keybinding). Use `{cwd}` as the placeholder for the working directory. When empty, defaults to `copilot`.
+
+```json
+"new_session_command": "copilot --agent workspace"
 ```
 
 ### Customizing Keybindings

.playwright-mcp/page-2026-06-24T18-20-30-013Z.yml

@@ -55,7 +55,7 @@ The application may contact the following domains:
 
 - **Configuration file** (platform config directory, e.g.
   `~/.config/dispatch/config.json`): Treated as trusted user
-  input. If a `custom_command` is configured, it is executed as-is. Keep your
+  input. If a `resume_session_command` is configured, it is executed as-is. Keep your
   config file permissions restricted to your user account.
 - **Session data**: Read from the Copilot CLI SQLite database in read-only mode.
   Malformed session data cannot cause code execution.

.playwright-mcp/page-2026-06-24T18-22-06-184Z.yml

@@ -43,6 +43,7 @@ var (
 	// seams so tests can substitute them without touching the environment.
 	doctorCopilotVersionFn = defaultCopilotVersion
 	doctorSessionCountFn   = defaultSessionCount
+	doctorWorkspacesFn     = defaultDoctorWorkspaces
 )
 
 type versionOutput struct {
@@ -442,7 +443,7 @@ _dispatch_completion() {
       ;;
     config)
       if [[ "${COMP_CWORD}" -eq 2 ]]; then
-        COMPREPLY=( $(compgen -W "list get set unset edit path" -- "${cur}") )
+        COMPREPLY=( $(compgen -W "list get set unset edit path export import" -- "${cur}") )
       elif [[ "${COMP_WORDS[2]}" == "get" || "${COMP_WORDS[2]}" == "set" || "${COMP_WORDS[2]}" == "unset" ]]; then
         COMPREPLY=( $(compgen -W "$("${bin}" __complete config-keys)" -- "${cur}") )
       fi
@@ -458,7 +459,7 @@ _dispatch_completion() {
   local -a commands flags configsubs shells aliases configkeys openflags newflags
   local bin=${words[1]}
   commands=(help version open new doctor update completion stats search tags notes views aliases alias compare prune tag watch config export info path man)
-  configsubs=(list get set unset edit path)
+  configsubs=(list get set unset edit path export import)
   openflags=(--mode --last --print --agent --model --yolo)
   newflags=(--mode --agent --model --yolo)
   flags=(-h --help -v --version --demo --clear-cache --reindex --current --cwd --repo --branch --query)
@@ -539,7 +540,7 @@ end
 const powershellCompletionScript = `# PowerShell completion for dispatch
 $script:DispatchCommands = @('help', 'version', 'open', 'new', 'doctor', 'update', 'completion', 'stats', 'search', 'tags', 'aliases', 'alias', 'compare', 'prune', 'tag', 'watch', 'config', 'export', 'info', 'path', 'man')
 $script:DispatchFlags = @('-h', '--help', '-v', '--version', '--demo', '--clear-cache', '--reindex', '--current', '--cwd', '--repo', '--branch', '--query')
-$script:DispatchConfigSubcommands = @('list', 'get', 'set', 'unset', 'edit', 'path')
+$script:DispatchConfigSubcommands = @('list', 'get', 'set', 'unset', 'edit', 'path', 'export', 'import')
 $script:DispatchOpenFlags = @('--mode', '--last', '--print', '--agent', '--model', '--yolo')
 $script:DispatchNewFlags = @('--mode', '--agent', '--model', '--yolo')
 
@@ -588,15 +589,25 @@ type doctorEntry struct {
 // Both the text and JSON renderers consume this struct so their outputs stay
 // in sync.
 type doctorReport struct {
-	Version        string      `json:"version"`
-	OS             string      `json:"os"`
-	OK             bool        `json:"ok"`
-	Config         doctorEntry `json:"config"`
-	SessionStore   doctorEntry `json:"session_store"`
-	SessionState   doctorEntry `json:"session_state"`
-	CopilotCLI     doctorEntry `json:"copilot_cli"`
-	CopilotVersion string      `json:"copilot_version"`
-	SessionCount   int         `json:"session_count"`
+	Version        string          `json:"version"`
+	OS             string          `json:"os"`
+	OK             bool            `json:"ok"`
+	Config         doctorEntry     `json:"config"`
+	SessionStore   doctorEntry     `json:"session_store"`
+	SessionState   doctorEntry     `json:"session_state"`
+	CopilotCLI     doctorEntry     `json:"copilot_cli"`
+	CopilotVersion string          `json:"copilot_version"`
+	SessionCount   int             `json:"session_count"`
+	Workspaces     workspaceReport `json:"workspaces"`
+}
+
+// workspaceReport summarizes whether stored session working directories still
+// exist on disk.
+type workspaceReport struct {
+	Total   int      `json:"total"`
+	Missing int      `json:"missing"`
+	Samples []string `json:"samples,omitempty"`
+	Error   string   `json:"error,omitempty"`
 }
 
 // collectDoctorReport gathers the environment diagnostics once so they can be
@@ -633,6 +644,7 @@ func collectDoctorReport() doctorReport {
 	}
 
 	r.SessionCount = doctorSessionCountFn()
+	r.Workspaces = doctorWorkspacesFn()
 	r.OK = doctorEntryOK(r.Config) &&
 		doctorEntryOK(r.SessionStore) &&
 		doctorEntryOK(r.SessionState) &&
@@ -712,6 +724,35 @@ func defaultSessionCount() int {
 	return n
 }
 
+func defaultDoctorWorkspaces() workspaceReport {
+	store, err := data.Open()
+	if err != nil {
+		return workspaceReport{Error: err.Error()}
+	}
+	defer store.Close() //nolint:errcheck // read-only, best-effort close
+
+	folders, err := store.ListFolders(context.Background())
+	if err != nil {
+		return workspaceReport{Error: err.Error()}
+	}
+
+	r := workspaceReport{Total: len(folders)}
+	for _, folder := range folders {
+		if strings.TrimSpace(folder) == "" {
+			continue
+		}
+		if _, err := os.Stat(folder); err != nil {
+			if errors.Is(err, os.ErrNotExist) {
+				r.Missing++
+				if len(r.Samples) < 5 {
+					r.Samples = append(r.Samples, folder)
+				}
+			}
+		}
+	}
+	return r
+}
+
 // pathStatus stats a path and reports whether it is found, missing, or the
 // wrong type (a file where a directory is expected, or vice versa).
 func pathStatus(path string, wantDir bool) string {
@@ -748,6 +789,7 @@ func runDoctor(w io.Writer) doctorReport {
 		fmt.Fprintf(w, "Copilot CLI version: not detected\n")
 	}
 	fmt.Fprintf(w, "Stored sessions: %d\n", r.SessionCount)
+	writeWorkspaceLine(w, r.Workspaces)
 	fmt.Fprintf(w, "OK: %t\n", r.OK)
 	return r
 }
@@ -791,6 +833,17 @@ func writeDoctorLine(w io.Writer, label string, e doctorEntry, wantDir bool) {
 	}
 }
 
+func writeWorkspaceLine(w io.Writer, r workspaceReport) {
+	if r.Error != "" {
+		fmt.Fprintf(w, "Missing workspaces: unknown (%s)\n", r.Error)
+		return
+	}
+	fmt.Fprintf(w, "Missing workspaces: %d of %d folders\n", r.Missing, r.Total)
+	for _, sample := range r.Samples {
+		fmt.Fprintf(w, "  - %s\n", sample)
+	}
+}
+
 // setupLogRedirect opens the log file (if configured via DISPATCH_LOG) and
 // redirects stderr to it. When no log file is configured, stderr is sent to
 // os.DevNull to keep Bubble Tea's alt-screen clean. Returns the writer for

README.md

@@ -196,10 +196,15 @@ func TestRunDoctor_PrintsDiagnostics(t *testing.T) {
 	t.Setenv("DISPATCH_DB", db)
 	t.Setenv("DISPATCH_SESSION_STATE", stateDir)
 
-	origCount, origVer := doctorSessionCountFn, doctorCopilotVersionFn
+	origCount, origVer, origWorkspaces := doctorSessionCountFn, doctorCopilotVersionFn, doctorWorkspacesFn
 	doctorSessionCountFn = func() int { return 7 }
 	doctorCopilotVersionFn = func(string) string { return "1.2.3" }
-	t.Cleanup(func() { doctorSessionCountFn, doctorCopilotVersionFn = origCount, origVer })
+	doctorWorkspacesFn = func() workspaceReport {
+		return workspaceReport{Total: 3, Missing: 1, Samples: []string{filepath.Join(stateDir, "missing")}}
+	}
+	t.Cleanup(func() {
+		doctorSessionCountFn, doctorCopilotVersionFn, doctorWorkspacesFn = origCount, origVer, origWorkspaces
+	})
 
 	var buf bytes.Buffer
 	runDoctor(&buf)
@@ -213,6 +218,7 @@ func TestRunDoctor_PrintsDiagnostics(t *testing.T) {
 		"Session state: found",
 		"Copilot CLI:",
 		"Stored sessions: 7",
+		"Missing workspaces: 1 of 3 folders",
 	} {
 		if !strings.Contains(out, want) {
 			t.Errorf("doctor output missing %q:\n%s", want, out)
@@ -229,9 +235,10 @@ func TestRunDoctorJSON_Shape(t *testing.T) {
 	t.Setenv("DISPATCH_DB", db)
 	t.Setenv("DISPATCH_SESSION_STATE", stateDir)
 
-	origCount := doctorSessionCountFn
+	origCount, origWorkspaces := doctorSessionCountFn, doctorWorkspacesFn
 	doctorSessionCountFn = func() int { return 3 }
-	t.Cleanup(func() { doctorSessionCountFn = origCount })
+	doctorWorkspacesFn = func() workspaceReport { return workspaceReport{Total: 2, Missing: 1, Samples: []string{"missing-dir"}} }
+	t.Cleanup(func() { doctorSessionCountFn, doctorWorkspacesFn = origCount, origWorkspaces })
 
 	var buf bytes.Buffer
 	if _, err := runDoctorJSON(&buf); err != nil {
@@ -257,11 +264,22 @@ func TestRunDoctorJSON_Shape(t *testing.T) {
 	if r.SessionCount != 3 {
 		t.Errorf("session_count = %d, want 3", r.SessionCount)
 	}
+	if r.Workspaces.Missing != 1 || len(r.Workspaces.Samples) != 1 {
+		t.Errorf("workspaces = %+v, want one missing sample", r.Workspaces)
+	}
 	if !strings.HasSuffix(buf.String(), "}\n") {
 		t.Errorf("JSON output should end with a single newline, got:\n%q", buf.String())
 	}
 }
 
+func TestWriteWorkspaceLine_Error(t *testing.T) {
+	var buf bytes.Buffer
+	writeWorkspaceLine(&buf, workspaceReport{Error: "store unavailable"})
+	if !strings.Contains(buf.String(), "Missing workspaces: unknown") {
+		t.Fatalf("workspace line = %q, want unknown status", buf.String())
+	}
+}
+
 func TestParseDoctorArgs(t *testing.T) {
 	opts, err := parseDoctorArgs([]string{"doctor", "--json", "--strict"})
 	if err != nil {