omarchy: detect tdl command conflict and suggest different installation path (#56)

Author: roblaszczak

install.sh

@@ -360,5 +360,63 @@ adjust_binary
 # compute URL to download
 TARBALL_URL=${GITHUB_DOWNLOAD}/${TAG}/${NAME}
 
+# check if the existing 'tdl' in PATH is a ThreeDotsLabs binary
+is_our_tdl() {
+  existing_tdl=$(command -v tdl 2>/dev/null) || return 1
+  strings "$existing_tdl" 2>/dev/null | grep -q "ThreeDotsLabs"
+}
+
+# detect naming conflicts with other tools (e.g. omarchy) before installing
+detect_conflict() {
+  HAS_OMARCHY=false
+  HAS_OTHER_TDL=false
+
+  if [ -d "$HOME/.local/share/omarchy" ]; then
+    HAS_OMARCHY=true
+  fi
+
+  if is_command tdl && ! is_our_tdl; then
+    HAS_OTHER_TDL=true
+  fi
+
+  if [ "$HAS_OMARCHY" = false ] && [ "$HAS_OTHER_TDL" = false ]; then
+    return
+  fi
+
+  echo "" >/dev/tty
+  if [ "$HAS_OMARCHY" = true ]; then
+    echo "NOTE: Omarchy detected on this system." >/dev/tty
+    echo "  Omarchy provides its own 'tdl' command (Tmux Dev Layout) as a bash function," >/dev/tty
+    echo "  which would shadow the ThreeDotsLabs CLI binary." >/dev/tty
+  elif [ "$HAS_OTHER_TDL" = true ]; then
+    existing=$(command -v tdl)
+    echo "NOTE: Another 'tdl' command was found at: ${existing}" >/dev/tty
+    echo "  Installing the ThreeDotsLabs CLI as 'tdl' would conflict with it." >/dev/tty
+  fi
+
+  echo "" >/dev/tty
+  echo "  Options:" >/dev/tty
+  echo "    1) Install as 'threedots' instead of 'tdl' (recommended)" >/dev/tty
+  echo "    2) Install as 'tdl' anyway" >/dev/tty
+  if [ "$HAS_OMARCHY" = true ]; then
+    echo "" >/dev/tty
+    echo "  Tip: To disable omarchy's 'tdl' and use the ThreeDotsLabs CLI as 'tdl'," >/dev/tty
+    echo "  add this line to your ~/.bashrc (after omarchy's rc is sourced):" >/dev/tty
+    echo "    unset -f tdl" >/dev/tty
+  fi
+  echo "" >/dev/tty
+
+  printf "  Choose [1/2] (default: 1): " >/dev/tty
+  read choice </dev/tty 2>/dev/null || choice="1"
+  case "$choice" in
+    2) log_info "installing as 'tdl' (user chose to keep the name)" ;;
+    *) BINARY="threedots"
+       log_info "installing as 'threedots' to avoid conflict"
+       ;;
+  esac
+}
+
+detect_conflict
+
 # do it
 execute

internal/binary_name.go

@@ -0,0 +1,10 @@
+package internal
+
+import (
+	"os"
+	"path/filepath"
+)
+
+func BinaryName() string {
+	return filepath.Base(os.Args[0])
+}

tdl/main.go

@@ -84,7 +84,7 @@ var configureFlags = []cli.Flag{
 var tokenDocs = fmt.Sprintf("token from %s", internal.WebsiteAddress)
 
 var app = &cli.App{
-	Name:      "tdl",
+	Name:      internal.BinaryName(),
 	Usage:     "https://threedots.tech/ CLI.",
 	Compiled:  time.Now(),
 	Copyright: "(c) Three Dots Labs",

trainings/config/global.go

@@ -41,7 +41,7 @@ func (c Config) GlobalConfig() GlobalConfig {
 	if !c.dirOrFileExists(c.osFs, configPath) {
 		panic(errors.Errorf(
 			"trainings are not configured, please visit %s to get credentials and run %s",
-			internal.WebsiteAddress, internal.SprintCommand("tdl training configure"),
+			internal.WebsiteAddress, internal.SprintCommand(internal.BinaryName()+" training configure"),
 		))
 	}
 

trainings/errors.go

@@ -8,6 +8,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+
+	"github.com/ThreeDotsLabs/cli/internal"
 )
 
 type UserFacingError struct {
@@ -30,7 +32,7 @@ To start fresh, create a new directory and re-initialize:
   %s
 
 This will re-download all your existing solutions.`,
-		color.CyanString("tdl training init %s .", trainingName),
+		color.CyanString(internal.BinaryName()+" training init %s .", trainingName),
 	)
 }
 
@@ -53,7 +55,7 @@ func formatServerError(err error) error {
 	case codes.Unauthenticated:
 		return UserFacingError{
 			Msg:          "Authentication failed.",
-			SolutionHint: "Run " + color.CyanString("tdl training configure <token>") + " to set up your token.",
+			SolutionHint: "Run " + color.CyanString(internal.BinaryName()+" training configure <token>") + " to set up your token.",
 		}
 	case codes.ResourceExhausted:
 		return UserFacingError{

trainings/errors_test.go

@@ -18,7 +18,7 @@ func TestRecoveryHint(t *testing.T) {
 	if !strings.Contains(hint, "mkdir my-training") {
 		t.Error("expected recovery hint to create new directory")
 	}
-	if !strings.Contains(hint, "tdl training init go-event-driven .") {
+	if !strings.Contains(hint, "training init go-event-driven .") {
 		t.Error("expected recovery hint to include training name and dot")
 	}
 	if !strings.Contains(hint, "re-download all your existing solutions") {
@@ -51,7 +51,7 @@ func TestFormatGitError(t *testing.T) {
 	if !strings.Contains(msg, "git branch: fatal: branch already exists: exit status 128") {
 		t.Error("expected error to contain raw git error")
 	}
-	if !strings.Contains(msg, "tdl training init go-event-driven .") {
+	if !strings.Contains(msg, "training init go-event-driven .") {
 		t.Error("expected error to contain recovery hint with training name")
 	}
 }

trainings/git_config.go

@@ -47,7 +47,7 @@ func (h *Handlers) Settings(opts SettingsOptions) error {
 		printCurrentSettings(cfg, globalCfg, gitAvailable)
 		fmt.Println()
 		fmt.Println("To change settings, use flags:")
-		fmt.Println("  " + color.CyanString("tdl training settings --auto-commit=on --mcp=off"))
+		fmt.Println("  " + color.CyanString(internal.BinaryName()+" training settings --auto-commit=on --mcp=off"))
 		return nil
 	}
 
@@ -67,7 +67,7 @@ func (h *Handlers) applySettingsFlags(opts SettingsOptions, cfg *config.Training
 	gitFlagSet := opts.AutoCommit != nil || opts.AutoSync != nil || opts.SyncMode != nil
 	if gitFlagSet && !gitAvailable {
 		fmt.Println("Git integration is not enabled for this training.")
-		fmt.Println("To enable it, reinitialize with: " + color.CyanString("tdl training init"))
+		fmt.Println("To enable it, reinitialize with: " + color.CyanString(internal.BinaryName()+" training init"))
 		return nil
 	}
 

trainings/init.go

@@ -223,7 +223,7 @@ func showGitDefaults() {
 	fmt.Println("  Your work is saved to a backup branch first (never destructive).")
 	fmt.Println()
 	fmt.Printf("  Defaults: auto-commit on, auto-sync off.\n")
-	fmt.Printf("  To change: %s\n\n", color.CyanString("tdl training settings"))
+	fmt.Printf("  To change: %s\n\n", color.CyanString(internal.BinaryName()+" training settings"))
 }
 
 // printGitUnavailableNotice shows a recommendation banner when git is missing or too old.

trainings/mcp/tools.go

@@ -13,6 +13,8 @@ import (
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 	"github.com/sirupsen/logrus"
+
+	"github.com/ThreeDotsLabs/cli/internal"
 )
 
 func registerTools(srv *server.MCPServer, state *LoopState) {
@@ -122,7 +124,7 @@ func handleGetExerciseInfo(state *LoopState) server.ToolHandlerFunc {
 		if updateAvailable, updateVersion, updateNotes := state.GetUpdateAvailable(); updateAvailable {
 			resp.UpdateAvailable = true
 			resp.UpdateVersion = updateVersion
-			resp.UpdateCommand = "tdl update"
+			resp.UpdateCommand = internal.BinaryName() + " update"
 			resp.UpdateReleaseNotes = updateNotes
 		}
 
@@ -333,7 +335,7 @@ func sendCommand(state *LoopState, cmdType CommandType, successMsg string, respo
 		if state.ShouldShowUpdateNoticeMCP() {
 			if updateAvailable, updateVersion, _ := state.GetUpdateAvailable(); updateAvailable {
 				msg += fmt.Sprintf(
-					"\n\nNote: a new CLI version (%s) is available. Run `tdl update` in your terminal.",
+					"\n\nNote: a new CLI version (%s) is available. Run `"+internal.BinaryName()+" update` in your terminal.",
 					updateVersion,
 				)
 				state.MarkUpdateNoticeShownMCP()

trainings/mcp_detect.go

@@ -90,12 +90,12 @@ func promptMCPSetup() bool {
 	fmt.Println()
 	fmt.Println("  If you plan to use an AI coding tool (Claude Code, Cursor, etc.) alongside")
 	fmt.Println("  this training, the MCP server lets it run exercises and check results.")
-	fmt.Println("  It listens on 127.0.0.1 (localhost only) while " + color.CyanString("tdl tr run") + " is active.")
+	fmt.Println("  It listens on 127.0.0.1 (localhost only) while " + color.CyanString(internal.BinaryName()+" tr run") + " is active.")
 	fmt.Println()
 	fmt.Println("  The training works perfectly fine without it.")
 	fmt.Println("  It will integrate your coding agent with this CLI.")
 	fmt.Println(color.New(color.Bold).Sprint("  Writing by hand is still the default, and may help the ideas stick."))
-	fmt.Println("  You can change this later with: " + color.CyanString("tdl training settings"))
+	fmt.Println("  You can change this later with: " + color.CyanString(internal.BinaryName()+" training settings"))
 	fmt.Println()
 
 	choice := internal.Prompt(