@blunking/codexlink 0.1.9 → 0.1.12

package/telegram-plugin/poller.js

@@ -2,7 +2,7 @@
 import { pollOnce } from "./lib/bridge.js";
 import { isCurrentSidecarPid } from "./lib/singleton.js";
 
-const intervalMs = Number.parseInt(process.env.BLUN_TELEGRAM_POLL_INTERVAL_MS || "1500", 10) || 1500;
+const intervalMs = Number.parseInt(process.env.BLUN_TELEGRAM_POLL_INTERVAL_MS || "700", 10) || 700;
 let stopping = false;
 
 function sleep(ms) {

package/telegram-setup.ps1

@@ -1,96 +1,230 @@
-param(
-  [string]$Profile = "default",
-  [switch]$EnsureConfigured,
-  [switch]$Json
-)
-
-$ErrorActionPreference = "Stop"
-
-function Try-ReadJson {
-  param([string]$Path)
-  if (-not (Test-Path $Path)) { return $null }
-  try { return Get-Content -Raw -Path $Path | ConvertFrom-Json } catch { return $null }
-}
-
-function Ensure-Dir {
-  param([string]$Path)
-  if (-not (Test-Path $Path)) {
-    New-Item -ItemType Directory -Path $Path -Force | Out-Null
-  }
-}
-
-function Resolve-ConfiguredPath {
-  param([string]$Value, [string]$RuntimeRoot)
-  if (-not $Value) { return "" }
-  $expanded = [Environment]::ExpandEnvironmentVariables($Value)
-  if ([System.IO.Path]::IsPathRooted($expanded)) { return $expanded }
-  return [System.IO.Path]::GetFullPath((Join-Path $RuntimeRoot $expanded))
-}
-
-function Read-DotEnvFile {
-  param([string]$Path)
-  $values = @{}
-  if (-not (Test-Path $Path)) { return $values }
-  foreach ($line in (Get-Content -Path $Path)) {
-    if (-not $line) { continue }
-    if ($line.Trim().StartsWith("#")) { continue }
-    $parts = $line -split "=", 2
-    if ($parts.Count -ne 2) { continue }
-    $values[$parts[0].Trim()] = $parts[1]
-  }
-  return $values
-}
-
-function Write-DotEnvFile {
-  param(
-    [string]$Path,
-    [hashtable]$Values
-  )
-
-  $lines = foreach ($key in ($Values.Keys | Sort-Object)) {
-    "$key=$($Values[$key])"
-  }
-  Set-Content -Path $Path -Value $lines -Encoding UTF8
-}
-
-function Test-TelegramTokenFormat {
-  param([string]$Value)
-  if (-not $Value) { return $false }
-  return $Value -match '^\d{6,}:[A-Za-z0-9_-]{20,}$'
-}
-
-function Test-AllowedChatIdsFormat {
-  param([string]$Value)
-  if (-not $Value) { return $false }
-  $parts = @($Value -split "," | ForEach-Object { $_.Trim() } | Where-Object { $_ })
-  if ($parts.Count -eq 0) { return $false }
-  foreach ($part in $parts) {
-    if ($part -notmatch '^-?\d+$') {
-      return $false
-    }
-  }
-  return $true
-}
-
+param(
+  [string]$Profile = "default",
+  [switch]$EnsureConfigured,
+  [switch]$Json
+)
+
+$ErrorActionPreference = "Stop"
+
+function Try-ReadJson {
+  param([string]$Path)
+  if (-not (Test-Path $Path)) { return $null }
+  try { return Get-Content -Raw -Path $Path | ConvertFrom-Json } catch { return $null }
+}
+
+function Ensure-Dir {
+  param([string]$Path)
+  if (-not (Test-Path $Path)) {
+    New-Item -ItemType Directory -Path $Path -Force | Out-Null
+  }
+}
+
+function Resolve-ConfiguredPath {
+  param([string]$Value, [string]$RuntimeRoot)
+  if (-not $Value) { return "" }
+  $expanded = [Environment]::ExpandEnvironmentVariables($Value)
+  if ([System.IO.Path]::IsPathRooted($expanded)) { return $expanded }
+  return [System.IO.Path]::GetFullPath((Join-Path $RuntimeRoot $expanded))
+}
+
+function Read-DotEnvFile {
+  param([string]$Path)
+  $values = @{}
+  if (-not (Test-Path $Path)) { return $values }
+  foreach ($line in (Get-Content -Path $Path)) {
+    if (-not $line) { continue }
+    if ($line.Trim().StartsWith("#")) { continue }
+    $parts = $line -split "=", 2
+    if ($parts.Count -ne 2) { continue }
+    $values[$parts[0].Trim()] = $parts[1]
+  }
+  return $values
+}
+
+function Write-DotEnvFile {
+  param(
+    [string]$Path,
+    [hashtable]$Values
+  )
+
+  $lines = foreach ($key in ($Values.Keys | Sort-Object)) {
+    "$key=$($Values[$key])"
+  }
+  Set-Content -Path $Path -Value $lines -Encoding UTF8
+}
+
+function Test-TelegramTokenFormat {
+  param([string]$Value)
+  if (-not $Value) { return $false }
+  return $Value -match '^\d{6,}:[A-Za-z0-9_-]{20,}$'
+}
+
+function Test-AllowedChatIdsFormat {
+  param([string]$Value)
+  if (-not $Value) { return $false }
+  $parts = @($Value -split "," | ForEach-Object { $_.Trim() } | Where-Object { $_ })
+  if ($parts.Count -eq 0) { return $false }
+  foreach ($part in $parts) {
+    if ($part -notmatch '^-?\d+$') {
+      return $false
+    }
+  }
+  return $true
+}
+
+function Invoke-TelegramSetupRequest {
+  param(
+    [string]$Token,
+    [string]$Method,
+    [hashtable]$Body = @{}
+  )
+
+  $uri = "https://api.telegram.org/bot$Token/$Method"
+  try {
+    return Invoke-RestMethod -Method Post -Uri $uri -ContentType "application/json" -Body ($Body | ConvertTo-Json -Depth 10) -TimeoutSec 35
+  } catch {
+    $message = $_.Exception.Message
+    if ($_.ErrorDetails -and $_.ErrorDetails.Message) {
+      $message = $_.ErrorDetails.Message
+    }
+    throw "Telegram $Method fehlgeschlagen: $message"
+  }
+}
+
+function Get-TelegramBotInfo {
+  param([string]$Token)
+  $response = Invoke-TelegramSetupRequest -Token $Token -Method "getMe"
+  if (-not $response.ok) {
+    throw "Telegram Bot Token wurde von Telegram abgelehnt."
+  }
+  return $response.result
+}
+
+function Get-TelegramUpdatesForSetup {
+  param(
+    [string]$Token,
+    [long]$Offset = 0,
+    [int]$TimeoutSeconds = 0
+  )
+
+  $body = @{
+    timeout = $TimeoutSeconds
+    limit = 20
+    allowed_updates = @("message", "edited_message", "channel_post")
+  }
+  if ($Offset -gt 0) {
+    $body["offset"] = $Offset
+  }
+  $response = Invoke-TelegramSetupRequest -Token $Token -Method "getUpdates" -Body $body
+  if (-not $response.ok) {
+    return @()
+  }
+  return @($response.result)
+}
+
+function Get-TelegramUpdateId {
+  param($Update)
+  try {
+    return [long]$Update.update_id
+  } catch {
+    return 0
+  }
+}
+
+function Get-TelegramChatFromUpdate {
+  param($Update)
+
+  $message = $null
+  if ($Update.message) {
+    $message = $Update.message
+  } elseif ($Update.edited_message) {
+    $message = $Update.edited_message
+  } elseif ($Update.channel_post) {
+    $message = $Update.channel_post
+  }
+
+  if (-not $message -or -not $message.chat -or -not $message.chat.id) {
+    return $null
+  }
+
+  $chat = $message.chat
+  $title = ""
+  if ($chat.title) {
+    $title = [string]$chat.title
+  } elseif ($chat.username) {
+    $title = "@" + [string]$chat.username
+  } elseif ($chat.first_name -or $chat.last_name) {
+    $title = ((@($chat.first_name, $chat.last_name) | Where-Object { $_ }) -join " ")
+  }
+
+  return [ordered]@{
+    chat_id = [string]$chat.id
+    chat_type = [string]$chat.type
+    title = $title
+    update_id = Get-TelegramUpdateId -Update $Update
+  }
+}
+
+function Wait-TelegramPairingChat {
+  param(
+    [string]$Token,
+    $BotInfo,
+    [int]$TimeoutSeconds = 90
+  )
+
+  $baseline = Get-TelegramUpdatesForSetup -Token $Token -TimeoutSeconds 0
+  $offset = 0
+  foreach ($update in $baseline) {
+    $offset = [Math]::Max($offset, (Get-TelegramUpdateId -Update $update) + 1)
+  }
+
+  $botName = if ($BotInfo.username) { "@" + [string]$BotInfo.username } else { "deinen Bot" }
+  Write-Host ""
+  Write-Host "Telegram Pairing" -ForegroundColor Cyan
+  Write-Host "Oeffne Telegram und sende jetzt eine neue Nachricht an $botName." -ForegroundColor White
+  Write-Host "Fuer Gruppen: Bot in die Gruppe einladen und dort kurz '$botName connect' schreiben." -ForegroundColor DarkGray
+  Write-Host "Ich erkenne die Chat-ID automatisch. Du musst keine ID suchen." -ForegroundColor DarkGray
+  Write-Host ""
+
+  $deadline = (Get-Date).AddSeconds($TimeoutSeconds)
+  while ((Get-Date) -lt $deadline) {
+    $remaining = [Math]::Max(1, [int]([Math]::Ceiling(($deadline - (Get-Date)).TotalSeconds)))
+    $pollTimeout = [Math]::Min(10, $remaining)
+    $updates = Get-TelegramUpdatesForSetup -Token $Token -Offset $offset -TimeoutSeconds $pollTimeout
+    foreach ($update in $updates) {
+      $updateId = Get-TelegramUpdateId -Update $update
+      if ($updateId -gt 0) {
+        $offset = [Math]::Max($offset, $updateId + 1)
+      }
+      $chat = Get-TelegramChatFromUpdate -Update $update
+      if ($chat -and $chat.chat_id) {
+        return $chat
+      }
+    }
+  }
+
+  return $null
+}
+
 function Prompt-RequiredValue {
-  param(
-    [string]$Prompt,
-    [string]$CurrentValue,
-    [scriptblock]$Validator,
-    [string]$ErrorMessage
-  )
-
-  while ($true) {
-    $fullPrompt = if ($CurrentValue) { "$Prompt [$CurrentValue]" } else { $Prompt }
-    $inputValue = Read-Host -Prompt $fullPrompt
-    if (-not $inputValue -and $CurrentValue) {
-      $inputValue = $CurrentValue
-    }
-    $inputValue = [string]$inputValue
-    if (& $Validator $inputValue) {
-      return $inputValue
-    }
-    Write-Host $ErrorMessage -ForegroundColor Yellow
+  param(
+    [string]$Prompt,
+    [string]$CurrentValue,
+    [scriptblock]$Validator,
+    [string]$ErrorMessage
+  )
+
+  while ($true) {
+    $fullPrompt = if ($CurrentValue) { "$Prompt [$CurrentValue]" } else { $Prompt }
+    $inputValue = Read-Host -Prompt $fullPrompt
+    if (-not $inputValue -and $CurrentValue) {
+      $inputValue = $CurrentValue
+    }
+    $inputValue = [string]$inputValue
+    if (& $Validator $inputValue) {
+      return $inputValue
+    }
+    Write-Host $ErrorMessage -ForegroundColor Yellow
   }
 }
 
@@ -122,19 +256,19 @@ function Get-ProfilePath {
 $runtimeRoot = Split-Path -Parent $MyInvocation.MyCommand.Path
 $profilePath = Get-ProfilePath -RuntimeRoot $runtimeRoot -ProfileName $Profile
 $profileJson = Try-ReadJson -Path $profilePath
-
-if (-not $profileJson) {
-  throw "Profile not found or invalid: $profilePath"
-}
-
-$profileAgent = if ($profileJson.agent_name) { [string]$profileJson.agent_name } else { $Profile.ToLower() }
-$stateDir = if ($profileJson.telegram -and $profileJson.telegram.state_dir) {
-  Resolve-ConfiguredPath -Value ([string]$profileJson.telegram.state_dir) -RuntimeRoot $runtimeRoot
-} else {
-  Join-Path $env:USERPROFILE (".codex\channels\telegram-" + $profileAgent)
-}
-
-Ensure-Dir -Path $stateDir
+
+if (-not $profileJson) {
+  throw "Profile not found or invalid: $profilePath"
+}
+
+$profileAgent = if ($profileJson.agent_name) { [string]$profileJson.agent_name } else { $Profile.ToLower() }
+$stateDir = if ($profileJson.telegram -and $profileJson.telegram.state_dir) {
+  Resolve-ConfiguredPath -Value ([string]$profileJson.telegram.state_dir) -RuntimeRoot $runtimeRoot
+} else {
+  Join-Path $env:USERPROFILE (".codex\channels\telegram-" + $profileAgent)
+}
+
+Ensure-Dir -Path $stateDir
 $envPath = Join-Path $stateDir ".env"
 $envValues = Read-DotEnvFile -Path $envPath
 
@@ -147,12 +281,13 @@ $currentAllowedChatIds = [string]$envValues["BLUN_TELEGRAM_ALLOWED_CHAT_ID"]
 if (-not (Test-AllowedChatIdsFormat -Value $currentAllowedChatIds)) {
   $currentAllowedChatIds = [string]$envValues["TELEGRAM_ALLOWED_CHAT_ID"]
 }
-
+
 $needsToken = -not (Test-TelegramTokenFormat -Value $currentToken)
 $needsChatIds = -not (Test-AllowedChatIdsFormat -Value $currentAllowedChatIds)
 $changed = $false
+$tokenWasPrompted = $false
 
-if ($EnsureConfigured -and -not $needsToken) {
+if ($EnsureConfigured -and -not $needsToken -and -not $needsChatIds) {
   $result = [ordered]@{
     ok = $true
     changed = $false
@@ -160,18 +295,13 @@ if ($EnsureConfigured -and -not $needsToken) {
     state_dir = $stateDir
     env_path = $envPath
     missing = @()
-    optional = @(
-      "allowed_chat_ids"
-    )
+    optional = @()
   }
   if ($Json) {
     $result | ConvertTo-Json -Depth 6
   } else {
     Write-Host "Telegram ist bereits eingerichtet fuer Profil '$profileAgent'." -ForegroundColor Green
     Write-Host "State-Ordner: $stateDir"
-    if ($needsChatIds) {
-      Write-Host "Hinweis: keine Chat-Allowlist gesetzt. Der Bot akzeptiert aktuell alle Chats, die er sehen kann." -ForegroundColor Yellow
-    }
   }
   exit 0
 }
@@ -192,63 +322,83 @@ if ($EnsureConfigured -and $Json -and $needsToken) {
   } | ConvertTo-Json -Depth 6
   exit 2
 }
-
-if (-not $Json) {
-  Write-Host ""
-  Write-Host "CodexLink Telegram Setup" -ForegroundColor Cyan
-  Write-Host "Profil: $profileAgent"
-  Write-Host "Lokaler State-Ordner: $stateDir"
-  Write-Host ""
-  Write-Host "Ich speichere die Telegram-Werte automatisch an die richtige lokale Stelle." -ForegroundColor DarkGray
+
+if (-not $Json) {
+  Write-Host ""
+  Write-Host "CodexLink Telegram Setup" -ForegroundColor Cyan
+  Write-Host "Profil: $profileAgent"
+  Write-Host "Lokaler State-Ordner: $stateDir"
+  Write-Host ""
+  Write-Host "Ich speichere die Telegram-Werte automatisch an die richtige lokale Stelle." -ForegroundColor DarkGray
   Write-Host "Du musst keine .env-Datei selbst suchen." -ForegroundColor DarkGray
-  Write-Host "Chat-ID-Allowlist ist optional und blockiert den Start nicht mehr." -ForegroundColor DarkGray
+  Write-Host "Die Chat-ID wird automatisch erkannt. Du musst sie nicht wissen." -ForegroundColor DarkGray
   Write-Host ""
 }
-
-if ($needsToken) {
-  $currentToken = Prompt-RequiredValue `
-    -Prompt "Telegram Bot Token" `
-    -CurrentValue $currentToken `
-    -Validator { param($v) Test-TelegramTokenFormat -Value $v } `
-    -ErrorMessage "Bitte einen gueltigen Telegram Bot Token eingeben. Beispiel: 123456789:ABC..."
-  $envValues["BLUN_TELEGRAM_BOT_TOKEN"] = $currentToken
-  $changed = $true
-}
-
-if (-not $EnsureConfigured -and $needsChatIds) {
-  $currentAllowedChatIds = Prompt-RequiredValue `
-    -Prompt "Erlaubte Chat ID(s), komma-getrennt" `
-    -CurrentValue $currentAllowedChatIds `
-    -Validator { param($v) Test-AllowedChatIdsFormat -Value $v } `
-    -ErrorMessage "Bitte mindestens eine numerische Chat-ID eingeben. Mehrere IDs mit Komma trennen."
-  $envValues["BLUN_TELEGRAM_ALLOWED_CHAT_ID"] = (($currentAllowedChatIds -split "," | ForEach-Object { $_.Trim() } | Where-Object { $_ }) -join ",")
+
+if ($needsToken) {
+  $currentToken = Prompt-RequiredValue `
+    -Prompt "Telegram Bot Token" `
+    -CurrentValue $currentToken `
+    -Validator { param($v) Test-TelegramTokenFormat -Value $v } `
+    -ErrorMessage "Bitte einen gueltigen Telegram Bot Token eingeben. Beispiel: 123456789:ABC..."
+  $envValues["BLUN_TELEGRAM_BOT_TOKEN"] = $currentToken
   $changed = $true
+  $tokenWasPrompted = $true
 }
-
-$envValues["BLUN_TELEGRAM_AGENT_NAME"] = $profileAgent
-$envValues["BLUN_TELEGRAM_STATE_DIR"] = $stateDir
-Write-DotEnvFile -Path $envPath -Values $envValues
-
-$result = [ordered]@{
-  ok = $true
-  changed = $changed
-  profile = $profileAgent
-  state_dir = $stateDir
-  env_path = $envPath
-  missing = @()
-}
-
-if ($Json) {
-  $result | ConvertTo-Json -Depth 6
-  exit 0
-}
-
-Write-Host ""
-Write-Host "Telegram ist jetzt eingerichtet." -ForegroundColor Green
-Write-Host "Gespeichert unter: $envPath"
-Write-Host ""
-Write-Host "Naechster Schritt:" -ForegroundColor Cyan
-Write-Host "  blun-codex --profile $profileAgent telegram-plugin"
-Write-Host ""
-Write-Host "Pruefen kannst du spaeter mit:" -ForegroundColor Cyan
-Write-Host "  blun-codex --profile $profileAgent telegram-doctor"
+
+if ($needsChatIds -and -not $Json) {
+  try {
+    $botInfo = Get-TelegramBotInfo -Token $currentToken
+    $shouldPair = $tokenWasPrompted -or (-not $EnsureConfigured)
+    if ($shouldPair) {
+      $pairedChat = Wait-TelegramPairingChat -Token $currentToken -BotInfo $botInfo -TimeoutSeconds 90
+      if ($pairedChat -and $pairedChat.chat_id) {
+        $currentAllowedChatIds = [string]$pairedChat.chat_id
+        $envValues["BLUN_TELEGRAM_ALLOWED_CHAT_ID"] = $currentAllowedChatIds
+        $envValues["BLUN_TELEGRAM_PAIRING_DONE"] = "1"
+        $changed = $true
+        $label = if ($pairedChat.title) { "$($pairedChat.title) ($($pairedChat.chat_type))" } else { $pairedChat.chat_type }
+        Write-Host "Gekoppelt: $label -> $currentAllowedChatIds" -ForegroundColor Green
+      } else {
+        $envValues["BLUN_TELEGRAM_PAIRING_DONE"] = "1"
+        Write-Host "Keine Telegram-Nachricht erkannt. Ich starte ohne Allowlist; du kannst spaeter erneut `blun-codex telegram-setup` ausfuehren." -ForegroundColor Yellow
+      }
+    } else {
+      Write-Host "Hinweis: keine Chat-Allowlist gesetzt. Der Bot akzeptiert aktuell alle Chats, die er sehen kann." -ForegroundColor Yellow
+    }
+  } catch {
+    if ($tokenWasPrompted) {
+      throw
+    }
+    Write-Host $_.Exception.Message -ForegroundColor Yellow
+    Write-Host "Ich starte ohne Allowlist; du kannst spaeter erneut `blun-codex telegram-setup` ausfuehren." -ForegroundColor Yellow
+  }
+}
+
+$envValues["BLUN_TELEGRAM_AGENT_NAME"] = $profileAgent
+$envValues["BLUN_TELEGRAM_STATE_DIR"] = $stateDir
+Write-DotEnvFile -Path $envPath -Values $envValues
+
+$result = [ordered]@{
+  ok = $true
+  changed = $changed
+  profile = $profileAgent
+  state_dir = $stateDir
+  env_path = $envPath
+  missing = @()
+}
+
+if ($Json) {
+  $result | ConvertTo-Json -Depth 6
+  exit 0
+}
+
+Write-Host ""
+Write-Host "Telegram ist jetzt eingerichtet." -ForegroundColor Green
+Write-Host "Gespeichert unter: $envPath"
+Write-Host ""
+Write-Host "Naechster Schritt:" -ForegroundColor Cyan
+Write-Host "  blun-codex --profile $profileAgent telegram-plugin"
+Write-Host ""
+Write-Host "Pruefen kannst du spaeter mit:" -ForegroundColor Cyan
+Write-Host "  blun-codex --profile $profileAgent telegram-doctor"