feat: worktree-resume integration (worktree 名 = session 名 + RESUME/NEW picker)

README.md

@@ -72,12 +72,26 @@ PR state badge (shown only when [`gh`](https://cli.github.com/) is installed and
 | 🟪 `[MERGED]` | PR has been merged |
 | 🟥 `[CLOSED]` | PR was closed without merging |
 
-Selecting a worktree opens `[r] run` / `[d] delete` / `[b] back`. `run` launches a fresh `claude --permission-mode auto` in that worktree — ccw does **not** reuse Claude Code session IDs (no `--resume` under the hood). Bulk shortcuts (`[delete all]`, `[clean pushed]`, `[custom select]`) remove many at once; dirty items require either `--force` or a three-choice confirm (`y` force · `s` skip dirty · `N` cancel).
+Session badge:
+
+| Badge | Meaning |
+|---|---|
+| 💬 `RESUME` | Past session log exists — `run` restores the conversation |
+| ⚡ `NEW`    | No session log — `run` starts fresh |
+
+Selecting a worktree opens `[r] run` / `[d] delete` / `[b] back`. `run` calls `claude --continue` to restore the past conversation when a session log exists, or `claude -n <worktree>` to start fresh otherwise. Bulk shortcuts (`[delete all]`, `[clean pushed]`, `[custom select]`) remove many at once; dirty items require either `--force` or a three-choice confirm (`y` force · `s` skip dirty · `N` cancel).
 
 Without `gh`, the picker stays functional and shows a hint; rate-limit / network failures hide the PR column silently.
 
-> ⚠️ **Passing `--resume` through `--` is unsupported.**
-> `ccw -n -- --resume ID` and `ccw -s -- --resume ID` combine `claude --worktree` (new worktree) with `--resume` (continue a prior session); the resumed transcript's file references won't match the freshly-created worktree. Even the picker's re-entry path suffers the same mismatch if the selected worktree differs from the session's original. If a resumed session is what you want, run `claude --resume ID` directly — bypass ccw.
+### Naming convention
+
+When ccw creates a new worktree, the worktree directory and the Claude Code session name are kept 1:1:
+
+- Directory: `<repo>/.claude/worktrees/<name>/`
+- Branch: `worktree-<name>`
+- Session name: `<name>` (set via `claude -n <name>`)
+
+`<name>` is generated like `quick-falcon-7bd2`. Renaming the session manually with `/rename` is fine — ccw does not track it, and `--continue` keys off the working directory so conversation restore is unaffected.
 
 ## 📦 Installation
 
@@ -99,7 +113,7 @@ Make sure `~/.local/bin` is on your `PATH`.
 ### Requirements
 
 - [`git`](https://git-scm.com/)
-- [Claude Code](https://docs.claude.com/claude-code) `>= 2.1.49` — the `--worktree` flag that ccw relies on was introduced in 2.1.49 (2026-02-19). ccw offers to install `claude` via npm / brew if missing.
+- [Claude Code](https://docs.claude.com/claude-code) `>= 2.1.76` — ccw uses `--worktree <name>` (added in 2.1.49) together with `-n <name>` (added in 2.1.76). ccw offers to install `claude` via npm / brew if missing.
 - *(optional)* [`gh`](https://cli.github.com/) — enables PR info in the picker
 - *(optional)* [superpowers](https://github.com/obra/superpowers) plugin — auto-checked when `-s` is used
 

cmd/ccw/main.go

@@ -11,6 +11,7 @@ import (
 	"github.com/tqer39/ccw-cli/internal/claude"
 	"github.com/tqer39/ccw-cli/internal/cli"
 	"github.com/tqer39/ccw-cli/internal/gitx"
+	"github.com/tqer39/ccw-cli/internal/namegen"
 	"github.com/tqer39/ccw-cli/internal/picker"
 	"github.com/tqer39/ccw-cli/internal/superpowers"
 	"github.com/tqer39/ccw-cli/internal/ui"
@@ -71,7 +72,8 @@ func run(flags cli.Flags) int {
 	}
 
 	if flags.NewWorktree {
-		code, err := claude.LaunchNew(mainRepo, preamble, flags.Passthrough)
+		name := namegen.Generate()
+		code, err := claude.LaunchNew(mainRepo, name, preamble, flags.Passthrough)
 		if err != nil {
 			ui.Error("%v", err)
 			return 1
@@ -93,19 +95,15 @@ func runPicker(mainRepo string, passthrough []string, interactive bool) int {
 		case picker.ActionCancel:
 			return 0
 		case picker.ActionNew:
-			code, err := claude.LaunchNew(mainRepo, "", passthrough)
+			name := namegen.Generate()
+			code, err := claude.LaunchNew(mainRepo, name, "", passthrough)
 			if err != nil {
 				ui.Error("%v", err)
 				return 1
 			}
 			return code
 		case picker.ActionResume:
-			code, err := claude.Resume(sel.Path, passthrough)
-			if err != nil {
-				ui.Error("%v", err)
-				return 1
-			}
-			return code
+			return runResume(sel, passthrough)
 		case picker.ActionDelete:
 			if err := worktree.Remove(mainRepo, sel.Path, sel.ForceDelete); err != nil {
 				ui.Error("%v", err)
@@ -120,6 +118,39 @@ func runPicker(mainRepo string, passthrough []string, interactive bool) int {
 	}
 }
 
+// runResume launches `claude --continue` when the worktree has a session log,
+// or `claude -n <name>` for fresh starts. The fresh-start path uses
+// LaunchInWorktree because cwd is already an existing worktree (passing
+// `--worktree <name>` from inside one risks a name-collision against git's
+// existing registration). The post-Continue fallback only fires when the
+// session log has actually disappeared between the picker check and Continue
+// returning — so a normal user quit or transient claude error surfaces its
+// exit code instead of silently restarting a fresh conversation.
+func runResume(sel picker.Selection, passthrough []string) int {
+	if !sel.HasSession {
+		return launchInPlace(sel.Path, passthrough)
+	}
+	code, err := claude.Continue(sel.Path, passthrough)
+	if err != nil {
+		ui.Error("%v", err)
+		return 1
+	}
+	if code != 0 && !worktree.HasSession(sel.Path) {
+		return launchInPlace(sel.Path, passthrough)
+	}
+	return code
+}
+
+func launchInPlace(path string, passthrough []string) int {
+	name := worktreeName(path)
+	code, err := claude.LaunchInWorktree(path, name, "", passthrough)
+	if err != nil {
+		ui.Error("%v", err)
+		return 1
+	}
+	return code
+}
+
 func applyBulkDelete(mainRepo string, bulk picker.BulkDeletion) int {
 	errs := 0
 	for _, p := range bulk.Paths {
@@ -237,6 +268,15 @@ func resolveMainRepo() (string, error) {
 	return mainRepo, nil
 }
 
+func worktreeName(path string) string {
+	for i := len(path) - 1; i >= 0; i-- {
+		if path[i] == '/' {
+			return path[i+1:]
+		}
+	}
+	return path
+}
+
 func maybeSuperpowers(enabled bool, interactive, assumeYes bool) (string, error) {
 	if !enabled {
 		return "", nil

docs/README.ja.md

@@ -72,12 +72,26 @@ PR 状態バッジ（[`gh`](https://cli.github.com/) がインストール済み
 | 🟪 `[MERGED]` | マージ済みの PR |
 | 🟥 `[CLOSED]` | マージされずにクローズされた PR |
 
-worktree を選択すると `[r] run` / `[d] delete` / `[b] back` のサブメニューに遷移。`run` は選択した worktree で `claude --permission-mode auto` を新規起動するもので、Claude Code のセッション ID を引き継ぐ（`--resume` 相当の）操作は**行いません**。`[delete all]` / `[clean pushed]` / `[custom select]` は一括削除のショートカットで、dirty を含む場合は `--force` か、または 3 択確認 (`y` force · `s` dirty を除外 · `N` キャンセル) を経由します。
+セッションバッジ:
+
+| バッジ | 意味 |
+|---|---|
+| 💬 `RESUME` | 過去のセッションログがあり、`run` で会話を復元できる |
+| ⚡ `NEW`    | セッションログ無し。`run` は新規起動 |
+
+worktree を選択すると `[r] run` / `[d] delete` / `[b] back` のサブメニューに遷移。`run` はセッションログが残っていれば `claude --continue` で**過去会話を復元**、無ければ `claude -n <worktree名>` で新規起動します。`[delete all]` / `[clean pushed]` / `[custom select]` は一括削除のショートカットで、dirty を含む場合は `--force` か、または 3 択確認 (`y` force · `s` dirty を除外 · `N` キャンセル) を経由します。
 
 `gh` が無い場合も picker は動作し、ヒントを下部に表示。rate limit / ネットワークエラー時は PR 列だけを静かに隠します。
 
-> ⚠️ **`-- --resume ID` のパススルーは非推奨です。**
-> `ccw -n -- --resume ID` や `ccw -s -- --resume ID` は `claude --worktree`（新 worktree 作成）と `--resume`（過去セッション継続）を同時に使うことになり、resume された会話中のファイル参照が新 worktree の実体と合いません。picker 経由で既存 worktree に再入場する場合も、選んだ worktree と session 元の worktree が違えば同様のズレが出ます。過去セッションを resume したいときは ccw を介さず直接 `claude --resume ID` を呼んでください。
+### 命名規約
+
+ccw は新規 worktree を作るとき、worktree 名と Claude Code のセッション名を 1:1 で揃えます:
+
+- ディレクトリ: `<repo>/.claude/worktrees/<name>/`
+- ブランチ: `worktree-<name>`
+- セッション名: `<name>`（`claude -n <name>` で設定）
+
+`<name>` は `quick-falcon-7bd2` のようにジェネレータが生成します。手動で `/rename` した場合も ccw は追跡しません。`--continue` は cwd 基準で動くので会話復元には影響しません。
 
 ## 📦 インストール
 
@@ -99,7 +113,7 @@ go build -o ~/.local/bin/ccw ~/ccw-cli/cmd/ccw
 ### 依存
 
 - [`git`](https://git-scm.com/)
-- [Claude Code](https://docs.claude.com/claude-code) `>= 2.1.49` — ccw が利用する `--worktree` フラグは 2.1.49 (2026-02-19) で追加されました。未導入なら起動時に npm / brew で入れるかを確認します。
+- [Claude Code](https://docs.claude.com/claude-code) `>= 2.1.76` — ccw は `--worktree <name>` (2.1.49 で追加) と `-n <name>` (2.1.76 で追加) を併用します。未導入なら起動時に npm / brew で入れるかを確認します。
 - *(optional)* [`gh`](https://cli.github.com/) — picker で PR 情報を表示
 - *(optional)* [superpowers](https://github.com/obra/superpowers) プラグイン — `-s` 利用時に自動チェック