feat: hot-swap LLM backend + media keys + codebase Q&A + scheduler cancel-by-text + TTS pre-warm
Single biggest user-facing change: you can now switch local↔cloud LLM by voice
without restarting. Plus four new packs and a perf nudge.
Shared LLM global (crates/jarvis-core/src/llm/mod.rs)
- GLOBAL: Lazy<RwLock<Option<Arc<LlmClient>>>>. Single source of truth.
- init_global() / current() / swap_to(LlmBackend) / current_backend_name() / parse_backend(str).
- llm_fallback + llm_router migrated: they no longer own a separate LlmClient,
they read from the global on each request. Hot-swap is now LIVE — change
backend, next chat call uses the new one.
- parse_backend accepts both english and russian aliases:
"groq"/"cloud"/"облако"/"клауд" → Groq
"ollama"/"local"/"локал"/"локальный" → Ollama
Voice + Lua LLM switcher (resources/commands/llm_switch/, 3 commands)
- "переключись на локальный" / "перейди на оллама" → swap to Ollama
- "переключись на облако" / "используй грок" → swap to Groq
- "какой у тебя мозг" / "облако или локально" → status query
Underlying Lua API (registered globally):
jarvis.llm({messages}, opts) -- as before, now uses global client
jarvis.llm_status() -> "groq" | "ollama" | "none"
jarvis.llm_switch(name) -> name on success, nil on failure
Media keys pack (resources/commands/media_keys/, 4 commands)
- "пауза" / "плей" → VK_MEDIA_PLAY_PAUSE
- "следующий трек" → VK_MEDIA_NEXT_TRACK
- "предыдущий трек" → VK_MEDIA_PREV_TRACK
- "стоп музыка" → VK_MEDIA_STOP
- Helper _media.ps1 uses user32.keybd_event (P/Invoke through Add-Type).
- Works with anything that listens to global media keys: Spotify, Yandex Music,
YouTube (focused tab), Foobar2000, Winamp, etc. No OAuth, no API keys.
Codebase Q&A pack (resources/commands/codebase_qa/, 3 commands)
- "укажи проект <path>" → stores path in jarvis.memory under codebase.root
- "какой проект сейчас" → speaks current path
- "что делает функция X" / "найди в коде Y" / "объясни код"
→ walks the folder (depth 3, 30 files cap, 4KB per file, 50KB total),
filters by source extensions (rs/py/ts/lua/go/...), feeds digest to LLM
with a "senior reviewer" system prompt, speaks 3-5 sentence answer.
Scheduler cancel-by-text (crates/jarvis-core/src/scheduler.rs)
- new pub fn find_by_text(query, limit) -> Vec<ScheduledTask>
- new pub fn remove_by_text(query) -> usize (count removed)
- new pure helper find_by_text_in(tasks, query, limit) for tests
- Lua: jarvis.scheduler.{find_by_text, remove_by_text}
- Voice: "отмени напоминание про воду" / "удали задачу про разминку"
- 3 new unit tests (52 total in jarvis-core).
TTS pre-warm (crates/jarvis-app/src/main.rs)
- Call jarvis_core::tts::backend() once on startup so the first speak()
doesn't pay Piper binary discovery + voice loading cost. Cuts first-speak
latency by ~150-300ms depending on backend.
Build: cargo build --release -p jarvis-app -p jarvis-gui both green.
Tests: 52/52 jarvis-core unit tests pass.
This commit is contained in:
parent
6225198821
commit
5c7245012e
19 changed files with 709 additions and 34 deletions
98
resources/commands/codebase_qa/ask.lua
Normal file
98
resources/commands/codebase_qa/ask.lua
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
-- "что делает функция X" / "найди в коде Y"
|
||||
-- Reads a digest of source files in the configured codebase root, sends to LLM.
|
||||
local root = jarvis.memory.recall("codebase.root")
|
||||
if not root or root == "" then
|
||||
return jarvis.cmd.not_found("Сначала укажите проект.")
|
||||
end
|
||||
|
||||
local phrase = (jarvis.context.phrase or "")
|
||||
local question = jarvis.text.strip_trigger(phrase:lower(), {
|
||||
"что делает функция",
|
||||
"вопрос по коду",
|
||||
"спроси код",
|
||||
"найди в проекте",
|
||||
"найди в коде",
|
||||
"что в коде",
|
||||
"объясни код",
|
||||
"ask the codebase",
|
||||
"ask the code",
|
||||
"what does the function",
|
||||
"explain the code",
|
||||
})
|
||||
question = question:gsub("^[%s,:%.]+", ""):gsub("%s+$", "")
|
||||
if question == "" then
|
||||
return jarvis.cmd.error("Сформулируйте вопрос.")
|
||||
end
|
||||
|
||||
-- Build a digest: walk depth-2, pick source files by extension, cap per-file size + total size.
|
||||
local EXT_OK = {
|
||||
rs=true, lua=true, py=true, ts=true, tsx=true, js=true, jsx=true, svelte=true,
|
||||
go=true, java=true, kt=true, c=true, h=true, cpp=true, hpp=true, cs=true,
|
||||
rb=true, php=true, sh=true, ps1=true, sql=true, toml=true, yaml=true, yml=true,
|
||||
json=true, md=true,
|
||||
}
|
||||
local SKIP_DIR = {
|
||||
[".git"]=true, ["target"]=true, ["node_modules"]=true, ["dist"]=true, ["build"]=true,
|
||||
["__pycache__"]=true, [".venv"]=true, ["venv"]=true, [".idea"]=true, [".vscode"]=true,
|
||||
}
|
||||
|
||||
local MAX_FILE_BYTES = 4096 -- ~1k tokens per file
|
||||
local MAX_TOTAL_BYTES = 50000 -- ~12k tokens total for digest
|
||||
local MAX_FILES = 30
|
||||
|
||||
local function walk(dir, depth, acc)
|
||||
if depth > 3 then return end
|
||||
local entries = jarvis.fs.list(dir)
|
||||
if not entries then return end
|
||||
for _, ent in ipairs(entries) do
|
||||
if #acc.files >= MAX_FILES or acc.bytes >= MAX_TOTAL_BYTES then
|
||||
return
|
||||
end
|
||||
local name = ent.name
|
||||
local full = dir .. "\\" .. name
|
||||
if ent.is_dir then
|
||||
if not SKIP_DIR[name] and not name:match("^%.") then
|
||||
walk(full, depth + 1, acc)
|
||||
end
|
||||
else
|
||||
local ext = name:match("%.([%w]+)$")
|
||||
if ext and EXT_OK[ext:lower()] then
|
||||
local content = jarvis.fs.read(full)
|
||||
if content then
|
||||
if #content > MAX_FILE_BYTES then
|
||||
content = content:sub(1, MAX_FILE_BYTES) .. "\n... [truncated]"
|
||||
end
|
||||
-- relative path for readability
|
||||
local rel = full:sub(#root + 2)
|
||||
table.insert(acc.files, "--- " .. rel .. " ---\n" .. content)
|
||||
acc.bytes = acc.bytes + #content
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local acc = { files = {}, bytes = 0 }
|
||||
walk(root, 1, acc)
|
||||
|
||||
if #acc.files == 0 then
|
||||
return jarvis.cmd.not_found("Не нашёл исходников в проекте.")
|
||||
end
|
||||
|
||||
local digest = table.concat(acc.files, "\n\n")
|
||||
local prompt = string.format(
|
||||
"Ты — старший разработчик. По digest проекта ответь на вопрос пользователя кратко (3-5 предложений) на русском. Указывай файлы где уместно.\n\n=== ВОПРОС ===\n%s\n\n=== КОД ===\n%s",
|
||||
question, digest
|
||||
)
|
||||
|
||||
local reply = jarvis.llm({
|
||||
{ role = "system", content = "Ты — внимательный код-ревьюер. Отвечай по существу, без воды." },
|
||||
{ role = "user", content = prompt }
|
||||
}, { max_tokens = 400, temperature = 0.2 })
|
||||
|
||||
if not reply or reply == "" then
|
||||
return jarvis.cmd.error("Не получилось получить ответ.")
|
||||
end
|
||||
|
||||
jarvis.system.notify("Codebase Q&A", reply:sub(1, 250))
|
||||
return jarvis.cmd.ok(reply)
|
||||
61
resources/commands/codebase_qa/command.toml
Normal file
61
resources/commands/codebase_qa/command.toml
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
# Codebase Q&A — point J.A.R.V.I.S. at a folder, ask questions about the code.
|
||||
# Active folder stored via jarvis.memory (key="codebase.root"). Voice commands let
|
||||
# you swap the folder, list it, and ask questions. The script reads files lazily
|
||||
# (depth-limited, size-capped) and feeds a digest to the LLM.
|
||||
|
||||
[[commands]]
|
||||
id = "codebase.set"
|
||||
type = "lua"
|
||||
script = "set.lua"
|
||||
sandbox = "full"
|
||||
timeout = 5000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"укажи проект",
|
||||
"укажи папку проекта",
|
||||
"укажи кодовую базу",
|
||||
"выбери проект",
|
||||
"проект сейчас",
|
||||
]
|
||||
en = ["set codebase", "set project folder", "use project"]
|
||||
ua = ["вкажи проект", "вкажи папку проекту"]
|
||||
|
||||
|
||||
[[commands]]
|
||||
id = "codebase.ask"
|
||||
type = "lua"
|
||||
script = "ask.lua"
|
||||
sandbox = "full"
|
||||
timeout = 60000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"спроси код",
|
||||
"вопрос по коду",
|
||||
"что в коде",
|
||||
"что делает функция",
|
||||
"найди в коде",
|
||||
"найди в проекте",
|
||||
"объясни код",
|
||||
]
|
||||
en = ["ask the code", "ask the codebase", "what does the function", "explain the code"]
|
||||
ua = ["що в коді", "що робить функція"]
|
||||
|
||||
|
||||
[[commands]]
|
||||
id = "codebase.where"
|
||||
type = "lua"
|
||||
script = "where.lua"
|
||||
sandbox = "full"
|
||||
timeout = 3000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"какой проект сейчас",
|
||||
"где проект",
|
||||
"какая папка проекта",
|
||||
"какая кодовая база",
|
||||
]
|
||||
en = ["which project", "what's the codebase"]
|
||||
ua = ["який проект"]
|
||||
29
resources/commands/codebase_qa/set.lua
Normal file
29
resources/commands/codebase_qa/set.lua
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
-- "Укажи проект C:\Jarvis\rust" — stores path in memory under key "codebase.root"
|
||||
local phrase = (jarvis.context.phrase or "")
|
||||
|
||||
local body = jarvis.text.strip_trigger(phrase:lower(), {
|
||||
"укажи папку проекта",
|
||||
"укажи кодовую базу",
|
||||
"укажи проект",
|
||||
"выбери проект",
|
||||
"проект сейчас",
|
||||
"set codebase",
|
||||
"set project folder",
|
||||
"use project",
|
||||
})
|
||||
body = body:gsub("^[%s,:%.]+", ""):gsub("%s+$", "")
|
||||
|
||||
-- Path can have backslashes/spaces — preserve original casing by picking from raw phrase
|
||||
local raw = phrase:sub(#phrase - #body + 1):gsub("^[%s,:%.]+", ""):gsub("%s+$", "")
|
||||
local path = raw ~= "" and raw or body
|
||||
|
||||
if path == "" then
|
||||
return jarvis.cmd.error("Укажите путь к папке проекта.")
|
||||
end
|
||||
|
||||
if not jarvis.fs.is_dir(path) then
|
||||
return jarvis.cmd.error("Папка не найдена: " .. path)
|
||||
end
|
||||
|
||||
jarvis.memory.remember("codebase.root", path)
|
||||
return jarvis.cmd.ok("Проект установлен.")
|
||||
5
resources/commands/codebase_qa/where.lua
Normal file
5
resources/commands/codebase_qa/where.lua
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
local root = jarvis.memory.recall("codebase.root")
|
||||
if not root or root == "" then
|
||||
return jarvis.cmd.not_found("Проект не выбран. Скажите: укажи проект.")
|
||||
end
|
||||
return jarvis.cmd.ok("Сейчас работаю с проектом " .. root .. ".")
|
||||
62
resources/commands/llm_switch/command.toml
Normal file
62
resources/commands/llm_switch/command.toml
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
# Switch between local (Ollama) and cloud (Groq) LLM at runtime.
|
||||
|
||||
[[commands]]
|
||||
id = "llm.switch.local"
|
||||
type = "lua"
|
||||
script = "switch.lua"
|
||||
sandbox = "standard"
|
||||
timeout = 3000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"переключись на локальный",
|
||||
"переключись на локальный мозг",
|
||||
"включи локальный режим",
|
||||
"перейди на локальный",
|
||||
"используй локальный",
|
||||
"перейди на оллама",
|
||||
"используй оллама",
|
||||
]
|
||||
en = ["switch to local", "use local llm", "use ollama"]
|
||||
ua = ["перейди на локальний", "використовуй локальний"]
|
||||
|
||||
|
||||
[[commands]]
|
||||
id = "llm.switch.cloud"
|
||||
type = "lua"
|
||||
script = "switch.lua"
|
||||
sandbox = "standard"
|
||||
timeout = 3000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"переключись на облако",
|
||||
"переключись на облачный",
|
||||
"переключись на грок",
|
||||
"переключись на гроку",
|
||||
"используй облако",
|
||||
"используй грок",
|
||||
"перейди на облако",
|
||||
]
|
||||
en = ["switch to cloud", "use cloud llm", "use groq"]
|
||||
ua = ["перейди на хмару", "використовуй хмару"]
|
||||
|
||||
|
||||
[[commands]]
|
||||
id = "llm.status"
|
||||
type = "lua"
|
||||
script = "status.lua"
|
||||
sandbox = "minimal"
|
||||
timeout = 2000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"какой у тебя мозг",
|
||||
"какой ллм",
|
||||
"какой у тебя llm",
|
||||
"облако или локально",
|
||||
"ты сейчас где работаешь",
|
||||
"что за модель",
|
||||
]
|
||||
en = ["which llm", "are you local or cloud", "what model"]
|
||||
ua = ["який ллм", "хмара чи локально"]
|
||||
8
resources/commands/llm_switch/status.lua
Normal file
8
resources/commands/llm_switch/status.lua
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
local backend = jarvis.llm_status()
|
||||
if backend == "groq" then
|
||||
return jarvis.cmd.ok("Сейчас работаю на облаке.")
|
||||
elseif backend == "ollama" then
|
||||
return jarvis.cmd.ok("Сейчас работаю локально.")
|
||||
else
|
||||
return jarvis.cmd.not_found("LLM не настроен.")
|
||||
end
|
||||
22
resources/commands/llm_switch/switch.lua
Normal file
22
resources/commands/llm_switch/switch.lua
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
-- Map command id → backend name (see command.toml).
|
||||
local cmd_id = jarvis.context.command_id or ""
|
||||
local target
|
||||
if cmd_id:match("local") then
|
||||
target = "ollama"
|
||||
elseif cmd_id:match("cloud") then
|
||||
target = "groq"
|
||||
else
|
||||
return jarvis.cmd.error("Не понял на что переключать.")
|
||||
end
|
||||
|
||||
local result = jarvis.llm_switch(target)
|
||||
if not result then
|
||||
local human = (target == "ollama") and "локальный" or "облачный"
|
||||
return jarvis.cmd.error("Не получилось переключиться на " .. human .. ".")
|
||||
end
|
||||
|
||||
if result == "groq" then
|
||||
return jarvis.cmd.ok("Переключился на облачный мозг.")
|
||||
else
|
||||
return jarvis.cmd.ok("Переключился на локальный мозг.")
|
||||
end
|
||||
18
resources/commands/media_keys/_media.ps1
Normal file
18
resources/commands/media_keys/_media.ps1
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# Helper: send a Windows media key via user32.keybd_event.
|
||||
# Called by key.lua with one argument = decimal VK code.
|
||||
param([int]$Vk)
|
||||
|
||||
if (-not $Vk) { exit 1 }
|
||||
|
||||
Add-Type -TypeDefinition @"
|
||||
using System.Runtime.InteropServices;
|
||||
public class MediaKey {
|
||||
[DllImport("user32.dll")]
|
||||
public static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, int dwExtraInfo);
|
||||
}
|
||||
"@
|
||||
|
||||
# down + up
|
||||
[MediaKey]::keybd_event([byte]$Vk, 0, 0, 0)
|
||||
[MediaKey]::keybd_event([byte]$Vk, 0, 2, 0)
|
||||
exit 0
|
||||
80
resources/commands/media_keys/command.toml
Normal file
80
resources/commands/media_keys/command.toml
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
# Media playback control via Windows virtual media keys.
|
||||
# Works with anything that listens to global media keys: Spotify, Yandex Music,
|
||||
# YouTube in browser (when tab is focused), Foobar2000, Winamp, etc.
|
||||
# No OAuth, no API keys — just sends VK_MEDIA_* via PowerShell SendKeys.
|
||||
|
||||
[[commands]]
|
||||
id = "media.play_pause"
|
||||
type = "lua"
|
||||
script = "key.lua"
|
||||
sandbox = "full"
|
||||
timeout = 2000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"пауза",
|
||||
"продолжи",
|
||||
"плей",
|
||||
"включи музыку",
|
||||
"выключи музыку",
|
||||
"приостанови музыку",
|
||||
"снова музыку",
|
||||
]
|
||||
en = ["pause", "play", "resume music", "stop music"]
|
||||
ua = ["пауза", "продовжи"]
|
||||
|
||||
|
||||
[[commands]]
|
||||
id = "media.next"
|
||||
type = "lua"
|
||||
script = "key.lua"
|
||||
sandbox = "full"
|
||||
timeout = 2000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"следующий трек",
|
||||
"следующую песню",
|
||||
"перемотай вперёд",
|
||||
"вперёд трек",
|
||||
"переключи на следующую",
|
||||
"next",
|
||||
]
|
||||
en = ["next track", "next song", "skip"]
|
||||
ua = ["наступний трек"]
|
||||
|
||||
|
||||
[[commands]]
|
||||
id = "media.prev"
|
||||
type = "lua"
|
||||
script = "key.lua"
|
||||
sandbox = "full"
|
||||
timeout = 2000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"предыдущий трек",
|
||||
"предыдущую песню",
|
||||
"перемотай назад",
|
||||
"назад трек",
|
||||
"переключи на предыдущую",
|
||||
"previous",
|
||||
]
|
||||
en = ["previous track", "previous song", "back"]
|
||||
ua = ["попередній трек"]
|
||||
|
||||
|
||||
[[commands]]
|
||||
id = "media.stop"
|
||||
type = "lua"
|
||||
script = "key.lua"
|
||||
sandbox = "full"
|
||||
timeout = 2000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"стоп музыка",
|
||||
"останови плеер",
|
||||
]
|
||||
en = ["stop", "stop player"]
|
||||
ua = ["зупини плеєр"]
|
||||
26
resources/commands/media_keys/key.lua
Normal file
26
resources/commands/media_keys/key.lua
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
-- Map command id → VK_MEDIA_* virtual key code.
|
||||
-- See https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
|
||||
local cmd_id = jarvis.context.command_id or ""
|
||||
|
||||
local VK = {
|
||||
["media.play_pause"] = 179, -- VK_MEDIA_PLAY_PAUSE (0xB3)
|
||||
["media.next"] = 176, -- VK_MEDIA_NEXT_TRACK (0xB0)
|
||||
["media.prev"] = 177, -- VK_MEDIA_PREV_TRACK (0xB1)
|
||||
["media.stop"] = 178, -- VK_MEDIA_STOP (0xB2)
|
||||
}
|
||||
|
||||
local code = VK[cmd_id]
|
||||
if not code then
|
||||
return jarvis.cmd.error("Неизвестная медиа-команда.")
|
||||
end
|
||||
|
||||
local helper = jarvis.context.command_path .. "\\_media.ps1"
|
||||
local cmd_str = string.format(
|
||||
'powershell -NoProfile -ExecutionPolicy Bypass -File "%s" %d',
|
||||
helper, code
|
||||
)
|
||||
|
||||
jarvis.system.exec(cmd_str)
|
||||
|
||||
-- silent — feedback would be annoying for media-key spam
|
||||
return jarvis.cmd.silent_ok()
|
||||
27
resources/commands/scheduler/cancel_by_text.lua
Normal file
27
resources/commands/scheduler/cancel_by_text.lua
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
-- "Отмени напоминание про воду" / "удали задачу про разминку"
|
||||
local phrase = (jarvis.context.phrase or ""):lower()
|
||||
|
||||
local query = jarvis.text.strip_trigger(phrase, {
|
||||
"отмени напоминание про",
|
||||
"отмени напоминание о",
|
||||
"удали задачу про",
|
||||
"удали задачу о",
|
||||
"отмени про",
|
||||
"забудь напоминание про",
|
||||
"cancel reminder about",
|
||||
})
|
||||
query = query:gsub("^[%s,:%.]+", ""):gsub("%s+$", "")
|
||||
|
||||
if query == "" then
|
||||
return jarvis.cmd.error("Что именно отменить?")
|
||||
end
|
||||
|
||||
local n = jarvis.scheduler.remove_by_text(query)
|
||||
if n == 0 then
|
||||
return jarvis.cmd.not_found("Не нашёл напоминаний про " .. query .. ".")
|
||||
end
|
||||
|
||||
if n == 1 then
|
||||
return jarvis.cmd.ok("Отменил напоминание.")
|
||||
end
|
||||
return jarvis.cmd.ok(string.format("Отменил %d напоминаний про %s.", n, query))
|
||||
|
|
@ -107,3 +107,28 @@ ru = [
|
|||
]
|
||||
en = ["clear schedule", "cancel all reminders"]
|
||||
ua = ["очисти розклад", "скасуй всі нагадування"]
|
||||
|
||||
|
||||
[[commands]]
|
||||
id = "scheduler.cancel_by_text"
|
||||
type = "lua"
|
||||
script = "cancel_by_text.lua"
|
||||
sandbox = "minimal"
|
||||
timeout = 3000
|
||||
|
||||
[commands.phrases]
|
||||
ru = [
|
||||
"отмени напоминание про",
|
||||
"отмени напоминание о",
|
||||
"удали задачу про",
|
||||
"удали задачу о",
|
||||
"отмени про",
|
||||
"забудь напоминание про",
|
||||
]
|
||||
en = [
|
||||
"cancel reminder about",
|
||||
"remove task about",
|
||||
]
|
||||
ua = [
|
||||
"скасуй нагадування про",
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue