arashi 1.20.1 → 1.22.0

package/README.md

@@ -117,12 +117,12 @@ Arashi currently provides these commands:
 - `arashi update [--check] [--dry-run] [--yes]`
 - `arashi add <git-url>`
 - `arashi clone [--all]`
-- `arashi create <branch>`
+- `arashi create <branch> [--tmux|--sesh|--herdr]`
 - `arashi list`
 - `arashi status`
 - `arashi remove <branch|path>`
 - `arashi prune [--dry-run]` - clean stale Git worktree metadata
-- `arashi switch [filter] [--repos|--all] [--cd|--no-cd] [--sesh] [--no-default-launch]`
+- `arashi switch [filter] [--repos|--all] [--cd|--no-cd] [--tmux|--sesh|--herdr] [--no-default-launch]`
 - `arashi shell init <bash|zsh|fish>`
 - `arashi shell install`
 - `arashi pull`
@@ -139,6 +139,8 @@ arashi add git@github.com:your-org/frontend.git
 arashi add git@github.com:your-org/backend.git
 arashi create feature-auth-refresh
 arashi create feature-auth-refresh --launch
+arashi create feature-auth-refresh --tmux
+arashi create feature-auth-refresh --herdr
 arashi create feature-auth-refresh --no-launch
 arashi shell install
 arashi status
@@ -147,9 +149,13 @@ arashi switch --repos feature-auth-refresh  # child repo worktrees in current wo
 arashi switch --all feature-auth-refresh    # all repos
 arashi switch --repos docs                  # repo-name matching in child repos
 arashi switch --cd feature-auth-refresh     # parent-shell cd when shell integration is active
-arashi switch --no-default-launch           # bypass configured launch mode defaults once
+arashi switch --tmux feature-auth-refresh   # force a new plain tmux window
+arashi switch --herdr feature-auth-refresh  # open or focus a persistent Herdr workspace
+arashi switch --no-default-launch           # bypass configured sesh/Herdr mode once
 ```
 
+Explicit `--tmux` is a per-invocation launcher override for `create` and `switch`; it is not a persisted configuration mode. It requires an active tmux context whose `TMUX` value is non-empty after trimming, uses the selected worktree path as one argv-safe `tmux new-window -c` argument, and does not fall back to another launcher when the prerequisite or launch fails. On `create`, it implies both launch and switch, while validation failures occur before worktree mutation.
+
 ### Managed Git ignore rules
 
 Configured workspaces keep `reposDir` and `worktreesDir` effectively ignored. Arashi asks Git
@@ -176,7 +182,7 @@ Use the docs site workflow guides when you want setup guidance by outcome instea
 For contributors working on Arashi itself, the project planning workflow in the `arashi-arashi` meta-repo now uses OpenSpec. Older SpecKit-oriented references in legacy planning artifacts are historical context only.
 
 - Hooks and configuration defaults: [arashi.haphazard.dev/workflows/hooks-and-config](https://arashi.haphazard.dev/workflows/hooks-and-config/)
-- Integrations for VSCode, tmux, and `tmux` plus `sesh`: [arashi.haphazard.dev/workflows/integrations](https://arashi.haphazard.dev/workflows/integrations/)
+- Integrations for Herdr, VSCode, tmux, and `tmux` plus `sesh`: [arashi.haphazard.dev/workflows](https://arashi.haphazard.dev/workflows/)
 - Agent-assisted and spec-driven change flow: [arashi.haphazard.dev/workflows/agents-and-specs](https://arashi.haphazard.dev/workflows/agents-and-specs/)
 
 ## Shell Integration
@@ -197,7 +203,7 @@ arashi shell init zsh
 arashi shell init fish
 ```
 
-Once installed, you can use `arashi switch --cd <filter>` for one-off parent-shell switching or set `.arashi/config.json` `defaults.switch.mode` to `"cd"` or `"auto"`.
+Once installed, you can use `arashi switch --cd <filter>` for one-off parent-shell switching or set `.arashi/config.json` `defaults.switch.mode` to `"cd"` or contextual `"auto"`. The canonical modes are `auto` | `cd` | `launch` | `sesh` | `herdr`.
 
 If shell integration is inactive, `arashi switch --cd` warns and skips launch fallback for that invocation.
 
@@ -298,30 +304,36 @@ Example config header:
   "defaults": {
     "create": {
       "switch": true,
-      "launch": false
+      "launch": "none"
     },
     "editors": {
       "vscode": {
         "create": {
-          "launch": true,
-          "launchMode": "sesh"
+          "launch": "sesh"
         }
       }
     },
     "switch": {
-      "mode": "auto",
-      "launchMode": "sesh"
+      "mode": "sesh"
     }
   },
   "repos": {}
 }
 ```
 
-`defaults.switch.mode` accepts `"launch"`, `"cd"`, or `"auto"`. `"auto"` prefers parent-shell switching only when shell integration is active.
+`defaults.switch.mode` accepts `auto` | `cd` | `launch` | `sesh` | `herdr`. Contextual `auto` checks strict managed contexts in the order tmux → Herdr → cmux → integrated IDE, then uses parent-shell `cd` when shell integration is active, and otherwise follows terminal/platform launch fallback. An absent mode preserves the built-in automatic `launch` behavior rather than newly preferring `cd`.
+
+Explicit launcher flags take precedence over `--cd` / `--no-cd`, which take precedence over the configured mode and automatic context detection. `--no-default-launch` bypasses only configured `sesh` or `herdr`. `--herdr` remains available on both `create` and `switch`; Herdr launch uses `herdr worktree open` with the Git-resolved non-bare main checkout and selected worktree.
+
+Legacy switch-only `launchMode` and `launch_mode` fields remain readable for a bounded compatibility window. Arashi warns with the exact replacement `defaults.switch.mode` on stderr; migrate promptly. Ambiguous `cd` plus an explicit legacy launcher and conflicting legacy aliases are rejected.
+
+Use `defaults.create` for terminal `arashi create` behavior. Use `defaults.editors.<host>.create` for editor-specific overrides such as VS Code extension create flows. Supported hosts are `vscode`, `cursor`, and `kiro`. Each scope has one canonical `launch` choice: `none` | `auto` | `sesh` | `herdr`. `switch` stays independent, while any enabled launch implies switch handling for the newly created primary worktree.
+
+Create precedence is: reject `--sesh` plus `--herdr`; then explicit `--sesh` / `--herdr`; `--launch`; `--no-launch`; the matching configured scope; and built-in `none`. An editor-hosted invocation does not fall back to terminal or another editor scope.
 
-Use `defaults.create` for terminal `arashi create` behavior. Use `defaults.editors.<host>.create` for editor-specific overrides such as VS Code extension create flows. Supported hosts are `vscode`, `cursor`, and `kiro`.
+Legacy create booleans plus `launchMode` / `launch_mode` remain readable for a bounded compatibility window. Accepted combinations warn on stderr with the exact canonical replacement and do not rewrite the file. Disabled launch plus a launcher, conflicting aliases, and conflicting canonical/legacy choices are rejected before workspace mutation.
 
-Defaults precedence for create/switch behavior: explicit CLI flag > opt-out flag > config default > built-in default. For editor-hosted `create`, Arashi uses the matching `defaults.editors.<host>.create` override when present and otherwise skips post-create defaults instead of falling back to terminal defaults.
+Defaults precedence for unrelated switch behavior remains unchanged.
 
 ## skills.sh Integration
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arashi",
-  "version": "1.20.1",
+  "version": "1.22.0",
   "description": "Git worktree manager for meta-repositories - The eye of the storm for your development workflow",
   "keywords": [
     "cli",
@@ -81,7 +81,7 @@
     "commander": "12.1.0",
     "conventional-changelog-conventionalcommits": "8.0.0",
     "husky": "9.1.7",
-    "js-yaml": "4.2.0",
+    "js-yaml": "4.3.0",
     "lint-staged": "16.2.7",
     "ora": "8.2.0",
     "oxfmt": "0.28.0",

package/schema/config.schema.json

@@ -82,12 +82,8 @@
       "additionalProperties": false,
       "properties": {
         "launch": {
-          "description": "Default to launching a terminal/editor context after create",
-          "type": "boolean"
-        },
-        "launchMode": {
-          "$ref": "#/definitions/LaunchMode",
-          "description": "Preferred launch mode for create-triggered launch"
+          "$ref": "#/definitions/CreateLaunchMode",
+          "description": "Post-create launch choice; omitted preserves built-in no-launch behavior"
         },
         "switch": {
           "description": "Default to switching to the new worktree after create",
@@ -96,6 +92,10 @@
       },
       "type": "object"
     },
+    "CreateLaunchMode": {
+      "enum": ["none", "auto", "sesh", "herdr"],
+      "type": "string"
+    },
     "EditorCommandDefaults": {
       "additionalProperties": false,
       "properties": {
@@ -121,10 +121,6 @@
       },
       "type": "object"
     },
-    "LaunchMode": {
-      "enum": ["auto", "sesh"],
-      "type": "string"
-    },
     "RepoConfig": {
       "additionalProperties": false,
       "description": "Configuration for a single repository",
@@ -151,19 +147,15 @@
     "SwitchCommandDefaults": {
       "additionalProperties": false,
       "properties": {
-        "launchMode": {
-          "$ref": "#/definitions/LaunchMode",
-          "description": "Preferred launch mode when running switch"
-        },
         "mode": {
           "$ref": "#/definitions/SwitchMode",
-          "description": "Preferred switch behavior when running switch"
+          "description": "Preferred switch behavior and launcher when running switch"
         }
       },
       "type": "object"
     },
     "SwitchMode": {
-      "enum": ["launch", "cd", "auto"],
+      "enum": ["auto", "cd", "launch", "sesh", "herdr"],
       "type": "string"
     }
   }