feat(webhook): configure shutdown timeout wiring

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>

Author: tae2089

internal/cli/serve.go

@@ -35,6 +35,7 @@ type ServeConfig struct {
 	RepoRoot                string
 	WebhookMaxTrackedRepos  int
 	WebhookAttemptTimeout   time.Duration
+	WebhookShutdownTimeout  time.Duration
 	WebhookRetryAttempts    int
 	WebhookRetryBaseDelay   time.Duration
 	WebhookRetryMaxDelay    time.Duration
@@ -59,6 +60,9 @@ func validateServeConfig(cfg ServeConfig) error {
 	if cfg.WebhookAttemptTimeout <= 0 {
 		return fmt.Errorf("--webhook-attempt-timeout must be > 0")
 	}
+	if cfg.WebhookShutdownTimeout <= 0 {
+		return fmt.Errorf("--webhook-shutdown-timeout must be > 0")
+	}
 	if cfg.WebhookRetryAttempts <= 0 {
 		return fmt.Errorf("--webhook-retry-attempts must be > 0")
 	}
@@ -147,6 +151,7 @@ func newServeCmd(deps *Deps) *cobra.Command {
 	cmd.Flags().IntVar(&cfg.WebhookWorkers, "webhook-workers", envInt("CCG_WEBHOOK_WORKERS", 4), "Number of webhook sync workers")
 	cmd.Flags().IntVar(&cfg.WebhookMaxTrackedRepos, "webhook-max-tracked-repos", envInt("CCG_WEBHOOK_MAX_TRACKED_REPOS", 1024), "Maximum repositories tracked by the webhook sync queue")
 	cmd.Flags().DurationVar(&cfg.WebhookAttemptTimeout, "webhook-attempt-timeout", envDuration("CCG_WEBHOOK_ATTEMPT_TIMEOUT", 15*time.Minute), "Timeout for one webhook sync attempt")
+	cmd.Flags().DurationVar(&cfg.WebhookShutdownTimeout, "webhook-shutdown-timeout", envDuration("CCG_WEBHOOK_SHUTDOWN_TIMEOUT", 30*time.Second), "Timeout for graceful webhook queue shutdown and HTTP drain")
 	cmd.Flags().IntVar(&cfg.WebhookRetryAttempts, "webhook-retry-attempts", envInt("CCG_WEBHOOK_RETRY_ATTEMPTS", 3), "Maximum webhook sync attempts per queued item")
 	cmd.Flags().DurationVar(&cfg.WebhookRetryBaseDelay, "webhook-retry-base-delay", envDuration("CCG_WEBHOOK_RETRY_BASE_DELAY", time.Second), "Initial webhook sync retry delay")
 	cmd.Flags().DurationVar(&cfg.WebhookRetryMaxDelay, "webhook-retry-max-delay", envDuration("CCG_WEBHOOK_RETRY_MAX_DELAY", 30*time.Second), "Maximum webhook sync retry delay")

internal/cli/serve_test.go

@@ -444,14 +444,15 @@ func TestServeCmdFlags_WebhookOperationalTuning(t *testing.T) {
 	err := executeCmd(deps, stdout, stderr, "serve",
 		"--webhook-max-tracked-repos", "8",
 		"--webhook-attempt-timeout", "2m",
+		"--webhook-shutdown-timeout", "45s",
 		"--webhook-retry-attempts", "5",
 		"--webhook-retry-base-delay", "2s",
 		"--webhook-retry-max-delay", "20s",
 	)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if got.WebhookMaxTrackedRepos != 8 || got.WebhookAttemptTimeout != 2*time.Minute ||
+	if got.WebhookMaxTrackedRepos != 8 || got.WebhookAttemptTimeout != 2*time.Minute || got.WebhookShutdownTimeout != 45*time.Second ||
 		got.WebhookRetryAttempts != 5 || got.WebhookRetryBaseDelay != 2*time.Second ||
 		got.WebhookRetryMaxDelay != 20*time.Second {
 		t.Fatalf("unexpected webhook tuning config: %+v", got)
@@ -461,6 +462,7 @@ func TestServeCmdFlags_WebhookOperationalTuning(t *testing.T) {
 func TestServeCmd_UsesWebhookTuningFromEnv(t *testing.T) {
 	t.Setenv("CCG_WEBHOOK_MAX_TRACKED_REPOS", "9")
 	t.Setenv("CCG_WEBHOOK_ATTEMPT_TIMEOUT", "3m")
+	t.Setenv("CCG_WEBHOOK_SHUTDOWN_TIMEOUT", "40s")
 	t.Setenv("CCG_WEBHOOK_RETRY_ATTEMPTS", "6")
 	t.Setenv("CCG_WEBHOOK_RETRY_BASE_DELAY", "3s")
 	t.Setenv("CCG_WEBHOOK_RETRY_MAX_DELAY", "30s")
@@ -476,13 +478,25 @@ func TestServeCmd_UsesWebhookTuningFromEnv(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if got.WebhookMaxTrackedRepos != 9 || got.WebhookAttemptTimeout != 3*time.Minute ||
+	if got.WebhookMaxTrackedRepos != 9 || got.WebhookAttemptTimeout != 3*time.Minute || got.WebhookShutdownTimeout != 40*time.Second ||
 		got.WebhookRetryAttempts != 6 || got.WebhookRetryBaseDelay != 3*time.Second ||
 		got.WebhookRetryMaxDelay != 30*time.Second {
 		t.Fatalf("unexpected webhook env config: %+v", got)
 	}
 }
 
+func TestServeCmd_RejectsNonPositiveWebhookShutdownTimeout(t *testing.T) {
+	deps, stdout, stderr := newTestDeps()
+	deps.ServeFunc = func(cfg ServeConfig) error { return nil }
+
+	for _, timeout := range []string{"0s", "-1s"} {
+		err := executeCmd(deps, stdout, stderr, "serve", "--transport", "streamable-http", "--webhook-shutdown-timeout", timeout)
+		if err == nil || !strings.Contains(err.Error(), "--webhook-shutdown-timeout must be > 0") {
+			t.Fatalf("expected webhook shutdown timeout validation error for %s, got %v", timeout, err)
+		}
+	}
+}
+
 func TestServeCmd_RejectsNonPositiveWebhookWorkers(t *testing.T) {
 	deps, stdout, stderr := newTestDeps()
 	deps.ServeFunc = func(cfg ServeConfig) error { return nil }

internal/server/serve.go

@@ -310,6 +310,7 @@ func RunStreamableHTTP(deps *cli.Deps, srv *mcpgo.MCPServer, cfg cli.ServeConfig
 				BaseDelay:   cfg.WebhookRetryBaseDelay,
 				MaxDelay:    cfg.WebhookRetryMaxDelay,
 			},
+			ShutdownTimeout: cfg.WebhookShutdownTimeout,
 			MaxTrackedRepos: cfg.WebhookMaxTrackedRepos,
 		})
 		mux.Handle("/webhook", webhook.NewWebhookHandlerWithConfig(webhook.WebhookHandlerConfig{
@@ -358,7 +359,7 @@ func RunStreamableHTTP(deps *cli.Deps, srv *mcpgo.MCPServer, cfg cli.ServeConfig
 		return nil
 	case <-ctx.Done():
 		deps.Logger.Info("shutting down HTTP server")
-		shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), cfg.WebhookShutdownTimeout)
 		defer cancel()
 		if err := httpServer.Shutdown(shutdownCtx); err != nil {
 			return trace.Wrap(err, "HTTP server shutdown")