J.A.R.V.I.S-rust/resources/commands/random_choice/pick.lua

46 lines
1.6 KiB
Lua
Raw Permalink Normal View History

arch + features: Lua jarvis.speak() / jarvis.llm() API, /commands GUI page, games / mouse / random_choice packs Architecture — DRY at the Lua API surface: lua/api/tts.rs (new): jarvis.speak(text, opts?). opts.lang = ISO two-letter code (default "ru"); auto-picks first installed voice matching the culture. opts.async = true|false (default true). The 9 packs that previously inlined a 60-character PS-SAPI string for every spoken reply can now reduce to one line. Refactored fun/, dice/, clipboard_read/ as proof — fun/ask.lua went from 75 lines of HTTP+SAPI boilerplate to ~28 lines of intent code. lua/api/llm.rs (new): jarvis.llm(messages, opts?). messages is a list of {role, content} tables, opts.max_tokens / .temperature / .top_p. Returns the assistant string or nil. Gated by sandbox allows_http() (so Standard+ packs only). Internally uses the existing jarvis_core::llm::LlmClient::complete_with, no duplicated HTTP plumbing. llm/client.rs: split complete() into complete_with(messages, max_tokens, temperature, top_p) for the new caller; old complete() is now a thin wrapper at temp=0.7 top_p=1.0 for backward compat. GUI — /commands page rewrite: Replaces the "Раздел в разработке" placeholder. Calls Tauri command get_commands_list (already existed in tauri_commands/commands.rs, was wired but unused). Renders a search-filterable card grid: - cmd id (monospace) - type badge with colour by kind (lua=blue, ahk=red, cli=grey, voice=green, terminate=red, stop_chaining=violet) - sandbox badge - description line (if non-empty) - all phrases for currentLanguage, fallback to en, fallback to first available; each phrase in a small inline pill Toolbar: text input with magnifier icon + reload button (↻). Counter line shows visible/total + "Скажи Джарвис + любую фразу" hint. Counts down as you type the filter. New packs (3, total 33 → 36): games/ — launch_game / list_games. Reads or creates %USERPROFILE%\Documents\jarvis-games.json (the sample preloads dota, cs2, elden ring, witcher 3, factorio + minecraft launcher path + fortnite epic URI). Trigger-strip + fuzzy name/alias match, then launches via steam://rungameid/N (Steam), epic:// (Epic Games), or start "" "path" (anything else). list_games speaks the configured library. mouse/ — left/right/middle/double click + scroll up/down. Single dispatch.lua + _mouse_helper.ps1. PS P/Invokes user32!mouse_event with the right flag pair (LEFTDOWN+LEFTUP / etc.), 30ms gap, doubles do two LEFT cycles with a 50ms gap, wheel uses ±360 ticks. random_choice/ — "выбери из X или Y или Z". Strips the trigger, splits on " или " / " or " / ", " / " либо " / " чи ", math.random picks one, speaks "Я выбираю N". cargo test commands::tests still 3/3. 36 packs verified via jarvis-gui startup log.
2026-05-15 12:58:16 +03:00
local lang = jarvis.context.language
local phrase = (jarvis.context.phrase or ""):lower()
local triggers = { "выбери из", "выбери", "решай за меня", "выбрать",
"pick from", "choose from", "decide between",
"обери з", "вибери" }
local rest = phrase
for _, t in ipairs(triggers) do
local s, e = string.find(rest, t, 1, true)
if s == 1 then
rest = rest:sub(e + 1)
break
end
end
rest = rest:gsub("^%s+", ""):gsub("%s+$", "")
local separators = { " или ", " or ", ", ", " либо ", " чи " }
local options = nil
for _, sep in ipairs(separators) do
local pattern = sep:gsub("([%-%.%+%[%]%(%)%$%^%%%?%*])", "%%%1")
if rest:find(pattern) then
options = {}
for token in (rest .. sep):gmatch("(.-)" .. pattern) do
token = token:gsub("^%s+", ""):gsub("%s+$", "")
if token ~= "" then table.insert(options, token) end
end
break
end
end
if not options or #options < 2 then
jarvis.system.notify("Choice", lang == "ru"
and "Скажи: выбери из X или Y или Z"
or "Say: pick from X or Y or Z")
jarvis.audio.play_error()
return { chain = false }
end
math.randomseed(os.time() + math.floor(jarvis.context.time.second * 7919))
local pick = options[math.random(1, #options)]
jarvis.system.notify(lang == "ru" and "Выбираю" or "Choice", pick)
jarvis.speak((lang == "ru" and "Я выбираю " or "I pick ") .. pick, { lang = lang })
jarvis.audio.play_ok()
return { chain = false }