fix: make tenkai switch robust with shell hook gating

Author: kosuke9809

README.md

@@ -90,9 +90,17 @@ ryoiki tenkai
 | `d` | purpose（用途）を設定 |
 | `f` | workspaceを削除 |
 | `a` | workspaceを追加 |
+| `s` | 選択workspaceへ切り替え（`cd`） |
 | `r` | リフレッシュ |
 | `q` | 終了 |
 
+`s` で切り替えるには最新のシェル統合が必要です。動かない場合は再設定してください。
+
+```bash
+ryoiki init zsh
+source ~/.zshrc
+```
+
 ## Requirements
 
 - [jj (Jujutsu)](https://github.com/jj-vcs/jj) がインストール済みであること

cmd/tenkai.go

@@ -10,6 +10,8 @@ import (
 	"github.com/kosuke9809/ryoiki/internal/tui"
 )
 
+const tenkaiSwitchCaptureEnv = "RYOIKI_TENKAI_SWITCH_CAPTURE"
+
 var tenkaiCmd = &cobra.Command{
 	Use:   "tenkai",
 	Short: "Launch interactive TUI",
@@ -31,12 +33,21 @@ var tenkaiCmd = &cobra.Command{
 			return err
 		}
 		if finalApp, ok := finalModel.(tui.App); ok && finalApp.SwitchPath != "" {
+			if !switchCaptureEnabled() {
+				return fmt.Errorf(
+					"tenkai switch requires updated shell integration. Re-run `ryoiki init <shell>` and reload your shell (e.g. `source ~/.zshrc`)",
+				)
+			}
 			fmt.Print(finalApp.SwitchPath)
 		}
 		return nil
 	},
 }
 
+func switchCaptureEnabled() bool {
+	return os.Getenv(tenkaiSwitchCaptureEnv) == "1"
+}
+
 func requireInteractiveTerminal(stdin, output *os.File, isTerminal func(*os.File) bool) error {
 	if !isTerminal(stdin) || !isTerminal(output) {
 		return fmt.Errorf(

cmd/tenkai_test.go

@@ -70,3 +70,15 @@ func TestIsInteractiveTerminalNilFile(t *testing.T) {
 		t.Fatal("expected nil file to be non-interactive")
 	}
 }
+
+func TestSwitchCaptureEnabled(t *testing.T) {
+	t.Setenv(tenkaiSwitchCaptureEnv, "1")
+	if !switchCaptureEnabled() {
+		t.Fatal("expected switch capture enabled when env=1")
+	}
+
+	t.Setenv(tenkaiSwitchCaptureEnv, "0")
+	if switchCaptureEnabled() {
+		t.Fatal("expected switch capture disabled when env!=1")
+	}
+}

internal/shell/init.go

@@ -8,30 +8,43 @@ import (
 )
 
 const zshScript = `ryoiki() {
+    export RYOIKI_SHELL_HOOK_VERSION=2
     if [[ "$1" == "switch" ]]; then
         local dir
         dir="$(\command ryoiki "$@")" && [[ -n "$dir" ]] && builtin cd -- "$dir"
+    elif [[ "$1" == "tenkai" ]]; then
+        local dir
+        dir="$(RYOIKI_TENKAI_SWITCH_CAPTURE=1 \command ryoiki "$@")" && [[ -n "$dir" ]] && builtin cd -- "$dir"
     else
         \command ryoiki "$@"
     fi
 }
 `
 
 const bashScript = `ryoiki() {
+    export RYOIKI_SHELL_HOOK_VERSION=2
     if [[ "$1" == "switch" ]]; then
         local dir
         dir="$(command ryoiki "$@")" && [[ -n "$dir" ]] && builtin cd -- "$dir"
+    elif [[ "$1" == "tenkai" ]]; then
+        local dir
+        dir="$(RYOIKI_TENKAI_SWITCH_CAPTURE=1 command ryoiki "$@")" && [[ -n "$dir" ]] && builtin cd -- "$dir"
     else
         command ryoiki "$@"
     fi
 }
 `
 
 const fishScript = `function ryoiki
+    set -gx RYOIKI_SHELL_HOOK_VERSION 2
     if test "$argv[1]" = "switch"
         set -l dir (command ryoiki $argv)
         and test -n "$dir"
         and builtin cd -- $dir
+    else if test "$argv[1]" = "tenkai"
+        set -l dir (env RYOIKI_TENKAI_SWITCH_CAPTURE=1 command ryoiki $argv)
+        and test -n "$dir"
+        and builtin cd -- $dir
     else
         command ryoiki $argv
     end

internal/shell/init_test.go

@@ -124,14 +124,14 @@ func TestEvalLine(t *testing.T) {
 	}
 }
 
-func TestInitScriptDoesNotInterceptTenkai(t *testing.T) {
+func TestInitScriptInterceptsTenkai(t *testing.T) {
 	tests := []struct {
 		shell   string
-		contain string
+		contain []string
 	}{
-		{"zsh", `"tenkai"`},
-		{"bash", `"tenkai"`},
-		{"fish", `"tenkai"`},
+		{"zsh", []string{`"switch"`, `"tenkai"`, "RYOIKI_TENKAI_SWITCH_CAPTURE=1", "RYOIKI_SHELL_HOOK_VERSION=2"}},
+		{"bash", []string{`"switch"`, `"tenkai"`, "RYOIKI_TENKAI_SWITCH_CAPTURE=1", "RYOIKI_SHELL_HOOK_VERSION=2"}},
+		{"fish", []string{`"switch"`, `"tenkai"`, "RYOIKI_TENKAI_SWITCH_CAPTURE=1", "RYOIKI_SHELL_HOOK_VERSION 2"}},
 	}
 
 	for _, tt := range tests {
@@ -140,8 +140,10 @@ func TestInitScriptDoesNotInterceptTenkai(t *testing.T) {
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
-			if strings.Contains(script, tt.contain) {
-				t.Errorf("script should not intercept tenkai (found %q):\n%s", tt.contain, script)
+			for _, contain := range tt.contain {
+				if !strings.Contains(script, contain) {
+					t.Errorf("script missing %q:\n%s", contain, script)
+				}
 			}
 		})
 	}