opencode-wyvern 0.2.2 → 0.2.4

package/README.md

@@ -20,7 +20,7 @@ npm install -g opencode-wyvern
 Il comando si chiama **`oc-setup`** (non `oc-help`, non `oc`). Verifica:
 
 ```bash
-oc-setup --version    # → 0.2.1
+oc-setup --version    # → 0.2.4
 ```
 
 Se compare `oc-setup: command not found` subito dopo l'installazione, il
@@ -96,7 +96,7 @@ accodata al valore precedente.
 | `client-bash` | locale | stesso blocco in `~/.bashrc` |
 | `server`      | remoto | controlla node/npm, installa opencode se manca, crea `~/.config/opencode` + `AGENTS.md` |
 | `commands`    | remoto | comandi custom in `command/*.md` (`/baseline-ui`, `/omniroute-restart`, `/review`, ...) |
-| `mcp`         | remoto | server MCP preset (Figma Desktop, Figma Developer MCP); token in `.env` |
+| `mcp`         | remoto | server MCP preset (Figma Developer MCP); token in `.env` |
 | `providers`   | remoto | provider opencode in `opencode.json`; chiavi in `.env` |
 | `plugins`     | remoto | plugin npm installati nella dir config e listati in `opencode.json` |
 | `claude-mem`  | remoto | memoria: wrapper `plugins/claude-mem-plugin.js` |
@@ -125,10 +125,9 @@ Docker OmniRoute e attende che sia `healthy`), `/review`, `/refactor`, `/tests`,
 
 ## MCP
 
-La sezione `mcp` scrive il blocco `mcp` di `opencode.json` con i preset:
-**Figma Desktop** (Dev Mode, `http://127.0.0.1:3845/mcp`, nessun segreto) e
-**Figma Developer MCP** (stdio via `npx figma-developer-mcp`; il Figma personal
-token finisce in `.env` sul server, mai in `config.json`).
+La sezione `mcp` configura **Figma Developer MCP** (stdio via
+`npx figma-developer-mcp`). Il Figma personal access token finisce in `.env`
+sul server, mai in `config.json`.
 
 ## Client
 
@@ -149,4 +148,4 @@ node bin/oc-setup.js --help
 - Nessuna chiave/token/password nel pacchetto o in `config.json` locale.
 - Le API key sono scritte dal bootstrap remoto in `~/.config/opencode/.env` (`chmod 600`).
 - I file remoti viaggiano come base64 dentro lo script; con server non raggiungibile
-  lo script non viene stampato a video (evita leak delle chiavi).
+  lo script non viene stampato a video (evita leak delle chiavi).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-wyvern",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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/src/sections.js

@@ -155,7 +155,6 @@ export const COMMAND_CHOICES = [
 ]
 
 export const MCP_CHOICES = [
-  { label: "Figma Desktop — Dev Mode (localhost, " + ui("nessun segreto", "no secret") + ")", value: "figma-desktop" },
   { label: "Figma Developer MCP — npx + " + ui("token personale Figma", "personal Figma token"), value: "figma-developer" },
 ]
 
@@ -196,7 +195,8 @@ export function serverState(cfg) {
     omnirouteUrl,
     baseUrls: cfg.baseUrls || {},
     customCommands: cfg.customCommands || [],
-    mcpList: cfg.mcpList || [],
+    // Ignora preset rimossi: `oc-setup generate` pulisce anche le vecchie config.
+    mcpList: (cfg.mcpList || []).filter((id) => MCP_PRESETS[id]),
     defaultModel,
     smallModel,
     tuning: cfg.tuning,
@@ -259,4 +259,4 @@ export function applyRemoteSections(cfg, { dryRun = false, envKeys, applyMode }
   }
   runRemote(cfg.entry || cfg, script)
   return { applied: true, script }
-}
+}

package/src/server.js

@@ -158,16 +158,14 @@ function providerBlock(id, models, baseUrls = {}, omnirouteUrl = "") {
  * `envKey` = chiave d'ambiente da chiedere al setup (finisce in .env sul server).
  */
 export const MCP_PRESETS = {
-  "figma-desktop": {
-    label: "Figma Desktop — Dev Mode (localhost, nessun segreto)",
-    type: "remote",
-    url: "http://127.0.0.1:3845/mcp",
-  },
   "figma-developer": {
     label: "Figma Developer MCP — npx + Figma personal token",
     type: "local",
-    command: ["npx", "-y", "figma-developer-mcp", "--stdio"],
-    environment: { FIGMA_API_KEY: "{env:FIGMA_API_KEY}" },
+    command: ["npx", "-y", "figma-developer-mcp", "--stdio", "--no-telemetry"],
+    environment: {
+      FIGMA_API_KEY: "{env:FIGMA_API_KEY}",
+      PATH: "{env:PATH}",
+    },
     timeout: 15000,
     envKey: "FIGMA_API_KEY",
   },
@@ -175,14 +173,14 @@ export const MCP_PRESETS = {
 
 /** Raggruppa i preset MCP scelti nel blocco `mcp` di opencode.json. */
 export function buildMcpBlock(mcpList = []) {
-  const mcp = {}
+  const servers = {}
   for (const id of mcpList) {
     const p = MCP_PRESETS[id]
     if (!p) continue
     const { label, envKey, ...serv } = p
-    mcp[id] = serv
+    servers[id] = serv
   }
-  return mcp
+  return Object.keys(servers).length ? { servers } : {}
 }
 
 /** Modello default (inner ID) per un preset MCP che richiede un token. */
@@ -244,11 +242,12 @@ export function ensureLocalKey() {
 export function installKeyOnServer(cfg) {
   const { pub } = keyPaths()
   const pubContent = fs.readFileSync(pub, "utf8").trim()
+  const pubB64 = Buffer.from(pubContent, "utf8").toString("base64")
   const target = sshTargetArgs(cfg)
   const remoteCmd =
-    "umask 077; mkdir -p ~/.ssh && grep -qF '" +
-    pubContent.split(" ")[0] +
-    "' ~/.ssh/authorized_keys 2>/dev/null || (cat >> ~/.ssh/authorized_keys); " +
+    `umask 077; mkdir -p ~/.ssh; touch ~/.ssh/authorized_keys; ` +
+    `PUB="$(printf '%s' '${pubB64}' | base64 -d)"; ` +
+    `grep -qxF "$PUB" ~/.ssh/authorized_keys 2>/dev/null || printf '%s\\n' "$PUB" >> ~/.ssh/authorized_keys; ` +
     "chmod 700 ~/.ssh; chmod 600 ~/.ssh/authorized_keys; echo OK"
 
   console.log(c.cyan(ui(
@@ -278,6 +277,8 @@ export function hostAliasBlock(cfg) {
   if (cfg.host) parts.push(`    HostName ${cfg.host}`)
   if (cfg.user) parts.push(`    User ${cfg.user}`)
   if (cfg.port && String(cfg.port) !== "22") parts.push(`    Port ${cfg.port}`)
+  parts.push("    IdentityFile ~/.ssh/id_ed25519")
+  parts.push("    IdentitiesOnly yes")
   parts.push("    ServerAliveInterval 30")
   parts.push("    ServerAliveCountMax 5")
   parts.push("    StrictHostKeyChecking accept-new")
@@ -289,19 +290,37 @@ export function ensureSshConfigAlias(cfg) {
   const p = sshConfigPath()
   const target = `Host ${cfg.server}`
   let content = ""
+  const nextBlock = hostAliasBlock(cfg)
   if (fs.existsSync(p)) {
     content = fs.readFileSync(p, "utf8")
-    if (content.includes(target)) return false
+    const re = new RegExp(`(^|\\n)Host\\s+${cfg.server.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\n(?:[ \\t].*(?:\\n|$))*`, "m")
+    if (re.test(content)) {
+      const updated = content.replace(re, (m, lead = "") => `${lead}${nextBlock}\n`)
+      if (updated === content) return false
+      fs.writeFileSync(p, updated, "utf8")
+      return true
+    }
     if (content && !content.endsWith("\n")) content += "\n"
   }
   ensureDir(path.dirname(p))
-  fs.writeFileSync(p, content + hostAliasBlock(cfg) + "\n", "utf8")
+  fs.writeFileSync(p, content + nextBlock + "\n", "utf8")
   return true
 }
 
 /** Verifica la connessione SSH senza password (BatchMode). */
 export function verifyConnection(cfg) {
-  const res = run("ssh", [...sshTargetArgs(cfg), "-o", "BatchMode=yes", "-o", "ConnectTimeout=8", "echo CONN_OK"], {
+  const { key } = keyPaths()
+  const target = cfg.server || sshTargetArgs(cfg).at(-1)
+  const targetArgs = cfg.server ? [] : sshTargetArgs(cfg).slice(0, -1)
+  const keyArgs = fs.existsSync(key) ? ["-i", key, "-o", "IdentitiesOnly=yes"] : []
+  const res = run("ssh", [
+    ...targetArgs,
+    ...keyArgs,
+    "-o", "BatchMode=yes",
+    "-o", "ConnectTimeout=8",
+    target,
+    "echo CONN_OK",
+  ], {
     silent: true,
     timeout: 20000,
   })
@@ -335,7 +354,7 @@ export function buildRemoteScript({ sections = new Set(), providers = new Set(),
       "if [ -z \"$OPENCODE_BIN\" ]; then",
       "  log 'opencode mancante: lo installo (npm i -g opencode-ai)'",
       "  npm install -g opencode-ai >/dev/null 2>&1 || true",
-      "  OPENCODE_BIN=\"$(command -v opencode 2>/dev/null)\"",
+      "  OPENCODE_BIN=\"$(command -v opencode 2>/dev/null || ls -t $HOME/.nvm/versions/node/*/bin/opencode 2>/dev/null | head -n1)\"",
       "fi",
       '[ -f package.json ] || printf \'{\\n  "private": true,\\n  "dependencies": {}\\n}\\n\' > package.json',
       "[ -f .gitignore ] || printf 'node_modules\\n.env\\n' > .gitignore",
@@ -392,6 +411,19 @@ export function buildRemoteScript({ sections = new Set(), providers = new Set(),
     lines.push("umask 077; [ -f \"$CFG_DIR/.env\" ] || : > \"$CFG_DIR/.env\"")
   }
 
+  if (mcpList.includes("figma-developer")) {
+    lines.push(
+      'NVM_NODE_BIN="$(ls -dt \"$HOME\"/.nvm/versions/node/*/bin 2>/dev/null | head -n1)"',
+      'if [ -n "$NVM_NODE_BIN" ] && [ -x "$NVM_NODE_BIN/node" ]; then',
+      '  touch "$CFG_DIR/.env"',
+      '  grep -v "^PATH=" "$CFG_DIR/.env" > "$CFG_DIR/.env.tmp" || true',
+      '  printf \'PATH="%s:%s"\\n\' "$NVM_NODE_BIN" "$PATH" >> "$CFG_DIR/.env.tmp"',
+      '  mv "$CFG_DIR/.env.tmp" "$CFG_DIR/.env"',
+      '  chmod 600 "$CFG_DIR/.env"',
+      'fi',
+    )
+  }
+
   lines.push('log "config opencode scritta in: $CFG_DIR"')
   lines.push("[ -n \"$OPENCODE_BIN\" ] && \"$OPENCODE_BIN\" --version && echo REMOTE_OK || echo REMOTE_NO_OPENCODE")
   return lines.join("\n")
@@ -448,4 +480,4 @@ export function runScriptLocal(script) {
 
 export function isPortValid(v) {
   return v === "" || (/^\d+$/.test(v) && Number(v) >= 1 && Number(v) <= 65535)
-}
+}

package/src/setup.js

@@ -323,6 +323,14 @@ if (!localOnly) {
     if (doInstall) {
       try {
         installKeyOnServer(entry)
+        if (verifyConnection(entry)) {
+          console.log(c.green(ui("  autenticazione SSH a chiave verificata.", "  SSH key authentication verified.")))
+        } else {
+          console.log(c.yellow(ui(
+            "  attenzione: la chiave e' stata copiata, ma l'accesso senza password non e' stato verificato. Controlla sshd e ~/.ssh/authorized_keys sul server.",
+            "  warning: the key was copied, but passwordless login could not be verified. Check sshd and ~/.ssh/authorized_keys on the server.",
+          )))
+        }
       } catch (err) {
         console.log(c.yellow(`  ${ui("attenzione:", "warning:")} ${err.message}`))
       }
@@ -385,7 +393,8 @@ export async function cmdStatus() {
     console.log(`  server: provider ${providers.join(", ")}${urls.length ? ` · ${urls.join(" · ")}` : ""}${cfg.tuning ? ui(" · tuning on", " · tuning on") : ""}`)
   }
   if (cfg.customCommands?.length) console.log(`  cmds  : ${cfg.customCommands.map((x) => "/" + x).join(", ")}`)
-  if (cfg.mcpList?.length) console.log(`  mcp   : ${cfg.mcpList.join(", ")}`)
+  const mcpList = (cfg.mcpList || []).filter((id) => MCP_PRESETS[id])
+  if (mcpList.length) console.log(`  mcp   : ${mcpList.join(", ")}`)
   console.log("")
   console.log(ui("  moduli:", "  modules:"))
   for (const s of SECTIONS) {
@@ -447,4 +456,4 @@ function fail(msg) {
 export async function runPrintClient(kind) {
   const id = kind === "bash" ? "client-bash" : "client-pwsh"
   await cmdPrint(id)
-}
+}

package/templates/client-bash.sh

@@ -28,11 +28,10 @@ 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'
-    fi
-    echo "$OC_OPENCODE"
+    # Risolve opencode SUL SERVER al momento dell'esecuzione: funziona anche
+    # senza chiave SSH configurata (BatchMode non tenuto) e senza opencode nel
+    # PATH del server (cade sulle installazioni nvm `~/.nvm/versions/node/*/bin`).
+    printf '%s' '__oc_wyvern(){ OPENCODE_BIN="$(command -v opencode 2>/dev/null || ls -t $HOME/.nvm/versions/node/*/bin/opencode 2>/dev/null | head -n1)"; if [ -z "$OPENCODE_BIN" ]; then echo "[oc] ERRORE: opencode non trovato sul server. Esegui oc-setup scegliendo Client + Server, oppure installa sul server: npm install -g opencode-ai" >&2; return 127; fi; "$OPENCODE_BIN" "$@"; }; __oc_wyvern'
 }
 
 oc-connect() {
@@ -201,10 +200,23 @@ oc-delete() {
 
 oc-go() {
     oc-sync-env
-    local id="$1" dir="${2:-~}" norecap=0 oc exit_code
+    local id="$1" dir="${2:-}" norecap=0 oc exit_code session_dir
     [ "$3" = "--no-recap" ] && norecap=1
+    if [ -z "$id" ]; then
+        echo -e "${RED}[FAIL] Specifica l'ID della sessione.${NC}"
+        return 2
+    fi
+    case "$id" in
+        *[![:alnum:]_-]*) echo -e "${RED}[FAIL] ID sessione non valido.${NC}"; return 2 ;;
+    esac
     oc="$(oc-path)"
-    oc-sessions-all >/dev/null 2>&1
+    if [ -z "$dir" ]; then
+        session_dir="$(oc-cache-load | awk -F '\t' -v wanted="$id" '$2 == wanted { print $4; exit }')"
+        if [ -z "$session_dir" ]; then
+            session_dir="$(oc-sessions-all | awk -F '\t' -v wanted="$id" '$2 == wanted { print $4; exit }')"
+        fi
+        dir="${session_dir:-~}"
+    fi
     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
@@ -229,6 +241,12 @@ oc-recap() {
     live="$(oc-sessions-today 2>/dev/null)"
     if [ -z "$live" ]; then
         cached="$(oc-cache-load)"
+        if [ "$last_exit" = "127" ]; then
+            echo -e "${RED}  [!] Comando remoto non trovato (SSH exit 127).${NC}"
+            echo -e "${YELLOW}      Probabile causa: opencode non e' installato sul server o non e' nel PATH della shell SSH.${NC}"
+            echo -e "${DARKGRAY:-}      Risolvi con: oc-setup scegliendo Client + Server, oppure sul server: npm install -g opencode-ai${NC}"
+            return 127
+        fi
         if [ -n "$cached" ]; then
             m="$(stat -c %y "${XDG_CACHE_HOME:-$HOME/.cache}/opencode-wyvern/sessions.tsv" 2>/dev/null | cut -d'.' -f1)"
             echo -e "${RED}  [!] Connessione persa alle $err_time (SSH exit $last_exit).${NC}"
@@ -448,4 +466,4 @@ oc-help() {
     echo ""
     echo -e "${DARKGRAY:-}Nota: oc-ssh, oc-sessions, oc-resume richiedono SSH key configurata"
     echo ""
-}
+}

package/templates/client-pwsh.ps1

@@ -26,13 +26,10 @@ function Sync-OcEnv {
 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)"
-        $found = ssh -o BatchMode=yes $env:OC_SERVER $remotePath 2>$null | Select-Object -First 1
-        if ($found) { $global:OC_OPENCODE = $found.Trim() }
-        else { $global:OC_OPENCODE = 'opencode' }
-    }
-    return $global:OC_OPENCODE
+    # Risolve opencode SUL SERVER al momento dell'esecuzione: funziona anche
+    # senza chiave SSH configurata (niente BatchMode) e senza opencode nel PATH
+    # del server (fallback sulle installazioni nvm ~/.nvm/versions/node/*/bin).
+    return '__oc_wyvern(){ OPENCODE_BIN="$(command -v opencode 2>/dev/null || ls -t $HOME/.nvm/versions/node/*/bin/opencode 2>/dev/null | head -n1)"; if [ -z "$OPENCODE_BIN" ]; then echo "[oc] ERRORE: opencode non trovato sul server. Esegui oc-setup scegliendo Client + Server, oppure installa sul server: npm install -g opencode-ai" >&2; return 127; fi; "$OPENCODE_BIN" "$@"; }; __oc_wyvern'
 }
 
 function oc-connect {
@@ -300,11 +297,21 @@ function oc-go {
     param(
         [Parameter(Mandatory)]
         [string]$Id,
-        [string]$Dir = "~",
+        [string]$Dir = "",
         [switch]$NoRecap
     )
     Sync-OcEnv
-    $null = @(Get-OcAllSessions)
+    if ($Id -notmatch '^[A-Za-z0-9_-]+$') {
+        Write-Host "ID sessione non valido." -ForegroundColor Red
+        return
+    }
+    if ([string]::IsNullOrWhiteSpace($Dir)) {
+        $found = @(Get-OcCachedSessions | Where-Object { $_.Id -eq $Id } | Select-Object -First 1)
+        if (-not $found.Count) {
+            $found = @(Get-OcAllSessions | Where-Object { $_.Id -eq $Id } | Select-Object -First 1)
+        }
+        $Dir = if ($found.Count) { $found[0].Dir } else { "~" }
+    }
     $oc = Get-OcPath
     if ($Dir -eq '~' -or [string]::IsNullOrEmpty($Dir)) {
         $remoteCmd = "cd ~ && $oc -s $Id"
@@ -334,6 +341,12 @@ function Show-OcRecap {
         $sessions = @(Get-OcRecentSessions)
         $fromCache = $false
         if ($sessions.Count -eq 0) {
+            if ($LastExit -eq 127) {
+                Write-Host "  [!] Comando remoto non trovato (SSH exit 127)." -ForegroundColor Red
+                Write-Host "      Probabile causa: opencode non e' installato sul server o non e' nel PATH della shell SSH." -ForegroundColor Yellow
+                Write-Host "      Risolvi con: oc-setup scegliendo Client + Server, oppure sul server: npm install -g opencode-ai" -ForegroundColor DarkGray
+                return
+            }
             $status = Get-OcServerStatus
             if ($status.Up) {
                 Write-Host "  Server raggiungibile ma nessuna sessione nelle ultime 24 ore." -ForegroundColor Yellow