gssh-agent 1.0.0 → 1.0.2

package/internal/session/manager.go

@@ -10,6 +10,7 @@ import (
 	"gssh/internal/protocol"
 
 	"github.com/google/uuid"
+	"golang.org/x/crypto/ssh"
 )
 
 // Manager manages SSH sessions
@@ -23,17 +24,17 @@ type Manager struct {
 
 // ManagedSession wraps a session with additional state
 type ManagedSession struct {
-	ID        string
-	Host      string
-	User      string
-	Port      int
-	Status    string
-	Password  string
-	KeyPath   string
-	SSHClient *client.SSHClient
-	LastCmd   string
-	Forwards  map[string]*portforward.Forwarder
-	mu        sync.RWMutex
+	ID                 string
+	Host               string
+	User               string
+	Port               int
+	Status             string
+	Password           string
+	KeyPath            string
+	SSHClient          *client.SSHClient
+	LastCmd            string
+	Forwards           map[string]*portforward.Forwarder
+	mu                 sync.RWMutex
 }
 
 // NewManager creates a new session manager
@@ -180,23 +181,47 @@ func (m *Manager) Exec(sessionID, command string) (*protocol.ExecResult, error)
 	}
 
 	ms.mu.RLock()
-	defer ms.mu.RUnlock()
-
 	if ms.SSHClient == nil {
+		ms.mu.RUnlock()
 		return nil, fmt.Errorf("session not connected")
 	}
+	ms.mu.RUnlock()
 
-	stdout, stderr, exitCode, err := ms.SSHClient.Exec(command)
-	if err != nil && exitCode == 0 {
-		return nil, err
+	// 复用 SSH 连接，创建新的 session 执行命令
+	session, err := ms.SSHClient.Client.NewSession()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create session: %w", err)
 	}
+	defer session.Close()
 
-	ms.LastCmd = command
+	// 直接执行命令，不通过 shell
+	
+	fullCmd := command
+
+	output, err := session.CombinedOutput(fullCmd)
+	if err != nil {
+		exitErr, ok := err.(*ssh.ExitError)
+		if ok {
+			ms.LastCmd = command
+			return &protocol.ExecResult{
+				Stdout:   string(output),
+				Stderr:   "",
+				ExitCode: exitErr.ExitStatus(),
+			}, nil
+		}
+		ms.LastCmd = command
+		return &protocol.ExecResult{
+			Stdout:   string(output),
+			Stderr:   "",
+			ExitCode: 0,
+		}, nil
+	}
 
+	ms.LastCmd = command
 	return &protocol.ExecResult{
-		Stdout:   stdout,
-		Stderr:   stderr,
-		ExitCode: exitCode,
+		Stdout:   string(output),
+		Stderr:   "",
+		ExitCode: 0,
 	}, nil
 }
 
@@ -314,6 +339,164 @@ func (m *Manager) CloseForward(forwardID string) error {
 	return nil
 }
 
+// SCP uploads or downloads files via SFTP
+func (m *Manager) SCP(sessionID, source, dest string, isUpload bool) (*protocol.SCPResult, error) {
+	m.mu.RLock()
+	var ms *ManagedSession
+	if sessionID != "" {
+		ms = m.sessions[sessionID]
+	} else if m.defaultID != "" {
+		ms = m.sessions[m.defaultID]
+	}
+	m.mu.RUnlock()
+
+	if ms == nil {
+		return nil, fmt.Errorf("session not found")
+	}
+
+	ms.mu.RLock()
+	sshClient := ms.SSHClient
+	ms.mu.RUnlock()
+
+	if sshClient == nil {
+		return nil, fmt.Errorf("session not connected")
+	}
+
+	// Create SFTP client
+	sftpClient, err := sshClient.NewSFTPClient()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SFTP client: %w", err)
+	}
+	defer sftpClient.Close()
+
+	start := time.Now()
+
+	var bytes int64
+	var transferErr error
+
+	if isUpload {
+		// Upload: source is local, dest is remote
+		bytes, transferErr = sftpClient.Upload(source, dest)
+	} else {
+		// Download: source is remote, dest is local
+		bytes, transferErr = sftpClient.Download(source, dest)
+	}
+
+	duration := time.Since(start).Milliseconds()
+
+	if transferErr != nil {
+		return &protocol.SCPResult{
+			Success:  false,
+			Message:  transferErr.Error(),
+			Bytes:    bytes,
+			Duration: duration,
+		}, nil
+	}
+
+	return &protocol.SCPResult{
+		Success:  true,
+		Message:  fmt.Sprintf("Transferred %d bytes in %dms", bytes, duration),
+		Bytes:    bytes,
+		Duration: duration,
+	}, nil
+}
+
+// SFTPList lists files in a remote directory
+func (m *Manager) SFTPList(sessionID, path string) ([]string, error) {
+	m.mu.RLock()
+	var ms *ManagedSession
+	if sessionID != "" {
+		ms = m.sessions[sessionID]
+	} else if m.defaultID != "" {
+		ms = m.sessions[m.defaultID]
+	}
+	m.mu.RUnlock()
+
+	if ms == nil {
+		return nil, fmt.Errorf("session not found")
+	}
+
+	ms.mu.RLock()
+	sshClient := ms.SSHClient
+	ms.mu.RUnlock()
+
+	if sshClient == nil {
+		return nil, fmt.Errorf("session not connected")
+	}
+
+	sftpClient, err := sshClient.NewSFTPClient()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SFTP client: %w", err)
+	}
+	defer sftpClient.Close()
+
+	return sftpClient.List(path)
+}
+
+// SFTPMkdir creates a remote directory
+func (m *Manager) SFTPMkdir(sessionID, path string) error {
+	m.mu.RLock()
+	var ms *ManagedSession
+	if sessionID != "" {
+		ms = m.sessions[sessionID]
+	} else if m.defaultID != "" {
+		ms = m.sessions[m.defaultID]
+	}
+	m.mu.RUnlock()
+
+	if ms == nil {
+		return fmt.Errorf("session not found")
+	}
+
+	ms.mu.RLock()
+	sshClient := ms.SSHClient
+	ms.mu.RUnlock()
+
+	if sshClient == nil {
+		return fmt.Errorf("session not connected")
+	}
+
+	sftpClient, err := sshClient.NewSFTPClient()
+	if err != nil {
+		return fmt.Errorf("failed to create SFTP client: %w", err)
+	}
+	defer sftpClient.Close()
+
+	return sftpClient.Mkdir(path)
+}
+
+// SFTPRemove removes a remote file
+func (m *Manager) SFTPRemove(sessionID, path string) error {
+	m.mu.RLock()
+	var ms *ManagedSession
+	if sessionID != "" {
+		ms = m.sessions[sessionID]
+	} else if m.defaultID != "" {
+		ms = m.sessions[m.defaultID]
+	}
+	m.mu.RUnlock()
+
+	if ms == nil {
+		return fmt.Errorf("session not found")
+	}
+
+	ms.mu.RLock()
+	sshClient := ms.SSHClient
+	ms.mu.RUnlock()
+
+	if sshClient == nil {
+		return fmt.Errorf("session not connected")
+	}
+
+	sftpClient, err := sshClient.NewSFTPClient()
+	if err != nil {
+		return fmt.Errorf("failed to create SFTP client: %w", err)
+	}
+	defer sftpClient.Close()
+
+	return sftpClient.Remove(path)
+}
+
 // monitorReconnect monitors connection and auto-reconnects
 func (m *Manager) monitorReconnect(ms *ManagedSession) {
 	ticker := time.NewTicker(5 * time.Second)

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "gssh-agent",
-  "version": "1.0.0",
-  "description": "SSH Session Manager for Agents",
+  "version": "1.0.2",
+  "description": "SSH Session Manager for Agents - Stateless SSH client with SFTP support",
   "bin": {
-    "gssh": "bin/gssh",
-    "gssh-daemon": "bin/gssh-daemon"
+    "gssh": "./bin/gssh",
+    "gssh-daemon": "./bin/gssh-daemon"
   },
   "repository": {
     "type": "git",
@@ -12,14 +12,29 @@
   },
   "keywords": [
     "ssh",
+    "sftp",
+    "scp",
     "agent",
     "session-manager",
-    "port-forwarding"
+    "port-forwarding",
+    "remote-execution"
   ],
   "author": "",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/forechoandlook/gssh/issues"
   },
-  "homepage": "https://github.com/forechoandlook/gssh#readme"
+  "homepage": "https://github.com/forechoandlook/gssh#readme",
+  "preferGlobal": true,
+  "os": [
+    "darwin",
+    "linux"
+  ],
+  "cpu": [
+    "x64",
+    "arm64"
+  ],
+  "engines": {
+    "node": ">=14.0.0"
+  }
 }

package/pkg/rpc/handler.go

@@ -89,6 +89,34 @@ func (h *Handler) Handle(data []byte) ([]byte, error) {
 		}
 		err = h.manager.CloseForward(params.ForwardID)
 
+	case "scp":
+		var params protocol.SCPParams
+		if err := json.Unmarshal(req.Params, &params); err != nil {
+			return h.errorResponse(req.ID, -32602, "Invalid params")
+		}
+		result, err = h.manager.SCP(params.SessionID, params.Source, params.Dest, params.IsUpload)
+
+	case "sftp_list":
+		var params protocol.SFTPParams
+		if err := json.Unmarshal(req.Params, &params); err != nil {
+			return h.errorResponse(req.ID, -32602, "Invalid params")
+		}
+		result, err = h.manager.SFTPList(params.SessionID, params.Path)
+
+	case "sftp_mkdir":
+		var params protocol.SFTPParams
+		if err := json.Unmarshal(req.Params, &params); err != nil {
+			return h.errorResponse(req.ID, -32602, "Invalid params")
+		}
+		err = h.manager.SFTPMkdir(params.SessionID, params.Path)
+
+	case "sftp_remove":
+		var params protocol.SFTPParams
+		if err := json.Unmarshal(req.Params, &params); err != nil {
+			return h.errorResponse(req.ID, -32602, "Invalid params")
+		}
+		err = h.manager.SFTPRemove(params.SessionID, params.Path)
+
 	default:
 		return h.errorResponse(req.ID, -32601, fmt.Sprintf("Method not found: %s", req.Method))
 	}

package/skill.md

@@ -1,96 +1,96 @@
-# gssh 使用指南
-
-## 快速开始
-
-### 1. 安装
-
-```bash
-git clone <repository-url>
-cd gssh
-go build -o bin/daemon cmd/daemon/main.go
-go build -o bin/gssh cmd/gssh/main.go
-./homebrew/install.sh
-```
-
-### 2. 基本使用
+---
+name: use-gssh
+description: "Manage SSH sessions with gssh CLI for agents"
+allowed-tools: Read, Write, Glob, Grep, Bash
+triggers:
+  - gssh
+  - ssh session
+  - ssh 连接
+  - ssh 管理
+  - sftp
+  - scp 文件传输
+---
+
+## 连接认证
 
 ```bash
-# 连接 SSH
-gssh connect -u admin1 -h 192.168.1.100 -P 1234
+# 使用密码
+gssh connect -u user -h host -p password
 
-# 执行命令
-gssh exec "ls -la"
-
-# 列出 session
-gssh list
+# SSH 密钥
+gssh connect -u user -h host -i ~/.ssh/id_rsa
 ```
 
-## 核心概念
-
-- **daemon**: 后台服务，管理 SSH 连接
-- **session**: 一个 SSH 连接会话
-- **默认 session**: 不指定 session ID 时使用的会话
-
-## 命令列表
+## 核心命令
 
 | 命令 | 说明 |
 |------|------|
-| `connect` | 建立新 SSH 连接 |
+| `connect` | 建立 SSH 连接 |
 | `exec` | 执行命令 |
-| `list` | 列出所有 session |
-| `use` | 切换默认 session |
-| `disconnect` | 断开 session |
-| `reconnect` | 重连 session |
+| `scp` | 文件传输 |
+| `sftp` | SFTP 操作 |
 | `forward` | 端口转发 |
-| `forwards` | 列出转发 |
-| `forward-close` | 关闭转发 |
+| `list` | 列出 session |
+| `use` | 切换默认 session |
 
-## 典型工作流
+## 执行命令
 
 ```bash
-# 1. 连接远程主机
-gssh connect -u admin -h 192.168.1.100 -P password
-
-# 2. 执行命令（使用默认 session）
-gssh exec "pwd"
-gssh exec "uname -a"
-
-# 3. 断开连接
-gssh disconnect
+# 普通命令
+gssh exec "ls -la"
 
-# 4. 重连
-gssh reconnect -s <session-id>
+# sudo 命令
+gssh exec -S password "sudo systemctl restart nginx"
 ```
 
-## SSH 密钥认证
+## 文件传输
 
 ```bash
-# 使用密钥连接
-gssh connect -u admin -h 192.168.1.100 -i ~/.ssh/id_rsa
+# 上传本地 -> 远程
+gssh scp -put local.txt /remote/path/
+
+# 下载远程 -> 本地
+gssh scp -get /remote/file.txt ./
+
+# SFTP 目录操作
+gssh sftp -c ls -p /home/user
+gssh sftp -c mkdir -p /home/user/newdir
+gssh sftp -c rm -p /home/user/file.txt
 ```
 
 ## 端口转发
 
 ```bash
-# 本地转发：localhost:8080 -> remote:80
+# 本地转发: localhost:8080 -> remote:80
 gssh forward -l 8080 -r 80
+
+# 远程转发: remote:9000 -> localhost:3000
+gssh forward -R -l 9000 -r 3000
 ```
 
-## 服务管理
+## Session 管理
 
 ```bash
-# 启动
-brew services start gssh
-
-# 停止
-brew services stop gssh
-
-# 状态
-brew services list
+gssh list                    # 列出所有 session
+gssh use <session-id>        # 切换默认 session
+gssh disconnect             # 断开
+gssh reconnect -s <id>     # 重连
 ```
 
-## 注意事项
+## 选项汇总
 
-- Agent 使用场景：无状态，每次请求独立完成
-- sudo 命令：需要配置 passwordless sudo 或使用密钥认证
-- Session 状态由 daemon 维护，CLI 只负责发送请求
+| 选项 | 说明 |
+|------|------|
+| `-s` | session ID |
+| `-u` | 用户名 |
+| `-h` | 主机地址 |
+| `-p` | 端口（默认 22） |
+| `-P` | SSH 密码 |
+| `-i` | SSH 密钥 |
+| `-l` | 本地端口 |
+| `-r` | 远程端口 |
+| `-R` | 远程端口转发 |
+| `-put/-get` | 上传/下载 |
+| `-S` | sudo 密码 |
+| `--ask-pass` | 交互输入 SSH 密码 |
+| `--ask-sudo-pass` | 交互输入 sudo 密码 |

package/homebrew/gssh.plist

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>com.gssh.daemon</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>/usr/local/bin/gssh-daemon</string>
-        <string>-socket</string>
-        <string>/tmp/gssh.sock</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>KeepAlive</key>
-    <true/>
-    <key>StandardOutPath</key>
-    <string>/var/log/gssh.log</string>
-    <key>StandardErrorPath</key>
-    <string>/var/log/gssh.error.log</string>
-</dict>
-</plist>

package/homebrew/install.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-# gssh service installation script
-
-set -e
-
-# Detect architecture
-ARCH=$(uname -m)
-if [ "$ARCH" = "arm64" ]; then
-    PREFIX="/opt/homebrew"
-else
-    PREFIX="/usr/local"
-fi
-
-DAEMON_BIN="$PREFIX/bin/gssh-daemon"
-CLI_BIN="$PREFIX/bin/gssh"
-
-echo "Installing gssh to $PREFIX/bin/..."
-
-# Copy binaries
-cp bin/daemon "$DAEMON_BIN"
-cp bin/gssh "$CLI_BIN"
-
-chmod +x "$DAEMON_BIN" "$CLI_BIN"
-
-# Install launchd plist
-PLIST_DIR="$HOME/Library/LaunchAgents"
-mkdir -p "$PLIST_DIR"
-cp homebrew/gssh.plist "$PLIST_DIR/"
-
-echo "Loading gssh service..."
-launchctl load "$PLIST_DIR/gssh.plist"
-
-echo "gssh installed successfully!"
-echo ""
-echo "Usage:"
-echo "  Start:   launchctl start com.gssh.daemon"
-echo "  Stop:    launchctl stop com.gssh.daemon"
-echo "  Status:  launchctl list | grep gssh"
-echo ""
-echo "Or use Homebrew services:"
-echo "  brew services start gssh"
-echo "  brew services stop gssh"
-echo "  brew services list"