Merge pull request #3202 from carapace-sh/unknown-bridges

support unknown bridges in lookup/diff

Author: rsteube

cmd/carapace/cmd/completers/completers.go

@@ -272,14 +272,26 @@ func AddSpecs(m completer.CompleterMap, parse bool) error {
 }
 
 func Lookup(nameVariantGroup string) (*completer.Completer, error) { // TODO choice as parameter?
-	m, err := Completers(choices.Parse(nameVariantGroup), true) // TODO lookup needs to use a quick version (skip parsing of specs for descriptions)
+	parsed := choices.Parse(nameVariantGroup)
+	m, err := Completers(parsed, true) // TODO lookup needs to use a quick version (skip parsing of specs for descriptions)
 	if err != nil {
 		return nil, err
 	}
 	if c, ok := m.Lookup(nameVariantGroup); ok {
 		return c, nil
 	}
-	return nil, fmt.Errorf("unknonw completer/variant: %#v", nameVariantGroup)
+	switch parsed.Group {
+	case "", "bridge": // support unknown bridges in lookup
+		if action, ok := bridge.Get(parsed.Variant); ok {
+			return &completer.Completer{
+				Name:    parsed.Name,
+				Group:   "bridge",
+				Variant: parsed.Variant,
+				Execute: complete(parsed.Name, action(parsed.Name)),
+			}, nil
+		}
+	}
+	return nil, fmt.Errorf("unknown completer/variant: %#v", nameVariantGroup)
 }
 
 func Description(name string) string {

cmd/carapace/cmd/diff.go

@@ -33,8 +33,8 @@ func init() {
 	diffCmd.Flags().SetInterspersed(false)
 
 	carapace.Gen(diffCmd).PositionalCompletion(
-		carapacebin.ActionCompleters(),
-		carapacebin.ActionCompleters(),
+		carapacebin.ActionCompleters(true),
+		carapacebin.ActionCompleters(true),
 	)
 
 	carapace.Gen(diffCmd).PositionalAnyCompletion(

cmd/carapace/cmd/invoke.go

@@ -30,7 +30,7 @@ func init() {
 	invokeCmd.Flags().SetInterspersed(false)
 
 	carapace.Gen(invokeCmd).PositionalCompletion(
-		carapacebin.ActionCompleters(),
+		carapacebin.ActionCompleters(true),
 		bridge.ActionCarapaceBin("_carapace", "export", "", "_carapace").Shift(1).
 			Filter("macro", "style"),
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {

cmd/carapace/cmd/list.go

@@ -52,6 +52,6 @@ func init() {
 	listCmd.Flags().Bool("names", false, "only list names")
 
 	carapace.Gen(listCmd).PositionalCompletion(
-		carapacebin.ActionCompleters().NoSpace(),
+		carapacebin.ActionCompleters(false).NoSpace(),
 	)
 }

cmd/carapace/cmd/root.go

@@ -207,7 +207,7 @@ func init() {
 				cmd.Flags().AddFlagSet(rootCmd.Flags())
 				return carapace.ActionExecute(cmd)
 			}
-			return carapacebin.ActionCompleters()
+			return carapacebin.ActionCompleters(true)
 		}),
 	)
 

go.mod

@@ -4,7 +4,7 @@ go 1.24.0
 
 require (
 	github.com/carapace-sh/carapace v1.11.0
-	github.com/carapace-sh/carapace-bridge v1.4.12-0.20251227001747-5537b050e32c
+	github.com/carapace-sh/carapace-bridge v1.5.0
 	github.com/carapace-sh/carapace-selfupdate v0.0.10
 	github.com/carapace-sh/carapace-shlex v1.1.1
 	github.com/carapace-sh/carapace-spec v1.5.0

go.sum

@@ -1,7 +1,7 @@
 github.com/carapace-sh/carapace v1.11.0 h1:dTUFXvIrUTLd9BGLsfDt4wCgEyPl8bJeZOFDmN7fIfo=
 github.com/carapace-sh/carapace v1.11.0/go.mod h1:NVkuv1s8wyFvu7d98rdgYwqGKMB6GO1MEUZp5RcWri8=
-github.com/carapace-sh/carapace-bridge v1.4.12-0.20251227001747-5537b050e32c h1:E7PNP+XyUk4xy5ztQggT6XO+OfV6TS3GHNyn6FrpekE=
-github.com/carapace-sh/carapace-bridge v1.4.12-0.20251227001747-5537b050e32c/go.mod h1:kCUFSLpn06FPb7fDjR/jFc/v2WxzCLssRqPDCSSEJmY=
+github.com/carapace-sh/carapace-bridge v1.5.0 h1:7TaRw1o59QrKDO+7uLxupS8/IOUTOllPLicY8oe08FE=
+github.com/carapace-sh/carapace-bridge v1.5.0/go.mod h1:6C3kzrDWOmQM8FlK3rmTSWFi2I4M8jPCjzWJZWzBHD0=
 github.com/carapace-sh/carapace-pflag v1.1.0 h1:uB33wch8ADjP878NadQnbZ5vyROcj/Ac+wUQKMcIrQM=
 github.com/carapace-sh/carapace-pflag v1.1.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/carapace-sh/carapace-selfupdate v0.0.10 h1:ZvutqGwVvSj6TmI/tLcort63JD6PaOG0ia6squwbTuo=

pkg/actions/env/carapace.go

@@ -60,7 +60,7 @@ func init() {
 				"CARAPACE_EXCLUDES": carapace.Batch(
 					carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 						c.Setenv(env.CARAPACE_EXCLUDES, "")
-						return carapacebin.ActionCompleters().Invoke(c).ToA()
+						return carapacebin.ActionCompleters(false).Invoke(c).ToA() // TODO prevent/handle variants,groups?
 					}),
 					carapace.ActionValuesDescribed("*", "exclude all"),
 				).ToA().UniqueList(","),

pkg/actions/tools/carapace/completer.go

@@ -10,7 +10,7 @@ import (
 	"github.com/carapace-sh/carapace/pkg/style"
 )
 
-func ActionCompleters() carapace.Action {
+func ActionCompleters(unknownBridges bool) carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 		if strings.Count(c.Value, "@") > 1 || strings.Count(c.Value, "/") > 1 {
 			return carapace.ActionValues()
@@ -24,7 +24,11 @@ func ActionCompleters() carapace.Action {
 		case strings.Contains(c.Value, "/"):
 			nameVariant, _, _ := strings.Cut(c.Value, "@")
 			name, _, _ := strings.Cut(nameVariant, "/")
-			return ActionVariants(name).Prefix(name + "/").NoSpace()
+
+			return carapace.Batch(
+				bridge.ActionBridges(name).Unless(!unknownBridges),
+				ActionVariants(name).Style(style.Carapace.KeywordPositive),
+			).ToA().Unique().Prefix(name + "/").NoSpace()
 
 		default:
 			return ActionNames().NoSpace()