diff --git a/.gitignore b/.gitignore
index fedb5786d4..d7162fb2ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@
 .DS_Store
 .claude/settings.local.json
 
+# Agent tools
+.mcp_*
+.mcp.*
+
 # Testing
 test_config.json
 test-dry-run.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1e5c9bcfa4..8f77820e27 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -50,4 +50,4 @@
     "platforma",
     "ptable"
   ],
-}
\ No newline at end of file
+}
diff --git a/sdk/workflow-tengo/src/exec/limits.lib.tengo b/sdk/workflow-tengo/src/exec/limits.lib.tengo
index 8ff7e70002..bded6fcdf2 100644
--- a/sdk/workflow-tengo/src/exec/limits.lib.tengo
+++ b/sdk/workflow-tengo/src/exec/limits.lib.tengo
@@ -31,7 +31,7 @@ getResourceTypes := func(queueName) {
 
 	// Fallback: existing logic for backward compatibility with older backends
 	runnerType := constants.RUNNER_EXECUTOR
-	if feats.hasBatch && queueName != constants.UI_TASKS_QUEUE {
+	if feats.hasBatch && (queueName != constants.UI_TASKS_QUEUE || !feats.uiQueueAllowedInExecutor) {
 		runnerType = constants.RUNNER_BATCH
 	}
 	return {
diff --git a/sdk/workflow-tengo/src/feats.lib.tengo b/sdk/workflow-tengo/src/feats.lib.tengo
index 33d9edb4c7..1fee375f45 100644
--- a/sdk/workflow-tengo/src/feats.lib.tengo
+++ b/sdk/workflow-tengo/src/feats.lib.tengo
@@ -67,6 +67,9 @@ export ll.toStrict({
 	// true when backend supports docker packages
 	isDockerAvailable:        _isEnabled("dockerSupport"),
 
+	// when true (default), ui-tasks queue uses RunCommand/executor resource type.
+	// when false, ui-tasks queue uses RunCommand/batch resource type (when batch setup is active).
+	uiQueueAllowedInExecutor: _isEnabled("uiQueueAllowedInExecutor")
 	// true when backend supports 'secret' argType for environment variables
 	secretEnvSupport:         _isEnabled("secretEnvSupport")
 })