fix: stopReason/suppressOutputのマージ処理追加

Notification hookでcommand actionが返すstopReason/suppressOutputが
最終JSON出力に反映されていなかった問題を修正

- ExecuteNotificationAction: ActionOutputにStopReason/SuppressOutputをコピー
- executeNotificationHooksJSON: PostToolUseパターンに倣ってマージ処理追加
  - StopReason: 最後の非空値が勝ち
  - SuppressOutput: 最後の値が勝ち
- テスト追加: executor_test.go/hooks_test.goで検証

Author: syou6162

executor.go

@@ -88,9 +88,11 @@ func (e *ActionExecutor) ExecuteNotificationAction(action Action, input *Notific
 
 		// Build ActionOutput from parsed JSON
 		result := &ActionOutput{
-			Continue:      cmdOutput.Continue,
-			HookEventName: cmdOutput.HookSpecificOutput.HookEventName,
-			SystemMessage: cmdOutput.SystemMessage,
+			Continue:       cmdOutput.Continue,
+			HookEventName:  cmdOutput.HookSpecificOutput.HookEventName,
+			SystemMessage:  cmdOutput.SystemMessage,
+			StopReason:     cmdOutput.StopReason,
+			SuppressOutput: cmdOutput.SuppressOutput,
 		}
 
 		// Set AdditionalContext

executor_test.go

@@ -3213,13 +3213,15 @@ func TestExecuteSubagentStopAction_TypeCommand(t *testing.T) {
 
 func TestExecuteNotificationAction_TypeOutput(t *testing.T) {
 	tests := []struct {
-		name              string
-		action            Action
-		wantContinue      bool
-		wantHookEventName string
-		wantAdditionalCtx string
-		wantSystemMessage string
-		wantErr           bool
+		name               string
+		action             Action
+		wantContinue       bool
+		wantHookEventName  string
+		wantAdditionalCtx  string
+		wantSystemMessage  string
+		wantStopReason     string
+		wantSuppressOutput bool
+		wantErr            bool
 	}{
 		{
 			name: "Message with continue unspecified defaults to true",
@@ -3330,23 +3332,33 @@ func TestExecuteNotificationAction_TypeOutput(t *testing.T) {
 			if tt.wantSystemMessage != "" && output.SystemMessage != tt.wantSystemMessage {
 				t.Errorf("SystemMessage = %q, want %q", output.SystemMessage, tt.wantSystemMessage)
 			}
+
+			if tt.wantStopReason != "" && output.StopReason != tt.wantStopReason {
+				t.Errorf("StopReason = %q, want %q", output.StopReason, tt.wantStopReason)
+			}
+
+			if output.SuppressOutput != tt.wantSuppressOutput {
+				t.Errorf("SuppressOutput = %v, want %v", output.SuppressOutput, tt.wantSuppressOutput)
+			}
 		})
 	}
 }
 
 func TestExecuteNotificationAction_TypeCommand(t *testing.T) {
 	tests := []struct {
-		name              string
-		action            Action
-		stubStdout        string
-		stubStderr        string
-		stubExitCode      int
-		stubErr           error
-		wantContinue      bool
-		wantHookEventName string
-		wantAdditionalCtx string
-		wantSystemMessage string
-		wantErr           bool
+		name               string
+		action             Action
+		stubStdout         string
+		stubStderr         string
+		stubExitCode       int
+		stubErr            error
+		wantContinue       bool
+		wantHookEventName  string
+		wantAdditionalCtx  string
+		wantSystemMessage  string
+		wantStopReason     string
+		wantSuppressOutput bool
+		wantErr            bool
 	}{
 		{
 			name: "Command success with valid JSON and all fields",
@@ -3419,6 +3431,31 @@ func TestExecuteNotificationAction_TypeCommand(t *testing.T) {
 			wantSystemMessage: "",
 			wantErr:           false,
 		},
+		{
+			name: "Command with stopReason and suppressOutput",
+			action: Action{
+				Type:    "command",
+				Command: "get-notification-with-flags.sh",
+			},
+			stubStdout: `{
+				"continue": true,
+				"stopReason": "test_stop_reason",
+				"suppressOutput": true,
+				"hookSpecificOutput": {
+					"hookEventName": "Notification",
+					"additionalContext": "Notification with flags"
+				}
+			}`,
+			stubStderr:         "",
+			stubExitCode:       0,
+			wantContinue:       true,
+			wantHookEventName:  "Notification",
+			wantAdditionalCtx:  "Notification with flags",
+			wantSystemMessage:  "",
+			wantStopReason:     "test_stop_reason",
+			wantSuppressOutput: true,
+			wantErr:            false,
+		},
 	}
 
 	for _, tt := range tests {
@@ -3469,6 +3506,14 @@ func TestExecuteNotificationAction_TypeCommand(t *testing.T) {
 			if tt.wantSystemMessage != "" && output.SystemMessage != tt.wantSystemMessage {
 				t.Errorf("SystemMessage = %q, want %q", output.SystemMessage, tt.wantSystemMessage)
 			}
+
+			if tt.wantStopReason != "" && output.StopReason != tt.wantStopReason {
+				t.Errorf("StopReason = %q, want %q", output.StopReason, tt.wantStopReason)
+			}
+
+			if output.SuppressOutput != tt.wantSuppressOutput {
+				t.Errorf("SuppressOutput = %v, want %v", output.SuppressOutput, tt.wantSuppressOutput)
+			}
 		})
 	}
 }

hooks.go

@@ -627,6 +627,14 @@ func executeNotificationHooksJSON(config *Config, input *NotificationInput, rawJ
 				systemMessageBuilder.WriteString(actionOutput.SystemMessage)
 			}
 
+			// StopReason: 最後の非空値が勝ち
+			if actionOutput.StopReason != "" {
+				finalOutput.StopReason = actionOutput.StopReason
+			}
+
+			// SuppressOutput: 最後の値が勝ち
+			finalOutput.SuppressOutput = actionOutput.SuppressOutput
+
 			// No early return for Notification (cannot block)
 		}
 	}

hooks_test.go

@@ -3681,6 +3681,8 @@ func TestExecuteNotificationHooksJSON(t *testing.T) {
 		wantHookEventName     string
 		wantAdditionalContext string
 		wantSystemMessage     string
+		wantStopReason        string
+		wantSuppressOutput    bool
 		wantErr               bool
 		wantErrContains       string
 	}{
@@ -3825,6 +3827,14 @@ func TestExecuteNotificationHooksJSON(t *testing.T) {
 				if tt.wantSystemMessage != "" && output.SystemMessage != tt.wantSystemMessage {
 					t.Errorf("SystemMessage = %q, want %q", output.SystemMessage, tt.wantSystemMessage)
 				}
+
+				if tt.wantStopReason != "" && output.StopReason != tt.wantStopReason {
+					t.Errorf("StopReason = %q, want %q", output.StopReason, tt.wantStopReason)
+				}
+
+				if output.SuppressOutput != tt.wantSuppressOutput {
+					t.Errorf("SuppressOutput = %v, want %v", output.SuppressOutput, tt.wantSuppressOutput)
+				}
 			}
 		})
 	}