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.
81 lines
2.9 KiB
Lua
81 lines
2.9 KiB
Lua
-- tracker.today — report total active time accrued today (local-day).
|
|
local lang = jarvis.context.language or "ru"
|
|
local now = jarvis.context.time.timestamp or os.time()
|
|
|
|
local data = jarvis.state.get("data") or {}
|
|
local sessions = data.sessions or {}
|
|
|
|
-- Local-day boundary: use the calendar fields (already in local time).
|
|
local t = jarvis.context.time
|
|
local y = tonumber(t.year) or 1970
|
|
local mo = tonumber(t.month) or 1
|
|
local d = tonumber(t.day) or 1
|
|
local h = tonumber(t.hour) or 0
|
|
local mi = tonumber(t.minute) or 0
|
|
local s = tonumber(t.second) or 0
|
|
|
|
-- Seconds since local midnight today, derived from the broken-down time.
|
|
local secs_today = h * 3600 + mi * 60 + s
|
|
local today_start = now - secs_today
|
|
|
|
local total = 0
|
|
for _, sess in ipairs(sessions) do
|
|
local sstart = tonumber(sess.start) or 0
|
|
local send = tonumber(sess["end"]) or 0
|
|
-- Overlap with [today_start, now]
|
|
local lo = math.max(sstart, today_start)
|
|
local hi = math.min(send, now)
|
|
if hi > lo then total = total + (hi - lo) end
|
|
end
|
|
|
|
-- Include the open session, if any, up to now.
|
|
local open_start = data.current_session_start
|
|
if open_start then
|
|
local lo = math.max(tonumber(open_start) or 0, today_start)
|
|
if now > lo then total = total + (now - lo) end
|
|
end
|
|
|
|
local function format_dur(sec)
|
|
sec = math.floor(sec)
|
|
local hh = math.floor(sec / 3600)
|
|
local mm = math.floor((sec % 3600) / 60)
|
|
if lang == "ru" then
|
|
local function h_word(n)
|
|
local n10 = n % 10; local n100 = n % 100
|
|
if n100 >= 11 and n100 <= 14 then return "часов" end
|
|
if n10 == 1 then return "час" end
|
|
if n10 >= 2 and n10 <= 4 then return "часа" end
|
|
return "часов"
|
|
end
|
|
local function m_word(n)
|
|
local n10 = n % 10; local n100 = n % 100
|
|
if n100 >= 11 and n100 <= 14 then return "минут" end
|
|
if n10 == 1 then return "минута" end
|
|
if n10 >= 2 and n10 <= 4 then return "минуты" end
|
|
return "минут"
|
|
end
|
|
if hh > 0 and mm > 0 then
|
|
return hh .. " " .. h_word(hh) .. " " .. mm .. " " .. m_word(mm)
|
|
end
|
|
if hh > 0 then return hh .. " " .. h_word(hh) end
|
|
return mm .. " " .. m_word(mm)
|
|
else
|
|
if hh > 0 and mm > 0 then return hh .. "h " .. mm .. "m" end
|
|
if hh > 0 then return hh .. "h" end
|
|
return mm .. "m"
|
|
end
|
|
end
|
|
|
|
-- Suppress unused-warning for y/mo/d — only h/mi/s feed the calc, but having
|
|
-- y/mo/d on hand keeps the script easy to extend later.
|
|
local _ = y + mo + d
|
|
|
|
if total < 60 then
|
|
return jarvis.cmd.ok(lang == "ru"
|
|
and "Сегодня ещё ничего не отработано, сэр."
|
|
or "Nothing tracked yet today, sir.")
|
|
end
|
|
|
|
return jarvis.cmd.ok(lang == "ru"
|
|
and ("Сегодня отработано " .. format_dur(total) .. ".")
|
|
or ("Today: " .. format_dur(total) .. "."))
|