feat: enhance GitHub bundle import functionality and improve CLI command handling

Author: orca-zhang

docs/harness-v3.md

@@ -467,6 +467,9 @@ blue harness dataset pull \
 blue harness dataset pull \
   --source https://github.com/example/harness-datasets \
   --bundle-path harness/datasets/demo-bundle
+
+blue harness dataset pull \
+  --source https://github.com/IceWhaleTech/ZimaOS-Blue
 ```
 
 The web UI now exposes the same manual flow from `Automation -> Harness -> Datasets & versions -> Import bundle`.

server/cmd/blue/cli_dispatch.go

@@ -68,7 +68,7 @@ func cliDispatch(args []string) bool {
 		return false // config uses viper, let cobra handle it
 	case "models":
 		return false // models subcommands need cobra arg validation
-	case "skills":
+	case "skills", "skill":
 		return false // skills subcommands need cobra arg validation
 	case "context":
 		if shouldIPCDispatchContext(rest) {

server/cmd/blue/cli_dispatch_test.go

@@ -132,6 +132,31 @@ func TestCLIDispatch_BrowserNavigateRoutesThroughIPC(t *testing.T) {
 	}
 }
 
+func TestCLIDispatch_SkillAliasFallsThroughToCobra(t *testing.T) {
+	oldRoundTrip := ipcRoundTripFunc
+	oldIPCExit := ipcExit
+	oldCLIExit := cliDispatchExit
+	oldJSONOutput := jsonOutput
+	defer func() {
+		ipcRoundTripFunc = oldRoundTrip
+		ipcExit = oldIPCExit
+		cliDispatchExit = oldCLIExit
+		jsonOutput = oldJSONOutput
+	}()
+
+	ipcRoundTripFunc = func(req *sockipc.Request) (*sockipc.Response, error) {
+		t.Fatalf("unexpected IPC request: %+v", req)
+		return nil, nil
+	}
+	ipcExit = func(code int) { panic(cliDispatchExitPanic{code: code}) }
+	cliDispatchExit = func(code int) { panic(cliDispatchExitPanic{code: code}) }
+
+	handled, exitCode, stdout := runCLIDispatchForTest([]string{"skill", "install", "humanizer"})
+	if handled {
+		t.Fatalf("expected cliDispatch to fall through to cobra, handled=true exitCode=%d stdout=%q", exitCode, stdout)
+	}
+}
+
 func runCLIDispatchForTest(args []string) (handled bool, exitCode int, stdout string) {
 	oldStdout := os.Stdout
 	r, w, err := os.Pipe()

server/cmd/blue/harness_dataset_bundle.go

@@ -86,7 +86,7 @@ func init() {
 	harnessDatasetImportCmd.Flags().StringVar(&harnessDatasetBundleLocalPath, "path", "", "local bundle directory path")
 	harnessDatasetImportCmd.Flags().StringVar(&harnessDatasetBundleVersion, "version", "", "bundle version to import (defaults to dataset.yaml default_version)")
 	harnessDatasetPullCmd.Flags().StringVar(&harnessDatasetBundleSource, "source", "", "GitHub repo or tree URL for the bundle source")
-	harnessDatasetPullCmd.Flags().StringVar(&harnessDatasetBundlePath, "bundle-path", "", "bundle path inside the GitHub repo when --source is a repo URL")
+	harnessDatasetPullCmd.Flags().StringVar(&harnessDatasetBundlePath, "bundle-path", "", "bundle path inside the GitHub repo when --source is a repo URL (defaults to harness/datasets/pinchbench for IceWhaleTech/ZimaOS-Blue)")
 	harnessDatasetPullCmd.Flags().StringVar(&harnessDatasetBundleVersion, "version", "", "bundle version to import (defaults to dataset.yaml default_version)")
 	harnessDatasetCmd.AddCommand(harnessDatasetImportCmd)
 	harnessDatasetCmd.AddCommand(harnessDatasetPullCmd)
@@ -382,6 +382,9 @@ func resolveHarnessDatasetGitHubSource(source, bundlePath string) (harnessDatase
 	}
 	if matches := skillbundle.GitHubRepoURLPattern.FindStringSubmatch(source); len(matches) == 3 {
 		bundlePath = strings.Trim(strings.TrimSpace(bundlePath), "/")
+		if bundlePath == "" {
+			bundlePath = harnesspkg.DefaultDatasetBundleGitHubPathForRepo(matches[1], matches[2])
+		}
 		if bundlePath == "" {
 			return harnessDatasetGitHubSource{}, fmt.Errorf("--bundle-path is required for GitHub repo URLs")
 		}

server/cmd/blue/harness_dataset_bundle_test.go

@@ -251,6 +251,54 @@ func TestLoadHarnessDatasetBundleFromGitHubRepoURLWithBundlePath(t *testing.T) {
 	}
 }
 
+func TestLoadHarnessDatasetBundleFromOfficialRepoURLDefaultsPinchBenchBundlePath(t *testing.T) {
+	resetHarnessCLIState(t)
+
+	datasetYAML, manifestJSON, evalSpecYAML := harnessDatasetBundleFixtureContents()
+	oldClient := harnessDatasetBundleHTTPClient
+	harnessDatasetBundleHTTPClient = &http.Client{
+		Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
+			var body string
+			switch {
+			case strings.Contains(req.URL.String(), "/main/harness/datasets/pinchbench/dataset.yaml"):
+				body = datasetYAML
+			case strings.Contains(req.URL.String(), "/main/harness/datasets/pinchbench/versions/v1/manifest.json"):
+				body = manifestJSON
+			case strings.Contains(req.URL.String(), "/main/harness/datasets/pinchbench/versions/v1/eval-specs/default.yaml"):
+				body = evalSpecYAML
+			default:
+				return &http.Response{
+					StatusCode: http.StatusNotFound,
+					Body:       io.NopCloser(strings.NewReader("not found")),
+					Header:     make(http.Header),
+				}, nil
+			}
+			return &http.Response{
+				StatusCode: http.StatusOK,
+				Body:       io.NopCloser(strings.NewReader(body)),
+				Header:     make(http.Header),
+			}, nil
+		}),
+	}
+	t.Cleanup(func() {
+		harnessDatasetBundleHTTPClient = oldClient
+	})
+
+	req, err := loadHarnessDatasetBundleFromGitHubSource("https://github.com/IceWhaleTech/ZimaOS-Blue", "", "")
+	if err != nil {
+		t.Fatalf("loadHarnessDatasetBundleFromGitHubSource: %v", err)
+	}
+	if req.SourceType != "dataset_bundle_github" {
+		t.Fatalf("source_type = %q, want dataset_bundle_github", req.SourceType)
+	}
+	if req.SourceRef != "https://github.com/IceWhaleTech/ZimaOS-Blue/tree/main/harness/datasets/pinchbench" {
+		t.Fatalf("source_ref = %q, want canonical pinchbench tree url", req.SourceRef)
+	}
+	if req.Dataset.Name != "demo-bundle" || req.Version.Version != "v1" {
+		t.Fatalf("request = %#v, want demo-bundle/v1", req)
+	}
+}
+
 func TestLoadHarnessDatasetBundleFromDirUsesRequestedVersionOverride(t *testing.T) {
 	bundleDir := writeHarnessDatasetBundleMultiVersionFixture(t, t.TempDir())
 

server/cmd/blue/main_startup_test.go

@@ -123,3 +123,13 @@ func TestRootCommand_RegistersCustomCompletionCommand(t *testing.T) {
 		t.Fatalf("expected custom completion command to be registered, got %#v", cmd)
 	}
 }
+
+func TestRootCommand_RegistersSkillsAlias(t *testing.T) {
+	cmd, _, err := rootCmd.Find([]string{"skill"})
+	if err != nil {
+		t.Fatalf("rootCmd.Find(skill): %v", err)
+	}
+	if cmd == nil || cmd.Name() != "skills" {
+		t.Fatalf("expected skill alias to resolve to skills command, got %#v", cmd)
+	}
+}

server/cmd/blue/skills.go

@@ -40,8 +40,9 @@ var (
 
 // skillsCmd represents the skills command
 var skillsCmd = &cobra.Command{
-	Use:   "skills",
-	Short: "Skill management",
+	Use:     "skills",
+	Aliases: []string{"skill"},
+	Short:   "Skill management",
 	Long: `Manage ZimaOS-Blue skills.
 
 Subcommands:

server/internal/harness/dataset_bundle_defaults.go

@@ -0,0 +1,13 @@
+package harness
+
+import "strings"
+
+const defaultPinchBenchDatasetBundleGitHubPath = "harness/datasets/pinchbench"
+
+func DefaultDatasetBundleGitHubPathForRepo(owner, repo string) string {
+	if strings.EqualFold(strings.TrimSpace(owner), "IceWhaleTech") &&
+		strings.EqualFold(strings.TrimSpace(repo), "ZimaOS-Blue") {
+		return defaultPinchBenchDatasetBundleGitHubPath
+	}
+	return ""
+}

server/internal/harness/dataset_bundle_import_source_test.go

@@ -83,6 +83,56 @@ func TestLoadImportDatasetBundleRequestFromGitHubSourceUsesFallback(t *testing.T
 	}
 }
 
+func TestLoadImportDatasetBundleRequestFromOfficialRepoURLDefaultsPinchBenchBundlePath(t *testing.T) {
+	datasetYAML, manifestJSON, evalSpecYAML := testDatasetBundleFixtureContents()
+	oldClient := datasetBundleLoaderHTTPClient
+	datasetBundleLoaderHTTPClient = &http.Client{
+		Transport: datasetBundleRoundTripFunc(func(req *http.Request) (*http.Response, error) {
+			var body string
+			switch {
+			case strings.Contains(req.URL.String(), "/main/harness/datasets/pinchbench/dataset.yaml"):
+				body = datasetYAML
+			case strings.Contains(req.URL.String(), "/main/harness/datasets/pinchbench/versions/v1/manifest.json"):
+				body = manifestJSON
+			case strings.Contains(req.URL.String(), "/main/harness/datasets/pinchbench/versions/v1/eval-specs/default.yaml"):
+				body = evalSpecYAML
+			default:
+				return &http.Response{
+					StatusCode: http.StatusNotFound,
+					Body:       io.NopCloser(strings.NewReader("not found")),
+					Header:     make(http.Header),
+				}, nil
+			}
+			return &http.Response{
+				StatusCode: http.StatusOK,
+				Body:       io.NopCloser(strings.NewReader(body)),
+				Header:     make(http.Header),
+			}, nil
+		}),
+	}
+	t.Cleanup(func() {
+		datasetBundleLoaderHTTPClient = oldClient
+	})
+
+	req, err := loadImportDatasetBundleRequestFromGitHubSource(
+		"https://github.com/IceWhaleTech/ZimaOS-Blue",
+		"",
+		"",
+	)
+	if err != nil {
+		t.Fatalf("loadImportDatasetBundleRequestFromGitHubSource: %v", err)
+	}
+	if req.SourceType != "dataset_bundle_github" {
+		t.Fatalf("source_type = %q, want dataset_bundle_github", req.SourceType)
+	}
+	if req.SourceRef != "https://github.com/IceWhaleTech/ZimaOS-Blue/tree/main/harness/datasets/pinchbench" {
+		t.Fatalf("source_ref = %q, want canonical pinchbench tree url", req.SourceRef)
+	}
+	if req.Version.Version != "v1" || len(req.EvalSpecs) != 1 || req.EvalSpecs[0].Name != "Default Demo Eval" {
+		t.Fatalf("request = %#v, want v1 with imported eval spec", req)
+	}
+}
+
 func TestHandler_ImportDatasetBundleFromLocalSource(t *testing.T) {
 	controller := newTestController(t)
 	handler := NewHandler(controller)

server/internal/harness/dataset_bundle_loader.go

@@ -296,6 +296,9 @@ func resolveDatasetBundleGitHubSource(source, bundlePath string) (datasetBundleG
 	}
 	if matches := skillbundle.GitHubRepoURLPattern.FindStringSubmatch(source); len(matches) == 3 {
 		bundlePath = strings.Trim(strings.TrimSpace(bundlePath), "/")
+		if bundlePath == "" {
+			bundlePath = DefaultDatasetBundleGitHubPathForRepo(matches[1], matches[2])
+		}
 		if bundlePath == "" {
 			return datasetBundleGitHubSource{}, fmt.Errorf("bundle_path is required for GitHub repo URLs")
 		}