From 110b072200df7775333254792c061ff3d71c7f10 Mon Sep 17 00:00:00 2001
From: Michael Yang <git@mxy.ng>
Date: Mon, 19 Jan 2026 14:00:05 -0800
Subject: [PATCH] chore: simplify runner.Execute

---
 cmd/cmd.go         |  2 +-
 cmd/runner/main.go | 15 ---------------
 runner/runner.go   | 29 ++++++++---------------------
 3 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 cmd/runner/main.go

diff --git a/cmd/cmd.go b/cmd/cmd.go
index 5139c05cb..3943dfa31 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -1958,7 +1958,7 @@ func NewCLI() *cobra.Command {
 		Use:    "runner",
 		Hidden: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runner.Execute(os.Args[1:])
+			return runner.Execute(os.Args[2:])
 		},
 		FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
 	}
diff --git a/cmd/runner/main.go b/cmd/runner/main.go
deleted file mode 100644
index fbfafc7ff..000000000
--- a/cmd/runner/main.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/ollama/ollama/runner"
-)
-
-func main() {
-	if err := runner.Execute(os.Args[1:]); err != nil {
-		fmt.Fprintf(os.Stderr, "error: %s\n", err)
-		os.Exit(1)
-	}
-}
diff --git a/runner/runner.go b/runner/runner.go
index 543410798..98fc5ede6 100644
--- a/runner/runner.go
+++ b/runner/runner.go
@@ -7,26 +7,13 @@ import (
 )
 
 func Execute(args []string) error {
-	if args[0] == "runner" {
-		args = args[1:]
-	}
-
-	var newRunner bool
-	var imageRunner bool
-	if len(args) > 0 && args[0] == "--ollama-engine" {
-		args = args[1:]
-		newRunner = true
-	}
-	if len(args) > 0 && args[0] == "--image-engine" {
-		args = args[1:]
-		imageRunner = true
-	}
-
-	if imageRunner {
-		return imagerunner.Execute(args)
-	} else if newRunner {
-		return ollamarunner.Execute(args)
-	} else {
-		return llamarunner.Execute(args)
+	if len(args) > 0 {
+		switch args[0] {
+		case "--ollama-engine":
+			return ollamarunner.Execute(args[1:])
+		case "--image-engine":
+			return imagerunner.Execute(args[1:])
+		}
 	}
+	return llamarunner.Execute(args)
 }