test: pin miaoda-cli to frontend alpha for +init acceptance

Temporary acceptance-only change: point +init at
@lark-apaas/miaoda-cli@0.1.24-alpha.03a64f0 (contains the frontend ->
vite-react mapping) so reviewers can validate `apps +init` on frontend
apps before the miaoda-cli release lands on npm latest. Do NOT merge;
revert to @latest once miaoda-cli MR #129 is published.

.github/CODEOWNERS

@@ -1,7 +1,4 @@
-/go.mod @liangshuo-1
-/go.sum @liangshuo-1
 /internal/ @liangshuo-1
-/shortcuts/common/ @liangshuo-1
 
 # Last match wins: existing domains below are exempt, only new skills/ entries need review.
 /skills/ @liangshuo-1

CHANGELOG.md

@@ -2,72 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## [v1.0.81] - 2026-07-31
-
-### Features
-
-- support visible_rule for form questions (#1891)
-- **contact**: add bot search shortcut (#2083)
-- add SXSD schema validation to Slides lint (#2103)
-- **drive**: add comment-operation shortcuts (#1898)
-- **drive**: extend permission shortcuts for Miaoda (#2070)
-- **apps**: add cache debug commands (+cache-get/-delete/-clear) (#1896)
-- support source file preview artifacts (#2085)
-
-### Bug Fixes
-
-- **contact**: stop bot match segments carrying tags or empty entries (#2115)
-- **base**: resolve Base URL block types accurately (#2099)
-- **drive**: use title for default download filename (#2089)
-- drop stale target version from root upgrade prompt (#2100)
-
-### Documentation
-
-- **calendar**: warn against container-default timezone in time conversion (#2104)
-- **calendar**: confirm scope before editing recurring events (#2119)
-- **base**: clarify form and file operation routing (#2110)
-
-### Misc
-
-- add protected public domain allowlists (#2111)
-
-## [v1.0.80] - 2026-07-29
-
-### Features
-
-- **drive**: add +member-list shortcut (#1795)
-- **drive**: add +permission-get-setting shortcut (#1738)
-- propagate invocation metadata (#2097)
-
-### Documentation
-
-- **slides**: 补齐 shortcut 参数说明，修正 +xml-get --output 必填标注 (#2088)
-- **slides**: +create 的参数下沉到 create.md，主 skill 只留路由 (#2096)
-
-### Tests
-
-- **e2e**: wait for base role update visibility (#2087)
-
-### Misc
-
-- Feat/detect line text overlap (#2069)
-
-## [v1.0.79] - 2026-07-28
-
-### Features
-
-- **slides**: update xsd (#2067)
-
-### Bug Fixes
-
-- **ci**: validate static workflow identity (#2015)
-- **sheets**: recognize OFL0X local office tokens (#2063)
-
-### Documentation
-
-- **calendar**: clarify identity selection by event ownership (#2071)
-- **slides**: add formula inline element syntax to quick-ref (#2077)
-
 ## [v1.0.78] - 2026-07-27
 
 ### Features
@@ -1751,9 +1685,6 @@ Bundled AI agent skills for intelligent assistance:
 - Bilingual documentation (English & Chinese).
 - CI/CD pipelines: linting, testing, coverage reporting, and automated releases.
 
-[v1.0.81]: https://github.com/larksuite/cli/releases/tag/v1.0.81
-[v1.0.80]: https://github.com/larksuite/cli/releases/tag/v1.0.80
-[v1.0.79]: https://github.com/larksuite/cli/releases/tag/v1.0.79
 [v1.0.78]: https://github.com/larksuite/cli/releases/tag/v1.0.78
 [v1.0.77]: https://github.com/larksuite/cli/releases/tag/v1.0.77
 [v1.0.75]: https://github.com/larksuite/cli/releases/tag/v1.0.75

README.md

@@ -310,6 +310,10 @@ lark-cli config risk-control default
 
 Please fully understand all usage risks. By using this tool, you are deemed to voluntarily assume all related responsibilities.
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=larksuite/cli&type=Date)](https://star-history.com/#larksuite/cli&Date)
+
 ## Contributing
 
 Community contributions are welcome! If you find a bug or have feature suggestions, please submit an [Issue](https://github.com/larksuite/cli/issues) or [Pull Request](https://github.com/larksuite/cli/pulls).

README.zh.md

@@ -311,6 +311,10 @@ lark-cli config risk-control default
 
 请您充分知悉全部使用风险，使用本工具即视为您自愿承担相关所有责任。
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=larksuite/cli&type=Date)](https://star-history.com/#larksuite/cli&Date)
+
 ## 贡献
 
 欢迎社区贡献！如果你发现 bug 或有功能建议，请提交 [Issue](https://github.com/larksuite/cli/issues) 或 [Pull Request](https://github.com/larksuite/cli/pulls)。

affordance/contact.md

@@ -23,41 +23,6 @@ lark-cli contact +search-user --query "alice" --as user
 lark-cli contact +search-user --user-ids "ou_3a8b****6a7b,me" --as user
 ```
 
-## +search-bot
-Search bots (apps) by keyword. Pass `--query` or `--queries`; use `--chat-ids` to search within specific chats.
-
-### Skills
-- lark-contact/references/lark-contact-search-bot.md
-
-### Avoid when
-- Looking for a person rather than a bot → use [[+search-user]]
-- Running as a bot — this shortcut is user-only
-
-### Tips
-- `has_more=true` means the search is incomplete; refine the keyword or search scope instead of paginating
-
-### Examples
-
-**Find bots by keyword**
-```bash
-lark-cli contact +search-bot --query "会议助手" --as user
-```
-
-**Search inside one chat**
-```bash
-lark-cli contact +search-bot --query "助手" --chat-ids "oc_3a8b****6a7b" --as user
-```
-
-**Find bots you've chatted with**
-```bash
-lark-cli contact +search-bot --query "助手" --has-chatted --as user
-```
-
-**Search several bot keywords in one call**
-```bash
-lark-cli contact +search-bot --queries "会议助手,日报助手,审批助手" --as user
-```
-
 ## +get-user
 Fetch one user's profile by id, or your own with --user-id omitted. Use it under bot identity — `+search-user` is user-only.
 

cmd/config/init_interactive.go

@@ -179,8 +179,8 @@ func runCreateAppFlow(ctx context.Context, f *cmdutil.Factory, brandOverride cor
 	}
 
 	// Step 1: Request app registration (begin)
-	// Registration is platform traffic, so it must use the provider-aware
-	// transport as well as the shared proxy configuration.
+	// Use the shared proxy-plugin-aware transport so registration traffic is not
+	// a bypass of proxy plugin mode.
 	httpClient := transport.NewHTTPClient(0)
 	authResp, err := larkauth.RequestAppRegistration(ctx, httpClient, larkBrand, f.IOStreams.ErrOut)
 	if err != nil {

cmd/doctor/doctor.go

@@ -157,8 +157,8 @@ func networkChecks(ctx context.Context, opts *DoctorOptions, ep core.Endpoints)
 		}
 	}
 
-	// Connectivity checks are platform traffic and must exercise the same
-	// provider-aware route as real platform requests.
+	// Use the shared proxy-plugin-aware transport so connectivity checks reflect
+	// the real egress path (and are blocked when proxy plugin fails closed).
 	httpClient := transport.NewHTTPClient(0)
 	mcpURL := ep.MCP + "/mcp"
 

cmd/root_upgrade.go

@@ -65,17 +65,7 @@ func offerRootUpgrade(f *cmdutil.Factory, cmd *cobra.Command) {
 	if info == nil {
 		return
 	}
-	// Deliberately no target version here: info.Latest comes from the on-disk
-	// cache, which has no expiry (the 24h TTL only throttles refreshes, and a
-	// failed refresh leaves the old value in place), so it can name a version
-	// that is no longer the one npm would install. The version actually
-	// installed is resolved live by the update subcommand, which prints
-	// "Updating lark-cli <cur> -> <latest> via <pm> ..." before installing —
-	// that is where the user sees the real target. Keep going through the
-	// update subcommand rather than calling RunNpmInstall directly, otherwise
-	// that line disappears and the user approves a global install without ever
-	// being told what gets installed.
-	fmt.Fprintf(ios.ErrOut, "A newer lark-cli is available (current %s). Upgrade now? [y/N]: ", info.Current)
+	fmt.Fprintf(ios.ErrOut, "lark-cli %s available (current %s). Upgrade now? [y/N]: ", info.Latest, info.Current)
 	if !readYes(ios.In) {
 		return
 	}

cmd/root_upgrade_test.go

@@ -128,17 +128,6 @@ func TestOfferRootUpgrade(t *testing.T) {
 			if gotPrompt != tc.wantPrompt {
 				t.Errorf("prompt: got %v want %v (stderr=%q)", gotPrompt, tc.wantPrompt, errBuf.String())
 			}
-			// The prompt must not name a target version: info.Latest comes from
-			// the on-disk cache and can be stale, while the version actually
-			// installed is resolved live by the update subcommand.
-			if tc.wantPrompt {
-				if strings.Contains(errBuf.String(), tc.latest) {
-					t.Errorf("prompt must not name the cached target version %q (stderr=%q)", tc.latest, errBuf.String())
-				}
-				if !strings.Contains(errBuf.String(), build.Version) {
-					t.Errorf("prompt must name the current version %q (stderr=%q)", build.Version, errBuf.String())
-				}
-			}
 			if called != tc.wantRun {
 				t.Errorf("runRootUpgrade called: got %v want %v", called, tc.wantRun)
 			}

extension/transport/sidecar/interceptor_test.go

@@ -12,18 +12,9 @@ import (
 	"net/http"
 	"testing"
 
-	exttransport "github.com/larksuite/cli/extension/transport"
-	"github.com/larksuite/cli/internal/envvars"
-	internaltransport "github.com/larksuite/cli/internal/transport"
 	"github.com/larksuite/cli/sidecar"
 )
 
-type roundTripFunc func(*http.Request) (*http.Response, error)
-
-func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f(req)
-}
-
 // failingBody is a ReadCloser that errors on Read and tracks Close calls.
 type failingBody struct {
 	err      error
@@ -272,55 +263,3 @@ func TestInterceptor_EmptyBody(t *testing.T) {
 		t.Errorf("body SHA256 = %q, want empty-string SHA256 %q", sha, expectedEmpty)
 	}
 }
-
-func TestLegacySidecarProviderStillHandlesForcedExternalRequests(t *testing.T) {
-	t.Setenv(envvars.CliAuthProxy, "http://127.0.0.1:16384")
-	t.Setenv(envvars.CliProxyKey, "test-key")
-	previousProvider := exttransport.GetProvider()
-	exttransport.Register(&Provider{})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	seen := make(chan *http.Request, 2)
-	base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		seen <- req.Clone(req.Context())
-		return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-	})
-	client := internaltransport.ClientForRequestClass(
-		&http.Client{Transport: internaltransport.NewHTTPPolicyRouter(base, base)},
-		exttransport.RequestClassExternal,
-	)
-
-	withSentinel, err := http.NewRequest(http.MethodGet, "https://external.example/protected", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	withSentinel.Header.Set("Authorization", "Bearer "+sidecar.SentinelUAT)
-	resp, err := client.Do(withSentinel)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	withoutSentinel, err := http.NewRequest(http.MethodGet, "https://external.example/public", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err = client.Do(withoutSentinel)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	proxied := <-seen
-	if proxied.URL.Scheme != "http" || proxied.URL.Host != "127.0.0.1:16384" {
-		t.Fatalf("sentinel request URL = %s, want sidecar route", proxied.URL)
-	}
-	if got := proxied.Header.Get(sidecar.HeaderProxyTarget); got != "https://external.example" {
-		t.Fatalf("sentinel request proxy target = %q", got)
-	}
-
-	passthrough := <-seen
-	if got := passthrough.URL.String(); got != "https://external.example/public" {
-		t.Fatalf("non-sentinel request URL = %q, want unchanged", got)
-	}
-}

extension/transport/types.go

@@ -15,27 +15,6 @@ type Provider interface {
 	ResolveInterceptor(ctx context.Context) Interceptor
 }
 
-// RequestClass describes the trust boundary of an outbound HTTP request.
-// Platform requests target endpoints owned by the CLI's endpoint resolver;
-// external requests target user-provided, pre-signed, CDN, registry, or other
-// non-platform URLs. Redirect targets are classified again from each hop's
-// logical URL; rewriting a host in an interceptor does not add that host to
-// the platform endpoint catalog.
-type RequestClass string
-
-const (
-	RequestClassPlatform RequestClass = "platform"
-	RequestClassExternal RequestClass = "external"
-)
-
-// ScopedProvider optionally limits a Provider to selected request classes.
-// Providers that do not implement this interface retain the original
-// behavior and apply to every request class.
-type ScopedProvider interface {
-	Provider
-	SupportsRequestClass(RequestClass) bool
-}
-
 // Interceptor defines network-layer customization via a pre/post hook pair.
 // The built-in transport chain always executes between PreRoundTrip and the
 // returned post function, and cannot be skipped or overridden by the extension.

internal/auth/transport.go

@@ -17,8 +17,6 @@ import (
 	"github.com/larksuite/cli/internal/transport"
 )
 
-var _ transport.RoundTripperDecorator = (*SecurityPolicyTransport)(nil)
-
 // SecurityPolicyTransport is an http.RoundTripper that intercepts all responses
 // and checks for security policy errors.
 type SecurityPolicyTransport struct {
@@ -33,16 +31,6 @@ func (t *SecurityPolicyTransport) base() http.RoundTripper {
 	return transport.Fallback()
 }
 
-func (t *SecurityPolicyTransport) BaseRoundTripper() http.RoundTripper {
-	return t.base()
-}
-
-func (t *SecurityPolicyTransport) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	cloned := *t
-	cloned.Base = base
-	return &cloned
-}
-
 // RoundTrip implements http.RoundTripper.
 func (t *SecurityPolicyTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	resp, err := t.base().RoundTrip(req)

internal/client/client.go

@@ -212,9 +212,6 @@ func (c *APIClient) DoStream(ctx context.Context, req *larkcore.ApiReq, as core.
 	resp, err := httpClient.Do(httpReq)
 	if err != nil {
 		cancel()
-		if _, ok := errs.ProblemOf(err); ok {
-			return nil, err
-		}
 		return nil, errs.NewNetworkError(classifyNetworkSubtype(err), "stream request failed: %s", err).WithCause(err)
 	}
 	resp.Body = &cancelOnCloseBody{ReadCloser: resp.Body, cancel: cancel}

internal/client/client_test.go

@@ -518,29 +518,6 @@ func TestDoStream_TransportFailureSplitsSubtype(t *testing.T) {
 	}
 }
 
-func TestDoStream_PreservesTypedTransportError(t *testing.T) {
-	policyErr := errs.NewSecurityPolicyError(errs.SubtypeAccessDenied, "blocked redirect")
-	ac := &APIClient{
-		HTTP: &http.Client{Transport: roundTripFunc(func(*http.Request) (*http.Response, error) {
-			return nil, policyErr
-		})},
-		Credential: credential.NewCredentialProvider(nil, nil, &staticTokenResolver{}, nil),
-		Config:     &core.CliConfig{AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu},
-	}
-
-	_, err := ac.DoStream(context.Background(), &larkcore.ApiReq{
-		HttpMethod: http.MethodGet,
-		ApiPath:    "/open-apis/drive/v1/files/file_token/download",
-	}, core.AsBot)
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryPolicy || problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("DoStream() problem = %#v, %v; want policy/access_denied", problem, ok)
-	}
-	if !errors.Is(err, policyErr) {
-		t.Fatal("DoStream() did not preserve the typed transport error")
-	}
-}
-
 // failingTokenResolver always returns TokenUnavailableError, exercising the
 // auth/credential failure path through resolveAccessToken.
 type failingTokenResolver struct{}

internal/cmdutil/factory.go

@@ -16,12 +16,10 @@ import (
 	"github.com/larksuite/cli/errs"
 	extcred "github.com/larksuite/cli/extension/credential"
 	"github.com/larksuite/cli/extension/fileio"
-	exttransport "github.com/larksuite/cli/extension/transport"
 	"github.com/larksuite/cli/internal/client"
 	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/credential"
 	"github.com/larksuite/cli/internal/keychain"
-	"github.com/larksuite/cli/internal/transport"
 )
 
 // Factory holds shared dependencies injected into every command.
@@ -33,7 +31,7 @@ type InvocationContext struct {
 
 type Factory struct {
 	Config     func() (*core.CliConfig, error) // lazily loads app config from Credential
-	HttpClient func() (*http.Client, error)    // policy-routed HTTP client for direct requests
+	HttpClient func() (*http.Client, error)    // HTTP client for non-Lark API calls (with retry and security headers)
 	LarkClient func() (*lark.Client, error)    // Lark SDK client for all Open API calls
 	IOStreams  *IOStreams                      // stdin/stdout/stderr streams
 
@@ -50,18 +48,6 @@ type Factory struct {
 	SkillContent fs.FS // embedded skill tree (rooted at the skill list); nil when the build embeds no skills
 }
 
-// ExternalHTTPClient returns a clone of the existing Factory client whose
-// requests are explicitly classified as external. The underlying client,
-// redirect policy, timeout, proxy configuration, and legacy transport provider
-// behavior are preserved.
-func (f *Factory) ExternalHTTPClient() (*http.Client, error) {
-	client, err := f.HttpClient()
-	if err != nil {
-		return nil, err
-	}
-	return transport.ClientForRequestClass(client, exttransport.RequestClassExternal), nil
-}
-
 // ResolveFileIO resolves a FileIO instance using the current execution context.
 // The provider controls whether the returned instance is fresh or cached.
 func (f *Factory) ResolveFileIO(ctx context.Context) fileio.FileIO {

internal/cmdutil/factory_default.go

@@ -5,18 +5,16 @@ package cmdutil
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 	"os"
-	"strings"
 	"sync"
 	"time"
 
 	lark "github.com/larksuite/oapi-sdk-go/v3"
 	larkcore "github.com/larksuite/oapi-sdk-go/v3/core"
 
-	"github.com/larksuite/cli/errs"
 	extcred "github.com/larksuite/cli/extension/credential"
 	"github.com/larksuite/cli/extension/fileio"
 	"github.com/larksuite/cli/internal/auth"
@@ -50,19 +48,6 @@ func NewDefault(streams *IOStreams, inv InvocationContext) *Factory {
 	// workspace-scoped. Default is WorkspaceLocal — existing behavior unchanged.
 	ws := core.DetectWorkspaceFromEnv(os.Getenv)
 	core.SetCurrentWorkspace(ws)
-	workspaceConfig := core.NewConfigSnapshot()
-	bootstrapHostSignalSource := sync.OnceValue(func() riskcontrol.Source {
-		return resolveSDKHostSignalSource(workspaceConfig)
-	})
-	// Install after workspace selection so the dependency bootstrap bridge uses
-	// the correct shared proxy configuration. NewDefault is also used by cmd.Build
-	// consumers, so this keeps their request routing identical to cmd.Execute.
-	transport.InstallSDKTransportBridge(func(base http.RoundTripper) http.RoundTripper {
-		return buildSDKPlatformTransportWithBase(
-			base,
-			bootstrapHostSignalSource(),
-		)
-	})
 
 	// Inject workspace-aware dir into keychain's log system.
 	// This breaks the core↔keychain import cycle by using a function variable.
@@ -70,6 +55,7 @@ func NewDefault(streams *IOStreams, inv InvocationContext) *Factory {
 
 	// Phase 0: FileIO provider (no dependency)
 	f.FileIOProvider = fileio.GetProvider()
+	workspaceConfig := core.NewConfigSnapshot()
 
 	// Phase 1: HttpClient (no credential dependency)
 	f.HttpClient = cachedHttpClientFunc(f, workspaceConfig)
@@ -101,45 +87,15 @@ func NewDefault(streams *IOStreams, inv InvocationContext) *Factory {
 	return f
 }
 
-// safeRedirectPolicy permits cross-origin redirects only for bodyless GET and
-// HEAD requests. This allows API download redirects while preventing OAuth or
-// other credential-bearing request bodies from being replayed to another
-// origin. HTTPS requests can never be downgraded to HTTP.
+// safeRedirectPolicy prevents credential headers from being forwarded
+// when a response redirects to a different host (e.g. Lark API 302 → CDN).
+// Strips Authorization, X-Lark-MCP-UAT, and X-Lark-MCP-TAT on cross-host
+// redirects; other headers like X-Cli-* pass through.
 func safeRedirectPolicy(req *http.Request, via []*http.Request) error {
 	if len(via) >= 10 {
-		return errs.NewNetworkError(errs.SubtypeNetworkTransport, "too many redirects")
+		return fmt.Errorf("too many redirects")
 	}
-	if len(via) == 0 {
-		return nil
-	}
-	original := via[0]
-	previous := via[len(via)-1]
-	if previous.URL != nil && req.URL != nil && strings.EqualFold(previous.URL.Scheme, "https") && !strings.EqualFold(req.URL.Scheme, "https") {
-		return errs.NewSecurityPolicyError(
-			errs.SubtypeAccessDenied,
-			"redirect from HTTPS to %s is not allowed",
-			req.URL.Scheme,
-		)
-	}
-	if !sameRedirectOrigin(previous.URL, req.URL) {
-		if req.Method != http.MethodGet && req.Method != http.MethodHead {
-			return errs.NewSecurityPolicyError(
-				errs.SubtypeAccessDenied,
-				"cross-origin redirect for HTTP method %s is not allowed",
-				req.Method,
-			)
-		}
-		if req.Body != nil || req.GetBody != nil {
-			return errs.NewSecurityPolicyError(
-				errs.SubtypeAccessDenied,
-				"cross-origin redirect with a request body is not allowed",
-			)
-		}
-	}
-	// net/http copies initial headers onto every redirect request. Continue
-	// stripping credentials for every hop outside the initial origin, even when
-	// two consecutive redirect targets share an origin.
-	if !sameRedirectOrigin(original.URL, req.URL) {
+	if len(via) > 0 && req.URL.Host != via[0].URL.Host {
 		req.Header.Del("Authorization")
 		req.Header.Del("X-Lark-MCP-UAT")
 		req.Header.Del("X-Lark-MCP-TAT")
@@ -147,29 +103,6 @@ func safeRedirectPolicy(req *http.Request, via []*http.Request) error {
 	return nil
 }
 
-func sameRedirectOrigin(left, right *url.URL) bool {
-	if left == nil || right == nil {
-		return false
-	}
-	return strings.EqualFold(left.Scheme, right.Scheme) &&
-		strings.EqualFold(left.Hostname(), right.Hostname()) &&
-		effectivePort(left) == effectivePort(right)
-}
-
-func effectivePort(candidate *url.URL) string {
-	if port := candidate.Port(); port != "" {
-		return port
-	}
-	switch strings.ToLower(candidate.Scheme) {
-	case "http":
-		return "80"
-	case "https":
-		return "443"
-	default:
-		return ""
-	}
-}
-
 // warnIfProxied is a test seam for the proxy-warning gate. Production wires it
 // to transport.WarnIfProxied; tests swap in a spy to count invocations. It is
 // needed because the real function is guarded by an internal sync.Once, so
@@ -185,12 +118,15 @@ func cachedHttpClientFunc(f *Factory, workspaceConfig workspaceConfigSource) fun
 		}
 
 		hostSignalSource := resolveSDKHostSignalSource(workspaceConfig)
-		shared := transport.Shared()
-		outbound := riskcontrol.NewTransport(shared, hostSignalSource)
-		platform := buildDirectHTTPTransport(outbound, true)
-		external := buildDirectHTTPTransport(outbound, false)
+
+		var rt http.RoundTripper = transport.Shared()
+		rt = riskcontrol.NewTransport(rt, hostSignalSource)
+		rt = &RetryTransport{Base: rt}
+		rt = &SecurityHeaderTransport{Base: rt}
+		rt = &auth.SecurityPolicyTransport{Base: rt} // Add our global response interceptor
+		rt = wrapWithExtension(rt)
 		client := &http.Client{
-			Transport:     transport.NewHTTPPolicyRouter(platform, external),
+			Transport:     rt,
 			Timeout:       30 * time.Second,
 			CheckRedirect: safeRedirectPolicy,
 		}
@@ -198,15 +134,6 @@ func cachedHttpClientFunc(f *Factory, workspaceConfig workspaceConfigSource) fun
 	})
 }
 
-func buildDirectHTTPTransport(base http.RoundTripper, platform bool) http.RoundTripper {
-	var builtIn http.RoundTripper = &RetryTransport{Base: base}
-	builtIn = &SecurityHeaderTransport{Base: builtIn}
-	if platform {
-		builtIn = &auth.SecurityPolicyTransport{Base: builtIn}
-	}
-	return builtIn
-}
-
 func cachedLarkClientFunc(f *Factory, workspaceConfig workspaceConfigSource) func() (*lark.Client, error) {
 	return sync.OnceValues(func() (*lark.Client, error) {
 		acct, err := f.Credential.ResolveAccount(context.Background())
@@ -222,8 +149,14 @@ func cachedLarkClientFunc(f *Factory, workspaceConfig workspaceConfigSource) fun
 			warnIfProxied(f.IOStreams.ErrOut)
 		}
 		hostSignalSource := resolveSDKHostSignalSource(workspaceConfig)
+		var sdkBase http.RoundTripper = transport.Shared()
+		// The innermost SDK boundary always strips reserved host-signal headers;
+		// a nil source makes it strip-only when workspace policy disables signal
+		// collection.
+		sdkBase = riskcontrol.NewTransport(sdkBase, hostSignalSource)
+		sdkTransport := wrapSDKTransport(sdkBase)
 		opts = append(opts, lark.WithHttpClient(&http.Client{
-			Transport:     buildSDKTransport(hostSignalSource),
+			Transport:     sdkTransport,
 			CheckRedirect: safeRedirectPolicy,
 		}))
 		ep := core.ResolveEndpoints(acct.Brand)
@@ -232,41 +165,12 @@ func cachedLarkClientFunc(f *Factory, workspaceConfig workspaceConfigSource) fun
 	})
 }
 
-func buildSDKTransport(hostSignalSource riskcontrol.Source) http.RoundTripper {
-	return buildSDKTransportWithBase(transport.Shared(), hostSignalSource)
-}
-
-func buildSDKPlatformTransportWithBase(
-	base http.RoundTripper,
-	hostSignalSource riskcontrol.Source,
-) http.RoundTripper {
-	outbound := riskcontrol.NewTransport(base, hostSignalSource)
-	return buildSDKHTTPTransport(outbound, true)
-}
-
-func buildSDKTransportWithBase(
-	base http.RoundTripper,
-	hostSignalSource riskcontrol.Source,
-) http.RoundTripper {
-	// Risk control is the innermost trusted boundary for both request classes.
-	// It therefore observes the final URL and strips extension-supplied reserved
-	// headers immediately before the network transport.
-	outbound := riskcontrol.NewTransport(base, hostSignalSource)
-	return transport.NewHTTPPolicyRouter(
-		buildSDKHTTPTransport(outbound, true),
-		buildSDKHTTPTransport(outbound, false),
-	)
-}
-
-func buildSDKHTTPTransport(base http.RoundTripper, platform bool) http.RoundTripper {
-	var builtIn http.RoundTripper = &RetryTransport{Base: base}
-	builtIn = &UserAgentTransport{Base: builtIn}
-	builtIn = &BuildHeaderTransport{Base: builtIn}
-	builtIn = &SecurityHeaderTransport{Base: builtIn}
-	if platform {
-		builtIn = &auth.SecurityPolicyTransport{Base: builtIn}
-	}
-	return builtIn
+func wrapSDKTransport(next http.RoundTripper) http.RoundTripper {
+	var sdkTransport http.RoundTripper = &RetryTransport{Base: next}
+	sdkTransport = &UserAgentTransport{Base: sdkTransport}
+	sdkTransport = &BuildHeaderTransport{Base: sdkTransport}
+	sdkTransport = &auth.SecurityPolicyTransport{Base: sdkTransport}
+	return wrapWithExtension(sdkTransport)
 }
 
 type credentialDeps struct {

internal/cmdutil/factory_http_test.go

@@ -4,20 +4,13 @@
 package cmdutil
 
 import (
-	"errors"
 	"io"
-	"net/http"
-	"net/http/httptest"
-	"strings"
 	"testing"
 
-	"github.com/larksuite/cli/errs"
-	exttransport "github.com/larksuite/cli/extension/transport"
 	"github.com/larksuite/cli/internal/core"
-	internaltransport "github.com/larksuite/cli/internal/transport"
 )
 
-func TestCachedHTTPClientFunc_ReturnsSameInstance(t *testing.T) {
+func TestCachedHttpClientFunc_ReturnsSameInstance(t *testing.T) {
 	isEnabled := false
 	f, _, _, _ := TestFactory(t, &core.CliConfig{AppID: "test-app"})
 	f.IOStreams.ErrOut = io.Discard
@@ -40,7 +33,7 @@ func TestCachedHTTPClientFunc_ReturnsSameInstance(t *testing.T) {
 	}
 }
 
-func TestCachedHTTPClientFunc_HasTimeout(t *testing.T) {
+func TestCachedHttpClientFunc_HasTimeout(t *testing.T) {
 	isEnabled := false
 	f, _, _, _ := TestFactory(t, &core.CliConfig{AppID: "test-app"})
 	f.IOStreams.ErrOut = io.Discard
@@ -51,7 +44,7 @@ func TestCachedHTTPClientFunc_HasTimeout(t *testing.T) {
 	}
 }
 
-func TestCachedHTTPClientFunc_HasRedirectPolicy(t *testing.T) {
+func TestCachedHttpClientFunc_HasRedirectPolicy(t *testing.T) {
 	isEnabled := false
 	f, _, _, _ := TestFactory(t, &core.CliConfig{AppID: "test-app"})
 	f.IOStreams.ErrOut = io.Discard
@@ -61,283 +54,3 @@ func TestCachedHTTPClientFunc_HasRedirectPolicy(t *testing.T) {
 		t.Error("expected CheckRedirect to be set (safeRedirectPolicy)")
 	}
 }
-
-func TestFactoryExternalHTTPClientClonesExistingClient(t *testing.T) {
-	base := &http.Client{Timeout: 17, CheckRedirect: safeRedirectPolicy}
-	factory := &Factory{HttpClient: func() (*http.Client, error) { return base, nil }}
-
-	external, err := factory.ExternalHTTPClient()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if external == base {
-		t.Fatal("ExternalHTTPClient returned the cached client instead of a clone")
-	}
-	if external.Timeout != base.Timeout || external.CheckRedirect == nil {
-		t.Fatal("ExternalHTTPClient did not preserve client policy")
-	}
-	if base.Transport != nil {
-		t.Fatal("ExternalHTTPClient mutated the cached client's transport")
-	}
-}
-
-type platformOnlyStubProvider struct {
-	*stubTransportProvider
-}
-
-func (*platformOnlyStubProvider) SupportsRequestClass(class exttransport.RequestClass) bool {
-	return class == exttransport.RequestClassPlatform
-}
-
-func TestFactoryHTTPClientRoutesPoliciesByRequestClass(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_NO_PROXY", "1")
-
-	interceptor := &headerCapturingInterceptor{}
-	exttransport.Register(&platformOnlyStubProvider{stubTransportProvider: &stubTransportProvider{interceptor: interceptor}})
-	t.Cleanup(func() { exttransport.Register(nil) })
-
-	received := make(chan http.Header, 2)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		received <- req.Header.Clone()
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(server.Close)
-
-	factory := &Factory{IOStreams: &IOStreams{ErrOut: io.Discard}}
-	client, err := cachedHttpClientFunc(factory, nil)()
-	if err != nil {
-		t.Fatal(err)
-	}
-	factory.HttpClient = func() (*http.Client, error) { return client, nil }
-	platformClient := internaltransport.ClientForRequestClass(client, exttransport.RequestClassPlatform)
-	externalClient, err := factory.ExternalHTTPClient()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, client := range []*http.Client{platformClient, externalClient} {
-		resp, err := client.Get(server.URL)
-		if err != nil {
-			t.Fatal(err)
-		}
-		resp.Body.Close()
-	}
-
-	platformHeaders := <-received
-	if got := platformHeaders.Get("X-Custom-Trace"); got != "ext-trace-123" {
-		t.Fatalf("platform extension header = %q, want ext-trace-123", got)
-	}
-	if got := platformHeaders.Get(HeaderSource); got != SourceValue {
-		t.Fatalf("platform security header = %q, want %q", got, SourceValue)
-	}
-
-	externalHeaders := <-received
-	if got := externalHeaders.Get("X-Custom-Trace"); got != "" {
-		t.Fatalf("external request leaked extension header %q", got)
-	}
-	for header, values := range BaseSecurityHeaders() {
-		if len(values) == 0 {
-			continue
-		}
-		want := values[len(values)-1]
-		if got := externalHeaders.Get(header); got != want {
-			t.Fatalf("external security header %s = %q, want preserved value %q", header, got, want)
-		}
-	}
-}
-
-func TestFactoryExternalHTTPClientDoesNotParsePlatformErrorProtocol(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_NO_PROXY", "1")
-	exttransport.Register(nil)
-
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		w.Header().Set("Content-Type", "application/json")
-		_, _ = io.WriteString(w, `{"code":21000,"msg":"application-defined external response","data":{"cli_hint":"external-defined"}}`)
-	}))
-	t.Cleanup(server.Close)
-
-	factory := &Factory{IOStreams: &IOStreams{ErrOut: io.Discard}}
-	client, err := cachedHttpClientFunc(factory, nil)()
-	if err != nil {
-		t.Fatal(err)
-	}
-	factory.HttpClient = func() (*http.Client, error) { return client, nil }
-
-	platform := internaltransport.ClientForRequestClass(client, exttransport.RequestClassPlatform)
-	if _, err := platform.Get(server.URL); err == nil {
-		t.Fatal("platform request error = nil, want security policy classification")
-	} else {
-		var policyErr *errs.SecurityPolicyError
-		if !errors.As(err, &policyErr) {
-			t.Fatalf("platform request error type = %T, want *errs.SecurityPolicyError", err)
-		}
-	}
-
-	external, err := factory.ExternalHTTPClient()
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := external.Get(server.URL)
-	if err != nil {
-		t.Fatalf("external request parsed platform error protocol: %v", err)
-	}
-	resp.Body.Close()
-}
-
-func TestSafeRedirectPolicyAllowsBodylessCrossOriginGetAndStripsCredentials(t *testing.T) {
-	original, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/start", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	redirect, err := http.NewRequest(http.MethodGet, "https://cdn.example.com/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, header := range []string{"Authorization", "X-Lark-MCP-UAT", "X-Lark-MCP-TAT"} {
-		redirect.Header.Set(header, "secret")
-	}
-
-	if err := safeRedirectPolicy(redirect, []*http.Request{original}); err != nil {
-		t.Fatalf("safeRedirectPolicy() error = %v, want allowed GET redirect", err)
-	}
-	for _, header := range []string{"Authorization", "X-Lark-MCP-UAT", "X-Lark-MCP-TAT"} {
-		if got := redirect.Header.Get(header); got != "" {
-			t.Fatalf("redirect retained %s=%q", header, got)
-		}
-	}
-}
-
-func TestSafeRedirectPolicyRejectsHTTPSDowngrade(t *testing.T) {
-	original, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/start", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	redirect, err := http.NewRequest(http.MethodGet, "http://open.feishu.cn/next", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = safeRedirectPolicy(redirect, []*http.Request{original})
-	if err == nil || !strings.Contains(err.Error(), "HTTPS") {
-		t.Fatalf("safeRedirectPolicy() error = %v, want HTTPS downgrade rejection", err)
-	}
-	requireRedirectProblem(t, err, errs.CategoryPolicy, errs.SubtypeAccessDenied)
-}
-
-func TestSafeRedirectPolicyRejectsCrossOriginMethod(t *testing.T) {
-	original, err := http.NewRequest(http.MethodPost, "https://accounts.feishu.cn/token", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	redirect, err := http.NewRequest(http.MethodPost, "https://external.example/token", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = safeRedirectPolicy(redirect, []*http.Request{original})
-	if err == nil || !strings.Contains(err.Error(), "HTTP method POST") {
-		t.Fatalf("safeRedirectPolicy() error = %v, want cross-origin method rejection", err)
-	}
-	requireRedirectProblem(t, err, errs.CategoryPolicy, errs.SubtypeAccessDenied)
-}
-
-func TestSafeRedirectPolicyRejectsCrossOriginRequestBody(t *testing.T) {
-	original, err := http.NewRequest(http.MethodGet, "https://accounts.feishu.cn/token", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	redirect, err := http.NewRequest(http.MethodGet, "https://external.example/token", strings.NewReader("client_secret=secret"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = safeRedirectPolicy(redirect, []*http.Request{original})
-	if err == nil || !strings.Contains(err.Error(), "request body") {
-		t.Fatalf("safeRedirectPolicy() error = %v, want cross-origin body rejection", err)
-	}
-	requireRedirectProblem(t, err, errs.CategoryPolicy, errs.SubtypeAccessDenied)
-}
-
-func TestSafeRedirectPolicyRejectsTooManyRedirects(t *testing.T) {
-	err := safeRedirectPolicy(&http.Request{}, make([]*http.Request, 10))
-	if err == nil || err.Error() != "too many redirects" {
-		t.Fatalf("safeRedirectPolicy() error = %v, want redirect limit rejection", err)
-	}
-	requireRedirectProblem(t, err, errs.CategoryNetwork, errs.SubtypeNetworkTransport)
-}
-
-func TestSafeRedirectPolicyTreatsDefaultHTTPSPortAsSameOrigin(t *testing.T) {
-	original, err := http.NewRequest(http.MethodPost, "https://accounts.feishu.cn/token", strings.NewReader("secret"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	redirect, err := http.NewRequest(http.MethodPost, "https://accounts.feishu.cn:443/token-next", strings.NewReader("secret"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := safeRedirectPolicy(redirect, []*http.Request{original}); err != nil {
-		t.Fatalf("safeRedirectPolicy() error = %v, want same-origin redirect", err)
-	}
-}
-
-func TestSafeRedirectPolicyKeepsCredentialsStrippedAcrossExternalHops(t *testing.T) {
-	original, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/start", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	previous, err := http.NewRequest(http.MethodGet, "https://cdn.example.com/first", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	redirect, err := http.NewRequest(http.MethodGet, "https://cdn.example.com/second", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	redirect.Header.Set("Authorization", "Bearer copied-from-initial-request")
-
-	if err := safeRedirectPolicy(redirect, []*http.Request{original, previous}); err != nil {
-		t.Fatalf("safeRedirectPolicy() error = %v, want same-CDN redirect", err)
-	}
-	if got := redirect.Header.Get("Authorization"); got != "" {
-		t.Fatalf("redirect retained Authorization=%q outside the initial origin", got)
-	}
-}
-
-func TestSafeRedirectPolicyRejectsDowngradeOnLaterHop(t *testing.T) {
-	original, err := http.NewRequest(http.MethodGet, "http://source.example/start", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	previous, err := http.NewRequest(http.MethodGet, "https://cdn.example.com/secure", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	redirect, err := http.NewRequest(http.MethodGet, "http://cdn.example.com/plain", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = safeRedirectPolicy(redirect, []*http.Request{original, previous})
-	if err == nil || !strings.Contains(err.Error(), "HTTPS") {
-		t.Fatalf("safeRedirectPolicy() error = %v, want later-hop HTTPS downgrade rejection", err)
-	}
-	requireRedirectProblem(t, err, errs.CategoryPolicy, errs.SubtypeAccessDenied)
-}
-
-func requireRedirectProblem(t *testing.T, err error, category errs.Category, subtype errs.Subtype) {
-	t.Helper()
-	problem, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("error type = %T, want typed error", err)
-	}
-	if problem.Category != category || problem.Subtype != subtype {
-		t.Fatalf(
-			"error category/subtype = %s/%s, want %s/%s",
-			problem.Category,
-			problem.Subtype,
-			category,
-			subtype,
-		)
-	}
-}

internal/cmdutil/factory_proxy_warn_test.go

@@ -34,9 +34,9 @@ var proxyWarnGateCases = []struct {
 	{"non-terminal stderr stays silent", false, 0},
 }
 
-// TestCachedHTTPClientFunc_ProxyWarnGate verifies the HTTP client init path
+// TestCachedHttpClientFunc_ProxyWarnGate verifies the http-client init path
 // invokes WarnIfProxied only when stderr is an interactive terminal.
-func TestCachedHTTPClientFunc_ProxyWarnGate(t *testing.T) {
+func TestCachedHttpClientFunc_ProxyWarnGate(t *testing.T) {
 	isEnabled := false
 	for _, tc := range proxyWarnGateCases {
 		t.Run(tc.name, func(t *testing.T) {

internal/cmdutil/secheader.go

@@ -26,7 +26,6 @@ const (
 	HeaderShortcut    = "X-Cli-Shortcut"
 	HeaderExecutionId = "X-Cli-Execution-Id"
 	HeaderAgentTrace  = "X-Agent-Trace"
-	HeaderAgentName   = "X-Agent-Name"
 
 	SourceValue = "lark-cli"
 
@@ -56,9 +55,6 @@ func BaseSecurityHeaders() http.Header {
 	if v := envvars.AgentTrace(); v != "" {
 		h.Set(HeaderAgentTrace, v)
 	}
-	if v := envvars.AgentName(); v != "" {
-		h.Set(HeaderAgentName, v)
-	}
 	return h
 }
 

internal/cmdutil/secheader_test.go

@@ -263,34 +263,9 @@ func TestBaseSecurityHeaders_AllRequiredHeaders(t *testing.T) {
 }
 
 // ---------------------------------------------------------------------------
-// Agent headers injected via BaseSecurityHeaders
+// HeaderAgentTrace injection (via BaseSecurityHeaders)
 // ---------------------------------------------------------------------------
 
-func TestBaseSecurityHeaders_NoAgentNameHeaderWhenEnvUnset(t *testing.T) {
-	t.Setenv(envvars.CliAgentName, "")
-	h := BaseSecurityHeaders()
-	if v := h.Get(HeaderAgentName); v != "" {
-		t.Fatalf("BaseSecurityHeaders() included %s = %q, want absent when env unset", HeaderAgentName, v)
-	}
-}
-
-func TestBaseSecurityHeaders_IncludesAgentNameHeaderWhenEnvSet(t *testing.T) {
-	const agentName = "sample-agent"
-	t.Setenv(envvars.CliAgentName, agentName)
-	h := BaseSecurityHeaders()
-	if v := h.Get(HeaderAgentName); v != agentName {
-		t.Fatalf("BaseSecurityHeaders()[%s] = %q, want %q", HeaderAgentName, v, agentName)
-	}
-}
-
-func TestBaseSecurityHeaders_NoAgentNameHeaderWhenEnvInvalid(t *testing.T) {
-	t.Setenv(envvars.CliAgentName, "agent\r\nX-Evil: attack")
-	h := BaseSecurityHeaders()
-	if v := h.Get(HeaderAgentName); v != "" {
-		t.Fatalf("BaseSecurityHeaders() included %s = %q, want absent for invalid input", HeaderAgentName, v)
-	}
-}
-
 func TestBaseSecurityHeaders_NoAgentTraceHeaderWhenEnvUnset(t *testing.T) {
 	t.Setenv(envvars.CliAgentTrace, "")
 	h := BaseSecurityHeaders()

internal/cmdutil/testing_test.go

@@ -46,7 +46,7 @@ func TestTestFactory_ReplacesGlobals(t *testing.T) {
 		URL:  "/test",
 		Body: "ok",
 	})
-	// Use the stub via Factory HttpClient.
+	// Use the stub via Factory HttpClient
 	httpClient, err := f.HttpClient()
 	if err != nil {
 		t.Fatalf("HttpClient() error: %v", err)

internal/cmdutil/transport.go

@@ -4,19 +4,14 @@
 package cmdutil
 
 import (
+	"context"
 	"net/http"
 	"time"
 
+	exttransport "github.com/larksuite/cli/extension/transport"
 	"github.com/larksuite/cli/internal/transport"
 )
 
-var (
-	_ transport.RoundTripperDecorator = (*RetryTransport)(nil)
-	_ transport.RoundTripperDecorator = (*UserAgentTransport)(nil)
-	_ transport.RoundTripperDecorator = (*BuildHeaderTransport)(nil)
-	_ transport.RoundTripperDecorator = (*SecurityHeaderTransport)(nil)
-)
-
 // RetryTransport is an http.RoundTripper that retries on 5xx responses
 // and network errors. MaxRetries defaults to 0 (no retries).
 type RetryTransport struct {
@@ -32,16 +27,6 @@ func (t *RetryTransport) base() http.RoundTripper {
 	return transport.Fallback()
 }
 
-func (t *RetryTransport) BaseRoundTripper() http.RoundTripper {
-	return t.base()
-}
-
-func (t *RetryTransport) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	cloned := *t
-	cloned.Base = base
-	return &cloned
-}
-
 func (t *RetryTransport) delay() time.Duration {
 	if t.Delay > 0 {
 		return t.Delay
@@ -78,19 +63,6 @@ type UserAgentTransport struct {
 	Base http.RoundTripper
 }
 
-func (t *UserAgentTransport) BaseRoundTripper() http.RoundTripper {
-	if t.Base != nil {
-		return t.Base
-	}
-	return transport.Fallback()
-}
-
-func (t *UserAgentTransport) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	cloned := *t
-	cloned.Base = base
-	return &cloned
-}
-
 func (t *UserAgentTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	req = req.Clone(req.Context())
 	req.Header.Set(HeaderUserAgent, UserAgentValue())
@@ -101,25 +73,14 @@ func (t *UserAgentTransport) RoundTrip(req *http.Request) (*http.Response, error
 }
 
 // BuildHeaderTransport is an http.RoundTripper that force-writes the
-// X-Cli-Build header before every request. It remains in the SDK transport
-// chain as a narrow defense-in-depth layer alongside SecurityHeaderTransport.
+// X-Cli-Build header before every request. Used in the SDK transport chain,
+// where SecurityHeaderTransport is not installed, to prevent extensions from
+// tampering with the build classification. The direct HTTP chain is already
+// covered by SecurityHeaderTransport iterating BaseSecurityHeaders.
 type BuildHeaderTransport struct {
 	Base http.RoundTripper
 }
 
-func (t *BuildHeaderTransport) BaseRoundTripper() http.RoundTripper {
-	if t.Base != nil {
-		return t.Base
-	}
-	return transport.Fallback()
-}
-
-func (t *BuildHeaderTransport) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	cloned := *t
-	cloned.Base = base
-	return &cloned
-}
-
 func (t *BuildHeaderTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	req = req.Clone(req.Context())
 	req.Header.Set(HeaderBuild, DetectBuildKind())
@@ -142,16 +103,6 @@ func (t *SecurityHeaderTransport) base() http.RoundTripper {
 	return transport.Fallback()
 }
 
-func (t *SecurityHeaderTransport) BaseRoundTripper() http.RoundTripper {
-	return t.base()
-}
-
-func (t *SecurityHeaderTransport) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	cloned := *t
-	cloned.Base = base
-	return &cloned
-}
-
 // RoundTrip implements http.RoundTripper.
 func (t *SecurityHeaderTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	req = req.Clone(req.Context())
@@ -169,3 +120,67 @@ func (t *SecurityHeaderTransport) RoundTrip(req *http.Request) (*http.Response,
 	}
 	return t.base().RoundTrip(req)
 }
+
+// extensionMiddleware wraps the built-in transport chain with pre/post hooks.
+// The built-in chain always executes unless the extension is an
+// exttransport.AbortableInterceptor and its PreRoundTripE returns a non-nil
+// error; it cannot otherwise be skipped or overridden.
+//
+// The original request context is restored after the pre hook to prevent
+// extensions from tampering with cancellation, deadlines, or built-in values.
+// Cloning the request isolates header/URL/etc. mutations from the caller's
+// request object; req.Body is intentionally shared — extensions that consume
+// it are responsible for rewinding (see Interceptor doc).
+type extensionMiddleware struct {
+	Base    http.RoundTripper
+	Ext     exttransport.Interceptor
+	ExtName string // Provider.Name(), captured at wrap time for *AbortError.Extension
+}
+
+// RoundTrip invokes the interceptor pre hook, restores the original context,
+// executes the built-in chain (unless aborted), then calls the post hook if
+// non-nil. When the extension implements AbortableInterceptor and returns a
+// non-nil error from PreRoundTripE, the built-in chain is skipped and an
+// *exttransport.AbortError is returned; the post hook is still invoked with
+// (nil, reason) so extensions can unwind resources.
+func (m *extensionMiddleware) RoundTrip(req *http.Request) (*http.Response, error) {
+	origCtx := req.Context()
+	req = req.Clone(origCtx)
+
+	var (
+		post    func(*http.Response, error)
+		abortEr error
+	)
+	if a, ok := m.Ext.(exttransport.AbortableInterceptor); ok {
+		post, abortEr = a.PreRoundTripE(req)
+	} else {
+		post = m.Ext.PreRoundTrip(req)
+	}
+	if abortEr != nil {
+		if post != nil {
+			post(nil, abortEr)
+		}
+		return nil, &exttransport.AbortError{Extension: m.ExtName, Reason: abortEr}
+	}
+
+	req = req.WithContext(origCtx) // restore original context
+	resp, err := m.Base.RoundTrip(req)
+	if post != nil {
+		post(resp, err)
+	}
+	return resp, err
+}
+
+// wrapWithExtension wraps transport with the registered extension middleware.
+// If no extension is registered, returns transport unchanged.
+func wrapWithExtension(transport http.RoundTripper) http.RoundTripper {
+	p := exttransport.GetProvider()
+	if p == nil {
+		return transport
+	}
+	tr := p.ResolveInterceptor(context.Background())
+	if tr == nil {
+		return transport
+	}
+	return &extensionMiddleware{Base: transport, Ext: tr, ExtName: p.Name()}
+}

internal/cmdutil/transport_test.go

@@ -14,8 +14,8 @@ import (
 	"time"
 
 	exttransport "github.com/larksuite/cli/extension/transport"
+	internalauth "github.com/larksuite/cli/internal/auth"
 	"github.com/larksuite/cli/internal/riskcontrol"
-	internaltransport "github.com/larksuite/cli/internal/transport"
 )
 
 type roundTripFunc func(*http.Request) (*http.Response, error)
@@ -91,107 +91,94 @@ func TestRetryTransport_DefaultNoRetry(t *testing.T) {
 	}
 }
 
-// buildSDKTransport policy behavior
+// ---------------------------------------------------------------------------
+// wrapSDKTransport chain composition
 // ---------------------------------------------------------------------------
 
-func TestBuildSDKTransportAppliesSecurityHeadersToEveryRequestClass(t *testing.T) {
-	exttransport.Register(nil)
-	received := make(chan http.Header, 2)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		received <- req.Header.Clone()
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(server.Close)
+func TestWrapSDKTransport_IncludesRetryTransport(t *testing.T) {
+	transport := wrapSDKTransport(riskcontrol.NewTransport(http.DefaultTransport, nil))
 
-	for _, class := range []exttransport.RequestClass{
-		exttransport.RequestClassPlatform,
-		exttransport.RequestClassExternal,
-	} {
-		client := internaltransport.ClientForRequestClass(
-			&http.Client{Transport: buildSDKTransport(nil)},
-			class,
-		)
-		resp, err := client.Get(server.URL)
-		if err != nil {
-			t.Fatal(err)
-		}
-		resp.Body.Close()
-
-		headers := <-received
-		for header, values := range BaseSecurityHeaders() {
-			if len(values) == 0 {
-				continue
-			}
-			want := values[len(values)-1]
-			if got := headers.Get(header); got != want {
-				t.Fatalf("SDK %s header %s = %q, want %q", class, header, got, want)
-			}
-		}
-	}
-}
-
-func TestBuildSDKTransport_WithExtension(t *testing.T) {
-	previous := exttransport.GetProvider()
-	interceptor := &headerCapturingInterceptor{}
-	exttransport.Register(&platformOnlyStubProvider{
-		stubTransportProvider: &stubTransportProvider{interceptor: interceptor},
-	})
-	t.Cleanup(func() { exttransport.Register(previous) })
-
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(server.Close)
-
-	client := internaltransport.ClientForRequestClass(
-		&http.Client{Transport: buildSDKTransport(nil)},
-		exttransport.RequestClassPlatform,
-	)
-	resp, err := client.Get(server.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-	if !interceptor.preCalled || !interceptor.postCalled {
-		t.Fatal("SDK platform request did not execute extension pre/post hooks")
-	}
-}
-
-func TestBuildSDKTransport_WithoutExtension(t *testing.T) {
-	previous := exttransport.GetProvider()
-	exttransport.Register(nil)
-	t.Cleanup(func() { exttransport.Register(previous) })
-
-	if _, ok := buildSDKTransport(nil).(*internaltransport.HTTPPolicyRouter); !ok {
-		t.Fatalf(
-			"buildSDKTransport() type = %T, want *transport.HTTPPolicyRouter",
-			buildSDKTransport(nil),
-		)
-	}
-}
-
-func TestBuildSDKTransportSupportsPolicyLeafCloning(t *testing.T) {
-	previous := exttransport.GetProvider()
-	exttransport.Register(nil)
-	t.Cleanup(func() { exttransport.Register(previous) })
-
-	base := &http.Transport{}
-	client := internaltransport.ClientForRequestClass(
-		&http.Client{Transport: buildSDKTransportWithBase(base, nil)},
-		exttransport.RequestClassExternal,
-	)
-	source, ok := client.Transport.(interface {
-		CloneHTTPTransport() (http.RoundTripper, *http.Transport, bool)
-	})
+	// Chain: SecurityPolicy → BuildHeader → UserAgent → Retry → RiskControl → Base
+	sec, ok := transport.(*internalauth.SecurityPolicyTransport)
 	if !ok {
-		t.Fatalf("SDK request-class transport type = %T, want clone capability", client.Transport)
+		t.Fatalf("outer transport type = %T, want *auth.SecurityPolicyTransport", transport)
 	}
-	rebuilt, concrete, ok := source.CloneHTTPTransport()
-	if !ok || rebuilt == nil || concrete == nil {
-		t.Fatal("SDK policy graph could not clone its HTTP transport leaf")
+	bh, ok := sec.Base.(*BuildHeaderTransport)
+	if !ok {
+		t.Fatalf("layer after SecurityPolicy = %T, want *BuildHeaderTransport", sec.Base)
 	}
-	if concrete == base {
-		t.Fatal("SDK policy graph reused the original HTTP transport")
+	ua, ok := bh.Base.(*UserAgentTransport)
+	if !ok {
+		t.Fatalf("layer after BuildHeader = %T, want *UserAgentTransport", bh.Base)
+	}
+	retry, ok := ua.Base.(*RetryTransport)
+	if !ok {
+		t.Fatalf("inner transport type = %T, want *RetryTransport", ua.Base)
+	}
+	if _, ok := retry.Base.(*riskcontrol.Transport); !ok {
+		t.Fatalf("layer after Retry = %T, want *riskcontrol.Transport", retry.Base)
+	}
+}
+
+func TestWrapSDKTransport_WithExtension(t *testing.T) {
+	previous := exttransport.GetProvider()
+	exttransport.Register(&stubTransportProvider{})
+	t.Cleanup(func() { exttransport.Register(previous) })
+
+	transport := wrapSDKTransport(riskcontrol.NewTransport(http.DefaultTransport, nil))
+
+	// Chain: extensionMiddleware → SecurityPolicy → BuildHeader → UserAgent → Retry → RiskControl → Base
+	mid, ok := transport.(*extensionMiddleware)
+	if !ok {
+		t.Fatalf("outer transport type = %T, want *extensionMiddleware", transport)
+	}
+	sec, ok := mid.Base.(*internalauth.SecurityPolicyTransport)
+	if !ok {
+		t.Fatalf("transport type = %T, want *auth.SecurityPolicyTransport", mid.Base)
+	}
+	bh, ok := sec.Base.(*BuildHeaderTransport)
+	if !ok {
+		t.Fatalf("layer after SecurityPolicy = %T, want *BuildHeaderTransport", sec.Base)
+	}
+	ua, ok := bh.Base.(*UserAgentTransport)
+	if !ok {
+		t.Fatalf("layer after BuildHeader = %T, want *UserAgentTransport", bh.Base)
+	}
+	retry, ok := ua.Base.(*RetryTransport)
+	if !ok {
+		t.Fatalf("innermost transport type = %T, want *RetryTransport", ua.Base)
+	}
+	if _, ok := retry.Base.(*riskcontrol.Transport); !ok {
+		t.Fatalf("layer after Retry = %T, want *riskcontrol.Transport", retry.Base)
+	}
+}
+
+func TestWrapSDKTransport_WithoutExtension(t *testing.T) {
+	previous := exttransport.GetProvider()
+	exttransport.Register(nil)
+	t.Cleanup(func() { exttransport.Register(previous) })
+
+	transport := wrapSDKTransport(riskcontrol.NewTransport(http.DefaultTransport, nil))
+
+	// Chain: SecurityPolicy → BuildHeader → UserAgent → Retry → RiskControl → Base
+	sec, ok := transport.(*internalauth.SecurityPolicyTransport)
+	if !ok {
+		t.Fatalf("outer transport type = %T, want *auth.SecurityPolicyTransport", transport)
+	}
+	bh, ok := sec.Base.(*BuildHeaderTransport)
+	if !ok {
+		t.Fatalf("layer after SecurityPolicy = %T, want *BuildHeaderTransport", sec.Base)
+	}
+	ua, ok := bh.Base.(*UserAgentTransport)
+	if !ok {
+		t.Fatalf("layer after BuildHeader = %T, want *UserAgentTransport", bh.Base)
+	}
+	retry, ok := ua.Base.(*RetryTransport)
+	if !ok {
+		t.Fatalf("inner transport type = %T, want *RetryTransport", ua.Base)
+	}
+	if _, ok := retry.Base.(*riskcontrol.Transport); !ok {
+		t.Fatalf("layer after Retry = %T, want *riskcontrol.Transport", retry.Base)
 	}
 }
 
@@ -251,7 +238,7 @@ func TestExtensionInterceptor_ExecutionOrder(t *testing.T) {
 	var base http.RoundTripper = http.DefaultTransport
 	base = &RetryTransport{Base: base}
 	base = &SecurityHeaderTransport{Base: base}
-	transport := internaltransport.WrapWithExtension(base)
+	transport := wrapWithExtension(base)
 	client := &http.Client{Transport: transport}
 
 	req, _ := http.NewRequest("GET", srv.URL, nil)
@@ -279,16 +266,14 @@ func TestExtensionInterceptor_ExecutionOrder(t *testing.T) {
 	}
 }
 
-// buildTamperingInterceptor tries to delete and spoof security headers via
-// PreRoundTrip. The SDK built-in chain must restore the real values before the
-// request leaves the process.
+// buildTamperingInterceptor tries to delete and spoof X-Cli-Build via
+// PreRoundTrip. The SDK chain's BuildHeaderTransport must restore the real
+// value before the request leaves the process.
 type buildTamperingInterceptor struct{}
 
 func (buildTamperingInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
 	req.Header.Del(HeaderBuild)
 	req.Header.Set(HeaderBuild, "ext-tampered-build")
-	req.Header.Del(HeaderSource)
-	req.Header.Set(HeaderSource, "ext-tampered-source")
 	return nil
 }
 
@@ -300,74 +285,7 @@ func (riskHeaderTamperingInterceptor) PreRoundTrip(req *http.Request) func(*http
 	return nil
 }
 
-type bootstrapPolicyTamperingInterceptor struct{}
-
-func (bootstrapPolicyTamperingInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
-	req.Header.Set(HeaderSource, "extension-value")
-	req.Header.Set(riskcontrol.HeaderOSType, "extension-value")
-	return nil
-}
-
-func TestNewDefaultInstallsSDKBootstrapSecurityPolicy(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	oldTransport := http.DefaultClient.Transport
-	oldCheckRedirect := http.DefaultClient.CheckRedirect
-	t.Cleanup(func() {
-		http.DefaultClient.Transport = oldTransport
-		http.DefaultClient.CheckRedirect = oldCheckRedirect
-	})
-
-	previous := exttransport.GetProvider()
-	exttransport.Register(&platformOnlyStubProvider{
-		stubTransportProvider: &stubTransportProvider{
-			interceptor: bootstrapPolicyTamperingInterceptor{},
-		},
-	})
-	t.Cleanup(func() { exttransport.Register(previous) })
-
-	var received http.Header
-	network := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		received = req.Header.Clone()
-		return &http.Response{
-			StatusCode: http.StatusNoContent,
-			Body:       http.NoBody,
-			Request:    req,
-		}, nil
-	})
-	http.DefaultClient.Transport = network
-	http.DefaultClient.CheckRedirect = nil
-	_ = NewDefault(nil, InvocationContext{})
-
-	req, err := http.NewRequest(
-		http.MethodPost,
-		"https://open.feishu.cn/callback/ws/endpoint",
-		strings.NewReader(`{"app_secret":"secret"}`),
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if got := received.Get(HeaderSource); got != SourceValue {
-		t.Fatalf("%s = %q, want trusted value %q", HeaderSource, got, SourceValue)
-	}
-	if got := received.Get(riskcontrol.HeaderOSType); got != "" {
-		t.Fatalf("%s = %q, want extension value stripped", riskcontrol.HeaderOSType, got)
-	}
-	if got := received.Get(HeaderBuild); got != DetectBuildKind() {
-		t.Fatalf("%s = %q, want %q", HeaderBuild, got, DetectBuildKind())
-	}
-	if got := received.Get(HeaderUserAgent); got != UserAgentValue() {
-		t.Fatalf("%s = %q, want %q", HeaderUserAgent, got, UserAgentValue())
-	}
-}
-
-func TestBuildSDKTransport_StripsExtensionRiskHeaders(t *testing.T) {
+func TestWrapSDKTransport_StripsExtensionRiskHeaders(t *testing.T) {
 	previous := exttransport.GetProvider()
 	exttransport.Register(&stubTransportProvider{interceptor: riskHeaderTamperingInterceptor{}})
 	t.Cleanup(func() { exttransport.Register(previous) })
@@ -383,11 +301,7 @@ func TestBuildSDKTransport_StripsExtensionRiskHeaders(t *testing.T) {
 	}
 	req.Header.Set("Authorization", "Bearer token")
 
-	client := internaltransport.ClientForRequestClass(
-		&http.Client{Transport: buildSDKTransportWithBase(network, nil)},
-		exttransport.RequestClassPlatform,
-	)
-	resp, err := client.Do(req)
+	resp, err := wrapSDKTransport(riskcontrol.NewTransport(network, nil)).RoundTrip(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -398,13 +312,14 @@ func TestBuildSDKTransport_StripsExtensionRiskHeaders(t *testing.T) {
 }
 
 // TestBuildHeaderTransport_SDKChain_OverridesTamperedHeader verifies that the
-// SDK chain restores both the build classification and the full security
-// header set after an extension runs.
+// X-Cli-Build header is force-written by BuildHeaderTransport in the SDK
+// transport chain, even when an extension tries to delete or spoof it. This
+// closes the gap where the SDK chain had no equivalent of
+// SecurityHeaderTransport (see design doc §3.3.3).
 func TestBuildHeaderTransport_SDKChain_OverridesTamperedHeader(t *testing.T) {
-	var receivedBuild, receivedSource string
+	var receivedBuild string
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		receivedBuild = r.Header.Get(HeaderBuild)
-		receivedSource = r.Header.Get(HeaderSource)
 		w.WriteHeader(http.StatusOK)
 	}))
 	defer srv.Close()
@@ -412,13 +327,12 @@ func TestBuildHeaderTransport_SDKChain_OverridesTamperedHeader(t *testing.T) {
 	exttransport.Register(&stubTransportProvider{interceptor: buildTamperingInterceptor{}})
 	t.Cleanup(func() { exttransport.Register(nil) })
 
-	// Replicate the SDK built-in chain inside buildSDKTransport.
+	// Replicate the SDK chain layering used by wrapSDKTransport.
 	var base http.RoundTripper = http.DefaultTransport
 	base = &RetryTransport{Base: base}
 	base = &UserAgentTransport{Base: base}
 	base = &BuildHeaderTransport{Base: base}
-	base = &SecurityHeaderTransport{Base: base}
-	transport := internaltransport.WrapWithExtension(base)
+	transport := wrapWithExtension(base)
 	client := &http.Client{Transport: transport}
 
 	req, _ := http.NewRequest("GET", srv.URL, nil)
@@ -435,9 +349,6 @@ func TestBuildHeaderTransport_SDKChain_OverridesTamperedHeader(t *testing.T) {
 	if receivedBuild != want {
 		t.Fatalf("%s = %q, want %q", HeaderBuild, receivedBuild, want)
 	}
-	if receivedSource != SourceValue {
-		t.Fatalf("%s = %q, want %q", HeaderSource, receivedSource, SourceValue)
-	}
 }
 
 // TestBuildHeaderTransport_OverridesEvenWithoutTamper verifies that even if
@@ -527,7 +438,7 @@ func TestExtensionInterceptor_ContextTamperPrevented(t *testing.T) {
 		return nil
 	})
 
-	mid := &internaltransport.ExtensionMiddleware{Base: capturer, Ext: tamperIC}
+	mid := &extensionMiddleware{Base: capturer, Ext: tamperIC}
 
 	origCtx := context.WithValue(context.Background(), testKey, "original")
 	req, _ := http.NewRequestWithContext(origCtx, "GET", srv.URL, nil)
@@ -589,7 +500,7 @@ func TestExtensionMiddleware_PreRoundTripEAbort(t *testing.T) {
 			return &http.Response{StatusCode: http.StatusOK, Body: http.NoBody}, nil
 		})
 
-		mid := &internaltransport.ExtensionMiddleware{Base: base, Ext: ic, ExtName: "stub"}
+		mid := &extensionMiddleware{Base: base, Ext: ic, ExtName: "stub"}
 		req, _ := http.NewRequest("GET", "http://example.invalid/", nil)
 		resp, err := mid.RoundTrip(req)
 
@@ -630,7 +541,7 @@ func TestExtensionMiddleware_PreRoundTripEAbort(t *testing.T) {
 			return nil, nil
 		})
 
-		mid := &internaltransport.ExtensionMiddleware{Base: base, Ext: ic, ExtName: "stub"}
+		mid := &extensionMiddleware{Base: base, Ext: ic, ExtName: "stub"}
 		req, _ := http.NewRequest("GET", "http://example.invalid/", nil)
 		_, err := mid.RoundTrip(req)
 
@@ -649,7 +560,7 @@ func TestExtensionMiddleware_PreRoundTripEHappyPath(t *testing.T) {
 		return &http.Response{StatusCode: http.StatusOK, Body: http.NoBody}, nil
 	})
 
-	mid := &internaltransport.ExtensionMiddleware{Base: base, Ext: ic, ExtName: "stub"}
+	mid := &extensionMiddleware{Base: base, Ext: ic, ExtName: "stub"}
 	req, _ := http.NewRequest("GET", "http://example.invalid/", nil)
 	resp, err := mid.RoundTrip(req)
 	if err != nil {

internal/core/types.go

@@ -3,10 +3,7 @@
 
 package core
 
-import (
-	"net/url"
-	"strings"
-)
+import "strings"
 
 // LarkBrand represents the Lark platform brand.
 // "feishu" targets China-mainland, "lark" targets international.
@@ -66,39 +63,3 @@ func ResolveEndpoints(brand LarkBrand) Endpoints {
 func ResolveOpenBaseURL(brand LarkBrand) string {
 	return ResolveEndpoints(brand).Open
 }
-
-var platformEndpointHosts = func() map[string]struct{} {
-	hosts := make(map[string]struct{})
-	for _, brand := range []LarkBrand{BrandFeishu, BrandLark} {
-		endpoints := ResolveEndpoints(brand)
-		for _, rawURL := range []string{endpoints.Open, endpoints.Accounts, endpoints.MCP, endpoints.AppLink} {
-			parsed, err := url.Parse(rawURL)
-			if err == nil && parsed.Hostname() != "" {
-				hosts[strings.ToLower(parsed.Hostname())] = struct{}{}
-			}
-		}
-	}
-	return hosts
-}()
-
-// IsPlatformEndpointHost reports whether hostname exactly matches one of the
-// endpoint hosts produced by ResolveEndpoints. It intentionally does not use a
-// suffix match: lookalike external domains must never enter the platform
-// transport extension.
-func IsPlatformEndpointHost(hostname string) bool {
-	_, ok := platformEndpointHosts[strings.ToLower(hostname)]
-	return ok
-}
-
-// IsPlatformEndpointURL reports whether candidate uses a secure origin for a
-// configured platform endpoint. Non-TLS and non-standard-port lookalikes are
-// excluded even when their hostname matches.
-func IsPlatformEndpointURL(candidate *url.URL) bool {
-	if candidate == nil || !strings.EqualFold(candidate.Scheme, "https") {
-		return false
-	}
-	if port := candidate.Port(); port != "" && port != "443" {
-		return false
-	}
-	return IsPlatformEndpointHost(candidate.Hostname())
-}

internal/core/types_test.go

@@ -3,11 +3,7 @@
 
 package core
 
-import (
-	"net/url"
-	"reflect"
-	"testing"
-)
+import "testing"
 
 func TestResolveEndpoints_Feishu(t *testing.T) {
 	ep := ResolveEndpoints(BrandFeishu)
@@ -95,85 +91,3 @@ func TestResolveEndpoints_NormalizesBrand(t *testing.T) {
 		t.Errorf("ResolveEndpoints(unexpected).Open = %q, want the feishu default", got)
 	}
 }
-
-func TestIsPlatformEndpointHost_ExactMatchOnly(t *testing.T) {
-	for _, host := range []string{
-		"open.feishu.cn",
-		"accounts.feishu.cn",
-		"mcp.feishu.cn",
-		"applink.feishu.cn",
-		"open.larksuite.com",
-		"accounts.larksuite.com",
-		"mcp.larksuite.com",
-		"applink.larksuite.com",
-	} {
-		if !IsPlatformEndpointHost(host) {
-			t.Errorf("IsPlatformEndpointHost(%q) = false, want true", host)
-		}
-	}
-
-	for _, host := range []string{
-		"example.com",
-		"open.feishu.cn.example.com",
-		"notopen.feishu.cn",
-		"",
-	} {
-		if IsPlatformEndpointHost(host) {
-			t.Errorf("IsPlatformEndpointHost(%q) = true, want false", host)
-		}
-	}
-}
-
-func TestIsPlatformEndpointHost_CoversEveryResolvedEndpoint(t *testing.T) {
-	for _, brand := range []LarkBrand{BrandFeishu, BrandLark} {
-		endpoints := reflect.ValueOf(ResolveEndpoints(brand))
-		for i := 0; i < endpoints.NumField(); i++ {
-			rawURL := endpoints.Field(i).String()
-			parsed, err := url.Parse(rawURL)
-			if err != nil {
-				t.Fatalf("ResolveEndpoints(%q) field %d URL %q: %v", brand, i, rawURL, err)
-			}
-			if !IsPlatformEndpointHost(parsed.Hostname()) {
-				t.Errorf("ResolveEndpoints(%q) field %d host %q is missing from the platform transport boundary", brand, i, parsed.Hostname())
-			}
-		}
-	}
-}
-
-func TestIsPlatformEndpointURL_RequiresSecureStandardOrigin(t *testing.T) {
-	if IsPlatformEndpointURL(nil) {
-		t.Error("IsPlatformEndpointURL(nil) = true, want false")
-	}
-	uppercaseScheme := &url.URL{Scheme: "HTTPS", Host: "open.feishu.cn", Path: "/path"}
-	if !IsPlatformEndpointURL(uppercaseScheme) {
-		t.Error("IsPlatformEndpointURL() rejected uppercase HTTPS scheme")
-	}
-
-	for _, rawURL := range []string{
-		"http://open.feishu.cn/path",
-		"https://open.feishu.cn:8443/path",
-		"https://open.feishu.cn.example.com/path",
-	} {
-		candidate, err := url.Parse(rawURL)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if IsPlatformEndpointURL(candidate) {
-			t.Errorf("IsPlatformEndpointURL(%q) = true, want false", rawURL)
-		}
-	}
-
-	for _, rawURL := range []string{
-		"https://open.feishu.cn/path",
-		"https://open.feishu.cn:443/path",
-		"https://OPEN.FEISHU.CN/path",
-	} {
-		candidate, err := url.Parse(rawURL)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !IsPlatformEndpointURL(candidate) {
-			t.Errorf("IsPlatformEndpointURL(%q) = false, want true", rawURL)
-		}
-	}
-}

internal/envvars/read_test.go

@@ -16,18 +16,16 @@ func TestAgentName_EmptyWhenEnvUnset(t *testing.T) {
 }
 
 func TestAgentName_ReturnsCleanValue(t *testing.T) {
-	const agentName = "sample-agent"
-	t.Setenv(CliAgentName, agentName)
-	if got := AgentName(); got != agentName {
-		t.Fatalf("AgentName() = %q, want %q", got, agentName)
+	t.Setenv(CliAgentName, "claude-code")
+	if got := AgentName(); got != "claude-code" {
+		t.Fatalf("AgentName() = %q, want %q", got, "claude-code")
 	}
 }
 
 func TestAgentName_TrimsWhitespace(t *testing.T) {
-	const agentName = "sample-agent"
-	t.Setenv(CliAgentName, "  "+agentName+"  ")
-	if got := AgentName(); got != agentName {
-		t.Fatalf("AgentName() = %q, want %q (whitespace trimmed)", got, agentName)
+	t.Setenv(CliAgentName, "  cursor  ")
+	if got := AgentName(); got != "cursor" {
+		t.Fatalf("AgentName() = %q, want %q (whitespace trimmed)", got, "cursor")
 	}
 }
 

internal/httpmock/registry.go

@@ -38,10 +38,6 @@ type Stub struct {
 	// matches after the first hit. Each match appends to CapturedBodies.
 	Reusable bool
 
-	// Optional (optional): when true, Verify does not require this stub to be
-	// matched. Useful for negative assertions via OnMatch.
-	Optional bool
-
 	// CapturedHeaders records the request headers of the matched request.
 	// Populated after RoundTrip matches this stub.
 	CapturedHeaders http.Header
@@ -141,9 +137,6 @@ func (r *Registry) Verify(t testing.TB) {
 		if s.matched {
 			continue
 		}
-		if s.Optional {
-			continue
-		}
 		// Reusable stubs never set s.matched; treat any captured hit as a match.
 		if s.Reusable && len(s.CapturedBodies) > 0 {
 			continue

internal/qualitygate/config/README.md

@@ -45,18 +45,6 @@ Adding a new row requires approval from the matching CODEOWNERS or quality gate
 
 `legacy-commands.txt` only covers hand-authored legacy commands. Generated OpenAPI service commands are intentionally excluded from `command-manifest.json`; they are included in `command-index.json` only so command references can be checked against the real CLI surface.
 
-## Public Domain Allowlists
-
-`internal/qualitygate/config/allowlists/public-domains.txt` contains supported public hostnames approved for Go source. `fixture-domains.txt` contains test-only hostnames used by `*_test.go`, the repository-root `tests/` directory, or any `testdata/` directory; fixture entries do not apply to production Go files or `skills/`.
-
-Keep one lowercase exact hostname per line, sorted alphabetically. Wildcards, suffix rules, duplicates, schemes, ports, and paths are rejected; approving `larkoffice.com` does not approve its subdomains.
-
-RFC 2606 reserves the `.test`, `.example`, `.invalid`, and `.localhost` namespaces plus the exact names `example.com`, `example.net`, and `example.org`. These names are accepted without an allowlist entry and must not be listed.
-
-Every public entry needs a current non-fixture Go use, evidence that it is a supported public endpoint, and CODEOWNER approval. Other test-only hostnames belong in the fixture list. Tenant-specific, private-control-plane, and internal API hostnames are not eligible.
-
-`lint/domaincontract` validates both lists and scans complete Go files. In CI, unapproved-host findings are limited to values whose expressions intersect added lines; list validation and unused-entry checks remain repository-wide. See `lint/README.md` for scanner semantics.
-
 ## Semantic Blocker Policy
 
 The semantic reviewer can propose findings, but the local gatekeeper recomputes whether each finding is reproducible from `facts.json`. A finding blocks only when all of these are true:

internal/qualitygate/config/allowlists/fixture-domains.txt

@@ -1,24 +0,0 @@
-# Exact test-only hostnames. Keep sorted.
-abc.feishu.cn
-attacker.example.com
-bytedance.feishu.cn
-cdn.feishu.cn
-evil.example.com
-example.feishu.cn
-example.larkoffice.com
-example.larksuite.com
-feishu.cn
-feishu.doubao.com
-gateway.docker.internal
-host.containers.internal
-host.docker.internal
-host.lima.internal
-lf3-static.bytednsdoc.com
-meetings.feishu.cn
-meetings.larksuite.com
-p3-lark-file.byteimg.com
-passport.feishu.cn
-sample.feishu.cn
-x.feishu.cn
-xxx.feishu.cn
-xxx.larksuite.com

internal/qualitygate/config/allowlists/public-domains.txt

@@ -1,18 +0,0 @@
-# Exact public hostnames. Keep sorted.
-accounts.feishu.cn
-accounts.larksuite.com
-applink.feishu.cn
-applink.larksuite.com
-ark.ap-southeast.bytepluses.com
-github.com
-larkoffice.com
-lf-larkemail.bytetos.com
-mcp.feishu.cn
-mcp.larksuite.com
-open.feishu.cn
-open.larksuite.com
-registry.npmjs.org
-registry.npmmirror.com
-sf16-sg.tiktokcdn.com
-www.feishu.cn
-www.larksuite.com

internal/registry/remote.go

@@ -180,8 +180,8 @@ func saveCachedMerged(data []byte, cm CacheMeta) error {
 // localVersion is sent as data_version query param for server-side version comparison.
 // Returns (data, reg, err). A nil reg means the version is unchanged (not modified).
 func fetchRemoteMerged(localVersion string) (data []byte, reg *MergedRegistry, err error) {
-	// Remote metadata is platform traffic and must honor both the shared proxy
-	// configuration and the registered platform transport extension.
+	// Route through the shared proxy-plugin-aware transport so remote API
+	// definition fetches honor proxy plugin mode instead of bypassing it.
 	client := transport.NewHTTPClient(fetchTimeout)
 	req, err := http.NewRequest("GET", remoteMetaURL(localVersion), nil)
 	if err != nil {

internal/riskcontrol/transport.go

@@ -12,8 +12,6 @@ import (
 	internaltransport "github.com/larksuite/cli/internal/transport"
 )
 
-var _ internaltransport.RoundTripperDecorator = (*Transport)(nil)
-
 const (
 	HeaderProductModel = "X-Agent-Device-Type"
 	HeaderOSType       = "X-Agent-Os-Type"
@@ -42,28 +40,6 @@ func NewTransport(next http.RoundTripper, source Source) *Transport {
 	}
 }
 
-// BaseRoundTripper exposes the network transport so policy routers can clone
-// and rebuild the complete decorator graph without dropping risk control.
-func (t *Transport) BaseRoundTripper() http.RoundTripper {
-	if t == nil || t.next == nil {
-		return internaltransport.Fallback()
-	}
-	return t.next
-}
-
-// WithBaseRoundTripper returns an equivalent risk-control boundary over base.
-func (t *Transport) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	if t == nil {
-		return NewTransport(base, nil)
-	}
-	cloned := *t
-	if base == nil {
-		base = internaltransport.Fallback()
-	}
-	cloned.next = base
-	return &cloned
-}
-
 // RoundTrip implements http.RoundTripper.
 func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
 	req = req.Clone(req.Context())

internal/transport/config.go

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 // Package transport owns how the CLI assembles its outbound HTTP transport: the
-// shared base RoundTripper (Shared/Fallback and the HTTP client constructors), the LARK_CLI_NO_PROXY
+// shared base RoundTripper (Shared/Fallback/NewHTTPClient), the LARK_CLI_NO_PROXY
 // direct-egress clone, and the ~/.lark-cli/proxy_config.json proxy-plugin mode.
 //
 // Proxy-plugin mode forces all outbound HTTP(S) requests through a fixed loopback

internal/transport/default_client.go

@@ -1,258 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package transport
-
-import (
-	"context"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-
-	larkws "github.com/larksuite/oapi-sdk-go/v3/ws"
-
-	"github.com/larksuite/cli/errs"
-	exttransport "github.com/larksuite/cli/extension/transport"
-	"github.com/larksuite/cli/internal/core"
-)
-
-type requestMatcher func(*http.Request) bool
-type transportPolicyBuilder func(http.RoundTripper) http.RoundTripper
-
-type sdkBootstrapRedirectContextKey struct{}
-
-var (
-	// larkws pins this client during package initialization.
-	sdkBootstrapHTTPClient = http.DefaultClient
-	installDefaultClientMu sync.Mutex
-)
-
-// sdkBootstrapTransport applies the platform HTTP policy only to dependency
-// bootstrap requests selected by match. Unmatched DefaultClient traffic is
-// delegated directly to the previous transport.
-type sdkBootstrapTransport struct {
-	base                http.RoundTripper
-	match               requestMatcher
-	buildPlatformPolicy transportPolicyBuilder
-
-	policyMu sync.RWMutex
-}
-
-func (t *sdkBootstrapTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	if !t.isBootstrapRequest(req) {
-		return t.fallbackTransport().RoundTrip(req)
-	}
-
-	base := t.base
-	if base == nil {
-		// Resolve Shared lazily so bridge installation never initializes
-		// workspace-scoped proxy state ahead of workspace selection.
-		base = Shared()
-	}
-	buildPlatformPolicy := t.platformPolicyBuilder()
-	if buildPlatformPolicy == nil {
-		return nil, errs.NewInternalError(
-			errs.SubtypeUnknown,
-			"SDK bootstrap transport policy is not configured",
-		)
-	}
-	base = buildPlatformPolicy(base)
-	if base == nil {
-		return nil, errs.NewInternalError(
-			errs.SubtypeUnknown,
-			"SDK bootstrap transport policy returned a nil transport",
-		)
-	}
-
-	// Resolve extensions per hop so redirects retain platform policy.
-	extended := WrapWithExtensionForClass(base, exttransport.RequestClassPlatform)
-	guarded := &sameOriginRedirectTransport{base: extended}
-	return guarded.RoundTrip(req)
-}
-
-func (t *sdkBootstrapTransport) platformPolicyBuilder() transportPolicyBuilder {
-	t.policyMu.RLock()
-	defer t.policyMu.RUnlock()
-	return t.buildPlatformPolicy
-}
-
-func (t *sdkBootstrapTransport) setPlatformPolicyBuilder(build transportPolicyBuilder) {
-	t.policyMu.Lock()
-	t.buildPlatformPolicy = build
-	t.policyMu.Unlock()
-}
-
-func (t *sdkBootstrapTransport) isBootstrapRequest(req *http.Request) bool {
-	if req == nil {
-		return false
-	}
-	if _, redirected := req.Context().Value(sdkBootstrapRedirectContextKey{}).(struct{}); redirected {
-		return true
-	}
-	return t.match != nil && t.match(req)
-}
-
-func (t *sdkBootstrapTransport) fallbackTransport() http.RoundTripper {
-	if t.base != nil {
-		return t.base
-	}
-	// Preserve net/http's dynamic nil-Transport fallback.
-	return http.DefaultTransport
-}
-
-// sameOriginRedirectTransport rejects redirects before net/http can replay a
-// bootstrap request to a different logical origin.
-type sameOriginRedirectTransport struct {
-	base http.RoundTripper
-}
-
-func (t *sameOriginRedirectTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	resp, err := t.base.RoundTrip(req)
-	if err != nil || resp == nil || !isFollowedRedirect(resp.StatusCode) {
-		return resp, err
-	}
-
-	location := resp.Header.Get("Location")
-	if location == "" {
-		return resp, nil
-	}
-	target, parseErr := req.URL.Parse(location)
-	if parseErr != nil {
-		if resp.Body != nil {
-			_ = resp.Body.Close()
-		}
-		return nil, errs.NewInternalError(
-			errs.SubtypeInvalidResponse,
-			"platform request returned an invalid redirect location: %v",
-			parseErr,
-		).WithCause(parseErr)
-	}
-	if sameOrigin(req.URL, target) {
-		return resp, nil
-	}
-
-	if resp.Body != nil {
-		_ = resp.Body.Close()
-	}
-	return nil, errs.NewSecurityPolicyError(
-		errs.SubtypeAccessDenied,
-		"platform bootstrap blocked cross-origin redirect from %q to %q",
-		originName(req.URL),
-		originName(target),
-	)
-}
-
-// sdkBootstrapRedirectPolicy preserves the prior hook and marks each redirect hop.
-func sdkBootstrapRedirectPolicy(
-	match requestMatcher,
-	previous func(*http.Request, []*http.Request) error,
-) func(*http.Request, []*http.Request) error {
-	return func(req *http.Request, via []*http.Request) error {
-		if previous != nil {
-			if err := previous(req, via); err != nil {
-				return err
-			}
-		} else if len(via) >= 10 {
-			// Retain net/http's default redirect limit.
-			return errs.NewNetworkError(
-				errs.SubtypeNetworkTransport,
-				"stopped after 10 redirects",
-			)
-		}
-
-		if req == nil || len(via) == 0 || match == nil || !match(via[0]) {
-			return nil
-		}
-
-		ctx := context.WithValue(req.Context(), sdkBootstrapRedirectContextKey{}, struct{}{})
-		*req = *req.WithContext(ctx)
-		return nil
-	}
-}
-
-func originName(candidate *url.URL) string {
-	if candidate == nil {
-		return ""
-	}
-	return strings.ToLower(candidate.Scheme) + "://" + candidate.Host
-}
-
-func sameOrigin(left, right *url.URL) bool {
-	if left == nil || right == nil {
-		return false
-	}
-	return strings.EqualFold(left.Scheme, right.Scheme) &&
-		strings.EqualFold(left.Hostname(), right.Hostname()) &&
-		originPort(left) == originPort(right)
-}
-
-func originPort(candidate *url.URL) string {
-	if port := candidate.Port(); port != "" {
-		return port
-	}
-	switch strings.ToLower(candidate.Scheme) {
-	case "http":
-		return "80"
-	case "https":
-		return "443"
-	default:
-		return ""
-	}
-}
-
-func isFollowedRedirect(status int) bool {
-	switch status {
-	case http.StatusMovedPermanently,
-		http.StatusFound,
-		http.StatusSeeOther,
-		http.StatusTemporaryRedirect,
-		http.StatusPermanentRedirect:
-		return true
-	default:
-		return false
-	}
-}
-
-// InstallSDKTransportBridge wraps larkws's captured HTTP bootstrap client. All
-// requests through that client hit the bridge, but only matched bootstrap
-// traffic uses platform policy. The SDK owns the subsequent WebSocket dial,
-// which does not use this net/http transport.
-func InstallSDKTransportBridge(buildPlatformPolicy func(http.RoundTripper) http.RoundTripper) {
-	installDefaultClientMu.Lock()
-	defer installDefaultClientMu.Unlock()
-	installSDKTransportBridge(
-		sdkBootstrapHTTPClient,
-		isSDKWebSocketBootstrapRequest,
-		buildPlatformPolicy,
-	)
-}
-
-func isSDKWebSocketBootstrapRequest(req *http.Request) bool {
-	return req != nil &&
-		req.Method == http.MethodPost &&
-		core.IsPlatformEndpointURL(req.URL) &&
-		req.URL.Path == larkws.GenEndpointUri
-}
-
-func installSDKTransportBridge(
-	client *http.Client,
-	match requestMatcher,
-	buildPlatformPolicy transportPolicyBuilder,
-) {
-	if client == nil {
-		return
-	}
-	if existing, ok := client.Transport.(*sdkBootstrapTransport); ok {
-		existing.setPlatformPolicyBuilder(buildPlatformPolicy)
-		return
-	}
-	base := client.Transport
-	previousRedirect := client.CheckRedirect
-	client.Transport = &sdkBootstrapTransport{
-		base:                base,
-		match:               match,
-		buildPlatformPolicy: buildPlatformPolicy,
-	}
-	client.CheckRedirect = sdkBootstrapRedirectPolicy(match, previousRedirect)
-}

internal/transport/extension.go

@@ -1,120 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package transport
-
-import (
-	"context"
-	"net/http"
-
-	exttransport "github.com/larksuite/cli/extension/transport"
-)
-
-var _ RoundTripperDecorator = (*ExtensionMiddleware)(nil)
-
-type resolvedExtension struct {
-	provider    exttransport.Provider
-	interceptor exttransport.Interceptor
-}
-
-func resolveExtension() *resolvedExtension {
-	p := exttransport.GetProvider()
-	if p == nil {
-		return nil
-	}
-	interceptor := p.ResolveInterceptor(context.Background())
-	if interceptor == nil {
-		return nil
-	}
-	return &resolvedExtension{provider: p, interceptor: interceptor}
-}
-
-func (e *resolvedExtension) wrap(base http.RoundTripper, class exttransport.RequestClass, enforceScope bool) http.RoundTripper {
-	if base == nil {
-		base = Shared()
-	}
-	if e == nil {
-		return base
-	}
-	if enforceScope {
-		if scoped, ok := e.provider.(exttransport.ScopedProvider); ok && !scoped.SupportsRequestClass(class) {
-			return base
-		}
-	}
-	return &ExtensionMiddleware{Base: base, Ext: e.interceptor, ExtName: e.provider.Name()}
-}
-
-// ExtensionMiddleware wraps the built-in transport chain with extension
-// pre/post hooks. The built-in chain always executes unless an
-// exttransport.AbortableInterceptor rejects the request.
-//
-// The original request context is restored after the pre hook to prevent an
-// extension from replacing cancellation, deadlines, or built-in values. The
-// request is cloned so URL and header mutations do not alter the caller's
-// request object. The body remains shared; interceptors that consume it must
-// restore it before returning.
-type ExtensionMiddleware struct {
-	Base    http.RoundTripper
-	Ext     exttransport.Interceptor
-	ExtName string
-}
-
-// BaseRoundTripper returns the wrapped built-in transport chain.
-func (m *ExtensionMiddleware) BaseRoundTripper() http.RoundTripper {
-	if m.Base == nil {
-		return Shared()
-	}
-	return m.Base
-}
-
-// WithBaseRoundTripper clones the middleware over base.
-func (m *ExtensionMiddleware) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	cloned := *m
-	cloned.Base = base
-	return &cloned
-}
-
-// RoundTrip invokes the extension pre hook, the wrapped transport, and then
-// the optional post hook. Abortable interceptors can stop the request before
-// the wrapped transport is called.
-func (m *ExtensionMiddleware) RoundTrip(req *http.Request) (*http.Response, error) {
-	origCtx := req.Context()
-	req = req.Clone(origCtx)
-
-	var (
-		post     func(*http.Response, error)
-		abortErr error
-	)
-	if a, ok := m.Ext.(exttransport.AbortableInterceptor); ok {
-		post, abortErr = a.PreRoundTripE(req)
-	} else {
-		post = m.Ext.PreRoundTrip(req)
-	}
-	if abortErr != nil {
-		if post != nil {
-			post(nil, abortErr)
-		}
-		return nil, &exttransport.AbortError{Extension: m.ExtName, Reason: abortErr}
-	}
-
-	req = req.WithContext(origCtx)
-	resp, err := m.BaseRoundTripper().RoundTrip(req)
-	if post != nil {
-		post(resp, err)
-	}
-	return resp, err
-}
-
-// WrapWithExtension wraps base with the currently registered transport
-// extension. With no registered provider or no resolved interceptor, base is
-// returned unchanged.
-func WrapWithExtension(base http.RoundTripper) http.RoundTripper {
-	return resolveExtension().wrap(base, "", false)
-}
-
-// WrapWithExtensionForClass wraps base only when the registered provider
-// supports class. Providers without the optional ScopedProvider interface keep
-// their historical all-request behavior.
-func WrapWithExtensionForClass(base http.RoundTripper, class exttransport.RequestClass) http.RoundTripper {
-	return resolveExtension().wrap(base, class, true)
-}

internal/transport/extension_test.go

@@ -1,924 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package transport
-
-import (
-	"context"
-	"errors"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strconv"
-	"strings"
-	"sync/atomic"
-	"testing"
-
-	larkws "github.com/larksuite/oapi-sdk-go/v3/ws"
-
-	"github.com/larksuite/cli/errs"
-	exttransport "github.com/larksuite/cli/extension/transport"
-)
-
-type testProvider struct {
-	interceptor  exttransport.Interceptor
-	resolveCalls *int
-}
-
-func (p testProvider) Name() string { return "test-provider" }
-
-func (p testProvider) ResolveInterceptor(context.Context) exttransport.Interceptor {
-	if p.resolveCalls != nil {
-		*p.resolveCalls++
-	}
-	return p.interceptor
-}
-
-type scopedTestProvider struct {
-	testProvider
-	supported exttransport.RequestClass
-}
-
-func (p scopedTestProvider) SupportsRequestClass(class exttransport.RequestClass) bool {
-	return class == p.supported
-}
-
-type testHeaderInterceptor struct {
-	calls int
-}
-
-func (i *testHeaderInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
-	i.calls++
-	req.Header.Set("X-Test-Platform", "routed")
-	return nil
-}
-
-type abortingTestInterceptor struct {
-	reason error
-	post   func(*http.Response, error)
-}
-
-func (i *abortingTestInterceptor) PreRoundTrip(*http.Request) func(*http.Response, error) {
-	panic("PreRoundTrip called for abortable interceptor")
-}
-
-func (i *abortingTestInterceptor) PreRoundTripE(*http.Request) (func(*http.Response, error), error) {
-	return i.post, i.reason
-}
-
-func TestLegacyProviderKeepsAllRequestBehavior(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	unsetProxyPluginEnv(t)
-	resetProxyPluginState()
-	t.Setenv(EnvNoProxy, "")
-
-	interceptor := &testHeaderInterceptor{}
-	previousProvider := exttransport.GetProvider()
-	exttransport.Register(testProvider{interceptor: interceptor})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	received := make(chan string, 2)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		received <- req.Header.Get("X-Test-Platform")
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(server.Close)
-
-	for _, client := range []*http.Client{
-		ClientForRequestClass(NewHTTPClient(0), exttransport.RequestClassPlatform),
-		NewExternalHTTPClient(0),
-	} {
-		resp, err := client.Get(server.URL)
-		if err != nil {
-			t.Fatal(err)
-		}
-		resp.Body.Close()
-	}
-
-	if got := <-received; got != "routed" {
-		t.Fatalf("platform request header = %q, want routed", got)
-	}
-	if got := <-received; got != "routed" {
-		t.Fatalf("external request header = %q, want routed for legacy provider", got)
-	}
-	if interceptor.calls != 2 {
-		t.Fatalf("extension calls = %d, want exactly 2", interceptor.calls)
-	}
-}
-
-func TestScopedProviderOnlyRunsForSupportedRequestClass(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	unsetProxyPluginEnv(t)
-	resetProxyPluginState()
-	t.Setenv(EnvNoProxy, "")
-
-	interceptor := &testHeaderInterceptor{}
-	previousProvider := exttransport.GetProvider()
-	exttransport.Register(scopedTestProvider{
-		testProvider: testProvider{interceptor: interceptor},
-		supported:    exttransport.RequestClassPlatform,
-	})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	received := make(chan string, 2)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		received <- req.Header.Get("X-Test-Platform")
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(server.Close)
-
-	clients := []*http.Client{
-		ClientForRequestClass(NewHTTPClient(0), exttransport.RequestClassPlatform),
-		NewExternalHTTPClient(0),
-	}
-	for _, client := range clients {
-		resp, err := client.Get(server.URL)
-		if err != nil {
-			t.Fatal(err)
-		}
-		resp.Body.Close()
-	}
-
-	if got := <-received; got != "routed" {
-		t.Fatalf("platform request header = %q, want routed", got)
-	}
-	if got := <-received; got != "" {
-		t.Fatalf("external request received scoped provider header %q", got)
-	}
-	if interceptor.calls != 1 {
-		t.Fatalf("extension calls = %d, want exactly 1", interceptor.calls)
-	}
-}
-
-func TestHTTPPolicyRouterResolvesProviderOnce(t *testing.T) {
-	resolveCalls := 0
-	previousProvider := exttransport.GetProvider()
-	exttransport.Register(testProvider{
-		interceptor:  &testHeaderInterceptor{},
-		resolveCalls: &resolveCalls,
-	})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-	})
-	_ = NewHTTPPolicyRouter(base, base)
-
-	if resolveCalls != 1 {
-		t.Fatalf("ResolveInterceptor() calls = %d, want 1 per router", resolveCalls)
-	}
-}
-
-func TestSDKBootstrapBridgeBlocksCrossOriginRedirectAfterSameOriginHop(t *testing.T) {
-	var externalCalls atomic.Int32
-	var relayBody string
-	base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		if req.URL.Host == "external.example" {
-			externalCalls.Add(1)
-			return noContentResponse(req), nil
-		}
-		switch req.URL.Path {
-		case "/bootstrap":
-			return redirectResponse(req, http.StatusTemporaryRedirect, "/relay"), nil
-		case "/relay":
-			body, err := io.ReadAll(req.Body)
-			if err != nil {
-				return nil, err
-			}
-			relayBody = string(body)
-			return redirectResponse(
-				req,
-				http.StatusPermanentRedirect,
-				"https://external.example/target",
-			), nil
-		default:
-			return noContentResponse(req), nil
-		}
-	})
-
-	client := &http.Client{Transport: base}
-	installSDKTransportBridge(client, func(req *http.Request) bool {
-		return req.URL != nil && req.URL.Path == "/bootstrap"
-	}, identityTransportPolicy)
-
-	const secret = "app_secret=secret"
-	req, err := http.NewRequest(
-		http.MethodPost,
-		"https://platform.example/bootstrap",
-		strings.NewReader(secret),
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if resp != nil && resp.Body != nil {
-		resp.Body.Close()
-	}
-	if err == nil || !strings.Contains(err.Error(), "cross-origin redirect") {
-		t.Fatalf("Do() error = %v, want cross-origin redirect rejection", err)
-	}
-	if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryPolicy ||
-		problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("Do() problem = %#v, %v; want policy/access_denied", problem, ok)
-	}
-	if relayBody != secret {
-		t.Fatalf("same-origin relay body = %q, want %q", relayBody, secret)
-	}
-	if got := externalCalls.Load(); got != 0 {
-		t.Fatalf("cross-origin target calls = %d, want 0", got)
-	}
-}
-
-func TestSDKBootstrapRedirectGuardClassifiesInvalidLocation(t *testing.T) {
-	base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		return redirectResponse(req, http.StatusFound, "%"), nil
-	})
-	client := &http.Client{Transport: &sameOriginRedirectTransport{base: base}}
-	resp, err := client.Get("https://platform.example/bootstrap")
-	if resp != nil && resp.Body != nil {
-		resp.Body.Close()
-	}
-	if err == nil || !strings.Contains(err.Error(), "invalid redirect location") {
-		t.Fatalf("Do() error = %v, want invalid redirect rejection", err)
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryInternal || problem.Subtype != errs.SubtypeInvalidResponse {
-		t.Fatalf("Do() problem = %#v, %v; want internal/invalid_response", problem, ok)
-	}
-}
-
-type redirectPolicyInterceptor struct {
-	calls int
-}
-
-func (i *redirectPolicyInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
-	i.calls++
-	req.Header.Set("X-Extension-Hop", strconv.Itoa(i.calls))
-	req.Header.Set("X-Reserved", "extension")
-	return nil
-}
-
-func TestSDKBootstrapBridgeRetainsPoliciesAcrossSameOriginRedirect(t *testing.T) {
-	previousProvider := exttransport.GetProvider()
-	interceptor := &redirectPolicyInterceptor{}
-	exttransport.Register(scopedTestProvider{
-		testProvider: testProvider{interceptor: interceptor},
-		supported:    exttransport.RequestClassPlatform,
-	})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	var finalHeaders http.Header
-	base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		switch req.URL.Path {
-		case "/bootstrap":
-			return redirectResponse(req, http.StatusTemporaryRedirect, "/next"), nil
-		case "/next":
-			finalHeaders = req.Header.Clone()
-			return noContentResponse(req), nil
-		default:
-			return noContentResponse(req), nil
-		}
-	})
-
-	builtInCalls := 0
-	client := &http.Client{Transport: base}
-	installSDKTransportBridge(
-		client,
-		func(req *http.Request) bool {
-			return req.URL != nil && req.URL.Path == "/bootstrap"
-		},
-		func(base http.RoundTripper) http.RoundTripper {
-			return roundTripFunc(func(req *http.Request) (*http.Response, error) {
-				builtInCalls++
-				req = req.Clone(req.Context())
-				req.Header.Set("X-Builtin-Hop", strconv.Itoa(builtInCalls))
-				req.Header.Set("X-Reserved", "trusted")
-				return base.RoundTrip(req)
-			})
-		},
-	)
-
-	req, err := http.NewRequest(
-		http.MethodPost,
-		"https://platform.example/bootstrap",
-		strings.NewReader("body"),
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if finalHeaders == nil {
-		t.Fatal("same-origin redirect target was not called")
-	}
-	if interceptor.calls != 2 {
-		t.Fatalf("extension calls = %d, want 2", interceptor.calls)
-	}
-	if builtInCalls != 2 {
-		t.Fatalf("built-in policy calls = %d, want 2", builtInCalls)
-	}
-	if got := finalHeaders.Get("X-Extension-Hop"); got != "2" {
-		t.Fatalf("final X-Extension-Hop = %q, want 2", got)
-	}
-	if got := finalHeaders.Get("X-Builtin-Hop"); got != "2" {
-		t.Fatalf("final X-Builtin-Hop = %q, want 2", got)
-	}
-	if got := finalHeaders.Get("X-Reserved"); got != "trusted" {
-		t.Fatalf("final X-Reserved = %q, want trusted built-in value", got)
-	}
-}
-
-type redirectRewriteInterceptor struct {
-	target       *url.URL
-	postLocation string
-	calls        int
-}
-
-func (i *redirectRewriteInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
-	i.calls++
-	req.URL.Scheme = i.target.Scheme
-	req.URL.Host = i.target.Host
-	if i.postLocation == "" {
-		return nil
-	}
-	return func(resp *http.Response, err error) {
-		if err == nil && resp != nil && isFollowedRedirect(resp.StatusCode) {
-			resp.Header.Set("Location", i.postLocation)
-		}
-	}
-}
-
-func TestSDKBootstrapRedirectGuardUsesLogicalURLAfterExtensionRewrite(t *testing.T) {
-	sidecarURL, err := url.Parse("https://sidecar.example")
-	if err != nil {
-		t.Fatal(err)
-	}
-	sidecarCalls := 0
-	base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		if req.URL.Host != sidecarURL.Host {
-			t.Fatalf("network host = %q, want extension target %q", req.URL.Host, sidecarURL.Host)
-		}
-		sidecarCalls++
-		switch req.URL.Path {
-		case "/bootstrap":
-			return redirectResponse(
-				req,
-				http.StatusTemporaryRedirect,
-				"https://platform.example/next",
-			), nil
-		case "/next":
-			return noContentResponse(req), nil
-		default:
-			return noContentResponse(req), nil
-		}
-	})
-
-	previousProvider := exttransport.GetProvider()
-	interceptor := &redirectRewriteInterceptor{target: sidecarURL}
-	exttransport.Register(scopedTestProvider{
-		testProvider: testProvider{interceptor: interceptor},
-		supported:    exttransport.RequestClassPlatform,
-	})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	client := &http.Client{Transport: base}
-	installSDKTransportBridge(client, func(req *http.Request) bool {
-		return req.URL != nil && req.URL.Path == "/bootstrap"
-	}, identityTransportPolicy)
-
-	req, err := http.NewRequest(
-		http.MethodPost,
-		"https://platform.example/bootstrap",
-		strings.NewReader("body"),
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if sidecarCalls != 2 {
-		t.Fatalf("sidecar calls = %d, want 2", sidecarCalls)
-	}
-	if interceptor.calls != 2 {
-		t.Fatalf("extension calls = %d, want 2", interceptor.calls)
-	}
-}
-
-func TestSDKBootstrapRedirectGuardChecksLocationAfterExtensionPostHook(t *testing.T) {
-	var externalCalls atomic.Int32
-	sidecarURL, err := url.Parse("https://sidecar.example")
-	if err != nil {
-		t.Fatal(err)
-	}
-	base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		if req.URL.Host == "external.example" {
-			externalCalls.Add(1)
-			return noContentResponse(req), nil
-		}
-		return redirectResponse(
-			req,
-			http.StatusTemporaryRedirect,
-			"https://platform.example/next",
-		), nil
-	})
-
-	previousProvider := exttransport.GetProvider()
-	exttransport.Register(scopedTestProvider{
-		testProvider: testProvider{interceptor: &redirectRewriteInterceptor{
-			target:       sidecarURL,
-			postLocation: "https://external.example/target",
-		}},
-		supported: exttransport.RequestClassPlatform,
-	})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	client := &http.Client{Transport: base}
-	installSDKTransportBridge(client, func(req *http.Request) bool {
-		return req.URL != nil && req.URL.Path == "/bootstrap"
-	}, identityTransportPolicy)
-	req, err := http.NewRequest(
-		http.MethodPost,
-		"https://platform.example/bootstrap",
-		strings.NewReader("secret"),
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if resp != nil && resp.Body != nil {
-		resp.Body.Close()
-	}
-	if err == nil || !strings.Contains(err.Error(), "cross-origin redirect") {
-		t.Fatalf("Do() error = %v, want post-hook Location rejection", err)
-	}
-	if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryPolicy ||
-		problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("Do() problem = %#v, %v; want policy/access_denied", problem, ok)
-	}
-	if got := externalCalls.Load(); got != 0 {
-		t.Fatalf("post-hook redirect target calls = %d, want 0", got)
-	}
-}
-
-func TestSameOriginNormalizesDefaultPort(t *testing.T) {
-	left, err := url.Parse("https://platform.example/bootstrap")
-	if err != nil {
-		t.Fatal(err)
-	}
-	right, err := url.Parse("https://platform.example:443/next")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !sameOrigin(left, right) {
-		t.Fatal("sameOrigin() = false for equivalent default HTTPS ports")
-	}
-}
-
-func TestDefaultClientBridgeCoversWebSocketSDKBootstrap(t *testing.T) {
-	preserveHTTPClientState(t, sdkBootstrapHTTPClient)
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	unsetProxyPluginEnv(t)
-	resetProxyPluginState()
-	t.Setenv(EnvNoProxy, "1")
-
-	previousProvider := exttransport.GetProvider()
-	interceptor := &testHeaderInterceptor{}
-	exttransport.Register(scopedTestProvider{
-		testProvider: testProvider{interceptor: interceptor},
-		supported:    exttransport.RequestClassPlatform,
-	})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	seenHeader := make(chan string, 1)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		seenHeader <- req.Header.Get("X-Test-Platform")
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusBadRequest)
-		_, _ = io.WriteString(w, `{"code":400,"msg":"stop after bootstrap"}`)
-	}))
-	t.Cleanup(server.Close)
-
-	installSDKTransportBridge(sdkBootstrapHTTPClient, func(req *http.Request) bool {
-		return req.URL != nil && req.URL.Host == strings.TrimPrefix(server.URL, "http://")
-	}, identityTransportPolicy)
-
-	client := larkws.NewClient(
-		"test-app",
-		"test-secret",
-		larkws.WithDomain(server.URL),
-		larkws.WithAutoReconnect(false),
-	)
-	if err := client.Start(context.Background()); err == nil {
-		t.Fatal("WebSocket SDK Start() error = nil, want bootstrap failure")
-	}
-	if got := <-seenHeader; got != "routed" {
-		t.Fatalf("WebSocket bootstrap header = %q, want routed", got)
-	}
-	if interceptor.calls != 1 {
-		t.Fatalf("extension calls = %d, want exactly 1 bootstrap call", interceptor.calls)
-	}
-}
-
-func TestSDKTransportBridgeUsesPinnedClientAfterGlobalReplacement(t *testing.T) {
-	preserveHTTPClientState(t, sdkBootstrapHTTPClient)
-	oldDefaultClient := http.DefaultClient
-	t.Cleanup(func() { http.DefaultClient = oldDefaultClient })
-
-	var pinnedCalls atomic.Int32
-	pinnedHeader := make(chan string, 1)
-	sdkBootstrapHTTPClient.Transport = roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		pinnedCalls.Add(1)
-		pinnedHeader <- req.Header.Get("X-Pinned-Bridge")
-		return &http.Response{
-			StatusCode: http.StatusBadRequest,
-			Header:     http.Header{"Content-Type": []string{"application/json"}},
-			Body:       io.NopCloser(strings.NewReader(`{"code":400,"msg":"stop"}`)),
-			Request:    req,
-		}, nil
-	})
-	sdkBootstrapHTTPClient.CheckRedirect = nil
-
-	var replacementCalls atomic.Int32
-	http.DefaultClient = &http.Client{Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		replacementCalls.Add(1)
-		return &http.Response{
-			StatusCode: http.StatusBadRequest,
-			Body:       http.NoBody,
-			Request:    req,
-		}, nil
-	})}
-
-	InstallSDKTransportBridge(func(base http.RoundTripper) http.RoundTripper {
-		return roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			req = req.Clone(req.Context())
-			req.Header.Set("X-Pinned-Bridge", "routed")
-			return base.RoundTrip(req)
-		})
-	})
-
-	client := larkws.NewClient(
-		"test-app",
-		"test-secret",
-		larkws.WithAutoReconnect(false),
-	)
-	if err := client.Start(context.Background()); err == nil {
-		t.Fatal("WebSocket SDK Start() error = nil, want bootstrap failure")
-	}
-	if got := pinnedCalls.Load(); got != 1 {
-		t.Fatalf("SDK-pinned client calls = %d, want 1", got)
-	}
-	if got := <-pinnedHeader; got != "routed" {
-		t.Fatalf("SDK-pinned bridge header = %q, want routed", got)
-	}
-	if got := replacementCalls.Load(); got != 0 {
-		t.Fatalf("replacement DefaultClient calls = %d, want 0", got)
-	}
-}
-
-func TestSDKWebSocketBootstrapMatcherIsNarrow(t *testing.T) {
-	tests := []struct {
-		name   string
-		method string
-		url    string
-		want   bool
-	}{
-		{
-			name:   "platform bootstrap",
-			method: http.MethodPost,
-			url:    "https://open.feishu.cn/callback/ws/endpoint",
-			want:   true,
-		},
-		{
-			name:   "other platform path",
-			method: http.MethodPost,
-			url:    "https://open.feishu.cn/open-apis/test",
-		},
-		{
-			name:   "wrong bootstrap method",
-			method: http.MethodGet,
-			url:    "https://open.feishu.cn/callback/ws/endpoint",
-		},
-		{
-			name:   "external lookalike",
-			method: http.MethodPost,
-			url:    "https://external.example/callback/ws/endpoint",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req, err := http.NewRequest(tt.method, tt.url, nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if got := isSDKWebSocketBootstrapRequest(req); got != tt.want {
-				t.Fatalf("isSDKWebSocketBootstrapRequest() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestSDKTransportBridgeLeavesOtherPlatformPathsUntouched(t *testing.T) {
-	previousProvider := exttransport.GetProvider()
-	interceptor := &testHeaderInterceptor{}
-	exttransport.Register(scopedTestProvider{
-		testProvider: testProvider{interceptor: interceptor},
-		supported:    exttransport.RequestClassPlatform,
-	})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	baseCalls := 0
-	client := &http.Client{Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		baseCalls++
-		return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-	})}
-	installSDKTransportBridge(client, isSDKWebSocketBootstrapRequest, nil)
-
-	req, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/open-apis/test", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if baseCalls != 1 {
-		t.Fatalf("base calls = %d, want 1", baseCalls)
-	}
-	if interceptor.calls != 0 {
-		t.Fatalf("extension calls = %d, want 0 for unmatched DefaultClient traffic", interceptor.calls)
-	}
-}
-
-func TestSDKTransportBridgeNilBasePreservesDefaultTransportForUnmatchedRequest(t *testing.T) {
-	oldDefaultTransport := http.DefaultTransport
-	t.Cleanup(func() { http.DefaultTransport = oldDefaultTransport })
-
-	unsetProxyPluginEnv(t)
-	resetProxyPluginState()
-	t.Setenv(EnvNoProxy, "1")
-
-	var firstCalls atomic.Int32
-	http.DefaultTransport = roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		firstCalls.Add(1)
-		return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-	})
-	client := &http.Client{}
-	installSDKTransportBridge(client, func(*http.Request) bool { return false }, nil)
-
-	var currentCalls atomic.Int32
-	http.DefaultTransport = roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		currentCalls.Add(1)
-		return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-	})
-
-	req, err := http.NewRequest(http.MethodGet, "http://127.0.0.1:1/unmatched", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if got := firstCalls.Load(); got != 0 {
-		t.Fatalf("install-time DefaultTransport calls = %d, want 0", got)
-	}
-	if got := currentCalls.Load(); got != 1 {
-		t.Fatalf("request-time DefaultTransport calls = %d, want 1", got)
-	}
-}
-
-func TestSDKTransportBridgeUpdatesPlatformPolicy(t *testing.T) {
-	client := &http.Client{Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		return noContentResponse(req), nil
-	})}
-	var firstCalls, secondCalls int
-	build := func(calls *int) transportPolicyBuilder {
-		return func(base http.RoundTripper) http.RoundTripper {
-			*calls++
-			return base
-		}
-	}
-	match := func(*http.Request) bool { return true }
-	installSDKTransportBridge(client, match, build(&firstCalls))
-	installSDKTransportBridge(client, match, build(&secondCalls))
-	req, err := http.NewRequest(http.MethodPost, "https://platform.example/bootstrap", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-	if firstCalls != 0 || secondCalls != 1 {
-		t.Fatalf("policy calls = (%d, %d), want (0, 1)", firstCalls, secondCalls)
-	}
-}
-
-func TestSDKBootstrapTransportFailsClosedWithoutPlatformPolicy(t *testing.T) {
-	var baseCalls atomic.Int32
-	client := &http.Client{Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		baseCalls.Add(1)
-		return &http.Response{
-			StatusCode: http.StatusNoContent,
-			Body:       http.NoBody,
-			Request:    req,
-		}, nil
-	})}
-	installSDKTransportBridge(client, func(*http.Request) bool { return true }, nil)
-
-	req, err := http.NewRequest(http.MethodPost, "https://platform.example/bootstrap", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if resp != nil && resp.Body != nil {
-		resp.Body.Close()
-	}
-	if err == nil || !strings.Contains(err.Error(), "policy is not configured") {
-		t.Fatalf("Do() error = %v, want missing policy rejection", err)
-	}
-	if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryInternal ||
-		problem.Subtype != errs.SubtypeUnknown {
-		t.Fatalf("Do() problem = %#v, %v; want internal/unknown", problem, ok)
-	}
-	if got := baseCalls.Load(); got != 0 {
-		t.Fatalf("base transport calls = %d, want 0", got)
-	}
-}
-
-func TestSDKBootstrapTransportFailsClosedForNilPlatformTransport(t *testing.T) {
-	var baseCalls atomic.Int32
-	client := &http.Client{Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		baseCalls.Add(1)
-		return &http.Response{
-			StatusCode: http.StatusNoContent,
-			Body:       http.NoBody,
-			Request:    req,
-		}, nil
-	})}
-	installSDKTransportBridge(client, func(*http.Request) bool { return true }, func(http.RoundTripper) http.RoundTripper {
-		return nil
-	})
-
-	req, err := http.NewRequest(http.MethodPost, "https://platform.example/bootstrap", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if resp != nil && resp.Body != nil {
-		resp.Body.Close()
-	}
-	if err == nil || !strings.Contains(err.Error(), "nil transport") {
-		t.Fatalf("Do() error = %v, want nil policy transport rejection", err)
-	}
-	if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryInternal ||
-		problem.Subtype != errs.SubtypeUnknown {
-		t.Fatalf("Do() problem = %#v, %v; want internal/unknown", problem, ok)
-	}
-	if got := baseCalls.Load(); got != 0 {
-		t.Fatalf("base transport calls = %d, want 0", got)
-	}
-}
-
-func TestSDKBootstrapRedirectPolicyRetainsDefaultLimit(t *testing.T) {
-	policy := sdkBootstrapRedirectPolicy(nil, nil)
-	via := make([]*http.Request, 10)
-	err := policy(&http.Request{}, via)
-	if err == nil {
-		t.Fatal("redirect policy error = nil after 10 redirects")
-	}
-	if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryNetwork ||
-		problem.Subtype != errs.SubtypeNetworkTransport {
-		t.Fatalf("redirect problem = %#v, %v; want network/transport", problem, ok)
-	}
-}
-
-func TestExtensionMiddlewareUsesFallbackWhenBaseIsNil(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	unsetProxyPluginEnv(t)
-	resetProxyPluginState()
-	t.Setenv(EnvNoProxy, "")
-
-	previous := http.DefaultTransport
-	var calls atomic.Int32
-	http.DefaultTransport = roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		calls.Add(1)
-		return &http.Response{
-			StatusCode: http.StatusNoContent,
-			Body:       http.NoBody,
-			Request:    req,
-		}, nil
-	})
-	t.Cleanup(func() { http.DefaultTransport = previous })
-
-	req, err := http.NewRequest(http.MethodGet, "https://external.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := (&ExtensionMiddleware{Ext: &testHeaderInterceptor{}}).RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-	if got := calls.Load(); got != 1 {
-		t.Fatalf("fallback transport calls = %d, want 1", got)
-	}
-}
-
-func TestExtensionMiddlewareAbortsBeforeBase(t *testing.T) {
-	reason := errors.New("blocked")
-	baseCalled := false
-	postCalled := false
-	interceptor := &abortingTestInterceptor{
-		reason: reason,
-		post: func(resp *http.Response, err error) {
-			postCalled = true
-			if resp != nil || err != reason {
-				t.Errorf("post arguments = (%v, %v), want (nil, reason)", resp, err)
-			}
-		},
-	}
-	middleware := &ExtensionMiddleware{
-		Base: roundTripFunc(func(*http.Request) (*http.Response, error) {
-			baseCalled = true
-			return nil, nil
-		}),
-		Ext:     interceptor,
-		ExtName: "test-provider",
-	}
-
-	resp, err := middleware.RoundTrip(httptest.NewRequest(http.MethodGet, "https://example.com", nil))
-	if resp != nil {
-		t.Fatalf("response = %v, want nil", resp)
-	}
-	var abortErr *exttransport.AbortError
-	if !errors.As(err, &abortErr) {
-		t.Fatalf("error = %T, want *transport.AbortError", err)
-	}
-	if abortErr.Extension != "test-provider" || abortErr.Reason != reason {
-		t.Fatalf("abort error = %#v, want provider and reason", abortErr)
-	}
-	if baseCalled {
-		t.Fatal("base transport was called")
-	}
-	if !postCalled {
-		t.Fatal("post hook was not called")
-	}
-}
-
-func preserveHTTPClientState(t *testing.T, client *http.Client) {
-	t.Helper()
-	oldTransport := client.Transport
-	oldCheckRedirect := client.CheckRedirect
-	t.Cleanup(func() {
-		client.Transport = oldTransport
-		client.CheckRedirect = oldCheckRedirect
-	})
-}
-
-func identityTransportPolicy(base http.RoundTripper) http.RoundTripper {
-	return base
-}
-
-func redirectResponse(req *http.Request, status int, location string) *http.Response {
-	return &http.Response{
-		StatusCode: status,
-		Header:     http.Header{"Location": []string{location}},
-		Body:       http.NoBody,
-		Request:    req,
-	}
-}
-
-func noContentResponse(req *http.Request) *http.Response {
-	return &http.Response{
-		StatusCode: http.StatusNoContent,
-		Body:       http.NoBody,
-		Request:    req,
-	}
-}
-
-type roundTripFunc func(*http.Request) (*http.Response, error)
-
-func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f(req)
-}

internal/transport/policy_router.go

@@ -1,232 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package transport
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/larksuite/cli/errs"
-	exttransport "github.com/larksuite/cli/extension/transport"
-	"github.com/larksuite/cli/internal/core"
-)
-
-type requestClassContextKey struct{}
-type forcedRequestClassContextKey struct{}
-
-// HTTPPolicyRouter selects an HTTP transport policy from request intent and
-// the endpoint catalog. Explicit request intent takes precedence; otherwise
-// known platform endpoints use the platform policy and all other URLs use the
-// external policy.
-type HTTPPolicyRouter struct {
-	platform http.RoundTripper
-	external http.RoundTripper
-}
-
-// RoundTripperDecorator describes a transport layer that can be rebuilt over
-// a cloned base transport. Connection-policy helpers use this contract to
-// preserve retry, response, and extension layers while safely customizing the
-// innermost *http.Transport.
-type RoundTripperDecorator interface {
-	BaseRoundTripper() http.RoundTripper
-	WithBaseRoundTripper(http.RoundTripper) http.RoundTripper
-}
-
-// NewHTTPPolicyRouter constructs a router over two policy chains. A nil chain
-// falls back to the shared proxy-aware transport. The currently registered
-// extension provider is resolved once and applied according to its optional
-// ScopedProvider contract.
-func NewHTTPPolicyRouter(platform, external http.RoundTripper) *HTTPPolicyRouter {
-	if platform == nil {
-		platform = Shared()
-	}
-	if external == nil {
-		external = Shared()
-	}
-
-	extension := resolveExtension()
-	return &HTTPPolicyRouter{
-		platform: extension.wrap(platform, exttransport.RequestClassPlatform, true),
-		external: extension.wrap(external, exttransport.RequestClassExternal, true),
-	}
-}
-
-// RoundTrip dispatches the request to its selected policy chain.
-func (r *HTTPPolicyRouter) RoundTrip(req *http.Request) (*http.Response, error) {
-	if req == nil {
-		return nil, errs.NewInternalError(
-			errs.SubtypeUnknown,
-			"HTTP policy router received a nil request",
-		)
-	}
-	class, err := classifyRequest(req)
-	if err != nil {
-		return nil, err
-	}
-	if class == exttransport.RequestClassPlatform {
-		return r.platform.RoundTrip(req)
-	}
-	return r.external.RoundTrip(req)
-}
-
-func (r *HTTPPolicyRouter) transportForClass(class exttransport.RequestClass) (http.RoundTripper, bool) {
-	switch class {
-	case exttransport.RequestClassPlatform:
-		return r.platform, true
-	case exttransport.RequestClassExternal:
-		return r.external, true
-	default:
-		return nil, false
-	}
-}
-
-func classifyRequest(req *http.Request) (exttransport.RequestClass, error) {
-	if explicit, ok := req.Context().Value(requestClassContextKey{}).(exttransport.RequestClass); ok {
-		switch explicit {
-		case exttransport.RequestClassPlatform, exttransport.RequestClassExternal:
-			return explicit, nil
-		default:
-			return "", errs.NewInternalError(
-				errs.SubtypeUnknown,
-				"unsupported HTTP request class %q",
-				explicit,
-			)
-		}
-	}
-	if core.IsPlatformEndpointURL(req.URL) {
-		return exttransport.RequestClassPlatform, nil
-	}
-	return exttransport.RequestClassExternal, nil
-}
-
-// WithRequestClass returns a shallow copy of req with explicit routing intent.
-func WithRequestClass(req *http.Request, class exttransport.RequestClass) *http.Request {
-	if req == nil {
-		return nil
-	}
-	ctx := context.WithValue(req.Context(), requestClassContextKey{}, class)
-	return req.WithContext(ctx)
-}
-
-func withForcedRequestClass(req *http.Request, class exttransport.RequestClass) *http.Request {
-	if req == nil {
-		return nil
-	}
-	if _, forced := req.Context().Value(forcedRequestClassContextKey{}).(struct{}); forced {
-		return req
-	}
-	ctx := context.WithValue(req.Context(), requestClassContextKey{}, class)
-	ctx = context.WithValue(ctx, forcedRequestClassContextKey{}, struct{}{})
-	return req.WithContext(ctx)
-}
-
-type requestClassTransport struct {
-	base  http.RoundTripper
-	class exttransport.RequestClass
-}
-
-func (t *requestClassTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	return t.base.RoundTrip(withForcedRequestClass(req, t.class))
-}
-
-// CloneHTTPTransport exposes a structural cloning capability without requiring
-// higher-level safety helpers to import this package. The explicit request
-// class selects the policy branch that must be rebuilt.
-func (t *requestClassTransport) CloneHTTPTransport() (http.RoundTripper, *http.Transport, bool) {
-	return CloneHTTPTransportForRequestClass(t.base, t.class)
-}
-
-// TransformHTTPTransport clones the selected policy branch and replaces its
-// concrete transport in place. Keeping the replacement at the graph leaf is
-// important for policies that must observe requests after outer decorators
-// have run, such as proxy selection.
-func (t *requestClassTransport) TransformHTTPTransport(transform func(*http.Transport) (http.RoundTripper, bool)) (http.RoundTripper, bool) {
-	return transformHTTPTransportForRequestClass(t.base, t.class, transform, 0)
-}
-
-// ClientForRequestClass clones client and forces all of its requests through a
-// specific policy class. The original client is never mutated.
-func ClientForRequestClass(client *http.Client, class exttransport.RequestClass) *http.Client {
-	if client == nil {
-		client = &http.Client{}
-	}
-	cloned := *client
-	base := client.Transport
-	if base == nil {
-		base = Shared()
-	}
-	cloned.Transport = &requestClassTransport{base: base, class: class}
-	return &cloned
-}
-
-// CloneHTTPTransportForRequestClass selects one policy branch, clones its
-// innermost *http.Transport, and rebuilds every composable decorator around
-// the clone. Callers can customize concrete before using rebuilt. The original
-// transport graph is never mutated.
-func CloneHTTPTransportForRequestClass(base http.RoundTripper, class exttransport.RequestClass) (rebuilt http.RoundTripper, concrete *http.Transport, ok bool) {
-	rebuilt, ok = transformHTTPTransportForRequestClass(base, class, func(cloned *http.Transport) (http.RoundTripper, bool) {
-		concrete = cloned
-		return cloned, true
-	}, 0)
-	if !ok {
-		return nil, nil, false
-	}
-	return rebuilt, concrete, true
-}
-
-func transformHTTPTransportForRequestClass(
-	base http.RoundTripper,
-	class exttransport.RequestClass,
-	transform func(*http.Transport) (http.RoundTripper, bool),
-	depth int,
-) (http.RoundTripper, bool) {
-	if depth > 32 {
-		return nil, false
-	}
-	if base == nil || transform == nil {
-		if transform == nil {
-			return nil, false
-		}
-		base = Shared()
-	}
-
-	switch current := base.(type) {
-	case *http.Transport:
-		cloned := cloneHTTPTransport(current)
-		rebuilt, valid := transform(cloned)
-		return rebuilt, valid && rebuilt != nil
-	case *requestClassTransport:
-		return transformHTTPTransportForRequestClass(current.base, class, transform, depth+1)
-	case *HTTPPolicyRouter:
-		selected, valid := current.transportForClass(class)
-		if !valid {
-			return nil, false
-		}
-		return transformHTTPTransportForRequestClass(selected, class, transform, depth+1)
-	case RoundTripperDecorator:
-		inner := current.BaseRoundTripper()
-		if inner == nil || inner == base {
-			return nil, false
-		}
-		rebuiltInner, valid := transformHTTPTransportForRequestClass(inner, class, transform, depth+1)
-		if !valid {
-			return nil, false
-		}
-		rebuilt := current.WithBaseRoundTripper(rebuiltInner)
-		return rebuilt, rebuilt != nil
-	default:
-		return nil, false
-	}
-}
-
-func cloneHTTPTransport(source *http.Transport) *http.Transport {
-	cloned := source.Clone()
-	// Clone leaves an auto-configured h2 handler on source.
-	if cloned.TLSNextProto == nil {
-		if _, ok := source.TLSNextProto["h2"]; ok {
-			cloned.ForceAttemptHTTP2 = true
-		}
-	}
-	return cloned
-}

internal/transport/policy_router_test.go

@@ -1,351 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package transport
-
-import (
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	exttransport "github.com/larksuite/cli/extension/transport"
-)
-
-type cloneTestDecorator struct {
-	base http.RoundTripper
-}
-
-func (d *cloneTestDecorator) RoundTrip(req *http.Request) (*http.Response, error) {
-	return d.base.RoundTrip(req)
-}
-
-func (d *cloneTestDecorator) BaseRoundTripper() http.RoundTripper {
-	return d.base
-}
-
-func (d *cloneTestDecorator) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	return &cloneTestDecorator{base: base}
-}
-
-type headerCloneTestDecorator struct {
-	base http.RoundTripper
-}
-
-func (d *headerCloneTestDecorator) RoundTrip(req *http.Request) (*http.Response, error) {
-	req = req.Clone(req.Context())
-	req.Header.Set("X-Decorator", "applied")
-	return d.base.RoundTrip(req)
-}
-
-func (d *headerCloneTestDecorator) BaseRoundTripper() http.RoundTripper {
-	return d.base
-}
-
-func (d *headerCloneTestDecorator) WithBaseRoundTripper(base http.RoundTripper) http.RoundTripper {
-	return &headerCloneTestDecorator{base: base}
-}
-
-func TestHTTPPolicyRouterClassifiesFromEndpointCatalog(t *testing.T) {
-	exttransport.Register(nil)
-
-	platformCalls := 0
-	externalCalls := 0
-	router := NewHTTPPolicyRouter(
-		roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			platformCalls++
-			return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-		}),
-		roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			externalCalls++
-			return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-		}),
-	)
-
-	for _, rawURL := range []string{
-		"https://open.feishu.cn/open-apis/test",
-		"https://example.com/file",
-	} {
-		req, err := http.NewRequest(http.MethodGet, rawURL, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		resp, err := router.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		resp.Body.Close()
-	}
-
-	if platformCalls != 1 || externalCalls != 1 {
-		t.Fatalf("platform calls = %d, external calls = %d; want 1 each", platformCalls, externalCalls)
-	}
-}
-
-func TestHTTPPolicyRouterExplicitClassOverridesCatalog(t *testing.T) {
-	exttransport.Register(nil)
-
-	platformCalls := 0
-	externalCalls := 0
-	router := NewHTTPPolicyRouter(
-		roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			platformCalls++
-			return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-		}),
-		roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			externalCalls++
-			return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-		}),
-	)
-
-	req, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/open-apis/test", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	req = WithRequestClass(req, exttransport.RequestClassExternal)
-	resp, err := router.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if platformCalls != 0 || externalCalls != 1 {
-		t.Fatalf("platform calls = %d, external calls = %d; want 0 and 1", platformCalls, externalCalls)
-	}
-}
-
-func TestClientForRequestClassOutermostIntentWins(t *testing.T) {
-	exttransport.Register(nil)
-	platformCalls := 0
-	externalCalls := 0
-	router := NewHTTPPolicyRouter(
-		roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			platformCalls++
-			return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-		}),
-		roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			externalCalls++
-			return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-		}),
-	)
-
-	platform := ClientForRequestClass(&http.Client{Transport: router}, exttransport.RequestClassPlatform)
-	external := ClientForRequestClass(platform, exttransport.RequestClassExternal)
-	resp, err := external.Get("https://open.feishu.cn/open-apis/test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if platformCalls != 0 || externalCalls != 1 {
-		t.Fatalf("platform calls = %d, external calls = %d; want outer external intent to win", platformCalls, externalCalls)
-	}
-}
-
-func TestHTTPPolicyRouterRejectsInvalidExplicitClass(t *testing.T) {
-	exttransport.Register(nil)
-	router := NewHTTPPolicyRouter(nil, nil)
-	req, err := http.NewRequest(http.MethodGet, "https://example.com", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	req = WithRequestClass(req, exttransport.RequestClass("invalid"))
-	if _, err := router.RoundTrip(req); err == nil || !strings.Contains(err.Error(), "unsupported HTTP request class") {
-		t.Fatalf("RoundTrip() error = %v, want unsupported request class", err)
-	} else if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryInternal ||
-		problem.Subtype != errs.SubtypeUnknown {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want internal/unknown", problem, ok)
-	}
-}
-
-func TestHTTPPolicyRouterRejectsNilRequest(t *testing.T) {
-	router := NewHTTPPolicyRouter(nil, nil)
-	_, err := router.RoundTrip(nil)
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryInternal || problem.Subtype != errs.SubtypeUnknown {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want internal/unknown", problem, ok)
-	}
-}
-
-func TestHTTPPolicyRouterReclassifiesRedirectTargets(t *testing.T) {
-	interceptor := &testHeaderInterceptor{}
-	exttransport.Register(scopedTestProvider{
-		testProvider: testProvider{interceptor: interceptor},
-		supported:    exttransport.RequestClassPlatform,
-	})
-	t.Cleanup(func() { exttransport.Register(nil) })
-
-	receivedHeader := make(chan string, 1)
-	external := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		receivedHeader <- req.Header.Get("X-Test-Platform")
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(external.Close)
-
-	router := NewHTTPPolicyRouter(
-		roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			return &http.Response{
-				StatusCode: http.StatusFound,
-				Header:     http.Header{"Location": []string{external.URL}},
-				Body:       http.NoBody,
-				Request:    req,
-			}, nil
-		}),
-		http.DefaultTransport,
-	)
-	client := &http.Client{Transport: router}
-	req, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/start", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if got := <-receivedHeader; got != "" {
-		t.Fatalf("redirect target received platform-scoped header %q", got)
-	}
-	if interceptor.calls != 1 {
-		t.Fatalf("extension calls = %d, want only the initial platform request", interceptor.calls)
-	}
-}
-
-func TestCloneHTTPTransportForRequestClassRebuildsDecorators(t *testing.T) {
-	wantErr := errors.New("preserved proxy policy")
-	base := &http.Transport{
-		Proxy: func(*http.Request) (*url.URL, error) {
-			return nil, wantErr
-		},
-	}
-	decorated := &cloneTestDecorator{base: base}
-	router := NewHTTPPolicyRouter(decorated, decorated)
-
-	rebuilt, concrete, ok := CloneHTTPTransportForRequestClass(router, exttransport.RequestClassExternal)
-	if !ok {
-		t.Fatal("CloneHTTPTransportForRequestClass() ok = false")
-	}
-	if concrete == base {
-		t.Fatal("CloneHTTPTransportForRequestClass() reused the original *http.Transport")
-	}
-	if _, ok := rebuilt.(*cloneTestDecorator); !ok {
-		t.Fatalf("rebuilt transport type = %T, want *cloneTestDecorator", rebuilt)
-	}
-
-	req, err := http.NewRequest(http.MethodGet, "https://external.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := rebuilt.RoundTrip(req); !errors.Is(err, wantErr) {
-		t.Fatalf("RoundTrip() error = %v, want %v", err, wantErr)
-	}
-}
-
-func TestCloneHTTPTransportForRequestClassPreservesAutomaticHTTP2(t *testing.T) {
-	previousProvider := exttransport.GetProvider()
-	exttransport.Register(nil)
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-	source := &http.Transport{
-		Proxy: http.ProxyURL(&url.URL{Scheme: "http", Host: "proxy.example:8080"}),
-	}
-	router := NewHTTPPolicyRouter(&http.Transport{}, source)
-
-	_, cloned, ok := CloneHTTPTransportForRequestClass(router, exttransport.RequestClassExternal)
-	if !ok {
-		t.Fatal("CloneHTTPTransportForRequestClass() ok = false")
-	}
-	if !cloned.ForceAttemptHTTP2 {
-		t.Fatal("ForceAttemptHTTP2 = false, want true")
-	}
-	if cloned.TLSNextProto != nil {
-		t.Fatal("TLSNextProto is non-nil, want automatic HTTP/2")
-	}
-}
-
-func TestCloneHTTPTransportForRequestClassKeepsOutermostIntent(t *testing.T) {
-	platformErr := errors.New("platform transport")
-	externalErr := errors.New("external transport")
-	newBlocked := func(reason error) *http.Transport {
-		return &http.Transport{Proxy: func(*http.Request) (*url.URL, error) { return nil, reason }}
-	}
-	router := NewHTTPPolicyRouter(newBlocked(platformErr), newBlocked(externalErr))
-	platform := ClientForRequestClass(&http.Client{Transport: router}, exttransport.RequestClassPlatform)
-	external := ClientForRequestClass(platform, exttransport.RequestClassExternal)
-
-	source, ok := external.Transport.(interface {
-		CloneHTTPTransport() (http.RoundTripper, *http.Transport, bool)
-	})
-	if !ok {
-		t.Fatalf("transport type %T has no clone capability", external.Transport)
-	}
-	rebuilt, _, ok := source.CloneHTTPTransport()
-	if !ok {
-		t.Fatal("CloneHTTPTransport() ok = false")
-	}
-	req, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/open-apis/test", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := rebuilt.RoundTrip(req); !errors.Is(err, externalErr) {
-		t.Fatalf("RoundTrip() error = %v, want outer external transport error %v", err, externalErr)
-	}
-}
-
-func TestClientForRequestClassOverridesCallerIntent(t *testing.T) {
-	platformErr := errors.New("platform transport")
-	externalErr := errors.New("external transport")
-	newBlocked := func(reason error) *http.Transport {
-		return &http.Transport{Proxy: func(*http.Request) (*url.URL, error) { return nil, reason }}
-	}
-	router := NewHTTPPolicyRouter(newBlocked(platformErr), newBlocked(externalErr))
-	client := ClientForRequestClass(&http.Client{Transport: router}, exttransport.RequestClassExternal)
-	req, err := http.NewRequest(http.MethodGet, "https://external.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	req = WithRequestClass(req, exttransport.RequestClassPlatform)
-
-	if _, err := client.Do(req); !errors.Is(err, externalErr) {
-		t.Fatalf("Do() error = %v, want forced external transport error %v", err, externalErr)
-	}
-}
-
-func TestTransformHTTPTransportReplacesLeafInsideDecorators(t *testing.T) {
-	exttransport.Register(nil)
-	decorated := &headerCloneTestDecorator{base: &http.Transport{}}
-	router := NewHTTPPolicyRouter(decorated, decorated)
-	client := ClientForRequestClass(&http.Client{Transport: router}, exttransport.RequestClassExternal)
-
-	source, ok := client.Transport.(interface {
-		TransformHTTPTransport(func(*http.Transport) (http.RoundTripper, bool)) (http.RoundTripper, bool)
-	})
-	if !ok {
-		t.Fatalf("transport type %T has no transform capability", client.Transport)
-	}
-	rebuilt, ok := source.TransformHTTPTransport(func(*http.Transport) (http.RoundTripper, bool) {
-		return roundTripFunc(func(req *http.Request) (*http.Response, error) {
-			if got := req.Header.Get("X-Decorator"); got != "applied" {
-				t.Fatalf("leaf received X-Decorator = %q, want applied", got)
-			}
-			return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-		}), true
-	})
-	if !ok {
-		t.Fatal("TransformHTTPTransport() ok = false")
-	}
-
-	req, err := http.NewRequest(http.MethodGet, "https://external.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := rebuilt.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-}

internal/transport/shared.go

@@ -8,8 +8,6 @@ import (
 	"os"
 	"sync"
 	"time"
-
-	exttransport "github.com/larksuite/cli/extension/transport"
 )
 
 // Shared returns the base http.RoundTripper for all CLI HTTP clients.
@@ -57,29 +55,21 @@ func Fallback() *http.Transport {
 	return noProxyTransport()
 }
 
-// NewHTTPClient returns a policy-routed client over the shared proxy-aware
-// transport. Known platform endpoints use the platform request class; all
-// other URLs use the external request class. Existing unscoped transport
-// providers continue to apply to both classes.
+// NewHTTPClient returns an *http.Client whose Transport is the shared,
+// proxy-plugin-aware base (see Shared). Prefer this over a bare &http.Client{}
+// for outbound requests: a bare client falls back to http.DefaultTransport and
+// therefore silently bypasses proxy plugin mode (fixed proxy + trusted CA, or
+// fail-closed), creating an audit blind spot.
 //
 // A zero timeout means no client-level timeout (callers relying on context
 // deadlines pass 0).
 func NewHTTPClient(timeout time.Duration) *http.Client {
-	base := Shared()
 	return &http.Client{
-		Transport: NewHTTPPolicyRouter(base, base),
+		Transport: Shared(),
 		Timeout:   timeout,
 	}
 }
 
-// NewExternalHTTPClient returns a client for user-provided, pre-signed, CDN,
-// package-registry, and other non-platform URLs. It forces the external policy
-// while preserving the shared proxy configuration and the historical behavior
-// of unscoped transport providers. A zero timeout means no client-level timeout.
-func NewExternalHTTPClient(timeout time.Duration) *http.Client {
-	return ClientForRequestClass(NewHTTPClient(timeout), exttransport.RequestClassExternal)
-}
-
 // noProxyTransport is a proxy-disabled clone of http.DefaultTransport, lazily
 // built the first time LARK_CLI_NO_PROXY is observed set.
 var noProxyTransport = sync.OnceValue(func() *http.Transport {

internal/transport/shared_test.go

@@ -88,24 +88,23 @@ func TestShared_NoProxyOverridesSystemProxy(t *testing.T) {
 	}
 }
 
-// TestHTTPClientConstructors verifies both the policy-routed client and its
-// forced-external view retain explicit transports and configured timeouts.
-func TestHTTPClientConstructors(t *testing.T) {
+// TestNewHTTPClient verifies the factory wires the shared proxy-plugin-aware
+// transport (instead of a bare client that bypasses proxy plugin mode).
+func TestNewHTTPClient(t *testing.T) {
 	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
 	unsetProxyPluginEnv(t)
 	resetProxyPluginState()
 	t.Setenv(EnvNoProxy, "")
 
-	for name, client := range map[string]*http.Client{
-		"routed":   NewHTTPClient(7 * time.Second),
-		"external": NewExternalHTTPClient(7 * time.Second),
-	} {
-		if client.Transport == nil {
-			t.Fatalf("%s client transport is nil", name)
-		}
-		if client.Timeout != 7*time.Second {
-			t.Errorf("%s client timeout = %v, want 7s", name, client.Timeout)
-		}
+	c := NewHTTPClient(7 * time.Second)
+	if c.Transport == nil {
+		t.Fatal("NewHTTPClient transport is nil; want shared transport")
+	}
+	if c.Transport != Shared() {
+		t.Errorf("NewHTTPClient transport = %v, want Shared()", c.Transport)
+	}
+	if c.Timeout != 7*time.Second {
+		t.Errorf("NewHTTPClient timeout = %v, want 7s", c.Timeout)
 	}
 }
 
@@ -154,32 +153,4 @@ func TestShared_MalformedConfigFailsClosedEvenWithNoProxy(t *testing.T) {
 	if err == nil {
 		t.Fatalf("RoundTrip() err = nil (resp=%v); malformed config must fail closed", resp)
 	}
-
-	for name, test := range map[string]struct {
-		client *http.Client
-		url    string
-	}{
-		"platform": {
-			client: NewHTTPClient(time.Second),
-			url:    "https://open.feishu.cn/open-apis/test",
-		},
-		"external": {
-			client: NewHTTPClient(time.Second),
-			url:    "https://external.example/test",
-		},
-		"forced external": {
-			client: NewExternalHTTPClient(time.Second),
-			url:    "https://external.example/test",
-		},
-	} {
-		t.Run(name, func(t *testing.T) {
-			resp, err := test.client.Get(test.url)
-			if err == nil {
-				if resp != nil && resp.Body != nil {
-					resp.Body.Close()
-				}
-				t.Fatalf("policy-routed client succeeded with malformed proxy config")
-			}
-		})
-	}
 }

internal/update/update.go

@@ -62,7 +62,10 @@ func httpClient() *http.Client {
 	if DefaultClient != nil {
 		return DefaultClient
 	}
-	return transport.NewExternalHTTPClient(fetchTimeout)
+	return &http.Client{
+		Timeout:   fetchTimeout,
+		Transport: transport.Shared(),
+	}
 }
 
 // updateState is persisted to disk for caching.

internal/update/update_test.go

@@ -4,7 +4,6 @@
 package update
 
 import (
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -13,8 +12,6 @@ import (
 	"path/filepath"
 	"testing"
 	"time"
-
-	exttransport "github.com/larksuite/cli/extension/transport"
 )
 
 // roundTripFunc adapts a function to http.RoundTripper.
@@ -22,30 +19,6 @@ type roundTripFunc func(*http.Request) (*http.Response, error)
 
 func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) { return f(req) }
 
-type updateExternalProvider struct {
-	interceptor exttransport.Interceptor
-}
-
-func (p updateExternalProvider) Name() string { return "update-external-test" }
-
-func (p updateExternalProvider) ResolveInterceptor(context.Context) exttransport.Interceptor {
-	return p.interceptor
-}
-
-func (updateExternalProvider) SupportsRequestClass(class exttransport.RequestClass) bool {
-	return class == exttransport.RequestClassExternal
-}
-
-type updateExternalInterceptor struct {
-	calls int
-}
-
-func (i *updateExternalInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
-	i.calls++
-	req.Header.Set("X-External-Route", "1")
-	return nil
-}
-
 // clearSkipEnv unsets all env vars that shouldSkip checks,
 // preventing the host environment (e.g. CI=true) from polluting test results.
 func clearSkipEnv(t *testing.T) {
@@ -269,46 +242,6 @@ func TestRefreshCache(t *testing.T) {
 	RefreshCache("1.0.0")
 }
 
-func TestHTTPClientUsesExternalRequestClass(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	t.Setenv("LARK_CLI_NO_PROXY", "")
-	previousClient := DefaultClient
-	DefaultClient = nil
-	t.Cleanup(func() { DefaultClient = previousClient })
-
-	previousProvider := exttransport.GetProvider()
-	interceptor := &updateExternalInterceptor{}
-	exttransport.Register(updateExternalProvider{interceptor: interceptor})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	previousTransport := http.DefaultTransport
-	var receivedHeader string
-	http.DefaultTransport = roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		receivedHeader = req.Header.Get("X-External-Route")
-		return &http.Response{
-			StatusCode: http.StatusNoContent,
-			Header:     make(http.Header),
-			Body:       http.NoBody,
-			Request:    req,
-		}, nil
-	})
-	t.Cleanup(func() { http.DefaultTransport = previousTransport })
-
-	req, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/npm/latest", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := httpClient().Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if interceptor.calls != 1 || receivedHeader != "1" {
-		t.Fatalf("external route = calls %d, header %q; want 1, %q", interceptor.calls, receivedHeader, "1")
-	}
-}
-
 func TestPendingAtomicAccess(t *testing.T) {
 	// Initially nil
 	if got := GetPending(); got != nil {

internal/validate/url.go

@@ -5,15 +5,11 @@ package validate
 
 import (
 	"context"
-	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
 	"net/url"
 	"strings"
-	"sync"
-
-	"github.com/larksuite/cli/errs"
 )
 
 const (
@@ -38,9 +34,6 @@ func isRestrictedDownloadIP(ip net.IP) bool {
 		return true
 	}
 	if v4 := ip.To4(); v4 != nil {
-		if v4[0] == 0 { // RFC 1122 "this network"
-			return true
-		}
 		if v4[0] == 10 || v4[0] == 127 {
 			return true
 		}
@@ -59,9 +52,6 @@ func isRestrictedDownloadIP(ip net.IP) bool {
 		if v4[0] == 198 && (v4[1] == 18 || v4[1] == 19) { // RFC2544 benchmarking
 			return true
 		}
-		if v4[0] >= 240 {
-			return true
-		}
 		return false
 	}
 	if ip.IsPrivate() {
@@ -86,42 +76,32 @@ func ValidateDownloadSourceURL(ctx context.Context, rawURL string) error {
 	if u.Scheme != "http" && u.Scheme != "https" {
 		return fmt.Errorf("only http/https URLs are supported")
 	}
-	_, err = resolveDownloadHost(ctx, u.Hostname(), net.DefaultResolver.LookupIP)
-	return err
-}
-
-type downloadLookupIPFunc func(context.Context, string, string) ([]net.IP, error)
-
-func resolveDownloadHost(ctx context.Context, rawHost string, lookupIP downloadLookupIPFunc) ([]net.IP, error) {
-	host := strings.TrimSpace(strings.ToLower(rawHost))
+	host := strings.TrimSpace(strings.ToLower(u.Hostname()))
 	if host == "" {
-		return nil, fmt.Errorf("URL host is required")
+		return fmt.Errorf("URL host is required")
 	}
 	if host == "localhost" || strings.HasSuffix(host, ".localhost") {
-		return nil, fmt.Errorf("local/internal host is not allowed")
+		return fmt.Errorf("local/internal host is not allowed")
 	}
 	if ip := net.ParseIP(host); ip != nil {
 		if isRestrictedDownloadIP(ip) {
-			return nil, fmt.Errorf("local/internal host is not allowed")
+			return fmt.Errorf("local/internal host is not allowed")
 		}
-		return []net.IP{ip}, nil
+		return nil
 	}
-	if lookupIP == nil {
-		lookupIP = net.DefaultResolver.LookupIP
-	}
-	ips, err := lookupIP(ctx, "ip", host)
+	ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host)
 	if err != nil {
-		return nil, fmt.Errorf("failed to resolve host")
+		return fmt.Errorf("failed to resolve host")
 	}
 	if len(ips) == 0 {
-		return nil, fmt.Errorf("failed to resolve host")
+		return fmt.Errorf("failed to resolve host")
 	}
 	for _, ip := range ips {
 		if isRestrictedDownloadIP(ip) {
-			return nil, fmt.Errorf("local/internal host is not allowed")
+			return fmt.Errorf("local/internal host is not allowed")
 		}
 	}
-	return ips, nil
+	return nil
 }
 
 // NewDownloadHTTPClient clones base client and enforces download-safe redirect
@@ -135,10 +115,7 @@ func NewDownloadHTTPClient(base *http.Client, opts DownloadHTTPClientOptions) *h
 	}
 
 	cloned := *base
-	cloned.Transport = &downloadSchemeTransport{
-		base:      cloneDownloadTransport(base.Transport),
-		allowHTTP: opts.AllowHTTP,
-	}
+	cloned.Transport = cloneDownloadTransport(base.Transport)
 	cloned.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 		if len(via) >= opts.MaxRedirects {
 			return fmt.Errorf("too many redirects")
@@ -161,310 +138,18 @@ func NewDownloadHTTPClient(base *http.Client, opts DownloadHTTPClientOptions) *h
 	return &cloned
 }
 
-type downloadSchemeTransport struct {
-	base      http.RoundTripper
-	allowHTTP bool
-}
-
-func (t *downloadSchemeTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	if req == nil || req.URL == nil {
-		return nil, errs.NewInternalError(
-			errs.SubtypeUnknown,
-			"download transport received a nil request",
-		)
-	}
-	switch {
-	case strings.EqualFold(req.URL.Scheme, "https"):
-	case t.allowHTTP && strings.EqualFold(req.URL.Scheme, "http"):
-	default:
-		return nil, errs.NewSecurityPolicyError(
-			errs.SubtypeAccessDenied,
-			"only https URLs are supported",
-		)
-	}
-	return t.base.RoundTrip(req)
-}
-
-type selectedDownloadProxyKey struct{}
-
-type proxyAwareDownloadTransport struct {
-	selectProxy func(*http.Request) (*url.URL, error)
-	direct      http.RoundTripper
-	proxied     *http.Transport
-	lookupIP    downloadLookupIPFunc
-
-	mu                 sync.Mutex
-	proxiedByTLSServer map[string]*http.Transport
-}
-
-func (t *proxyAwareDownloadTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	if req == nil || req.URL == nil {
-		return nil, fmt.Errorf("download transport received a nil request")
-	}
-	proxyURL, err := t.selectProxy(req)
-	if err != nil {
-		return nil, err
-	}
-	if proxyURL == nil {
-		return t.direct.RoundTrip(req)
-	}
-
-	targetIPs, err := resolveDownloadHost(req.Context(), req.URL.Hostname(), t.lookupIP)
-	if err != nil {
-		return nil, errs.NewSecurityPolicyError(
-			errs.SubtypeAccessDenied,
-			"blocked download target: %v",
-			err,
-		).WithCause(err)
-	}
-	if strings.EqualFold(req.URL.Scheme, "http") && net.ParseIP(req.URL.Hostname()) == nil {
-		// HTTP proxies cannot pin the target IP separately from the Host header.
-		return nil, errs.NewSecurityPolicyError(
-			errs.SubtypeAccessDenied,
-			"plain HTTP hostname downloads through a proxy are not allowed",
-		).WithHint("use HTTPS or a literal public IP")
-	}
-
-	selected := *proxyURL
-	proxied := t.proxied
-	if strings.EqualFold(req.URL.Scheme, "https") {
-		proxied = t.proxiedTransportForTLSServer(req.URL.Hostname())
-	}
-
-	var lastErr error
-	for index, targetIP := range targetIPs {
-		proxiedReq, pinErr := pinDownloadRequestTargetToIP(req, targetIP)
-		if pinErr != nil {
-			return nil, pinErr
-		}
-		ctx := context.WithValue(proxiedReq.Context(), selectedDownloadProxyKey{}, &selected)
-		proxiedReq = proxiedReq.WithContext(ctx)
-
-		resp, roundTripErr := proxied.RoundTrip(proxiedReq)
-		if roundTripErr == nil {
-			if resp != nil {
-				// Hide the internal pinned URL from redirect handling.
-				resp.Request = req
-			}
-			return resp, nil
-		}
-		lastErr = roundTripErr
-		if resp != nil && resp.Body != nil {
-			resp.Body.Close()
-		}
-		if req.Context().Err() != nil {
-			break
-		}
-		if index+1 < len(targetIPs) && !canRetryDownloadTarget(req) {
-			break
+func cloneDownloadTransport(base http.RoundTripper) *http.Transport {
+	var cloned *http.Transport
+	if src, ok := base.(*http.Transport); ok && src != nil {
+		cloned = src.Clone()
+	} else {
+		if def, ok := http.DefaultTransport.(*http.Transport); ok && def != nil {
+			cloned = def.Clone()
+		} else {
+			cloned = &http.Transport{}
 		}
 	}
-	return nil, lastErr
-}
 
-func (t *proxyAwareDownloadTransport) CloseIdleConnections() {
-	if closer, ok := t.direct.(interface{ CloseIdleConnections() }); ok {
-		closer.CloseIdleConnections()
-	}
-	t.proxied.CloseIdleConnections()
-
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	for _, transport := range t.proxiedByTLSServer {
-		transport.CloseIdleConnections()
-	}
-}
-
-func (t *proxyAwareDownloadTransport) proxiedTransportForTLSServer(serverName string) *http.Transport {
-	if configured := t.proxied.TLSClientConfig; configured != nil && configured.ServerName != "" {
-		serverName = configured.ServerName
-	}
-
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if transport := t.proxiedByTLSServer[serverName]; transport != nil {
-		return transport
-	}
-
-	transport := t.proxied.Clone()
-	targetTLSConfig := cloneDownloadTLSConfig(transport.TLSClientConfig)
-	targetTLSConfig.ServerName = serverName
-	transport.TLSClientConfig = targetTLSConfig
-	configureHTTPSProxyTLSDialer(transport, t.proxied)
-	if t.proxiedByTLSServer == nil {
-		t.proxiedByTLSServer = make(map[string]*http.Transport)
-	}
-	t.proxiedByTLSServer[serverName] = transport
-	return transport
-}
-
-type blockedDownloadTransport struct {
-	err error
-}
-
-func (t *blockedDownloadTransport) RoundTrip(*http.Request) (*http.Response, error) {
-	return nil, t.err
-}
-
-func cloneDownloadTransport(base http.RoundTripper) http.RoundTripper {
-	if base == nil {
-		base = http.DefaultTransport
-	}
-	if source, ok := base.(interface {
-		TransformHTTPTransport(func(*http.Transport) (http.RoundTripper, bool)) (http.RoundTripper, bool)
-	}); ok {
-		rebuilt, transformed := source.TransformHTTPTransport(newDownloadTransportLeaf)
-		if transformed && rebuilt != nil {
-			return rebuilt
-		}
-	}
-	if source, ok := base.(*http.Transport); ok && source != nil {
-		rebuilt, transformed := newDownloadTransportLeaf(source)
-		if transformed && rebuilt != nil {
-			return rebuilt
-		}
-	}
-	return &blockedDownloadTransport{err: errs.NewInternalError(
-		errs.SubtypeUnknown,
-		"cannot safely clone download transport %T",
-		base,
-	)}
-}
-
-func newDownloadTransportLeaf(source *http.Transport) (http.RoundTripper, bool) {
-	return newDownloadTransportLeafWithResolver(source, net.DefaultResolver.LookupIP)
-}
-
-func newDownloadTransportLeafWithResolver(source *http.Transport, lookupIP downloadLookupIPFunc) (http.RoundTripper, bool) {
-	if source == nil {
-		return nil, false
-	}
-
-	selectProxy := source.Proxy
-	direct := cloneDownloadHTTPTransport(source)
-	direct.Proxy = nil
-	configureDirectDownloadTransport(direct)
-	if selectProxy == nil {
-		return direct, true
-	}
-
-	// The proxied branch validates the requested URL before construction and
-	// on every redirect. Its TCP peer is the selected proxy, so applying the
-	// direct-origin IP guard there would incorrectly reject trusted loopback or
-	// private-network proxies. Freeze the selected proxy in request context so
-	// a stateful selector cannot switch the second lookup to direct egress.
-	proxied := cloneDownloadHTTPTransport(source)
-	proxied.Proxy = func(req *http.Request) (*url.URL, error) {
-		selected, ok := req.Context().Value(selectedDownloadProxyKey{}).(*url.URL)
-		if !ok || selected == nil {
-			return nil, fmt.Errorf("download proxy selection is missing")
-		}
-		cloned := *selected
-		return &cloned, nil
-	}
-	return &proxyAwareDownloadTransport{
-		selectProxy:        selectProxy,
-		direct:             direct,
-		proxied:            proxied,
-		lookupIP:           lookupIP,
-		proxiedByTLSServer: make(map[string]*http.Transport),
-	}, true
-}
-
-func cloneDownloadHTTPTransport(source *http.Transport) *http.Transport {
-	cloned := source.Clone()
-	if cloned.TLSNextProto == nil {
-		if _, ok := source.TLSNextProto["h2"]; ok {
-			cloned.ForceAttemptHTTP2 = true
-		}
-	}
-	return cloned
-}
-
-func pinDownloadRequestTargetToIP(req *http.Request, targetIP net.IP) (*http.Request, error) {
-	if req == nil || req.URL == nil {
-		return nil, fmt.Errorf("download request URL is missing")
-	}
-	if targetIP == nil || isRestrictedDownloadIP(targetIP) {
-		return nil, fmt.Errorf("blocked download target: local/internal host is not allowed")
-	}
-
-	originalHost := req.URL.Host
-	pinnedHost := targetIP.String()
-	if port := req.URL.Port(); port != "" {
-		pinnedHost = net.JoinHostPort(pinnedHost, port)
-	} else if strings.Contains(pinnedHost, ":") {
-		pinnedHost = "[" + pinnedHost + "]"
-	}
-
-	pinned := req.Clone(req.Context())
-	pinnedURL := *req.URL
-	pinnedURL.Host = pinnedHost
-	pinned.URL = &pinnedURL
-	pinned.Host = originalHost
-	return pinned, nil
-}
-
-func canRetryDownloadTarget(req *http.Request) bool {
-	if req == nil || req.Body != nil {
-		return false
-	}
-	return req.Method == http.MethodGet || req.Method == http.MethodHead
-}
-
-func cloneDownloadTLSConfig(config *tls.Config) *tls.Config {
-	if config == nil {
-		return &tls.Config{MinVersion: tls.VersionTLS12}
-	}
-	return config.Clone()
-}
-
-func configureHTTPSProxyTLSDialer(transport, source *http.Transport) {
-	if transport.DialTLSContext != nil || transport.DialTLS != nil {
-		return
-	}
-
-	proxyTLSConfig := cloneDownloadTLSConfig(source.TLSClientConfig)
-	transport.DialTLSContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
-		rawConn, err := dialDownloadProxy(ctx, source, network, addr)
-		if err != nil {
-			return nil, err
-		}
-
-		config := proxyTLSConfig.Clone()
-		serverName, _, splitErr := net.SplitHostPort(addr)
-		if splitErr != nil {
-			rawConn.Close()
-			return nil, fmt.Errorf("invalid HTTPS proxy address: %w", splitErr)
-		}
-		config.ServerName = serverName
-		tlsConn := tls.Client(rawConn, config)
-		handshakeCtx := ctx
-		cancel := func() {}
-		if source.TLSHandshakeTimeout > 0 {
-			handshakeCtx, cancel = context.WithTimeout(ctx, source.TLSHandshakeTimeout)
-		}
-		defer cancel()
-		if err := tlsConn.HandshakeContext(handshakeCtx); err != nil {
-			rawConn.Close()
-			return nil, err
-		}
-		return tlsConn, nil
-	}
-}
-
-func dialDownloadProxy(ctx context.Context, source *http.Transport, network, addr string) (net.Conn, error) {
-	if source.DialContext != nil {
-		return source.DialContext(ctx, network, addr)
-	}
-	if source.Dial != nil {
-		return source.Dial(network, addr)
-	}
-	var dialer net.Dialer
-	return dialer.DialContext(ctx, network, addr)
-}
-
-func configureDirectDownloadTransport(cloned *http.Transport) {
 	origDial := cloned.DialContext
 	cloned.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
 		conn, err := dialConn(ctx, origDial, network, addr)
@@ -473,7 +158,7 @@ func configureDirectDownloadTransport(cloned *http.Transport) {
 		}
 		if err := validateConnRemoteIP(conn); err != nil {
 			conn.Close()
-			return nil, downloadTargetPolicyError(err)
+			return nil, err
 		}
 		return conn, nil
 	}
@@ -487,26 +172,13 @@ func configureDirectDownloadTransport(cloned *http.Transport) {
 			}
 			if err := validateConnRemoteIP(conn); err != nil {
 				conn.Close()
-				return nil, downloadTargetPolicyError(err)
-			}
-			return conn, nil
-		}
-	}
-	if cloned.DialTLS != nil {
-		origDialTLS := cloned.DialTLS
-		cloned.DialTLS = func(network, addr string) (net.Conn, error) {
-			conn, err := origDialTLS(network, addr)
-			if err != nil {
 				return nil, err
 			}
-			if err := validateConnRemoteIP(conn); err != nil {
-				conn.Close()
-				return nil, downloadTargetPolicyError(err)
-			}
 			return conn, nil
 		}
 	}
 
+	return cloned
 }
 
 // DialContextFunc is the signature for DialContext / DialTLSContext.
@@ -522,7 +194,7 @@ func WrapDialContextWithIPCheck(origDial DialContextFunc) DialContextFunc {
 		}
 		if err := validateConnRemoteIP(conn); err != nil {
 			conn.Close()
-			return nil, downloadTargetPolicyError(err)
+			return nil, err
 		}
 		return conn, nil
 	}
@@ -536,14 +208,6 @@ func dialConn(ctx context.Context, dialFn func(context.Context, string, string)
 	return d.DialContext(ctx, network, addr)
 }
 
-func downloadTargetPolicyError(err error) error {
-	return errs.NewSecurityPolicyError(
-		errs.SubtypeAccessDenied,
-		"blocked download target: %v",
-		err,
-	).WithCause(err)
-}
-
 func validateConnRemoteIP(conn net.Conn) error {
 	if conn == nil {
 		return fmt.Errorf("nil connection")

internal/validate/url_internal_test.go

@@ -1,529 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package validate
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/larksuite/cli/errs"
-)
-
-func TestProxiedHTTPSDownloadPinsValidatedTargetIP(t *testing.T) {
-	const (
-		targetHost = "rebind.example"
-		targetIP   = "203.0.113.10"
-	)
-
-	proxyCalled := make(chan struct{}, 1)
-	proxy := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		proxyCalled <- struct{}{}
-		if req.Method != http.MethodConnect {
-			t.Errorf("proxy request method = %q, want CONNECT", req.Method)
-		}
-		if got := req.Host; got != targetIP+":443" {
-			t.Errorf("proxy CONNECT target = %q, want validated IP %q", got, targetIP+":443")
-		}
-		w.WriteHeader(http.StatusBadGateway)
-	}))
-	t.Cleanup(proxy.Close)
-	proxyURL, err := url.Parse(proxy.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	lookupIP := func(context.Context, string, string) ([]net.IP, error) {
-		return []net.IP{net.ParseIP(targetIP)}, nil
-	}
-	transport, ok := newDownloadTransportLeafWithResolver(
-		&http.Transport{Proxy: http.ProxyURL(proxyURL)},
-		lookupIP,
-	)
-	if !ok {
-		t.Fatal("newDownloadTransportLeafWithResolver() did not rebuild transport")
-	}
-
-	req, err := http.NewRequest(http.MethodGet, "https://"+targetHost+"/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	pinned, err := pinDownloadRequestTargetToIP(req, net.ParseIP(targetIP))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pinned.Host != targetHost {
-		t.Fatalf("pinned request Host = %q, want %q", pinned.Host, targetHost)
-	}
-	if _, err := transport.RoundTrip(req); err == nil {
-		t.Fatal("RoundTrip() error = nil, want proxy rejection after CONNECT")
-	}
-	select {
-	case <-proxyCalled:
-	default:
-		t.Fatal("proxy was not called")
-	}
-}
-
-func TestRestrictedDownloadIPBlocksReservedIPv4(t *testing.T) {
-	for _, rawIP := range []string{"0.1.2.3", "240.0.0.1"} {
-		if !isRestrictedDownloadIP(net.ParseIP(rawIP)) {
-			t.Fatalf("%s was classified as safe", rawIP)
-		}
-	}
-	if isRestrictedDownloadIP(net.ParseIP("1.1.1.1")) {
-		t.Fatal("1.1.1.1 was classified as restricted")
-	}
-}
-
-func TestCloneDownloadTLSConfigSetsMinimumVersion(t *testing.T) {
-	if got := cloneDownloadTLSConfig(nil).MinVersion; got != tls.VersionTLS12 {
-		t.Fatalf("MinVersion = %d, want TLS 1.2", got)
-	}
-	configured := &tls.Config{MinVersion: tls.VersionTLS13}
-	if got := cloneDownloadTLSConfig(configured).MinVersion; got != tls.VersionTLS13 {
-		t.Fatalf("cloned MinVersion = %d, want TLS 1.3", got)
-	}
-}
-
-func TestCloneDownloadHTTPTransportPreservesHTTP2Policy(t *testing.T) {
-	tests := []struct {
-		name            string
-		source          *http.Transport
-		wantForce       bool
-		wantH2Handler   bool
-		wantProtocolMap bool
-	}{
-		{
-			name: "automatic",
-			source: &http.Transport{
-				Proxy: http.ProxyURL(&url.URL{Scheme: "http", Host: "proxy.example:8080"}),
-			},
-			wantForce: true,
-		},
-		{
-			name: "custom TLS without opt-in",
-			source: &http.Transport{
-				TLSClientConfig: &tls.Config{MinVersion: tls.VersionTLS12},
-			},
-		},
-		{
-			name: "custom dial without opt-in",
-			source: &http.Transport{
-				DialContext: func(context.Context, string, string) (net.Conn, error) {
-					return nil, errors.New("unused")
-				},
-			},
-		},
-		{
-			name:      "explicit opt-in",
-			source:    &http.Transport{ForceAttemptHTTP2: true},
-			wantForce: true,
-		},
-		{
-			name: "explicit h2 handler",
-			source: &http.Transport{
-				TLSNextProto: map[string]func(string, *tls.Conn) http.RoundTripper{
-					"h2": func(string, *tls.Conn) http.RoundTripper { return nil },
-				},
-			},
-			wantH2Handler:   true,
-			wantProtocolMap: true,
-		},
-		{
-			name: "explicit opt-out",
-			source: &http.Transport{
-				TLSNextProto: map[string]func(string, *tls.Conn) http.RoundTripper{},
-			},
-			wantProtocolMap: true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			cloned := cloneDownloadHTTPTransport(test.source)
-			if cloned.ForceAttemptHTTP2 != test.wantForce {
-				t.Fatalf("ForceAttemptHTTP2 = %v, want %v", cloned.ForceAttemptHTTP2, test.wantForce)
-			}
-			_, hasH2Handler := cloned.TLSNextProto["h2"]
-			if hasH2Handler != test.wantH2Handler {
-				t.Fatalf("h2 handler = %v, want %v", hasH2Handler, test.wantH2Handler)
-			}
-			if hasProtocolMap := cloned.TLSNextProto != nil; hasProtocolMap != test.wantProtocolMap {
-				t.Fatalf("TLSNextProto is non-nil = %v, want %v", hasProtocolMap, test.wantProtocolMap)
-			}
-		})
-	}
-}
-
-func TestCloneDownloadTransportPreservesAutomaticHTTP2(t *testing.T) {
-	source := &http.Transport{
-		Proxy: http.ProxyURL(&url.URL{Scheme: "http", Host: "proxy.example:8080"}),
-	}
-	rebuilt := cloneDownloadTransport(source)
-	proxyAware, ok := rebuilt.(*proxyAwareDownloadTransport)
-	if !ok {
-		t.Fatalf("transport type = %T, want *proxyAwareDownloadTransport", rebuilt)
-	}
-	direct, ok := proxyAware.direct.(*http.Transport)
-	if !ok {
-		t.Fatalf("direct transport type = %T, want *http.Transport", proxyAware.direct)
-	}
-	for name, transport := range map[string]*http.Transport{
-		"direct":  direct,
-		"proxied": proxyAware.proxied,
-	} {
-		if !transport.ForceAttemptHTTP2 {
-			t.Fatalf("%s ForceAttemptHTTP2 = false, want true", name)
-		}
-	}
-}
-
-func TestProxiedDownloadRejectsRestrictedResolvedTarget(t *testing.T) {
-	var proxyCalled atomic.Bool
-	proxy := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		proxyCalled.Store(true)
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(proxy.Close)
-	proxyURL, err := url.Parse(proxy.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	lookupIP := func(context.Context, string, string) ([]net.IP, error) {
-		return []net.IP{net.ParseIP("127.0.0.1")}, nil
-	}
-	transport, ok := newDownloadTransportLeafWithResolver(
-		&http.Transport{Proxy: http.ProxyURL(proxyURL)},
-		lookupIP,
-	)
-	if !ok {
-		t.Fatal("newDownloadTransportLeafWithResolver() did not rebuild transport")
-	}
-
-	req, err := http.NewRequest(http.MethodGet, "http://rebind.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = transport.RoundTrip(req)
-	if err == nil {
-		t.Fatal("RoundTrip() error = nil, want restricted target rejection")
-	}
-	if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryPolicy ||
-		problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want policy/access_denied", problem, ok)
-	}
-	if proxyCalled.Load() {
-		t.Fatal("proxy was called for a restricted resolved target")
-	}
-}
-
-func TestProxiedPlainHTTPHostnameRejectsLocalProxy(t *testing.T) {
-	var proxyCalled atomic.Bool
-	proxy := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		proxyCalled.Store(true)
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(proxy.Close)
-	proxyURL, err := url.Parse(proxy.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	lookupIP := func(ctx context.Context, _, host string) ([]net.IP, error) {
-		if host == "public.example" {
-			return []net.IP{net.ParseIP("203.0.113.10")}, nil
-		}
-		return net.DefaultResolver.LookupIP(ctx, "ip", host)
-	}
-	transport, ok := newDownloadTransportLeafWithResolver(
-		&http.Transport{Proxy: http.ProxyURL(proxyURL)},
-		lookupIP,
-	)
-	if !ok {
-		t.Fatal("newDownloadTransportLeafWithResolver() did not rebuild transport")
-	}
-
-	req, err := http.NewRequest(http.MethodGet, "http://public.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = transport.RoundTrip(req)
-	if err == nil {
-		t.Fatal("RoundTrip() error = nil, want plain HTTP hostname rejection")
-	}
-	if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryPolicy ||
-		problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want policy/access_denied", problem, ok)
-	} else if problem.Hint != "use HTTPS or a literal public IP" {
-		t.Fatalf("RoundTrip() hint = %q, want recovery guidance", problem.Hint)
-	}
-	if proxyCalled.Load() {
-		t.Fatal("proxy was called for a plain HTTP hostname target")
-	}
-}
-
-func TestProxiedHTTPSDownloadTriesEveryValidatedTargetIP(t *testing.T) {
-	connectTargets := make(chan string, 2)
-	proxy := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		connectTargets <- req.Host
-		w.WriteHeader(http.StatusBadGateway)
-	}))
-	t.Cleanup(proxy.Close)
-	proxyURL, err := url.Parse(proxy.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	transport, ok := newDownloadTransportLeafWithResolver(
-		&http.Transport{Proxy: http.ProxyURL(proxyURL)},
-		func(context.Context, string, string) ([]net.IP, error) {
-			return []net.IP{
-				net.ParseIP("203.0.113.10"),
-				net.ParseIP("203.0.113.11"),
-			}, nil
-		},
-	)
-	if !ok {
-		t.Fatal("newDownloadTransportLeafWithResolver() did not rebuild transport")
-	}
-
-	req, err := http.NewRequest(http.MethodGet, "https://multi.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := transport.RoundTrip(req); err == nil {
-		t.Fatal("RoundTrip() error = nil, want proxy rejection")
-	}
-	for _, want := range []string{"203.0.113.10:443", "203.0.113.11:443"} {
-		select {
-		case got := <-connectTargets:
-			if got != want {
-				t.Fatalf("proxy CONNECT target = %q, want %q", got, want)
-			}
-		default:
-			t.Fatalf("proxy did not receive CONNECT target %q", want)
-		}
-	}
-}
-
-func TestCanRetryDownloadTargetOnlyAllowsBodylessReads(t *testing.T) {
-	for _, test := range []struct {
-		method string
-		body   string
-		want   bool
-	}{
-		{method: http.MethodGet, want: true},
-		{method: http.MethodHead, want: true},
-		{method: http.MethodPost},
-		{method: http.MethodGet, body: "body"},
-	} {
-		req, err := http.NewRequest(test.method, "https://download.example/file", strings.NewReader(test.body))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if test.body == "" {
-			req.Body = nil
-		}
-		if got := canRetryDownloadTarget(req); got != test.want {
-			t.Fatalf("canRetryDownloadTarget(%s, body=%q) = %v, want %v", test.method, test.body, got, test.want)
-		}
-	}
-}
-
-func TestProxiedHTTPSTargetPreservesOriginalTLSServerName(t *testing.T) {
-	transport, ok := newDownloadTransportLeafWithResolver(
-		&http.Transport{Proxy: http.ProxyURL(&url.URL{Scheme: "http", Host: "proxy.example:8080"})},
-		func(context.Context, string, string) ([]net.IP, error) {
-			return []net.IP{net.ParseIP("203.0.113.10")}, nil
-		},
-	)
-	if !ok {
-		t.Fatal("newDownloadTransportLeafWithResolver() did not rebuild transport")
-	}
-	proxyAware, ok := transport.(*proxyAwareDownloadTransport)
-	if !ok {
-		t.Fatalf("transport type = %T, want *proxyAwareDownloadTransport", transport)
-	}
-
-	pinned := proxyAware.proxiedTransportForTLSServer("download.example")
-	if pinned.TLSClientConfig == nil {
-		t.Fatal("TLSClientConfig = nil")
-	}
-	if pinned.TLSClientConfig.ServerName != "download.example" {
-		t.Fatalf("TLS ServerName = %q, want download.example", pinned.TLSClientConfig.ServerName)
-	}
-	if proxyAware.proxied.TLSClientConfig != nil && proxyAware.proxied.TLSClientConfig.ServerName != "" {
-		t.Fatalf("base proxy TLS ServerName = %q, want unchanged", proxyAware.proxied.TLSClientConfig.ServerName)
-	}
-}
-
-func TestHTTPSProxyTLSDialerUsesLegacyDial(t *testing.T) {
-	wantErr := errors.New("legacy dial used")
-	source := &http.Transport{
-		Dial: func(string, string) (net.Conn, error) {
-			return nil, wantErr
-		},
-	}
-	target := source.Clone()
-	configureHTTPSProxyTLSDialer(target, source)
-	if target.DialTLSContext == nil {
-		t.Fatal("DialTLSContext = nil")
-	}
-	if _, err := target.DialTLSContext(context.Background(), "tcp", "proxy.example:443"); !errors.Is(err, wantErr) {
-		t.Fatalf("DialTLSContext() error = %v, want %v", err, wantErr)
-	}
-}
-
-func TestDirectDownloadLegacyDialTLSClosesRestrictedConnection(t *testing.T) {
-	clientConn, serverConn := net.Pipe()
-	t.Cleanup(func() { serverConn.Close() })
-	conn := &trackedDownloadConn{
-		Conn:       clientConn,
-		remoteAddr: &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 443},
-	}
-	rebuilt, ok := newDownloadTransportLeaf(&http.Transport{
-		DialTLS: func(string, string) (net.Conn, error) {
-			return conn, nil
-		},
-	})
-	if !ok {
-		t.Fatal("newDownloadTransportLeaf() did not rebuild transport")
-	}
-	transport, ok := rebuilt.(*http.Transport)
-	if !ok {
-		t.Fatalf("rebuilt transport = %T, want *http.Transport", rebuilt)
-	}
-
-	_, err := transport.DialTLS("tcp", "public.example:443")
-	if err == nil || !strings.Contains(err.Error(), "local/internal host is not allowed") {
-		t.Fatalf("DialTLS() error = %v, want restricted target rejection", err)
-	}
-	if problem, ok := errs.ProblemOf(err); !ok ||
-		problem.Category != errs.CategoryPolicy ||
-		problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("DialTLS() problem = %#v, %v; want policy/access_denied", problem, ok)
-	}
-	if !conn.closed {
-		t.Fatal("restricted connection was not closed")
-	}
-}
-
-func TestDirectDownloadLegacyDialTLSPreservesDialError(t *testing.T) {
-	wantErr := errors.New("dial failed")
-	rebuilt, ok := newDownloadTransportLeaf(&http.Transport{
-		DialTLS: func(string, string) (net.Conn, error) {
-			return nil, wantErr
-		},
-	})
-	if !ok {
-		t.Fatal("newDownloadTransportLeaf() did not rebuild transport")
-	}
-	transport, ok := rebuilt.(*http.Transport)
-	if !ok {
-		t.Fatalf("rebuilt transport = %T, want *http.Transport", rebuilt)
-	}
-
-	if _, err := transport.DialTLS("tcp", "public.example:443"); !errors.Is(err, wantErr) {
-		t.Fatalf("DialTLS() error = %v, want %v", err, wantErr)
-	}
-}
-
-func TestHTTPSProxyTLSDialerRetainsHandshakeTimeout(t *testing.T) {
-	clientConn, serverConn := net.Pipe()
-	t.Cleanup(func() {
-		clientConn.Close()
-		serverConn.Close()
-	})
-	source := &http.Transport{
-		DialContext: func(context.Context, string, string) (net.Conn, error) {
-			return clientConn, nil
-		},
-		TLSHandshakeTimeout: 50 * time.Millisecond,
-	}
-	target := source.Clone()
-	configureHTTPSProxyTLSDialer(target, source)
-
-	started := time.Now()
-	if _, err := target.DialTLSContext(context.Background(), "tcp", "proxy.example:443"); err == nil {
-		t.Fatal("DialTLSContext() error = nil, want TLS handshake timeout")
-	}
-	if elapsed := time.Since(started); elapsed > time.Second {
-		t.Fatalf("TLS handshake timeout took %s, want under 1s", elapsed)
-	}
-}
-
-func TestHTTPSProxyTLSDialerUsesProxyServerName(t *testing.T) {
-	server := httptest.NewTLSServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}))
-	t.Cleanup(server.Close)
-
-	clientConn, serverConn := net.Pipe()
-	t.Cleanup(func() {
-		clientConn.Close()
-		serverConn.Close()
-	})
-
-	proxySNI := make(chan string, 1)
-	serverTLSConfig := server.TLS.Clone()
-	serverTLSConfig.GetConfigForClient = func(info *tls.ClientHelloInfo) (*tls.Config, error) {
-		proxySNI <- info.ServerName
-		return nil, nil
-	}
-	serverErr := make(chan error, 1)
-	go func() {
-		serverErr <- tls.Server(serverConn, serverTLSConfig).Handshake()
-	}()
-
-	roots := x509.NewCertPool()
-	roots.AddCert(server.Certificate())
-	source := &http.Transport{
-		DialContext: func(context.Context, string, string) (net.Conn, error) {
-			return clientConn, nil
-		},
-		TLSClientConfig: &tls.Config{
-			RootCAs:    roots,
-			ServerName: "target.example.com",
-		},
-	}
-	target := source.Clone()
-	configureHTTPSProxyTLSDialer(target, source)
-
-	conn, err := target.DialTLSContext(context.Background(), "tcp", "example.com:443")
-	if err != nil {
-		t.Fatal(err)
-	}
-	conn.Close()
-	if err := <-serverErr; err != nil {
-		t.Fatal(err)
-	}
-	if got := <-proxySNI; got != "example.com" {
-		t.Fatalf("proxy TLS ServerName = %q, want example.com", got)
-	}
-}
-
-type trackedDownloadConn struct {
-	net.Conn
-	remoteAddr net.Addr
-	closed     bool
-}
-
-func (c *trackedDownloadConn) RemoteAddr() net.Addr {
-	return c.remoteAddr
-}
-
-func (c *trackedDownloadConn) Close() error {
-	c.closed = true
-	return c.Conn.Close()
-}

internal/validate/url_test.go

@@ -1,222 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package validate_test
-
-import (
-	"context"
-	"crypto/tls"
-	"errors"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	exttransport "github.com/larksuite/cli/extension/transport"
-	internaltransport "github.com/larksuite/cli/internal/transport"
-	"github.com/larksuite/cli/internal/validate"
-)
-
-type opaqueRoundTripper struct {
-	called bool
-}
-
-func (t *opaqueRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	t.called = true
-	return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-}
-
-type downloadTestProvider struct {
-	interceptor exttransport.Interceptor
-}
-
-func (p downloadTestProvider) Name() string { return "download-test" }
-
-func (p downloadTestProvider) ResolveInterceptor(context.Context) exttransport.Interceptor {
-	return p.interceptor
-}
-
-type downloadHeaderInterceptor struct{}
-
-func (downloadHeaderInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
-	req.Header.Set("X-Use-Proxy", "1")
-	return nil
-}
-
-func TestNewDownloadHTTPClientPreservesPolicyRouterBaseTransport(t *testing.T) {
-	wantErr := errors.New("proxy policy blocked request")
-	base := &http.Transport{
-		Proxy: func(*http.Request) (*url.URL, error) {
-			return nil, wantErr
-		},
-	}
-	router := internaltransport.NewHTTPPolicyRouter(base, base)
-	client := internaltransport.ClientForRequestClass(
-		&http.Client{Transport: router},
-		exttransport.RequestClassExternal,
-	)
-
-	download := validate.NewDownloadHTTPClient(client, validate.DownloadHTTPClientOptions{AllowHTTP: true})
-	req, err := http.NewRequest(http.MethodGet, "https://external.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := download.Transport.RoundTrip(req)
-	if resp != nil && resp.Body != nil {
-		resp.Body.Close()
-	}
-	if !errors.Is(err, wantErr) {
-		t.Fatalf("RoundTrip() error = %v, want preserved proxy error %v", err, wantErr)
-	}
-}
-
-func TestNewDownloadHTTPClientRejectsInitialHTTPBeforeTransport(t *testing.T) {
-	base := &opaqueRoundTripper{}
-	download := validate.NewDownloadHTTPClient(
-		&http.Client{Transport: base},
-		validate.DownloadHTTPClientOptions{},
-	)
-	req, err := http.NewRequest(http.MethodGet, "http://203.0.113.10/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = download.Transport.RoundTrip(req)
-	if err == nil {
-		t.Fatal("RoundTrip() error = nil, want initial HTTP rejection")
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryPolicy || problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want policy/access_denied", problem, ok)
-	}
-	if base.called {
-		t.Fatal("base transport was called for a disallowed initial HTTP request")
-	}
-}
-
-func TestNewDownloadHTTPClientAllowsSelectedLoopbackProxy(t *testing.T) {
-	proxy := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		if req.URL.Host != "203.0.113.10" {
-			t.Errorf("proxy request target = %q, want 203.0.113.10", req.URL.Host)
-		}
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(proxy.Close)
-	proxyURL, err := url.Parse(proxy.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	base := &http.Transport{Proxy: http.ProxyURL(proxyURL)}
-	router := internaltransport.NewHTTPPolicyRouter(base, base)
-	client := internaltransport.ClientForRequestClass(
-		&http.Client{Transport: router},
-		exttransport.RequestClassExternal,
-	)
-	download := validate.NewDownloadHTTPClient(client, validate.DownloadHTTPClientOptions{AllowHTTP: true})
-
-	req, err := http.NewRequest(http.MethodGet, "http://203.0.113.10/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := download.Do(req)
-	if err != nil {
-		t.Fatalf("download through selected loopback proxy: %v", err)
-	}
-	resp.Body.Close()
-}
-
-func TestNewDownloadHTTPClientSelectsProxyAfterOuterDecorators(t *testing.T) {
-	proxy := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		if got := req.Header.Get("X-Use-Proxy"); got != "1" {
-			t.Errorf("proxy received X-Use-Proxy = %q, want 1", got)
-		}
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(proxy.Close)
-	proxyURL, err := url.Parse(proxy.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	wantErr := errors.New("proxy selector ran before decorators")
-	base := &http.Transport{Proxy: func(req *http.Request) (*url.URL, error) {
-		if req.Header.Get("X-Use-Proxy") != "1" {
-			return nil, wantErr
-		}
-		return proxyURL, nil
-	}}
-	previousProvider := exttransport.GetProvider()
-	exttransport.Register(downloadTestProvider{interceptor: downloadHeaderInterceptor{}})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-	router := internaltransport.NewHTTPPolicyRouter(base, base)
-	client := internaltransport.ClientForRequestClass(
-		&http.Client{Transport: router},
-		exttransport.RequestClassExternal,
-	)
-	download := validate.NewDownloadHTTPClient(client, validate.DownloadHTTPClientOptions{AllowHTTP: true})
-
-	req, err := http.NewRequest(http.MethodGet, "http://203.0.113.10/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := download.Do(req)
-	if err != nil {
-		t.Fatalf("download through decorator-selected proxy: %v", err)
-	}
-	resp.Body.Close()
-}
-
-func TestNewDownloadHTTPClientGuardsLegacyDialTLS(t *testing.T) {
-	server := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(server.Close)
-	base := &http.Transport{DialTLS: func(_, _ string) (net.Conn, error) {
-		return tls.Dial("tcp", server.Listener.Addr().String(), &tls.Config{InsecureSkipVerify: true}) //nolint:gosec // local TLS server verifies the connection guard.
-	}}
-	download := validate.NewDownloadHTTPClient(&http.Client{Transport: base}, validate.DownloadHTTPClientOptions{AllowHTTP: true})
-	req, err := http.NewRequest(http.MethodGet, "https://public.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = download.Transport.RoundTrip(req)
-	if err == nil || !strings.Contains(err.Error(), "local/internal host is not allowed") {
-		t.Fatalf("RoundTrip() error = %v, want legacy DialTLS IP guard", err)
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryPolicy || problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want policy/access_denied", problem, ok)
-	}
-	var policyErr *errs.SecurityPolicyError
-	if !errors.As(err, &policyErr) || policyErr.Cause == nil {
-		t.Fatalf("RoundTrip() error = %T, want policy error with cause", err)
-	}
-}
-
-func TestNewDownloadHTTPClientFailsClosedForOpaqueTransport(t *testing.T) {
-	opaque := &opaqueRoundTripper{}
-	client := internaltransport.ClientForRequestClass(
-		&http.Client{Transport: opaque},
-		exttransport.RequestClassExternal,
-	)
-	download := validate.NewDownloadHTTPClient(client, validate.DownloadHTTPClientOptions{AllowHTTP: true})
-	req, err := http.NewRequest(http.MethodGet, "https://public.example/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = download.Transport.RoundTrip(req)
-	if err == nil || !strings.Contains(err.Error(), "cannot safely clone download transport") {
-		t.Fatalf("RoundTrip() error = %v, want fail-closed clone error", err)
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryInternal || problem.Subtype != errs.SubtypeUnknown {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want internal/unknown", problem, ok)
-	}
-	if opaque.called {
-		t.Fatal("opaque transport was called after safe cloning failed")
-	}
-}

lint/README.md

@@ -19,7 +19,7 @@ lint/
 ├── lintapi/            # shared types every domain returns
 │   └── violation.go    # Violation, Action, ActionReject / ActionLabel / ActionWarning
 └── errscontract/       # first domain: typed-error contract guards
-    ├── scan.go         # ScanRepoWithOptions(root, opts)  ← public entry
+    ├── scan.go         # ScanRepo(root) ([]lintapi.Violation, error)  ← public entry
     ├── runner.go
     ├── typecheck.go
     ├── violation.go    # local type aliases to lintapi
@@ -30,19 +30,16 @@ lint/
     ├── rule_subtype_classifier.go
     ├── rule_typed_error_completeness.go
     └── *_test.go
-└── domaincontract/     # resolver ownership + approved public hostname policy
-    ├── scan.go         # ScanRepoWithOptions(root, opts)  ← public entry
-    ├── unapproved.go   # Go AST/type-aware hostname extraction
-    ├── policy.go       # exact public/fixture allowlist validation
-    ├── diff.go         # added-line attribution
-    └── *_test.go
+└── domaincontract/     # endpoint domain contract: no hardcoded resolver hosts
+    ├── scan.go         # ScanRepo(root) ([]lintapi.Violation, error)  ← public entry
+    └── scan_test.go
 ```
 
 ## Endpoint domain contract (`domaincontract`)
 
-`domaincontract` contains two complementary Go source guards.
-
-The resolver-ownership guard rejects:
+`domaincontract` is a syntax-level regression guard for the resolver-owned
+Open, Accounts, MCP, and AppLink hosts used by the Go CLI. In production `.go`
+files it rejects:
 
 - string literals containing a resolver-owned host FQDN
   (`{open,accounts,mcp,applink}.{feishu.cn,larksuite.com}`), and
@@ -62,54 +59,17 @@ parse-level guard). The forbidden-host list is bound to the resolver source by
 `TestForbiddenHostsMatchResolver`, so adding a resolver domain without updating
 the guard fails the lint module's tests.
 
-The approved-domain guard parses every Git-tracked Go file in full. In CI,
-unapproved-host findings are limited to values whose expressions intersect an
-added line; policy validation and unused-entry checks remain repository-wide.
-It rejects an exact hostname unless it is present in one of:
+This is not a general outbound-URL or data-flow analyzer. It does not inspect
+non-Go assets, hosts assembled from string fragments, SDK constructor option
+flow, or previously unknown Feishu/Lark hosts. The literal rule and code review
+remain the backstop for those cases.
 
-- `internal/qualitygate/config/allowlists/public-domains.txt`, for production
-  and test code; or
-- `internal/qualitygate/config/allowlists/fixture-domains.txt`, only for
-  `*_test.go`, the repository-root `tests/`, and any `testdata/` (never
-  `skills/`).
-
-RFC 2606 example/test names are accepted independently of those lists. This
-includes the reserved `.test`, `.example`, `.invalid`, and `.localhost`
-namespaces and the exact names `example.com`, `example.net`, and `example.org`;
-they are safe placeholders rather than supported public endpoints.
-
-High-confidence evidence is deliberately limited to static string expressions
-assigned to `host`, `hostname`, or `domain` semantic names (including common
-case/plural forms and collections), plus static strings whose entire value is
-an absolute `http`, `https`, `ws`, or `wss` URL. It supports Go literals,
-escapes, compile-time concatenation, constant references, grouped declarations,
-multi-value assignments, and multiline expressions. Bare domain-shaped strings
-without hostname semantics are not blocked.
-
-Sequence values are scanned individually. For a hostname-semantic map, a key or
-value is evidence only when it is the sole hostname-shaped side of that entry;
-ambiguous string-to-string entries are not guessed. Struct fields use Go type
-information so known non-network `Host` / `Domain` fields do not become hostname
-evidence merely because an enum or command category contains a dot.
-
-Allowlist matching is lowercase and exact: there are no wildcard, suffix, DNS,
-or public-suffix exceptions. Entries must be sorted and unique, use ASCII
-hostnames, and have a current in-scope use. See
-`internal/qualitygate/config/README.md` for admission and approval rules.
-
-This is not a general outbound-URL or cross-language data-flow analyzer. It does
-not inspect non-Go assets or dynamically constructed values.
-
-To add or change a resolver-owned Feishu/Lark endpoint, edit the resolver rather
-than hardcoding the host elsewhere.
+To add or change an outbound endpoint, edit the resolver — never hardcode a host.
 
 ## Running
 
 ```bash
-# PR-scoped scan from the repo root (one level above lint/)
-go run -C lint . --changed-from <base-revision> ..
-
-# Full inventory (also reports historical unapproved hostnames)
+# from the repo root (one level above lint/)
 go run -C lint . ..
 ```
 
@@ -140,14 +100,10 @@ Exit codes follow `lint/main.go`:
 
    import "github.com/larksuite/cli/lint/lintapi"
 
-   type ScanOptions struct {
-       ChangedFrom string
-   }
-
-   // ScanRepoWithOptions walks root and returns every violation produced
-   // by this domain's checks. Domains MUST return []lintapi.Violation so
-   // the top-level dispatcher can aggregate uniformly.
-   func ScanRepoWithOptions(root string, opts ScanOptions) ([]lintapi.Violation, error) { ... }
+   // ScanRepo walks root and returns every violation produced by this
+   // domain's checks. Domains MUST return []lintapi.Violation so the
+   // top-level dispatcher can aggregate uniformly.
+   func ScanRepo(root string) ([]lintapi.Violation, error) { ... }
    ```
 
 3. Per-rule files are named `rule_<name>.go` with sibling
@@ -158,12 +114,8 @@ Exit codes follow `lint/main.go`:
 
    ```go
    var scanners = []scanner{
-       {name: "errscontract", fn: errscontract.ScanRepoWithOptions},
-       {name: "<domain>", fn: func(root string, opts errscontract.ScanOptions) ([]lintapi.Violation, error) {
-           return <domain>.ScanRepoWithOptions(root, <domain>.ScanOptions{
-               ChangedFrom: opts.ChangedFrom,
-           })
-       }},
+       {name: "errscontract", fn: errscontract.ScanRepo},
+       {name: "<domain>",     fn: <domain>.ScanRepo},  // ← add here
    }
    ```
 

lint/domaincontract/diff.go

@@ -1,171 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import (
-	"bytes"
-	"fmt"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-type addedLineRange struct {
-	Start int
-	End   int
-}
-
-type changedGoPath struct {
-	Old string
-	New string
-}
-
-var unifiedHunkRE = regexp.MustCompile(`^@@ -[0-9]+(?:,[0-9]+)? \+([0-9]+)(?:,([0-9]+))? @@`)
-
-func changedGoLineRanges(root, from string) (map[string][]addedLineRange, error) {
-	if from == "" {
-		return nil, nil
-	}
-	names, err := gitCommandOutput(
-		root,
-		"diff",
-		"--name-status",
-		"-z",
-		"--find-renames",
-		"--diff-filter=ACMR",
-		from+"...HEAD",
-		"--",
-	)
-	if err != nil {
-		return nil, fmt.Errorf("list changed Go files: %w", err)
-	}
-	paths, err := parseChangedGoPaths(names)
-	if err != nil {
-		return nil, fmt.Errorf("parse changed Go files: %w", err)
-	}
-
-	out := map[string][]addedLineRange{}
-	for _, path := range paths {
-		args := []string{
-			"diff",
-			"--unified=0",
-			"--no-color",
-			"--no-ext-diff",
-			"--find-renames",
-			"--diff-filter=ACMR",
-			from + "...HEAD",
-			"--",
-		}
-		if path.Old != path.New {
-			args = append(args, path.Old)
-		}
-		args = append(args, path.New)
-		patch, err := gitCommandOutput(root, args...)
-		if err != nil {
-			return nil, fmt.Errorf("read diff for %s: %w", path.New, err)
-		}
-		ranges, err := parseAddedLineRanges(patch)
-		if err != nil {
-			return nil, fmt.Errorf("parse diff for %s: %w", path.New, err)
-		}
-		out[path.New] = ranges
-	}
-	return out, nil
-}
-
-func parseChangedGoPaths(raw []byte) ([]changedGoPath, error) {
-	fields := bytes.Split(raw, []byte{0})
-	var out []changedGoPath
-	for i := 0; i < len(fields); {
-		status := string(fields[i])
-		i++
-		if status == "" {
-			break
-		}
-		if i >= len(fields) || len(fields[i]) == 0 {
-			return nil, fmt.Errorf("truncated name-status record")
-		}
-		oldPath := filepath.ToSlash(string(fields[i]))
-		i++
-		newPath := oldPath
-		if status[0] == 'R' || status[0] == 'C' {
-			if i >= len(fields) || len(fields[i]) == 0 {
-				return nil, fmt.Errorf("truncated rename/copy record for %q", oldPath)
-			}
-			newPath = filepath.ToSlash(string(fields[i]))
-			i++
-			if status[0] == 'C' {
-				// A copy introduces every destination line. Diff only the new
-				// path so Git presents it as an added file rather than a
-				// metadata-only copy with no added-line ranges.
-				oldPath = newPath
-			}
-		}
-		if !strings.HasSuffix(newPath, ".go") {
-			continue
-		}
-		out = append(out, changedGoPath{Old: oldPath, New: newPath})
-	}
-	return out, nil
-}
-
-func parseAddedLineRanges(patch []byte) ([]addedLineRange, error) {
-	var out []addedLineRange
-	for _, raw := range bytes.Split(patch, []byte{'\n'}) {
-		line := string(raw)
-		if !strings.HasPrefix(line, "@@") {
-			continue
-		}
-		match := unifiedHunkRE.FindStringSubmatch(line)
-		if match == nil {
-			return nil, fmt.Errorf("unsupported unified hunk header %q", line)
-		}
-		start, err := strconv.Atoi(match[1])
-		if err != nil {
-			return nil, fmt.Errorf("parse added start line in %q: %w", line, err)
-		}
-		count := 1
-		if match[2] != "" {
-			count, err = strconv.Atoi(match[2])
-			if err != nil {
-				return nil, fmt.Errorf("parse added line count in %q: %w", line, err)
-			}
-		}
-		if count == 0 {
-			continue
-		}
-		out = append(out, addedLineRange{Start: start, End: start + count - 1})
-	}
-	return out, nil
-}
-
-func firstAddedLineInSpan(ranges []addedLineRange, start, end int) (int, bool) {
-	for _, r := range ranges {
-		if start <= r.End && end >= r.Start {
-			if start > r.Start {
-				return start, true
-			}
-			return r.Start, true
-		}
-	}
-	return 0, false
-}
-
-func gitCommandOutput(root string, args ...string) ([]byte, error) {
-	cmd := exec.Command("git", args...)
-	cmd.Dir = root
-	out, err := cmd.Output()
-	if err == nil {
-		return out, nil
-	}
-	if exitErr, ok := err.(*exec.ExitError); ok {
-		stderr := strings.TrimSpace(string(exitErr.Stderr))
-		if stderr != "" {
-			return nil, fmt.Errorf("%w: %s", err, stderr)
-		}
-	}
-	return nil, err
-}

lint/domaincontract/diff_test.go

@@ -1,96 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import "testing"
-
-func TestParseChangedGoPaths(t *testing.T) {
-	raw := []byte("M\x00changed.go\x00R100\x00old.go\x00renamed.go\x00C100\x00source.go\x00copied.go\x00A\x00README.md\x00")
-	got, err := parseChangedGoPaths(raw)
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := []changedGoPath{
-		{Old: "changed.go", New: "changed.go"},
-		{Old: "old.go", New: "renamed.go"},
-		{Old: "copied.go", New: "copied.go"},
-	}
-	if len(got) != len(want) {
-		t.Fatalf("paths = %#v, want %#v", got, want)
-	}
-	for i := range got {
-		if got[i] != want[i] {
-			t.Fatalf("paths = %#v, want %#v", got, want)
-		}
-	}
-}
-
-func TestParseChangedGoPathsRejectsTruncatedRename(t *testing.T) {
-	if _, err := parseChangedGoPaths([]byte("R100\x00old.go\x00")); err == nil {
-		t.Fatal("expected truncated rename error")
-	}
-}
-
-func TestParseAddedLineRanges(t *testing.T) {
-	patch := []byte(`diff --git a/x.go b/x.go
-index 1111111..2222222 100644
---- a/x.go
-+++ b/x.go
-@@ -2,0 +3,2 @@
-+first
-+second
-@@ -10 +12 @@
--old
-+new
-@@ -20 +21,0 @@
--deleted
-`)
-	got, err := parseAddedLineRanges(patch)
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := []addedLineRange{{Start: 3, End: 4}, {Start: 12, End: 12}}
-	if len(got) != len(want) {
-		t.Fatalf("ranges = %#v, want %#v", got, want)
-	}
-	for i := range got {
-		if got[i] != want[i] {
-			t.Fatalf("ranges = %#v, want %#v", got, want)
-		}
-	}
-}
-
-func TestParseAddedLineRangesRejectsUnknownHunk(t *testing.T) {
-	if _, err := parseAddedLineRanges([]byte("@@@ unsupported @@@\n")); err == nil {
-		t.Fatal("expected unsupported hunk error")
-	}
-}
-
-func TestFirstAddedLineInSpan(t *testing.T) {
-	ranges := []addedLineRange{{Start: 5, End: 7}, {Start: 10, End: 10}}
-	tests := []struct {
-		start, end int
-		line       int
-		ok         bool
-	}{
-		{start: 1, end: 4, ok: false},
-		{start: 4, end: 6, line: 5, ok: true},
-		{start: 6, end: 9, line: 6, ok: true},
-		{start: 8, end: 12, line: 10, ok: true},
-	}
-	for _, tc := range tests {
-		line, ok := firstAddedLineInSpan(ranges, tc.start, tc.end)
-		if line != tc.line || ok != tc.ok {
-			t.Errorf(
-				"firstAddedLineInSpan(%d, %d) = (%d, %v), want (%d, %v)",
-				tc.start,
-				tc.end,
-				line,
-				ok,
-				tc.line,
-				tc.ok,
-			)
-		}
-	}
-}

lint/domaincontract/policy.go

@@ -1,126 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-const (
-	publicDomainsPath  = "internal/qualitygate/config/allowlists/public-domains.txt"
-	fixtureDomainsPath = "internal/qualitygate/config/allowlists/fixture-domains.txt"
-)
-
-type domainPolicyEntry struct {
-	Host string
-	File string
-	Line int
-}
-
-type domainPolicy struct {
-	Public   map[string]domainPolicyEntry
-	Fixtures map[string]domainPolicyEntry
-}
-
-// isReservedExampleHostname recognizes only names reserved by RFC 2606 for
-// examples, testing, invalid-name examples, and localhost use. These names are
-// safe source placeholders and are policy exceptions, not supported public
-// endpoints.
-func isReservedExampleHostname(host string) bool {
-	host = strings.TrimSuffix(strings.ToLower(strings.TrimSpace(host)), ".")
-	switch host {
-	case "example.com", "example.net", "example.org":
-		return true
-	}
-	labels := strings.Split(host, ".")
-	switch labels[len(labels)-1] {
-	case "test", "example", "invalid", "localhost":
-		return true
-	default:
-		return false
-	}
-}
-
-func loadDomainPolicy(root string) (domainPolicy, error) {
-	public, err := loadDomainList(root, publicDomainsPath)
-	if err != nil {
-		return domainPolicy{}, err
-	}
-	fixtures, err := loadDomainList(root, fixtureDomainsPath)
-	if err != nil {
-		return domainPolicy{}, err
-	}
-	for host, entry := range fixtures {
-		if publicEntry, ok := public[host]; ok {
-			return domainPolicy{}, fmt.Errorf(
-				"%s:%d: hostname %q is already listed at %s:%d",
-				entry.File, entry.Line, host, publicEntry.File, publicEntry.Line,
-			)
-		}
-	}
-	return domainPolicy{Public: public, Fixtures: fixtures}, nil
-}
-
-func loadDomainList(root, rel string) (map[string]domainPolicyEntry, error) {
-	path := filepath.Join(root, filepath.FromSlash(rel))
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, fmt.Errorf("open domain allowlist %s: %w", rel, err)
-	}
-	defer file.Close()
-
-	entries := map[string]domainPolicyEntry{}
-	var previous string
-	scanner := bufio.NewScanner(file)
-	for line := 1; scanner.Scan(); line++ {
-		host := strings.TrimSpace(scanner.Text())
-		if host == "" || strings.HasPrefix(host, "#") {
-			continue
-		}
-		if host != strings.ToLower(host) {
-			return nil, fmt.Errorf("%s:%d: hostname must be lowercase: %q", rel, line, host)
-		}
-		if err := validatePolicyHostname(host); err != nil {
-			return nil, fmt.Errorf("%s:%d: %w", rel, line, err)
-		}
-		if previous != "" && host <= previous {
-			return nil, fmt.Errorf("%s:%d: hostnames must be unique and sorted: %q", rel, line, host)
-		}
-		entries[host] = domainPolicyEntry{Host: host, File: rel, Line: line}
-		previous = host
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("read domain allowlist %s: %w", rel, err)
-	}
-	if len(entries) == 0 {
-		return nil, fmt.Errorf("%s: domain list must not be empty", rel)
-	}
-	return entries, nil
-}
-
-func validatePolicyHostname(host string) error {
-	if len(host) > 253 || !strings.Contains(host, ".") || strings.HasSuffix(host, ".") {
-		return fmt.Errorf("invalid exact hostname %q", host)
-	}
-	labels := strings.Split(host, ".")
-	for _, label := range labels {
-		if len(label) == 0 || len(label) > 63 || label[0] == '-' || label[len(label)-1] == '-' {
-			return fmt.Errorf("invalid exact hostname %q", host)
-		}
-		for _, r := range label {
-			if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' {
-				continue
-			}
-			return fmt.Errorf("invalid exact hostname %q", host)
-		}
-	}
-	if !strings.ContainsAny(labels[len(labels)-1], "abcdefghijklmnopqrstuvwxyz") {
-		return fmt.Errorf("invalid exact hostname %q", host)
-	}
-	return nil
-}

lint/domaincontract/policy_test.go

@@ -1,120 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestLoadDomainPolicy(t *testing.T) {
-	root := t.TempDir()
-	writeFile(t, root, publicDomainsPath, "# public\napi.example.com\nwww.example.com\n")
-	writeFile(t, root, fixtureDomainsPath, "# fixtures\nfixture.example.com\n")
-
-	policy, err := loadDomainPolicy(root)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(policy.Public) != 2 || len(policy.Fixtures) != 1 {
-		t.Fatalf("unexpected policy sizes: public=%d fixtures=%d", len(policy.Public), len(policy.Fixtures))
-	}
-	if policy.Public["api.example.com"].Line != 2 {
-		t.Fatalf("api.example.com line = %d, want 2", policy.Public["api.example.com"].Line)
-	}
-}
-
-func TestLoadDomainPolicyRejectsInvalidLists(t *testing.T) {
-	tests := []struct {
-		name     string
-		public   string
-		fixtures string
-		want     string
-	}{
-		{
-			name:     "uppercase",
-			public:   "API.example.com\n",
-			fixtures: "fixture.example.com\n",
-			want:     "must be lowercase",
-		},
-		{
-			name:     "unsorted",
-			public:   "www.example.com\napi.example.com\n",
-			fixtures: "fixture.example.com\n",
-			want:     "unique and sorted",
-		},
-		{
-			name:     "duplicate",
-			public:   "api.example.com\napi.example.com\n",
-			fixtures: "fixture.example.com\n",
-			want:     "unique and sorted",
-		},
-		{
-			name:     "wildcard",
-			public:   "*.example.com\n",
-			fixtures: "fixture.example.com\n",
-			want:     "invalid exact hostname",
-		},
-		{
-			name:     "scheme",
-			public:   "https://example.com\n",
-			fixtures: "fixture.example.com\n",
-			want:     "invalid exact hostname",
-		},
-		{
-			name:     "path",
-			public:   "api.example.com/v1\n",
-			fixtures: "fixture.example.com\n",
-			want:     "invalid exact hostname",
-		},
-		{
-			name:     "port",
-			public:   "api.example.com:443\n",
-			fixtures: "fixture.example.com\n",
-			want:     "invalid exact hostname",
-		},
-		{
-			name:     "cross-list duplicate",
-			public:   "api.example.com\n",
-			fixtures: "api.example.com\n",
-			want:     "already listed",
-		},
-	}
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			root := t.TempDir()
-			writeFile(t, root, publicDomainsPath, tc.public)
-			writeFile(t, root, fixtureDomainsPath, tc.fixtures)
-			_, err := loadDomainPolicy(root)
-			if err == nil || !strings.Contains(err.Error(), tc.want) {
-				t.Fatalf("loadDomainPolicy() error = %v, want substring %q", err, tc.want)
-			}
-		})
-	}
-}
-
-func TestReservedExampleHostname(t *testing.T) {
-	for _, host := range []string{
-		"example.com",
-		"example.net",
-		"example.org",
-		"example.test",
-		"docs.example",
-		"missing.invalid",
-		"service.localhost",
-	} {
-		if !isReservedExampleHostname(host) {
-			t.Errorf("%q should be a reserved example hostname", host)
-		}
-	}
-	for _, host := range []string{
-		"attacker.example.com",
-		"example.dev",
-		"private.corp.internal",
-	} {
-		if isReservedExampleHostname(host) {
-			t.Errorf("%q must still require policy approval", host)
-		}
-	}
-}

lint/domaincontract/scan.go

@@ -1,8 +1,8 @@
 // Copyright (c) 2026 Lark Technologies Pte. Ltd.
 // SPDX-License-Identifier: MIT
 
-// Package domaincontract guards resolver ownership and rejects newly introduced
-// static Go hostnames that are not covered by the repository domain policy.
+// Package domaincontract guards the Go CLI against direct reuse of the current
+// resolver-owned host FQDNs outside core.ResolveEndpoints.
 package domaincontract
 
 import (
@@ -11,7 +11,6 @@ import (
 	"go/token"
 	"io/fs"
 	"path/filepath"
-	"sort"
 	"strconv"
 	"strings"
 
@@ -76,40 +75,10 @@ func skipDir(name string) bool {
 	return false
 }
 
-// ScanRepo runs the resolver-owned endpoint guard and a full repository domain
-// inventory. CI should use ScanRepoWithOptions with a changed-from revision so
-// historical unapproved domains are not attributed to an unrelated change.
+// ScanRepo walks production .go files under root and flags string literals
+// containing a forbidden resolver host outside the allowlist. Comments and
+// _test.go files are not scanned.
 func ScanRepo(root string) ([]lintapi.Violation, error) {
-	return ScanRepoWithOptions(root, ScanOptions{})
-}
-
-type ScanOptions struct {
-	ChangedFrom string
-}
-
-func ScanRepoWithOptions(root string, opts ScanOptions) ([]lintapi.Violation, error) {
-	out, err := scanHardcodedEndpoints(root)
-	if err != nil {
-		return nil, err
-	}
-	domainViolations, err := scanUnapprovedDomains(root, opts)
-	if err != nil {
-		return nil, err
-	}
-	out = append(out, domainViolations...)
-	sort.SliceStable(out, func(i, j int) bool {
-		if out[i].File != out[j].File {
-			return out[i].File < out[j].File
-		}
-		if out[i].Line != out[j].Line {
-			return out[i].Line < out[j].Line
-		}
-		return out[i].Rule < out[j].Rule
-	})
-	return out, nil
-}
-
-func scanHardcodedEndpoints(root string) ([]lintapi.Violation, error) {
 	var out []lintapi.Violation
 	err := filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {

lint/domaincontract/unapproved.go

@@ -1,911 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import (
-	"fmt"
-	"go/ast"
-	"go/constant"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"net"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"unicode"
-
-	"github.com/larksuite/cli/lint/lintapi"
-	"golang.org/x/tools/go/packages"
-)
-
-const (
-	unapprovedDomainRule = "unapproved-domain"
-	unusedDomainRule     = "domain-allowlist-unused"
-	incompleteDomainRule = "domain-scan-incomplete"
-)
-
-type typedGoFile struct {
-	File *ast.File
-	Fset *token.FileSet
-	Info *types.Info
-}
-
-type domainEvidence struct {
-	Host string
-	Kind string
-	Expr ast.Expr
-}
-
-type evidenceKey struct {
-	Host       string
-	Start, End token.Pos
-}
-
-type fileDomainScan struct {
-	File             *ast.File
-	Fset             *token.FileSet
-	Info             *types.Info
-	Evidence         []domainEvidence
-	TypeInfoRequired []ast.Expr
-	seen             map[evidenceKey]bool
-	parents          map[ast.Node]ast.Node
-}
-
-type collectionCompositeKind uint8
-
-const (
-	notCollectionComposite collectionCompositeKind = iota
-	sequenceComposite
-	mapComposite
-)
-
-type hostnameFieldID struct {
-	Type  string
-	Field string
-}
-
-var nonNetworkHostnameFields = map[hostnameFieldID]bool{
-	{Type: "github.com/larksuite/cli/events/im.CardActionTriggerOutput", Field: "Host"}: true,
-	{Type: "github.com/larksuite/cli/internal/cmdmeta.Meta", Field: "Domain"}:           true,
-}
-
-func scanUnapprovedDomains(root string, opts ScanOptions) ([]lintapi.Violation, error) {
-	root, err := filepath.Abs(root)
-	if err != nil {
-		return nil, fmt.Errorf("resolve repository root: %w", err)
-	}
-	publicPath := filepath.Join(root, filepath.FromSlash(publicDomainsPath))
-	if _, err := os.Stat(publicPath); err != nil {
-		if os.IsNotExist(err) {
-			if _, goModErr := os.Stat(filepath.Join(root, "go.mod")); os.IsNotExist(goModErr) {
-				return nil, nil
-			}
-		}
-		return nil, fmt.Errorf("domain policy unavailable: %w", err)
-	}
-	policy, err := loadDomainPolicy(root)
-	if err != nil {
-		return nil, err
-	}
-	added, err := changedGoLineRanges(root, opts.ChangedFrom)
-	if err != nil {
-		return nil, err
-	}
-	typed, typeLoadErr := loadTypedGoFiles(root)
-	goFiles, err := trackedGoFiles(root)
-	if err != nil {
-		return nil, err
-	}
-
-	observedPublic := map[string]bool{}
-	observedFixtures := map[string]bool{}
-	inventoryComplete := typeLoadErr == nil
-	var out []lintapi.Violation
-	parseFailureReported := false
-	typeInfoGapReported := false
-	for _, rel := range goFiles {
-		path := filepath.Join(root, filepath.FromSlash(rel))
-		parsedFset := token.NewFileSet()
-		parsedFile, parseErr := parser.ParseFile(parsedFset, path, nil, 0)
-		if parseErr != nil {
-			inventoryComplete = false
-			if opts.ChangedFrom == "" {
-				out = append(out, incompleteDomainViolation(rel, parseErr))
-				parseFailureReported = true
-			} else if _, changed := added[rel]; changed {
-				out = append(out, incompleteDomainViolation(rel, parseErr))
-				parseFailureReported = true
-			}
-			continue
-		}
-		tf, ok := typed[filepath.Clean(path)]
-		if !ok {
-			tf = typedGoFile{File: parsedFile, Fset: parsedFset}
-		}
-
-		scan := newFileDomainScan(tf)
-		scan.collectSemanticEvidence()
-		scan.collectAbsoluteURLEvidence()
-		if len(scan.TypeInfoRequired) > 0 {
-			// Inventory completeness is a property of the whole HEAD. Whether
-			// this PR owns an incomplete-scan diagnostic is decided separately
-			// by the added-line intersection below.
-			inventoryComplete = false
-		}
-		for _, expr := range scan.TypeInfoRequired {
-			start := tf.Fset.Position(expr.Pos()).Line
-			end := tf.Fset.Position(expr.End()).Line
-			line := start
-			if opts.ChangedFrom != "" {
-				var intersects bool
-				line, intersects = firstAddedLineInSpan(added[rel], start, end)
-				if !intersects {
-					continue
-				}
-			}
-			typeInfoGapReported = true
-			out = append(out, incompleteDomainViolationAt(
-				rel,
-				line,
-				fmt.Errorf("Go type information unavailable for hostname-oriented field evidence"),
-			))
-			break
-		}
-		fixture := isDomainFixturePath(rel)
-		// The detector's own policy literals and contract corpus may be
-		// scanned, but they cannot justify keeping an allowlist entry.
-		policyOwner := strings.HasPrefix(rel, "lint/domaincontract/")
-		for _, evidence := range scan.Evidence {
-			if isReservedExampleHostname(evidence.Host) {
-				continue
-			}
-			if _, ok := policy.Public[evidence.Host]; ok {
-				if !fixture && !policyOwner {
-					observedPublic[evidence.Host] = true
-				}
-				continue
-			}
-			if _, ok := policy.Fixtures[evidence.Host]; ok && fixture {
-				if !policyOwner {
-					observedFixtures[evidence.Host] = true
-				}
-				continue
-			}
-			start := tf.Fset.Position(evidence.Expr.Pos()).Line
-			end := tf.Fset.Position(evidence.Expr.End()).Line
-			line := start
-			if opts.ChangedFrom != "" {
-				var intersects bool
-				line, intersects = firstAddedLineInSpan(added[rel], start, end)
-				if !intersects {
-					continue
-				}
-			}
-			suggestion := "remove the hostname or replace it with an approved public endpoint; " +
-				"public allowlist additions require evidence and CODEOWNER approval"
-			if _, fixtureOnly := policy.Fixtures[evidence.Host]; fixtureOnly && !fixture {
-				suggestion = "remove the fixture-only hostname or move this use into an approved fixture scope; " +
-					"fixture entries are not approved for production Go code or skills"
-			}
-			out = append(out, lintapi.Violation{
-				Rule:   unapprovedDomainRule,
-				Action: lintapi.ActionReject,
-				File:   rel,
-				Line:   line,
-				Message: fmt.Sprintf(
-					"unapproved hostname %q found in %s",
-					evidence.Host,
-					evidence.Kind,
-				),
-				Suggestion: suggestion,
-			})
-		}
-	}
-
-	// A syntax error is also surfaced by go/packages. Prefer the file-specific
-	// parse diagnostic when one was already reported; otherwise make a
-	// repository-wide type-loading failure explicit instead of silently
-	// continuing without the type information required by field evidence.
-	if typeLoadErr != nil && !parseFailureReported && !typeInfoGapReported {
-		out = append(out, incompleteDomainViolation("go.mod", typeLoadErr))
-	}
-
-	if inventoryComplete {
-		for host, entry := range policy.Public {
-			if !observedPublic[host] {
-				out = append(out, unusedDomainViolation(entry))
-			}
-		}
-		for host, entry := range policy.Fixtures {
-			if !observedFixtures[host] {
-				out = append(out, unusedDomainViolation(entry))
-			}
-		}
-	}
-	return out, nil
-}
-
-func trackedGoFiles(root string) ([]string, error) {
-	out, err := gitCommandOutput(root, "ls-files", "-z", "--", "*.go")
-	if err != nil {
-		return nil, fmt.Errorf("list tracked Go files: %w", err)
-	}
-	var files []string
-	for _, raw := range strings.Split(string(out), "\x00") {
-		if raw == "" {
-			continue
-		}
-		rel := filepath.ToSlash(raw)
-		if strings.HasPrefix(rel, "vendor/") || strings.HasPrefix(rel, "node_modules/") {
-			continue
-		}
-		files = append(files, rel)
-	}
-	return files, nil
-}
-
-func loadTypedGoFiles(root string) (map[string]typedGoFile, error) {
-	moduleDirs, err := trackedGoModuleDirs(root)
-	if err != nil {
-		return nil, err
-	}
-	out := map[string]typedGoFile{}
-	var firstLoadErr error
-	var loadErrCount int
-	for _, moduleDir := range moduleDirs {
-		moduleRoot := root
-		if moduleDir != "." {
-			moduleRoot = filepath.Join(root, filepath.FromSlash(moduleDir))
-		}
-		files, err := loadTypedGoModule(moduleRoot)
-		for path, file := range files {
-			out[path] = file
-		}
-		if err != nil {
-			loadErrCount++
-			if firstLoadErr == nil {
-				firstLoadErr = err
-			}
-		}
-	}
-	if loadErrCount == 1 {
-		return out, firstLoadErr
-	}
-	if loadErrCount > 1 {
-		return out, fmt.Errorf("%w (and %d more module errors)", firstLoadErr, loadErrCount-1)
-	}
-	return out, nil
-}
-
-func trackedGoModuleDirs(root string) ([]string, error) {
-	raw, err := gitCommandOutput(root, "ls-files", "-z")
-	if err != nil {
-		return nil, fmt.Errorf("list tracked Go modules: %w", err)
-	}
-	var dirs []string
-	for _, path := range strings.Split(string(raw), "\x00") {
-		path = filepath.ToSlash(path)
-		if path != "go.mod" && !strings.HasSuffix(path, "/go.mod") {
-			continue
-		}
-		dir := filepath.ToSlash(filepath.Dir(path))
-		dirs = append(dirs, dir)
-	}
-	return dirs, nil
-}
-
-func loadTypedGoModule(moduleRoot string) (map[string]typedGoFile, error) {
-	fset := token.NewFileSet()
-	cfg := &packages.Config{
-		Mode: packages.NeedName |
-			packages.NeedFiles |
-			packages.NeedCompiledGoFiles |
-			packages.NeedImports |
-			packages.NeedDeps |
-			packages.NeedTypes |
-			packages.NeedSyntax |
-			packages.NeedTypesInfo,
-		Dir:   moduleRoot,
-		Fset:  fset,
-		Tests: true,
-	}
-	pkgs, err := packages.Load(cfg, "./...")
-	if err != nil {
-		return nil, fmt.Errorf("load Go type information: %w", err)
-	}
-	out := map[string]typedGoFile{}
-	var firstPackageErr string
-	var packageErrCount int
-	packages.Visit(pkgs, nil, func(pkg *packages.Package) {
-		if pkg == nil {
-			return
-		}
-		for _, pkgErr := range pkg.Errors {
-			packageErrCount++
-			if firstPackageErr == "" {
-				firstPackageErr = pkgErr.Error()
-			}
-		}
-		if pkg.TypesInfo == nil || pkg.Fset == nil {
-			return
-		}
-		for i, file := range pkg.Syntax {
-			if i >= len(pkg.CompiledGoFiles) {
-				break
-			}
-			path := filepath.Clean(pkg.CompiledGoFiles[i])
-			if _, exists := out[path]; exists {
-				continue
-			}
-			out[path] = typedGoFile{File: file, Fset: pkg.Fset, Info: pkg.TypesInfo}
-		}
-	})
-	if packageErrCount == 1 {
-		return out, fmt.Errorf("load Go type information: %s", firstPackageErr)
-	}
-	if packageErrCount > 1 {
-		return out, fmt.Errorf(
-			"load Go type information: %s (and %d more package errors)",
-			firstPackageErr,
-			packageErrCount-1,
-		)
-	}
-	return out, nil
-}
-
-func newFileDomainScan(file typedGoFile) *fileDomainScan {
-	return &fileDomainScan{
-		File:    file.File,
-		Fset:    file.Fset,
-		Info:    file.Info,
-		seen:    map[evidenceKey]bool{},
-		parents: astParentMap(file.File),
-	}
-}
-
-func (s *fileDomainScan) collectSemanticEvidence() {
-	ast.Inspect(s.File, func(node ast.Node) bool {
-		switch n := node.(type) {
-		case *ast.AssignStmt:
-			if len(n.Lhs) != len(n.Rhs) {
-				return true
-			}
-			for i, lhs := range n.Lhs {
-				if s.Info == nil &&
-					potentialHostnameSelectorTarget(lhs) &&
-					s.hasStaticBareHostnameValue(n.Rhs[i]) {
-					s.requireTypeInfo(n.Rhs[i])
-				}
-				if index, ok := stripParens(lhs).(*ast.IndexExpr); ok {
-					switch {
-					case s.isHostnameTarget(index.X):
-						s.addMapPair(index.Index, n.Rhs[i])
-					case s.isHostnameMapKey(index.Index):
-						s.addHostValue(n.Rhs[i], "host assignment")
-					}
-					continue
-				}
-				if s.isHostnameTarget(lhs) {
-					s.addHostValue(n.Rhs[i], "host assignment")
-				}
-			}
-		case *ast.ValueSpec:
-			if len(n.Names) != len(n.Values) {
-				return true
-			}
-			for i, name := range n.Names {
-				if isHostnameSemanticName(name.Name) {
-					s.addHostValue(n.Values[i], "host assignment")
-				}
-			}
-		case *ast.KeyValueExpr:
-			if s.Info == nil && s.keyValueNeedsTypeInfo(n) {
-				s.requireTypeInfo(n.Value)
-			}
-			if s.isHostnameKeyValue(n) {
-				s.addHostValue(n.Value, "host assignment")
-			}
-		}
-		return true
-	})
-}
-
-func (s *fileDomainScan) requireTypeInfo(expr ast.Expr) {
-	for _, existing := range s.TypeInfoRequired {
-		if existing.Pos() == expr.Pos() && existing.End() == expr.End() {
-			return
-		}
-	}
-	s.TypeInfoRequired = append(s.TypeInfoRequired, expr)
-}
-
-func (s *fileDomainScan) hasStaticBareHostnameValue(expr ast.Expr) bool {
-	value, ok := staticStringValue(expr, s.Info, nil)
-	if !ok {
-		return false
-	}
-	host, ok := semanticHostname(value)
-	return ok && !isReservedExampleHostname(host)
-}
-
-func (s *fileDomainScan) keyValueNeedsTypeInfo(pair *ast.KeyValueExpr) bool {
-	composite, ok := s.parents[pair].(*ast.CompositeLit)
-	if !ok {
-		return false
-	}
-	if _, explicitMap := composite.Type.(*ast.MapType); explicitMap {
-		return false
-	}
-	key, ok := pair.Key.(*ast.Ident)
-	return ok && isHostnameSemanticName(key.Name) && s.hasStaticBareHostnameValue(pair.Value)
-}
-
-func potentialHostnameSelectorTarget(expr ast.Expr) bool {
-	switch n := stripParens(expr).(type) {
-	case *ast.SelectorExpr:
-		return isHostnameSemanticName(n.Sel.Name)
-	case *ast.StarExpr:
-		return potentialHostnameSelectorTarget(n.X)
-	case *ast.IndexExpr:
-		return potentialHostnameSelectorTarget(n.X)
-	default:
-		return false
-	}
-}
-
-func (s *fileDomainScan) collectAbsoluteURLEvidence() {
-	ast.Inspect(s.File, func(node ast.Node) bool {
-		expr, ok := node.(ast.Expr)
-		if !ok {
-			return true
-		}
-		if ident, ok := expr.(*ast.Ident); ok && s.Info != nil && s.Info.Defs[ident] != nil {
-			// A declaration name may carry the constant value in types.Info,
-			// but it is not a second source expression.
-			return true
-		}
-		value, ok := staticStringValue(expr, s.Info, nil)
-		if !ok {
-			return true
-		}
-		if s.hasStaticStringContainer(expr) {
-			return true
-		}
-		host, ok := absoluteURLHostname(value)
-		if ok {
-			s.addEvidence(host, "absolute URL", expr)
-		}
-		return true
-	})
-}
-
-func (s *fileDomainScan) hasStaticStringContainer(expr ast.Expr) bool {
-	parent, ok := s.parents[expr].(ast.Expr)
-	if !ok {
-		return false
-	}
-	switch parent.(type) {
-	case *ast.BinaryExpr, *ast.ParenExpr:
-		_, ok := staticStringValue(parent, s.Info, nil)
-		return ok
-	default:
-		return false
-	}
-}
-
-func (s *fileDomainScan) addHostValue(expr ast.Expr, kind string) {
-	expr = stripParens(expr)
-	if composite, ok := expr.(*ast.CompositeLit); ok {
-		switch s.collectionCompositeKind(composite) {
-		case sequenceComposite:
-			for _, element := range composite.Elts {
-				if valueExpr, ok := element.(ast.Expr); ok {
-					s.addHostValue(valueExpr, "host collection")
-				}
-			}
-		case mapComposite:
-			for _, element := range composite.Elts {
-				pair, ok := element.(*ast.KeyValueExpr)
-				if !ok {
-					continue
-				}
-				keyExpr, ok := pair.Key.(ast.Expr)
-				if !ok {
-					continue
-				}
-				s.addMapPair(keyExpr, pair.Value)
-			}
-		default:
-			if s.Info == nil {
-				s.requireTypeInfoForUnclassifiedCollection(composite)
-			}
-			return
-		}
-		return
-	}
-	if evidence, ok := s.hostnameEvidence(expr, kind); ok {
-		s.addEvidence(evidence.Host, evidence.Kind, evidence.Expr)
-	}
-}
-
-func (s *fileDomainScan) requireTypeInfoForUnclassifiedCollection(composite *ast.CompositeLit) {
-	for _, element := range composite.Elts {
-		if pair, ok := element.(*ast.KeyValueExpr); ok {
-			keyExpr, ok := pair.Key.(ast.Expr)
-			if !ok {
-				continue
-			}
-			keyIsHost := s.hasStaticBareHostnameValue(keyExpr)
-			valueIsHost := s.hasStaticBareHostnameValue(pair.Value)
-			if keyIsHost == valueIsHost {
-				continue
-			}
-			if keyIsHost {
-				s.requireTypeInfo(keyExpr)
-			} else {
-				s.requireTypeInfo(pair.Value)
-			}
-			continue
-		}
-		valueExpr, ok := element.(ast.Expr)
-		if ok && s.hasStaticBareHostnameValue(valueExpr) {
-			s.requireTypeInfo(valueExpr)
-		}
-	}
-}
-
-// addMapPair reports a map side only when it is the sole hostname-shaped
-// static value. A semantic map name does not establish whether a string map
-// is hostname->metadata or alias->hostname, so reporting both sides would turn
-// filenames such as client.pem into blocking hostname evidence.
-func (s *fileDomainScan) addMapPair(key, value ast.Expr) {
-	keyEvidence, keyOK := s.hostnameEvidence(key, "host collection")
-	valueEvidence, valueOK := s.hostnameEvidence(value, "host collection")
-	if keyOK == valueOK {
-		return
-	}
-	if keyOK {
-		s.addEvidence(keyEvidence.Host, keyEvidence.Kind, keyEvidence.Expr)
-		return
-	}
-	s.addEvidence(valueEvidence.Host, valueEvidence.Kind, valueEvidence.Expr)
-}
-
-func (s *fileDomainScan) hostnameEvidence(expr ast.Expr, kind string) (domainEvidence, bool) {
-	expr = stripParens(expr)
-	value, ok := staticStringValue(expr, s.Info, nil)
-	if !ok {
-		return domainEvidence{}, false
-	}
-	if host, ok := absoluteURLHostname(value); ok {
-		return domainEvidence{Host: host, Kind: "absolute URL", Expr: expr}, true
-	}
-	if host, ok := semanticHostname(value); ok {
-		return domainEvidence{Host: host, Kind: kind, Expr: expr}, true
-	}
-	return domainEvidence{}, false
-}
-
-func (s *fileDomainScan) collectionCompositeKind(expr *ast.CompositeLit) collectionCompositeKind {
-	if s.Info != nil {
-		if tv, ok := s.Info.Types[expr]; ok && tv.Type != nil {
-			switch tv.Type.Underlying().(type) {
-			case *types.Array, *types.Slice:
-				return sequenceComposite
-			case *types.Map:
-				return mapComposite
-			}
-		}
-	}
-	switch expr.Type.(type) {
-	case *ast.ArrayType:
-		return sequenceComposite
-	case *ast.MapType:
-		return mapComposite
-	default:
-		return notCollectionComposite
-	}
-}
-
-func (s *fileDomainScan) addEvidence(host, kind string, expr ast.Expr) {
-	key := evidenceKey{Host: host, Start: expr.Pos(), End: expr.End()}
-	if s.seen[key] {
-		return
-	}
-	s.seen[key] = true
-	s.Evidence = append(s.Evidence, domainEvidence{Host: host, Kind: kind, Expr: expr})
-}
-
-func staticStringValue(expr ast.Expr, info *types.Info, seen map[*ast.Object]bool) (string, bool) {
-	if info != nil {
-		if tv, ok := info.Types[expr]; ok && tv.Value != nil && tv.Value.Kind() == constant.String {
-			return constant.StringVal(tv.Value), true
-		}
-	}
-	switch n := expr.(type) {
-	case *ast.BasicLit:
-		if n.Kind != token.STRING {
-			return "", false
-		}
-		value, err := strconv.Unquote(n.Value)
-		return value, err == nil
-	case *ast.ParenExpr:
-		return staticStringValue(n.X, info, seen)
-	case *ast.BinaryExpr:
-		if n.Op != token.ADD {
-			return "", false
-		}
-		left, ok := staticStringValue(n.X, info, seen)
-		if !ok {
-			return "", false
-		}
-		right, ok := staticStringValue(n.Y, info, seen)
-		if !ok {
-			return "", false
-		}
-		return left + right, true
-	case *ast.Ident:
-		if info != nil {
-			if obj := info.ObjectOf(n); obj != nil {
-				if c, ok := obj.(*types.Const); ok {
-					if c.Val().Kind() == constant.String {
-						return constant.StringVal(c.Val()), true
-					}
-				}
-			}
-		}
-		if n.Obj == nil || n.Obj.Kind != ast.Con {
-			return "", false
-		}
-		if seen == nil {
-			seen = map[*ast.Object]bool{}
-		}
-		if seen[n.Obj] {
-			return "", false
-		}
-		seen[n.Obj] = true
-		defer delete(seen, n.Obj)
-		spec, ok := n.Obj.Decl.(*ast.ValueSpec)
-		if !ok {
-			return "", false
-		}
-		for i, name := range spec.Names {
-			if name.Name == n.Name && i < len(spec.Values) {
-				return staticStringValue(spec.Values[i], info, seen)
-			}
-		}
-	}
-	return "", false
-}
-
-func absoluteURLHostname(value string) (string, bool) {
-	value = strings.TrimSpace(value)
-	parsed, err := url.Parse(value)
-	if err != nil || parsed.Host == "" {
-		return "", false
-	}
-	switch strings.ToLower(parsed.Scheme) {
-	case "http", "https", "ws", "wss":
-	default:
-		return "", false
-	}
-	return normalizeCandidateHostname(parsed.Hostname())
-}
-
-func semanticHostname(value string) (string, bool) {
-	value = strings.TrimSpace(value)
-	if value == "" || strings.ContainsAny(value, `/\?#@`) || strings.ContainsAny(value, " \t\r\n") {
-		return "", false
-	}
-	parsed, err := url.Parse("//" + value)
-	if err != nil || parsed.Host == "" || parsed.Path != "" {
-		return "", false
-	}
-	return normalizeCandidateHostname(parsed.Hostname())
-}
-
-func normalizeCandidateHostname(host string) (string, bool) {
-	host = strings.TrimSuffix(strings.ToLower(strings.TrimSpace(host)), ".")
-	if host == "" || !strings.Contains(host, ".") || net.ParseIP(host) != nil {
-		return "", false
-	}
-	labels := strings.Split(host, ".")
-	for _, label := range labels {
-		if label == "" || strings.HasPrefix(label, "-") || strings.HasSuffix(label, "-") {
-			return "", false
-		}
-		for _, r := range label {
-			if unicode.IsLetter(r) || unicode.IsDigit(r) || r == '-' {
-				continue
-			}
-			return "", false
-		}
-	}
-	return host, true
-}
-
-func (s *fileDomainScan) isHostnameTarget(expr ast.Expr) bool {
-	switch n := stripParens(expr).(type) {
-	case *ast.Ident:
-		return isHostnameSemanticName(n.Name)
-	case *ast.SelectorExpr:
-		return s.isHostnameSelector(n)
-	case *ast.StarExpr:
-		return s.isHostnameTarget(n.X)
-	default:
-		return false
-	}
-}
-
-func (s *fileDomainScan) isHostnameKeyValue(pair *ast.KeyValueExpr) bool {
-	composite, ok := s.parents[pair].(*ast.CompositeLit)
-	if !ok {
-		return false
-	}
-	switch s.collectionCompositeKind(composite) {
-	case mapComposite:
-		key, ok := pair.Key.(ast.Expr)
-		return ok && s.isHostnameMapKey(key)
-	case notCollectionComposite:
-		ident, ok := pair.Key.(*ast.Ident)
-		return ok && s.isHostnameStructField(composite, ident.Name)
-	default:
-		return false
-	}
-}
-
-func (s *fileDomainScan) isHostnameMapKey(expr ast.Expr) bool {
-	value, ok := staticStringValue(expr, s.Info, nil)
-	return ok && isHostnameSemanticName(value)
-}
-
-func (s *fileDomainScan) isHostnameSelector(selector *ast.SelectorExpr) bool {
-	if s.Info == nil || !isHostnameSemanticName(selector.Sel.Name) {
-		return false
-	}
-	selection := s.Info.Selections[selector]
-	if selection == nil || selection.Kind() != types.FieldVal {
-		return false
-	}
-	return !nonNetworkHostnameFields[hostnameFieldID{
-		Type:  namedTypeID(selection.Recv()),
-		Field: selector.Sel.Name,
-	}]
-}
-
-func (s *fileDomainScan) isHostnameStructField(composite *ast.CompositeLit, field string) bool {
-	if s.Info == nil || !isHostnameSemanticName(field) {
-		return false
-	}
-	typeID := namedTypeID(s.Info.TypeOf(composite))
-	if typeID == "" {
-		return false
-	}
-	return !nonNetworkHostnameFields[hostnameFieldID{Type: typeID, Field: field}]
-}
-
-func namedTypeID(typ types.Type) string {
-	for {
-		switch t := typ.(type) {
-		case *types.Pointer:
-			typ = t.Elem()
-		case *types.Named:
-			obj := t.Obj()
-			if obj == nil || obj.Pkg() == nil {
-				return ""
-			}
-			return obj.Pkg().Path() + "." + obj.Name()
-		default:
-			return ""
-		}
-	}
-}
-
-func isHostnameSemanticName(name string) bool {
-	lower := strings.ToLower(name)
-	switch lower {
-	case "host", "hosts", "hostname", "hostnames", "domain", "domains":
-		return true
-	}
-	for _, marker := range []string{
-		"HostBy", "HostsBy", "HostnameBy", "HostnamesBy", "DomainBy", "DomainsBy",
-	} {
-		if i := strings.Index(name, marker); i >= 0 {
-			end := i + len(marker)
-			if end < len(name) && unicode.IsUpper(rune(name[end])) {
-				return true
-			}
-		}
-	}
-	for _, prefix := range []string{
-		"hostBy", "hostsBy", "hostnameBy", "hostnamesBy", "domainBy", "domainsBy",
-	} {
-		if strings.HasPrefix(name, prefix) &&
-			len(name) > len(prefix) &&
-			unicode.IsUpper(rune(name[len(prefix)])) {
-			return true
-		}
-	}
-	if i := strings.LastIndexAny(name, "_-"); i >= 0 {
-		return isHostnameSemanticName(name[i+1:])
-	}
-	for _, suffix := range []string{"Hostnames", "Hostname", "Domains", "Domain", "Hosts", "Host"} {
-		if strings.HasSuffix(name, suffix) && len(name) > len(suffix) {
-			return true
-		}
-	}
-	return false
-}
-
-func stripParens(expr ast.Expr) ast.Expr {
-	for {
-		paren, ok := expr.(*ast.ParenExpr)
-		if !ok {
-			return expr
-		}
-		expr = paren.X
-	}
-}
-
-func astParentMap(root ast.Node) map[ast.Node]ast.Node {
-	parents := map[ast.Node]ast.Node{}
-	var stack []ast.Node
-	ast.Inspect(root, func(node ast.Node) bool {
-		if node == nil {
-			stack = stack[:len(stack)-1]
-			return false
-		}
-		if len(stack) > 0 {
-			parents[node] = stack[len(stack)-1]
-		}
-		stack = append(stack, node)
-		return true
-	})
-	return parents
-}
-
-func isDomainFixturePath(rel string) bool {
-	rel = filepath.ToSlash(rel)
-	if strings.HasPrefix(rel, "skills/") {
-		return false
-	}
-	if strings.HasSuffix(rel, "_test.go") || strings.HasPrefix(rel, "tests/") {
-		return true
-	}
-	for _, part := range strings.Split(rel, "/") {
-		if part == "testdata" {
-			return true
-		}
-	}
-	return false
-}
-
-func unusedDomainViolation(entry domainPolicyEntry) lintapi.Violation {
-	return lintapi.Violation{
-		Rule:       unusedDomainRule,
-		Action:     lintapi.ActionReject,
-		File:       entry.File,
-		Line:       entry.Line,
-		Message:    fmt.Sprintf("domain allowlist entry %q has no in-scope Go reference", entry.Host),
-		Suggestion: "remove the unused entry; allowlist entries must be justified by a current in-scope reference",
-	}
-}
-
-func incompleteDomainViolation(file string, err error) lintapi.Violation {
-	return incompleteDomainViolationAt(file, 1, err)
-}
-
-func incompleteDomainViolationAt(file string, line int, err error) lintapi.Violation {
-	return lintapi.Violation{
-		Rule:       incompleteDomainRule,
-		Action:     lintapi.ActionReject,
-		File:       file,
-		Line:       line,
-		Message:    "domain scan incomplete: " + err.Error(),
-		Suggestion: "fix the Go parse or type-loading error so hostname analysis can complete",
-	}
-}

lint/domaincontract/unapproved_repo_test.go

@@ -1,462 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import (
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/lint/lintapi"
-)
-
-func gitTestCommand(t *testing.T, root string, args ...string) string {
-	t.Helper()
-	cmd := exec.Command("git", args...)
-	cmd.Dir = root
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
-	}
-	return strings.TrimSpace(string(out))
-}
-
-func setupDomainDiffRepo(t *testing.T, target string) (root, base string) {
-	t.Helper()
-	root = t.TempDir()
-	writeFile(t, root, "go.mod", "module example.com/domainfixture\n\ngo 1.23.0\n")
-	writeFile(t, root, publicDomainsPath, "# public\npublic.example.com\n")
-	writeFile(t, root, fixtureDomainsPath, "# fixtures\nfixture.example.com\n")
-	writeFile(t, root, "policy_refs.go", "package sample\n\nvar APIHost = \"public.example.com\"\n")
-	writeFile(t, root, "policy_refs_test.go", "package sample\n\nvar FixtureHost = \"fixture.example.com\"\n")
-	writeFile(t, root, "target.go", target)
-
-	gitTestCommand(t, root, "init", "-q")
-	gitTestCommand(t, root, "config", "user.name", "Domain Contract Test")
-	gitTestCommand(t, root, "config", "user.email", "domain-contract@example.com")
-	gitTestCommand(t, root, "add", ".")
-	gitTestCommand(t, root, "-c", "commit.gpgsign=false", "commit", "-qm", "base")
-	return root, gitTestCommand(t, root, "rev-parse", "HEAD")
-}
-
-func commitDomainDiff(t *testing.T, root, message string) {
-	t.Helper()
-	gitTestCommand(t, root, "add", "-A")
-	gitTestCommand(t, root, "-c", "commit.gpgsign=false", "commit", "-qm", message)
-}
-
-func violationsForRule(vs []lintapi.Violation, rule string) []lintapi.Violation {
-	var out []lintapi.Violation
-	for _, v := range vs {
-		if v.Rule == rule {
-			out = append(out, v)
-		}
-	}
-	return out
-}
-
-func scanDomainDiff(t *testing.T, root, base string) []lintapi.Violation {
-	t.Helper()
-	vs, err := ScanRepoWithOptions(root, ScanOptions{ChangedFrom: base})
-	if err != nil {
-		t.Fatal(err)
-	}
-	return vs
-}
-
-func TestUnapprovedDomainDiffContract(t *testing.T) {
-	t.Run("new PR 1975 case", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar unrelated = 1\nvar APIHost = \"internal-api-drive-stream.larkoffice.com\"\n")
-		commitDomainDiff(t, root, "add internal host")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "internal-api-drive-stream.larkoffice.com") {
-			t.Fatalf("violations = %+v, want PR 1975 hostname", got)
-		}
-	})
-
-	t.Run("hostname field in nested Go module", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "nested/go.mod", "module example.com/nested\n\ngo 1.23.0\n")
-		writeFile(t, root, "nested/target.go",
-			"package nested\n\ntype Config struct{ Host string }\n\n"+
-				"var config = Config{Host: \"private.corp.internal\"}\n")
-		commitDomainDiff(t, root, "add nested module hostname")
-
-		all := scanDomainDiff(t, root, base)
-		got := violationsForRule(all, unapprovedDomainRule)
-		if len(got) != 1 || filepath.ToSlash(got[0].File) != "nested/target.go" ||
-			!strings.Contains(got[0].Message, "private.corp.internal") {
-			t.Fatalf("violations = %+v, want nested-module hostname rejection", got)
-		}
-		if incomplete := violationsForRule(all, incompleteDomainRule); len(incomplete) != 0 {
-			t.Fatalf("nested module must have complete type information: %+v", incomplete)
-		}
-	})
-
-	t.Run("changed excluded field reports incomplete scan", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "excluded.go",
-			"//go:build domaincontract_never && !domaincontract_never\n\npackage sample\n\n"+
-				"type Config struct{ Host string }\n\n"+
-				"var config = Config{Host: \"private.corp.internal\"}\n")
-		commitDomainDiff(t, root, "add excluded hostname field")
-
-		all := scanDomainDiff(t, root, base)
-		got := violationsForRule(all, incompleteDomainRule)
-		if len(got) != 1 || filepath.Base(got[0].File) != "excluded.go" || got[0].Line != 7 {
-			t.Fatalf("violations = %+v, want changed field scan-incomplete at line 7", got)
-		}
-		if unapproved := violationsForRule(all, unapprovedDomainRule); len(unapproved) != 0 {
-			t.Fatalf("untyped field must not produce an unverified hostname finding: %+v", unapproved)
-		}
-	})
-
-	t.Run("changed excluded selector reports incomplete scan", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "excluded.go",
-			"//go:build domaincontract_never && !domaincontract_never\n\npackage sample\n\n"+
-				"type Config struct{ Host string }\n\n"+
-				"func configure(config *Config) { config.Host = \"private.corp.internal\" }\n")
-		commitDomainDiff(t, root, "add excluded hostname selector")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), incompleteDomainRule)
-		if len(got) != 1 || filepath.Base(got[0].File) != "excluded.go" || got[0].Line != 7 {
-			t.Fatalf("violations = %+v, want changed selector scan-incomplete at line 7", got)
-		}
-	})
-
-	t.Run("changed excluded named slice reports incomplete scan", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "excluded.go",
-			"//go:build domaincontract_never && !domaincontract_never\n\npackage sample\n\n"+
-				"type HostList []string\n\n"+
-				"var AllowedHosts = HostList{\n\t\"attacker.zip\",\n}\n")
-		commitDomainDiff(t, root, "add excluded hostname slice")
-
-		all := scanDomainDiff(t, root, base)
-		got := violationsForRule(all, incompleteDomainRule)
-		if len(got) != 1 || filepath.Base(got[0].File) != "excluded.go" || got[0].Line != 8 {
-			t.Fatalf("violations = %+v, want named-slice scan-incomplete at line 8", got)
-		}
-		if unapproved := violationsForRule(all, unapprovedDomainRule); len(unapproved) != 0 {
-			t.Fatalf("untyped named slice must not produce an unverified hostname finding: %+v", unapproved)
-		}
-	})
-
-	t.Run("changed excluded named map reports incomplete scan", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "excluded.go",
-			"//go:build domaincontract_never && !domaincontract_never\n\npackage sample\n\n"+
-				"type HostSet map[string]struct{}\n\n"+
-				"var AllowedHosts = HostSet{\n\t\"attacker.zip\": {},\n}\n")
-		commitDomainDiff(t, root, "add excluded hostname map")
-
-		all := scanDomainDiff(t, root, base)
-		got := violationsForRule(all, incompleteDomainRule)
-		if len(got) != 1 || filepath.Base(got[0].File) != "excluded.go" || got[0].Line != 8 {
-			t.Fatalf("violations = %+v, want named-map scan-incomplete at line 8", got)
-		}
-		if unapproved := violationsForRule(all, unapprovedDomainRule); len(unapproved) != 0 {
-			t.Fatalf("untyped named map must not produce an unverified hostname finding: %+v", unapproved)
-		}
-	})
-
-	t.Run("changed excluded unrelated code stays allowed", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "excluded.go",
-			"//go:build domaincontract_never && !domaincontract_never\n\npackage sample\n\nvar unrelated = 2\n")
-		commitDomainDiff(t, root, "add excluded unrelated code")
-
-		if got := violationsForRule(scanDomainDiff(t, root, base), incompleteDomainRule); len(got) != 0 {
-			t.Fatalf("unrelated excluded code must not require hostname type information: %+v", got)
-		}
-	})
-
-	t.Run("new element in existing collection", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t,
-			"package sample\n\nvar ExtraHosts = []string{\n\t\"public.example.com\",\n}\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar ExtraHosts = []string{\n\t\"public.example.com\",\n\t\"attacker.zip\",\n}\n")
-		commitDomainDiff(t, root, "add collection host")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "attacker.zip") {
-			t.Fatalf("violations = %+v, want attacker.zip", got)
-		}
-		if got[0].Line != 5 {
-			t.Fatalf("violation line = %d, want 5", got[0].Line)
-		}
-	})
-
-	t.Run("multiline expression changed segment", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t,
-			"package sample\n\nvar ExtraHost = \"private.corp.\" +\n\t\"example.com\"\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar ExtraHost = \"private.corp.\" +\n\t\"internal\"\n")
-		commitDomainDiff(t, root, "change concatenated host")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "private.corp.internal") {
-			t.Fatalf("violations = %+v, want private.corp.internal", got)
-		}
-		if got[0].Line != 4 {
-			t.Fatalf("violation line = %d, want changed line 4", got[0].Line)
-		}
-	})
-
-	t.Run("unrelated change beside historical hostname", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t,
-			"package sample\n\nvar HistoricalHost = \"historical.private.internal\"\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar HistoricalHost = \"historical.private.internal\"\nvar unrelated = 1\n")
-		commitDomainDiff(t, root, "add unrelated value")
-
-		if got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule); len(got) != 0 {
-			t.Fatalf("unexpected historical-domain violation: %+v", got)
-		}
-	})
-
-	t.Run("historical hostname expression changed", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t,
-			"package sample\n\nvar HistoricalHost = \"historical.private.internal\"\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar HistoricalHost = \"replacement.private.internal\"\n")
-		commitDomainDiff(t, root, "change historical host")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "replacement.private.internal") {
-			t.Fatalf("violations = %+v, want replacement.private.internal", got)
-		}
-	})
-
-	t.Run("new assignment references existing constant", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t,
-			"package sample\n\nconst existingConst = \"private.corp.internal\"\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nconst existingConst = \"private.corp.internal\"\nvar APIHost = existingConst\n")
-		commitDomainDiff(t, root, "use existing hostname constant")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "private.corp.internal") {
-			t.Fatalf("violations = %+v, want private.corp.internal", got)
-		}
-		if got[0].Line != 4 {
-			t.Fatalf("violation line = %d, want 4", got[0].Line)
-		}
-	})
-
-	t.Run("allowlisted hostname", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar unrelated = 1\nvar BackupHost = \"public.example.com\"\n")
-		commitDomainDiff(t, root, "add public host")
-
-		if got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule); len(got) != 0 {
-			t.Fatalf("unexpected public-domain violation: %+v", got)
-		}
-	})
-
-	t.Run("reserved example URL", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar unrelated = 1\nfunc fakeValue() string { return \"https://example.test/resource\" }\n")
-		commitDomainDiff(t, root, "add safe example URL")
-
-		if got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule); len(got) != 0 {
-			t.Fatalf("unexpected reserved-example violation: %+v", got)
-		}
-	})
-
-	t.Run("historical type gap suppresses unused policy diagnostics", func(t *testing.T) {
-		root, _ := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, publicDomainsPath,
-			"# public\nplatform.example.com\npublic.example.com\n")
-		writeFile(t, root, "excluded.go",
-			"//go:build domaincontract_never && !domaincontract_never\n\npackage sample\n\n"+
-				"type Config struct{ Host string }\n\n"+
-				"var config = Config{Host: \"platform.example.com\"}\n")
-		commitDomainDiff(t, root, "add historical platform hostname")
-		base := gitTestCommand(t, root, "rev-parse", "HEAD")
-
-		writeFile(t, root, "target.go", "package sample\n\nvar unrelated = 2\n")
-		commitDomainDiff(t, root, "change unrelated code")
-
-		all := scanDomainDiff(t, root, base)
-		if got := violationsForRule(all, incompleteDomainRule); len(got) != 0 {
-			t.Fatalf("historical type gap must not be attributed to this change: %+v", got)
-		}
-		if got := violationsForRule(all, unusedDomainRule); len(got) != 0 {
-			t.Fatalf("incomplete inventory must not produce unused-policy diagnostics: %+v", got)
-		}
-	})
-
-	t.Run("allowlist does not approve subdomains", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar unrelated = 1\nvar BackupHost = \"evil.public.example.com\"\n")
-		commitDomainDiff(t, root, "add unapproved public subdomain")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "evil.public.example.com") {
-			t.Fatalf("violations = %+v, want evil.public.example.com", got)
-		}
-	})
-
-	t.Run("multi assignment pairs names and values", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, publicDomainsPath,
-			"# public\nopen.larksuite.com\npublic.example.com\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar unrelated = 1\nvar APIHost, BackupHost = \"open.larksuite.com\", \"attacker.zip\"\n")
-		commitDomainDiff(t, root, "add multiple hosts")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "attacker.zip") {
-			t.Fatalf("violations = %+v, want only attacker.zip", got)
-		}
-	})
-
-	t.Run("IDN hostname is rejected", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar unrelated = 1\nvar BackupHost = \"例子.公司.cn\"\n")
-		commitDomainDiff(t, root, "add IDN hostname")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "例子.公司.cn") {
-			t.Fatalf("violations = %+v, want IDN hostname", got)
-		}
-	})
-
-	t.Run("fixture limited to test files", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nvar unrelated = 1\nvar ProductionHost = \"fixture.example.com\"\n")
-		commitDomainDiff(t, root, "use fixture in production")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "fixture.example.com") {
-			t.Fatalf("violations = %+v, want production fixture rejection", got)
-		}
-		if !strings.Contains(got[0].Suggestion, "fixture-only hostname") ||
-			strings.Contains(got[0].Suggestion, "public allowlist") {
-			t.Fatalf("suggestion = %q, want fixture-scope guidance", got[0].Suggestion)
-		}
-	})
-
-	t.Run("fixture accepted in test file", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "new_target_test.go",
-			"package sample\n\nvar BackupHost = \"fixture.example.com\"\n")
-		commitDomainDiff(t, root, "use fixture in test")
-
-		if got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule); len(got) != 0 {
-			t.Fatalf("unexpected fixture-domain violation: %+v", got)
-		}
-	})
-
-	t.Run("fixture allowlist does not approve subdomains", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "new_target_test.go",
-			"package sample\n\nvar BackupHost = \"evil.fixture.example.com\"\n")
-		commitDomainDiff(t, root, "use unapproved fixture subdomain")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "evil.fixture.example.com") {
-			t.Fatalf("violations = %+v, want exact fixture match", got)
-		}
-	})
-
-	t.Run("fixture rejected in skills", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "skills/example/example_test.go",
-			"package example\n\nvar BackupHost = \"fixture.example.com\"\n")
-		commitDomainDiff(t, root, "use fixture in skill")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "fixture.example.com") {
-			t.Fatalf("violations = %+v, want skill fixture rejection", got)
-		}
-	})
-
-	t.Run("pure rename", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t,
-			"package sample\n\nvar HistoricalHost = \"historical.private.internal\"\n")
-		gitTestCommand(t, root, "mv", "target.go", "renamed.go")
-		commitDomainDiff(t, root, "rename file")
-
-		if got := violationsForRule(scanDomainDiff(t, root, base), unapprovedDomainRule); len(got) != 0 {
-			t.Fatalf("unexpected rename violation: %+v", got)
-		}
-	})
-}
-
-func TestUnapprovedDomainPolicyAndFailurePaths(t *testing.T) {
-	t.Run("unused policy entry", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, publicDomainsPath,
-			"# public\npublic.example.com\nunused.example.com\n")
-		commitDomainDiff(t, root, "add unused policy")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unusedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "unused.example.com") {
-			t.Fatalf("violations = %+v, want unused.example.com", got)
-		}
-	})
-
-	t.Run("public entry used only by fixture", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, publicDomainsPath,
-			"# public\npublic.example.com\ntest-only.example.com\n")
-		writeFile(t, root, "public_only_test.go",
-			"package sample\n\nvar BackupHost = \"test-only.example.com\"\n")
-		commitDomainDiff(t, root, "add test-only public policy")
-
-		got := violationsForRule(scanDomainDiff(t, root, base), unusedDomainRule)
-		if len(got) != 1 || !strings.Contains(got[0].Message, "test-only.example.com") {
-			t.Fatalf("violations = %+v, want test-only.example.com", got)
-		}
-	})
-
-	t.Run("changed Go parse failure", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "target.go", "package sample\n\nfunc broken(\n")
-		commitDomainDiff(t, root, "break source")
-
-		all := scanDomainDiff(t, root, base)
-		got := violationsForRule(all, incompleteDomainRule)
-		if len(got) != 1 || filepath.Base(got[0].File) != "target.go" {
-			t.Fatalf("violations = %+v, want target.go scan-incomplete", got)
-		}
-		if unused := violationsForRule(all, unusedDomainRule); len(unused) != 0 {
-			t.Fatalf("parse failure must not produce unreliable unused-policy diagnostics: %+v", unused)
-		}
-	})
-
-	t.Run("repository type loading failure", func(t *testing.T) {
-		root, base := setupDomainDiffRepo(t, "package sample\n\nvar unrelated = 1\n")
-		writeFile(t, root, "go.mod", "module example.com/domainfixture\n\ngo 1.23.0\n\n"+
-			"require example.com/missing v0.0.0\n\nreplace example.com/missing => ./missing\n")
-		writeFile(t, root, "target.go",
-			"package sample\n\nimport _ \"example.com/missing\"\n\n"+
-				"type Config struct{ Host string }\nvar config = Config{Host: \"malicious.corp.internal\"}\n")
-		commitDomainDiff(t, root, "break type loading")
-
-		all := scanDomainDiff(t, root, base)
-		got := violationsForRule(all, incompleteDomainRule)
-		if len(got) != 1 || filepath.Base(got[0].File) != "go.mod" {
-			t.Fatalf("violations = %+v, want go.mod scan-incomplete", got)
-		}
-		if !strings.Contains(got[0].Message, "load Go type information") {
-			t.Fatalf("message = %q, want type-loading failure", got[0].Message)
-		}
-		if unused := violationsForRule(all, unusedDomainRule); len(unused) != 0 {
-			t.Fatalf("type-loading failure must not produce unreliable unused-policy diagnostics: %+v", unused)
-		}
-	})
-}

lint/domaincontract/unapproved_test.go

@@ -1,380 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package domaincontract
-
-import (
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"sort"
-	"testing"
-)
-
-func scanDomainEvidence(t *testing.T, source string) []domainEvidence {
-	t.Helper()
-	fset := token.NewFileSet()
-	file, err := parser.ParseFile(fset, "fixture.go", source, 0)
-	if err != nil {
-		t.Fatalf("parse fixture: %v\n%s", err, source)
-	}
-	scan := newFileDomainScan(typedGoFile{File: file, Fset: fset})
-	scan.collectSemanticEvidence()
-	scan.collectAbsoluteURLEvidence()
-	sort.Slice(scan.Evidence, func(i, j int) bool {
-		if scan.Evidence[i].Host != scan.Evidence[j].Host {
-			return scan.Evidence[i].Host < scan.Evidence[j].Host
-		}
-		return scan.Evidence[i].Expr.Pos() < scan.Evidence[j].Expr.Pos()
-	})
-	return scan.Evidence
-}
-
-func scanTypedDomainEvidence(t *testing.T, source string) []domainEvidence {
-	t.Helper()
-	return scanTypedDomainEvidenceInPackage(t, "fixture", source)
-}
-
-func scanTypedDomainEvidenceInPackage(t *testing.T, packagePath, source string) []domainEvidence {
-	t.Helper()
-	fset := token.NewFileSet()
-	file, err := parser.ParseFile(fset, "fixture.go", source, 0)
-	if err != nil {
-		t.Fatalf("parse fixture: %v\n%s", err, source)
-	}
-	info := &types.Info{
-		Types:      map[ast.Expr]types.TypeAndValue{},
-		Defs:       map[*ast.Ident]types.Object{},
-		Uses:       map[*ast.Ident]types.Object{},
-		Selections: map[*ast.SelectorExpr]*types.Selection{},
-	}
-	if _, err := (&types.Config{}).Check(packagePath, fset, []*ast.File{file}, info); err != nil {
-		t.Fatalf("type-check fixture: %v\n%s", err, source)
-	}
-	scan := newFileDomainScan(typedGoFile{File: file, Fset: fset, Info: info})
-	scan.collectSemanticEvidence()
-	scan.collectAbsoluteURLEvidence()
-	sort.Slice(scan.Evidence, func(i, j int) bool {
-		if scan.Evidence[i].Host != scan.Evidence[j].Host {
-			return scan.Evidence[i].Host < scan.Evidence[j].Host
-		}
-		return scan.Evidence[i].Expr.Pos() < scan.Evidence[j].Expr.Pos()
-	})
-	return scan.Evidence
-}
-
-func evidenceHosts(evidence []domainEvidence) []string {
-	hosts := make([]string, 0, len(evidence))
-	for _, item := range evidence {
-		hosts = append(hosts, item.Host)
-	}
-	return hosts
-}
-
-func TestTypedAbsoluteURLDeclarationProducesOneFinding(t *testing.T) {
-	evidence := scanTypedDomainEvidence(t,
-		"package p\nconst DomainContractE2EURL = \"https://private.corp.internal/v1\"\n")
-	if got := evidenceHosts(evidence); len(got) != 1 || got[0] != "private.corp.internal" {
-		t.Fatalf("hosts = %v, want [private.corp.internal]", got)
-	}
-}
-
-func TestGoDomainEvidenceTruePositives(t *testing.T) {
-	tests := []struct {
-		name   string
-		source string
-		want   []string
-	}{
-		{
-			name:   "PR 1975 Feishu assignment",
-			source: "package p\nfunc f() { host := \"internal-api-drive-stream.feishu.cn\"; _ = host }\n",
-			want:   []string{"internal-api-drive-stream.feishu.cn"},
-		},
-		{
-			name:   "PR 1975 Lark assignment",
-			source: "package p\nfunc f() { var host string; host = \"internal-api-drive-stream.larksuite.com\"; _ = host }\n",
-			want:   []string{"internal-api-drive-stream.larksuite.com"},
-		},
-		{
-			name:   "uppercase snake target",
-			source: "package p\nfunc f() { API_HOST := \"private.corp.internal\"; _ = API_HOST }\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "typed declaration",
-			source: "package p\nconst APIHost string = \"attacker.zip\"\n",
-			want:   []string{"attacker.zip"},
-		},
-		{
-			name:   "grouped const declaration",
-			source: "package p\nconst (\n APIHost string = \"attacker.zip\"\n)\n",
-			want:   []string{"attacker.zip"},
-		},
-		{
-			name:   "grouped var declaration",
-			source: "package p\nvar (\n APIHost string = \"attacker.zip\"\n)\n",
-			want:   []string{"attacker.zip"},
-		},
-		{
-			name: "multi assignment",
-			source: "package p\nfunc f() {\n" +
-				" APIHost, BackupHost := \"public.example.com\", \"attacker.zip\"\n" +
-				" _, _ = APIHost, BackupHost\n}\n",
-			want: []string{"attacker.zip", "public.example.com"},
-		},
-		{
-			name:   "map semantic key",
-			source: "package p\nvar c = map[string]string{\"host\": \"private.corp.internal\"}\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "map semantic key assignment",
-			source: "package p\nfunc f() { c := map[string]string{}; c[\"host\"] = \"private.corp.internal\" }\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "host collection values",
-			source: "package p\nvar ALLOWED_HOSTS = []string{\"private.corp.internal\", \"attacker.zip\"}\n",
-			want:   []string{"attacker.zip", "private.corp.internal"},
-		},
-		{
-			name:   "host collection map keys",
-			source: "package p\nvar allowedHosts = map[string]struct{}{\"attacker.zip\": {}}\n",
-			want:   []string{"attacker.zip"},
-		},
-		{
-			name:   "host collection bool map keys",
-			source: "package p\nvar AllowedHosts = map[string]bool{\"api.example.com\": true}\n",
-			want:   []string{"api.example.com"},
-		},
-		{
-			name:   "host collection map values",
-			source: "package p\nvar HostsByRegion = map[string]string{\"sg\": \"api.example.com\"}\n",
-			want:   []string{"api.example.com"},
-		},
-		{
-			name: "host collection map value assignment",
-			source: "package p\nfunc f() {\n" +
-				" HostsByRegion := map[string]string{}\n" +
-				" HostsByRegion[\"sg\"] = \"api.example.com\"\n" +
-				"}\n",
-			want: []string{"api.example.com"},
-		},
-		{
-			name:   "static concatenation",
-			source: "package p\nvar APIHost = \"attacker.\" + \"zip\"\n",
-			want:   []string{"attacker.zip"},
-		},
-		{
-			name:   "multiline assignment",
-			source: "package p\nfunc f() {\n APIHost :=\n  \"attacker.zip\"\n _ = APIHost\n}\n",
-			want:   []string{"attacker.zip"},
-		},
-		{
-			name:   "escaped hostname",
-			source: "package p\nvar APIHost = \"private\\u002ecorp\\u002einternal\"\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "hex escaped hostname",
-			source: "package p\nvar APIHost = \"private\\x2ecorp\\x2einternal\"\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "octal escaped hostname",
-			source: "package p\nvar APIHost = \"private\\056corp\\056internal\"\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "raw hostname",
-			source: "package p\nvar APIHost = `private.corp.internal`\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name: "same-file constant reference",
-			source: "package p\nconst existingConst = \"private.corp.internal\"\n" +
-				"func f() { APIHost := existingConst; _ = APIHost }\n",
-			want: []string{"private.corp.internal"},
-		},
-		{
-			name:   "absolute URL",
-			source: "package p\nvar message = \"https://private.corp.internal/v1\"\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "websocket URL with port",
-			source: "package p\nvar endpoint = \"wss://private.corp.internal:443/v1\"\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "URL userinfo query and fragment",
-			source: "package p\nvar endpoint = \" https://user:pass@private.corp.internal:8443/v1?q=1#result \"\n",
-			want:   []string{"private.corp.internal"},
-		},
-		{
-			name:   "IDN hostname",
-			source: "package p\nvar APIHost = \"例子.公司.cn\"\n",
-			want:   []string{"例子.公司.cn"},
-		},
-		{
-			name:   "case port and trailing dot normalization",
-			source: "package p\nvar APIHost = \"EXAMPLE.COM.:443\"\n",
-			want:   []string{"example.com"},
-		},
-	}
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			got := evidenceHosts(scanDomainEvidence(t, tc.source))
-			if len(got) != len(tc.want) {
-				t.Fatalf("hosts = %v, want %v", got, tc.want)
-			}
-			for i := range got {
-				if got[i] != tc.want[i] {
-					t.Fatalf("hosts = %v, want %v", got, tc.want)
-				}
-			}
-		})
-	}
-}
-
-func TestGoDomainEvidenceTrueNegatives(t *testing.T) {
-	source := `package p
-
-import _ "github.com/larksuite/oapi-sdk-go/v3"
-
-var file = "archive.zip"
-var event = "card.action.trigger"
-var schema = "im.messages.list"
-var configFile = "service.prod.json"
-var version = "v1.2.3"
-var email = "name@example.com"
-var lowConfidence = "attacker.zip"
-var downloadURL = "archive.zip/file"
-var prose = "See https://private.corp.internal/v1 for details"
-// https://private.corp.internal/v1
-var ghost = "private.corp.internal"
-var hostnameParser = "private.corp.internal"
-var domainError = "private.corp.internal"
-var APIHost = "localhost"
-var BackupHost = "127.0.0.1"
-var hosts = struct{ File string }{File: "archive.zip"}
-var AllowedHosts = map[string]string{"api.example.com": "client.pem"}
-
-func dynamicValue() string { return "private.corp.internal" }
-var DynamicHost = dynamicValue()
-
-func setAmbiguousHostMetadata() {
-	AllowedHosts["api.example.com"] = "client.pem"
-}
-`
-	if got := scanDomainEvidence(t, source); len(got) != 0 {
-		t.Fatalf("unexpected evidence: %+v", got)
-	}
-}
-
-func TestTypedStructFieldHostnameSemantics(t *testing.T) {
-	t.Run("network fields", func(t *testing.T) {
-		source := `package source
-
-type Config struct { Host string }
-type FeishuSource struct { Domain string }
-
-var config = Config{Host: "api.example.com"}
-var source = FeishuSource{Domain: "events.example.com"}
-`
-		got := evidenceHosts(scanTypedDomainEvidenceInPackage(
-			t,
-			"github.com/larksuite/cli/internal/event/source",
-			source,
-		))
-		want := []string{"api.example.com", "events.example.com"}
-		if len(got) != len(want) || got[0] != want[0] || got[1] != want[1] {
-			t.Fatalf("hosts = %v, want %v", got, want)
-		}
-	})
-
-	t.Run("command metadata domain", func(t *testing.T) {
-		source := `package cmdmeta
-
-type Meta struct { Domain string }
-
-var meta = Meta{Domain: "im.messages"}
-func update(meta *Meta) { meta.Domain = "docs.pages" }
-`
-		if got := scanTypedDomainEvidenceInPackage(
-			t,
-			"github.com/larksuite/cli/internal/cmdmeta",
-			source,
-		); len(got) != 0 {
-			t.Fatalf("unexpected command metadata evidence: %+v", got)
-		}
-	})
-
-	t.Run("card action host", func(t *testing.T) {
-		source := `package im
-
-type CardActionTriggerOutput struct { Host string }
-
-var output = CardActionTriggerOutput{Host: "card.action"}
-func update(output *CardActionTriggerOutput) { output.Host = "im.message" }
-`
-		if got := scanTypedDomainEvidenceInPackage(
-			t,
-			"github.com/larksuite/cli/events/im",
-			source,
-		); len(got) != 0 {
-			t.Fatalf("unexpected card host evidence: %+v", got)
-		}
-	})
-
-	t.Run("unknown field ownership is conservative", func(t *testing.T) {
-		source := "package p\ntype Config struct { Host string }\nvar c = Config{Host: \"api.example.com\"}\n"
-		if got := scanDomainEvidence(t, source); len(got) != 0 {
-			t.Fatalf("unexpected untyped field evidence: %+v", got)
-		}
-	})
-}
-
-func TestHostnameSemanticNames(t *testing.T) {
-	for _, name := range []string{
-		"host", "HOST", "hosts", "hostname", "domains",
-		"api_host", "API_HOST", "ALLOWED_HOSTS",
-		"apiHost", "APIHost", "backupHostname",
-		"HostsByRegion", "APIHostsByRegion", "hostsByRegion",
-	} {
-		if !isHostnameSemanticName(name) {
-			t.Errorf("%q should be hostname-semantic", name)
-		}
-	}
-	for _, name := range []string{
-		"ghost", "hostnameParser", "domainError", "hostValue", "downloadURL", "endpoint", "origin",
-		"HostBypass", "APIHostBypass",
-	} {
-		if isHostnameSemanticName(name) {
-			t.Errorf("%q must not be hostname-semantic", name)
-		}
-	}
-}
-
-func TestDomainFixturePaths(t *testing.T) {
-	for _, path := range []string{
-		"internal/x/x_test.go",
-		"tests/cli_e2e/x.go",
-		"internal/x/testdata/sample.go",
-	} {
-		if !isDomainFixturePath(path) {
-			t.Errorf("%q should be fixture scope", path)
-		}
-	}
-	for _, path := range []string{
-		"internal/x/test_helper.go",
-		"examples/demo.go",
-		"skills/example/testdata/sample.go",
-		"skills/example/example_test.go",
-	} {
-		if isDomainFixturePath(path) {
-			t.Errorf("%q must not be fixture scope", path)
-		}
-	}
-}

lint/main.go

@@ -3,7 +3,7 @@
 
 // Command lintcheck runs repository source-contract guards that golangci-lint
 // cannot express directly. It currently covers typed-error contracts and the
-// resolver-owned endpoint and approved-domain contracts.
+// resolver-owned endpoint contract.
 //
 // lintcheck lives in its own Go module under lint/ so its build-time
 // dependency on golang.org/x/tools/go/packages does not leak into the
@@ -43,10 +43,8 @@ type scanner struct {
 
 var scanners = []scanner{
 	{name: "errscontract", fn: errscontract.ScanRepoWithOptions},
-	{name: "domaincontract", fn: func(root string, opts errscontract.ScanOptions) ([]lintapi.Violation, error) {
-		return domaincontract.ScanRepoWithOptions(root, domaincontract.ScanOptions{
-			ChangedFrom: opts.ChangedFrom,
-		})
+	{name: "domaincontract", fn: func(root string, _ errscontract.ScanOptions) ([]lintapi.Violation, error) {
+		return domaincontract.ScanRepo(root)
 	}},
 }
 
@@ -59,7 +57,7 @@ func main() {
 				"Runs every registered lint domain against repo-root (default: current directory).\n")
 		flag.PrintDefaults()
 	}
-	flag.StringVar(&changedFrom, "changed-from", "", "base revision for incremental source-contract checks")
+	flag.StringVar(&changedFrom, "changed-from", "", "base revision for incremental boundary-error checks")
 	flag.BoolVar(&printLegacyCommandErrorCandidates, "print-legacy-command-error-candidates", false, "print existing command boundary bare errors as allowlist candidates")
 	flag.Parse()
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@larksuite/cli",
-  "version": "1.0.81",
+  "version": "1.0.78",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@larksuite/cli",
-      "version": "1.0.81",
+      "version": "1.0.78",
       "cpu": [
         "x64",
         "arm64",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larksuite/cli",
-  "version": "1.0.81",
+  "version": "1.0.78",
   "description": "The official CLI for Lark/Feishu open platform",
   "bin": {
     "lark-cli": "scripts/run.js"

shortcuts/apps/apps_cache_clear.go

@@ -1,71 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// AppsCacheClear clears all cache entries for the app in the given environment.
-//
-// POST /apps/{app_id}/cache/clear，body {env}。清空当前应用指定环境下全部缓存，用于无法定位
-// 具体 key 的快速恢复；影响面大，定 high-risk-write（框架自动注入 --yes 确认）。
-var AppsCacheClear = common.Shortcut{
-	Service:     appsService,
-	Command:     "+cache-clear",
-	Description: "Clear all cache entries for the app in the given environment",
-	Risk:        "high-risk-write",
-	Tips: []string{
-		"Example: lark-cli apps +cache-clear --app-id <app_id> --environment dev --yes",
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app id", Required: true},
-		cacheEnvFlag(),
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		_, err := requireAppID(rctx.Str("app-id"))
-		return err
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID, _ := requireAppID(rctx.Str("app-id"))
-		return common.NewDryRunAPI().
-			POST(appCacheClearPath(appID)).
-			Desc("Clear all cache entries for the app in the given environment").
-			Body(dbEnvParams(rctx, map[string]interface{}{}))
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID, err := requireAppID(rctx.Str("app-id"))
-		if err != nil {
-			return err
-		}
-		data, err := rctx.CallAPITyped("POST", appCacheClearPath(appID), nil, dbEnvParams(rctx, map[string]interface{}{}))
-		if err != nil {
-			return withAppsHint(err, appIDListHint)
-		}
-		out := map[string]interface{}{
-			"environment":       resolvedEnv(data, rctx),
-			"deleted_key_count": cacheInt(data["deleted_key_count"]),
-		}
-		rctx.OutFormat(out, nil, func(w io.Writer) {
-			renderCacheClearPretty(w, out)
-		})
-		return nil
-	},
-}
-
-// renderCacheClearPretty 打 "✓ cache cleared: N entries (env)"。
-func renderCacheClearPretty(w io.Writer, out map[string]interface{}) {
-	n := int64(0)
-	if f, ok := numericAsFloat(out["deleted_key_count"]); ok {
-		n = int64(f)
-	}
-	fmt.Fprintf(w, "✓ cache cleared: %d entries (%s)\n", n, common.GetString(out, "environment"))
-}

shortcuts/apps/apps_cache_delete.go

@@ -1,75 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// AppsCacheDelete deletes a single business cache key (idempotent).
-//
-// DELETE /apps/{app_id}/cache?env=&key=。缓存是派生数据、删单 key 影响面小且可重建，
-// 故定 write（非 high-risk-write、不需 --yes）。目标不存在按幂等成功处理（deleted_key_count=0）。
-var AppsCacheDelete = common.Shortcut{
-	Service:     appsService,
-	Command:     "+cache-delete",
-	Description: "Delete a single business cache key (idempotent)",
-	Risk:        "write",
-	Tips: []string{
-		"Example: lark-cli apps +cache-delete --app-id <app_id> --environment dev --key <key>",
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app id", Required: true},
-		{Name: "key", Desc: "business cache key", Required: true},
-		cacheEnvFlag(),
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		_, err := requireAppID(rctx.Str("app-id"))
-		return err
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID, _ := requireAppID(rctx.Str("app-id"))
-		return common.NewDryRunAPI().
-			DELETE(appCachePath(appID)).
-			Desc("Delete a Miaoda app runtime cache key").
-			Params(dbEnvParams(rctx, map[string]interface{}{"key": rctx.Str("key")}))
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID, err := requireAppID(rctx.Str("app-id"))
-		if err != nil {
-			return err
-		}
-		key := rctx.Str("key")
-		data, err := rctx.CallAPITyped("DELETE", appCachePath(appID), dbEnvParams(rctx, map[string]interface{}{"key": key}), nil)
-		if err != nil {
-			return withAppsHint(err, appIDListHint)
-		}
-		out := map[string]interface{}{
-			"key":               key,
-			"environment":       resolvedEnv(data, rctx),
-			"deleted_key_count": cacheInt(data["deleted_key_count"]),
-		}
-		rctx.OutFormat(out, nil, func(w io.Writer) {
-			renderCacheDeletePretty(w, out)
-		})
-		return nil
-	},
-}
-
-// renderCacheDeletePretty 命中打 "✓ cache deleted"，幂等未命中打 "✓ cache already absent"（措辞区分，都成功）。
-func renderCacheDeletePretty(w io.Writer, out map[string]interface{}) {
-	key := common.GetString(out, "key")
-	if n, ok := numericAsFloat(out["deleted_key_count"]); ok && n > 0 {
-		fmt.Fprintf(w, "✓ cache deleted: %s\n", key)
-		return
-	}
-	fmt.Fprintf(w, "✓ cache already absent: %s\n", key)
-}

shortcuts/apps/apps_cache_get.go

@@ -1,105 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// AppsCacheGet reads a single business cache key's value + metadata.
-//
-// GET /apps/{app_id}/cache?env=&key=。value 在 wire 上是 JSON 字符串透传：--format json
-// 原样输出该字符串（不反序列化），--format pretty 反序列化后缩进展开。value_size_bytes 由 CLI
-// 按 value 字节长度算出（端点不返回）；未命中（exists=false）时不带 value，ttl_ms/value_size_bytes 为 null。
-var AppsCacheGet = common.Shortcut{
-	Service:     appsService,
-	Command:     "+cache-get",
-	Description: "Get a business cache key's value and metadata",
-	Risk:        "read",
-	Tips: []string{
-		"Example: lark-cli apps +cache-get --app-id <app_id> --key spotbonus:2026:winners:list:v1",
-		"Example: lark-cli apps +cache-get --app-id <app_id> --environment online --key <key>",
-	},
-	Scopes:    []string{"spark:app:read"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app id", Required: true},
-		{Name: "key", Desc: "business cache key", Required: true},
-		cacheEnvFlag(),
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		_, err := requireAppID(rctx.Str("app-id"))
-		return err
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID, _ := requireAppID(rctx.Str("app-id"))
-		return common.NewDryRunAPI().
-			GET(appCachePath(appID)).
-			Desc("Get a Miaoda app runtime cache key").
-			Params(dbEnvParams(rctx, map[string]interface{}{"key": rctx.Str("key")}))
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID, err := requireAppID(rctx.Str("app-id"))
-		if err != nil {
-			return err
-		}
-		key := rctx.Str("key")
-		data, err := rctx.CallAPITyped("GET", appCachePath(appID), dbEnvParams(rctx, map[string]interface{}{"key": key}), nil)
-		if err != nil {
-			return withAppsHint(err, appIDListHint)
-		}
-		out := projectCacheGet(data, key, rctx)
-		rctx.OutFormat(out, nil, func(w io.Writer) {
-			renderCacheGetPretty(w, out)
-		})
-		return nil
-	},
-}
-
-// projectCacheGet 组装 cache-get 输出：key 回显、environment 取 resolved env、exists 直读；
-// 命中时带 ttl_ms + value（原始串）+ value_size_bytes（CLI 算），未命中时 ttl_ms/value_size_bytes 为 null、无 value。
-func projectCacheGet(data map[string]interface{}, key string, rctx *common.RuntimeContext) map[string]interface{} {
-	exists := cacheBool(data["exists"])
-	out := map[string]interface{}{
-		"key":         key,
-		"environment": resolvedEnv(data, rctx),
-		"exists":      exists,
-	}
-	if exists {
-		val := common.GetString(data, "value")
-		out["ttl_ms"] = cacheInt(data["ttl_ms"])
-		out["value_size_bytes"] = len([]byte(val))
-		out["value"] = val
-	} else {
-		out["ttl_ms"] = nil
-		out["value_size_bytes"] = nil
-	}
-	return out
-}
-
-// renderCacheGetPretty 打元信息块（key/environment/exists，命中再加 ttl/value_size），命中时末尾展开 value。
-func renderCacheGetPretty(w io.Writer, out map[string]interface{}) {
-	exists, _ := out["exists"].(bool)
-	pairs := [][2]string{
-		{"key", common.GetString(out, "key")},
-		{"environment", common.GetString(out, "environment")},
-		{"exists", fmt.Sprintf("%v", exists)},
-	}
-	if exists {
-		pairs = append(pairs,
-			[2]string{"ttl", formatCacheTTL(out["ttl_ms"])},
-			[2]string{"value_size", humanBytes(out["value_size_bytes"])},
-		)
-	}
-	renderKeyValuePairs(w, pairs)
-	if exists {
-		fmt.Fprintln(w, "value:")
-		printCacheValuePretty(w, common.GetString(out, "value"))
-	}
-}

shortcuts/apps/apps_cache_test.go

@@ -1,357 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-const (
-	cacheURL      = "/open-apis/spark/v1/apps/app_x/cache"
-	cacheClearURL = "/open-apis/spark/v1/apps/app_x/cache/clear"
-)
-
-// cacheValueStr 是服务端在 wire 上透传的原始 JSON 字符串（value 不反序列化）。
-const cacheValueStr = `[{"name":"Alice","award":"Gold"},{"name":"Bob","award":"Silver"}]`
-
-// ── cache-get ──
-
-// TestAppsCacheGet_HitJSON：命中时 json 默认——value 原样透传（不反序列化），
-// value_size_bytes 由 CLI 按 value 字节长度算出，environment 取服务端 resolved env。
-func TestAppsCacheGet_HitJSON(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{
-			"env": "online", "exists": true, "ttl_ms": 272000, "value": cacheValueStr,
-		}},
-	})
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--environment", "online", "--key", "k:1", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	d := parseEnvelopeData(t, stdout)
-	if d["key"] != "k:1" || d["environment"] != "online" || d["exists"] != true {
-		t.Fatalf("get hit data=%v", d)
-	}
-	if v, _ := d["value"].(string); v != cacheValueStr {
-		t.Fatalf("value must be raw passthrough string, got %v", d["value"])
-	}
-	if sz, _ := numericAsFloat(d["value_size_bytes"]); int(sz) != len(cacheValueStr) {
-		t.Fatalf("value_size_bytes = %v, want %d", d["value_size_bytes"], len(cacheValueStr))
-	}
-	// ttl_ms 必须是 JSON number（透传服务端数字，不得变成字符串）；JSON 解析后为 float64。
-	if _, ok := d["ttl_ms"].(float64); !ok {
-		t.Fatalf("ttl_ms must be a JSON number, got %T (%v)", d["ttl_ms"], d["ttl_ms"])
-	}
-}
-
-// TestAppsCacheGet_HitPretty：pretty 把 value 反序列化后展开（含缩进后的字段），并打元信息标签。
-func TestAppsCacheGet_HitPretty(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{
-			"env": "online", "exists": true, "ttl_ms": 272000, "value": cacheValueStr,
-		}},
-	})
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--environment", "online", "--key", "k:1", "--format", "pretty", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	for _, want := range []string{"key", "environment", "exists", "value", "Alice"} {
-		if !strings.Contains(got, want) {
-			t.Errorf("pretty missing %q:\n%s", want, got)
-		}
-	}
-}
-
-// TestAppsCacheGet_Miss：未命中——exists=false，无 value，ttl_ms / value_size_bytes 为 null。
-func TestAppsCacheGet_Miss(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{
-			"env": "online", "exists": false,
-		}},
-	})
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--environment", "online", "--key", "k:1", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	d := parseEnvelopeData(t, stdout)
-	if d["exists"] != false {
-		t.Fatalf("miss exists=%v", d["exists"])
-	}
-	if _, ok := d["value"]; ok {
-		t.Fatalf("miss must not carry value: %v", d)
-	}
-	if d["ttl_ms"] != nil || d["value_size_bytes"] != nil {
-		t.Fatalf("miss ttl_ms/value_size_bytes must be null: %v", d)
-	}
-}
-
-// TestAppsCacheGet_ExistsAsString：服务端把 exists 返成字符串 "true" 时仍按命中处理
-// （cacheBool 容错，防 exists 以字符串形态出现被误判成未命中、hit→miss 翻转）。
-func TestAppsCacheGet_ExistsAsString(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{
-			"env": "online", "exists": "true", "ttl_ms": 272000, "value": cacheValueStr,
-		}},
-	})
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--environment", "online", "--key", "k:1", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	d := parseEnvelopeData(t, stdout)
-	if d["exists"] != true {
-		t.Fatalf("exists string \"true\" 应按命中解析, got exists=%v", d["exists"])
-	}
-	if v, _ := d["value"].(string); v != cacheValueStr {
-		t.Fatalf("命中应带 value, got %v", d["value"])
-	}
-}
-
-// TestAppsCacheGet_PrettyNonJSONFallback：pretty 下 value 不是合法 JSON 时降级原样输出
-// （safeParseJSON 解析失败→原样打印，不报错、不吞值）。补齐 HitPretty 只覆盖了"能反序列化"路径的缺口。
-func TestAppsCacheGet_PrettyNonJSONFallback(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{
-			"env": "online", "exists": true, "ttl_ms": 272000, "value": "hello-plain-not-json",
-		}},
-	})
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--environment", "online", "--key", "k:1", "--format", "pretty", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	if !strings.Contains(stdout.String(), "hello-plain-not-json") {
-		t.Fatalf("非 JSON value 应原样输出（降级）, got:\n%s", stdout.String())
-	}
-}
-
-// TestAppsCacheGet_TTLAsStringNormalized：服务端把 ttl_ms 返成字符串 "272000" 时，
-// 输出的 ttl_ms 必须归一成 JSON number（cacheInt），不得随 wire 形态漂移成字符串。
-func TestAppsCacheGet_TTLAsStringNormalized(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{
-			"env": "online", "exists": true, "ttl_ms": "272000", "value": cacheValueStr,
-		}},
-	})
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--environment", "online", "--key", "k:1", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	d := parseEnvelopeData(t, stdout)
-	f, ok := d["ttl_ms"].(float64)
-	if !ok {
-		t.Fatalf("ttl_ms string wire 应归一成 JSON number, got %T (%v)", d["ttl_ms"], d["ttl_ms"])
-	}
-	if int(f) != 272000 {
-		t.Fatalf("ttl_ms = %v, want 272000", f)
-	}
-}
-
-// TestAppsCacheDelete_CountAsStringNormalized：服务端把 deleted_key_count 返成字符串 "1" 时，
-// 输出必须归一成 JSON number（cacheInt）。
-func TestAppsCacheDelete_CountAsStringNormalized(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "DELETE", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{"env": "dev", "deleted_key_count": "1"}},
-	})
-	if err := runAppsShortcut(t, AppsCacheDelete,
-		[]string{"+cache-delete", "--app-id", "app_x", "--environment", "dev", "--key", "k:1", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	d := parseEnvelopeData(t, stdout)
-	if _, ok := d["deleted_key_count"].(float64); !ok {
-		t.Fatalf("deleted_key_count string wire 应归一成 JSON number, got %T (%v)", d["deleted_key_count"], d["deleted_key_count"])
-	}
-}
-
-// TestAppsCacheGet_DryRunOmitsEnv：不传 --environment 时 dry-run query 不带 env（服务端自动选），但带 key。
-func TestAppsCacheGet_DryRunOmitsEnv(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--key", "k:1", "--dry-run", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	a := firstDryRunAPI(t, stdout.String())
-	if a.Method != "GET" || a.URL != cacheURL {
-		t.Fatalf("dry-run = %s %s", a.Method, a.URL)
-	}
-	if _, ok := a.Params["env"]; ok {
-		t.Fatalf("no --environment → env must be omitted, params=%v", a.Params)
-	}
-	if a.Params["key"] != "k:1" {
-		t.Fatalf("key must be in query, params=%v", a.Params)
-	}
-}
-
-// TestAppsCacheGet_DryRunWithEnv：显式 --environment dev → query 带 env=dev。
-func TestAppsCacheGet_DryRunWithEnv(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--environment", "dev", "--key", "k:1", "--dry-run", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	a := firstDryRunAPI(t, stdout.String())
-	if a.Params["env"] != "dev" {
-		t.Fatalf("env must be dev, params=%v", a.Params)
-	}
-}
-
-// TestAppsCacheGet_RequiresKey：缺 --key → 校验错。
-func TestAppsCacheGet_RequiresKey(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsCacheGet,
-		[]string{"+cache-get", "--app-id", "app_x", "--as", "user"}, factory, stdout); err == nil {
-		t.Fatalf("expected required --key error")
-	}
-}
-
-// ── cache-delete ──
-
-// TestAppsCacheDelete_Hit：删中命中的 key → deleted_key_count=1；pretty 打 "✓ cache deleted"。
-func TestAppsCacheDelete_Hit(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "DELETE", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{"env": "dev", "deleted_key_count": 1}},
-	})
-	if err := runAppsShortcut(t, AppsCacheDelete,
-		[]string{"+cache-delete", "--app-id", "app_x", "--environment", "dev", "--key", "k:1", "--format", "pretty", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	if !strings.Contains(stdout.String(), "✓ cache deleted") {
-		t.Fatalf("pretty: %s", stdout.String())
-	}
-}
-
-// TestAppsCacheDelete_AbsentJSON：目标不存在 → 幂等成功，deleted_key_count=0，pretty 措辞区分。
-func TestAppsCacheDelete_AbsentJSON(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "DELETE", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{"env": "dev", "deleted_key_count": 0}},
-	})
-	if err := runAppsShortcut(t, AppsCacheDelete,
-		[]string{"+cache-delete", "--app-id", "app_x", "--environment", "dev", "--key", "k:1", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	d := parseEnvelopeData(t, stdout)
-	if sz, _ := numericAsFloat(d["deleted_key_count"]); int(sz) != 0 || d["key"] != "k:1" || d["environment"] != "dev" {
-		t.Fatalf("absent data=%v", d)
-	}
-}
-
-// TestAppsCacheDelete_AbsentPretty：不存在 pretty 打 "✓ cache already absent"。
-func TestAppsCacheDelete_AbsentPretty(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "DELETE", URL: cacheURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{"env": "dev", "deleted_key_count": 0}},
-	})
-	if err := runAppsShortcut(t, AppsCacheDelete,
-		[]string{"+cache-delete", "--app-id", "app_x", "--environment", "dev", "--key", "k:1", "--format", "pretty", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	if !strings.Contains(stdout.String(), "already absent") {
-		t.Fatalf("pretty: %s", stdout.String())
-	}
-}
-
-// TestAppsCacheDelete_DryRun：DELETE 方法、/cache 路由，query 带 key + env。
-func TestAppsCacheDelete_DryRun(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsCacheDelete,
-		[]string{"+cache-delete", "--app-id", "app_x", "--environment", "dev", "--key", "k:1", "--dry-run", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	a := firstDryRunAPI(t, stdout.String())
-	if a.Method != "DELETE" || a.URL != cacheURL {
-		t.Fatalf("dry-run = %s %s", a.Method, a.URL)
-	}
-	if a.Params["key"] != "k:1" || a.Params["env"] != "dev" {
-		t.Fatalf("params=%v", a.Params)
-	}
-}
-
-// ── cache-clear ──
-
-// TestAppsCacheClear_Success：清空成功 → deleted_key_count=128；pretty 打 "✓ cache cleared: 128 entries (dev)"。
-func TestAppsCacheClear_Success(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST", URL: cacheClearURL,
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{"env": "dev", "deleted_key_count": 128}},
-	})
-	if err := runAppsShortcut(t, AppsCacheClear,
-		[]string{"+cache-clear", "--app-id", "app_x", "--environment", "dev", "--yes", "--format", "pretty", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	if !strings.Contains(stdout.String(), "✓ cache cleared: 128 entries (dev)") {
-		t.Fatalf("pretty: %s", stdout.String())
-	}
-}
-
-// TestAppsCacheClear_RequiresConfirmation：high-risk-write 无 --yes → 被确认门拦截。
-func TestAppsCacheClear_RequiresConfirmation(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsCacheClear,
-		[]string{"+cache-clear", "--app-id", "app_x", "--environment", "dev", "--as", "user"}, factory, stdout); err == nil {
-		t.Fatalf("expected confirmation gate without --yes")
-	}
-}
-
-// TestAppsCacheClear_DryRunBodyWithEnv：dry-run POST /cache/clear，body 带 env=dev。
-func TestAppsCacheClear_DryRunBodyWithEnv(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsCacheClear,
-		[]string{"+cache-clear", "--app-id", "app_x", "--environment", "dev", "--dry-run", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	a := firstDryRunAPI(t, stdout.String())
-	if a.Method != "POST" || a.URL != cacheClearURL {
-		t.Fatalf("dry-run = %s %s", a.Method, a.URL)
-	}
-	if a.Body["env"] != "dev" {
-		t.Fatalf("body must carry env=dev, body=%v", a.Body)
-	}
-}
-
-// TestAppsCacheClear_DryRunBodyOmitsEnv：不传 --environment → body 不带 env（服务端自动选）。
-func TestAppsCacheClear_DryRunBodyOmitsEnv(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsCacheClear,
-		[]string{"+cache-clear", "--app-id", "app_x", "--dry-run", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	a := firstDryRunAPI(t, stdout.String())
-	if _, ok := a.Body["env"]; ok {
-		t.Fatalf("no --environment → body env must be omitted, body=%v", a.Body)
-	}
-}
-
-// firstDryRunAPI 解析 dry-run 输出的第一个 api[] 项（method/url/params/body）。
-// 复用本包规范的 dryRunAPIEnvelope（api 现嵌在 data.api 下，见 dryrun_test.go）。
-func firstDryRunAPI(t *testing.T, s string) dryRunAPICall {
-	t.Helper()
-	var env dryRunAPIEnvelope
-	if err := json.Unmarshal([]byte(s), &env); err != nil || len(env.API) == 0 {
-		t.Fatalf("bad dry-run json: %v\n%s", err, s)
-	}
-	return env.API[0]
-}

shortcuts/apps/apps_create.go

@@ -13,7 +13,7 @@ import (
 	"github.com/larksuite/cli/shortcuts/common"
 )
 
-const createHint = "verify --app-type is html or full_stack and --name is non-empty; if this is a permission error, confirm your account can create apps"
+const createHint = "verify --app-type is html, frontend or full_stack and --name is non-empty; if this is a permission error, confirm your account can create apps"
 
 // AppsCreate creates a new app.
 var AppsCreate = common.Shortcut{
@@ -23,6 +23,7 @@ var AppsCreate = common.Shortcut{
 	Risk:        "write",
 	Tips: []string{
 		`Example: lark-cli apps +create --name "审批系统" --app-type full_stack`,
+		`Example: lark-cli apps +create --name "工具页" --app-type frontend --description "纯前端工具"`,
 		`Example: lark-cli apps +create --name "活动页" --app-type html --description "活动报名"`,
 	},
 	Scopes:    []string{"spark:app:write"},
@@ -30,7 +31,7 @@ var AppsCreate = common.Shortcut{
 	HasFormat: true,
 	Flags: []common.Flag{
 		{Name: "name", Desc: "app display name", Required: true},
-		{Name: "app-type", Desc: "app type", Required: true, Enum: []string{"html", "full_stack"}},
+		{Name: "app-type", Desc: "app type", Required: true, Enum: []string{"html", "frontend", "full_stack"}},
 		{Name: "description", Desc: "app description"},
 		{Name: "icon-url", Desc: "app icon URL (server uses default if omitted)"},
 	},
@@ -59,7 +60,7 @@ var AppsCreate = common.Shortcut{
 }
 
 func buildAppsCreateBody(rctx *common.RuntimeContext) map[string]interface{} {
-	// --app-type is constrained to the lowercase enum (html / full_stack) by the
+	// --app-type is constrained to the lowercase enum (html / frontend / full_stack) by the
 	// flag's Enum, so send it through verbatim. Legacy uppercase compatibility is
 	// a server concern and is intentionally not surfaced by the CLI.
 	agent := envvars.AgentName()

shortcuts/apps/apps_create_test.go

@@ -363,3 +363,18 @@ func TestAppsCreate_AgentEnvVarNotSet(t *testing.T) {
 		t.Fatalf("source_agent should not be present when env var is unset: %v", sent)
 	}
 }
+
+// TestAppsCreate_AcceptsFrontend pins that --app-type frontend is a valid
+// enum value and flows through to the request body as "frontend" verbatim.
+func TestAppsCreate_AcceptsFrontend(t *testing.T) {
+	factory, stdout, _ := newAppsExecuteFactory(t)
+	if err := runAppsShortcut(t, AppsCreate,
+		[]string{"+create", "--name", "Demo", "--app-type", "frontend", "--dry-run", "--as", "user"},
+		factory, stdout); err != nil {
+		t.Fatalf("frontend dry-run err=%v", err)
+	}
+	got := stdout.String()
+	if !strings.Contains(got, `"app_type": "frontend"`) {
+		t.Fatalf("expected app_type frontend in body, got %s", got)
+	}
+}

shortcuts/apps/apps_init.go

@@ -39,7 +39,7 @@ const (
 )
 
 const (
-	miaodaCLIPkg    = "@lark-apaas/miaoda-cli@latest"
+	miaodaCLIPkg    = "@lark-apaas/miaoda-cli@0.1.24-alpha.03a64f0"
 	npmRegistry     = "https://registry.npmmirror.com"
 	metaRelPath     = ".spark/meta.json"
 	steeringRelPath = ".agent/skills/steering"
@@ -86,6 +86,10 @@ var appTypePolicies = map[string]appTypePolicy{
 	// no startup env vars to pull, no steering skills to sync, and no app sync.
 	"modern_html": {skipInstall: true, skipEnvPull: true, skipSkillsSync: true, skipAppSync: true},
 	"html":        {skipInstall: true, skipEnvPull: true, skipSkillsSync: true, skipAppSync: true},
+	// frontend (vite-react, a buildable front-end app) is intentionally NOT
+	// listed here: it takes the zero-value policy (install deps, pull env, sync
+	// skills) like full_stack, since it needs a build step — it is not a static
+	// HTML site and must not skip those steps.
 }
 
 // policyForAppType returns the +init control strategy for appType. Unlisted
@@ -438,6 +442,9 @@ func runScaffold(ctx context.Context, dir, appID, appType, sourcePath string) (s
 // --skip-install is appended per the app_type's policy (see appTypePolicy):
 // types whose policy sets skipInstall (e.g. modern_html) skip the dependency
 // install; others run it as usual.
+// appType is forwarded verbatim (including "frontend") — the CLI does not
+// translate the app type; mapping the app type to a concrete tech stack is the
+// downstream tool's responsibility.
 func scaffoldInitArgs(appType, appID, sourcePath string) []string {
 	base := []string{"-y", "--prefer-online", "--registry", npmRegistry, miaodaCLIPkg, "app", "init"}
 	at := appType

shortcuts/apps/apps_list.go

@@ -35,7 +35,7 @@ var AppsList = common.Shortcut{
 	Flags: []common.Flag{
 		{Name: "keyword", Desc: "fuzzy match on app name"},
 		{Name: "ownership", Desc: "ownership filter: all (created by me + shared with me) | mine | shared", Enum: []string{"all", "mine", "shared"}},
-		{Name: "app-type", Desc: "app type filter (html or full_stack)", Enum: []string{"html", "full_stack"}},
+		{Name: "app-type", Desc: "app type filter (html, frontend or full_stack)", Enum: []string{"html", "frontend", "full_stack"}},
 		{Name: "page-size", Type: "int", Default: "20", Desc: "page size"},
 		{Name: "page-token", Desc: "pagination cursor from previous response"},
 	},

shortcuts/apps/apps_meta.go

@@ -15,7 +15,7 @@ import (
 // queryAppType fetches the app's type string from the server via
 // GET /open-apis/spark/v1/apps/{identifier}. The identifier can be either
 // an app_id or a meta_token — the server resolves both. The server returns
-// uppercase app_type values ("HTML", "FULL_STACK", "MODERN_HTML");
+// uppercase app_type values ("HTML", "FRONTEND", "FULL_STACK", "MODERN_HTML");
 // this function normalizes to lowercase. Returns an error when the API
 // is unavailable or the response is malformed — callers must not proceed
 // with a fallback type to avoid creating the wrong project scaffold.

shortcuts/apps/cache_common.go

@@ -1,99 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// 应用运行时缓存（Cache）调试命令共享件：路由 + 环境 flag + 渲染。
-//
-// 三条命令都走 spark OpenAPI `/apps/{app_id}/cache[/clear]`，按运行环境（env→dbBranch）隔离：
-// 环境 flag 用 cacheEnvFlag()（只 --environment，不带 db 家族的旧名 --env），env 值经 dbEnv 读、
-// 经 dbEnvParams 注入——get/delete 放 query，clear 放 body（省略即服务端自动选分支）。
-
-// appCachePath 返回缓存单 key 读/删 URL：cache（GET 读、DELETE 删，靠方法区分）。
-func appCachePath(appID string) string {
-	return fmt.Sprintf("%s/apps/%s/cache", apiBasePath, validate.EncodePathSegment(appID))
-}
-
-// appCacheClearPath 返回清空指定环境缓存 URL：cache/clear。
-func appCacheClearPath(appID string) string {
-	return fmt.Sprintf("%s/apps/%s/cache/clear", apiBasePath, validate.EncodePathSegment(appID))
-}
-
-// cacheEnvFlag 返回缓存命令的运行环境 flag。cache 是全新命令、从无旧名 --env，
-// 故只注册干净的 --environment（不带 db 家族那套隐藏 --env + 拒收逻辑）。
-// 省略即服务端按应用多环境状态自动选分支（多环境→dev，非多环境→online）。
-func cacheEnvFlag() common.Flag {
-	return common.Flag{
-		Name: "environment",
-		Enum: []string{"dev", "online"},
-		Desc: "target runtime environment; leave unset to auto-select (multi-env app uses dev, single-env uses online), or pass dev/online",
-	}
-}
-
-// cacheBool 防御性解析布尔：真 bool 直接用；若服务端把 exists 返成字符串 "true"/"false" 也归一成 bool，
-// 其它类型按 false。避免 exists 万一以字符串形态出现时被误判成未命中（hit→miss 翻转）。
-func cacheBool(v interface{}) bool {
-	switch x := v.(type) {
-	case bool:
-		return x
-	case string:
-		return strings.EqualFold(strings.TrimSpace(x), "true")
-	}
-	return false
-}
-
-// cacheInt 把服务端下发的数值字段归一成 int64（无法解析→nil）。本仓惯例：数值可能以字符串下发
-// （见 numericAsFloat 的 string 分支），若直接透传，--format json 的字段类型会随服务端 wire 形态漂移
-// （number ↔ string）。归一后输出类型恒定为数字或 null，消费方无需自己容忍字符串。
-func cacheInt(raw interface{}) interface{} {
-	if f, ok := numericAsFloat(raw); ok {
-		return int64(f)
-	}
-	return nil
-}
-
-// resolvedEnv 取服务端回吐的 resolved env；缺失时兜底成请求侧 --environment（可能为空）。
-// 省略 --environment 时服务端自动选分支，靠服务端回吐才知道实际命中 dev / online。
-func resolvedEnv(data map[string]interface{}, rctx *common.RuntimeContext) string {
-	if env := common.GetString(data, "env"); env != "" {
-		return env
-	}
-	return dbEnv(rctx)
-}
-
-// formatCacheTTL 把剩余 TTL（毫秒）格式化成 4m32s 这样的时长串；非数字返回 "—"。
-func formatCacheTTL(ms interface{}) string {
-	f, ok := numericAsFloat(ms)
-	if !ok {
-		return "—"
-	}
-	return (time.Duration(int64(f)) * time.Millisecond).String()
-}
-
-// printCacheValuePretty 把 value 反序列化后缩进展开（pretty 口径）；非 JSON 则原样打印。
-// 与「json 原样字符串、pretty 才反序列化」的设计一致。
-func printCacheValuePretty(w io.Writer, raw string) {
-	v := safeParseJSON(raw)
-	if s, ok := v.(string); ok {
-		fmt.Fprintln(w, s)
-		return
-	}
-	b, err := json.MarshalIndent(v, "", "  ")
-	if err != nil {
-		fmt.Fprintln(w, raw)
-		return
-	}
-	w.Write(b)
-	fmt.Fprintln(w)
-}

shortcuts/apps/file_common.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/transport"
 	"github.com/larksuite/cli/internal/validate"
 	"github.com/larksuite/cli/shortcuts/common"
 )
@@ -75,9 +74,11 @@ func normalizeTimestamp(raw string) (string, error) {
 	return "", errs.NewValidationError(errs.SubtypeInvalidArgument, "invalid timestamp %q (want relative 7d/2h/30s, date 2026-04-15, datetime 2026-04-15T10:00:00, or ISO 8601 with TZ)", s)
 }
 
-//nolint:forbidigo // Presigned transfers use the external HTTP policy.
+// newFileTransferClient 直传 / 直下对象存储 presigned URL 用（绕开 Lark 网关，无需 auth、无超时以容纳大文件）。
+//
+//nolint:forbidigo // presigned object-storage transfer bypasses the Lark gateway — raw http.Client is required (no Lark auth, no gateway routing); not a Lark API call, so RuntimeContext.DoAPI does not apply.
 func newFileTransferClient() *http.Client {
-	return transport.NewExternalHTTPClient(0)
+	return &http.Client{Transport: http.DefaultTransport}
 }
 
 // URL helpers for the file (storage) CLI commands.

shortcuts/apps/file_common_test.go

@@ -1,79 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"net/http"
-	"testing"
-
-	exttransport "github.com/larksuite/cli/extension/transport"
-)
-
-type appsExternalProvider struct {
-	interceptor exttransport.Interceptor
-}
-
-func (p appsExternalProvider) Name() string { return "apps-external-test" }
-
-func (p appsExternalProvider) ResolveInterceptor(context.Context) exttransport.Interceptor {
-	return p.interceptor
-}
-
-func (appsExternalProvider) SupportsRequestClass(class exttransport.RequestClass) bool {
-	return class == exttransport.RequestClassExternal
-}
-
-type appsExternalInterceptor struct {
-	calls int
-}
-
-func (i *appsExternalInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
-	i.calls++
-	req.Header.Set("X-External-Route", "1")
-	return nil
-}
-
-type appsRoundTripFunc func(*http.Request) (*http.Response, error)
-
-func (f appsRoundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f(req)
-}
-
-func TestFileTransferClientUsesExternalRequestClass(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	t.Setenv("LARK_CLI_NO_PROXY", "")
-
-	previousProvider := exttransport.GetProvider()
-	interceptor := &appsExternalInterceptor{}
-	exttransport.Register(appsExternalProvider{interceptor: interceptor})
-	t.Cleanup(func() { exttransport.Register(previousProvider) })
-
-	previousTransport := http.DefaultTransport
-	var receivedHeader string
-	http.DefaultTransport = appsRoundTripFunc(func(req *http.Request) (*http.Response, error) {
-		receivedHeader = req.Header.Get("X-External-Route")
-		return &http.Response{
-			StatusCode: http.StatusNoContent,
-			Header:     make(http.Header),
-			Body:       http.NoBody,
-			Request:    req,
-		}, nil
-	})
-	t.Cleanup(func() { http.DefaultTransport = previousTransport })
-
-	req, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/presigned/file", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp, err := newFileTransferClient().Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-
-	if interceptor.calls != 1 || receivedHeader != "1" {
-		t.Fatalf("external route = calls %d, header %q; want 1, %q", interceptor.calls, receivedHeader, "1")
-	}
-}

shortcuts/apps/shortcuts.go

@@ -64,9 +64,6 @@ func Shortcuts() []common.Shortcut {
 		AppsFileUpload,
 		AppsFileDelete,
 		AppsFileQuotaGet,
-		AppsCacheGet,
-		AppsCacheDelete,
-		AppsCacheClear,
 		AppsGitCredentialInit,
 		AppsGitCredentialList,
 		AppsGitCredentialRemove,

shortcuts/apps/shortcuts_test.go

@@ -20,14 +20,13 @@ import (
 //   - 3 git-credential
 //   - 5 session（create/list/get/stop/chat）+ 1 session-messages-list
 //   - 8 openapi-key（list/get/create/update/enable/disable/delete/reset）
-//   - 3 cache（get/delete/clear）
 //   - 3 plugin（install/uninstall/list）
 //   - 6 automation（list/get/create/update/enable/disable）
-//   - 9 role（role CRUD + role-member list/add/remove + role-match-list）= 82。
-func TestAppsShortcuts_Returns82(t *testing.T) {
+//   - 9 role（role CRUD + role-member list/add/remove + role-match-list）= 79。
+func TestAppsShortcuts_Returns79(t *testing.T) {
 	got := Shortcuts()
-	if len(got) != 82 {
-		t.Fatalf("Shortcuts() returned %d entries, want 82", len(got))
+	if len(got) != 79 {
+		t.Fatalf("Shortcuts() returned %d entries, want 79", len(got))
 	}
 }
 

shortcuts/base/base_form_execute_test.go

@@ -4,7 +4,6 @@
 package base
 
 import (
-	"encoding/json"
 	"strings"
 	"testing"
 
@@ -251,8 +250,7 @@ func TestBaseFormQuestionsExecuteList(t *testing.T) {
 				"total": 2,
 				"questions": []interface{}{
 					map[string]interface{}{"id": "q_001", "title": "您的姓名", "required": true, "description": nil},
-					map[string]interface{}{"id": "q_002", "title": "发票抬头", "required": false, "description": nil,
-						"visible_rule": map[string]interface{}{"logic": "and", "conditions": []interface{}{[]interface{}{"q_001", "==", "是"}}}},
+					map[string]interface{}{"id": "q_002", "title": "您的年龄", "required": false, "description": nil},
 				},
 			},
 		},
@@ -260,14 +258,9 @@ func TestBaseFormQuestionsExecuteList(t *testing.T) {
 	if err := runShortcut(t, BaseFormQuestionsList, []string{"+form-questions-list", "--base-token", "app_x", "--table-id", "tbl_x", "--form-id", "vew_form1"}, factory, stdout); err != nil {
 		t.Fatalf("err=%v", err)
 	}
-	got := stdout.String()
-	if !strings.Contains(got, `"q_001"`) || !strings.Contains(got, `"total": 2`) {
+	if got := stdout.String(); !strings.Contains(got, `"q_001"`) || !strings.Contains(got, `"total": 2`) {
 		t.Fatalf("stdout=%s", got)
 	}
-	// The list output must forward visible_rule verbatim so agents can read existing display conditions.
-	if !strings.Contains(got, `"visible_rule"`) {
-		t.Fatalf("visible_rule missing from list output: %s", got)
-	}
 }
 
 func TestBaseFormQuestionsExecuteCreate(t *testing.T) {
@@ -303,49 +296,11 @@ func TestBaseFormQuestionsExecuteCreate(t *testing.T) {
 			t.Fatalf("expected error for invalid questions JSON")
 		}
 	})
-
-	t.Run("visible_rule passthrough", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		stub := &httpmock.Stub{
-			Method: "POST",
-			URL:    "/open-apis/base/v3/bases/app_x/tables/tbl_x/forms/vew_form1/questions",
-			Body: map[string]interface{}{
-				"code": 0,
-				"data": map[string]interface{}{
-					"questions": []interface{}{
-						map[string]interface{}{"id": "q_new1", "title": "发票抬头"},
-					},
-				},
-			},
-		}
-		reg.Register(stub)
-		args := []string{"+form-questions-create", "--base-token", "app_x", "--table-id", "tbl_x", "--form-id", "vew_form1",
-			"--questions", `[{"type":"text","title":"发票抬头","visible_rule":{"logic":"and","conditions":[["是否需要发票","==","是"]]}}]`}
-		if err := runShortcut(t, BaseFormQuestionsCreate, args, factory, stdout); err != nil {
-			t.Fatalf("err=%v", err)
-		}
-		var body struct {
-			Questions []map[string]interface{} `json:"questions"`
-		}
-		if err := json.Unmarshal(stub.CapturedBody, &body); err != nil {
-			t.Fatalf("captured body json err=%v body=%s", err, string(stub.CapturedBody))
-		}
-		if len(body.Questions) != 1 {
-			t.Fatalf("questions=%#v", body.Questions)
-		}
-		rule, ok := body.Questions[0]["visible_rule"].(map[string]interface{})
-		if !ok {
-			t.Fatalf("visible_rule not forwarded verbatim: body=%s", string(stub.CapturedBody))
-		}
-		if rule["logic"] != "and" {
-			t.Fatalf("visible_rule logic not preserved: %#v", rule)
-		}
-	})
 }
 
 func TestBaseFormQuestionsExecuteUpdate(t *testing.T) {
 	factory, stdout, reg := newExecuteFactory(t)
-	stub := &httpmock.Stub{
+	reg.Register(&httpmock.Stub{
 		Method: "PATCH",
 		URL:    "/open-apis/base/v3/bases/app_x/tables/tbl_x/forms/vew_form1/questions",
 		Body: map[string]interface{}{
@@ -356,29 +311,15 @@ func TestBaseFormQuestionsExecuteUpdate(t *testing.T) {
 				},
 			},
 		},
-	}
-	reg.Register(stub)
+	})
 	args := []string{"+form-questions-update", "--base-token", "app_x", "--table-id", "tbl_x", "--form-id", "vew_form1",
-		"--questions", `[{"id":"q_001","title":"更新后的问题","required":true,"visible_rule":{"logic":"and","conditions":[["q_002","==","是"]]}}]`}
+		"--questions", `[{"id":"q_001","title":"更新后的问题","required":true}]`}
 	if err := runShortcut(t, BaseFormQuestionsUpdate, args, factory, stdout); err != nil {
 		t.Fatalf("err=%v", err)
 	}
 	if got := stdout.String(); !strings.Contains(got, `"questions"`) || !strings.Contains(got, `"q_001"`) {
 		t.Fatalf("stdout=%s", got)
 	}
-	// visible_rule must be forwarded verbatim to the API (transcribe faithfully).
-	var body struct {
-		Questions []map[string]interface{} `json:"questions"`
-	}
-	if err := json.Unmarshal(stub.CapturedBody, &body); err != nil {
-		t.Fatalf("captured body json err=%v body=%s", err, string(stub.CapturedBody))
-	}
-	if len(body.Questions) != 1 {
-		t.Fatalf("questions=%#v", body.Questions)
-	}
-	if _, ok := body.Questions[0]["visible_rule"].(map[string]interface{}); !ok {
-		t.Fatalf("visible_rule not forwarded verbatim: body=%s", string(stub.CapturedBody))
-	}
 }
 
 func TestBaseFormQuestionsExecuteDelete(t *testing.T) {

shortcuts/base/base_form_questions_create.go

@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"strings"
 
 	"github.com/larksuite/cli/internal/output"
 	"github.com/larksuite/cli/shortcuts/common"
@@ -26,25 +25,14 @@ var BaseFormQuestionsCreate = common.Shortcut{
 		{Name: "base-token", Desc: "Base token (base_token)", Required: true},
 		{Name: "table-id", Desc: "table ID", Required: true},
 		{Name: "form-id", Desc: "form ID", Required: true},
-		{Name: "questions", Desc: `questions JSON array, max 10 items. Each item requires "title"(field title) and "type"(text/number/select/datetime/user/attachment/location). Optional fields: "description"(plain text or markdown link like [text](https://example.com)),"required","option_display_mode"(0=dropdown/1=vertical/2=horizontal,select only),"multiple"(bool,select/user),"options"([{"name":"opt","hue":"Blue"}],select only),"style"({"type":"plain/phone/url/email/barcode/rating","precision":2,"format":"yyyy/MM/dd","icon":"star","min":1,"max":5}),"visible_rule"(display condition; same shape as view filter {"logic":"and","conditions":[["前序题目","==","是"]]}, field references another question's title/id, empty/absent = always shown). E.g. '[{"type":"text","title":"Your name","required":true}]'`, Required: true},
-	},
-	Tips: []string{
-		"If the form may already contain questions and has not been checked, run +form-questions-list for the same --base-token, --table-id, and --form-id. A verified empty form can create directly.",
-		"Each new question creates a field in the form's table; question IDs are field IDs.",
-		"Unless the user explicitly requests a separate same-title question, update an existing title with +form-questions-update instead of creating a duplicate.",
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		_, err := parseFormQuestionsCreate(runtime.Str("questions"))
-		return err
+		{Name: "questions", Desc: `questions JSON array, max 10 items. Each item requires "title"(field title) and "type"(text/number/select/datetime/user/attachment/location). Optional fields: "description"(plain text or markdown link like [text](https://example.com)),"required","option_display_mode"(0=dropdown/1=vertical/2=horizontal,select only),"multiple"(bool,select/user),"options"([{"name":"opt","hue":"Blue"}],select only),"style"({"type":"plain/phone/url/email/barcode/rating","precision":2,"format":"yyyy/MM/dd","icon":"star","min":1,"max":5}). E.g. '[{"type":"text","title":"Your name","required":true}]'`, Required: true},
 	},
 	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		questions, _ := parseFormQuestionsCreate(runtime.Str("questions"))
 		return common.NewDryRunAPI().
 			POST("/open-apis/base/v3/bases/:base_token/tables/:table_id/forms/:form_id/questions").
 			Set("base_token", runtime.Str("base-token")).
 			Set("table_id", runtime.Str("table-id")).
-			Set("form_id", runtime.Str("form-id")).
-			Body(map[string]interface{}{"questions": questions})
+			Set("form_id", runtime.Str("form-id"))
 	},
 	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
 		baseToken := runtime.Str("base-token")
@@ -52,9 +40,9 @@ var BaseFormQuestionsCreate = common.Shortcut{
 		formId := runtime.Str("form-id")
 		questionsJSON := runtime.Str("questions")
 
-		questions, err := parseFormQuestionsCreate(questionsJSON)
-		if err != nil {
-			return err
+		var questions []interface{}
+		if err := json.Unmarshal([]byte(questionsJSON), &questions); err != nil {
+			return baseValidationErrorf("--questions must be a valid JSON array: %s", err)
 		}
 
 		data, err := baseV3Call(runtime, "POST",
@@ -83,31 +71,3 @@ var BaseFormQuestionsCreate = common.Shortcut{
 		return nil
 	},
 }
-
-func parseFormQuestionsCreate(raw string) ([]interface{}, error) {
-	var questions []interface{}
-	if err := json.Unmarshal([]byte(raw), &questions); err != nil {
-		return nil, baseValidationErrorf("--questions must be a valid JSON array: %s", err)
-	}
-	if questions == nil {
-		return nil, baseValidationErrorf("--questions must be a non-null JSON array")
-	}
-	if len(questions) > 10 {
-		return nil, baseValidationErrorf("--questions must contain at most 10 items")
-	}
-	for i, question := range questions {
-		item, ok := question.(map[string]interface{})
-		if !ok {
-			return nil, baseValidationErrorf("--questions item %d must be an object", i+1)
-		}
-		title, ok := item["title"].(string)
-		if !ok || strings.TrimSpace(title) == "" {
-			return nil, baseValidationErrorf("--questions item %d must include a non-empty string \"title\"", i+1)
-		}
-		questionType, ok := item["type"].(string)
-		if !ok || strings.TrimSpace(questionType) == "" {
-			return nil, baseValidationErrorf("--questions item %d must include a non-empty string \"type\"", i+1)
-		}
-	}
-	return questions, nil
-}

shortcuts/base/base_form_questions_create_tips_test.go

@@ -1,24 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package base
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestBaseFormQuestionsCreateTipsRequireExistingQuestionCheck(t *testing.T) {
-	tips := strings.Join(BaseFormQuestionsCreate.Tips, "\n")
-	for _, want := range []string{
-		"+form-questions-list",
-		"verified empty form can create directly",
-		"question IDs are field IDs",
-		"explicitly requests a separate same-title question",
-		"+form-questions-update",
-	} {
-		if !strings.Contains(tips, want) {
-			t.Fatalf("tips missing %q:\n%s", want, tips)
-		}
-	}
-}

shortcuts/base/base_form_questions_update.go

@@ -25,26 +25,14 @@ var BaseFormQuestionsUpdate = common.Shortcut{
 		{Name: "base-token", Desc: "Base token (base_token)", Required: true},
 		{Name: "table-id", Desc: "table ID", Required: true},
 		{Name: "form-id", Desc: "form ID", Required: true},
-		{Name: "questions", Desc: `questions JSON array, max 10 items, each item must include "id". Update uses full question overwrite semantics: omitted/empty fields are written as defaults/empty, so run +form-questions-list first and include existing values you want to keep. Supported fields: "id"(required),"title","description"(plain text or markdown link like [text](https://example.com)),"required","option_display_mode"(0=dropdown,1=vertical,2=horizontal,select only),"visible_rule"(display condition; same shape as view filter {"logic":"and","conditions":[["前序题目","==","是"]]}, field references another question's title/id; pass null or omit to clear). E.g. '[{"id":"q_001","title":"Updated?","required":true}]'`, Required: true},
-	},
-	Tips: []string{
-		"Update uses full question overwrite semantics, not a patch.",
-		"Run +form-questions-list first and include existing title/description/required/option_display_mode/visible_rule values you want to keep.",
-		"Omitted fields reset to defaults; empty strings, null, and empty arrays are written as empty/clear when accepted by the API.",
+		{Name: "questions", Desc: `questions JSON array, max 10 items, each item must include "id". Supported fields: "id"(required),"title","description"(plain text or markdown link like [text](https://example.com)),"required","option_display_mode"(0=dropdown,1=vertical,2=horizontal,select only). E.g. '[{"id":"q_001","title":"Updated?","required":true}]'`, Required: true},
 	},
 	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		api := common.NewDryRunAPI().
+		return common.NewDryRunAPI().
 			PATCH("/open-apis/base/v3/bases/:base_token/tables/:table_id/forms/:form_id/questions").
 			Set("base_token", runtime.Str("base-token")).
 			Set("table_id", runtime.Str("table-id")).
 			Set("form_id", runtime.Str("form-id"))
-		// Transcribe the questions body verbatim so the preview shows exactly
-		// what would be sent (including optional fields like visible_rule).
-		var questions []interface{}
-		if err := json.Unmarshal([]byte(runtime.Str("questions")), &questions); err == nil {
-			api.Body(map[string]interface{}{"questions": questions})
-		}
-		return api
 	},
 	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
 		baseToken := runtime.Str("base-token")

shortcuts/base/base_resolve.go

@@ -29,7 +29,6 @@ var BaseURLResolve = common.Shortcut{
 	Risk:        "read",
 	Scopes:      []string{},
 	ConditionalScopes: []string{
-		"base:block:read",
 		"base:field:read",
 		"base:record:read",
 		"wiki:node:retrieve",
@@ -41,7 +40,7 @@ var BaseURLResolve = common.Shortcut{
 		{Name: "query", Hidden: true, Desc: "Alias for --url; accepted to recover from AI routing mistakes"},
 	},
 	Tips: []string{
-		`Example: lark-cli base +url-resolve --url "https://example.larkoffice.com/base/<base_token>?table=<block_id>&view=<view_id>"`,
+		`Example: lark-cli base +url-resolve --url "https://example.larkoffice.com/base/<base_token>?table=<table_id>&view=<view_id>"`,
 		"Only URLs are accepted. For Base titles or keywords, use +title-resolve --title.",
 	},
 	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
@@ -58,34 +57,10 @@ var BaseURLResolve = common.Shortcut{
 			return common.NewDryRunAPI().Set("error", err.Error())
 		}
 		switch classifyBaseURL(parsed) {
-		case "base_url":
-			baseToken := firstPathSegmentAfter(parsed.Path, "/base/")
-			if selectedBlockID := strings.TrimSpace(parsed.Query().Get("table")); selectedBlockID != "" {
-				return common.NewDryRunAPI().
-					POST("/open-apis/base/v3/bases/:base_token/blocks/list").
-					Body(map[string]interface{}{}).
-					Set("base_token", baseToken).
-					Set("selected_block_id", selectedBlockID)
-			}
-			return common.NewDryRunAPI().Set("url", raw).Set("resolution", "local")
 		case "wiki_url":
-			dry := common.NewDryRunAPI()
-			selectedBlockID := strings.TrimSpace(parsed.Query().Get("table"))
-			if selectedBlockID == "" {
-				return dry.
-					GET("/open-apis/wiki/v2/spaces/get_node").
-					Params(map[string]interface{}{"token": firstPathSegmentAfter(parsed.Path, "/wiki/")})
-			}
-			dry.Desc("2-step: resolve the Wiki node to a Base, then identify the selected Base block")
-			dry.GET("/open-apis/wiki/v2/spaces/get_node").
-				Desc("[1] Resolve the Wiki node to its underlying Base").
+			return common.NewDryRunAPI().
+				GET("/open-apis/wiki/v2/spaces/get_node").
 				Params(map[string]interface{}{"token": firstPathSegmentAfter(parsed.Path, "/wiki/")})
-			dry.POST("/open-apis/base/v3/bases/:base_token/blocks/list").
-				Desc("[2] List Base blocks and match selected_block_id").
-				Body(map[string]interface{}{})
-			return dry.
-				Set("base_token", "<obj_token from step 1>").
-				Set("selected_block_id", selectedBlockID)
 		case "record_share_url":
 			return common.NewDryRunAPI().
 				GET("/open-apis/base/v3/record_share/:record_share_token/meta").
@@ -195,7 +170,7 @@ func executeBaseURLResolve(runtime *common.RuntimeContext) error {
 	switch classifyBaseURL(parsed) {
 	case "base_url":
 		out := resolveBaseURL(parsed)
-		enrichBaseResolveHint(runtime, out, resolveBaseURLSelection(parsed))
+		enrichBaseResolveHint(runtime, out)
 		runtime.OutFormat(out, nil, nil)
 		return nil
 	case "wiki_url":
@@ -203,9 +178,6 @@ func executeBaseURLResolve(runtime *common.RuntimeContext) error {
 		if err != nil {
 			return err
 		}
-		selection := resolveBaseURLSelection(parsed)
-		applyBaseURLSelection(out, selection)
-		enrichBaseResolveHint(runtime, out, selection)
 		runtime.OutFormat(out, nil, nil)
 		return nil
 	case "record_share_url":
@@ -279,50 +251,24 @@ func classifyBaseURL(u *url.URL) string {
 }
 
 func resolveBaseURL(u *url.URL) map[string]interface{} {
+	query := u.Query()
 	out := map[string]interface{}{
 		"input_type":    "base_url",
 		"resource_type": "bitable",
 		"base_token":    firstPathSegmentAfter(u.Path, "/base/"),
 	}
-	applyBaseURLSelection(out, resolveBaseURLSelection(u))
+	if tableID := strings.TrimSpace(query.Get("table")); tableID != "" {
+		out["table_id"] = tableID
+	}
+	if viewID := strings.TrimSpace(query.Get("view")); viewID != "" {
+		out["view_id"] = viewID
+	}
+	if recordID := strings.TrimSpace(query.Get("record")); recordID != "" {
+		out["record_id"] = recordID
+	}
 	return out
 }
 
-type baseURLSelection struct {
-	blockID  string
-	viewID   string
-	recordID string
-}
-
-func resolveBaseURLSelection(u *url.URL) baseURLSelection {
-	query := u.Query()
-	return baseURLSelection{
-		blockID:  strings.TrimSpace(query.Get("table")),
-		viewID:   strings.TrimSpace(query.Get("view")),
-		recordID: strings.TrimSpace(query.Get("record")),
-	}
-}
-
-func applyBaseURLSelection(out map[string]interface{}, selection baseURLSelection) {
-	if selection.blockID != "" {
-		// The Base web UI historically uses the query key "table" for the
-		// currently selected top-level block. Its value can identify a table,
-		// dashboard, workflow, or another block type. Keep it neutral until the
-		// block directory confirms the resource type.
-		out["block_id"] = selection.blockID
-		out["selection_source"] = "url_query"
-	}
-}
-
-func applyResolvedTableSelection(out map[string]interface{}, selection baseURLSelection) {
-	if selection.viewID != "" {
-		out["view_id"] = selection.viewID
-	}
-	if selection.recordID != "" {
-		out["record_id"] = selection.recordID
-	}
-}
-
 func resolveWikiBaseURL(runtime *common.RuntimeContext, u *url.URL) (map[string]interface{}, error) {
 	token := firstPathSegmentAfter(u.Path, "/wiki/")
 	data, err := runtime.CallAPITyped("GET", "/open-apis/wiki/v2/spaces/get_node", map[string]interface{}{"token": token}, nil)
@@ -422,89 +368,13 @@ func executeBaseTitleResolve(runtime *common.RuntimeContext) error {
 	}
 }
 
-func enrichBaseResolveHint(runtime *common.RuntimeContext, out map[string]interface{}, selection baseURLSelection) {
+func enrichBaseResolveHint(runtime *common.RuntimeContext, out map[string]interface{}) {
 	baseToken := strings.TrimSpace(common.GetString(out, "base_token"))
-	selectedBlockID := strings.TrimSpace(common.GetString(out, "block_id"))
-	if baseToken == "" || selectedBlockID == "" {
+	tableID := strings.TrimSpace(common.GetString(out, "table_id"))
+	if baseToken == "" || tableID == "" {
 		out["hint"] = resolveHint("", nil)
 		return
 	}
-
-	if block, found, err := resolveSelectedBaseBlock(runtime, baseToken, selectedBlockID); err == nil && found {
-		out["block_type"] = block.Type
-		if block.Name != "" {
-			out["block_name"] = block.Name
-		}
-		switch block.Type {
-		case "table":
-			applyResolvedTableSelection(out, selection)
-			enrichResolvedTable(runtime, out, baseToken, selectedBlockID)
-		case "dashboard":
-			out["dashboard_id"] = selectedBlockID
-			out["hint"] = map[string]interface{}{
-				"next_step": "this dashboard is only the block currently selected by the URL; if the user names a different dashboard than block_name, use +dashboard-list and match that name first, otherwise use +dashboard-get to inspect this dashboard",
-			}
-		case "workflow":
-			out["workflow_id"] = selectedBlockID
-			out["hint"] = map[string]interface{}{
-				"next_step": "use +workflow-get to inspect the resolved workflow",
-			}
-		case "folder":
-			out["hint"] = map[string]interface{}{
-				"next_step": fmt.Sprintf("use +base-block-list --base-token %s --parent-id %s to list this folder's direct children", baseToken, selectedBlockID),
-			}
-		case "docx":
-			if block.DocxToken != "" {
-				out["docx_token"] = block.DocxToken
-				out["hint"] = map[string]interface{}{
-					"next_step": fmt.Sprintf("use docs +fetch --doc %s to read this document", block.DocxToken),
-				}
-			} else {
-				out["hint"] = map[string]interface{}{
-					"next_step": "use +base-block-list --type docx and match block_id to retrieve this document's docx_token",
-				}
-			}
-		default:
-			out["hint"] = resolveUnknownBlockHint()
-		}
-		return
-	}
-
-	out["hint"] = resolveUnknownBlockHint()
-}
-
-type resolvedBaseBlock struct {
-	ID        string
-	Type      string
-	Name      string
-	DocxToken string
-}
-
-func resolveSelectedBaseBlock(runtime *common.RuntimeContext, baseToken, selectedBlockID string) (resolvedBaseBlock, bool, error) {
-	data, err := baseV3Call(runtime, "POST", baseV3Path("bases", baseToken, "blocks", "list"), nil, map[string]interface{}{})
-	if err != nil {
-		return resolvedBaseBlock{}, false, err
-	}
-	for _, item := range common.GetSlice(data, "blocks") {
-		row, ok := item.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		block := resolvedBaseBlock{
-			ID:        strings.TrimSpace(common.GetString(row, "id")),
-			Type:      strings.TrimSpace(common.GetString(row, "type")),
-			Name:      strings.TrimSpace(common.GetString(row, "name")),
-			DocxToken: strings.TrimSpace(common.GetString(row, "docx_token")),
-		}
-		if block.ID == selectedBlockID {
-			return block, true, nil
-		}
-	}
-	return resolvedBaseBlock{}, false, nil
-}
-
-func enrichResolvedTable(runtime *common.RuntimeContext, out map[string]interface{}, baseToken, tableID string) {
-	out["table_id"] = tableID
 	fields, total, err := listAllFields(runtime, baseToken, tableID, 0, 100)
 	if err != nil {
 		out["hint"] = resolveHint(tableID, nil)
@@ -513,12 +383,6 @@ func enrichResolvedTable(runtime *common.RuntimeContext, out map[string]interfac
 	out["hint"] = resolveHint(tableID, map[string]interface{}{"fields": map[string]interface{}{"fields": fields, "total": total}})
 }
 
-func resolveUnknownBlockHint() map[string]interface{} {
-	return map[string]interface{}{
-		"next_step": "use +base-block-list and match block_id to determine whether this is a table, dashboard, workflow, folder, or docx block",
-	}
-}
-
 func enrichRecordShareResolveHint(runtime *common.RuntimeContext, out map[string]interface{}) {
 	baseToken := strings.TrimSpace(common.GetString(out, "base_token"))
 	tableID := strings.TrimSpace(common.GetString(out, "table_id"))

shortcuts/base/base_resolve_test.go

@@ -4,7 +4,6 @@
 package base
 
 import (
-	"net/http"
 	"strings"
 	"testing"
 
@@ -18,9 +17,6 @@ import (
 func TestBaseURLResolveBaseURL(t *testing.T) {
 	t.Run("with coordinates", func(t *testing.T) {
 		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "tbl123", "type": "table", "name": "Orders"},
-		))
 		reg.Register(fieldListStub("bas123", "tbl123"))
 		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
 			"+url-resolve",
@@ -35,7 +31,7 @@ func TestBaseURLResolveBaseURL(t *testing.T) {
 		if data["input_type"] != "base_url" || data["base_token"] != "bas123" {
 			t.Fatalf("unexpected output: %#v", data)
 		}
-		if data["block_id"] != "tbl123" || data["selection_source"] != "url_query" || data["block_type"] != "table" || data["table_id"] != "tbl123" || data["view_id"] != "vew123" || data["record_id"] != "rec123" {
+		if data["table_id"] != "tbl123" || data["view_id"] != "vew123" || data["record_id"] != "rec123" {
 			t.Fatalf("missing Base coordinates: %#v", data)
 		}
 		hint, _ := data["hint"].(map[string]interface{})
@@ -66,213 +62,45 @@ func TestBaseURLResolveBaseURL(t *testing.T) {
 		}
 	})
 
-	t.Run("unconfirmed selected block stays neutral", func(t *testing.T) {
+	t.Run("field list enrichment failure still returns coordinates", func(t *testing.T) {
 		factory, stdout, _ := newExecuteFactory(t)
 		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve", "--url", "https://example.larkoffice.com/base/bas123?table=tbl123&view=vew_stale&record=rec_stale", "--as", "user",
+			"+url-resolve", "--url", "https://example.larkoffice.com/base/bas123?table=tbl123", "--as", "user",
 		}, factory, stdout)
 		if err != nil {
 			t.Fatalf("err=%v", err)
 		}
 		data := decodeBaseEnvelope(t, stdout)
-		if data["base_token"] != "bas123" || data["block_id"] != "tbl123" {
+		if data["base_token"] != "bas123" || data["table_id"] != "tbl123" {
 			t.Fatalf("unexpected output: %#v", data)
 		}
-		if _, ok := data["table_id"]; ok {
-			t.Fatalf("unconfirmed block must not be reported as a table: %#v", data)
-		}
-		if _, ok := data["view_id"]; ok {
-			t.Fatalf("unconfirmed block must not expose table-only view_id: %#v", data)
-		}
-		if _, ok := data["record_id"]; ok {
-			t.Fatalf("unconfirmed block must not expose table-only record_id: %#v", data)
-		}
 		hint, _ := data["hint"].(map[string]interface{})
-		if !strings.Contains(hint["next_step"].(string), "+base-block-list") {
+		if hint["next_step"] != nextStepRecordList {
 			t.Fatalf("unexpected hint: %#v", hint)
 		}
 		if _, ok := hint["fields"]; ok {
 			t.Fatalf("fields should be omitted when enrichment fails: %#v", hint)
 		}
 	})
-
-	t.Run("field endpoint does not confirm untyped block", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "tbl_other", "type": "table", "name": "Other"},
-		))
-		fieldStub := fieldListStub("bas123", "tbl123")
-		fieldStub.Optional = true
-		fieldStub.OnMatch = func(_ *http.Request) {
-			t.Fatalf("field endpoint must not be used to infer selected block type")
-		}
-		reg.Register(fieldStub)
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve", "--url", "https://example.larkoffice.com/base/bas123?table=tbl123&view=vew_stale", "--as", "user",
-		}, factory, stdout)
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-		data := decodeBaseEnvelope(t, stdout)
-		if data["block_id"] != "tbl123" {
-			t.Fatalf("unexpected block coordinates: %#v", data)
-		}
-		if _, ok := data["block_type"]; ok {
-			t.Fatalf("field endpoint must not confirm block type without block directory: %#v", data)
-		}
-		if _, ok := data["table_id"]; ok {
-			t.Fatalf("field endpoint must not promote an untyped block to table_id: %#v", data)
-		}
-		if _, ok := data["view_id"]; ok {
-			t.Fatalf("untyped block must not expose table-only view_id: %#v", data)
-		}
-		hint, _ := data["hint"].(map[string]interface{})
-		if _, ok := hint["fields"]; ok {
-			t.Fatalf("fields should be omitted when block type is unconfirmed: %#v", hint)
-		}
-		if !strings.Contains(hint["next_step"].(string), "+base-block-list") {
-			t.Fatalf("unexpected hint: %#v", hint)
-		}
-	})
-
-	t.Run("dashboard selected through table query key", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "blk_dashboard", "type": "dashboard", "name": "Sales"},
-		))
-
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve", "--url", "https://example.larkoffice.com/base/bas123?table=blk_dashboard&view=vew_stale&record=rec_stale", "--as", "user",
-		}, factory, stdout)
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-		data := decodeBaseEnvelope(t, stdout)
-		if data["block_id"] != "blk_dashboard" || data["selection_source"] != "url_query" || data["block_type"] != "dashboard" || data["dashboard_id"] != "blk_dashboard" || data["block_name"] != "Sales" {
-			t.Fatalf("unexpected dashboard coordinates: %#v", data)
-		}
-		if _, ok := data["table_id"]; ok {
-			t.Fatalf("dashboard must not be reported as table_id: %#v", data)
-		}
-		if _, ok := data["view_id"]; ok {
-			t.Fatalf("dashboard must not expose table-only view_id: %#v", data)
-		}
-		if _, ok := data["record_id"]; ok {
-			t.Fatalf("dashboard must not expose table-only record_id: %#v", data)
-		}
-		hint, _ := data["hint"].(map[string]interface{})
-		nextStep := hint["next_step"].(string)
-		if !strings.Contains(nextStep, "+dashboard-get") || !strings.Contains(nextStep, "+dashboard-list") || !strings.Contains(nextStep, "different dashboard than block_name") {
-			t.Fatalf("unexpected dashboard hint: %#v", hint)
-		}
-	})
-
-	t.Run("workflow selected through table query key", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "wkf_notify", "type": "workflow", "name": "Notify"},
-		))
-
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve", "--url", "https://example.larkoffice.com/base/bas123?table=wkf_notify&view=vew_stale&record=rec_stale", "--as", "user",
-		}, factory, stdout)
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-		data := decodeBaseEnvelope(t, stdout)
-		if data["block_id"] != "wkf_notify" || data["block_type"] != "workflow" || data["workflow_id"] != "wkf_notify" {
-			t.Fatalf("unexpected workflow coordinates: %#v", data)
-		}
-		if _, ok := data["table_id"]; ok {
-			t.Fatalf("workflow must not be reported as table_id: %#v", data)
-		}
-		if _, ok := data["view_id"]; ok {
-			t.Fatalf("workflow must not expose table-only view_id: %#v", data)
-		}
-		if _, ok := data["record_id"]; ok {
-			t.Fatalf("workflow must not expose table-only record_id: %#v", data)
-		}
-		hint, _ := data["hint"].(map[string]interface{})
-		if !strings.Contains(hint["next_step"].(string), "+workflow-get") {
-			t.Fatalf("unexpected workflow hint: %#v", hint)
-		}
-	})
-
-	t.Run("folder selected through table query key", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "bfl_projects", "type": "folder", "name": "Projects"},
-		))
-
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve", "--url", "https://example.larkoffice.com/base/bas123?table=bfl_projects&view=vew_stale&record=rec_stale", "--as", "user",
-		}, factory, stdout)
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-		data := decodeBaseEnvelope(t, stdout)
-		if data["block_id"] != "bfl_projects" || data["block_type"] != "folder" || data["block_name"] != "Projects" {
-			t.Fatalf("unexpected folder coordinates: %#v", data)
-		}
-		if _, ok := data["table_id"]; ok {
-			t.Fatalf("folder must not be reported as table_id: %#v", data)
-		}
-		hint, _ := data["hint"].(map[string]interface{})
-		nextStep := hint["next_step"].(string)
-		if !strings.Contains(nextStep, "+base-block-list --base-token bas123 --parent-id bfl_projects") || strings.Contains(nextStep, "determine whether") {
-			t.Fatalf("unexpected folder hint: %#v", hint)
-		}
-	})
-
-	t.Run("docx selected through table query key", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "blk_doc", "type": "docx", "name": "Spec", "docx_token": "docx123"},
-		))
-
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve", "--url", "https://example.larkoffice.com/base/bas123?table=blk_doc&view=vew_stale&record=rec_stale", "--as", "user",
-		}, factory, stdout)
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-		data := decodeBaseEnvelope(t, stdout)
-		if data["block_id"] != "blk_doc" || data["block_type"] != "docx" || data["block_name"] != "Spec" || data["docx_token"] != "docx123" {
-			t.Fatalf("unexpected docx coordinates: %#v", data)
-		}
-		if _, ok := data["table_id"]; ok {
-			t.Fatalf("docx must not be reported as table_id: %#v", data)
-		}
-		hint, _ := data["hint"].(map[string]interface{})
-		nextStep := hint["next_step"].(string)
-		if !strings.Contains(nextStep, "docs +fetch --doc docx123") || strings.Contains(nextStep, "determine whether") {
-			t.Fatalf("unexpected docx hint: %#v", hint)
-		}
-	})
-}
-
-func baseBlockListResolveStub(baseToken string, blocks ...map[string]interface{}) *httpmock.Stub {
-	items := make([]interface{}, 0, len(blocks))
-	for _, block := range blocks {
-		items = append(items, block)
-	}
-	return &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/base/v3/bases/" + baseToken + "/blocks/list",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"blocks": items,
-				"total":  len(items),
-			},
-		},
-	}
 }
 
 func TestBaseURLResolveWikiURL(t *testing.T) {
 	t.Run("bitable", func(t *testing.T) {
 		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(wikiBaseNodeStub("wik123", "bas123", "Demo Base"))
+		reg.Register(&httpmock.Stub{
+			Method: "GET",
+			URL:    "/open-apis/wiki/v2/spaces/get_node?token=wik123",
+			Body: map[string]interface{}{
+				"code": 0,
+				"data": map[string]interface{}{
+					"node": map[string]interface{}{
+						"obj_type":  "bitable",
+						"obj_token": "bas123",
+						"title":     "Demo Base",
+					},
+				},
+			},
+		})
 
 		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
 			"+url-resolve", "--url", "https://example.larkoffice.com/wiki/wik123", "--as", "user",
@@ -286,57 +114,6 @@ func TestBaseURLResolveWikiURL(t *testing.T) {
 		}
 	})
 
-	t.Run("bitable with table coordinates", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(wikiBaseNodeStub("wik123", "bas123", "Demo Base"))
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "tbl123", "type": "table", "name": "Orders"},
-		))
-		reg.Register(fieldListStub("bas123", "tbl123"))
-
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve",
-			"--url", "https://example.larkoffice.com/wiki/wik123?table=tbl123&view=vew123&record=rec123",
-			"--as", "user",
-		}, factory, stdout)
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-
-		data := decodeBaseEnvelope(t, stdout)
-		if data["input_type"] != "wiki_url" || data["base_token"] != "bas123" || data["block_id"] != "tbl123" || data["block_type"] != "table" || data["table_id"] != "tbl123" || data["view_id"] != "vew123" || data["record_id"] != "rec123" {
-			t.Fatalf("unexpected Wiki Base table coordinates: %#v", data)
-		}
-	})
-
-	t.Run("bitable with dashboard selection", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(wikiBaseNodeStub("wik123", "bas123", "Demo Base"))
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "blk_dashboard", "type": "dashboard", "name": "Sales"},
-		))
-
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve",
-			"--url", "https://example.larkoffice.com/wiki/wik123?table=blk_dashboard&view=vew_stale&record=rec_stale",
-			"--as", "user",
-		}, factory, stdout)
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-
-		data := decodeBaseEnvelope(t, stdout)
-		if data["input_type"] != "wiki_url" || data["block_id"] != "blk_dashboard" || data["block_type"] != "dashboard" || data["dashboard_id"] != "blk_dashboard" {
-			t.Fatalf("unexpected Wiki Base dashboard coordinates: %#v", data)
-		}
-		if _, ok := data["view_id"]; ok {
-			t.Fatalf("dashboard must not expose table-only view_id: %#v", data)
-		}
-		if _, ok := data["record_id"]; ok {
-			t.Fatalf("dashboard must not expose table-only record_id: %#v", data)
-		}
-	})
-
 	t.Run("non bitable", func(t *testing.T) {
 		factory, stdout, reg := newExecuteFactory(t)
 		reg.Register(&httpmock.Stub{
@@ -359,23 +136,6 @@ func TestBaseURLResolveWikiURL(t *testing.T) {
 	})
 }
 
-func wikiBaseNodeStub(wikiToken, baseToken, title string) *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/wiki/v2/spaces/get_node?token=" + wikiToken,
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"node": map[string]interface{}{
-					"obj_type":  "bitable",
-					"obj_token": baseToken,
-					"title":     title,
-				},
-			},
-		},
-	}
-}
-
 func TestBaseURLResolveRecordShareURL(t *testing.T) {
 	t.Run("enriched", func(t *testing.T) {
 		factory, stdout, reg := newExecuteFactory(t)

shortcuts/base/base_shortcuts_test.go

@@ -783,20 +783,6 @@ func TestBaseJSONExamplesLiveInFlagDescriptions(t *testing.T) {
 				`JSON array of question IDs to delete, max 10 items, e.g. '["q_001","q_002"]'`,
 			},
 		},
-		{
-			name:     "form question create visible_rule",
-			shortcut: BaseFormQuestionsCreate,
-			wantHelp: []string{
-				`"visible_rule"(display condition; same shape as view filter`,
-			},
-		},
-		{
-			name:     "form question update visible_rule",
-			shortcut: BaseFormQuestionsUpdate,
-			wantHelp: []string{
-				`"visible_rule"(display condition; same shape as view filter`,
-			},
-		},
 		{
 			name:     "record search json",
 			shortcut: BaseRecordSearch,
@@ -1042,39 +1028,6 @@ func TestBaseFieldUpdateHelpGuidesAgents(t *testing.T) {
 	}
 }
 
-func TestBaseFormQuestionsUpdateHelpGuidesFullOverwrite(t *testing.T) {
-	parent := &cobra.Command{Use: "base"}
-	BaseFormQuestionsUpdate.Mount(parent, &cmdutil.Factory{})
-	cmd := parent.Commands()[0]
-
-	help := cmd.Flags().FlagUsages()
-	wantHelp := []string{
-		"Update uses full question overwrite semantics",
-		"run +form-questions-list first",
-		"include existing values you want to keep",
-		"pass null or omit to clear",
-	}
-	for _, want := range wantHelp {
-		if !strings.Contains(help, want) {
-			t.Fatalf("flag help missing %q:\n%s", want, help)
-		}
-	}
-
-	tips := strings.Join(cmdutil.GetTips(cmd), "\n")
-	wantTips := []string{
-		"full question overwrite semantics, not a patch",
-		"Run +form-questions-list first",
-		"title/description/required/option_display_mode/visible_rule",
-		"Omitted fields reset to defaults",
-		"empty strings, null, and empty arrays are written as empty/clear",
-	}
-	for _, want := range wantTips {
-		if !strings.Contains(tips, want) {
-			t.Fatalf("tips missing %q:\n%s", want, tips)
-		}
-	}
-}
-
 func TestBaseAttachmentHelpGuidesAgents(t *testing.T) {
 	tests := []struct {
 		name     string

shortcuts/calendar/description_rich_images.go

@@ -157,7 +157,7 @@ func localImagePath(src string) string {
 }
 
 func buildCalendarImagePreviewURL(brand core.LarkBrand, fileToken string, width, height int, size int64) string {
-	host := "internal-api-drive-stream.feishu.cn"
+	host := "internal-api-drive-stream.larkoffice.com"
 	if brand == core.BrandLark {
 		host = "internal-api-drive-stream.larksuite.com"
 	}

shortcuts/calendar/description_rich_images_test.go

@@ -68,7 +68,7 @@ func TestBuildCalendarImagePreviewURL(t *testing.T) {
 		brand    core.LarkBrand
 		hostFrag string
 	}{
-		{core.BrandFeishu, "feishu.cn"},
+		{core.BrandFeishu, "larkoffice"},
 		{core.BrandLark, "larksuite"},
 	} {
 		raw := buildCalendarImagePreviewURL(tc.brand, "boxcnTOKEN123", 416, 306, 142568)

shortcuts/contact/contact_search_bot.go

@@ -1,447 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package contact
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"html"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/shortcuts/common"
-	larkcore "github.com/larksuite/oapi-sdk-go/v3/core"
-)
-
-const botSearchURL = "/open-apis/bot/v4/bot/search"
-
-const (
-	maxBotSearchQueryChars = 50
-	maxBotSearchChatIDs    = 100
-	maxBotSearchPageSize   = 30
-)
-
-type botSearchAPIRequest struct {
-	Query  string              `json:"query,omitempty"`
-	Filter *botSearchAPIFilter `json:"filter,omitempty"`
-}
-
-// HasChatter uses omitempty: validation rejects =false, so a set field is always
-// true and an unset field stays out of the request entirely.
-type botSearchAPIFilter struct {
-	ChatIDs    []string `json:"chat_ids,omitempty"`
-	HasChatter bool     `json:"has_chatter,omitempty"`
-}
-
-type botSearchAPIData struct {
-	Items     []botSearchAPIItem `json:"items"`
-	HasMore   bool               `json:"has_more"`
-	PageToken string             `json:"page_token"`
-	Notice    string             `json:"notice"`
-}
-
-type botSearchAPIItem struct {
-	ID          string           `json:"id"`
-	DisplayInfo string           `json:"display_info"`
-	MetaData    botSearchAPIMeta `json:"meta_data"`
-}
-
-type botSearchAPIMeta struct {
-	TenantID        string `json:"tenant_id"`
-	EnableJoinGroup bool   `json:"enable_join_group"`
-	ChatID          string `json:"chat_id"`
-	IsAgent         bool   `json:"is_agent"`
-}
-
-type searchBot struct {
-	OpenID      string `json:"open_id"`
-	Name        string `json:"name"`
-	Description string `json:"description,omitempty"`
-	// ChatID is the caller's P2P chat with the bot.
-	ChatID          string   `json:"chat_id"`
-	EnableJoinGroup bool     `json:"enable_join_group"`
-	IsAgent         bool     `json:"is_agent"`
-	TenantID        string   `json:"tenant_id,omitempty"`
-	MatchSegments   []string `json:"match_segments"`
-}
-
-// PageToken is decoded from the response but deliberately not surfaced, matching
-// searchUserResponse: neither search command paginates. Callers narrow the query
-// instead, so handing out a token that no flag accepts would only mislead.
-type searchBotResponse struct {
-	Bots    []searchBot `json:"bots"`
-	HasMore bool        `json:"has_more"`
-	Notice  string      `json:"notice,omitempty"`
-}
-
-var ContactSearchBot = common.Shortcut{
-	Service:     "contact",
-	Command:     "+search-bot",
-	Description: "Search bots (apps) by keyword — across the tenant, or inside specific chats (requires --as user)",
-	Risk:        "read",
-	Scopes:      []string{"search:bot"},
-	AuthTypes:   []string{"user"},
-	Flags: []common.Flag{
-		{Name: "query", Desc: "search keyword (≤ 50 characters); required unless --queries is given"},
-		{Name: "chat-ids", Desc: "search within specific chats (CSV of chat_id; ≤ 100)"},
-		{Name: "has-chatted", Type: "bool", Desc: "narrow a keyword search to bots you've chatted with (omit to disable; =false rejected)"},
-		{Name: "page-size", Type: "int", Default: "20", Desc: "rows per request, 1-30"},
-		{Name: "queries", Desc: "comma-separated keywords searched in parallel; output is a flat bots[] with matched_query plus a queries[] sidecar"},
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		return validateBotSearch(runtime)
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		if raw := strings.TrimSpace(runtime.Str("queries")); raw != "" {
-			filter, err := buildBotSearchFilter(runtime)
-			if err != nil {
-				return common.NewDryRunAPI().Set("error", err.Error())
-			}
-			api := common.NewDryRunAPI()
-			for _, q := range parseAndDedupQueries(raw) {
-				body := &botSearchAPIRequest{Query: q, Filter: filter}
-				api.POST(botSearchURL).
-					Params(map[string]interface{}{"page_size": runtime.Int("page-size")}).
-					Body(body)
-			}
-			return api
-		}
-		body, err := buildBotSearchBody(runtime)
-		if err != nil {
-			return common.NewDryRunAPI().Set("error", err.Error())
-		}
-		return common.NewDryRunAPI().
-			POST(botSearchURL).
-			Params(map[string]interface{}{"page_size": runtime.Int("page-size")}).
-			Body(body)
-	},
-	Execute: executeBotSearch,
-}
-
-// executeBotSearch dispatches to single-query or fanout mode.
-func executeBotSearch(ctx context.Context, runtime *common.RuntimeContext) error {
-	if strings.TrimSpace(runtime.Str("queries")) != "" {
-		return executeBotSearchFanout(ctx, runtime)
-	}
-	return executeBotSearchSingle(ctx, runtime)
-}
-
-// botSearchKeywordRequiredError names every flag that can satisfy the keyword
-// requirement. Naming only --query would tell an agent that --queries is not a
-// way out, which it is.
-func botSearchKeywordRequiredError() error {
-	return common.ValidationErrorf("specify --query or --queries: --chat-ids and --has-chatted shape a keyword search but cannot enumerate bots on their own (the API answers a filter-only request with an empty list)").
-		WithParams(
-			errs.InvalidParam{Name: "--query", Reason: "required unless --queries is given"},
-			errs.InvalidParam{Name: "--queries", Reason: "required unless --query is given"},
-		)
-}
-
-// botSearchHasChattedFalseError is raised from two places — with and without a
-// keyword — so the wording stays in one spot.
-//
-// Agents passing =false almost always mean "do not filter", but the API reads it
-// as "must NOT match". A hard error prevents silent wrong results.
-func botSearchHasChattedFalseError() error {
-	return common.ValidationErrorf("--has-chatted: pass the flag to enable the filter; omit it to disable filtering (=false is rejected to prevent silent wrong results)").
-		WithParam("--has-chatted")
-}
-
-func validateBotSearch(runtime *common.RuntimeContext) error {
-	queriesRaw := strings.TrimSpace(runtime.Str("queries"))
-	query := strings.TrimSpace(runtime.Str("query"))
-	explicitFalseHasChatted := runtime.Cmd.Flags().Changed("has-chatted") && !runtime.Bool("has-chatted")
-
-	if queriesRaw != "" {
-		if query != "" {
-			return common.ValidationErrorf("--query and --queries are mutually exclusive").
-				WithParams(
-					errs.InvalidParam{Name: "--query", Reason: "mutually exclusive with --queries"},
-					errs.InvalidParam{Name: "--queries", Reason: "mutually exclusive with --query"},
-				)
-		}
-		queries := parseAndDedupQueries(queriesRaw)
-		if len(queries) == 0 {
-			return common.ValidationErrorf("--queries: no valid query parsed from %q (separate entries with ',')", queriesRaw).
-				WithParam("--queries")
-		}
-		if len(queries) > maxFanoutQueries {
-			return common.ValidationErrorf("--queries: must be at most %d entries (got %d)", maxFanoutQueries, len(queries)).
-				WithParam("--queries")
-		}
-		for _, q := range queries {
-			if utf8.RuneCountInString(q) > maxBotSearchQueryChars {
-				return common.ValidationErrorf("--queries: entry %q exceeds %d characters", q, maxBotSearchQueryChars).
-					WithParam("--queries")
-			}
-		}
-	} else if query == "" {
-		// No keyword at all. An explicit =false is the more specific mistake, so
-		// report it instead of sending the caller off to add a keyword only to hit
-		// this on the next attempt. +search-user lands here too: a Changed bool
-		// counts as search input for its "at least one" gate, so the =false check
-		// is what it reaches next.
-		//
-		// Scoped to the no-keyword case on purpose. Hoisting it above the keyword
-		// checks would let it mask the mutual-exclusion and length errors, which
-		// +search-user reports first when a keyword is present.
-		if explicitFalseHasChatted {
-			return botSearchHasChattedFalseError()
-		}
-		return botSearchKeywordRequiredError()
-	} else if utf8.RuneCountInString(query) > maxBotSearchQueryChars {
-		return common.ValidationErrorf("--query: length must be between 1 and %d characters", maxBotSearchQueryChars).
-			WithParam("--query")
-	}
-
-	if _, err := parseBotSearchChatIDs(runtime); err != nil {
-		return err
-	}
-
-	if explicitFalseHasChatted {
-		return botSearchHasChattedFalseError()
-	}
-
-	if n := runtime.Int("page-size"); n < 1 || n > maxBotSearchPageSize {
-		return common.ValidationErrorf("--page-size: must be between 1 and %d", maxBotSearchPageSize).
-			WithParam("--page-size")
-	}
-	return nil
-}
-
-func parseBotSearchChatIDs(runtime *common.RuntimeContext) ([]string, error) {
-	raw := strings.TrimSpace(runtime.Str("chat-ids"))
-	if raw == "" {
-		return nil, nil
-	}
-	parts := common.SplitCSV(raw)
-	if len(parts) == 0 {
-		return nil, common.ValidationErrorf("--chat-ids: no valid chat_id parsed from %q (separate entries with ',')", raw).
-			WithParam("--chat-ids")
-	}
-
-	// Normalize before deduping, then check the cap against the deduped list —
-	// the same order common.resolveOpenIDs uses for --user-ids. Doing it the other
-	// way would spend the server's 100-entry budget on duplicates, and would let
-	// 101 copies of one chat be rejected here while the sibling command accepts
-	// them. Normalization matters too: a chat URL and a bare chat_id can name the
-	// same chat.
-	seen := make(map[string]struct{}, len(parts))
-	chatIDs := make([]string, 0, len(parts))
-	for _, part := range parts {
-		normalized, err := common.ValidateChatIDTyped("--chat-ids", part)
-		if err != nil {
-			return nil, err
-		}
-		if _, dup := seen[normalized]; dup {
-			continue
-		}
-		seen[normalized] = struct{}{}
-		chatIDs = append(chatIDs, normalized)
-	}
-	if len(chatIDs) > maxBotSearchChatIDs {
-		return nil, common.ValidationErrorf("--chat-ids: must be at most %d entries", maxBotSearchChatIDs).
-			WithParam("--chat-ids")
-	}
-	return chatIDs, nil
-}
-
-// buildBotSearchFilter reads the scope flags shared by single and fanout search.
-// A nil filter means "no scope": an empty filter object is not the same request.
-func buildBotSearchFilter(runtime *common.RuntimeContext) (*botSearchAPIFilter, error) {
-	filter := &botSearchAPIFilter{}
-	hasFilter := false
-
-	chatIDs, err := parseBotSearchChatIDs(runtime)
-	if err != nil {
-		return nil, err
-	}
-	if len(chatIDs) > 0 {
-		filter.ChatIDs = chatIDs
-		hasFilter = true
-	}
-	if runtime.Cmd.Flags().Changed("has-chatted") && runtime.Bool("has-chatted") {
-		filter.HasChatter = true
-		hasFilter = true
-	}
-
-	if !hasFilter {
-		return nil, nil
-	}
-	return filter, nil
-}
-
-func buildBotSearchBody(runtime *common.RuntimeContext) (*botSearchAPIRequest, error) {
-	filter, err := buildBotSearchFilter(runtime)
-	if err != nil {
-		return nil, err
-	}
-	return &botSearchAPIRequest{
-		Query:  strings.TrimSpace(runtime.Str("query")),
-		Filter: filter,
-	}, nil
-}
-
-// botSearchStdoutCarriesEnvelope reports whether the chosen format puts the
-// response envelope — notice, has_more, and in fanout mode queries[] — into
-// stdout. Only json does; pretty, table, csv and ndjson render rows only, so
-// every piece of "this result is not the whole answer" metadata would vanish and
-// the caller would read a truncated result as a complete one. For those formats
-// the metadata goes to stderr, which keeps stdout pipe-clean. A --jq expression
-// can still project it away, but that is the caller's explicit choice.
-func botSearchStdoutCarriesEnvelope(format string) bool {
-	return format == "json" || format == ""
-}
-
-func executeBotSearchSingle(ctx context.Context, runtime *common.RuntimeContext) error {
-	body, err := buildBotSearchBody(runtime)
-	if err != nil {
-		return err
-	}
-
-	apiResp, err := runtime.DoAPI(&larkcore.ApiReq{
-		HttpMethod:  http.MethodPost,
-		ApiPath:     botSearchURL,
-		Body:        body,
-		QueryParams: larkcore.QueryParams{"page_size": []string{strconv.Itoa(runtime.Int("page-size"))}},
-	})
-	if err != nil {
-		return err
-	}
-
-	data, err := runtime.ClassifyAPIResponse(apiResp)
-	if err != nil {
-		return err
-	}
-	respData, err := decodeBotSearchAPIData(data)
-	if err != nil {
-		return err
-	}
-
-	bots := projectBots(respData)
-	out := searchBotResponse{
-		Bots:    bots,
-		HasMore: respData.HasMore,
-		Notice:  respData.Notice,
-	}
-	runtime.OutFormat(out, &output.Meta{Count: len(bots)}, func(w io.Writer) {
-		if len(bots) == 0 {
-			fmt.Fprintln(w, "No bots found.")
-			return
-		}
-		output.PrintTable(w, prettyBotRows(bots))
-	})
-	if respData.Notice != "" && !botSearchStdoutCarriesEnvelope(runtime.Format) {
-		fmt.Fprintf(runtime.IO().ErrOut, "\nnotice: %s\n", respData.Notice)
-	}
-	if respData.HasMore && !botSearchStdoutCarriesEnvelope(runtime.Format) {
-		fmt.Fprintln(runtime.IO().ErrOut,
-			"\nhint: more matches exist; narrow with --has-chatted or a more specific --query")
-	}
-	return nil
-}
-
-func decodeBotSearchAPIData(data map[string]interface{}) (*botSearchAPIData, error) {
-	raw, err := json.Marshal(data)
-	if err != nil {
-		return nil, contactInvalidResponseError("marshal bot search response data failed").WithCause(err)
-	}
-	var out botSearchAPIData
-	if err := json.Unmarshal(raw, &out); err != nil {
-		return nil, contactInvalidResponseError("decode bot search response data failed").WithCause(err)
-	}
-	return &out, nil
-}
-
-func projectBots(data *botSearchAPIData) []searchBot {
-	if data == nil {
-		return []searchBot{}
-	}
-	bots := make([]searchBot, 0, len(data.Items))
-	for i := range data.Items {
-		item := &data.Items[i]
-		name, description, segments := parseBotDisplayInfo(item.DisplayInfo)
-		bots = append(bots, searchBot{
-			OpenID:          item.ID,
-			Name:            name,
-			Description:     description,
-			ChatID:          item.MetaData.ChatID,
-			EnableJoinGroup: item.MetaData.EnableJoinGroup,
-			IsAgent:         item.MetaData.IsAgent,
-			TenantID:        item.MetaData.TenantID,
-			MatchSegments:   segments,
-		})
-	}
-	return bots
-}
-
-func stripHighlightTags(value string) string {
-	value = strings.ReplaceAll(value, "<h>", "")
-	return strings.ReplaceAll(value, "</h>", "")
-}
-
-func parseBotDisplayInfo(raw string) (name, description string, matchSegments []string) {
-	matchSegments = make([]string, 0)
-	for _, match := range displayInfoHighlightRE.FindAllStringSubmatch(raw, -1) {
-		// The capture can still carry a tag: the non-greedy pattern pairs a
-		// stray `<h>` with the next `</h>`. Strip it so a segment reads like the
-		// name and description it came from, and drop a highlight with no text.
-		segment := html.UnescapeString(stripHighlightTags(match[1]))
-		if strings.TrimSpace(segment) == "" {
-			continue
-		}
-		matchSegments = append(matchSegments, segment)
-	}
-
-	lines := strings.Split(raw, "\n")
-	stripTags := func(value string) string {
-		return strings.TrimSpace(html.UnescapeString(stripHighlightTags(value)))
-	}
-
-	// nameLine records which line the name came from, so the description is read
-	// from the line after it. Reading lines[1] unconditionally echoes the name
-	// back as its own description whenever line 0 is blank, and drops the real
-	// description with it.
-	nameLine := -1
-	if len(lines) > 0 {
-		if candidate := stripTags(lines[0]); candidate != "" {
-			name = candidate
-			nameLine = 0
-		}
-	}
-	if name == "" {
-		for i, line := range lines {
-			if candidate := stripTags(line); candidate != "" {
-				name = candidate
-				nameLine = i
-				break
-			}
-		}
-	}
-	if nameLine >= 0 && nameLine+1 < len(lines) {
-		description = stripTags(lines[nameLine+1])
-	}
-	return name, description, matchSegments
-}
-
-// map[] shape is required by output.PrintTable.
-func prettyBotRows(bots []searchBot) []map[string]interface{} {
-	rows := make([]map[string]interface{}, 0, len(bots))
-	for _, bot := range bots {
-		rows = append(rows, map[string]interface{}{
-			"name":              bot.Name,
-			"description":       common.TruncateStr(bot.Description, 50),
-			"is_agent":          bot.IsAgent,
-			"enable_join_group": bot.EnableJoinGroup,
-			"open_id":           bot.OpenID,
-		})
-	}
-	return rows
-}

shortcuts/contact/contact_search_bot_fanout.go

@@ -1,289 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package contact
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"sync"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/shortcuts/common"
-	larkcore "github.com/larksuite/oapi-sdk-go/v3/core"
-)
-
-// Bot fanout reuses the user fanout's query parsing, concurrency limit and
-// response summary types.
-
-type botFanoutResult struct {
-	Index   int
-	Query   string
-	Bots    []searchBot
-	HasMore bool
-	Notice  string
-	ErrMsg  string // empty = success
-	Err     error  // original failure, kept for typed propagation
-}
-
-// runOneBotQuery converts one fanout request into either bots or an error summary.
-func runOneBotQuery(ctx context.Context, runtime *common.RuntimeContext, index int, query string,
-	filter *botSearchAPIFilter) botFanoutResult {
-	// Pre-check ctx so queued workers see cancellation before issuing a request;
-	// in-flight workers continue until DoAPI returns.
-	if err := ctx.Err(); err != nil {
-		return botFanoutErrorResult(index, query, err)
-	}
-
-	body := &botSearchAPIRequest{Query: query}
-	if filter != nil {
-		body.Filter = filter
-	}
-
-	apiResp, err := runtime.DoAPI(&larkcore.ApiReq{
-		HttpMethod:  http.MethodPost,
-		ApiPath:     botSearchURL,
-		Body:        body,
-		QueryParams: larkcore.QueryParams{"page_size": []string{strconv.Itoa(runtime.Int("page-size"))}},
-	})
-	if err != nil {
-		return botFanoutErrorResult(index, query, err)
-	}
-
-	data, err := runtime.ClassifyAPIResponse(apiResp)
-	if err != nil {
-		return botFanoutErrorResult(index, query, err)
-	}
-	respData, err := decodeBotSearchAPIData(data)
-	if err != nil {
-		return botFanoutErrorResult(index, query, err)
-	}
-
-	return botFanoutResult{
-		Index:   index,
-		Query:   query,
-		Bots:    projectBots(respData),
-		HasMore: respData.HasMore,
-		Notice:  respData.Notice,
-	}
-}
-
-// botFanoutErrorResult records a failed fanout query without stopping other workers.
-func botFanoutErrorResult(index int, query string, err error) botFanoutResult {
-	if err == nil {
-		return botFanoutResult{Index: index, Query: query}
-	}
-	return botFanoutResult{Index: index, Query: query, ErrMsg: contactFanoutErrorSummary(err), Err: err}
-}
-
-func botFanoutContextError(err error) error {
-	subtype := errs.SubtypeNetworkTransport
-	message := "bot search fanout cancelled"
-	if errors.Is(err, context.DeadlineExceeded) {
-		subtype = errs.SubtypeNetworkTimeout
-		message = "bot search fanout deadline exceeded"
-	}
-	return errs.NewNetworkError(subtype, "%s", message).WithCause(err)
-}
-
-func botFanoutPanicError(query string, recovered any) error {
-	err := errs.NewInternalError(errs.SubtypeUnknown,
-		"bot search query %q panicked: %v", query, recovered)
-	if cause, ok := recovered.(error); ok {
-		return err.WithCause(cause)
-	}
-	return err
-}
-
-// Terminal failures invalidate the batch; API and network failures remain
-// eligible for partial-success reporting.
-func botFanoutTerminalError(results []botFanoutResult) error {
-	for _, result := range results {
-		if result.Err == nil {
-			continue
-		}
-		if errors.Is(result.Err, context.Canceled) || errors.Is(result.Err, context.DeadlineExceeded) {
-			return botFanoutContextError(result.Err)
-		}
-		problem, ok := errs.ProblemOf(result.Err)
-		if !ok {
-			return errs.NewInternalError(errs.SubtypeUnknown,
-				"bot search query %q failed with an unclassified error: %v", result.Query, result.Err).
-				WithCause(result.Err)
-		}
-		if problem.Category != errs.CategoryAPI && problem.Category != errs.CategoryNetwork {
-			return result.Err
-		}
-	}
-	return nil
-}
-
-type fanoutBot struct {
-	searchBot
-	MatchedQuery string `json:"matched_query"`
-}
-
-type botFanoutResponse struct {
-	Bots    []fanoutBot    `json:"bots"`
-	Queries []querySummary `json:"queries"`
-	Notice  string         `json:"notice,omitempty"`
-}
-
-// buildBotFanoutResponse flattens recoverable results in query order. Terminal
-// errors fail the batch even when another query succeeded.
-func buildBotFanoutResponse(queries []string, results []botFanoutResult) (*botFanoutResponse, error) {
-	if err := botFanoutTerminalError(results); err != nil {
-		return nil, err
-	}
-
-	indexed := make([]botFanoutResult, len(queries))
-	for _, r := range results {
-		indexed[r.Index] = r
-	}
-
-	out := &botFanoutResponse{
-		Bots:    make([]fanoutBot, 0),
-		Queries: make([]querySummary, 0, len(queries)),
-	}
-	failed := 0
-	var firstErrMsg, firstErrQuery string
-	var firstErr error
-	for i, r := range indexed {
-		out.Queries = append(out.Queries, querySummary{
-			Query:   queries[i],
-			Error:   r.ErrMsg,
-			HasMore: r.HasMore,
-			Notice:  r.Notice,
-		})
-		if r.ErrMsg != "" {
-			failed++
-			if firstErrMsg == "" {
-				firstErrMsg = r.ErrMsg
-				firstErrQuery = queries[i]
-				firstErr = r.Err
-			}
-			continue
-		}
-		if out.Notice == "" {
-			out.Notice = r.Notice
-		}
-		for _, b := range r.Bots {
-			out.Bots = append(out.Bots, fanoutBot{searchBot: b, MatchedQuery: queries[i]})
-		}
-	}
-	if failed == len(queries) && len(queries) > 0 {
-		msg := fmt.Sprintf("all %d queries failed; first: %s (query=%q)",
-			len(queries), firstErrMsg, firstErrQuery)
-		return nil, contactFanoutAllFailedError(firstErr, msg)
-	}
-	return out, nil
-}
-
-func executeBotSearchFanout(ctx context.Context, runtime *common.RuntimeContext) error {
-	queries := parseAndDedupQueries(runtime.Str("queries"))
-
-	filter, err := buildBotSearchFilter(runtime)
-	if err != nil {
-		return err
-	}
-
-	results := make([]botFanoutResult, len(queries))
-	var wg sync.WaitGroup
-	sem := make(chan struct{}, fanoutConcurrency)
-
-schedule:
-	for i, q := range queries {
-		select {
-		case sem <- struct{}{}:
-		case <-ctx.Done():
-			for j := i; j < len(queries); j++ {
-				results[j] = botFanoutErrorResult(j, queries[j], ctx.Err())
-			}
-			break schedule
-		}
-		wg.Add(1)
-		go func(i int, q string) {
-			defer wg.Done()
-			defer func() { <-sem }()
-			defer func() {
-				if r := recover(); r != nil {
-					err := botFanoutPanicError(q, r)
-					results[i] = botFanoutResult{
-						Index:  i,
-						Query:  q,
-						ErrMsg: contactFanoutErrorSummary(err),
-						Err:    err,
-					}
-				}
-			}()
-			results[i] = runOneBotQuery(ctx, runtime, i, q, filter)
-		}(i, q)
-	}
-	wg.Wait()
-
-	resp, err := buildBotFanoutResponse(queries, results)
-	if err != nil {
-		return err
-	}
-
-	failed, hasMoreCount := 0, 0
-	for _, qs := range resp.Queries {
-		if qs.Error != "" {
-			failed++
-		}
-		if qs.HasMore {
-			hasMoreCount++
-		}
-	}
-
-	runtime.OutFormat(resp, &output.Meta{Count: len(resp.Bots)}, func(w io.Writer) {
-		if len(resp.Bots) == 0 {
-			fmt.Fprintln(w, "No bots found.")
-			return
-		}
-		output.PrintTable(w, prettyBotFanoutRows(resp.Bots))
-	})
-
-	if isFanoutSummaryFormat(runtime.Format) {
-		fmt.Fprintf(runtime.IO().ErrOut, "\n%d queries, %d total matches; %d failed, %d with has_more\n",
-			len(queries), len(resp.Bots), failed, hasMoreCount)
-	}
-	// The counts above say how many queries failed but not which, and only the
-	// json envelope carries queries[].error / queries[].notice. Without this an
-	// agent reading csv or a table sees "1 failed" with no way to learn the
-	// keyword or the reason, and a notice disappears entirely.
-	if !botSearchStdoutCarriesEnvelope(runtime.Format) {
-		for _, qs := range resp.Queries {
-			if qs.Error != "" {
-				fmt.Fprintf(runtime.IO().ErrOut, "failed: %q — %s\n", qs.Query, qs.Error)
-			}
-			if qs.Notice != "" {
-				fmt.Fprintf(runtime.IO().ErrOut, "notice: %q — %s\n", qs.Query, qs.Notice)
-			}
-			if qs.HasMore {
-				fmt.Fprintf(runtime.IO().ErrOut, "has_more: %q — more matches exist; narrow this keyword\n", qs.Query)
-			}
-		}
-	}
-	return nil
-}
-
-func prettyBotFanoutRows(bots []fanoutBot) []map[string]interface{} {
-	rows := make([]map[string]interface{}, 0, len(bots))
-	for _, bot := range bots {
-		rows = append(rows, map[string]interface{}{
-			"matched_query":     bot.MatchedQuery,
-			"name":              bot.Name,
-			"description":       common.TruncateStr(bot.Description, 50),
-			"is_agent":          bot.IsAgent,
-			"enable_join_group": bot.EnableJoinGroup,
-			"open_id":           bot.OpenID,
-		})
-	}
-	return rows
-}

shortcuts/contact/contact_search_bot_fanout_test.go

@@ -1,684 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package contact
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/httpmock"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-func TestBotFanoutErrorResultNilErrorIsSuccess(t *testing.T) {
-	r := botFanoutErrorResult(3, "会议助手", nil)
-	if r.ErrMsg != "" || r.Err != nil {
-		t.Fatalf("nil error must stay a success result: %+v", r)
-	}
-	if r.Index != 3 || r.Query != "会议助手" {
-		t.Fatalf("index/query must survive: %+v", r)
-	}
-}
-
-func TestBotFanoutAssembleOrderAndShape(t *testing.T) {
-	results := []botFanoutResult{
-		{Index: 1, Query: "日报", Bots: []searchBot{{OpenID: "ou_b"}}, HasMore: true},
-		{Index: 0, Query: "会议", Bots: []searchBot{{OpenID: "ou_a1"}, {OpenID: "ou_a2"}}},
-		{Index: 2, Query: "审批", ErrMsg: "API 1: nope"},
-	}
-	resp, err := buildBotFanoutResponse([]string{"会议", "日报", "审批"}, results)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Results are emitted in query order even though the workers finished out of
-	// order, and a failed query contributes no rows.
-	wantRows := []struct {
-		openID, matched string
-	}{{"ou_a1", "会议"}, {"ou_a2", "会议"}, {"ou_b", "日报"}}
-	if len(resp.Bots) != len(wantRows) {
-		t.Fatalf("bots length: got %d, want %d", len(resp.Bots), len(wantRows))
-	}
-	for i, w := range wantRows {
-		if resp.Bots[i].OpenID != w.openID || resp.Bots[i].MatchedQuery != w.matched {
-			t.Errorf("bots[%d]: got %+v, want %s/%s", i, resp.Bots[i], w.openID, w.matched)
-		}
-	}
-
-	want := []querySummary{
-		{Query: "会议"},
-		{Query: "日报", HasMore: true},
-		{Query: "审批", Error: "API 1: nope"},
-	}
-	if len(resp.Queries) != len(want) {
-		t.Fatalf("queries length: got %d, want %d (every query is enumerated)", len(resp.Queries), len(want))
-	}
-	for i, w := range want {
-		if resp.Queries[i] != w {
-			t.Errorf("queries[%d]: got %+v, want %+v", i, resp.Queries[i], w)
-		}
-	}
-}
-
-func TestBotFanoutAssembleAllFailedReturnsTypedError(t *testing.T) {
-	results := []botFanoutResult{
-		{Index: 0, Query: "会议", ErrMsg: "API 99991663: rate limit", Err: errs.NewAPIError(errs.SubtypeRateLimit, "rate limit").WithCode(99991663)},
-		{Index: 1, Query: "日报", ErrMsg: "HTTP 500 Internal Server Error"},
-	}
-	_, err := buildBotFanoutResponse([]string{"会议", "日报"}, results)
-	if err == nil {
-		t.Fatal("expected an error when every query fails")
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected a typed problem, got %T: %v", err, err)
-	}
-	// The first failure's classification must survive, so the caller can tell a
-	// rate limit apart from a transport fault.
-	if problem.Code != 99991663 || problem.Subtype != errs.SubtypeRateLimit {
-		t.Errorf("problem: got %d/%s, want 99991663/%s", problem.Code, problem.Subtype, errs.SubtypeRateLimit)
-	}
-	// Agents grep the count and the first failure out of this message.
-	for _, want := range []string{"all 2 queries failed", "rate limit"} {
-		if !strings.Contains(err.Error(), want) {
-			t.Errorf("message must contain %q; got %v", want, err)
-		}
-	}
-}
-
-func TestBotFanoutAssemblePartialFailureSucceeds(t *testing.T) {
-	results := []botFanoutResult{
-		{Index: 0, Query: "会议", Bots: []searchBot{{OpenID: "ou_a"}}},
-		{Index: 1, Query: "日报", ErrMsg: "API 1: nope"},
-	}
-	resp, err := buildBotFanoutResponse([]string{"会议", "日报"}, results)
-	if err != nil {
-		t.Fatalf("one failure out of two must not fail the call: %v", err)
-	}
-	if len(resp.Bots) != 1 || resp.Queries[1].Error == "" {
-		t.Fatalf("partial failure shape: %+v", resp)
-	}
-}
-
-func TestBotFanoutTerminalContextOverridesPartialSuccess(t *testing.T) {
-	tests := []struct {
-		name        string
-		err         error
-		wantSubtype errs.Subtype
-	}{
-		{name: "cancelled", err: context.Canceled, wantSubtype: errs.SubtypeNetworkTransport},
-		{name: "deadline", err: context.DeadlineExceeded, wantSubtype: errs.SubtypeNetworkTimeout},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			results := []botFanoutResult{
-				{Index: 0, Query: "会议", Bots: []searchBot{{OpenID: "ou_a"}}},
-				botFanoutErrorResult(1, "日报", tt.err),
-			}
-			_, err := buildBotFanoutResponse([]string{"会议", "日报"}, results)
-			if err == nil {
-				t.Fatal("terminal context error must fail the batch after a partial success")
-			}
-			if !errors.Is(err, tt.err) {
-				t.Fatalf("error must preserve %v as its cause: %v", tt.err, err)
-			}
-			problem, ok := errs.ProblemOf(err)
-			if !ok || problem.Category != errs.CategoryNetwork || problem.Subtype != tt.wantSubtype {
-				t.Fatalf("problem: got %+v, want network/%s", problem, tt.wantSubtype)
-			}
-		})
-	}
-}
-
-func TestBotFanoutResponseHasNoTopLevelHasMore(t *testing.T) {
-	resp, err := buildBotFanoutResponse([]string{"会议"}, []botFanoutResult{{Index: 0, Query: "会议", HasMore: true}})
-	if err != nil {
-		t.Fatalf("build: %v", err)
-	}
-	raw, err := json.Marshal(resp)
-	if err != nil {
-		t.Fatalf("marshal: %v", err)
-	}
-	var envelope map[string]interface{}
-	if err := json.Unmarshal(raw, &envelope); err != nil {
-		t.Fatalf("unmarshal: %v", err)
-	}
-	// has_more is per query in the sidecar; a single top-level flag would hide
-	// which keyword was truncated.
-	if _, ok := envelope["has_more"]; ok {
-		t.Fatalf("fanout must not surface a top-level has_more: %s", raw)
-	}
-	if !envelope["queries"].([]interface{})[0].(map[string]interface{})["has_more"].(bool) {
-		t.Fatalf("per-query has_more lost: %s", raw)
-	}
-}
-
-func TestBotFanoutEmptyBotsSerializesAsArray(t *testing.T) {
-	resp, err := buildBotFanoutResponse([]string{"会议"}, []botFanoutResult{{Index: 0, Query: "会议"}})
-	if err != nil {
-		t.Fatalf("build: %v", err)
-	}
-	raw, err := json.Marshal(resp)
-	if err != nil {
-		t.Fatalf("marshal: %v", err)
-	}
-	if !strings.Contains(string(raw), `"bots":[]`) {
-		t.Fatalf("empty bots must serialize as [], not null: %s", raw)
-	}
-}
-
-func TestPrettyBotFanoutRowsLeadWithMatchedQuery(t *testing.T) {
-	rows := prettyBotFanoutRows([]fanoutBot{{
-		searchBot:    searchBot{OpenID: "ou_a", Name: "会议助手", Description: strings.Repeat("长", 80)},
-		MatchedQuery: "会议",
-	}})
-	if len(rows) != 1 {
-		t.Fatalf("rows: %d", len(rows))
-	}
-	if rows[0]["matched_query"] != "会议" {
-		t.Errorf("matched_query missing: %+v", rows[0])
-	}
-	if got := rows[0]["description"].(string); len([]rune(got)) > 51 {
-		t.Errorf("description must be truncated like the single-search table: %d runes", len([]rune(got)))
-	}
-}
-
-func TestBotFanoutValidationRejectsQueryAndQueriesTogether(t *testing.T) {
-	cmd := newBotSearchTestCommand()
-	setBotSearchFlag(t, cmd, "query", "会议")
-	setBotSearchFlag(t, cmd, "queries", "会议,日报")
-	runtime := common.TestNewRuntimeContext(cmd, botSearchDefaultConfig())
-
-	err := validateBotSearch(runtime)
-	if err == nil {
-		t.Fatal("expected mutual-exclusion error")
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryValidation || problem.Subtype != errs.SubtypeInvalidArgument {
-		t.Fatalf("problem: %+v ok=%v", problem, ok)
-	}
-	if !strings.Contains(err.Error(), "mutually exclusive") {
-		t.Fatalf("message: %v", err)
-	}
-}
-
-func TestBotFanoutValidationLimits(t *testing.T) {
-	tests := []struct {
-		name      string
-		queries   string
-		wantParam string
-	}{
-		{name: "nothing parses", queries: " , , ", wantParam: "--queries"},
-		{name: "over the entry cap", queries: strings.TrimSuffix(strings.Repeat("q%d,", maxFanoutQueries+1), ","), wantParam: "--queries"},
-		{name: "entry too long", queries: strings.Repeat("会", maxBotSearchQueryChars+1), wantParam: "--queries"},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			queries := tt.queries
-			if strings.Contains(queries, "%d") {
-				parts := make([]string, 0, maxFanoutQueries+1)
-				for i := 0; i <= maxFanoutQueries; i++ {
-					parts = append(parts, fmt.Sprintf("q%d", i))
-				}
-				queries = strings.Join(parts, ",")
-			}
-			cmd := newBotSearchTestCommand()
-			setBotSearchFlag(t, cmd, "queries", queries)
-			runtime := common.TestNewRuntimeContext(cmd, botSearchDefaultConfig())
-			assertBotSearchValidationProblem(t, validateBotSearch(runtime), tt.wantParam)
-		})
-	}
-}
-
-// --queries alone is enough: the single-search "--query is required" rule must not
-// leak into fanout mode.
-func TestBotFanoutValidationQueriesAloneIsValid(t *testing.T) {
-	cmd := newBotSearchTestCommand()
-	setBotSearchFlag(t, cmd, "queries", "会议助手,日报助手")
-	runtime := common.TestNewRuntimeContext(cmd, botSearchDefaultConfig())
-	if err := validateBotSearch(runtime); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestBotFanoutFilterAppliedToEveryQuery(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	stub := botSearchStub(botSearchURL+"?page_size=20", "")
-	stub.Reusable = true
-	registry.Register(stub)
-
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--queries", "会议,日报", "--has-chatted", "--format", "json", "--as", "user",
-	}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	if len(stub.CapturedBodies) != 2 {
-		t.Fatalf("expected one request per query, got %d", len(stub.CapturedBodies))
-	}
-	seen := make(map[string]bool, len(stub.CapturedBodies))
-	for i, raw := range stub.CapturedBodies {
-		var body map[string]interface{}
-		if err := json.Unmarshal(raw, &body); err != nil {
-			t.Fatalf("unmarshal req %d: %v", i, err)
-		}
-		seen[fmt.Sprint(body["query"])] = true
-		filter, ok := body["filter"].(map[string]interface{})
-		if !ok || filter["has_chatter"] != true {
-			t.Fatalf("filter must ride along with every query: %#v", body)
-		}
-	}
-	for _, q := range []string{"会议", "日报"} {
-		if !seen[q] {
-			t.Fatalf("query %q never issued; saw %v", q, seen)
-		}
-	}
-}
-
-func TestBotFanoutMatchedQueryFidelityAndDedup(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	dedupStub := botSearchStub(botSearchURL+"?page_size=20", "")
-	dedupStub.Reusable = true
-	registry.Register(dedupStub)
-
-	// " 会议 " and "会议" collapse to one query; the duplicate must not double the
-	// requests or the rows.
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--queries", " 会议 ,会议", "--format", "json", "--as", "user",
-	}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-
-	var envelope struct {
-		Data botFanoutResponse `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &envelope); err != nil {
-		t.Fatalf("response JSON: %v\n%s", err, stdout.String())
-	}
-	if len(envelope.Data.Queries) != 1 || envelope.Data.Queries[0].Query != "会议" {
-		t.Fatalf("dedup failed: %+v", envelope.Data.Queries)
-	}
-	for _, bot := range envelope.Data.Bots {
-		if bot.MatchedQuery != "会议" {
-			t.Fatalf("matched_query fidelity: %+v", bot)
-		}
-	}
-}
-
-func TestBotFanoutConcurrencyCap(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-
-	var inFlight, peak int32
-	stub := botSearchStub(botSearchURL+"?page_size=20", "")
-	stub.Reusable = true
-	stub.OnMatch = func(req *http.Request) {
-		cur := atomic.AddInt32(&inFlight, 1)
-		defer atomic.AddInt32(&inFlight, -1)
-		for {
-			p := atomic.LoadInt32(&peak)
-			if cur <= p || atomic.CompareAndSwapInt32(&peak, p, cur) {
-				break
-			}
-		}
-		time.Sleep(50 * time.Millisecond)
-	}
-	registry.Register(stub)
-
-	queries := []string{"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"}
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--queries", strings.Join(queries, ","), "--format", "json", "--as", "user",
-	}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	if peak > fanoutConcurrency {
-		t.Errorf("concurrency peak = %d, want <= %d", peak, fanoutConcurrency)
-	}
-	if peak < 2 {
-		t.Errorf("concurrency peak = %d, want >= 2 so the test actually observes parallelism", peak)
-	}
-}
-
-func TestBotFanoutPanicFailsBatch(t *testing.T) {
-	factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	panicCause := errors.New("synthetic test panic")
-
-	boom := botSearchStub(botSearchURL, "")
-	boom.BodyFilter = func(b []byte) bool { return strings.Contains(string(b), `"boom"`) }
-	boom.OnMatch = func(req *http.Request) { panic(panicCause) }
-	registry.Register(boom)
-
-	okStub := botSearchStub(botSearchURL, "")
-	okStub.Reusable = true
-	registry.Register(okStub)
-
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--queries", "ok,boom,fine", "--format", "json", "--as", "user",
-	}, factory, stdout)
-	if err == nil {
-		t.Fatal("a panicking query must fail the batch")
-	}
-	if !errors.Is(err, panicCause) {
-		t.Fatalf("panic cause must be preserved: %v", err)
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryInternal || problem.Subtype != errs.SubtypeUnknown {
-		t.Fatalf("problem: got %+v, want internal/%s", problem, errs.SubtypeUnknown)
-	}
-	if stdout.Len() != 0 {
-		t.Fatalf("terminal failure must not write a success envelope: %s", stdout.String())
-	}
-	for _, marker := range []string{"goroutine ", ".go:", "runtime."} {
-		if strings.Contains(stderr.String(), marker) {
-			t.Errorf("stderr leaked stack-trace marker %q: %s", marker, stderr.String())
-		}
-	}
-}
-
-func TestBotFanoutAllQueriesFailingExitsNonZero(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	registry.Register(&httpmock.Stub{
-		Method:   "POST",
-		URL:      botSearchURL,
-		Reusable: true,
-		Status:   500,
-		Body:     map[string]interface{}{"reason": "boom"},
-	})
-
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--queries", "会议,日报", "--format", "json", "--as", "user",
-	}, factory, stdout)
-	if err == nil {
-		t.Fatal("every query failing must surface as a command error")
-	}
-	if _, ok := errs.ProblemOf(err); !ok {
-		t.Fatalf("expected a typed problem, got %T: %v", err, err)
-	}
-	// The first failure's upstream status and the all-failed mode must both survive,
-	// so a caller can classify instead of seeing a generic internal error.
-	for _, want := range []string{"500", "all 2 queries failed"} {
-		if !strings.Contains(err.Error(), want) {
-			t.Errorf("message must contain %q; got %v", want, err)
-		}
-	}
-}
-
-func TestBotFanoutPartialFailureKeepsNoticeAndSucceeds(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-
-	broken := botSearchStub(botSearchURL, "")
-	broken.BodyFilter = func(b []byte) bool { return strings.Contains(string(b), `"日报"`) }
-	broken.Status = 500
-	broken.Body = map[string]interface{}{"reason": "boom"}
-	registry.Register(broken)
-
-	okStub := botSearchStub(botSearchURL, "")
-	okStub.Reusable = true
-	registry.Register(okStub)
-
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--queries", "会议,日报", "--format", "json", "--as", "user",
-	}, factory, stdout)
-	if err != nil {
-		t.Fatalf("one failing query must not fail the batch: %v", err)
-	}
-
-	var envelope struct {
-		Data botFanoutResponse `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &envelope); err != nil {
-		t.Fatalf("response JSON: %v\n%s", err, stdout.String())
-	}
-
-	const wantNotice = "The query is too long and has been truncated to the first 50 characters for search."
-	// Assert the notice itself, not just that some row survived: the surviving
-	// query's server remark has to reach the caller both at the top level and in
-	// its own sidecar entry.
-	if envelope.Data.Notice != wantNotice {
-		t.Errorf("top-level notice: got %q, want %q", envelope.Data.Notice, wantNotice)
-	}
-	if len(envelope.Data.Queries) != 2 {
-		t.Fatalf("both queries must be enumerated: %+v", envelope.Data.Queries)
-	}
-	if envelope.Data.Queries[0].Notice != wantNotice {
-		t.Errorf("surviving query notice: got %q, want %q", envelope.Data.Queries[0].Notice, wantNotice)
-	}
-	if envelope.Data.Queries[0].Error != "" {
-		t.Errorf("surviving query must carry no error: %q", envelope.Data.Queries[0].Error)
-	}
-	if !strings.Contains(envelope.Data.Queries[1].Error, "500") {
-		t.Errorf("failed query must carry the upstream status: %q", envelope.Data.Queries[1].Error)
-	}
-	// Only the surviving query contributes rows.
-	if len(envelope.Data.Bots) != 1 || envelope.Data.Bots[0].MatchedQuery != "会议" {
-		t.Fatalf("bots: %+v", envelope.Data.Bots)
-	}
-}
-
-func TestBotFanoutCSVCarriesMatchedQueryAndSummary(t *testing.T) {
-	factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	stub := botSearchStub(botSearchURL, "")
-	stub.Reusable = true
-	registry.Register(stub)
-
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--queries", "会议,日报", "--format", "csv", "--as", "user",
-	}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	if !strings.Contains(stdout.String(), "matched_query") {
-		t.Errorf("csv must expose matched_query so rows can be traced to a keyword: %s", stdout.String())
-	}
-	// csv is in the summary format set, so the batch counters belong on stderr.
-	if !strings.Contains(stderr.String(), "2 queries, 2 total matches") || !strings.Contains(stderr.String(), "0 failed") {
-		t.Errorf("stderr summary must report the batch counters: %s", stderr.String())
-	}
-	if strings.Contains(stderr.String(), "total bots") {
-		t.Errorf("summary must count matches rather than imply unique bots: %s", stderr.String())
-	}
-}
-
-func TestBotFanoutNDJSONKeepsStdoutClean(t *testing.T) {
-	factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	stub := botSearchStub(botSearchURL, "")
-	stub.Reusable = true
-	registry.Register(stub)
-
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--queries", "会议,日报", "--format", "ndjson", "--as", "user",
-	}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	// ndjson is a machine format outside the summary set: every stdout line must
-	// parse, and the counters must not be mixed in.
-	for i, line := range strings.Split(strings.TrimSpace(stdout.String()), "\n") {
-		if line == "" {
-			continue
-		}
-		var row map[string]interface{}
-		if err := json.Unmarshal([]byte(line), &row); err != nil {
-			t.Fatalf("stdout line %d is not JSON: %q", i, line)
-		}
-	}
-	if strings.Contains(stderr.String(), "queries,") {
-		t.Errorf("ndjson must not emit the summary line: %s", stderr.String())
-	}
-}
-
-// TestBotFanoutCancelledSchedulingFailsQueuedQueries drives the real command so
-// the scheduler inside executeBotSearchFanout — not just runOneBotQuery — sees
-// the cancellation. Queueing more keywords than fanoutConcurrency while every
-// worker is parked keeps all semaphore slots held, so the queued keywords can
-// only leave the loop through its ctx.Done() branch.
-func TestBotFanoutCancelledSchedulingFailsQueuedQueries(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	started := make(chan struct{})
-	var once sync.Once
-	stub := botSearchStub(botSearchURL+"?page_size=20", "")
-	stub.Reusable = true
-	stub.OnMatch = func(*http.Request) {
-		once.Do(func() { close(started) })
-		<-ctx.Done() // hold the slot so later keywords must queue on the semaphore
-	}
-	registry.Register(stub)
-
-	go func() {
-		select {
-		case <-started:
-		case <-time.After(5 * time.Second): // never leave the workers parked
-		}
-		cancel()
-	}()
-
-	queries := make([]string, 0, fanoutConcurrency+3)
-	for i := 0; i < fanoutConcurrency+3; i++ {
-		queries = append(queries, fmt.Sprintf("q%d", i))
-	}
-
-	err := mountAndRunContext(t, ctx, ContactSearchBot, []string{
-		"+search-bot", "--queries", strings.Join(queries, ","), "--format", "json", "--as", "user",
-	}, factory, stdout)
-	if err == nil {
-		t.Fatal("a cancelled batch must surface as a command error")
-	}
-	if !errors.Is(err, context.Canceled) {
-		t.Fatalf("cancellation cause must be preserved: %v", err)
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryNetwork || problem.Subtype != errs.SubtypeNetworkTransport {
-		t.Fatalf("problem: got %+v, want network/%s", problem, errs.SubtypeNetworkTransport)
-	}
-}
-
-// TestBotFanoutCancelledContextShortCircuitsBeforeRequest pins the other half:
-// a queued worker must fail on the pre-check instead of issuing its request.
-func TestBotFanoutCancelledContextShortCircuitsBeforeRequest(t *testing.T) {
-	results := make([]botFanoutResult, 0, 2)
-	ctx, cancel := context.WithCancel(context.Background())
-	cancel()
-	for i, q := range []string{"会议", "日报"} {
-		results = append(results, runOneBotQuery(ctx, nil, i, q, nil))
-	}
-	for _, r := range results {
-		if r.ErrMsg == "" {
-			t.Fatalf("a cancelled context must short-circuit before the request: %+v", r)
-		}
-	}
-	_, err := buildBotFanoutResponse([]string{"会议", "日报"}, results)
-	if err == nil {
-		t.Fatal("all queries cancelled must surface as an error")
-	}
-	if !errors.Is(err, context.Canceled) {
-		t.Fatalf("cancellation cause must be preserved: %v", err)
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryNetwork || problem.Subtype != errs.SubtypeNetworkTransport {
-		t.Fatalf("problem: got %+v, want network/%s", problem, errs.SubtypeNetworkTransport)
-	}
-}
-
-func TestBotFanoutDryRunPreviewsOneRequestPerKeyword(t *testing.T) {
-	cmd := newBotSearchTestCommand()
-	setBotSearchFlag(t, cmd, "queries", "会议, 日报 ,会议")
-	setBotSearchFlag(t, cmd, "chat-ids", "oc_a")
-	setBotSearchFlag(t, cmd, "has-chatted", "true")
-	runtime := common.TestNewRuntimeContext(cmd, botSearchDefaultConfig())
-
-	raw, err := json.Marshal(ContactSearchBot.DryRun(context.Background(), runtime))
-	if err != nil {
-		t.Fatalf("marshal dry-run: %v", err)
-	}
-	var preview struct {
-		API []struct {
-			Method string                 `json:"method"`
-			URL    string                 `json:"url"`
-			Params map[string]interface{} `json:"params"`
-			Body   struct {
-				Query  string `json:"query"`
-				Filter *struct {
-					ChatIDs    []string `json:"chat_ids"`
-					HasChatter bool     `json:"has_chatter"`
-				} `json:"filter"`
-			} `json:"body"`
-		} `json:"api"`
-	}
-	if err := json.Unmarshal(raw, &preview); err != nil {
-		t.Fatalf("decode dry-run: %v\n%s", err, raw)
-	}
-
-	// Deduped, so the repeated keyword previews once — the preview has to match
-	// the requests Execute would actually issue.
-	if len(preview.API) != 2 {
-		t.Fatalf("expected one previewed request per deduped keyword, got %d: %s", len(preview.API), raw)
-	}
-	seen := make([]string, 0, len(preview.API))
-	for i, call := range preview.API {
-		if call.Method != "POST" || call.URL != botSearchURL {
-			t.Errorf("api[%d]: got %s %s", i, call.Method, call.URL)
-		}
-		if call.Params["page_size"] != float64(20) {
-			t.Errorf("api[%d] page_size: %v", i, call.Params["page_size"])
-		}
-		if _, ok := call.Params["page_token"]; ok {
-			t.Errorf("api[%d] must not preview a page_token: %v", i, call.Params)
-		}
-		// The filter rides along with every keyword, not just the first.
-		if call.Body.Filter == nil || !call.Body.Filter.HasChatter ||
-			len(call.Body.Filter.ChatIDs) != 1 || call.Body.Filter.ChatIDs[0] != "oc_a" {
-			t.Errorf("api[%d] filter: %+v", i, call.Body.Filter)
-		}
-		seen = append(seen, call.Body.Query)
-	}
-	if fmt.Sprint(seen) != fmt.Sprint([]string{"会议", "日报"}) {
-		t.Errorf("previewed keywords: got %v, want [会议 日报]", seen)
-	}
-}
-
-// The summary counts how many queries failed but never says which or why, and
-// only json carries queries[].error. Without a per-query line on stderr an agent
-// reading csv sees "1 failed" and cannot recover the keyword or the reason.
-func TestBotFanoutFailedQueryIsNamedOnStderr(t *testing.T) {
-	for _, format := range []string{"csv", "table", "pretty", "ndjson"} {
-		t.Run(format, func(t *testing.T) {
-			factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-			broken := botSearchStub(botSearchURL, "")
-			broken.BodyFilter = func(b []byte) bool { return strings.Contains(string(b), `"日报"`) }
-			broken.Status = 500
-			broken.Body = map[string]interface{}{"reason": "boom"}
-			registry.Register(broken)
-			okStub := botSearchStub(botSearchURL, "")
-			okStub.Reusable = true
-			registry.Register(okStub)
-
-			if err := mountAndRun(t, ContactSearchBot, []string{
-				"+search-bot", "--queries", "会议,日报", "--format", format, "--as", "user",
-			}, factory, stdout); err != nil {
-				t.Fatalf("one failing query must not fail the batch: %v", err)
-			}
-			for _, want := range []string{"日报", "500"} {
-				if !strings.Contains(stderr.String(), want) {
-					t.Fatalf("%s: stderr must name the failed query and its reason (missing %q)\nstderr:\n%s",
-						format, want, stderr.String())
-				}
-			}
-		})
-	}
-}

shortcuts/contact/contact_search_bot_test.go

@@ -1,724 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package contact
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/core"
-	"github.com/larksuite/cli/internal/httpmock"
-	"github.com/larksuite/cli/shortcuts/common"
-	"github.com/spf13/cobra"
-)
-
-func newBotSearchTestCommand() *cobra.Command {
-	cmd := &cobra.Command{Use: "test"}
-	cmd.Flags().String("query", "", "")
-	cmd.Flags().String("chat-ids", "", "")
-	cmd.Flags().Bool("has-chatted", false, "")
-	cmd.Flags().Int("page-size", 20, "")
-	cmd.Flags().String("queries", "", "")
-	return cmd
-}
-
-func botSearchDefaultConfig() *core.CliConfig {
-	return &core.CliConfig{
-		AppID: "test", AppSecret: "test", Brand: core.BrandFeishu,
-		UserOpenId: "ou_self",
-	}
-}
-
-func setBotSearchFlag(t *testing.T, cmd *cobra.Command, name, value string) {
-	t.Helper()
-	if err := cmd.Flags().Set(name, value); err != nil {
-		t.Fatalf("set --%s=%q: %v", name, value, err)
-	}
-}
-
-func assertBotSearchValidationProblem(t *testing.T, err error, wantParam string) {
-	t.Helper()
-	if err == nil {
-		t.Fatal("expected validation error")
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed problem, got %T: %v", err, err)
-	}
-	if problem.Category != errs.CategoryValidation || problem.Subtype != errs.SubtypeInvalidArgument {
-		t.Fatalf("problem: got %s/%s, want %s/%s", problem.Category, problem.Subtype, errs.CategoryValidation, errs.SubtypeInvalidArgument)
-	}
-	var validationErr *errs.ValidationError
-	if !errors.As(err, &validationErr) {
-		t.Fatalf("expected *errs.ValidationError, got %T", err)
-	}
-	if validationErr.Param != wantParam {
-		t.Fatalf("param: got %q, want %q", validationErr.Param, wantParam)
-	}
-}
-
-// assertBotSearchValidationParams covers the errors that name several flags via
-// WithParams; those leave the single Param empty on purpose, so an agent reading
-// the envelope sees every flag that could satisfy the requirement.
-func assertBotSearchValidationParams(t *testing.T, err error, wantParams []string) {
-	t.Helper()
-	if err == nil {
-		t.Fatal("expected validation error")
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryValidation || problem.Subtype != errs.SubtypeInvalidArgument {
-		t.Fatalf("problem: %+v ok=%v", problem, ok)
-	}
-	var validationErr *errs.ValidationError
-	if !errors.As(err, &validationErr) {
-		t.Fatalf("expected *errs.ValidationError, got %T", err)
-	}
-	got := make([]string, 0, len(validationErr.Params))
-	for _, p := range validationErr.Params {
-		if p.Reason == "" {
-			t.Errorf("param %q has no reason; agents read it to pick a recovery", p.Name)
-		}
-		got = append(got, p.Name)
-	}
-	if fmt.Sprint(got) != fmt.Sprint(wantParams) {
-		t.Fatalf("params: got %v, want %v", got, wantParams)
-	}
-}
-
-func TestValidateBotSearchErrors(t *testing.T) {
-	chatIDs := make([]string, 101)
-	for i := range chatIDs {
-		chatIDs[i] = fmt.Sprintf("oc_%03d", i)
-	}
-
-	tests := []struct {
-		name        string
-		flags       map[string]string
-		wantParam   string
-		wantParams  []string // set instead of wantParam when the error names several flags
-		wantMessage string
-	}{
-		{
-			name:        "keyword missing",
-			wantParams:  []string{"--query", "--queries"},
-			wantMessage: "specify --query or --queries: --chat-ids and --has-chatted shape a keyword search but cannot enumerate bots on their own (the API answers a filter-only request with an empty list)",
-		},
-		{
-			name:        "query over 50 characters",
-			flags:       map[string]string{"query": strings.Repeat("中", 51)},
-			wantParam:   "--query",
-			wantMessage: "--query: length must be between 1 and 50 characters",
-		},
-		{
-			name:        "chat ids parse empty",
-			flags:       map[string]string{"query": "x", "chat-ids": " , , "},
-			wantParam:   "--chat-ids",
-			wantMessage: "--chat-ids: no valid chat_id parsed from \", ,\" (separate entries with ',')",
-		},
-		{
-			name:        "over 100 chat ids",
-			flags:       map[string]string{"query": "x", "chat-ids": strings.Join(chatIDs, ",")},
-			wantParam:   "--chat-ids",
-			wantMessage: "--chat-ids: must be at most 100 entries",
-		},
-		{
-			name:        "invalid chat id",
-			flags:       map[string]string{"query": "x", "chat-ids": "bad"},
-			wantParam:   "--chat-ids",
-			wantMessage: "invalid chat ID format, should start with 'oc_' (e.g., oc_abc123)",
-		},
-		{
-			// With a keyword present the keyword errors win, exactly as +search-user
-			// orders them; the =false check must not be hoisted above these.
-			name:        "mutually exclusive keywords outrank has chatted false",
-			flags:       map[string]string{"query": "x", "queries": "y", "has-chatted": "false"},
-			wantParams:  []string{"--query", "--queries"},
-			wantMessage: "--query and --queries are mutually exclusive",
-		},
-		{
-			name:        "query length outranks has chatted false",
-			flags:       map[string]string{"query": strings.Repeat("中", 51), "has-chatted": "false"},
-			wantParam:   "--query",
-			wantMessage: "--query: length must be between 1 and 50 characters",
-		},
-		{
-			// With no keyword at all the explicit =false is the more specific mistake,
-			// so it wins over the missing-keyword error rather than costing a second
-			// round trip. Matches which error +search-user reports first.
-			name:        "has chatted false without a keyword",
-			flags:       map[string]string{"has-chatted": "false"},
-			wantParam:   "--has-chatted",
-			wantMessage: "--has-chatted: pass the flag to enable the filter; omit it to disable filtering (=false is rejected to prevent silent wrong results)",
-		},
-		{
-			name:        "has chatted false",
-			flags:       map[string]string{"query": "x", "has-chatted": "false"},
-			wantParam:   "--has-chatted",
-			wantMessage: "--has-chatted: pass the flag to enable the filter; omit it to disable filtering (=false is rejected to prevent silent wrong results)",
-		},
-		{
-			name:        "page size below one",
-			flags:       map[string]string{"query": "x", "page-size": "0"},
-			wantParam:   "--page-size",
-			wantMessage: "--page-size: must be between 1 and 30",
-		},
-		{
-			name:        "page size over 30",
-			flags:       map[string]string{"query": "x", "page-size": "31"},
-			wantParam:   "--page-size",
-			wantMessage: "--page-size: must be between 1 and 30",
-		},
-		{
-			name:        "chat ids without a keyword",
-			flags:       map[string]string{"chat-ids": "oc_a"},
-			wantParams:  []string{"--query", "--queries"},
-			wantMessage: "specify --query or --queries: --chat-ids and --has-chatted shape a keyword search but cannot enumerate bots on their own (the API answers a filter-only request with an empty list)",
-		},
-		{
-			name:        "has chatted without a keyword",
-			flags:       map[string]string{"has-chatted": "true"},
-			wantParams:  []string{"--query", "--queries"},
-			wantMessage: "specify --query or --queries: --chat-ids and --has-chatted shape a keyword search but cannot enumerate bots on their own (the API answers a filter-only request with an empty list)",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd := newBotSearchTestCommand()
-			for name, value := range tt.flags {
-				setBotSearchFlag(t, cmd, name, value)
-			}
-			runtime := common.TestNewRuntimeContext(cmd, botSearchDefaultConfig())
-			err := validateBotSearch(runtime)
-			if len(tt.wantParams) > 0 {
-				assertBotSearchValidationParams(t, err, tt.wantParams)
-			} else {
-				assertBotSearchValidationProblem(t, err, tt.wantParam)
-			}
-			if err.Error() != tt.wantMessage {
-				t.Fatalf("message: got %q, want %q", err.Error(), tt.wantMessage)
-			}
-		})
-	}
-}
-
-func TestValidateBotSearchPassingCases(t *testing.T) {
-	tests := []struct {
-		name  string
-		flags map[string]string
-	}{
-		{name: "query only", flags: map[string]string{"query": "x"}},
-		{name: "query and chat ids", flags: map[string]string{"query": "x", "chat-ids": "oc_a,oc_b"}},
-		{name: "query and has chatted", flags: map[string]string{"query": "x", "has-chatted": "true"}},
-		{name: "all filters", flags: map[string]string{"query": "x", "chat-ids": "oc_a,oc_b", "has-chatted": "true"}},
-		{name: "page size upper boundary", flags: map[string]string{"query": "x", "page-size": "30"}},
-		// An explicitly blank string flag reads as "no filter", matching how
-		// +search-user treats --user-ids / --queries. Only a non-blank value that
-		// parses to zero entries is an error.
-		{name: "blank chat ids ignored", flags: map[string]string{"query": "x", "chat-ids": ""}},
-		{name: "whitespace chat ids ignored", flags: map[string]string{"query": "x", "chat-ids": "   "}},
-		// Duplicates collapse before the cap is checked, so 101 copies of one chat
-		// is one entry — matching how --user-ids is resolved for +search-user.
-		{name: "duplicate chat ids collapse under the cap", flags: map[string]string{
-			"query": "x", "chat-ids": strings.TrimSuffix(strings.Repeat("oc_a,", 101), ","),
-		}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd := newBotSearchTestCommand()
-			for name, value := range tt.flags {
-				setBotSearchFlag(t, cmd, name, value)
-			}
-			runtime := common.TestNewRuntimeContext(cmd, botSearchDefaultConfig())
-			if err := validateBotSearch(runtime); err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-		})
-	}
-}
-
-func TestValidateBotSearchQueryRuneBoundary(t *testing.T) {
-	for _, tt := range []struct {
-		name      string
-		query     string
-		wantError bool
-	}{
-		{name: "50 CJK characters", query: strings.Repeat("中", 50)},
-		{name: "51 CJK characters", query: strings.Repeat("中", 51), wantError: true},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd := newBotSearchTestCommand()
-			setBotSearchFlag(t, cmd, "query", tt.query)
-			runtime := common.TestNewRuntimeContext(cmd, botSearchDefaultConfig())
-			err := validateBotSearch(runtime)
-			if tt.wantError {
-				assertBotSearchValidationProblem(t, err, "--query")
-				return
-			}
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-		})
-	}
-}
-
-func TestBuildBotSearchBody(t *testing.T) {
-	tests := []struct {
-		name     string
-		flags    map[string]string
-		wantJSON string
-	}{
-		{name: "query only", flags: map[string]string{"query": "x"}, wantJSON: `{"query":"x"}`},
-		{name: "chat ids", flags: map[string]string{"query": "x", "chat-ids": "oc_a,oc_b"}, wantJSON: `{"query":"x","filter":{"chat_ids":["oc_a","oc_b"]}}`},
-		{name: "chat id URL normalized", flags: map[string]string{"query": "x", "chat-ids": "https://example.feishu.cn/foo/oc_a,oc_b"}, wantJSON: `{"query":"x","filter":{"chat_ids":["oc_a","oc_b"]}}`},
-		{name: "has chatted", flags: map[string]string{"query": "x", "has-chatted": "true"}, wantJSON: `{"query":"x","filter":{"has_chatter":true}}`},
-		{name: "all fields", flags: map[string]string{"query": "x", "chat-ids": "oc_a,oc_b", "has-chatted": "true"}, wantJSON: `{"query":"x","filter":{"chat_ids":["oc_a","oc_b"],"has_chatter":true}}`},
-		// A blank --chat-ids must not materialize an empty filter object.
-		{name: "blank chat ids omit filter", flags: map[string]string{"query": "x", "chat-ids": "   "}, wantJSON: `{"query":"x"}`},
-		// Deduped after normalization, so a repeated id and a URL naming the same
-		// chat both collapse into one entry instead of burning the server's quota.
-		{name: "duplicate chat ids deduped", flags: map[string]string{"query": "x", "chat-ids": "oc_a,oc_a,oc_b"}, wantJSON: `{"query":"x","filter":{"chat_ids":["oc_a","oc_b"]}}`},
-		{name: "URL and bare id dedupe to one", flags: map[string]string{"query": "x", "chat-ids": "https://example.feishu.cn/foo/oc_a,oc_a"}, wantJSON: `{"query":"x","filter":{"chat_ids":["oc_a"]}}`},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd := newBotSearchTestCommand()
-			for name, value := range tt.flags {
-				setBotSearchFlag(t, cmd, name, value)
-			}
-			runtime := common.TestNewRuntimeContext(cmd, botSearchDefaultConfig())
-			body, err := buildBotSearchBody(runtime)
-			if err != nil {
-				t.Fatalf("build body: %v", err)
-			}
-			raw, err := json.Marshal(body)
-			if err != nil {
-				t.Fatalf("marshal body: %v", err)
-			}
-			if string(raw) != tt.wantJSON {
-				t.Fatalf("body: got %s, want %s", raw, tt.wantJSON)
-			}
-		})
-	}
-}
-
-func TestParseBotDisplayInfo(t *testing.T) {
-	tests := []struct {
-		name            string
-		raw             string
-		wantName        string
-		wantDescription string
-		wantSegments    []string
-	}{
-		// Whole name highlighted, description on line two.
-		{name: "whole name highlighted", raw: "<h>甲乙丙</h>\n一句话简介", wantName: "甲乙丙", wantDescription: "一句话简介", wantSegments: []string{"甲乙丙"}},
-		// Two highlighted runs split by a plain character: stripping tags has to
-		// rejoin them into one name.
-		{name: "two highlighted runs", raw: "<h>甲乙</h>丁<h>丙</h>\n另一句简介", wantName: "甲乙丁丙", wantDescription: "另一句简介", wantSegments: []string{"甲乙", "丙"}},
-		// Highlight at the end plus a trailing newline: line two exists but is empty.
-		{name: "trailing newline empty description", raw: "戊己的<h>庚辛</h>\n", wantName: "戊己的庚辛", wantSegments: []string{"庚辛"}},
-		// Single highlighted character in the middle of the name.
-		{name: "mid-name highlight", raw: "壬癸<h>子</h>丑\n第二行简介", wantName: "壬癸子丑", wantDescription: "第二行简介", wantSegments: []string{"子"}},
-		{name: "no newline", raw: "寅卯", wantName: "寅卯", wantSegments: []string{}},
-		{name: "html entities", raw: "<h>Lark</h>部门成员&amp;仓库\n来自飞书&#22810;维表格", wantName: "Lark部门成员&仓库", wantDescription: "来自飞书多维表格", wantSegments: []string{"Lark"}},
-		{name: "html entity in highlight", raw: "名称<h>&amp;</h>工具", wantName: "名称&工具", wantSegments: []string{"&"}},
-		{name: "empty", raw: "", wantSegments: []string{}},
-		{name: "first non-empty line", raw: "\n\n真名", wantName: "真名", wantSegments: []string{}},
-		// A blank first line must not make the description echo the name back and
-		// swallow the real description on the line after it.
-		{name: "blank first line keeps description", raw: "\n真名\n简介", wantName: "真名", wantDescription: "简介", wantSegments: []string{}},
-		{name: "blank first line without description", raw: "\n真名", wantName: "真名", wantSegments: []string{}},
-		// A highlight with no text carries nothing; an empty match segment is junk
-		// in the envelope. Which line the name comes from is left unchanged.
-		{name: "empty highlight yields no segment", raw: "<h></h>\n简介", wantName: "简介", wantSegments: []string{}},
-		// The non-greedy pattern pairs a stray `<h>` with the next `</h>`, so the
-		// capture can carry a tag the name and description already dropped.
-		{name: "nested highlight", raw: "<h>甲<h>乙</h></h>\n简介", wantName: "甲乙", wantDescription: "简介", wantSegments: []string{"甲乙"}},
-		{name: "dangling open tag", raw: "<h><h>甲</h>\n简介", wantName: "甲", wantDescription: "简介", wantSegments: []string{"甲"}},
-		{name: "unclosed highlight", raw: "<h>甲乙\n简介", wantName: "甲乙", wantDescription: "简介", wantSegments: []string{}},
-		// A literal `<h>` in a name arrives escaped, so it must survive: tags are
-		// stripped before unescaping. Swapping that order eats the name's own text.
-		{name: "escaped angle brackets are name text", raw: "名称&lt;h&gt;工具\n简介", wantName: "名称<h>工具", wantDescription: "简介", wantSegments: []string{}},
-		{name: "escaped angle brackets inside a highlight", raw: "<h>名称&lt;h&gt;</h>工具\n简介", wantName: "名称<h>工具", wantDescription: "简介", wantSegments: []string{"名称<h>"}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			name, description, segments := parseBotDisplayInfo(tt.raw)
-			if name != tt.wantName || description != tt.wantDescription {
-				t.Fatalf("name/description: got %q/%q, want %q/%q", name, description, tt.wantName, tt.wantDescription)
-			}
-			if segments == nil {
-				t.Fatal("match segments must be an empty slice, not nil")
-			}
-			if fmt.Sprint(segments) != fmt.Sprint(tt.wantSegments) {
-				t.Fatalf("match segments: got %v, want %v", segments, tt.wantSegments)
-			}
-		})
-	}
-}
-
-func TestProjectBotsMapsEveryField(t *testing.T) {
-	data := &botSearchAPIData{Items: []botSearchAPIItem{
-		{
-			ID:          "ou_with_chat",
-			DisplayInfo: "<h>甲乙丙</h>\n一句话简介",
-			MetaData: botSearchAPIMeta{
-				TenantID: "1", EnableJoinGroup: true, ChatID: "oc_p2p", IsAgent: true,
-			},
-		},
-		{
-			ID:          "ou_without_chat",
-			DisplayInfo: "",
-			MetaData:    botSearchAPIMeta{TenantID: "1"},
-		},
-	}}
-
-	bots := projectBots(data)
-	if len(bots) != 2 {
-		t.Fatalf("bots: got %d, want 2", len(bots))
-	}
-	first := bots[0]
-	if first.OpenID != "ou_with_chat" || first.Name != "甲乙丙" || first.Description != "一句话简介" ||
-		first.ChatID != "oc_p2p" || !first.EnableJoinGroup || !first.IsAgent || first.TenantID != "1" ||
-		fmt.Sprint(first.MatchSegments) != "[甲乙丙]" {
-		t.Fatalf("first bot mapping: %+v", first)
-	}
-	second := bots[1]
-	if second.Name != "" || second.ChatID != "" {
-		t.Fatalf("empty source fields must stay empty: %+v", second)
-	}
-	raw, err := json.Marshal(searchBotResponse{Bots: bots})
-	if err != nil {
-		t.Fatalf("marshal response: %v", err)
-	}
-	if !strings.Contains(string(raw), `"chat_id":""`) {
-		t.Fatalf("empty chat_id must still be emitted: %s", raw)
-	}
-	if !strings.Contains(string(raw), `"name":""`) {
-		t.Fatalf("empty name must not fall back to open_id: %s", raw)
-	}
-	if strings.Contains(string(raw), `"has_chatted"`) {
-		t.Fatalf("chat_id presence must not be exposed as a has_chatted signal: %s", raw)
-	}
-}
-
-func TestProjectBotsEmptySerializesAsArray(t *testing.T) {
-	bots := projectBots(&botSearchAPIData{Items: []botSearchAPIItem{}})
-	if bots == nil {
-		t.Fatal("bots must be an empty slice, not nil")
-	}
-	raw, err := json.Marshal(searchBotResponse{Bots: bots})
-	if err != nil {
-		t.Fatalf("marshal response: %v", err)
-	}
-	if string(raw) != `{"bots":[],"has_more":false}` {
-		t.Fatalf("response: got %s", raw)
-	}
-}
-
-func botSearchStub(url string, pageToken string) *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "POST",
-		URL:    url,
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "ok",
-			"data": map[string]interface{}{
-				"notice":     "The query is too long and has been truncated to the first 50 characters for search.",
-				"has_more":   true,
-				"page_token": pageToken,
-				"items": []interface{}{
-					map[string]interface{}{
-						"id":           "ou_bot",
-						"display_info": "<h>甲乙丙</h>\n一句话简介",
-						"meta_data": map[string]interface{}{
-							"tenant_id": "1", "enable_join_group": true, "chat_id": "oc_p2p", "is_agent": false,
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func TestBotSearchIntegrationRequestAndResponsePassThrough(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	stub := botSearchStub(botSearchURL+"?page_size=25", "cursor_out")
-	registry.Register(stub)
-
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--query", "甲乙", "--chat-ids", "oc_a,oc_b", "--has-chatted",
-		"--page-size", "25", "--format", "json", "--as", "user",
-	}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-
-	var requestBody map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &requestBody); err != nil {
-		t.Fatalf("request body: %v", err)
-	}
-	if requestBody["query"] != "甲乙" {
-		t.Fatalf("request query: got %v", requestBody["query"])
-	}
-	filter, ok := requestBody["filter"].(map[string]interface{})
-	if !ok || filter["has_chatter"] != true || fmt.Sprint(filter["chat_ids"]) != "[oc_a oc_b]" {
-		t.Fatalf("request filter: %#v", requestBody["filter"])
-	}
-
-	var envelope struct {
-		Data searchBotResponse `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &envelope); err != nil {
-		t.Fatalf("response JSON: %v\n%s", err, stdout.String())
-	}
-	if envelope.Data.Notice != "The query is too long and has been truncated to the first 50 characters for search." || !envelope.Data.HasMore {
-		t.Fatalf("response pass-through: %+v", envelope.Data)
-	}
-	if len(envelope.Data.Bots) != 1 || envelope.Data.Bots[0].OpenID != "ou_bot" || envelope.Data.Bots[0].ChatID != "oc_p2p" {
-		t.Fatalf("bots: %+v", envelope.Data.Bots)
-	}
-	registry.Verify(t)
-}
-
-func TestBotSearchIntegrationNeverSurfacesPageToken(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	// The stub returns a token; the envelope must still not carry one, matching
-	// +search-user, which decodes page_token and drops it.
-	registry.Register(botSearchStub(botSearchURL+"?page_size=20", "cursor_out"))
-
-	err := mountAndRun(t, ContactSearchBot, []string{"+search-bot", "--query", "甲乙", "--format", "json", "--as", "user"}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var envelope map[string]interface{}
-	if err := json.Unmarshal(stdout.Bytes(), &envelope); err != nil {
-		t.Fatalf("response JSON: %v", err)
-	}
-	data := envelope["data"].(map[string]interface{})
-	if _, ok := data["page_token"]; ok {
-		t.Fatalf("page_token must never be surfaced: %v", data)
-	}
-}
-
-func TestBotSearchPrettyOutputAndPaginationHint(t *testing.T) {
-	factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	registry.Register(botSearchStub(botSearchURL+"?page_size=20", "cursor_out"))
-
-	err := mountAndRun(t, ContactSearchBot, []string{"+search-bot", "--query", "甲乙", "--format", "pretty", "--as", "user"}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	for _, column := range []string{"name", "description", "is_agent", "enable_join_group", "open_id"} {
-		if !strings.Contains(stdout.String(), column) {
-			t.Errorf("pretty output missing %q: %s", column, stdout.String())
-		}
-	}
-	for _, genericField := range []string{"bots", "has_more", "notice", "tenant_id", "chat_id", "match_segments"} {
-		if strings.Contains(stdout.String(), genericField) {
-			t.Errorf("pretty output exposed %q: %s", genericField, stdout.String())
-		}
-	}
-	// pretty stdout carries rows only, so stderr has to carry both the server
-	// notice and the pagination hint.
-	for _, want := range []string{
-		"notice: The query is too long and has been truncated to the first 50 characters for search.",
-		"hint: more matches exist; narrow with --has-chatted or a more specific --query",
-	} {
-		if !strings.Contains(stderr.String(), want) {
-			t.Fatalf("pretty stderr missing %q: %q", want, stderr.String())
-		}
-	}
-}
-
-func TestBotSearchTableUsesGenericFormatterLikeSearchUser(t *testing.T) {
-	factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	registry.Register(botSearchStub(botSearchURL+"?page_size=20", "cursor_out"))
-
-	err := mountAndRun(t, ContactSearchBot, []string{"+search-bot", "--query", "甲乙", "--format", "table", "--as", "user"}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	for _, field := range []string{"open_id", "tenant_id", "chat_id", "match_segments"} {
-		if !strings.Contains(stdout.String(), field) {
-			t.Errorf("table output missing %q: %s", field, stdout.String())
-		}
-	}
-	// table stdout carries rows only, so stderr has to carry both the server
-	// notice and the pagination hint.
-	for _, want := range []string{
-		"notice: The query is too long and has been truncated to the first 50 characters for search.",
-		"hint: more matches exist; narrow with --has-chatted or a more specific --query",
-	} {
-		if !strings.Contains(stderr.String(), want) {
-			t.Fatalf("table stderr missing %q: %q", want, stderr.String())
-		}
-	}
-}
-
-// The old name and assertion here pinned a bug: csv and ndjson were the two
-// formats that carried neither has_more in stdout nor a hint on stderr, so a
-// machine caller read a truncated result as the whole answer. stdout stays
-// data-only; the truncation signal belongs on stderr for every format whose
-// stdout has no envelope.
-func TestBotSearchCSVAndNDJSONCarryFullFieldsAndSignalTruncation(t *testing.T) {
-	for _, format := range []string{"csv", "ndjson"} {
-		t.Run(format, func(t *testing.T) {
-			factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-			registry.Register(botSearchStub(botSearchURL+"?page_size=20", "cursor_out"))
-
-			err := mountAndRun(t, ContactSearchBot, []string{"+search-bot", "--query", "甲乙", "--format", format, "--as", "user"}, factory, stdout)
-			if err != nil {
-				t.Fatalf("execute: %v", err)
-			}
-			for _, field := range []string{"open_id", "tenant_id", "chat_id", "match_segments"} {
-				if !strings.Contains(stdout.String(), field) {
-					t.Errorf("%s output missing %q: %s", format, field, stdout.String())
-				}
-			}
-			// stdout must stay data-only, so both the notice and the truncation
-			// signal have to arrive on stderr.
-			for _, want := range []string{"notice: The query is too long", "hint: more matches exist"} {
-				if !strings.Contains(stderr.String(), want) {
-					t.Fatalf("%s dropped %q from stderr: %q", format, want, stderr.String())
-				}
-			}
-			if strings.Contains(stdout.String(), "more matches exist") {
-				t.Fatalf("%s stdout must stay data-only: %s", format, stdout.String())
-			}
-		})
-	}
-}
-
-func TestBotSearchPrettyEmptyResult(t *testing.T) {
-	factory, stdout, _, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	registry.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    botSearchURL + "?page_size=20",
-		Body: map[string]interface{}{
-			"code": 0, "msg": "ok",
-			"data": map[string]interface{}{"items": []interface{}{}, "has_more": false},
-		},
-	})
-
-	err := mountAndRun(t, ContactSearchBot, []string{"+search-bot", "--query", "none", "--format", "pretty", "--as", "user"}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	if !strings.Contains(stdout.String(), "No bots found.") {
-		t.Fatalf("pretty output: %q", stdout.String())
-	}
-}
-
-func TestBotSearchDryRunMirrorsRequest(t *testing.T) {
-	factory, stdout, _, _ := cmdutil.TestFactory(t, botSearchDefaultConfig())
-	err := mountAndRun(t, ContactSearchBot, []string{
-		"+search-bot", "--query", "甲乙", "--chat-ids", "oc_a", "--has-chatted",
-		"--page-size", "25", "--dry-run", "--as", "user",
-	}, factory, stdout)
-	if err != nil {
-		t.Fatalf("execute: %v", err)
-	}
-	var envelope struct {
-		Data struct {
-			API []struct {
-				Method string                 `json:"method"`
-				URL    string                 `json:"url"`
-				Params map[string]interface{} `json:"params"`
-				Body   botSearchAPIRequest    `json:"body"`
-			} `json:"api"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &envelope); err != nil {
-		t.Fatalf("dry-run JSON: %v", err)
-	}
-	if len(envelope.Data.API) != 1 {
-		t.Fatalf("api calls: got %d, want 1", len(envelope.Data.API))
-	}
-	call := envelope.Data.API[0]
-	if call.Method != "POST" || call.URL != botSearchURL || call.Params["page_size"] != float64(25) {
-		t.Fatalf("dry-run call: %+v", call)
-	}
-	if call.Body.Query != "甲乙" || call.Body.Filter == nil || fmt.Sprint(call.Body.Filter.ChatIDs) != "[oc_a]" || !call.Body.Filter.HasChatter {
-		t.Fatalf("dry-run body: %+v", call.Body)
-	}
-}
-
-func TestDecodeBotSearchAPIDataMarshalFailureTyped(t *testing.T) {
-	_, err := decodeBotSearchAPIData(map[string]interface{}{"bad": func() {}})
-	if err == nil {
-		t.Fatal("expected marshal failure")
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryInternal || problem.Subtype != errs.SubtypeInvalidResponse {
-		t.Fatalf("problem: %+v, ok=%v", problem, ok)
-	}
-}
-
-// Only the json envelope carries data.notice. If the other formats dropped it
-// silently, a caller would read a truncated or incomplete result as a complete
-// one, so every non-json format has to surface it on stderr instead.
-func TestBotSearchNoticeReachesCallerInEveryFormat(t *testing.T) {
-	const notice = "The query is too long and has been truncated to the first 50 characters for search."
-	for _, format := range []string{"json", "ndjson", "csv", "table", "pretty"} {
-		t.Run(format, func(t *testing.T) {
-			factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-			registry.Register(botSearchStub(botSearchURL+"?page_size=20", ""))
-			if err := mountAndRun(t, ContactSearchBot, []string{
-				"+search-bot", "--query", "甲乙", "--format", format, "--as", "user",
-			}, factory, stdout); err != nil {
-				t.Fatalf("execute: %v", err)
-			}
-			if strings.Contains(stdout.String(), notice) {
-				if format != "json" {
-					t.Fatalf("%s should not carry the notice in stdout: %s", format, stdout.String())
-				}
-				return
-			}
-			if !strings.Contains(stderr.String(), notice) {
-				t.Fatalf("%s dropped the notice entirely\nstdout:\n%s\nstderr:\n%s",
-					format, stdout.String(), stderr.String())
-			}
-			// stdout stays pipe-clean: the notice must not be mixed into the rows.
-			if format == "csv" && strings.Contains(stdout.String(), "notice") {
-				t.Fatalf("csv stdout must stay data-only: %s", stdout.String())
-			}
-		})
-	}
-}
-
-// has_more is the server saying "this is not the whole answer". Only the json
-// envelope carries it, so every other format has to say so on stderr or a machine
-// caller silently treats a truncated result as complete.
-func TestBotSearchTruncationReachesCallerInEveryFormat(t *testing.T) {
-	for _, format := range []string{"json", "ndjson", "csv", "table", "pretty"} {
-		t.Run(format, func(t *testing.T) {
-			factory, stdout, stderr, registry := cmdutil.TestFactory(t, botSearchDefaultConfig())
-			registry.Register(botSearchStub(botSearchURL+"?page_size=20", "cursor"))
-			if err := mountAndRun(t, ContactSearchBot, []string{
-				"+search-bot", "--query", "甲乙", "--format", format, "--as", "user",
-			}, factory, stdout); err != nil {
-				t.Fatalf("execute: %v", err)
-			}
-			if format == "json" {
-				if !strings.Contains(stdout.String(), `"has_more": true`) {
-					t.Fatalf("json must carry has_more in the envelope: %s", stdout.String())
-				}
-				return
-			}
-			if !strings.Contains(stderr.String(), "more matches exist") {
-				t.Fatalf("%s left the caller unable to learn the result was truncated\nstdout:\n%s\nstderr:\n%s",
-					format, stdout.String(), stderr.String())
-			}
-		})
-	}
-}

shortcuts/contact/contact_search_user_test.go

@@ -550,13 +550,6 @@ func TestDecodeSearchUserAPIData_MarshalFailureTyped(t *testing.T) {
 // mountAndRun mounts the shortcut under a parent cobra command and runs it
 // with the given args. Mirrors the pattern used in other shortcut packages.
 func mountAndRun(t *testing.T, s common.Shortcut, args []string, f *cmdutil.Factory, stdout *bytes.Buffer) error {
-	t.Helper()
-	return mountAndRunContext(t, context.Background(), s, args, f, stdout)
-}
-
-// mountAndRunContext is mountAndRun with a caller-supplied context, so a test
-// can cancel the run the shortcut actually sees (runShortcut reads cmd.Context).
-func mountAndRunContext(t *testing.T, ctx context.Context, s common.Shortcut, args []string, f *cmdutil.Factory, stdout *bytes.Buffer) error {
 	t.Helper()
 	parent := &cobra.Command{Use: "contact"}
 	s.Mount(parent, f)
@@ -566,7 +559,7 @@ func mountAndRunContext(t *testing.T, ctx context.Context, s common.Shortcut, ar
 	if stdout != nil {
 		stdout.Reset()
 	}
-	return parent.ExecuteContext(ctx)
+	return parent.Execute()
 }
 
 // searchUserStub returns a representative user search response with a notice.

shortcuts/contact/shortcuts.go

@@ -9,7 +9,6 @@ import "github.com/larksuite/cli/shortcuts/common"
 func Shortcuts() []common.Shortcut {
 	return []common.Shortcut{
 		ContactSearchUser,
-		ContactSearchBot,
 		ContactGetUser,
 	}
 }

shortcuts/doc/doc_resource_cover.go

@@ -40,6 +40,12 @@ func (c docCoverHTTPStatusCause) Error() string {
 	return http.StatusText(int(c))
 }
 
+type docCoverURLGuardError string
+
+func (e docCoverURLGuardError) Error() string {
+	return string(e)
+}
+
 var docCoverAllowedContentTypes = map[string]string{
 	"image/gif":  ".gif",
 	"image/jpeg": ".jpg",
@@ -536,7 +542,7 @@ func downloadDocCoverURL(ctx context.Context, runtime *common.RuntimeContext, ra
 		return nil, "", err
 	}
 
-	baseClient, err := runtime.Factory.ExternalHTTPClient()
+	baseClient, err := runtime.Factory.HttpClient()
 	if err != nil {
 		return nil, "", errs.NewInternalError(errs.SubtypeSDKError, "http client: %v", err).WithCause(err)
 	}
@@ -667,9 +673,6 @@ func isUnsafeDocCoverIP(ip net.IP) bool {
 		return true
 	}
 	if v4 := ip.To4(); v4 != nil {
-		if v4[0] == 0 {
-			return true
-		}
 		if v4[0] == 10 || v4[0] == 127 {
 			return true
 		}
@@ -698,15 +701,13 @@ func isUnsafeDocCoverIP(ip net.IP) bool {
 
 func newDocCoverHTTPClient(base *http.Client) *http.Client { //nolint:forbidigo // guarded external --url downloader cannot use Lark API runtime helpers.
 	if base == nil {
-		base = &http.Client{} //nolint:forbidigo // fallback only; caller normally supplies Factory.ExternalHTTPClient.
+		base = &http.Client{} //nolint:forbidigo // fallback only; caller normally supplies Factory.HttpClient.
 	}
 	cloned := *base
 	if cloned.Timeout == 0 { //nolint:forbidigo // external download timeout guard on cloned client.
 		cloned.Timeout = 30 * time.Second //nolint:forbidigo // external download timeout guard on cloned client.
 	}
-	cloned.Transport = validate.NewDownloadHTTPClient(base, validate.DownloadHTTPClientOptions{ //nolint:forbidigo // guarded external download
-		MaxRedirects: 3,
-	}).Transport
+	cloned.Transport = cloneDocCoverTransport(base.Transport)                   //nolint:forbidigo // external download transport adds proxy/IP guards.
 	cloned.CheckRedirect = func(req *http.Request, via []*http.Request) error { //nolint:forbidigo // redirects must be validated for external --url downloads.
 		if len(via) >= 3 {
 			return errs.NewValidationError(errs.SubtypeInvalidArgument, "cover URL redirects too many times").WithParam("--url")
@@ -722,3 +723,73 @@ func newDocCoverHTTPClient(base *http.Client) *http.Client { //nolint:forbidigo
 	}
 	return &cloned
 }
+
+func cloneDocCoverTransport(base http.RoundTripper) *http.Transport { //nolint:forbidigo // external --url downloader wraps caller transport with IP/proxy guards.
+	var cloned *http.Transport
+	if src, ok := base.(*http.Transport); ok && src != nil {
+		cloned = src.Clone()
+	} else if def, ok := http.DefaultTransport.(*http.Transport); ok && def != nil { //nolint:forbidigo // fallback for guarded external downloader only.
+		cloned = def.Clone()
+	} else {
+		cloned = &http.Transport{}
+	}
+	cloned.Proxy = nil
+
+	origDial := cloned.DialContext
+	cloned.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+		conn, err := dialDocCoverConn(ctx, origDial, network, addr)
+		if err != nil {
+			return nil, err
+		}
+		if err := validateDocCoverConnRemoteIP(conn); err != nil {
+			conn.Close()
+			return nil, err
+		}
+		return conn, nil
+	}
+	if cloned.DialTLSContext != nil {
+		origDialTLS := cloned.DialTLSContext
+		cloned.DialTLSContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			conn, err := dialDocCoverConn(ctx, origDialTLS, network, addr)
+			if err != nil {
+				return nil, err
+			}
+			if err := validateDocCoverConnRemoteIP(conn); err != nil {
+				conn.Close()
+				return nil, err
+			}
+			return conn, nil
+		}
+	}
+	return cloned
+}
+
+func dialDocCoverConn(ctx context.Context, dialFn func(context.Context, string, string) (net.Conn, error), network, addr string) (net.Conn, error) {
+	if dialFn != nil {
+		return dialFn(ctx, network, addr)
+	}
+	var dialer net.Dialer
+	return dialer.DialContext(ctx, network, addr)
+}
+
+func validateDocCoverConnRemoteIP(conn net.Conn) error {
+	if conn == nil {
+		return docCoverURLGuardError("nil connection")
+	}
+	addr := conn.RemoteAddr()
+	if addr == nil {
+		return docCoverURLGuardError("missing remote address")
+	}
+	host, _, err := net.SplitHostPort(addr.String())
+	if err != nil {
+		host = addr.String()
+	}
+	ip := net.ParseIP(strings.Trim(host, "[]"))
+	if ip == nil {
+		return docCoverURLGuardError("invalid remote IP")
+	}
+	if isUnsafeDocCoverIP(ip) {
+		return docCoverURLGuardError("local/internal host is not allowed")
+	}
+	return nil
+}

shortcuts/doc/doc_resource_cover_test.go

@@ -386,7 +386,6 @@ func TestValidateDocCoverURLHost(t *testing.T) {
 
 func TestDocCoverIPSafetyBlocksSpecialRanges(t *testing.T) {
 	for _, rawIP := range []string{
-		"0.1.2.3",
 		"10.0.0.1",
 		"127.0.0.1",
 		"169.254.1.1",
@@ -407,26 +406,17 @@ func TestDocCoverIPSafetyBlocksSpecialRanges(t *testing.T) {
 	}
 }
 
-func TestDocCoverHTTPClientPreservesProxyPolicy(t *testing.T) {
-	proxyErr := errors.New("proxy selected")
-	directErr := errors.New("direct dialed")
-	baseTransport := &http.Transport{
-		Proxy: func(*http.Request) (*url.URL, error) {
-			return nil, proxyErr
-		},
-		DialContext: func(context.Context, string, string) (net.Conn, error) {
-			return nil, directErr
-		},
-	}
+func TestDocCoverHTTPClientDoesNotUseProxy(t *testing.T) {
+	baseTransport := &http.Transport{Proxy: http.ProxyFromEnvironment}
 	baseClient := &http.Client{Transport: baseTransport}
 
 	client := newDocCoverHTTPClient(baseClient)
-	req, err := http.NewRequest(http.MethodGet, "https://203.0.113.10/cover.png", nil)
-	if err != nil {
-		t.Fatal(err)
+	transport, ok := client.Transport.(*http.Transport)
+	if !ok {
+		t.Fatalf("client transport = %T, want *http.Transport", client.Transport)
 	}
-	if _, err := client.Transport.RoundTrip(req); !errors.Is(err, proxyErr) {
-		t.Fatalf("RoundTrip() error = %v, want proxy policy error %v", err, proxyErr)
+	if transport.Proxy != nil {
+		t.Fatal("cover URL downloader must not inherit proxy settings")
 	}
 	if baseTransport.Proxy == nil {
 		t.Fatal("base transport proxy was mutated")
@@ -456,6 +446,21 @@ func TestDocCoverHTTPClientRedirectValidation(t *testing.T) {
 	}
 }
 
+func TestDocCoverConnRemoteIPValidation(t *testing.T) {
+	if err := validateDocCoverConnRemoteIP(nil); err == nil {
+		t.Fatal("expected nil connection error")
+	}
+	if err := validateDocCoverConnRemoteIP(docCoverRemoteAddrConn{}); err == nil {
+		t.Fatal("expected missing remote address error")
+	}
+	if err := validateDocCoverConnRemoteIP(docCoverRemoteAddrConn{addr: testAddr("not-ip")}); err == nil {
+		t.Fatal("expected invalid remote IP error")
+	}
+	if err := validateDocCoverConnRemoteIP(docCoverRemoteAddrConn{addr: &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 443}}); err == nil {
+		t.Fatal("expected local remote IP error")
+	}
+}
+
 func TestDocCoverURLFileName(t *testing.T) {
 	cases := []struct {
 		raw  string
@@ -657,6 +662,16 @@ func (c docCoverRemoteAddrConn) RemoteAddr() net.Addr {
 	return c.addr
 }
 
+type testAddr string
+
+func (a testAddr) Network() string {
+	return "test"
+}
+
+func (a testAddr) String() string {
+	return string(a)
+}
+
 type repeatByteReader byte
 
 func (r repeatByteReader) Read(p []byte) (int, error) {
@@ -695,61 +710,3 @@ func decodeDocResourceOutput(t *testing.T, stdout *bytes.Buffer) docResourceOutp
 	}
 	return out
 }
-
-type opaqueDocCoverTransport struct {
-	called bool
-}
-
-func (t *opaqueDocCoverTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	t.called = true
-	return &http.Response{StatusCode: http.StatusNoContent, Body: http.NoBody, Request: req}, nil
-}
-
-func TestNewDocCoverHTTPClientFailsClosedForOpaqueTransport(t *testing.T) {
-	opaque := &opaqueDocCoverTransport{}
-	client := newDocCoverHTTPClient(&http.Client{Transport: opaque})
-	req, err := http.NewRequest(http.MethodGet, "https://public.example/cover.png", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Transport.RoundTrip(req)
-	if err == nil || !strings.Contains(err.Error(), "cannot safely clone download transport") {
-		t.Fatalf("RoundTrip() error = %v, want fail-closed clone error", err)
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryInternal || problem.Subtype != errs.SubtypeUnknown {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want internal/unknown", problem, ok)
-	}
-	if opaque.called {
-		t.Fatal("opaque transport was called after safe cloning failed")
-	}
-}
-
-func TestNewDocCoverHTTPClientGuardsLegacyDialTLS(t *testing.T) {
-	server := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	t.Cleanup(server.Close)
-	base := &http.Transport{DialTLS: func(_, _ string) (net.Conn, error) {
-		return tls.Dial("tcp", server.Listener.Addr().String(), &tls.Config{InsecureSkipVerify: true}) //nolint:gosec // local TLS server verifies the connection guard.
-	}}
-	client := newDocCoverHTTPClient(&http.Client{Transport: base})
-	req, err := http.NewRequest(http.MethodGet, "https://public.example/cover.png", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = client.Transport.RoundTrip(req)
-	if err == nil || !strings.Contains(err.Error(), "local/internal host is not allowed") {
-		t.Fatalf("RoundTrip() error = %v, want legacy DialTLS IP guard", err)
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok || problem.Category != errs.CategoryPolicy || problem.Subtype != errs.SubtypeAccessDenied {
-		t.Fatalf("RoundTrip() problem = %#v, %v; want policy/access_denied", problem, ok)
-	}
-	var policyErr *errs.SecurityPolicyError
-	if !errors.As(err, &policyErr) || policyErr.Cause == nil {
-		t.Fatalf("RoundTrip() error = %T, want policy error with cause", err)
-	}
-}

shortcuts/drive/drive_add_comment.go

@@ -47,14 +47,6 @@ const defaultLocateDocLimit = 10
 // with `drive file.comments create_v2` against a fresh docx.
 const maxCommentTotalRunes = 10000
 
-// maxCommentReplyElements is the element-count cap declared ONLY by the
-// reply-create endpoint (POST .../comments/:comment_id/replies), whose
-// content.elements schema says "最大元素个数为100". It is enforced only by
-// +add-reply. create_v2 (+add-comment) and the reply-update endpoint
-// (+update-reply) do not declare this cap, so their inputs are not capped
-// here — see the shared parseCommentReplyElements, which stays uncapped.
-const maxCommentReplyElements = 100
-
 // The file comment API treats supported Drive file comments as full-file
 // comments in the UI, but currently rejects an empty anchor.block_id for file
 // targets. TODO: remove this placeholder after the API accepts omitting

shortcuts/drive/drive_add_comment_test.go

@@ -918,27 +918,6 @@ func TestSheetCommentValidateInvalidBlockIDFormat(t *testing.T) {
 	}
 }
 
-// create_v2 (+add-comment) uses reply_elements, which does NOT declare the
-// 100-element cap that the reply-create endpoint does; +add-comment must not
-// reject >100 elements locally.
-func TestDriveAddCommentDoesNotCapElements(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	elems := make([]string, 101)
-	for i := range elems {
-		elems[i] = `{"type":"text","text":"x"}`
-	}
-	err := mountAndRunDrive(t, DriveAddComment, []string{
-		"+add-comment",
-		"--doc", "https://example.larksuite.com/docx/docxToken",
-		"--content", "[" + strings.Join(elems, ",") + "]",
-		"--full-comment",
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("+add-comment must not cap element count locally, got %v", err)
-	}
-}
-
 func TestSheetCommentValidateRejectsFullComment(t *testing.T) {
 	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
 	err := mountAndRunDrive(t, DriveAddComment, []string{

shortcuts/drive/drive_add_reply.go

@@ -1,212 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package drive
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-var driveAddReplyOp = driveCommentOp{
-	Label: "comment reply",
-	Types: []string{"doc", "docx", "sheet", "file", "slides", "bitable", "apps"},
-}
-
-type driveAddReplySpec struct {
-	Ref           driveCommentRef
-	CommentID     string
-	ReplyElements []map[string]interface{} // simplified +add-comment element form, text already escaped
-}
-
-func (s driveAddReplySpec) RequestBody() map[string]interface{} {
-	return map[string]interface{}{
-		"content": map[string]interface{}{
-			"elements": driveReplyV1Elements(s.ReplyElements),
-		},
-	}
-}
-
-// DriveAddReply replies to an existing comment through the Drive comment
-// reply create API (POST .../comments/:comment_id/replies), while accepting
-// Wiki URLs/tokens and resolving them to the underlying object.
-//
-// Note: the documented alternative — POST .../comments with comment_id in the
-// body ("如填写，则视为回复已有评论") — does NOT reply on docx in practice; it
-// silently creates a new standalone comment instead.
-var DriveAddReply = common.Shortcut{
-	Service:           "drive",
-	Command:           "+add-reply",
-	Description:       "Add a reply to an existing comment on doc/docx/sheet/file/slides/base(bitable)/apps, with URL parsing and Wiki token unwrapping",
-	Risk:              "write",
-	Scopes:            []string{"docs:document.comment:create"},
-	ConditionalScopes: []string{"wiki:node:read"},
-	AuthTypes:         []string{"user", "bot"},
-	Flags: append(driveCommentTargetFlags(driveAddReplyOp),
-		common.Flag{Name: "comment-id", Desc: "comment ID to reply to (from drive +list-comments)", Required: true},
-		common.Flag{Name: "content", Desc: "reply_elements JSON string, same format as drive +add-comment", Required: true, Input: []string{common.File, common.Stdin}},
-	),
-	Tips: []string{
-		"--content uses the same JSON as `drive +add-comment`: '[{\"type\":\"text\",\"text\":\"正文\"}]' (types: text, mention_user, link).",
-		"Comment IDs come from `drive +list-comments` (items[].comment_id).",
-		"Whole-document comments (is_whole=true) and solved comments (is_solved=true) do not accept replies; check the comment state via `drive +list-comments` first.",
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		_, err := readDriveAddReplySpec(runtime)
-		return err
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		spec, err := readDriveAddReplySpec(runtime)
-		if err != nil {
-			return common.NewDryRunAPI().Set("error", err.Error())
-		}
-		return buildDriveAddReplyDryRun(spec)
-	},
-	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		spec, err := readDriveAddReplySpec(runtime)
-		if err != nil {
-			return err
-		}
-
-		target, err := resolveDriveCommentTarget(ctx, runtime, driveAddReplyOp, spec.Ref)
-		if err != nil {
-			return err
-		}
-
-		fmt.Fprintf(runtime.IO().ErrOut, "Adding reply to comment %s in %s...\n", spec.CommentID, common.MaskToken(target.FileToken))
-		path := fmt.Sprintf(
-			"/open-apis/drive/v1/files/%s/comments/%s/replies",
-			validate.EncodePathSegment(target.FileToken),
-			validate.EncodePathSegment(spec.CommentID),
-		)
-		data, err := runtime.CallAPITyped(
-			"POST",
-			path,
-			map[string]interface{}{"file_type": target.FileType},
-			spec.RequestBody(),
-		)
-		if err != nil {
-			return err
-		}
-
-		extra := map[string]interface{}{
-			"comment_id": spec.CommentID,
-			"created":    true,
-		}
-		if replyID := extractDriveCreatedReplyID(data); replyID != "" {
-			extra["reply_id"] = replyID
-		}
-		runtime.Out(driveCommentTargetOutput(target, extra), nil)
-		return nil
-	},
-}
-
-func readDriveAddReplySpec(runtime *common.RuntimeContext) (driveAddReplySpec, error) {
-	ref, err := resolveDriveCommentInput(driveAddReplyOp, runtime.Str("url"), runtime.Str("token"), runtime.Str("type"))
-	if err != nil {
-		return driveAddReplySpec{}, err
-	}
-	commentID := strings.TrimSpace(runtime.Str("comment-id"))
-	if err := validateDriveCommentPathID(commentID, "--comment-id"); err != nil {
-		return driveAddReplySpec{}, err
-	}
-	replyElements, err := parseCommentReplyElements(runtime.Str("content"))
-	if err != nil {
-		return driveAddReplySpec{}, err
-	}
-	// The reply-create endpoint documents a 100-element cap on content.elements;
-	// reject over-cap input locally instead of surfacing the opaque [1069302].
-	if len(replyElements) > maxCommentReplyElements {
-		return driveAddReplySpec{}, errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"--content has %d elements; the reply endpoint caps content.elements at %d", len(replyElements), maxCommentReplyElements).
-			WithParam("--content")
-	}
-	return driveAddReplySpec{
-		Ref:           ref,
-		CommentID:     commentID,
-		ReplyElements: replyElements,
-	}, nil
-}
-
-// driveReplyV1Elements converts the simplified +add-comment reply element form
-// (text / mention_user / link) to the Drive v1 comment create wire form
-// (text_run / person / docs_link).
-func driveReplyV1Elements(replyElements []map[string]interface{}) []map[string]interface{} {
-	elements := make([]map[string]interface{}, 0, len(replyElements))
-	for _, element := range replyElements {
-		switch common.GetString(element, "type") {
-		case "text":
-			elements = append(elements, map[string]interface{}{
-				"type":     "text_run",
-				"text_run": map[string]interface{}{"text": common.GetString(element, "text")},
-			})
-		case "mention_user":
-			elements = append(elements, map[string]interface{}{
-				"type":   "person",
-				"person": map[string]interface{}{"user_id": common.GetString(element, "mention_user")},
-			})
-		case "link":
-			elements = append(elements, map[string]interface{}{
-				"type":      "docs_link",
-				"docs_link": map[string]interface{}{"url": common.GetString(element, "link")},
-			})
-		}
-	}
-	return elements
-}
-
-// extractDriveCreatedReplyID pulls the created reply ID out of the reply
-// create response, tolerating the shapes the API family uses: a top-level
-// reply_id, a nested reply object, or a reply_list wrapper.
-func extractDriveCreatedReplyID(data map[string]interface{}) string {
-	if replyID := common.GetString(data, "reply_id"); replyID != "" {
-		return replyID
-	}
-	if reply := common.GetMap(data, "reply"); reply != nil {
-		if replyID := common.GetString(reply, "reply_id"); replyID != "" {
-			return replyID
-		}
-	}
-	replyList := common.GetMap(data, "reply_list")
-	if replyList == nil {
-		return ""
-	}
-	for _, item := range common.GetSlice(replyList, "replies") {
-		reply, ok := item.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		if replyID := common.GetString(reply, "reply_id"); replyID != "" {
-			return replyID
-		}
-	}
-	return ""
-}
-
-func buildDriveAddReplyDryRun(spec driveAddReplySpec) *common.DryRunAPI {
-	if spec.Ref.Type == "wiki" {
-		return common.NewDryRunAPI().
-			Desc("2-step orchestration: resolve wiki -> add reply to comment").
-			GET("/open-apis/wiki/v2/spaces/get_node").
-			Desc("[1] Resolve wiki node to underlying document").
-			Params(map[string]interface{}{"token": spec.Ref.Token}).
-			POST("/open-apis/drive/v1/files/<obj_token from step 1>/comments/:comment_id/replies").
-			Desc("[2] Add reply to comment on resolved document").
-			Params(map[string]interface{}{"file_type": "<obj_type from step 1>"}).
-			Body(spec.RequestBody()).
-			Set("comment_id", spec.CommentID)
-	}
-
-	return common.NewDryRunAPI().
-		Desc("1-step request: add reply to comment").
-		POST("/open-apis/drive/v1/files/:file_token/comments/:comment_id/replies").
-		Params(map[string]interface{}{"file_type": spec.Ref.Type}).
-		Body(spec.RequestBody()).
-		Set("file_token", spec.Ref.Token).
-		Set("comment_id", spec.CommentID)
-}

shortcuts/drive/drive_add_reply_test.go

@@ -1,393 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package drive
-
-import (
-	"encoding/json"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-func TestDriveReplyV1Elements(t *testing.T) {
-	t.Parallel()
-
-	elements, err := parseCommentReplyElements(`[
-		{"type":"text","text":"a<b"},
-		{"type":"mention_user","mention_user":"ou_123"},
-		{"type":"link","link":"https://example.com"}
-	]`)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	got := driveReplyV1Elements(elements)
-	if len(got) != 3 {
-		t.Fatalf("len = %d, want 3", len(got))
-	}
-	if got[0]["type"] != "text_run" {
-		t.Fatalf("elements[0].type = %#v, want text_run", got[0]["type"])
-	}
-	textRun, ok := got[0]["text_run"].(map[string]interface{})
-	if !ok {
-		t.Fatalf("elements[0].text_run is %T, want map", got[0]["text_run"])
-	}
-	if textRun["text"] != "a&lt;b" {
-		t.Fatalf("elements[0].text_run.text = %#v, want escaped a&lt;b", textRun["text"])
-	}
-	person, ok := got[1]["person"].(map[string]interface{})
-	if !ok || got[1]["type"] != "person" {
-		t.Fatalf("elements[1] = %#v, want person element", got[1])
-	}
-	if person["user_id"] != "ou_123" {
-		t.Fatalf("elements[1].person.user_id = %#v, want ou_123", person["user_id"])
-	}
-	docsLink, ok := got[2]["docs_link"].(map[string]interface{})
-	if !ok || got[2]["type"] != "docs_link" {
-		t.Fatalf("elements[2] = %#v, want docs_link element", got[2])
-	}
-	if docsLink["url"] != "https://example.com" {
-		t.Fatalf("elements[2].docs_link.url = %#v, want https://example.com", docsLink["url"])
-	}
-}
-
-func TestDriveAddReplyExecuteDocx(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/comment_1/replies",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("file_type"); got != "docx" {
-				t.Errorf("file_type = %q, want docx", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"reply": map[string]interface{}{
-					"reply_id": "reply_9",
-				},
-			},
-		},
-	}
-	reg.Register(stub)
-
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--content", `[{"type":"text","text":"收到，我来处理"}]`,
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var body map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &body); err != nil {
-		t.Fatalf("failed to decode captured request body: %v", err)
-	}
-	if _, ok := body["comment_id"]; ok {
-		t.Fatalf("request body must not carry comment_id (it rides in the URL path): %v", body)
-	}
-	content := mustMapValue(t, body["content"], "request.content")
-	elements := mustSliceValue(t, content["elements"], "request.content.elements")
-	element := mustMapValue(t, elements[0], "request.content.elements[0]")
-	if got := mustStringField(t, element, "type", "request.content.elements[0].type"); got != "text_run" {
-		t.Fatalf("request element type = %q, want text_run", got)
-	}
-	elementText := mustMapValue(t, element["text_run"], "request.content.elements[0].text_run")
-	if got := mustStringField(t, elementText, "text", "request.content.elements[0].text_run.text"); got != "收到，我来处理" {
-		t.Fatalf("text_run.text = %q, want 收到，我来处理", got)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	if got := mustStringField(t, data, "comment_id", "data.comment_id"); got != "comment_1" {
-		t.Fatalf("comment_id = %q, want comment_1", got)
-	}
-	if got := mustStringField(t, data, "reply_id", "data.reply_id"); got != "reply_9" {
-		t.Fatalf("reply_id = %q, want reply_9", got)
-	}
-	if got := data["created"]; got != true {
-		t.Fatalf("created = %#v, want true", got)
-	}
-}
-
-func TestDriveAddReplyExecuteWikiResolvesToDocx(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/wiki/v2/spaces/get_node",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"node": map[string]interface{}{
-					"obj_type":  "docx",
-					"obj_token": "docxFromWiki",
-				},
-			},
-		},
-	})
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/docxFromWiki/comments/comment_1/replies",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-id", "comment_1",
-		"--content", `[{"type":"text","text":"reply from wiki"}]`,
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	if got := mustStringField(t, data, "file_token", "data.file_token"); got != "docxFromWiki" {
-		t.Fatalf("file_token = %q, want docxFromWiki", got)
-	}
-	if got := mustStringField(t, data, "wiki_token", "data.wiki_token"); got != "wikiResource" {
-		t.Fatalf("wiki_token = %q, want wikiResource", got)
-	}
-	if _, ok := data["reply_id"]; ok {
-		t.Fatalf("reply_id should be omitted when the response carries none: %v", data)
-	}
-}
-
-func TestDriveAddReplyRejectsUnsupportedTargets(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/drive/folder/folderResource",
-		"--comment-id", "comment_1",
-		"--content", `[{"type":"text","text":"reply"}]`,
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), `unsupported --url resource type "folder"`) {
-		t.Fatalf("expected unsupported-type error, got %v", err)
-	}
-	assertDriveCommentValidationError(t, err, "--url")
-}
-
-func TestDriveAddReplyWikiResolvesToUnsupported(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/wiki/v2/spaces/get_node",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"node": map[string]interface{}{
-					"obj_type":  "mindnote",
-					"obj_token": "mindnoteFromWiki",
-				},
-			},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-id", "comment_1",
-		"--content", `[{"type":"text","text":"reply"}]`,
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), `wiki resolved to "mindnote", but comment reply only supports`) {
-		t.Fatalf("expected wiki-resolution error, got %v", err)
-	}
-	assertDriveCommentValidationError(t, err, "--url")
-}
-
-func TestExtractDriveCreatedReplyID(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name string
-		data map[string]interface{}
-		want string
-	}{
-		{name: "nil data", data: nil, want: ""},
-		{name: "top-level reply_id", data: map[string]interface{}{"reply_id": "r1"}, want: "r1"},
-		{name: "nested reply object", data: map[string]interface{}{"reply": map[string]interface{}{"reply_id": "r2"}}, want: "r2"},
-		{name: "nested reply without id falls through", data: map[string]interface{}{"reply": map[string]interface{}{}}, want: ""},
-		{
-			name: "reply_list wrapper",
-			data: map[string]interface{}{"reply_list": map[string]interface{}{"replies": []interface{}{
-				"not-a-map",
-				map[string]interface{}{"reply_id": ""},
-				map[string]interface{}{"reply_id": "r3"},
-			}}},
-			want: "r3",
-		},
-		{name: "reply_list without match", data: map[string]interface{}{"reply_list": map[string]interface{}{"replies": []interface{}{map[string]interface{}{}}}}, want: ""},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-			if got := extractDriveCreatedReplyID(tt.data); got != tt.want {
-				t.Fatalf("extractDriveCreatedReplyID() = %q, want %q", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestDriveAddReplyRejectsUnsafeCommentID(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "../admin",
-		"--content", `[{"type":"text","text":"reply"}]`,
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), "path traversal") {
-		t.Fatalf("expected comment-id validation error, got %v", err)
-	}
-	assertDriveCommentValidationError(t, err, "--comment-id")
-}
-
-func TestDriveAddReplyPropagatesAPIError(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/comment_1/replies",
-		Body: map[string]interface{}{
-			"code": 1069307,
-			"msg":  "comment not found",
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--content", `[{"type":"text","text":"reply"}]`,
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), "comment not found") {
-		t.Fatalf("expected API error to propagate, got %v", err)
-	}
-}
-
-func TestDriveAddReplyDryRunWiki(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-id", "comment_1",
-		"--content", `[{"type":"text","text":"reply"}]`,
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := dryRunDataMap(t, stdout.String())
-	api := mustSliceValue(t, out["api"], "data.api")
-	if len(api) != 2 {
-		t.Fatalf("dry-run api call count = %d, want 2\nstdout:\n%s", len(api), stdout.String())
-	}
-	step2 := mustMapValue(t, api[1], "api[1]")
-	if got := mustStringField(t, step2, "url", "api[1].url"); !strings.Contains(got, "/comments/comment_1/replies") {
-		t.Fatalf("api[1].url = %q, want replies URL with comment ID", got)
-	}
-}
-
-func TestDriveAddReplyInvalidContent(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--content", `not-json`,
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), "--content is not valid JSON") {
-		t.Fatalf("expected content JSON error, got %v", err)
-	}
-}
-
-func TestDriveAddReplyRejectsTooManyElements(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	elems := make([]string, 101)
-	for i := range elems {
-		elems[i] = `{"type":"text","text":"x"}`
-	}
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--content", "[" + strings.Join(elems, ",") + "]",
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), "caps content.elements at 100") {
-		t.Fatalf("expected 100-element cap error, got %v", err)
-	}
-	assertDriveCommentValidationError(t, err, "--content")
-}
-
-func TestDriveAddReplyAcceptsMaxElements(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	elems := make([]string, 100)
-	for i := range elems {
-		elems[i] = `{"type":"text","text":"x"}`
-	}
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--content", "[" + strings.Join(elems, ",") + "]",
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("100 elements should be accepted, got %v", err)
-	}
-}
-
-func TestDriveAddReplyDryRunDirect(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveAddReply, []string{
-		"+add-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--content", `[{"type":"text","text":"reply"}]`,
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := dryRunDataMap(t, stdout.String())
-	api := mustSliceValue(t, out["api"], "data.api")
-	if len(api) != 1 {
-		t.Fatalf("dry-run api call count = %d, want 1\nstdout:\n%s", len(api), stdout.String())
-	}
-	call := mustMapValue(t, api[0], "api[0]")
-	if got := mustStringField(t, call, "url", "api[0].url"); !strings.Contains(got, "/files/docxResource/comments/comment_1/replies") {
-		t.Fatalf("api[0].url = %q, want reply create URL with comment ID", got)
-	}
-	body := mustMapValue(t, call["body"], "api[0].body")
-	if _, ok := body["comment_id"]; ok {
-		t.Fatalf("api[0].body must not carry comment_id: %v", body)
-	}
-	content := mustMapValue(t, body["content"], "api[0].body.content")
-	if _, ok := content["elements"]; !ok {
-		t.Fatalf("api[0].body.content.elements missing: %v", body)
-	}
-}

shortcuts/drive/drive_apply_permission.go

@@ -6,7 +6,6 @@ package drive
 import (
 	"context"
 	"fmt"
-	"net/url"
 	"strings"
 
 	"github.com/larksuite/cli/errs"
@@ -14,137 +13,72 @@ import (
 	"github.com/larksuite/cli/shortcuts/common"
 )
 
-type permApplyResourceKind struct {
-	Type string
-	Path string
+// permApplyTypes is the authoritative list of type values the apply-permission
+// endpoint accepts for its required `type` query parameter.
+var permApplyTypes = []string{
+	"doc", "sheet", "file", "wiki", "bitable", "docx",
+	"mindnote", "slides",
 }
 
-// permApplyResourceKinds is the authoritative target contract for the
-// apply-permission endpoint: accepted types and their URL root paths.
-var permApplyResourceKinds = []permApplyResourceKind{
-	{Type: "doc", Path: "/doc/"},
-	{Type: "sheet", Path: "/sheets/"},
-	{Type: "file", Path: "/file/"},
-	{Type: "wiki", Path: "/wiki/"},
-	{Type: "bitable", Path: "/base/"},
-	{Type: "bitable", Path: "/bitable/"},
-	{Type: "docx", Path: "/docx/"},
-	{Type: "mindnote", Path: "/mindnote/"},
-	{Type: "slides", Path: "/slides/"},
-	{Type: "apps", Path: "/page/"},
-}
-
-var permApplyTypes = func() []string {
-	types := make([]string, 0, len(permApplyResourceKinds))
-	seen := make(map[string]struct{}, len(permApplyResourceKinds))
-	for _, resourceKind := range permApplyResourceKinds {
-		if _, ok := seen[resourceKind.Type]; ok {
-			continue
-		}
-		seen[resourceKind.Type] = struct{}{}
-		types = append(types, resourceKind.Type)
-	}
-	return types
-}()
-
-func permApplyTypeAllowed(docType string) bool {
-	for _, allowedType := range permApplyTypes {
-		if docType == allowedType {
-			return true
-		}
-	}
-	return false
+// permApplyURLMarkers maps document URL path markers to the `type` value the
+// apply-permission endpoint expects. Markers are disjoint strings (each begins
+// with "/" and ends with "/"), so a simple substring scan disambiguates them.
+var permApplyURLMarkers = []struct {
+	Marker string
+	Type   string
+}{
+	{"/wiki/", "wiki"},
+	{"/docx/", "docx"},
+	{"/sheets/", "sheet"},
+	{"/base/", "bitable"},
+	{"/bitable/", "bitable"},
+	{"/file/", "file"},
+	{"/mindnote/", "mindnote"},
+	{"/slides/", "slides"},
+	{"/doc/", "doc"},
 }
 
 // resolvePermApplyTarget extracts (token, type) from a user-supplied --token
 // value that may be either a bare token or a full document URL, plus an
-// optional explicit --type. A URL's path and explicit --type must agree.
+// optional explicit --type. Explicit --type wins over URL inference.
 func resolvePermApplyTarget(raw, explicitType string) (token, docType string, err error) {
 	raw = strings.TrimSpace(raw)
-	explicitType = strings.ToLower(strings.TrimSpace(explicitType))
 	if raw == "" {
 		return "", "", errs.NewValidationError(errs.SubtypeInvalidArgument, "--token is required").WithParam("--token")
 	}
-	if explicitType != "" && !permApplyTypeAllowed(explicitType) {
-		return "", "", errs.NewValidationError(
-			errs.SubtypeInvalidArgument,
-			"invalid --type %q: allowed values are %s",
-			explicitType,
-			strings.Join(permApplyTypes, ", "),
-		).WithParam("--type")
-	}
 
 	if strings.Contains(raw, "://") {
-		ref, ok := parsePermApplyResourceURL(raw)
-		if !ok {
+		for _, m := range permApplyURLMarkers {
+			if tok, ok := extractURLToken(raw, m.Marker); ok {
+				token = tok
+				if explicitType == "" {
+					docType = m.Type
+				}
+				break
+			}
+		}
+		if token == "" {
 			return "", "", errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"could not infer token from URL %q: supported paths are /docx/, /sheets/, /base/, /bitable/, /file/, /wiki/, /doc/, /mindnote/, /slides/, /page/. Pass a bare token with --type instead if the URL shape is unusual",
+				"could not infer token from URL %q: supported paths are /docx/, /sheets/, /base/, /bitable/, /file/, /wiki/, /doc/, /mindnote/, /slides/. Pass a bare token with --type instead if the URL shape is unusual",
 				raw,
 			).WithParam("--token")
 		}
-		token, docType = ref.Token, ref.Type
-		if explicitType != "" && explicitType != docType {
-			return "", "", errs.NewValidationError(
-				errs.SubtypeInvalidArgument,
-				"--type %q conflicts with URL path type %q; remove --type or use a matching value",
-				explicitType,
-				docType,
-			).WithParam("--type")
-		}
 	} else {
 		token = raw
-		docType = explicitType
 	}
 
+	if explicitType != "" {
+		docType = explicitType
+	}
 	if docType == "" {
 		return "", "", errs.NewValidationError(errs.SubtypeInvalidArgument,
 			"--type is required when --token is a bare token; accepted values: %s",
 			strings.Join(permApplyTypes, ", "),
 		).WithParam("--type")
 	}
-	if err := validatePermApplyToken(token); err != nil {
-		return "", "", err
-	}
 	return token, docType, nil
 }
 
-func parsePermApplyResourceURL(rawURL string) (common.ResourceRef, bool) {
-	parsed, err := url.Parse(rawURL)
-	if err != nil || parsed.Hostname() == "" || (parsed.Scheme != "http" && parsed.Scheme != "https") {
-		return common.ResourceRef{}, false
-	}
-
-	escapedPath := parsed.EscapedPath()
-	for _, resourceKind := range permApplyResourceKinds {
-		if !strings.HasPrefix(escapedPath, resourceKind.Path) {
-			continue
-		}
-		escapedToken := strings.TrimSuffix(strings.TrimPrefix(escapedPath, resourceKind.Path), "/")
-		if escapedToken == "" || strings.Contains(escapedToken, "/") {
-			return common.ResourceRef{}, false
-		}
-		token, err := url.PathUnescape(escapedToken)
-		if err != nil || token == "" {
-			return common.ResourceRef{}, false
-		}
-		return common.ResourceRef{Type: resourceKind.Type, Token: token}, true
-	}
-	return common.ResourceRef{}, false
-}
-
-func validatePermApplyToken(token string) error {
-	if err := validate.ResourceName(token, "--token"); err != nil {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument, "%s", err).WithParam("--token")
-	}
-	if token == "." || strings.Contains(token, "/") {
-		return errs.NewValidationError(
-			errs.SubtypeInvalidArgument,
-			"--token must be a non-dot single path segment",
-		).WithParam("--token")
-	}
-	return nil
-}
-
 // DriveApplyPermission applies to the document owner for view or edit access
 // on behalf of the invoking user. Matches the open-apis endpoint
 // /open-apis/drive/v1/permissions/:token/members/apply.
@@ -154,19 +88,16 @@ func validatePermApplyToken(token string) error {
 var DriveApplyPermission = common.Shortcut{
 	Service:     "drive",
 	Command:     "+apply-permission",
-	Description: "Apply to the owner for view or edit permission on a Drive resource",
+	Description: "Apply to the document owner for view or edit permission on a doc/sheet/file/wiki/bitable/docx/mindnote/slides",
 	Risk:        "write",
 	Scopes:      []string{"docs:permission.member:apply"},
 	AuthTypes:   []string{"user"},
 	Flags: []common.Flag{
-		{Name: "token", Desc: "target token or URL (docx/sheets/base/file/wiki/doc/mindnote/slides/page)", Required: true},
+		{Name: "token", Desc: "target token or document URL (docx/sheets/base/file/wiki/doc/mindnote/slides)", Required: true},
 		{Name: "type", Desc: "target type; auto-inferred from URL when omitted", Enum: permApplyTypes},
 		{Name: "perm", Desc: "permission to request", Required: true, Enum: []string{"view", "edit"}},
 		{Name: "remark", Desc: "optional note shown on the request card sent to the owner"},
 	},
-	Tips: []string{
-		"When --token is a URL, its path determines --type; a conflicting --type is rejected.",
-	},
 	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
 		_, _, err := resolvePermApplyTarget(runtime.Str("token"), runtime.Str("type"))
 		return err
@@ -178,7 +109,7 @@ var DriveApplyPermission = common.Shortcut{
 		}
 		body := buildPermApplyBody(runtime)
 		return common.NewDryRunAPI().
-			Desc("Apply to resource owner for access").
+			Desc("Apply to document owner for access").
 			POST("/open-apis/drive/v1/permissions/:token/members/apply").
 			Params(map[string]interface{}{"type": docType}).
 			Body(body).
@@ -200,7 +131,7 @@ var DriveApplyPermission = common.Shortcut{
 			body,
 		)
 		if err != nil {
-			return decoratePermApplyError(err)
+			return err
 		}
 		runtime.Out(data, nil)
 		return nil
@@ -217,34 +148,3 @@ func buildPermApplyBody(runtime *common.RuntimeContext) map[string]interface{} {
 	}
 	return body
 }
-
-func decoratePermApplyError(err error) error {
-	if err == nil {
-		return nil
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok {
-		return err
-	}
-	guidance := permApplyErrorGuidance(problem.Code)
-	if guidance == "" {
-		return err
-	}
-	if problem.Hint == "" {
-		problem.Hint = guidance
-	} else if !strings.Contains(problem.Hint, guidance) {
-		problem.Hint += "; " + guidance
-	}
-	return err
-}
-
-func permApplyErrorGuidance(code int) string {
-	switch code {
-	case 1063006:
-		return "permission-apply quota reached: each user may request access on the same document at most 5 times per day; wait for the daily quota to reset before retrying"
-	case 1063007:
-		return "this document does not accept a permission-apply request; verify the target and requested permission, or contact the owner directly"
-	default:
-		return ""
-	}
-}

shortcuts/drive/drive_apply_permission_test.go

@@ -5,11 +5,9 @@ package drive
 
 import (
 	"encoding/json"
-	"errors"
 	"strings"
 	"testing"
 
-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/cmdutil"
 	"github.com/larksuite/cli/internal/httpmock"
 )
@@ -35,18 +33,6 @@ func TestResolvePermApplyTarget_BareTokenWithType(t *testing.T) {
 	}
 }
 
-func TestResolvePermApplyTarget_BareTokenWithAppsType(t *testing.T) {
-	t.Parallel()
-
-	token, docType, err := resolvePermApplyTarget("appBareToken", "apps")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if token != "appBareToken" || docType != "apps" {
-		t.Fatalf("got token=%q type=%q, want appBareToken/apps", token, docType)
-	}
-}
-
 func TestResolvePermApplyTarget_URLInference(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
@@ -64,7 +50,6 @@ func TestResolvePermApplyTarget_URLInference(t *testing.T) {
 		{"legacy doc", "https://example.feishu.cn/doc/docTok333", "docTok333", "doc"},
 		{"mindnote", "https://example.feishu.cn/mindnote/mnTok444", "mnTok444", "mindnote"},
 		{"slides", "https://example.feishu.cn/slides/slTok666", "slTok666", "slides"},
-		{"apps page", "https://example.feishu.cn/page/appMetaTok/?from=share", "appMetaTok", "apps"},
 	}
 	for _, temp := range tests {
 		tt := temp
@@ -81,100 +66,15 @@ func TestResolvePermApplyTarget_URLInference(t *testing.T) {
 	}
 }
 
-func TestResolvePermApplyTarget_RejectsMalformedPageURL(t *testing.T) {
+func TestResolvePermApplyTarget_ExplicitTypeOverridesURL(t *testing.T) {
 	t.Parallel()
-
-	token, docType, err := resolvePermApplyTarget("https://example.feishu.cn/page/?from=share", "")
-	if err == nil || !strings.Contains(err.Error(), "could not infer token") {
-		t.Fatalf("expected page token inference error, got token=%q type=%q error=%v", token, docType, err)
+	// Even though the URL marker is /docx/, an explicit --type wins.
+	token, docType, err := resolvePermApplyTarget("https://example.feishu.cn/docx/doxTok123", "wiki")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
 	}
-}
-
-func TestResolvePermApplyTarget_RejectsAppsMarkerOutsidePath(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name string
-		raw  string
-	}{
-		{
-			name: "query",
-			raw:  "https://example.feishu.cn/share?redirect=/page/appMetaTok",
-		},
-		{
-			name: "fragment",
-			raw:  "https://example.feishu.cn/share#/page/appMetaTok",
-		},
-	}
-	for _, temp := range tests {
-		tt := temp
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			token, docType, err := resolvePermApplyTarget(tt.raw, "")
-			if err == nil {
-				t.Fatalf("expected URL path inference error, got token=%q type=%q", token, docType)
-			}
-			problem, ok := errs.ProblemOf(err)
-			if !ok {
-				t.Fatalf("ProblemOf(error) ok = false, error = %T %v", err, err)
-			}
-			if problem.Category != errs.CategoryValidation || problem.Subtype != errs.SubtypeInvalidArgument {
-				t.Fatalf("error category/subtype = %q/%q, want %q/%q",
-					problem.Category, problem.Subtype, errs.CategoryValidation, errs.SubtypeInvalidArgument)
-			}
-			var validationErr *errs.ValidationError
-			if !errors.As(err, &validationErr) {
-				t.Fatalf("error = %T, want *errs.ValidationError", err)
-			}
-			if validationErr.Param != "--token" {
-				t.Fatalf("error param = %q, want %q", validationErr.Param, "--token")
-			}
-		})
-	}
-}
-
-func TestResolvePermApplyTarget_RejectsConflictingURLType(t *testing.T) {
-	t.Parallel()
-	_, _, err := resolvePermApplyTarget("https://example.feishu.cn/docx/doxTok123", "wiki")
-	if err == nil || !strings.Contains(err.Error(), "conflicts with URL path type") {
-		t.Fatalf("expected URL type conflict error, got: %v", err)
-	}
-}
-
-func TestResolvePermApplyTarget_RejectsUnsafeOrAmbiguousTargets(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name  string
-		raw   string
-		type_ string
-	}{
-		{"bare traversal token", "..", "docx"},
-		{"bare dot token", ".", "docx"},
-		{"URL traversal token", "https://example.feishu.cn/docx/../victim", ""},
-		{"marker outside resource root", "https://example.feishu.cn/share/docx/doxUnexpected", ""},
-		{"encoded path separator", "https://example.feishu.cn/docx/doxTarget%2Fother", ""},
-		{"encoded query separator", "https://example.feishu.cn/docx/doxTarget%3Fother", ""},
-	}
-
-	for _, temp := range tests {
-		tt := temp
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			_, _, err := resolvePermApplyTarget(tt.raw, tt.type_)
-			if err == nil {
-				t.Fatalf("resolvePermApplyTarget(%q, %q) unexpectedly succeeded", tt.raw, tt.type_)
-			}
-			var validationErr *errs.ValidationError
-			if !errors.As(err, &validationErr) {
-				t.Fatalf("error = %T, want *errs.ValidationError", err)
-			}
-			if validationErr.Param != "--token" {
-				t.Fatalf("error param = %q, want --token", validationErr.Param)
-			}
-		})
+	if token != "doxTok123" || docType != "wiki" {
+		t.Fatalf("got (%q,%q), want (doxTok123,wiki)", token, docType)
 	}
 }
 
@@ -250,33 +150,6 @@ func TestDriveApplyPermission_DryRunInfersTypeFromURL(t *testing.T) {
 	}
 }
 
-func TestDriveApplyPermission_DryRunAcceptsAppsBareToken(t *testing.T) {
-	t.Parallel()
-
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveApplyPermission, []string{
-		"+apply-permission",
-		"--token", "appBareToken",
-		"--type", "apps",
-		"--perm", "edit",
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	out := stdout.String()
-	for _, want := range []string{
-		"/open-apis/drive/v1/permissions/appBareToken/members/apply",
-		`"apps"`,
-		`"edit"`,
-		`"appBareToken"`,
-	} {
-		if !strings.Contains(out, want) {
-			t.Fatalf("dry-run output missing %q:\n%s", want, out)
-		}
-	}
-}
-
 func TestDriveApplyPermission_ExecuteSuccess(t *testing.T) {
 	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
 	// Stub URL includes "?type=docx" — the stub only matches when the request
@@ -323,11 +196,6 @@ func TestDriveApplyPermission_ExecuteNotApplicableHint(t *testing.T) {
 		Status: 400,
 		Body: map[string]interface{}{
 			"code": 1063007, "msg": "request not applicable",
-			"error": map[string]interface{}{
-				"details": []interface{}{
-					map[string]interface{}{"value": "server says requests are disabled"},
-				},
-			},
 		},
 	})
 
@@ -344,18 +212,6 @@ func TestDriveApplyPermission_ExecuteNotApplicableHint(t *testing.T) {
 	if !strings.Contains(err.Error(), "not applicable") {
 		t.Fatalf("expected surfaced server message, got: %v", err)
 	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("ProblemOf(error) ok = false, error = %T %v", err, err)
-	}
-	if problem.Category != errs.CategoryAPI || problem.Subtype != errs.SubtypeInvalidParameters || problem.Code != 1063007 {
-		t.Fatalf("problem = %+v, want api/invalid_parameters code 1063007", problem)
-	}
-	for _, want := range []string{"server says requests are disabled", "does not accept a permission-apply request", "contact the owner"} {
-		if !strings.Contains(problem.Hint, want) {
-			t.Fatalf("hint missing %q: %q", want, problem.Hint)
-		}
-	}
 }
 
 func TestDriveApplyPermission_ExecuteRateLimitHint(t *testing.T) {
@@ -379,17 +235,4 @@ func TestDriveApplyPermission_ExecuteRateLimitHint(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected error for 1063006")
 	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("ProblemOf(error) ok = false, error = %T %v", err, err)
-	}
-	if problem.Category != errs.CategoryAPI || problem.Subtype != errs.SubtypeRateLimit || problem.Code != 1063006 {
-		t.Fatalf("problem = %+v, want api/rate_limit code 1063006", problem)
-	}
-	if problem.Retryable {
-		t.Fatalf("problem.Retryable = true, want false for the daily per-document quota")
-	}
-	if !strings.Contains(problem.Hint, "at most 5 times per day") {
-		t.Fatalf("hint missing daily quota guidance: %q", problem.Hint)
-	}
 }

shortcuts/drive/drive_batch_query_comments.go

@@ -1,175 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package drive
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// driveBatchQueryCommentsMaxIDs mirrors the server-side cap on comment_ids
-// per batch_query call.
-const driveBatchQueryCommentsMaxIDs = 100
-
-var driveBatchQueryCommentsOp = driveCommentOp{
-	Label: "comments batch query",
-	Types: []string{"doc", "docx", "sheet", "file", "slides", "bitable", "apps"},
-}
-
-type driveBatchQueryCommentsSpec struct {
-	Ref          driveCommentRef
-	CommentIDs   []string
-	NeedReaction bool
-	NeedRelation bool
-}
-
-// RequestBody assembles the batch_query body for the resolved fileType.
-// need_relation is absent from the platform metadata for this endpoint but
-// honored live (same undocumented parameter +list-comments already uses);
-// only docx returns relation data, so it is sent for docx targets only.
-func (s driveBatchQueryCommentsSpec) RequestBody(fileType string) map[string]interface{} {
-	body := map[string]interface{}{
-		"comment_ids": s.CommentIDs,
-	}
-	if s.NeedReaction {
-		body["need_reaction"] = true
-	}
-	if s.NeedRelation && fileType == "docx" {
-		body["need_relation"] = true
-	}
-	return body
-}
-
-// DriveBatchQueryComments fetches comments by ID through the Drive comment
-// batch_query API, while accepting Wiki URLs/tokens and resolving them to the
-// underlying object.
-var DriveBatchQueryComments = common.Shortcut{
-	Service:           "drive",
-	Command:           "+batch-query-comments",
-	Description:       "Batch get comments by comment ID for doc/docx/sheet/file/slides/base(bitable)/apps, with URL parsing and Wiki token unwrapping",
-	Risk:              "read",
-	Scopes:            []string{"docs:document.comment:read"},
-	ConditionalScopes: []string{"wiki:node:read"},
-	AuthTypes:         []string{"user", "bot"},
-	Flags: append(driveCommentTargetFlags(driveBatchQueryCommentsOp),
-		common.Flag{Name: "comment-ids", Type: "string_slice", Desc: fmt.Sprintf("comment IDs to fetch (comma-separated or repeated flag, max %d)", driveBatchQueryCommentsMaxIDs), Required: true},
-		common.Flag{Name: "need-reaction", Type: "bool", Desc: "include reaction data on comment cards"},
-		common.Flag{Name: "need-relation", Type: "bool", Desc: "include docx comment relation data; ignored for non-docx targets"},
-	),
-	Tips: []string{
-		"Comment IDs come from `drive +list-comments` (items[].comment_id).",
-		"--comment-ids accepts comma-separated values and repeated flags, up to 100 IDs per call.",
-		"--need-relation returns the docx comment anchor (items[].relation with the block position); see the lark-drive comment-location guide.",
-		"Wiki URLs/tokens are resolved to the underlying document automatically.",
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		_, err := readDriveBatchQueryCommentsSpec(runtime)
-		return err
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		spec, err := readDriveBatchQueryCommentsSpec(runtime)
-		if err != nil {
-			return common.NewDryRunAPI().Set("error", err.Error())
-		}
-		return buildDriveBatchQueryCommentsDryRun(spec)
-	},
-	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		spec, err := readDriveBatchQueryCommentsSpec(runtime)
-		if err != nil {
-			return err
-		}
-
-		target, err := resolveDriveCommentTarget(ctx, runtime, driveBatchQueryCommentsOp, spec.Ref)
-		if err != nil {
-			return err
-		}
-
-		fmt.Fprintf(runtime.IO().ErrOut, "Batch querying %d comment(s) in %s...\n", len(spec.CommentIDs), common.MaskToken(target.FileToken))
-		path := fmt.Sprintf("/open-apis/drive/v1/files/%s/comments/batch_query", validate.EncodePathSegment(target.FileToken))
-		data, err := runtime.CallAPITyped(
-			"POST",
-			path,
-			map[string]interface{}{"file_type": target.FileType},
-			spec.RequestBody(target.FileType),
-		)
-		if err != nil {
-			return err
-		}
-
-		items := driveCommentItems(data)
-		runtime.Out(driveCommentTargetOutput(target, map[string]interface{}{
-			"items": items,
-			"count": len(items),
-		}), nil)
-		return nil
-	},
-}
-
-func readDriveBatchQueryCommentsSpec(runtime *common.RuntimeContext) (driveBatchQueryCommentsSpec, error) {
-	ref, err := resolveDriveCommentInput(driveBatchQueryCommentsOp, runtime.Str("url"), runtime.Str("token"), runtime.Str("type"))
-	if err != nil {
-		return driveBatchQueryCommentsSpec{}, err
-	}
-	ids, err := normalizeDriveCommentIDs(runtime.StrSlice("comment-ids"))
-	if err != nil {
-		return driveBatchQueryCommentsSpec{}, err
-	}
-	return driveBatchQueryCommentsSpec{
-		Ref:          ref,
-		CommentIDs:   ids,
-		NeedReaction: runtime.Bool("need-reaction"),
-		NeedRelation: runtime.Bool("need-relation"),
-	}, nil
-}
-
-func normalizeDriveCommentIDs(raw []string) ([]string, error) {
-	ids := make([]string, 0, len(raw))
-	for i, id := range raw {
-		id = strings.TrimSpace(id)
-		if id == "" {
-			return nil, errs.NewValidationError(errs.SubtypeInvalidArgument, "--comment-ids element #%d is empty", i+1).WithParam("--comment-ids")
-		}
-		ids = append(ids, id)
-	}
-	if len(ids) == 0 {
-		return nil, errs.NewValidationError(errs.SubtypeInvalidArgument, "--comment-ids must contain at least one comment ID").WithParam("--comment-ids")
-	}
-	if len(ids) > driveBatchQueryCommentsMaxIDs {
-		return nil, errs.NewValidationError(errs.SubtypeInvalidArgument, "--comment-ids accepts at most %d comment IDs per call (got %d)", driveBatchQueryCommentsMaxIDs, len(ids)).WithParam("--comment-ids")
-	}
-	return ids, nil
-}
-
-func buildDriveBatchQueryCommentsDryRun(spec driveBatchQueryCommentsSpec) *common.DryRunAPI {
-	if spec.Ref.Type == "wiki" {
-		// The wiki obj_type is unknown until step 1 resolves, so RequestBody
-		// cannot decide the docx-only need_relation gate here; surface it as a
-		// placeholder the same way +list-comments does.
-		body := spec.RequestBody("<obj_type from step 1>")
-		if spec.NeedRelation {
-			body["need_relation"] = "<sent only when obj_type is docx>"
-		}
-		return common.NewDryRunAPI().
-			Desc("2-step orchestration: resolve wiki -> batch query comments").
-			GET("/open-apis/wiki/v2/spaces/get_node").
-			Desc("[1] Resolve wiki node to underlying document").
-			Params(map[string]interface{}{"token": spec.Ref.Token}).
-			POST("/open-apis/drive/v1/files/<obj_token from step 1>/comments/batch_query").
-			Desc("[2] Batch query comments on resolved document").
-			Params(map[string]interface{}{"file_type": "<obj_type from step 1>"}).
-			Body(body)
-	}
-
-	return common.NewDryRunAPI().
-		Desc("1-step request: batch query comments").
-		POST("/open-apis/drive/v1/files/:file_token/comments/batch_query").
-		Params(map[string]interface{}{"file_type": spec.Ref.Type}).
-		Body(spec.RequestBody(spec.Ref.Type)).
-		Set("file_token", spec.Ref.Token)
-}

shortcuts/drive/drive_batch_query_comments_test.go

@@ -1,560 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package drive
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-func TestNormalizeDriveCommentIDs(t *testing.T) {
-	t.Parallel()
-
-	got, err := normalizeDriveCommentIDs([]string{" c1 ", "c2"})
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if len(got) != 2 || got[0] != "c1" || got[1] != "c2" {
-		t.Fatalf("normalizeDriveCommentIDs = %v, want [c1 c2]", got)
-	}
-
-	if _, err := normalizeDriveCommentIDs(nil); err == nil || !strings.Contains(err.Error(), "at least one") {
-		t.Fatalf("expected at-least-one error, got %v", err)
-	}
-	if _, err := normalizeDriveCommentIDs([]string{"c1", "  "}); err == nil || !strings.Contains(err.Error(), "element #2 is empty") {
-		t.Fatalf("expected empty-element error, got %v", err)
-	}
-
-	tooMany := make([]string, driveBatchQueryCommentsMaxIDs+1)
-	for i := range tooMany {
-		tooMany[i] = fmt.Sprintf("c%d", i)
-	}
-	_, err = normalizeDriveCommentIDs(tooMany)
-	if err == nil || !strings.Contains(err.Error(), "at most 100") {
-		t.Fatalf("expected max-IDs error, got %v", err)
-	}
-	assertDriveCommentValidationError(t, err, "--comment-ids")
-}
-
-func TestDriveBatchQueryCommentsExecuteDocx(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/batch_query",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("file_type"); got != "docx" {
-				t.Errorf("file_type = %q, want docx", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"items": []map[string]interface{}{
-					{"comment_id": "comment_1", "is_solved": false},
-					{"comment_id": "comment_2", "is_solved": true},
-				},
-			},
-		},
-	}
-	reg.Register(stub)
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-ids", "comment_1,comment_2",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var body map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &body); err != nil {
-		t.Fatalf("failed to decode captured request body: %v", err)
-	}
-	ids := mustSliceValue(t, body["comment_ids"], "request.comment_ids")
-	if len(ids) != 2 || ids[0] != "comment_1" || ids[1] != "comment_2" {
-		t.Fatalf("request comment_ids = %v, want [comment_1 comment_2]", ids)
-	}
-	if _, ok := body["need_reaction"]; ok {
-		t.Fatalf("request should omit need_reaction by default: %v", body)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	if got := mustStringField(t, data, "file_token", "data.file_token"); got != "docxResource" {
-		t.Fatalf("file_token = %q, want docxResource", got)
-	}
-	if got := mustStringField(t, data, "file_type", "data.file_type"); got != "docx" {
-		t.Fatalf("file_type = %q, want docx", got)
-	}
-	if got := data["count"]; got != float64(2) {
-		t.Fatalf("count = %#v, want 2", got)
-	}
-	if _, ok := data["wiki_token"]; ok {
-		t.Fatalf("wiki_token should be omitted for direct targets: %v", data)
-	}
-}
-
-func TestDriveBatchQueryCommentsExecuteWikiWithReaction(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/wiki/v2/spaces/get_node",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("token"); got != "wikiResource" {
-				t.Errorf("wiki token = %q, want wikiResource", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"node": map[string]interface{}{
-					"obj_type":  "sheet",
-					"obj_token": "sheetFromWiki",
-				},
-			},
-		},
-	})
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/sheetFromWiki/comments/batch_query",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("file_type"); got != "sheet" {
-				t.Errorf("file_type = %q, want sheet", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"items": []map[string]interface{}{{"comment_id": "comment_1"}},
-			},
-		},
-	}
-	reg.Register(stub)
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--token", "wikiResource",
-		"--type", "wiki",
-		"--comment-ids", "comment_1",
-		"--need-reaction",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var body map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &body); err != nil {
-		t.Fatalf("failed to decode captured request body: %v", err)
-	}
-	if got := body["need_reaction"]; got != true {
-		t.Fatalf("request need_reaction = %#v, want true", got)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	if got := mustStringField(t, data, "file_token", "data.file_token"); got != "sheetFromWiki" {
-		t.Fatalf("file_token = %q, want sheetFromWiki", got)
-	}
-	if got := mustStringField(t, data, "file_type", "data.file_type"); got != "sheet" {
-		t.Fatalf("file_type = %q, want sheet", got)
-	}
-	if got := mustStringField(t, data, "wiki_token", "data.wiki_token"); got != "wikiResource" {
-		t.Fatalf("wiki_token = %q, want wikiResource", got)
-	}
-}
-
-func TestDriveBatchQueryCommentsExecuteAppsPageURL(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/appsPageResource/comments/batch_query",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("file_type"); got != "apps" {
-				t.Errorf("file_type = %q, want apps", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"items": []map[string]interface{}{{"comment_id": "comment_1"}},
-			},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.feishu.cn/page/appsPageResource/",
-		"--comment-ids", "comment_1",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	if got := mustStringField(t, data, "file_type", "data.file_type"); got != "apps" {
-		t.Fatalf("file_type = %q, want apps", got)
-	}
-	if got := mustStringField(t, data, "file_token", "data.file_token"); got != "appsPageResource" {
-		t.Fatalf("file_token = %q, want appsPageResource", got)
-	}
-}
-
-func TestDriveBatchQueryCommentsExecuteBaseURL(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/baseResource/comments/batch_query",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("file_type"); got != "bitable" {
-				t.Errorf("file_type = %q, want bitable", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"items": []map[string]interface{}{{"comment_id": "comment_1"}},
-			},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/base/baseResource",
-		"--comment-ids", "comment_1",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	if got := mustStringField(t, data, "file_type", "data.file_type"); got != "bitable" {
-		t.Fatalf("file_type = %q, want bitable", got)
-	}
-}
-
-func TestDriveBatchQueryCommentsWikiResolvesToUnsupported(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/wiki/v2/spaces/get_node",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"node": map[string]interface{}{
-					"obj_type":  "mindnote",
-					"obj_token": "mindnoteToken",
-				},
-			},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-ids", "comment_1",
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), `wiki resolved to "mindnote"`) {
-		t.Fatalf("expected wiki-resolution error, got %v", err)
-	}
-	assertDriveCommentValidationError(t, err, "--url")
-}
-
-func TestDriveBatchQueryCommentsExecuteBaseAliasType(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/baseToken/comments/batch_query",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("file_type"); got != "bitable" {
-				t.Errorf("file_type = %q, want bitable (base alias normalized)", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{"items": []map[string]interface{}{}},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--token", "baseToken",
-		"--type", "base",
-		"--comment-ids", "comment_1",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestDriveBatchQueryCommentsValidation(t *testing.T) {
-	tests := []struct {
-		name      string
-		args      []string
-		wantErr   string
-		wantParam string
-	}{
-		{
-			name: "url and token mutually exclusive",
-			args: []string{
-				"+batch-query-comments",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--token", "docxResource",
-				"--comment-ids", "comment_1",
-			},
-			wantErr:   "mutually exclusive",
-			wantParam: "--url",
-		},
-		{
-			name: "blank comment id element",
-			args: []string{
-				"+batch-query-comments",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--comment-ids", " ",
-			},
-			wantErr:   "element #1 is empty",
-			wantParam: "--comment-ids",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-			err := mountAndRunDrive(t, DriveBatchQueryComments, append(tt.args, "--as", "user"), f, stdout)
-			if err == nil || !strings.Contains(err.Error(), tt.wantErr) {
-				t.Fatalf("expected error containing %q, got %v", tt.wantErr, err)
-			}
-			assertDriveCommentValidationError(t, err, tt.wantParam)
-		})
-	}
-}
-
-func TestDriveBatchQueryCommentsPropagatesAPIError(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/batch_query",
-		Body: map[string]interface{}{
-			"code": 1069307,
-			"msg":  "comment not found",
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-ids", "comment_404",
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), "comment not found") {
-		t.Fatalf("expected API error to propagate, got %v", err)
-	}
-}
-
-func TestDriveBatchQueryCommentsDryRunDirect(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-ids", "comment_1,comment_2",
-		"--need-reaction",
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := dryRunDataMap(t, stdout.String())
-	api := mustSliceValue(t, out["api"], "data.api")
-	if len(api) != 1 {
-		t.Fatalf("dry-run api call count = %d, want 1\nstdout:\n%s", len(api), stdout.String())
-	}
-	call := mustMapValue(t, api[0], "api[0]")
-	if got := mustStringField(t, call, "url", "api[0].url"); !strings.Contains(got, "/files/docxResource/comments/batch_query") {
-		t.Fatalf("api[0].url = %q, want resolved batch_query URL", got)
-	}
-	body := mustMapValue(t, call["body"], "api[0].body")
-	if got := body["need_reaction"]; got != true {
-		t.Fatalf("api[0].body.need_reaction = %#v, want true", got)
-	}
-}
-
-func TestDriveBatchQueryCommentsDryRunWiki(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-ids", "comment_1",
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := dryRunDataMap(t, stdout.String())
-	api := mustSliceValue(t, out["api"], "data.api")
-	if len(api) != 2 {
-		t.Fatalf("dry-run api call count = %d, want 2\nstdout:\n%s", len(api), stdout.String())
-	}
-	step1 := mustMapValue(t, api[0], "api[0]")
-	if got := mustStringField(t, step1, "url", "api[0].url"); !strings.Contains(got, "/wiki/v2/spaces/get_node") {
-		t.Fatalf("api[0].url = %q, want wiki get_node", got)
-	}
-	step2 := mustMapValue(t, api[1], "api[1]")
-	if got := mustStringField(t, step2, "method", "api[1].method"); got != "POST" {
-		t.Fatalf("api[1].method = %q, want POST", got)
-	}
-	body := mustMapValue(t, step2["body"], "api[1].body")
-	ids := mustSliceValue(t, body["comment_ids"], "api[1].body.comment_ids")
-	if len(ids) != 1 || ids[0] != "comment_1" {
-		t.Fatalf("api[1].body.comment_ids = %v, want [comment_1]", ids)
-	}
-}
-
-func TestDriveBatchQueryCommentsDryRunWikiNeedRelation(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-ids", "comment_1",
-		"--need-relation",
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := dryRunDataMap(t, stdout.String())
-	api := mustSliceValue(t, out["api"], "data.api")
-	if len(api) != 2 {
-		t.Fatalf("dry-run api call count = %d, want 2\nstdout:\n%s", len(api), stdout.String())
-	}
-	step2 := mustMapValue(t, api[1], "api[1]")
-	body := mustMapValue(t, step2["body"], "api[1].body")
-	if got := body["need_relation"]; got != "<sent only when obj_type is docx>" {
-		t.Fatalf("api[1].body.need_relation = %#v, want conditional placeholder", got)
-	}
-}
-
-func TestDriveBatchQueryCommentsOmittedItemsNormalized(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/batch_query",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-ids", "comment_1",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	items, ok := data["items"].([]interface{})
-	if !ok {
-		t.Fatalf("items must be a JSON array even when the server omits it, got %#v", data["items"])
-	}
-	if len(items) != 0 {
-		t.Fatalf("len(items) = %d, want 0", len(items))
-	}
-	if got := data["count"]; got != float64(0) {
-		t.Fatalf("count = %#v, want 0", got)
-	}
-}
-
-func TestDriveBatchQueryCommentsNeedRelationDocx(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/batch_query",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{"items": []interface{}{}},
-		},
-	}
-	reg.Register(stub)
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-ids", "comment_1",
-		"--need-relation",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var body map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &body); err != nil {
-		t.Fatalf("failed to decode captured request body: %v", err)
-	}
-	if got := body["need_relation"]; got != true {
-		t.Fatalf("request need_relation = %#v, want true", got)
-	}
-}
-
-func TestDriveBatchQueryCommentsNeedRelationIgnoredForNonDocx(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/files/sheetResource/comments/batch_query",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{"items": []interface{}{}},
-		},
-	}
-	reg.Register(stub)
-
-	err := mountAndRunDrive(t, DriveBatchQueryComments, []string{
-		"+batch-query-comments",
-		"--url", "https://example.larksuite.com/sheets/sheetResource",
-		"--comment-ids", "comment_1",
-		"--need-relation",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var body map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &body); err != nil {
-		t.Fatalf("failed to decode captured request body: %v", err)
-	}
-	if _, ok := body["need_relation"]; ok {
-		t.Fatalf("need_relation must be omitted for non-docx targets: %v", body)
-	}
-}

shortcuts/drive/drive_comment_common.go

@@ -1,246 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package drive
-
-import (
-	"context"
-	"fmt"
-	"slices"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// driveCommentOp describes one comment-family shortcut for the shared
-// --url/--token/--type input resolution. Label appears in error messages;
-// Types lists the wire file_type values the underlying endpoint accepts.
-// Wiki URLs/tokens are always accepted as input and unwrapped to the
-// underlying document, which must then land in Types.
-type driveCommentOp struct {
-	Label string
-	Types []string
-}
-
-func (op driveCommentOp) supports(fileType string) bool {
-	return slices.Contains(op.Types, fileType)
-}
-
-// inputTypeList renders the values accepted as input (wire types plus wiki).
-func (op driveCommentOp) inputTypeList() string {
-	return strings.Join(op.flagEnum(), ", ")
-}
-
-// targetTypeList renders the wire types the endpoint accepts (wiki excluded).
-func (op driveCommentOp) targetTypeList() string {
-	return strings.Join(op.Types, ", ")
-}
-
-// flagEnum returns the Enum set for the --type flag: the endpoint's wire
-// types plus wiki (resolved to a wire type before the API call) and the
-// base product-name alias when bitable is supported (normalized to bitable).
-func (op driveCommentOp) flagEnum() []string {
-	enum := make([]string, 0, len(op.Types)+2)
-	for _, t := range op.Types {
-		enum = append(enum, t)
-		if t == "bitable" {
-			enum = append(enum, "base")
-		}
-	}
-	return append(enum, "wiki")
-}
-
-// driveCommentRef is the parsed --url/--token/--type input before wiki unwrapping.
-type driveCommentRef struct {
-	Token      string
-	Type       string
-	SourceFlag string
-}
-
-// driveCommentTarget is the underlying document a comment API call targets.
-type driveCommentTarget struct {
-	FileToken string
-	FileType  string
-	WikiToken string // non-empty when the input was a wiki node
-}
-
-// driveCommentTargetFlags returns the shared --url/--token/--type flag trio
-// used by the comment-family shortcuts that resolve a document target.
-func driveCommentTargetFlags(op driveCommentOp) []common.Flag {
-	return []common.Flag{
-		{Name: "url", Desc: fmt.Sprintf("recommended: Lark/Feishu document URL (%s); Wiki URLs are unwrapped automatically", op.inputTypeList())},
-		{Name: "token", Desc: "document token, Wiki token, or document URL; bare tokens require --type"},
-		{Name: "type", Desc: "document type for bare --token; optional for URLs but must match the URL type when provided", Enum: op.flagEnum()},
-	}
-}
-
-// resolveDriveCommentInput parses --url/--token/--type into a driveCommentRef,
-// mirroring +list-comments input handling: --url and --token are mutually
-// exclusive, URLs are parsed for type+token, bare tokens require --type, and
-// wiki is always accepted for later unwrapping.
-func resolveDriveCommentInput(op driveCommentOp, urlInput, tokenInput, explicitType string) (driveCommentRef, error) {
-	urlInput = strings.TrimSpace(urlInput)
-	tokenInput = strings.TrimSpace(tokenInput)
-	if urlInput != "" && tokenInput != "" {
-		return driveCommentRef{}, errs.NewValidationError(errs.SubtypeInvalidArgument, "--url and --token are mutually exclusive; pass one input only").WithParam("--url")
-	}
-	if urlInput == "" && tokenInput == "" {
-		return driveCommentRef{}, errs.NewValidationError(errs.SubtypeInvalidArgument, "specify --url or --token").WithParam("--url")
-	}
-
-	raw := urlInput
-	sourceFlag := "--url"
-	if raw == "" {
-		raw = tokenInput
-		sourceFlag = "--token"
-	}
-	inputType := normalizeDriveCommentType(strings.ToLower(strings.TrimSpace(explicitType)))
-
-	if ref, ok := common.ParseResourceURL(raw); ok {
-		refType := normalizeDriveCommentType(ref.Type)
-		if inputType != "" && inputType != refType {
-			return driveCommentRef{}, errs.NewValidationError(
-				errs.SubtypeInvalidArgument,
-				"--type %q conflicts with URL path type %q; remove --type or use a matching value",
-				inputType,
-				refType,
-			).WithParam("--type")
-		}
-		if refType != "wiki" && !op.supports(refType) {
-			return driveCommentRef{}, errs.NewValidationError(
-				errs.SubtypeInvalidArgument,
-				"unsupported %s resource type %q; %s supports %s",
-				sourceFlag,
-				refType,
-				op.Label,
-				op.inputTypeList(),
-			).WithParam(sourceFlag)
-		}
-		return driveCommentRef{Token: ref.Token, Type: refType, SourceFlag: sourceFlag}, nil
-	}
-
-	if token, ok := parseDriveListCommentsAppsURL(raw); ok {
-		const refType = "apps"
-		if inputType != "" && inputType != refType {
-			return driveCommentRef{}, errs.NewValidationError(
-				errs.SubtypeInvalidArgument,
-				"--type %q conflicts with URL path type %q; remove --type or use a matching value",
-				inputType,
-				refType,
-			).WithParam("--type")
-		}
-		if !op.supports(refType) {
-			return driveCommentRef{}, errs.NewValidationError(
-				errs.SubtypeInvalidArgument,
-				"unsupported %s resource type %q; %s supports %s",
-				sourceFlag,
-				refType,
-				op.Label,
-				op.inputTypeList(),
-			).WithParam(sourceFlag)
-		}
-		return driveCommentRef{Token: token, Type: refType, SourceFlag: sourceFlag}, nil
-	}
-
-	if strings.Contains(raw, "://") {
-		return driveCommentRef{}, errs.NewValidationError(errs.SubtypeInvalidArgument, "unsupported %s URL %q: use a recognized Lark document URL or pass a bare token with --type", sourceFlag, raw).WithParam(sourceFlag)
-	}
-	if strings.ContainsAny(raw, "/?#") {
-		return driveCommentRef{}, errs.NewValidationError(errs.SubtypeInvalidArgument, "invalid bare token %q: remove path/query fragments or pass a recognized Lark document URL", raw).WithParam(sourceFlag)
-	}
-	if inputType == "" {
-		return driveCommentRef{}, errs.NewValidationError(errs.SubtypeInvalidArgument, "--type is required when %s is a bare token (allowed: %s)", sourceFlag, op.inputTypeList()).WithParam("--type")
-	}
-	if inputType != "wiki" && !op.supports(inputType) {
-		return driveCommentRef{}, errs.NewValidationError(errs.SubtypeInvalidArgument, "invalid --type %q; allowed: %s", inputType, op.inputTypeList()).WithParam("--type")
-	}
-	return driveCommentRef{Token: raw, Type: inputType, SourceFlag: sourceFlag}, nil
-}
-
-// normalizeDriveCommentType maps compatibility aliases to wire values
-// (base → bitable) so type checks and error messages use one vocabulary.
-func normalizeDriveCommentType(docType string) string {
-	switch strings.TrimSpace(docType) {
-	case "base":
-		return "bitable"
-	default:
-		return strings.TrimSpace(docType)
-	}
-}
-
-// resolveDriveCommentTarget unwraps wiki refs to the underlying document via
-// wiki get_node and validates the resolved type against op.Types.
-func resolveDriveCommentTarget(ctx context.Context, runtime *common.RuntimeContext, op driveCommentOp, ref driveCommentRef) (driveCommentTarget, error) {
-	if ref.Type != "wiki" {
-		return driveCommentTarget{FileToken: ref.Token, FileType: ref.Type}, nil
-	}
-
-	fmt.Fprintf(runtime.IO().ErrOut, "Resolving wiki node: %s\n", common.MaskToken(ref.Token))
-	data, err := runtime.CallAPITyped(
-		"GET",
-		"/open-apis/wiki/v2/spaces/get_node",
-		map[string]interface{}{"token": ref.Token},
-		nil,
-	)
-	if err != nil {
-		return driveCommentTarget{}, err
-	}
-
-	node := common.GetMap(data, "node")
-	objType := normalizeDriveCommentType(common.GetString(node, "obj_type"))
-	objToken := common.GetString(node, "obj_token")
-	if objType == "" || objToken == "" {
-		return driveCommentTarget{}, errs.NewInternalError(errs.SubtypeInvalidResponse, "wiki get_node returned incomplete node data")
-	}
-	if objType == "wiki" || !op.supports(objType) {
-		return driveCommentTarget{}, errs.NewValidationError(
-			errs.SubtypeInvalidArgument,
-			"wiki resolved to %q, but %s only supports %s",
-			objType,
-			op.Label,
-			op.targetTypeList(),
-		).WithParam(ref.SourceFlag)
-	}
-	fmt.Fprintf(runtime.IO().ErrOut, "Resolved wiki to %s: %s\n", objType, common.MaskToken(objToken))
-	return driveCommentTarget{FileToken: objToken, FileType: objType, WikiToken: ref.Token}, nil
-}
-
-// validateDriveCommentPathID validates a comment/reply identifier destined
-// for a URL path segment.
-func validateDriveCommentPathID(value, flagName string) error {
-	if strings.TrimSpace(value) == "" {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument, "%s must not be empty", flagName).WithParam(flagName)
-	}
-	if err := validate.ResourceName(strings.TrimSpace(value), flagName); err != nil {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument, "%s", err).WithParam(flagName)
-	}
-	return nil
-}
-
-// driveCommentItems extracts data.items for output, normalizing a missing or
-// null field to an empty slice: emitting the server's shape verbatim would
-// surface "items": null, which breaks jq consumers iterating .data.items[].
-func driveCommentItems(data map[string]interface{}) []interface{} {
-	if items := common.GetSlice(data, "items"); items != nil {
-		return items
-	}
-	return []interface{}{}
-}
-
-// driveCommentTargetOutput assembles the output fields shared by the
-// comment-family shortcuts: the resolved target plus the wiki origin, if any.
-func driveCommentTargetOutput(target driveCommentTarget, extra map[string]interface{}) map[string]interface{} {
-	out := map[string]interface{}{
-		"file_token": target.FileToken,
-		"file_type":  target.FileType,
-	}
-	if target.WikiToken != "" {
-		out["wiki_token"] = target.WikiToken
-	}
-	for key, value := range extra {
-		out[key] = value
-	}
-	return out
-}

shortcuts/drive/drive_comment_common_test.go

@@ -1,268 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package drive
-
-import (
-	"errors"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-)
-
-func assertDriveCommentValidationError(t *testing.T, err error, wantParam string) {
-	t.Helper()
-
-	var validationErr *errs.ValidationError
-	if !errors.As(err, &validationErr) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", err, err)
-	}
-	if validationErr.Subtype != errs.SubtypeInvalidArgument {
-		t.Fatalf("subtype = %q, want %q", validationErr.Subtype, errs.SubtypeInvalidArgument)
-	}
-	if validationErr.Param != wantParam {
-		t.Fatalf("param = %q, want %q", validationErr.Param, wantParam)
-	}
-}
-
-// assertDriveCommentAPIError asserts the error kept the typed API contract:
-// CallAPITyped errors must reach the caller unchanged, message-only checks
-// would still pass if a refactor wrapped them into untyped errors.
-func assertDriveCommentAPIError(t *testing.T, err error, wantCode int) {
-	t.Helper()
-
-	problem, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed error, got %T: %v", err, err)
-	}
-	if problem.Category != errs.CategoryAPI {
-		t.Fatalf("category = %q, want %q", problem.Category, errs.CategoryAPI)
-	}
-	if problem.Subtype == "" {
-		t.Fatalf("subtype is empty, want populated")
-	}
-	if problem.Code != wantCode {
-		t.Fatalf("code = %d, want %d", problem.Code, wantCode)
-	}
-}
-
-func TestResolveDriveCommentInput(t *testing.T) {
-	t.Parallel()
-
-	op := driveCommentOp{Label: "comments batch query", Types: []string{"doc", "docx", "sheet", "file", "slides"}}
-	docOnlyOp := driveCommentOp{Label: "comment reply", Types: []string{"doc", "docx"}}
-
-	tests := []struct {
-		name      string
-		op        driveCommentOp
-		urlInput  string
-		rawInput  string
-		docType   string
-		wantToken string
-		wantType  string
-		wantErr   string
-		wantParam string
-	}{
-		{
-			name:      "url docx",
-			op:        op,
-			urlInput:  "https://example.larksuite.com/docx/docxResource?from=wiki",
-			wantToken: "docxResource",
-			wantType:  "docx",
-		},
-		{
-			name:      "url wiki always accepted",
-			op:        docOnlyOp,
-			urlInput:  "https://example.larksuite.com/wiki/wikiResource",
-			wantToken: "wikiResource",
-			wantType:  "wiki",
-		},
-		{
-			name:      "token flag also accepts url",
-			op:        op,
-			rawInput:  "https://example.larksuite.com/sheets/sheetResource",
-			wantToken: "sheetResource",
-			wantType:  "sheet",
-		},
-		{
-			name:      "bare token with type",
-			op:        op,
-			rawInput:  "docxResource",
-			docType:   "docx",
-			wantToken: "docxResource",
-			wantType:  "docx",
-		},
-		{
-			name:      "bare wiki token",
-			op:        docOnlyOp,
-			rawInput:  "wikiResource",
-			docType:   "wiki",
-			wantToken: "wikiResource",
-			wantType:  "wiki",
-		},
-		{
-			name:      "url and token mutually exclusive",
-			op:        op,
-			urlInput:  "https://example.larksuite.com/docx/docxResource",
-			rawInput:  "docxResource",
-			wantErr:   "mutually exclusive",
-			wantParam: "--url",
-		},
-		{
-			name:      "missing input",
-			op:        op,
-			wantErr:   "specify --url or --token",
-			wantParam: "--url",
-		},
-		{
-			name:      "bare token needs type",
-			op:        op,
-			rawInput:  "docxResource",
-			wantErr:   "--type is required",
-			wantParam: "--type",
-		},
-		{
-			name:      "type conflicts with url",
-			op:        op,
-			urlInput:  "https://example.larksuite.com/wiki/wikiResource",
-			docType:   "docx",
-			wantErr:   "conflicts",
-			wantParam: "--type",
-		},
-		{
-			name:      "unsupported url type",
-			op:        op,
-			urlInput:  "https://example.larksuite.com/drive/folder/folderResource",
-			wantErr:   "unsupported --url resource type",
-			wantParam: "--url",
-		},
-		{
-			name:      "unsupported url type for doc-only op",
-			op:        docOnlyOp,
-			urlInput:  "https://example.larksuite.com/sheets/sheetResource",
-			wantErr:   "comment reply supports doc, docx, wiki",
-			wantParam: "--url",
-		},
-		{
-			name:      "apps page url",
-			op:        driveCommentOp{Label: "comments batch query", Types: []string{"doc", "docx", "apps"}},
-			urlInput:  "https://example.feishu.cn/page/appsPageResource/",
-			wantToken: "appsPageResource",
-			wantType:  "apps",
-		},
-		{
-			name:      "apps page url rejected by op without apps",
-			op:        docOnlyOp,
-			urlInput:  "https://example.feishu.cn/page/appsPageResource",
-			wantErr:   `unsupported --url resource type "apps"`,
-			wantParam: "--url",
-		},
-		{
-			name:      "apps page url conflicts with explicit type",
-			op:        driveCommentOp{Label: "comments batch query", Types: []string{"doc", "docx", "apps"}},
-			urlInput:  "https://example.feishu.cn/page/appsPageResource",
-			docType:   "docx",
-			wantErr:   "conflicts",
-			wantParam: "--type",
-		},
-		{
-			name:      "base alias normalized in error",
-			op:        op,
-			urlInput:  "https://example.larksuite.com/base/baseResource",
-			wantErr:   `unsupported --url resource type "bitable"`,
-			wantParam: "--url",
-		},
-		{
-			name:      "unrecognized url",
-			op:        op,
-			urlInput:  "https://example.com/unknown/path",
-			wantErr:   "unsupported --url URL",
-			wantParam: "--url",
-		},
-		{
-			name:      "bare token with path fragments",
-			op:        op,
-			rawInput:  "abc/def",
-			docType:   "docx",
-			wantErr:   "invalid bare token",
-			wantParam: "--token",
-		},
-		{
-			name:      "invalid explicit type",
-			op:        docOnlyOp,
-			rawInput:  "sheetResource",
-			docType:   "sheet",
-			wantErr:   "invalid --type",
-			wantParam: "--type",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			got, err := resolveDriveCommentInput(tt.op, tt.urlInput, tt.rawInput, tt.docType)
-			if tt.wantErr != "" {
-				if err == nil || !strings.Contains(err.Error(), tt.wantErr) {
-					t.Fatalf("expected error containing %q, got %v", tt.wantErr, err)
-				}
-				assertDriveCommentValidationError(t, err, tt.wantParam)
-				return
-			}
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-			if got.Token != tt.wantToken || got.Type != tt.wantType {
-				t.Fatalf("got (%q, %q), want (%q, %q)", got.Token, got.Type, tt.wantToken, tt.wantType)
-			}
-		})
-	}
-}
-
-func TestValidateDriveCommentPathID(t *testing.T) {
-	t.Parallel()
-
-	if err := validateDriveCommentPathID("7457000000000000001", "--comment-id"); err != nil {
-		t.Fatalf("unexpected error for valid ID: %v", err)
-	}
-
-	tests := []struct {
-		name    string
-		value   string
-		wantErr string
-	}{
-		{name: "empty", value: "   ", wantErr: "must not be empty"},
-		{name: "path traversal", value: "../admin", wantErr: "path traversal"},
-		{name: "url metacharacters", value: "abc?x=1", wantErr: "invalid characters"},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			err := validateDriveCommentPathID(tt.value, "--comment-id")
-			if err == nil || !strings.Contains(err.Error(), tt.wantErr) {
-				t.Fatalf("expected error containing %q, got %v", tt.wantErr, err)
-			}
-			assertDriveCommentValidationError(t, err, "--comment-id")
-		})
-	}
-}
-
-func TestDriveCommentOpTypeHelpers(t *testing.T) {
-	t.Parallel()
-
-	op := driveCommentOp{Label: "comment reply", Types: []string{"doc", "docx"}}
-	if got := op.inputTypeList(); got != "doc, docx, wiki" {
-		t.Fatalf("inputTypeList() = %q, want %q", got, "doc, docx, wiki")
-	}
-	if got := op.targetTypeList(); got != "doc, docx" {
-		t.Fatalf("targetTypeList() = %q, want %q", got, "doc, docx")
-	}
-	if got := op.flagEnum(); len(got) != 3 || got[2] != "wiki" {
-		t.Fatalf("flagEnum() = %v, want types plus trailing wiki", got)
-	}
-	if !op.supports("docx") || op.supports("sheet") || op.supports("wiki") {
-		t.Fatalf("supports() misclassified: docx=%v sheet=%v wiki=%v", op.supports("docx"), op.supports("sheet"), op.supports("wiki"))
-	}
-}

shortcuts/drive/drive_delete_reply.go

@@ -1,134 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package drive
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-var driveDeleteReplyOp = driveCommentOp{
-	Label: "reply delete",
-	Types: []string{"doc", "docx", "sheet", "file", "slides", "bitable", "apps"},
-}
-
-type driveDeleteReplySpec struct {
-	Ref       driveCommentRef
-	CommentID string
-	ReplyID   string
-}
-
-// DriveDeleteReply deletes a reply of a comment through the Drive comment
-// reply delete API, while accepting Wiki URLs/tokens and resolving them to
-// the underlying object.
-var DriveDeleteReply = common.Shortcut{
-	Service:           "drive",
-	Command:           "+delete-reply",
-	Description:       "Delete a reply of a comment on doc/docx/sheet/file/slides/base(bitable)/apps, with URL parsing and Wiki token unwrapping",
-	Risk:              "high-risk-write",
-	Scopes:            []string{"docs:document.comment:write_only"},
-	ConditionalScopes: []string{"wiki:node:read"},
-	AuthTypes:         []string{"user", "bot"},
-	Flags: append(driveCommentTargetFlags(driveDeleteReplyOp),
-		common.Flag{Name: "comment-id", Desc: "comment ID the reply belongs to (from drive +list-comments)", Required: true},
-		common.Flag{Name: "reply-id", Desc: "reply ID to delete (from drive +list-comments items[].reply_list.replies[].reply_id)", Required: true},
-	),
-	Tips: []string{
-		"Reply IDs come from `drive +list-comments` (items[].reply_list.replies[].reply_id).",
-		"Deletion is permanent; there is no undo or trash for comment replies.",
-		"Wiki URLs/tokens are resolved to the underlying document automatically.",
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		_, err := readDriveDeleteReplySpec(runtime)
-		return err
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		spec, err := readDriveDeleteReplySpec(runtime)
-		if err != nil {
-			return common.NewDryRunAPI().Set("error", err.Error())
-		}
-		return buildDriveDeleteReplyDryRun(spec)
-	},
-	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		spec, err := readDriveDeleteReplySpec(runtime)
-		if err != nil {
-			return err
-		}
-
-		target, err := resolveDriveCommentTarget(ctx, runtime, driveDeleteReplyOp, spec.Ref)
-		if err != nil {
-			return err
-		}
-
-		fmt.Fprintf(runtime.IO().ErrOut, "Deleting reply %s of comment %s in %s...\n", spec.ReplyID, spec.CommentID, common.MaskToken(target.FileToken))
-		path := fmt.Sprintf(
-			"/open-apis/drive/v1/files/%s/comments/%s/replies/%s",
-			validate.EncodePathSegment(target.FileToken),
-			validate.EncodePathSegment(spec.CommentID),
-			validate.EncodePathSegment(spec.ReplyID),
-		)
-		if _, err := runtime.CallAPITyped(
-			"DELETE",
-			path,
-			map[string]interface{}{"file_type": target.FileType},
-			nil,
-		); err != nil {
-			return err
-		}
-
-		runtime.Out(driveCommentTargetOutput(target, map[string]interface{}{
-			"comment_id": spec.CommentID,
-			"reply_id":   spec.ReplyID,
-			"deleted":    true,
-		}), nil)
-		return nil
-	},
-}
-
-func readDriveDeleteReplySpec(runtime *common.RuntimeContext) (driveDeleteReplySpec, error) {
-	ref, err := resolveDriveCommentInput(driveDeleteReplyOp, runtime.Str("url"), runtime.Str("token"), runtime.Str("type"))
-	if err != nil {
-		return driveDeleteReplySpec{}, err
-	}
-	commentID := strings.TrimSpace(runtime.Str("comment-id"))
-	if err := validateDriveCommentPathID(commentID, "--comment-id"); err != nil {
-		return driveDeleteReplySpec{}, err
-	}
-	replyID := strings.TrimSpace(runtime.Str("reply-id"))
-	if err := validateDriveCommentPathID(replyID, "--reply-id"); err != nil {
-		return driveDeleteReplySpec{}, err
-	}
-	return driveDeleteReplySpec{
-		Ref:       ref,
-		CommentID: commentID,
-		ReplyID:   replyID,
-	}, nil
-}
-
-func buildDriveDeleteReplyDryRun(spec driveDeleteReplySpec) *common.DryRunAPI {
-	if spec.Ref.Type == "wiki" {
-		return common.NewDryRunAPI().
-			Desc("2-step orchestration: resolve wiki -> delete reply").
-			GET("/open-apis/wiki/v2/spaces/get_node").
-			Desc("[1] Resolve wiki node to underlying document").
-			Params(map[string]interface{}{"token": spec.Ref.Token}).
-			DELETE("/open-apis/drive/v1/files/<obj_token from step 1>/comments/:comment_id/replies/:reply_id").
-			Desc("[2] Delete reply on resolved document").
-			Params(map[string]interface{}{"file_type": "<obj_type from step 1>"}).
-			Set("comment_id", spec.CommentID).
-			Set("reply_id", spec.ReplyID)
-	}
-
-	return common.NewDryRunAPI().
-		Desc("1-step request: delete reply").
-		DELETE("/open-apis/drive/v1/files/:file_token/comments/:comment_id/replies/:reply_id").
-		Params(map[string]interface{}{"file_type": spec.Ref.Type}).
-		Set("file_token", spec.Ref.Token).
-		Set("comment_id", spec.CommentID).
-		Set("reply_id", spec.ReplyID)
-}

shortcuts/drive/drive_delete_reply_test.go

@@ -1,279 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package drive
-
-import (
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-func TestDriveDeleteReplyExecuteDocx(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "DELETE",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/comment_1/replies/reply_2",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("file_type"); got != "docx" {
-				t.Errorf("file_type = %q, want docx", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveDeleteReply, []string{
-		"+delete-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--reply-id", "reply_2",
-		"--yes",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	if got := mustStringField(t, data, "comment_id", "data.comment_id"); got != "comment_1" {
-		t.Fatalf("comment_id = %q, want comment_1", got)
-	}
-	if got := mustStringField(t, data, "reply_id", "data.reply_id"); got != "reply_2" {
-		t.Fatalf("reply_id = %q, want reply_2", got)
-	}
-	if got := data["deleted"]; got != true {
-		t.Fatalf("deleted = %#v, want true", got)
-	}
-}
-
-func TestDriveDeleteReplyExecuteViaWiki(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/wiki/v2/spaces/get_node",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"node": map[string]interface{}{
-					"obj_type":  "file",
-					"obj_token": "fileFromWiki",
-				},
-			},
-		},
-	})
-	reg.Register(&httpmock.Stub{
-		Method: "DELETE",
-		URL:    "/open-apis/drive/v1/files/fileFromWiki/comments/comment_1/replies/reply_2",
-		OnMatch: func(req *http.Request) {
-			if got := req.URL.Query().Get("file_type"); got != "file" {
-				t.Errorf("file_type = %q, want file", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveDeleteReply, []string{
-		"+delete-reply",
-		"--token", "wikiResource",
-		"--type", "wiki",
-		"--comment-id", "comment_1",
-		"--reply-id", "reply_2",
-		"--yes",
-		"--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := decodeJSONMap(t, stdout.String())
-	data := mustMapValue(t, out["data"], "data")
-	if got := mustStringField(t, data, "file_type", "data.file_type"); got != "file" {
-		t.Fatalf("file_type = %q, want file", got)
-	}
-	if got := mustStringField(t, data, "wiki_token", "data.wiki_token"); got != "wikiResource" {
-		t.Fatalf("wiki_token = %q, want wikiResource", got)
-	}
-}
-
-func TestDriveDeleteReplyValidation(t *testing.T) {
-	tests := []struct {
-		name      string
-		args      []string
-		wantErr   string
-		wantParam string
-	}{
-		{
-			name: "unsafe reply id",
-			args: []string{
-				"+delete-reply",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--comment-id", "comment_1",
-				"--reply-id", "../reply",
-			},
-			wantErr:   "path traversal",
-			wantParam: "--reply-id",
-		},
-		{
-			name: "empty reply id",
-			args: []string{
-				"+delete-reply",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--comment-id", "comment_1",
-				"--reply-id", " ",
-			},
-			wantErr:   "--reply-id must not be empty",
-			wantParam: "--reply-id",
-		},
-		{
-			name: "unsafe comment id",
-			args: []string{
-				"+delete-reply",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--comment-id", "../admin",
-				"--reply-id", "reply_2",
-			},
-			wantErr:   "path traversal",
-			wantParam: "--comment-id",
-		},
-		{
-			name: "unsupported url type",
-			args: []string{
-				"+delete-reply",
-				"--url", "https://example.larksuite.com/drive/folder/folderResource",
-				"--comment-id", "comment_1",
-				"--reply-id", "reply_2",
-			},
-			wantErr:   "reply delete supports doc, docx, sheet, file, slides, bitable, base, apps, wiki",
-			wantParam: "--url",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-			err := mountAndRunDrive(t, DriveDeleteReply, append(tt.args, "--as", "user"), f, stdout)
-			if err == nil || !strings.Contains(err.Error(), tt.wantErr) {
-				t.Fatalf("expected error containing %q, got %v", tt.wantErr, err)
-			}
-			assertDriveCommentValidationError(t, err, tt.wantParam)
-		})
-	}
-}
-
-func TestDriveDeleteReplyPropagatesAPIError(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "DELETE",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/comment_1/replies/reply_2",
-		Body: map[string]interface{}{
-			"code": 1069307,
-			"msg":  "reply not found",
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveDeleteReply, []string{
-		"+delete-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--reply-id", "reply_2",
-		"--yes",
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), "reply not found") {
-		t.Fatalf("expected API error to propagate, got %v", err)
-	}
-}
-
-func TestDriveDeleteReplyWikiNodeIncompleteResponse(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/wiki/v2/spaces/get_node",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"node": map[string]interface{}{"obj_type": "docx"},
-			},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveDeleteReply, []string{
-		"+delete-reply",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-id", "comment_1",
-		"--reply-id", "reply_2",
-		"--yes",
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), "incomplete node data") {
-		t.Fatalf("expected incomplete-node error, got %v", err)
-	}
-}
-
-func TestDriveDeleteReplyDryRunDirect(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveDeleteReply, []string{
-		"+delete-reply",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--reply-id", "reply_2",
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := dryRunDataMap(t, stdout.String())
-	api := mustSliceValue(t, out["api"], "data.api")
-	if len(api) != 1 {
-		t.Fatalf("dry-run api call count = %d, want 1\nstdout:\n%s", len(api), stdout.String())
-	}
-	call := mustMapValue(t, api[0], "api[0]")
-	if got := mustStringField(t, call, "method", "api[0].method"); got != "DELETE" {
-		t.Fatalf("api[0].method = %q, want DELETE", got)
-	}
-	if got := mustStringField(t, call, "url", "api[0].url"); !strings.Contains(got, "/files/docxResource/comments/comment_1/replies/reply_2") {
-		t.Fatalf("api[0].url = %q, want resolved path segments", got)
-	}
-}
-
-func TestDriveDeleteReplyDryRunWiki(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveDeleteReply, []string{
-		"+delete-reply",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-id", "comment_1",
-		"--reply-id", "reply_2",
-		"--dry-run", "--as", "user",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	out := dryRunDataMap(t, stdout.String())
-	api := mustSliceValue(t, out["api"], "data.api")
-	if len(api) != 2 {
-		t.Fatalf("dry-run api call count = %d, want 2\nstdout:\n%s", len(api), stdout.String())
-	}
-	step2 := mustMapValue(t, api[1], "api[1]")
-	if got := mustStringField(t, step2, "method", "api[1].method"); got != "DELETE" {
-		t.Fatalf("api[1].method = %q, want DELETE", got)
-	}
-	if got := mustStringField(t, step2, "url", "api[1].url"); !strings.Contains(got, "/comments/comment_1/replies/reply_2") {
-		t.Fatalf("api[1].url = %q, want resolved comment and reply IDs", got)
-	}
-}