opencode-wyvern 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-wyvern",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Setup modulare per OpenCode: SSH, client PowerShell/bash (comandi oc-*), configurazione server opencode, provider, plugin e comandi custom. Installi tutto, attivi quello che vuoi.",
   "type": "module",
   "license": "MIT",

package/templates/client-bash.sh

@@ -3,7 +3,31 @@
 export OC_SERVER='__OC_SERVER__'
 export OC_DIR='__OC_DIR__'
 
+oc-sync-env() {
+    local cfg="${XDG_CONFIG_HOME:-$HOME/.config}/opencode-wyvern/config.json"
+    [ -f "$cfg" ] || return 0
+    local out k v
+    if command -v node >/dev/null 2>&1; then
+        out="$(node -e 'const c=require(process.argv[1]).entry||{};for(const k of ["host","user","server","dir"]){if(c[k]!=null)console.log(k+"="+c[k])}' "$cfg" 2>/dev/null)" || return 0
+    elif command -v python3 >/dev/null 2>&1; then
+        out="$(python3 -c 'import json,sys;e=json.load(open(sys.argv[1]))["entry"];[print(k+"="+str(e[k])) for k in ("host","user","server","dir") if e.get(k)]' "$cfg" 2>/dev/null)" || return 0
+    else
+        return 0
+    fi
+    while IFS='=' read -r k v; do
+        [ -n "$k" ] || continue
+        case "$k" in
+            host)   export OC_HOST="$v" ;;
+            user)   export OC_USER="$v" ;;
+            server) export OC_SERVER="$v" ;;
+            dir)    export OC_DIR="$v" ;;
+        esac
+    done <<< "$out"
+}
+oc-sync-env
+
 oc-path() {
+    oc-sync-env
     if [ -z "$OC_OPENCODE" ]; then
         OC_OPENCODE=$(ssh -o BatchMode=yes "$OC_SERVER" "(command -v opencode || ls -t \$HOME/.nvm/versions/node/*/bin/opencode 2>/dev/null | head -n1)" 2>/dev/null | head -n1)
         [ -n "$OC_OPENCODE" ] || OC_OPENCODE='opencode'
@@ -12,6 +36,7 @@ oc-path() {
 }
 
 oc-connect() {
+    oc-sync-env
     local key="$HOME/.ssh/id_ed25519"
     local pub="$key.pub"
     if [ ! -f "$key" ]; then
@@ -29,11 +54,14 @@ oc-connect() {
 }
 
 oc() {
+    oc-sync-env
     local oc; oc="$(oc-path)"
+    oc-sessions-all >/dev/null 2>&1
     ssh -t "$OC_SERVER" "cd $OC_DIR && $oc"
 }
 
 oc-ssh() {
+    oc-sync-env
     ssh "$OC_SERVER"
 }
 
@@ -58,6 +86,7 @@ oc-cache-load() {
 }
 
 oc-sessions-all() {
+    oc-sync-env
     local oc b64 out
     py='import json,sys
 raw=sys.stdin.read()
@@ -171,9 +200,11 @@ oc-delete() {
 }
 
 oc-go() {
+    oc-sync-env
     local id="$1" dir="${2:-~}" norecap=0 oc exit_code
     [ "$3" = "--no-recap" ] && norecap=1
     oc="$(oc-path)"
+    oc-sessions-all >/dev/null 2>&1
     mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/opencode-wyvern"
     printf '%s\t%s\n' "$id" "${dir:-~}" > "${XDG_CACHE_HOME:-$HOME/.cache}/opencode-wyvern/last.tsv"
     if [ "$dir" = "~" ] || [ -z "$dir" ]; then
@@ -187,6 +218,7 @@ oc-go() {
 }
 
 oc-recap() {
+    oc-sync-env
     local last_exit="${1:--1}" err_time live cached list bar back m i id title dir updated last choice ss cid ctitle cdir
     err_time="$(date '+%Y-%m-%d %H:%M:%S')"
     bar="=============================================="
@@ -274,6 +306,7 @@ oc-open-tab() {
 }
 
 oc-resume() {
+    oc-sync-env
     local list rest first_term=1 mode="$1" term
     if [ "$mode" = "--all-tabs" ] || [ "$mode" = "-a" ]; then
         first_term=0

package/templates/client-pwsh.ps1

@@ -9,6 +9,22 @@ $env:OC_DIR     = '__OC_DIR__'                      # cartella remota di default
 
 $global:OC_OPENCODE = $null                # cache path, si azzera a ogni reload
 
+function Sync-OcEnv {
+    # riseleziona OC_* dal config (fonte di verità), così anche in un
+    # ambiente con variabili stale i comandi usano server/dir corretti.
+    $cfg = Join-Path $env:USERPROFILE ".config\opencode-wyvern\config.json"
+    if (-not (Test-Path $cfg)) { return }
+    try {
+        $j = Get-Content $cfg -Raw | ConvertFrom-Json
+        if ($j.entry.host)   { $env:OC_HOST   = [string]$j.entry.host }
+        if ($j.entry.user)   { $env:OC_USER   = [string]$j.entry.user }
+        if ($j.entry.server) { $env:OC_SERVER = [string]$j.entry.server }
+        if ($j.entry.dir)    { $env:OC_DIR    = [string]$j.entry.dir }
+    } catch { }
+}
+
+Sync-OcEnv
+
 function Get-OcPath {
     if (-not $global:OC_OPENCODE) {
         $remotePath = "(command -v opencode || ls -t ~/.nvm/versions/node/*/bin/opencode 2>/dev/null | head -n1)"
@@ -20,6 +36,7 @@ function Get-OcPath {
 }
 
 function oc-connect {
+    Sync-OcEnv
     $key = "$env:USERPROFILE\.ssh\id_ed25519"
     $pub = "$env:USERPROFILE\.ssh\id_ed25519.pub"
 
@@ -42,11 +59,14 @@ function oc-connect {
 }
 
 function oc {
+    Sync-OcEnv
+    $null = @(Get-OcAllSessions)
     $oc = Get-OcPath
     ssh -t $env:OC_SERVER "cd $env:OC_DIR && $oc"
 }
 
 function oc-ssh {
+    Sync-OcEnv
     ssh $env:OC_SERVER
 }
 
@@ -154,6 +174,7 @@ function Get-OcRecentSessions {
 }
 
 function oc-sessions {
+    Sync-OcEnv
     $sessions = Get-OcRecentSessions
     if (-not $sessions) {
         Write-Host "Nessuna sessione nelle ultime 24 ore (o SSH a chiave non configurato - esegui oc-connect)." -ForegroundColor Yellow
@@ -192,6 +213,7 @@ function oc-find {
         [string]$Search = '',
         [int]$Limit = 30
     )
+    Sync-OcEnv
     $all = Get-OcAllSessions
     if (-not $all) {
         Write-Host "Nessuna sessione trovata (o SSH a chiave non configurato)." -ForegroundColor Yellow
@@ -234,6 +256,7 @@ function oc-delete {
     param(
         [string]$Search = ''
     )
+    Sync-OcEnv
     $all = Get-OcAllSessions
     if (-not $all) {
         Write-Host "Nessuna sessione trovata." -ForegroundColor Yellow
@@ -280,6 +303,8 @@ function oc-go {
         [string]$Dir = "~",
         [switch]$NoRecap
     )
+    Sync-OcEnv
+    $null = @(Get-OcAllSessions)
     $oc = Get-OcPath
     if ($Dir -eq '~' -or [string]::IsNullOrEmpty($Dir)) {
         $remoteCmd = "cd ~ && $oc -s $Id"
@@ -298,6 +323,7 @@ function Show-OcRecap {
         [int]$LastExit = -1,
         [datetime]$ErrTime = (Get-Date)
     )
+    Sync-OcEnv
     Write-Host ""
     Write-Host ("{0}" -f ('=' * 56)) -ForegroundColor DarkCyan
     Write-Host "Connessione terminata. Riepilogo per riprendere:" -ForegroundColor Cyan
@@ -411,6 +437,7 @@ function Get-OcTerminal {
 
 function Invoke-OcWarpResume {
     param([Parameter(Mandatory)]$Sessions)
+    Sync-OcEnv
     $dir = Get-WarpConfigDir
     if (-not $dir) { return $false }
     $oc = Get-OcPath
@@ -460,6 +487,7 @@ function oc-resume {
         [switch]$Warp,
         [switch]$AllTabs
     )
+    Sync-OcEnv
     $sessions = @(Get-OcRecentSessions)
 
     if ($sessions.Count -eq 0) {