df799b6cd2
Voice sysinfo overhaul (6 scripts: battery/cpu/ram/disk/time/all):
- Now SPEAK the result via jarvis.cmd.ok instead of notify-only. Toast
still fires for visual reference, but real Jarvis tells you out loud.
- `all` joins lines with commas so TTS doesn't over-pause on linebreaks.
Smart reminders (`reminders/set.lua` rewrite):
- Was: detached `Start-Sleep` PowerShell subprocesses that died on
jarvis-app restart and spawned a hidden process per timer.
- Now: routes through `jarvis.scheduler.add(... type=speak ...)`. Persists
to schedule.json, survives restart, no zombie processes. Trade-off:
sub-minute timers round up to 1 min (rare in voice UX).
- Drops UA triggers from earlier UA-removal sweep.
Translation polish (`translate/translate.lua` + `clipboard.lua`):
- Drops UA target language; adds Italian, Polish, Turkish, French ru
triggers + English target detectors.
- `language_iso()` helper picks the SAPI voice locale for the TARGET
language (German translation → German SAPI voice if installed).
LLM system prompt (config.rs):
- New LLM_SYSTEM_PROMPT_EN counterpart. Both languages now mention the
assistant's tooling (memory / scheduler / profiles / macros / vision /
clipboard) so the LLM knows it can DO things, not suggest the user
install something.
- `get_llm_system_prompt(lang)` picks EN/RU.
Conversation pack (NEW `conversation/`):
- 2 commands. `conversation.summary` ("о чём мы говорили") pulls the
last 12 turns from persisted history, asks LLM for a 1-3 sentence
recap in Jarvis tone. Falls back gracefully when offline.
- `conversation.repeat` ("повтори") re-speaks the last assistant message.
- New Lua API `jarvis.llm_history()` returns array of {role, content}
tables, excluding the system prompt.
WOL pack (NEW `wol/`):
- Voice "разбуди сервер" / "wake server" fires a magic packet at a MAC
stored in long-term memory under `wol_<alias>` (default alias "server").
- Setup via voice: "запомни wol_server AA:BB:CC:DD:EE:FF". Falls back to
`JARVIS_WOL_TARGET` env if memory empty. Handles every standard MAC
format (colons / dashes / dots / bare). Broadcast on UDP 9 via
PowerShell System.Net.Sockets.UdpClient.
Outlook COM pack (NEW `outlook/`, via subagent):
- 4 commands: unread_count, latest, send_clipboard, summarize_inbox.
- PowerShell COM bridge `_outlook.ps1` with tab-delimited line protocol.
- summarize_inbox calls LLM for a one-paragraph summary. Graceful
failure when Outlook isn't running.
Time tracker pack (NEW `time_tracker/`, via subagent):
- 5 commands: start, stop, today, week, reset.
- Persists via `jarvis.state` (structured object: current_session_start
+ sessions array of {start, end}).
- Local-calendar "today" boundary, full Russian pluralisation
(час/часа/часов, минута/минуты/минут, сессия/сессии/сессий).
Tests: 139 rust (no regression), 81 python (60 → 81, +14 time_tracker
+7 outlook). Release build green for jarvis-app and jarvis-cli.
Pack count: 88 → 92 rust packs.
78 lines
2.9 KiB
Lua
78 lines
2.9 KiB
Lua
-- Wake-on-LAN — sends a magic packet to a target MAC stored in long-term memory.
|
||
--
|
||
-- Setup (one-time, via voice):
|
||
-- "запомни wol_server AA:BB:CC:DD:EE:FF"
|
||
-- Then later, anytime:
|
||
-- "разбуди сервер" → packet goes out to broadcast.
|
||
--
|
||
-- Lua can't open raw UDP, so we shell out to PowerShell (System.Net.Sockets).
|
||
|
||
local lang = jarvis.context.language
|
||
local phrase = (jarvis.context.phrase or ""):lower()
|
||
|
||
-- Figure out which alias the user wants. Right now we only support "server"
|
||
-- (the most common case) but the data model already supports more.
|
||
local alias = "server"
|
||
|
||
local mac = jarvis.memory.recall("wol_" .. alias)
|
||
if not mac or mac == "" then
|
||
-- Fall back to env so power users can ship a default without touching memory.
|
||
mac = jarvis.system.env("JARVIS_WOL_TARGET") or ""
|
||
end
|
||
|
||
if mac == "" then
|
||
return jarvis.cmd.error(lang == "ru"
|
||
and "Сэр, MAC-адрес не задан. Скажи: запомни wol_server, а потом адрес."
|
||
or "Sir, MAC address is not set. Say: remember wol_server, then the address.")
|
||
end
|
||
|
||
-- Normalise: AA-BB-CC-DD-EE-FF, AA:BB:CC:DD:EE:FF, AABB.CCDD.EEFF, AABBCCDDEEFF
|
||
local cleaned = mac:gsub("[^%w]", ""):upper()
|
||
if #cleaned ~= 12 or not cleaned:match("^[0-9A-F]+$") then
|
||
return jarvis.cmd.error(lang == "ru"
|
||
and "Сэр, MAC-адрес в памяти выглядит подозрительно: " .. tostring(mac)
|
||
or "Sir, the stored MAC looks malformed: " .. tostring(mac))
|
||
end
|
||
|
||
-- Inject the cleaned MAC as a constant in the PowerShell script so we don't
|
||
-- have to argv-escape it. The packet is 6 × 0xFF + 16 × MAC = 102 bytes,
|
||
-- broadcast on UDP/9.
|
||
local ps_template = [[
|
||
$mac = '%s'
|
||
$macBytes = @()
|
||
for ($i = 0; $i -lt 12; $i += 2) {
|
||
$macBytes += [Convert]::ToByte($mac.Substring($i, 2), 16)
|
||
}
|
||
$packet = New-Object byte[] 102
|
||
for ($i = 0; $i -lt 6; $i++) { $packet[$i] = 0xFF }
|
||
for ($r = 0; $r -lt 16; $r++) {
|
||
for ($j = 0; $j -lt 6; $j++) {
|
||
$packet[6 + $r * 6 + $j] = $macBytes[$j]
|
||
}
|
||
}
|
||
$udp = New-Object System.Net.Sockets.UdpClient
|
||
$udp.EnableBroadcast = $true
|
||
$null = $udp.Send($packet, $packet.Length, '255.255.255.255', 9)
|
||
$udp.Close()
|
||
Write-Output 'sent'
|
||
]]
|
||
|
||
local ps = string.format(ps_template, cleaned)
|
||
local cmd = 'powershell -NoProfile -ExecutionPolicy Bypass -Command "& {'
|
||
.. ps:gsub('\r?\n', '; '):gsub('"', '\\"')
|
||
.. '}"'
|
||
|
||
jarvis.log("info", "WOL packet → " .. cleaned)
|
||
local res = jarvis.system.exec(cmd)
|
||
if not res.success then
|
||
jarvis.log("error", "WOL failed: " .. tostring(res.stderr))
|
||
return jarvis.cmd.error(lang == "ru"
|
||
and "Не получилось отправить пакет."
|
||
or "Failed to send packet.")
|
||
end
|
||
|
||
-- Format the MAC back for speech: "AA-BB-CC-..." sounds clearer than "AABB..."
|
||
local pretty = cleaned:gsub("(%w%w)", "%1-"):sub(1, -2)
|
||
return jarvis.cmd.ok(lang == "ru"
|
||
and ("Пакет отправлен на " .. pretty)
|
||
or ("Packet sent to " .. pretty))
|