From cb5f99b332ff5a3d1e49a7c96d338d97e727177a Mon Sep 17 00:00:00 2001
From: Ollie Agent <ollie@example.com>
Date: Thu, 30 Jul 2026 23:40:24 +0200
Subject: [PATCH] fix ResolveTool to check OLLIE_TOOLS_PATH for variant cmd
 names

---
 justfile        | 2 ++
 toolsrv/meta.go | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/justfile b/justfile
index 3c24eb7..9383abc 100644
--- a/justfile
+++ b/justfile
@@ -155,6 +155,8 @@ install-data:
     install -m755 data/tools/route {{cfg}}/tools/route
     install -m755 data/tools/subagent_generate {{cfg}}/tools/subagent_generate
     install -m755 data/tools/subagent_spawn {{cfg}}/tools/subagent_spawn
+    install -m755 data/tools/system_logs_dmesg {{cfg}}/tools/system_logs_dmesg
+    install -m755 data/tools/system_logs_journald {{cfg}}/tools/system_logs_journald
     # Tool metadata (.meta sidecar files)
     for f in data/tools/*.meta; do install -m644 "$f" {{cfg}}/tools/"$(basename $f)"; done
     # Tools (library modules)
diff --git a/toolsrv/meta.go b/toolsrv/meta.go
index 27426d6..3b07ff0 100644
--- a/toolsrv/meta.go
+++ b/toolsrv/meta.go
@@ -196,6 +196,11 @@ func ResolveTool(name string) (string, error) {
 	if m, err := LoadMetaFile(name); err == nil && m != nil {
 		resolved := m.Resolve()
 		if resolved != nil && resolved.Cmd != "" {
+			// Check tools path for the cmd name first
+			cmdLocal := filepath.Join(ToolsPath(), resolved.Cmd)
+			if info, err := os.Stat(cmdLocal); err == nil && !info.IsDir() {
+				return cmdLocal, nil
+			}
 			if filepath.IsAbs(resolved.Cmd) {
 				return resolved.Cmd, nil
 			}