gitdone-agent 0.8.12 → 0.8.14

package/index.js

@@ -32,7 +32,7 @@ import { randomUUID, createHash } from 'node:crypto'
 // Reported to the server on every sync so the web UI can flag outdated agents.
 // Keep in lockstep with packages/agent/package.json. The server's offline
 // fallback is bumped only after this release has actually reached npm.
-const AGENT_VERSION = '0.8.12'
+const AGENT_VERSION = '0.8.14'
 
 const AGENT_DIR = join(homedir(), '.gitdone-agent')
 const CONFIG_PATH = join(AGENT_DIR, 'config.json')
@@ -41,6 +41,7 @@ const CONFIG_BAK_PATH = CONFIG_PATH + '.bak'
 const STABLE_AGENT = join(AGENT_DIR, 'agent.mjs')
 const LOG_PATH = join(AGENT_DIR, 'agent.log')
 const GAME_MONITOR_PATH = join(AGENT_DIR, 'game-monitor.ps1')
+const GAME_OVERLAY_STATE_PATH = join(AGENT_DIR, 'game-overlay-state.json')
 
 function ensureAgentDir() {
   if (!existsSync(AGENT_DIR)) mkdirSync(AGENT_DIR, { recursive: true })
@@ -1221,6 +1222,7 @@ async function pushWowProgress(cfg) {
 const GAME_PROFILES = [
   {
     id: 'ac-black-flag-resynced',
+    shortName: 'Black Flag Resynced',
     processNames: ['ACBlackFlag', 'ACBlackFlag_Plus'],
     sha256: 'EE40622D0F25126A11BF05DBEEC9C128B9B3A67373BC1FA5692E4C4C2D4665E3',
     heartbeatRvas: [0x0CCF9590, 0x0CCF9098],
@@ -1231,11 +1233,96 @@ const GAME_PROFILES = [
 const GAME_REPORT_HEARTBEAT_MS = 5_000
 const gameLastReport = new Map()
 let gameReportQueue = Promise.resolve()
+let gameDisplays = []
+let gameOverlaySettings = {
+  enabled: false,
+  monitor: 0,
+  position: 'top-right',
+  fontFamily: 'Segoe UI',
+  fontSize: 24,
+  transparent: true,
+}
+let activeGameOverlay = null
+let lastOverlayStateJson = ''
+
+function applyGameOverlaySettings(value) {
+  if (!value || typeof value !== 'object') return
+  gameOverlaySettings = {
+    enabled: value.enabled === true,
+    monitor: Number.isInteger(value.monitor) ? Math.max(0, Math.min(15, value.monitor)) : 0,
+    position: ['top-left', 'top-center', 'top-right', 'bottom-left', 'bottom-center', 'bottom-right'].includes(value.position) ? value.position : 'top-right',
+    fontFamily: typeof value.fontFamily === 'string' ? value.fontFamily.slice(0, 64) : 'Segoe UI',
+    fontSize: Number.isInteger(value.fontSize) ? Math.max(14, Math.min(72, value.fontSize)) : 24,
+    transparent: value.transparent !== false,
+  }
+}
+
+function localDayStartIso() {
+  const day = new Date()
+  day.setHours(0, 0, 0, 0)
+  return day.toISOString()
+}
+
+function formatGameClock(milliseconds) {
+  const seconds = Math.max(0, Math.floor(milliseconds / 1000))
+  const hh = String(Math.floor(seconds / 3600)).padStart(2, '0')
+  const mm = String(Math.floor((seconds % 3600) / 60)).padStart(2, '0')
+  const ss = String(seconds % 60).padStart(2, '0')
+  return `${hh}:${mm}:${ss}`
+}
+
+function writeGameOverlayState() {
+  const now = Date.now()
+  const runtime = activeGameOverlay
+  const todayMs = runtime
+    ? runtime.todayMs + (runtime.playing ? Math.max(0, now - runtime.asOf) : 0)
+    : 0
+  const profile = runtime ? GAME_PROFILES.find((item) => item.id === runtime.gameId) : null
+  const state = {
+    ...gameOverlaySettings,
+    // Keep the clock on-screen for the whole time the game is running. During
+    // pause/menu states it stays visible but frozen; only active gameplay adds
+    // time. This also prevents brief detector transitions from blinking it.
+    visible: gameOverlaySettings.enabled && runtime?.running === true,
+    text: profile ? `${profile.shortName} · Днес ${formatGameClock(todayMs)}` : '',
+  }
+  const json = JSON.stringify(state)
+  if (json === lastOverlayStateJson) return
+  lastOverlayStateJson = json
+  try {
+    ensureAgentDir()
+    const temp = GAME_OVERLAY_STATE_PATH + '.tmp'
+    writeFileSync(temp, json, 'utf8')
+    renameSync(temp, GAME_OVERLAY_STATE_PATH)
+  } catch (err) {
+    log(`✗ game overlay state write failed: ${err.message}`)
+  }
+}
+
+function observeGameActivity(gameId, state, observedAt) {
+  const at = Date.parse(observedAt) || Date.now()
+  const playing = state === 'playing'
+  const running = state === 'playing' || state === 'paused'
+  if (!activeGameOverlay || activeGameOverlay.gameId !== gameId) {
+    if (running) activeGameOverlay = { gameId, playing, running: true, todayMs: 0, asOf: at }
+  } else if (activeGameOverlay.playing !== playing) {
+    if (activeGameOverlay.playing) {
+      activeGameOverlay.todayMs += Math.max(0, at - activeGameOverlay.asOf)
+    }
+    activeGameOverlay.playing = playing
+    activeGameOverlay.asOf = at
+  }
+  if (activeGameOverlay?.gameId === gameId) activeGameOverlay.running = running
+  writeGameOverlayState()
+}
 
 function gameMonitorScript() {
   const profiles = Buffer.from(JSON.stringify(GAME_PROFILES), 'utf8').toString('base64')
+  const overlayStatePath = Buffer.from(GAME_OVERLAY_STATE_PATH, 'utf8').toString('base64')
   return String.raw`
 $ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
 Add-Type -TypeDefinition @'
 using System;
 using System.Runtime.InteropServices;
@@ -1246,6 +1333,12 @@ public static class GitDoneGameMemory {
   public static extern bool ReadProcessMemory(IntPtr process, IntPtr address, byte[] buffer, int size, out UIntPtr read);
   [DllImport("kernel32.dll")]
   public static extern bool CloseHandle(IntPtr handle);
+  [DllImport("user32.dll", SetLastError=true)]
+  public static extern int GetWindowLong(IntPtr window, int index);
+  [DllImport("user32.dll", SetLastError=true)]
+  public static extern int SetWindowLong(IntPtr window, int index, int value);
+  [DllImport("user32.dll", SetLastError=true)]
+  public static extern bool SetWindowPos(IntPtr window, IntPtr insertAfter, int x, int y, int width, int height, uint flags);
   public static UInt32 ReadUInt32(IntPtr process, UInt64 address) {
     var bytes = new byte[4]; UIntPtr read;
     if (!ReadProcessMemory(process, new IntPtr(unchecked((long)address)), bytes, 4, out read) || read.ToUInt64() != 4)
@@ -1256,8 +1349,103 @@ public static class GitDoneGameMemory {
 '@
 $profilesJson = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${profiles}'))
 $profiles = @($profilesJson | ConvertFrom-Json)
+$overlayStatePath = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${overlayStatePath}'))
 $attached = @{}
 
+$form = New-Object System.Windows.Forms.Form
+$form.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::None
+$form.ShowInTaskbar = $false
+$form.TopMost = $true
+$form.StartPosition = [System.Windows.Forms.FormStartPosition]::Manual
+$form.BackColor = [System.Drawing.Color]::Black
+$form.AutoScaleMode = [System.Windows.Forms.AutoScaleMode]::Dpi
+$label = New-Object System.Windows.Forms.Label
+$label.AutoSize = $true
+$label.ForeColor = [System.Drawing.Color]::White
+$label.BackColor = [System.Drawing.Color]::Transparent
+$label.TextAlign = [System.Drawing.ContentAlignment]::MiddleCenter
+$form.Controls.Add($label)
+$null = $form.Handle
+$extendedStyle = [GitDoneGameMemory]::GetWindowLong($form.Handle, -20)
+# WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE: never steal a click,
+# never take keyboard focus from the game, and stay out of Alt+Tab.
+[GitDoneGameMemory]::SetWindowLong($form.Handle, -20, $extendedStyle -bor 0x20 -bor 0x80 -bor 0x08000000) | Out-Null
+$form.Hide()
+$lastOverlayWrite = [DateTime]::MinValue
+$overlayWasVisible = $false
+
+$screens = @([System.Windows.Forms.Screen]::AllScreens)
+$displayRows = @()
+for ($index = 0; $index -lt $screens.Count; $index++) {
+  $screen = $screens[$index]
+  $displayRows += [pscustomobject]@{
+    index = $index
+    name = $screen.DeviceName
+    primary = $screen.Primary
+    width = $screen.Bounds.Width
+    height = $screen.Bounds.Height
+  }
+}
+[pscustomobject]@{ type='displays'; displays=$displayRows } | ConvertTo-Json -Depth 4 -Compress
+[Console]::Out.Flush()
+
+function Update-Overlay {
+  try {
+    if (!(Test-Path -LiteralPath $overlayStatePath)) { $form.Hide(); $script:overlayWasVisible = $false; return }
+    $write = (Get-Item -LiteralPath $overlayStatePath).LastWriteTimeUtc
+    if ($write -eq $lastOverlayWrite) { return }
+    $script:lastOverlayWrite = $write
+    $state = Get-Content -LiteralPath $overlayStatePath -Raw | ConvertFrom-Json
+    if (!$state.enabled -or !$state.visible -or [string]::IsNullOrWhiteSpace($state.text)) {
+      $form.Hide()
+      $script:overlayWasVisible = $false
+      return
+    }
+
+    $screenIndex = [Math]::Max(0, [Math]::Min($screens.Count - 1, [int]$state.monitor))
+    $screen = $screens[$screenIndex]
+    $label.Text = [string]$state.text
+    $label.Font = [System.Drawing.Font]::new([string]$state.fontFamily, [single]$state.fontSize, [System.Drawing.FontStyle]::Bold, [System.Drawing.GraphicsUnit]::Pixel)
+    $paddingX = if ($state.transparent) { 3 } else { 12 }
+    $paddingY = if ($state.transparent) { 2 } else { 7 }
+    $label.Location = [System.Drawing.Point]::new([int]$paddingX, [int]$paddingY)
+    $form.ClientSize = [System.Drawing.Size]::new([int]($label.PreferredWidth + 2 * $paddingX), [int]($label.PreferredHeight + 2 * $paddingY))
+    if ($state.transparent) {
+      $form.BackColor = [System.Drawing.Color]::Magenta
+      $form.TransparencyKey = [System.Drawing.Color]::Magenta
+    } else {
+      $form.TransparencyKey = [System.Drawing.Color]::Empty
+      $form.BackColor = [System.Drawing.Color]::FromArgb(22, 27, 38)
+    }
+
+    $margin = 24
+    $area = $screen.WorkingArea
+    $x = switch ([string]$state.position) {
+      'top-left' { $area.Left + $margin; break }
+      'bottom-left' { $area.Left + $margin; break }
+      'top-center' { $area.Left + [Math]::Floor(($area.Width - $form.Width) / 2); break }
+      'bottom-center' { $area.Left + [Math]::Floor(($area.Width - $form.Width) / 2); break }
+      default { $area.Right - $form.Width - $margin }
+    }
+    $y = if ([string]$state.position -like 'bottom-*') { $area.Bottom - $form.Height - $margin } else { $area.Top + $margin }
+    $form.Location = [System.Drawing.Point]::new([int]$x, [int]$y)
+    if (!$form.Visible) { $form.Show() }
+    # Reassert HWND_TOPMOST after showing. Games can reorder top-level windows
+    # when their DX swap chain becomes active, especially in fullscreen modes.
+    [GitDoneGameMemory]::SetWindowPos($form.Handle, [IntPtr](-1), $form.Left, $form.Top, $form.Width, $form.Height, 0x0010 -bor 0x0040) | Out-Null
+    if (!$script:overlayWasVisible -and $form.Visible) {
+      [pscustomobject]@{ type='overlay'; visible=$true; monitor=$screenIndex; position=[string]$state.position } | ConvertTo-Json -Compress
+      [Console]::Out.Flush()
+      $script:overlayWasVisible = $true
+    }
+  } catch {
+    $form.Hide()
+    $script:overlayWasVisible = $false
+    [pscustomobject]@{ type='overlay'; visible=$false; error=$_.Exception.Message } | ConvertTo-Json -Compress
+    [Console]::Out.Flush()
+  }
+}
+
 function Emit-State($profile, $state, $detail) {
   [pscustomobject]@{
     gameId = $profile.id
@@ -1269,6 +1457,8 @@ function Emit-State($profile, $state, $detail) {
 }
 
 while ($true) {
+  [System.Windows.Forms.Application]::DoEvents()
+  Update-Overlay
   foreach ($profile in $profiles) {
     $process = $null
     foreach ($processName in @($profile.processNames)) {
@@ -1352,6 +1542,7 @@ function queueGameReport(cfg, reading) {
   if (!GAME_PROFILES.some((profile) => profile.id === reading?.gameId)) return
   const state = reading.state === 'detecting' ? 'paused' : reading.state
   if (!['playing', 'paused', 'not_running', 'unsupported', 'error'].includes(state)) return
+  observeGameActivity(reading.gameId, state, reading.observedAt)
 
   const now = Date.now()
   const previous = gameLastReport.get(reading.gameId)
@@ -1360,12 +1551,21 @@ function queueGameReport(cfg, reading) {
 
   gameReportQueue = gameReportQueue
     .then(async () => {
-      await api(cfg, '/api/v1/games/activity', {
+      const result = await api(cfg, '/api/v1/games/activity', {
         machineId: cfg.machineId,
         gameId: reading.gameId,
         state,
         observedAt: reading.observedAt || new Date().toISOString(),
+        dayStart: localDayStartIso(),
       })
+      applyGameOverlaySettings(result.gameOverlay)
+      if (activeGameOverlay?.gameId === reading.gameId &&
+          activeGameOverlay.playing === (state === 'playing') &&
+          typeof result.todayMs === 'number') {
+        activeGameOverlay.todayMs = Math.max(0, result.todayMs)
+        activeGameOverlay.asOf = Date.parse(result.asOf) || Date.now()
+      }
+      writeGameOverlayState()
       if (previous?.state !== state) log(`🎮 ${reading.gameId}: ${state}`)
     })
     .catch((err) => log(`✗ game activity sync failed: ${err.message}`))
@@ -1388,6 +1588,16 @@ async function startGameActivityMonitor(cfg, printOnly = false) {
       lines.on('line', (line) => {
         try {
           const reading = JSON.parse(line)
+          if (reading.type === 'displays' && Array.isArray(reading.displays)) {
+            gameDisplays = reading.displays
+            if (printOnly) console.log(`Displays: ${JSON.stringify(gameDisplays)}`)
+            return
+          }
+          if (reading.type === 'overlay') {
+            if (printOnly) console.log(reading.error ? `Overlay error: ${reading.error}` : `Overlay: ${reading.visible ? 'visible' : 'hidden'} on monitor ${Number(reading.monitor) + 1}`)
+            else if (reading.error) log(`✗ game overlay error: ${reading.error}`)
+            return
+          }
           if (printOnly) console.log(`${reading.observedAt} ${reading.gameId}: ${reading.state} — ${reading.detail}`)
           else queueGameReport(cfg, reading)
         } catch { /* ignore non-JSON PowerShell host noise */ }
@@ -3220,16 +3430,19 @@ async function sync(cfg, discovered) {
     agentVersion: AGENT_VERSION,
     roots: cfg.roots,
     repos: full ? discovered : [],
+    gameDisplays,
     ...(usage ? { usage } : {}),
     ...(codexUsage ? { codexUsage } : {}),
   })
   if (full) { syncRepoSig = sig; syncFullCountdown = SYNC_FULL_TICKS }
   else syncFullCountdown--
+  applyGameOverlaySettings(data.gameOverlay)
   return {
     tracked: data.tracked ?? [],
     latestVersion: data.latestVersion,
     downloadUrl: data.downloadUrl,
     downloadSha256: data.downloadSha256,
+    gameOverlay: data.gameOverlay,
   }
 }
 
@@ -3429,6 +3642,8 @@ async function runLoop(cfg) {
   // Fast command path runs alongside the snapshot poll. Fire-and-forget: it owns
   // its own reconnect loop and never rejects.
   streamCommands(cfg)
+  writeGameOverlayState()
+  setInterval(writeGameOverlayState, 1000)
   startGameActivityMonitor(cfg)
 
   await tick()

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "gitdone-agent",
-    "version":  "0.8.12",
+    "version":  "0.8.14",
     "description":  "Local gitDone companion for repository and optional World of Warcraft progress sync",
     "type":  "module",
     "files":  [