Merge pull request #61 from langgenius/fix/skill-archive-roots

fix(skill): support CLI skill package uploads

Author: KurosawaGeeker

.goreleaser.yaml

@@ -5,8 +5,9 @@ project_name: mosoo
 before:
   hooks:
     - rm -rf .cache/goreleaser-skill
-    - mkdir -p .cache/goreleaser-skill
-    - cp -R publish/skills/mosoo .cache/goreleaser-skill/mosoo
+    - mkdir -p .cache/goreleaser-skill/mosoo
+    - cp publish/skills/mosoo/SKILL.md .cache/goreleaser-skill/mosoo/SKILL.md
+    - cp -R publish/skills/mosoo/references .cache/goreleaser-skill/mosoo/references
 
 builds:
   - id: mosoo

cmd/mosoo/main.go

@@ -17,6 +17,7 @@ import (
 	"github.com/langgenius/mosoo-connector/internal/doctor"
 	"github.com/langgenius/mosoo-connector/internal/generated"
 	"github.com/langgenius/mosoo-connector/internal/publicthreads"
+	"github.com/langgenius/mosoo-connector/internal/skillcommands"
 	"github.com/langgenius/mosoo-connector/internal/target"
 	publishskills "github.com/langgenius/mosoo-connector/publish/skills"
 )
@@ -47,6 +48,9 @@ func main() {
 	if err := consolecommands.Install(root); err != nil {
 		os.Exit(runtime.FormatError(err, "table", os.Stderr))
 	}
+	if err := skillcommands.Install(root); err != nil {
+		os.Exit(runtime.FormatError(err, "table", os.Stderr))
+	}
 	if err := publicthreads.Install(root); err != nil {
 		os.Exit(runtime.FormatError(err, "table", os.Stderr))
 	}

internal/skillcommands/client.go

@@ -0,0 +1,117 @@
+package skillcommands
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"mime/multipart"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+
+	latheruntime "github.com/lathe-cli/lathe/pkg/runtime"
+	"github.com/spf13/cobra"
+)
+
+// Client is a minimal Console REST skill package client. It owns multipart
+// construction because the generated Lathe runtime cannot build file parts.
+type Client struct {
+	hostname string
+	opts     latheruntime.ClientOptions
+}
+
+func NewClient(cmd *cobra.Command) (*Client, error) {
+	hostname, opts, err := latheruntime.LoadHostOptions(cmd)
+	if err != nil {
+		return nil, err
+	}
+	opts.UserAgent = cmd.Root().Use
+	opts.Accept = "application/json"
+	if debug, derr := cmd.Root().PersistentFlags().GetBool("debug"); derr == nil && debug {
+		opts.Debug = true
+	}
+	return &Client{hostname: hostname, opts: opts}, nil
+}
+
+func (c *Client) Inspect(ctx context.Context, opts uploadOptions) ([]byte, error) {
+	return c.postMultipart(ctx, "/skill/inspect", opts.formFields(false), opts.file)
+}
+
+func (c *Client) Package(ctx context.Context, opts uploadOptions) ([]byte, error) {
+	return c.postMultipart(ctx, "/skill/package", opts.formFields(true), opts.file)
+}
+
+func (o uploadOptions) formFields(includePackageFields bool) map[string]string {
+	fields := map[string]string{}
+	if strings.TrimSpace(o.githubURL) != "" {
+		fields["githubUrl"] = strings.TrimSpace(o.githubURL)
+	}
+	if includePackageFields {
+		fields["appId"] = strings.TrimSpace(o.appID)
+		if strings.TrimSpace(o.skillID) != "" {
+			fields["skillId"] = strings.TrimSpace(o.skillID)
+		}
+	}
+	return fields
+}
+
+func (c *Client) postMultipart(ctx context.Context, path string, fields map[string]string, filePath string) ([]byte, error) {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	var body bytes.Buffer
+	writer := multipart.NewWriter(&body)
+	for name, value := range fields {
+		if err := writer.WriteField(name, value); err != nil {
+			return nil, fmt.Errorf("write multipart field %s: %w", name, err)
+		}
+	}
+	if strings.TrimSpace(filePath) != "" {
+		if err := addFilePart(writer, strings.TrimSpace(filePath)); err != nil {
+			return nil, err
+		}
+	}
+	if err := writer.Close(); err != nil {
+		return nil, fmt.Errorf("close multipart body: %w", err)
+	}
+
+	opts := c.opts
+	opts.Headers = mergeHeaders(opts.Headers, map[string]string{
+		"Content-Type": writer.FormDataContentType(),
+	})
+	result, err := latheruntime.DoRawFull(ctx, c.hostname, http.MethodPost, path, body.Bytes(), opts)
+	if err != nil {
+		return nil, err
+	}
+	return result.Body, nil
+}
+
+func addFilePart(writer *multipart.Writer, filePath string) error {
+	file, err := os.Open(filePath)
+	if err != nil {
+		return fmt.Errorf("open --file %s: %w", filePath, err)
+	}
+	defer file.Close()
+
+	part, err := writer.CreateFormFile("file", filepath.Base(filePath))
+	if err != nil {
+		return fmt.Errorf("create multipart file part: %w", err)
+	}
+	if _, err := io.Copy(part, file); err != nil {
+		return fmt.Errorf("read --file %s: %w", filePath, err)
+	}
+	return nil
+}
+
+func mergeHeaders(base map[string]string, extra map[string]string) map[string]string {
+	merged := make(map[string]string, len(base)+len(extra))
+	for key, value := range base {
+		merged[key] = value
+	}
+	for key, value := range extra {
+		merged[key] = value
+	}
+	return merged
+}

internal/skillcommands/command.go

@@ -0,0 +1,181 @@
+package skillcommands
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	consolerest "github.com/langgenius/mosoo-connector/internal/generated/consolerest"
+	latheruntime "github.com/lathe-cli/lathe/pkg/runtime"
+	"github.com/spf13/cobra"
+)
+
+const (
+	inspectOperationID = "Skill_Inspect"
+	packageOperationID = "Skill_Package"
+)
+
+// Install mounts hand-maintained replacements for skill package upload commands
+// that require multipart/form-data file parts. Lathe currently exposes the
+// multipart request body but cannot build the file part from generated specs.
+func Install(root *cobra.Command) error {
+	surface := findChild(root, "console-rest")
+	if surface == nil {
+		return fmt.Errorf("console-rest command tree is not mounted")
+	}
+	skills := findChild(surface, "skills")
+	if skills == nil {
+		return fmt.Errorf("console-rest skills command tree is not mounted")
+	}
+
+	replaceCommand(skills, "inspect", newInspectCommand())
+	replaceCommand(skills, "package", newPackageCommand())
+	return nil
+}
+
+type uploadOptions struct {
+	appID     string
+	file      string
+	githubURL string
+	skillID   string
+}
+
+func newInspectCommand() *cobra.Command {
+	var opts uploadOptions
+	cmd := &cobra.Command{
+		Use:     "inspect",
+		Short:   "Inspect a skill package from upload or GitHub URL",
+		Long:    "Inspect a skill package by uploading a local package file or by passing a GitHub URL.",
+		Example: "mosoo console-rest skills inspect --file ./mosoo-skill.zip -o json",
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			if err := opts.validate(false); err != nil {
+				return err
+			}
+			client, err := NewClient(cmd)
+			if err != nil {
+				return err
+			}
+			data, err := client.Inspect(cmd.Context(), opts)
+			if err != nil {
+				return err
+			}
+			format, _ := cmd.Root().PersistentFlags().GetString("output")
+			return latheruntime.FormatOutput(data, format, cmd.OutOrStdout(), inspectCatalogSpec(cmd).Output)
+		},
+	}
+	addSourceFlags(cmd, &opts)
+	latheruntime.AttachCatalogCommand(cmd, "console-rest", inspectCatalogSpec(cmd))
+	return cmd
+}
+
+func newPackageCommand() *cobra.Command {
+	var opts uploadOptions
+	cmd := &cobra.Command{
+		Use:     "package",
+		Short:   "Create or update a skill package upload",
+		Long:    "Create or update a skill package by uploading a local package file or by passing a GitHub URL.",
+		Example: "mosoo console-rest skills package --app-id <app-id> --file ./mosoo-skill.zip -o json",
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			if err := opts.validate(true); err != nil {
+				return err
+			}
+			client, err := NewClient(cmd)
+			if err != nil {
+				return err
+			}
+			data, err := client.Package(cmd.Context(), opts)
+			if err != nil {
+				return err
+			}
+			format, _ := cmd.Root().PersistentFlags().GetString("output")
+			return latheruntime.FormatOutput(data, format, cmd.OutOrStdout(), packageCatalogSpec(cmd).Output)
+		},
+	}
+	flags := cmd.Flags()
+	flags.StringVar(&opts.appID, "app-id", "", "App ID that owns the skill. (form, required, ulid)")
+	flags.StringVar(&opts.skillID, "skill-id", "", "Existing skill ID to update. (form, ulid)")
+	addSourceFlags(cmd, &opts)
+	_ = cmd.MarkFlagRequired("app-id")
+	latheruntime.AttachCatalogCommand(cmd, "console-rest", packageCatalogSpec(cmd))
+	return cmd
+}
+
+func addSourceFlags(cmd *cobra.Command, opts *uploadOptions) {
+	flags := cmd.Flags()
+	flags.StringVarP(&opts.file, "file", "f", "", "Skill package file path (.zip, .skill, or SKILL.md)")
+	flags.StringVar(&opts.githubURL, "github-url", "", "GitHub URL for the skill package source")
+}
+
+func (o uploadOptions) validate(requireApp bool) error {
+	if requireApp && strings.TrimSpace(o.appID) == "" {
+		return fmt.Errorf("--app-id is required")
+	}
+	hasFile := strings.TrimSpace(o.file) != ""
+	hasURL := strings.TrimSpace(o.githubURL) != ""
+	switch {
+	case hasFile && hasURL:
+		return fmt.Errorf("only one of --file or --github-url can be set")
+	case !hasFile && !hasURL:
+		return fmt.Errorf("one of --file or --github-url is required")
+	default:
+		return nil
+	}
+}
+
+func inspectCatalogSpec(cmd *cobra.Command) latheruntime.CommandSpec {
+	spec := generatedSpec(inspectOperationID)
+	spec.Long = cmd.Long
+	spec.Example = cmd.Example
+	spec.Params = []latheruntime.ParamSpec{
+		{Name: "file", Flag: "file", In: latheruntime.InFormData, GoType: "string", Help: "Skill package file path (.zip, .skill, or SKILL.md)"},
+		{Name: "githubUrl", Flag: "github-url", In: latheruntime.InFormData, GoType: "string", Help: "GitHub URL for the skill package source"},
+	}
+	spec.KnownErrors = skillKnownErrors()
+	return spec
+}
+
+func packageCatalogSpec(cmd *cobra.Command) latheruntime.CommandSpec {
+	spec := generatedSpec(packageOperationID)
+	spec.Long = cmd.Long
+	spec.Example = cmd.Example
+	spec.Params = []latheruntime.ParamSpec{
+		{Name: "appId", Flag: "app-id", In: latheruntime.InFormData, GoType: "string", Help: "App ID that owns the skill. (form, required, ulid)", Required: true, Format: "ulid"},
+		{Name: "skillId", Flag: "skill-id", In: latheruntime.InFormData, GoType: "string", Help: "Existing skill ID to update. (form, ulid)", Format: "ulid"},
+		{Name: "file", Flag: "file", In: latheruntime.InFormData, GoType: "string", Help: "Skill package file path (.zip, .skill, or SKILL.md)"},
+		{Name: "githubUrl", Flag: "github-url", In: latheruntime.InFormData, GoType: "string", Help: "GitHub URL for the skill package source"},
+	}
+	spec.KnownErrors = skillKnownErrors()
+	return spec
+}
+
+func skillKnownErrors() []latheruntime.KnownError {
+	return []latheruntime.KnownError{
+		{Status: http.StatusBadRequest, Cause: "Invalid package source, malformed multipart form, or unsupported skill package layout."},
+		{Status: http.StatusUnauthorized, Cause: "Missing, invalid, or revoked personal access token."},
+	}
+}
+
+func generatedSpec(operationID string) latheruntime.CommandSpec {
+	for _, spec := range consolerest.Specs {
+		if spec.OperationID == operationID {
+			return spec
+		}
+	}
+	panic(fmt.Sprintf("missing generated console-rest spec %q", operationID))
+}
+
+func replaceCommand(parent *cobra.Command, name string, replacement *cobra.Command) {
+	if existing := findChild(parent, name); existing != nil {
+		parent.RemoveCommand(existing)
+	}
+	parent.AddCommand(replacement)
+}
+
+func findChild(parent *cobra.Command, name string) *cobra.Command {
+	for _, child := range parent.Commands() {
+		if child.Name() == name {
+			return child
+		}
+	}
+	return nil
+}