fix: reduce base shortcut token overhead

internal/suggest/suggest.go

@@ -7,7 +7,10 @@
 // carrying their own copy.
 package suggest
 
-import "sort"
+import (
+	"sort"
+	"strings"
+)
 
 // Levenshtein computes the classic edit distance between two strings. It is
 // rune-aware, so it is correct for multi-byte input.
@@ -51,22 +54,29 @@ func Levenshtein(a, b string) int {
 // signal of intent that raw edit distance misses.
 func Closest(typed string, candidates []string, maxN int) []string {
 	type scored struct {
-		name   string
-		prefix int
-		dist   int
+		name    string
+		contain bool
+		prefix  int
+		dist    int
 	}
 	limit := editLimit(typed)
 	ranked := make([]scored, 0, len(candidates))
 	for _, c := range candidates {
 		p := sharedPrefixLen(typed, c)
 		d := Levenshtein(typed, c)
-		// Keep only plausible matches: a meaningful shared prefix, or an edit
-		// distance within budget. Drop everything else so the hint stays short.
-		if p >= 3 || d <= limit {
-			ranked = append(ranked, scored{name: c, prefix: p, dist: d})
+		ct := containsSegment(typed, c)
+		// Keep only plausible matches: a meaningful shared prefix, an edit
+		// distance within budget, or one name containing the other (a missing
+		// namespace prefix like "+block-list" vs "+base-block-list"). Drop
+		// everything else so the hint stays short.
+		if p >= 3 || d <= limit || ct {
+			ranked = append(ranked, scored{name: c, contain: ct, prefix: p, dist: d})
 		}
 	}
 	sort.Slice(ranked, func(i, j int) bool {
+		if ranked[i].contain != ranked[j].contain {
+			return ranked[i].contain
+		}
 		if ranked[i].prefix != ranked[j].prefix {
 			return ranked[i].prefix > ranked[j].prefix
 		}
@@ -94,6 +104,21 @@ func editLimit(s string) int {
 	return 2
 }
 
+// containsSegment reports whether one name contains the other as a substring
+// after stripping the "+"/"--" sigils. It catches hallucinated names that drop
+// a namespace prefix (e.g. "+block-list" for "+base-block-list"), which share
+// almost no prefix and sit far beyond the edit-distance budget. The shorter
+// side must be at least 5 runes so generic fragments like "list" do not match
+// half the catalog.
+func containsSegment(a, b string) bool {
+	a = strings.TrimLeft(a, "+-")
+	b = strings.TrimLeft(b, "+-")
+	if len([]rune(a)) > len([]rune(b)) {
+		a, b = b, a
+	}
+	return len([]rune(a)) >= 5 && strings.Contains(b, a)
+}
+
 func sharedPrefixLen(a, b string) int {
 	ra, rb := []rune(a), []rune(b)
 	n := 0

shortcuts/base/base_advperm_disable.go

@@ -16,12 +16,13 @@ import (
 )
 
 var BaseAdvpermDisable = common.Shortcut{
-	Service:     "base",
-	Command:     "+advperm-disable",
-	Description: "Disable advanced permissions for a Base",
-	Risk:        "high-risk-write",
-	Scopes:      []string{"base:app:update"},
-	AuthTypes:   []string{"user", "bot"},
+	Service:           "base",
+	Command:           "+advperm-disable",
+	Description:       "Disable advanced permissions for a Base",
+	Risk:              "high-risk-write",
+	ConditionalScopes: []string{"wiki:node:retrieve"},
+	Scopes:            []string{"base:app:update"},
+	AuthTypes:         []string{"user", "bot"},
 	Flags: []common.Flag{
 		{Name: "base-token", Desc: "base token", Required: true},
 	},
@@ -30,18 +31,18 @@ var BaseAdvpermDisable = common.Shortcut{
 		"Disabling advanced permissions invalidates existing custom roles; confirm the target Base before passing --yes.",
 	},
 	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		if strings.TrimSpace(runtime.Str("base-token")) == "" {
+		if strings.TrimSpace(baseTokenOrRaw(runtime)) == "" {
 			return baseFlagErrorf("--base-token must not be blank")
 		}
 		return nil
 	},
 	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
 		return common.NewDryRunAPI().
 			PUT("/open-apis/base/v3/bases/:base_token/advperm/enable?enable=false").
-			Set("base_token", runtime.Str("base-token"))
+			Set("base_token", baseTokenOrRaw(runtime))
 	},
 	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		baseToken := runtime.Str("base-token")
+		baseToken := baseTokenOrRaw(runtime)
 
 		queryParams := make(larkcore.QueryParams)
 		queryParams.Set("enable", "false")

shortcuts/base/base_advperm_enable.go

@@ -16,31 +16,32 @@ import (
 )
 
 var BaseAdvpermEnable = common.Shortcut{
-	Service:     "base",
-	Command:     "+advperm-enable",
-	Description: "Enable advanced permissions for a Base",
-	Risk:        "write",
-	Scopes:      []string{"base:app:update"},
-	AuthTypes:   []string{"user", "bot"},
+	Service:           "base",
+	Command:           "+advperm-enable",
+	Description:       "Enable advanced permissions for a Base",
+	Risk:              "write",
+	ConditionalScopes: []string{"wiki:node:retrieve"},
+	Scopes:            []string{"base:app:update"},
+	AuthTypes:         []string{"user", "bot"},
 	Flags: []common.Flag{
 		{Name: "base-token", Desc: "base token", Required: true},
 	},
 	Tips: []string{
 		"Caller must be a Base admin; enable advanced permissions before creating or updating roles.",
 	},
 	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		if strings.TrimSpace(runtime.Str("base-token")) == "" {
+		if strings.TrimSpace(baseTokenOrRaw(runtime)) == "" {
 			return baseFlagErrorf("--base-token must not be blank")
 		}
 		return nil
 	},
 	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
 		return common.NewDryRunAPI().
 			PUT("/open-apis/base/v3/bases/:base_token/advperm/enable?enable=true").
-			Set("base_token", runtime.Str("base-token"))
+			Set("base_token", baseTokenOrRaw(runtime))
 	},
 	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		baseToken := runtime.Str("base-token")
+		baseToken := baseTokenOrRaw(runtime)
 
 		queryParams := make(larkcore.QueryParams)
 		queryParams.Set("enable", "true")

shortcuts/base/base_block_create.go

@@ -10,12 +10,13 @@ import (
 )
 
 var BaseBaseBlockCreate = common.Shortcut{
-	Service:     "base",
-	Command:     "+base-block-create",
-	Description: "Create a block",
-	Risk:        "write",
-	Scopes:      []string{"base:block:create"},
-	AuthTypes:   authTypes(),
+	Service:           "base",
+	Command:           "+base-block-create",
+	Description:       "Create a block",
+	Risk:              "write",
+	ConditionalScopes: []string{"wiki:node:retrieve"},
+	Scopes:            []string{"base:block:create"},
+	AuthTypes:         authTypes(),
 	Flags: []common.Flag{
 		baseTokenFlag(true),
 		{Name: "type", Desc: "resource type", Required: true, Enum: baseBlockTypeEnums},

shortcuts/base/base_block_delete.go

@@ -10,12 +10,13 @@ import (
 )
 
 var BaseBaseBlockDelete = common.Shortcut{
-	Service:     "base",
-	Command:     "+base-block-delete",
-	Description: "Delete a block",
-	Risk:        "high-risk-write",
-	Scopes:      []string{"base:block:delete"},
-	AuthTypes:   authTypes(),
+	Service:           "base",
+	Command:           "+base-block-delete",
+	Description:       "Delete a block",
+	Risk:              "high-risk-write",
+	ConditionalScopes: []string{"wiki:node:retrieve"},
+	Scopes:            []string{"base:block:delete"},
+	AuthTypes:         authTypes(),
 	Flags: []common.Flag{
 		baseTokenFlag(true),
 		baseBlockIDFlag(true),

shortcuts/base/base_block_list.go

@@ -10,12 +10,13 @@ import (
 )
 
 var BaseBaseBlockList = common.Shortcut{
-	Service:     "base",
-	Command:     "+base-block-list",
-	Description: "List blocks in a base",
-	Risk:        "read",
-	Scopes:      []string{"base:block:read"},
-	AuthTypes:   authTypes(),
+	Service:           "base",
+	Command:           "+base-block-list",
+	Description:       "List blocks in a base",
+	Risk:              "read",
+	ConditionalScopes: []string{"wiki:node:retrieve"},
+	Scopes:            []string{"base:block:read"},
+	AuthTypes:         authTypes(),
 	Flags: []common.Flag{
 		baseTokenFlag(true),
 		{Name: "type", Desc: "filter by resource type", Enum: baseBlockTypeEnums},

shortcuts/base/base_block_move.go

@@ -10,12 +10,13 @@ import (
 )
 
 var BaseBaseBlockMove = common.Shortcut{
-	Service:     "base",
-	Command:     "+base-block-move",
-	Description: "Move a block",
-	Risk:        "write",
-	Scopes:      []string{"base:block:update"},
-	AuthTypes:   authTypes(),
+	Service:           "base",
+	Command:           "+base-block-move",
+	Description:       "Move a block",
+	Risk:              "write",
+	ConditionalScopes: []string{"wiki:node:retrieve"},
+	Scopes:            []string{"base:block:update"},
+	AuthTypes:         authTypes(),
 	Flags: []common.Flag{
 		baseTokenFlag(true),
 		baseBlockIDFlag(true),

shortcuts/base/base_block_ops.go

@@ -20,36 +20,36 @@ func dryRunBaseBlockList(_ context.Context, runtime *common.RuntimeContext) *com
 	return common.NewDryRunAPI().
 		POST("/open-apis/base/v3/bases/:base_token/blocks/list").
 		Body(buildBaseBlockListBody(runtime)).
-		Set("base_token", runtime.Str("base-token"))
+		Set("base_token", baseTokenOrRaw(runtime))
 }
 
 func dryRunBaseBlockCreate(_ context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
 	return common.NewDryRunAPI().
 		POST("/open-apis/base/v3/bases/:base_token/blocks").
 		Body(buildBaseBlockCreateBody(runtime)).
-		Set("base_token", runtime.Str("base-token"))
+		Set("base_token", baseTokenOrRaw(runtime))
 }
 
 func dryRunBaseBlockMove(_ context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
 	return common.NewDryRunAPI().
 		POST("/open-apis/base/v3/bases/:base_token/blocks/:block_id/move").
 		Body(buildBaseBlockMoveBody(runtime)).
-		Set("base_token", runtime.Str("base-token")).
+		Set("base_token", baseTokenOrRaw(runtime)).
 		Set("block_id", runtime.Str("block-id"))
 }
 
 func dryRunBaseBlockRename(_ context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
 	return common.NewDryRunAPI().
 		POST("/open-apis/base/v3/bases/:base_token/blocks/:block_id/rename").
 		Body(map[string]interface{}{"name": strings.TrimSpace(runtime.Str("name"))}).
-		Set("base_token", runtime.Str("base-token")).
+		Set("base_token", baseTokenOrRaw(runtime)).
 		Set("block_id", runtime.Str("block-id"))
 }
 
 func dryRunBaseBlockDelete(_ context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
 	return common.NewDryRunAPI().
 		DELETE("/open-apis/base/v3/bases/:base_token/blocks/:block_id").
-		Set("base_token", runtime.Str("base-token")).
+		Set("base_token", baseTokenOrRaw(runtime)).
 		Set("block_id", runtime.Str("block-id"))
 }
 
@@ -78,7 +78,7 @@ func validateBaseBlockRename(runtime *common.RuntimeContext) error {
 }
 
 func executeBaseBlockList(runtime *common.RuntimeContext) error {
-	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", runtime.Str("base-token"), "blocks", "list"), nil, buildBaseBlockListBody(runtime))
+	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", baseTokenOrRaw(runtime), "blocks", "list"), nil, buildBaseBlockListBody(runtime))
 	if err != nil {
 		return err
 	}
@@ -88,7 +88,7 @@ func executeBaseBlockList(runtime *common.RuntimeContext) error {
 }
 
 func executeBaseBlockCreate(runtime *common.RuntimeContext) error {
-	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", runtime.Str("base-token"), "blocks"), nil, buildBaseBlockCreateBody(runtime))
+	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", baseTokenOrRaw(runtime), "blocks"), nil, buildBaseBlockCreateBody(runtime))
 	if err != nil {
 		return err
 	}
@@ -97,7 +97,7 @@ func executeBaseBlockCreate(runtime *common.RuntimeContext) error {
 }
 
 func executeBaseBlockMove(runtime *common.RuntimeContext) error {
-	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", runtime.Str("base-token"), "blocks", runtime.Str("block-id"), "move"), nil, buildBaseBlockMoveBody(runtime))
+	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", baseTokenOrRaw(runtime), "blocks", runtime.Str("block-id"), "move"), nil, buildBaseBlockMoveBody(runtime))
 	if err != nil {
 		return err
 	}
@@ -106,7 +106,7 @@ func executeBaseBlockMove(runtime *common.RuntimeContext) error {
 }
 
 func executeBaseBlockRename(runtime *common.RuntimeContext) error {
-	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", runtime.Str("base-token"), "blocks", runtime.Str("block-id"), "rename"), nil, map[string]interface{}{
+	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", baseTokenOrRaw(runtime), "blocks", runtime.Str("block-id"), "rename"), nil, map[string]interface{}{
 		"name": strings.TrimSpace(runtime.Str("name")),
 	})
 	if err != nil {
@@ -117,7 +117,7 @@ func executeBaseBlockRename(runtime *common.RuntimeContext) error {
 }
 
 func executeBaseBlockDelete(runtime *common.RuntimeContext) error {
-	data, err := baseV3Call(runtime, "DELETE", baseV3Path("bases", runtime.Str("base-token"), "blocks", runtime.Str("block-id")), nil, nil)
+	data, err := baseV3Call(runtime, "DELETE", baseV3Path("bases", baseTokenOrRaw(runtime), "blocks", runtime.Str("block-id")), nil, nil)
 	if err != nil {
 		return err
 	}

shortcuts/base/base_block_rename.go

@@ -10,12 +10,13 @@ import (
 )
 
 var BaseBaseBlockRename = common.Shortcut{
-	Service:     "base",
-	Command:     "+base-block-rename",
-	Description: "Rename a block",
-	Risk:        "write",
-	Scopes:      []string{"base:block:update"},
-	AuthTypes:   authTypes(),
+	Service:           "base",
+	Command:           "+base-block-rename",
+	Description:       "Rename a block",
+	Risk:              "write",
+	ConditionalScopes: []string{"wiki:node:retrieve"},
+	Scopes:            []string{"base:block:update"},
+	AuthTypes:         authTypes(),
 	Flags: []common.Flag{
 		baseTokenFlag(true),
 		baseBlockIDFlag(true),

shortcuts/base/base_command_common.go

@@ -10,7 +10,7 @@ func authTypes() []string {
 }
 
 func baseTokenFlag(required bool) common.Flag {
-	return common.Flag{Name: "base-token", Desc: "base token", Required: required}
+	return common.Flag{Name: "base-token", Desc: "base token or /base|/wiki URL", Required: required}
 }
 
 func tableRefFlag(required bool) common.Flag {

shortcuts/base/base_copy.go

@@ -10,13 +10,14 @@ import (
 )
 
 var BaseBaseCopy = common.Shortcut{
-	Service:     "base",
-	Command:     "+base-copy",
-	Description: "Copy a base resource",
-	Risk:        "write",
-	UserScopes:  []string{"base:app:copy"},
-	BotScopes:   []string{"base:app:copy", "docs:permission.member:create"},
-	AuthTypes:   authTypes(),
+	Service:               "base",
+	Command:               "+base-copy",
+	Description:           "Copy a base resource",
+	Risk:                  "write",
+	ConditionalUserScopes: []string{"wiki:node:retrieve"},
+	Scopes:                []string{"base:app:copy"},
+	BotScopes:             []string{"base:app:copy", "docs:permission.member:create"},
+	AuthTypes:             authTypes(),
 	Flags: []common.Flag{
 		baseTokenFlag(true),
 		{Name: "name", Desc: "new base name"},