Remove concept of tool permissions

Author: stanislavHamara

pkg/runtime/runtime.go

@@ -1335,39 +1335,18 @@ func (r *LocalRuntime) processToolCalls(ctx context.Context, sess *session.Sessi
 //
 // The approval flow considers (in order):
 //
-//  1. Session-level permissions (if configured) - checked first
-//     a. Per-tool settings (Tools map) - most specific, checked first
-//     b. Pattern-based Allow/Deny - broader rules, checked as fallback
+//  1. Session-level permissions (if configured) - pattern-based Allow/Deny rules
 //  2. Team-level permissions config - checked second
 //  3. sess.ToolsApproved (--yolo flag) - auto-approve all
 //  4. tool.Annotations.ReadOnlyHint - auto-approve read-only tools
 //  5. Default: ask for user confirmation
 //
-// Example session permissions configurations:
+// Example session permissions configuration:
 //
-//	// Per-tool settings - granular control per tool
-//	sess.Permissions = &session.PermissionsConfig{
-//	    Tools: map[string]session.ToolPermission{
-//	        "shell":      {Enabled: ptr(true), Mode: "ask"},          // require confirmation
-//	        "filesystem": {Enabled: ptr(true), Mode: "always_allow"}, // auto-approve
-//	        "dangerous":  {Enabled: ptr(false)},                      // disabled
-//	    },
-//	}
-//
-//	// Pattern-based rules - apply to multiple tools at once
 //	sess.Permissions = &session.PermissionsConfig{
 //	    Allow: []string{"read_*", "think"},  // auto-approve matching tools
 //	    Deny:  []string{"shell", "exec_*"},  // block matching tools
 //	}
-//
-//	// Mixed: per-tool settings take priority over patterns
-//	sess.Permissions = &session.PermissionsConfig{
-//	    Tools: map[string]session.ToolPermission{
-//	        "shell": {Enabled: ptr(true), Mode: "ask"}, // overrides Deny pattern
-//	    },
-//	    Allow: []string{"*"},     // applies to tools not in Tools map
-//	    Deny:  []string{"shell"}, // ignored for shell since it's in Tools map
-//	}
 func (r *LocalRuntime) executeWithApproval(
 	ctx context.Context,
 	sess *session.Session,
@@ -1389,81 +1368,50 @@ func (r *LocalRuntime) executeWithApproval(
 		}
 	}
 
-	// requiresConfirmation tracks if per-tool settings require user confirmation
-	// (skipping pattern-based rules and other auto-approve checks)
-	requiresConfirmation := false
-
 	// 1. Check session-level permissions first (if configured)
 	if sess.Permissions != nil {
-		// 1a. Check Tools map first (new per-tool settings)
-		if perm := sess.Permissions.GetToolPermission(toolName); perm != nil {
-			// Check if tool is disabled
-			if !sess.Permissions.IsToolEnabled(toolName) {
-				slog.Debug("Tool disabled by session permissions", "tool", toolName, "session_id", sess.ID)
-				r.addToolErrorResponse(ctx, sess, toolCall, tool, events, a, fmt.Sprintf("Tool '%s' is disabled by session permissions.", toolName))
-				return false
-			}
-			// Check permission mode
-			mode := sess.Permissions.GetToolMode(toolName)
-			switch mode {
-			case session.PermissionModeAlwaysAllow:
-				slog.Debug("Tool auto-approved by session per-tool permissions", "tool", toolName, "mode", mode, "session_id", sess.ID)
-				runTool()
-				return false
-			case session.PermissionModeAsk:
-			default:
-				slog.Debug("Tool requires confirmation by session per-tool permissions ", "tool", toolName, "mode", mode, "session_id", sess.ID)
-				requiresConfirmation = true
-			}
-		}
-
-		// 1b. Fall back to pattern-based Allow/Deny rules (only if not already handled by Tools map)
-		if !requiresConfirmation {
-			sessionChecker := permissions.NewChecker(&latest.PermissionsConfig{
-				Allow: sess.Permissions.Allow,
-				Deny:  sess.Permissions.Deny,
-			})
-			decision := sessionChecker.CheckWithArgs(toolName, toolArgs)
-			switch decision {
-			case permissions.Deny:
-				slog.Debug("Tool denied by session permissions", "tool", toolName, "session_id", sess.ID)
-				r.addToolErrorResponse(ctx, sess, toolCall, tool, events, a, fmt.Sprintf("Tool '%s' is denied by session permissions.", toolName))
-				return false
-			case permissions.Allow:
-				slog.Debug("Tool auto-approved by session permissions", "tool", toolName, "session_id", sess.ID)
-				runTool()
-				return false
-			case permissions.Ask:
-				// Fall through to team permissions
-			}
+		sessionChecker := permissions.NewChecker(&latest.PermissionsConfig{
+			Allow: sess.Permissions.Allow,
+			Deny:  sess.Permissions.Deny,
+		})
+		decision := sessionChecker.CheckWithArgs(toolName, toolArgs)
+		switch decision {
+		case permissions.Deny:
+			slog.Debug("Tool denied by session permissions", "tool", toolName, "session_id", sess.ID)
+			r.addToolErrorResponse(ctx, sess, toolCall, tool, events, a, fmt.Sprintf("Tool '%s' is denied by session permissions.", toolName))
+			return false
+		case permissions.Allow:
+			slog.Debug("Tool auto-approved by session permissions", "tool", toolName, "session_id", sess.ID)
+			runTool()
+			return false
+		case permissions.Ask:
+			// Fall through to team permissions
 		}
 	}
 
-	// 2. Check team-level permissions config (skip if per-tool ask mode is set)
-	if !requiresConfirmation {
-		if permChecker := r.team.Permissions(); permChecker != nil {
-			decision := permChecker.CheckWithArgs(toolName, toolArgs)
-			switch decision {
-			case permissions.Deny:
-				slog.Debug("Tool denied by team permissions config", "tool", toolName, "session_id", sess.ID)
-				r.addToolErrorResponse(ctx, sess, toolCall, tool, events, a, fmt.Sprintf("Tool '%s' is denied by permissions configuration.", toolName))
-				return false
-			case permissions.Allow:
-				slog.Debug("Tool auto-approved by team permissions config", "tool", toolName, "session_id", sess.ID)
-				runTool()
-				return false
-			case permissions.Ask:
-				// Fall through to normal approval flow
-			}
-		}
-
-		// Check --yolo flag or read-only hint (skip if per-tool ask mode is set)
-		if sess.ToolsApproved || tool.Annotations.ReadOnlyHint {
+	// 2. Check team-level permissions config
+	if permChecker := r.team.Permissions(); permChecker != nil {
+		decision := permChecker.CheckWithArgs(toolName, toolArgs)
+		switch decision {
+		case permissions.Deny:
+			slog.Debug("Tool denied by team permissions config", "tool", toolName, "session_id", sess.ID)
+			r.addToolErrorResponse(ctx, sess, toolCall, tool, events, a, fmt.Sprintf("Tool '%s' is denied by permissions configuration.", toolName))
+			return false
+		case permissions.Allow:
+			slog.Debug("Tool auto-approved by team permissions config", "tool", toolName, "session_id", sess.ID)
 			runTool()
 			return false
+		case permissions.Ask:
+			// Fall through to normal approval flow
 		}
 	}
 
+	// 3. Check --yolo flag or read-only hint
+	if sess.ToolsApproved || tool.Annotations.ReadOnlyHint {
+		runTool()
+		return false
+	}
+
 	// Ask user for confirmation
 	slog.Debug("Tools not approved, waiting for resume", "tool", toolCall.Function.Name, "session_id", sess.ID)
 	events <- ToolCallConfirmation(toolCall, tool, a.Name())