Bike-shedding on search jobs

cmd/src/format.go

@@ -80,6 +80,20 @@ func parseTemplate(text string) (*template.Template, error) {
 			}
 			return humanize.Time(t), nil
 		},
+		"searchJobIDNumber": func(id string) string {
+			sjid, err := ParseSearchJobID(id)
+			if err != nil {
+				return id
+			}
+			return fmt.Sprintf("%d", sjid.Number())
+		},
+		"searchJobIDCanonical": func(id string) string {
+			sjid, err := ParseSearchJobID(id)
+			if err != nil {
+				return id
+			}
+			return sjid.Canonical()
+		},
 
 		// Register search-specific template functions
 		"searchSequentialLineNumber":        searchTemplateFuncs["searchSequentialLineNumber"],

cmd/src/search_jobs.go

@@ -1,10 +1,13 @@
 package main
 
 import (
+	"encoding/base64"
 	"flag"
 	"fmt"
-	"text/template"
-	"os"
+	"regexp"
+	"strconv"
+
+	"github.com/sourcegraph/src-cli/internal/cmderrors"
 )
 
 // searchJobFragment is a GraphQL fragment that defines the fields to be queried
@@ -51,6 +54,8 @@ The commands are:
 	delete     deletes a search job by ID
 	get        gets a search job by ID
 	list       lists search jobs
+	logs       outputs the logs for a search job by ID
+	results    outputs the results for a search job by ID
 
 Use "src search-jobs [command] -h" for more information about a command.
 `
@@ -71,22 +76,12 @@ Use "src search-jobs [command] -h" for more information about a command.
 	})
 }
 
-// printSearchJob formats and prints a search job to stdout using the provided format template.
-// Returns an error if the template parsing or execution fails.
-func printSearchJob(job *SearchJob, format string) error {
-    tmpl, err := template.New("searchJob").Parse(format)
-    if err != nil {
-        return err
-    }
-    return tmpl.Execute(os.Stdout, job)
-}
-
 // SearchJob represents a search job with its metadata, including the search query,
 // execution state, creator information, timestamps, URLs, and repository statistics.
 type SearchJob struct {
-	ID        string
-	Query     string
-	State     string
+	ID      string
+	Query   string
+	State   string
 	Creator struct {
 		Username string
 	}
@@ -96,9 +91,55 @@ type SearchJob struct {
 	URL        string
 	LogURL     string
 	RepoStats  struct {
-		Total       int
-		Completed   int
-		Failed      int
-		InProgress  int
+		Total      int
+		Completed  int
+		Failed     int
+		InProgress int
+	}
+}
+
+type SearchJobID struct {
+	number uint64
+}
+
+func ParseSearchJobID(input string) (*SearchJobID, error) {
+	// accept either:
+	// - the numeric job id (non-negative integer)
+	// - the plain text SearchJob:<integer> form of the id
+	// - the base64-encoded "SearchJob:<integer>" string
+
+	if input == "" {
+		return nil, cmderrors.Usage("must provide a search job ID")
+	}
+
+	// Try to decode if it's base64 first
+	if decoded, err := base64.StdEncoding.DecodeString(input); err == nil {
+		input = string(decoded)
 	}
+
+	// Match either "SearchJob:<integer>" or "<integer>"
+	re := regexp.MustCompile(`^(?:SearchJob:)?(\d+)$`)
+	matches := re.FindStringSubmatch(input)
+	if matches == nil {
+		return nil, fmt.Errorf("invalid ID format: must be a non-negative integer, 'SearchJob:<integer>', or that string base64-encoded")
+	}
+
+	number, err := strconv.ParseUint(matches[1], 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("invalid ID format: must be a 64-bit non-negative integer")
+	}
+
+	return &SearchJobID{number: number}, nil
+}
+
+func (id *SearchJobID) String() string {
+	return fmt.Sprintf("SearchJob:%d", id.Number())
+}
+
+func (id *SearchJobID) Canonical() string {
+	return base64.StdEncoding.EncodeToString([]byte(id.String()))
+}
+
+func (id *SearchJobID) Number() uint64 {
+	return id.number
 }

cmd/src/search_jobs_cancel.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"flag"
 	"fmt"
+
 	"github.com/sourcegraph/src-cli/internal/api"
-	"github.com/sourcegraph/src-cli/internal/cmderrors"
 )
 
 const CancelSearchJobMutation = `mutation CancelSearchJob($id: ID!) {
@@ -23,7 +23,7 @@ Examples:
 
   Cancel a search job:
 
-    $ src search-jobs cancel --id U2VhcmNoSm9iOjY5
+    $ src search-jobs cancel -id 999
 `
 	flagSet := flag.NewFlagSet("cancel", flag.ExitOnError)
 	usageFunc := func() {
@@ -33,8 +33,8 @@ Examples:
 	}
 
 	var (
-		idFlag = flagSet.String("id", "", "ID of the search job to cancel")
-		apiFlags  = api.NewFlags(flagSet)
+		idFlag   = flagSet.String("id", "", "ID of the search job to cancel")
+		apiFlags = api.NewFlags(flagSet)
 	)
 
 	handler := func(args []string) error {
@@ -49,8 +49,9 @@ Examples:
 			Flags:       apiFlags,
 		})
 
-		if *idFlag == "" {
-			return cmderrors.Usage("must provide a search job ID")
+		jobID, err := ParseSearchJobID(*idFlag)
+		if err != nil {
+			return err
 		}
 
 		query := CancelSearchJobMutation
@@ -62,7 +63,7 @@ Examples:
 		}
 
 		if ok, err := client.NewRequest(query, map[string]interface{}{
-			"id": *idFlag,
+			"id": api.NullString(jobID.Canonical()),
 		}).Do(context.Background(), &result); err != nil || !ok {
 			return err
 		}

cmd/src/search_jobs_create.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+
 	"github.com/sourcegraph/src-cli/internal/api"
 	"github.com/sourcegraph/src-cli/internal/cmderrors"
 )
@@ -43,9 +44,9 @@ Examples:
 	}
 
 	var (
-		queryFlag = flagSet.String("query", "", "Search query")
-		formatFlag = flagSet.String("f", "{{.ID}}: {{.Creator.Username}} {{.State}} ({{.Query}})", `Format for the output, using the syntax of Go package text/template. (e.g. "{{.ID}}: {{.Creator.Username}} ({{.Query}})" or "{{.|json}}")`)
-		apiFlags  = api.NewFlags(flagSet)
+		queryFlag  = flagSet.String("query", "", "Search query")
+		formatFlag = flagSet.String("f", "{{searchJobIDNumber .ID}}: {{.Creator.Username}} {{.State}} ({{.Query}})", `Format for the output, using the syntax of Go package text/template. (e.g. "{{.ID}}: {{.Creator.Username}} ({{.Query}})" or "{{.|json}}")`)
+		apiFlags   = api.NewFlags(flagSet)
 	)
 
 	handler := func(args []string) error {

cmd/src/search_jobs_delete.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"flag"
 	"fmt"
+
 	"github.com/sourcegraph/src-cli/internal/api"
-	"github.com/sourcegraph/src-cli/internal/cmderrors"
 )
 
 const DeleteSearchJobQuery = `mutation DeleteSearchJob($id: ID!) {
@@ -23,7 +23,7 @@ Examples:
 
   Delete a search job by ID:
 
-    $ src search-jobs delete U2VhcmNoSm9iOjY5
+    $ src search-jobs delete -id 999
 `
 
 	flagSet := flag.NewFlagSet("delete", flag.ExitOnError)
@@ -34,7 +34,7 @@ Examples:
 	}
 
 	var (
-		idFlag = flagSet.String("id", "", "ID of the search job to delete")
+		idFlag   = flagSet.String("id", "", "ID of the search job to delete")
 		apiFlags = api.NewFlags(flagSet)
 	)
 
@@ -50,8 +50,9 @@ Examples:
 			Flags:       apiFlags,
 		})
 
-		if *idFlag == "" {
-			return cmderrors.Usage("must provide a search job ID")
+		jobID, err := ParseSearchJobID(*idFlag)
+		if err != nil {
+			return err
 		}
 
 		var result struct {
@@ -61,7 +62,7 @@ Examples:
 		}
 
 		if ok, err := client.NewRequest(DeleteSearchJobQuery, map[string]interface{}{
-			"id": *idFlag,
+			"id": api.NullString(jobID.Canonical()),
 		}).Do(context.Background(), &result); err != nil || !ok {
 			return err
 		}