2 files changed, 24 insertions, 2 deletions

diff --git a/shared/server-commands/runners/runner-jobs-command.ts b/shared/server-commands/runners/runner-jobs-command.ts
index 3b0f84b9d..26dbef77a 100644
--- a/shared/server-commands/runners/runner-jobs-command.ts
+++ b/shared/server-commands/runners/runner-jobs-command.ts
@@ -200,7 +200,7 @@ export class RunnerJobsCommand extends AbstractCommand {
     })
   }
 
-  getInputFile (options: OverrideCommandOptions & { url: string, jobToken: string, runnerToken: string }) {
+  getJobFile (options: OverrideCommandOptions & { url: string, jobToken: string, runnerToken: string }) {
     const { host, protocol, pathname } = new URL(options.url)
 
     return this.postBodyRequest({
@@ -249,8 +249,15 @@ export class RunnerJobsCommand extends AbstractCommand {
 
     const { data } = await this.list({ count: 100 })
 
+    const allowedStates = new Set<RunnerJobState>([
+      RunnerJobState.PENDING,
+      RunnerJobState.PROCESSING,
+      RunnerJobState.WAITING_FOR_PARENT_JOB
+    ])
+
     for (const job of data) {
       if (state && job.state.id !== state) continue
+      else if (allowedStates.has(job.state.id) !== true) continue
 
       await this.cancelByAdmin({ jobUUID: job.uuid })
     }
diff --git a/shared/server-commands/server/config-command.ts b/shared/server-commands/server/config-command.ts
index 9a6e413f2..b94bd2625 100644
--- a/shared/server-commands/server/config-command.ts
+++ b/shared/server-commands/server/config-command.ts
@@ -195,6 +195,18 @@ export class ConfigCommand extends AbstractCommand {
     })
   }
 
+  enableRemoteStudio () {
+    return this.updateExistingSubConfig({
+      newConfig: {
+        videoStudio: {
+          remoteRunners: {
+            enabled: true
+          }
+        }
+      }
+    })
+  }
+
   // ---------------------------------------------------------------------------
 
   enableStudio () {
@@ -442,7 +454,10 @@ export class ConfigCommand extends AbstractCommand {
         }
       },
       videoStudio: {
-        enabled: false
+        enabled: false,
+        remoteRunners: {
+          enabled: false
+        }
       },
       import: {
         videos: {