fix(slides): reindent xml-get output with a stdlib-only formatter

Reland of #1987 (reverted in #2013 over the BSD attribution gap of
github.com/beevik/etree) with the formatter rebuilt on the Go standard
library only — no third-party dependency.

encoding/xml serves purely as a tokenizer; the output is assembled
exclusively from verbatim byte slices of the server content plus
indentation inserted between structural elements. Nothing is
parsed-and-reserialized, so CDATA sections, whitespace character
references in any spelling, entity lexical forms, attribute quoting,
and in-tag whitespace survive byte-for-byte — the character-reference
masking machinery of the etree implementation is no longer needed.

Behavior is unchanged from the reverted PR: --raw stdout and --output
files are reindented (never inside the schema's mixed-content
text-bearing elements), the default JSON envelope carries the server's
XML verbatim without parsing, and formatting failures fall back to the
original content with a stderr warning and pretty_printed: false in
--output file metadata. All contract tests carry over unweakened; a
differential probe against the etree implementation over 53 inputs was
byte-identical except six cases where the new formatter preserves the
original bytes more faithfully (each pinned in tests).

.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

.github/workflows/semantic-review.yml

@@ -25,16 +25,19 @@ jobs:
         with:
           script: |
             const run = context.payload.workflow_run;
-            const workflowId = Number(run.workflow_id || 0);
-            if (!Number.isInteger(workflowId) || workflowId <= 0) throw new Error("missing workflow id");
-            const { data: workflow } = await github.rest.actions.getWorkflow({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: workflowId,
-            });
-            if (workflow.name !== "CI") throw new Error(`unexpected workflow name: ${workflow.name}`);
-            if (workflow.path !== ".github/workflows/ci.yml") throw new Error(`unexpected workflow path: ${workflow.path}`);
-            if (run.path && run.path !== workflow.path) throw new Error(`workflow path mismatch: ${run.path}`);
+            if (run.name !== "CI") throw new Error(`unexpected workflow name: ${run.name}`);
+            let workflowPath = run.path || "";
+            if (!workflowPath) {
+              const workflowId = Number(run.workflow_id || 0);
+              if (!Number.isInteger(workflowId) || workflowId <= 0) throw new Error("missing workflow id");
+              const { data: workflow } = await github.rest.actions.getWorkflow({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                workflow_id: workflowId,
+              });
+              workflowPath = workflow.path || "";
+            }
+            if (workflowPath !== ".github/workflows/ci.yml") throw new Error(`unexpected workflow path: ${workflowPath}`);
             if (run.event !== "pull_request") throw new Error(`unexpected event: ${run.event}`);
             if (run.repository.id !== context.payload.repository.id) throw new Error("repository id mismatch");
             if (run.repository.full_name !== context.payload.repository.full_name) throw new Error("repository name mismatch");
@@ -250,16 +253,19 @@ jobs:
         with:
           script: |
             const run = context.payload.workflow_run;
-            const workflowId = Number(run.workflow_id || 0);
-            if (!Number.isInteger(workflowId) || workflowId <= 0) throw new Error("missing workflow id");
-            const { data: workflow } = await github.rest.actions.getWorkflow({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: workflowId,
-            });
-            if (workflow.name !== "CI") throw new Error(`unexpected workflow name: ${workflow.name}`);
-            if (workflow.path !== ".github/workflows/ci.yml") throw new Error(`unexpected workflow path: ${workflow.path}`);
-            if (run.path && run.path !== workflow.path) throw new Error(`workflow path mismatch: ${run.path}`);
+            if (run.name !== "CI") throw new Error(`unexpected workflow name: ${run.name}`);
+            let workflowPath = run.path || "";
+            if (!workflowPath) {
+              const workflowId = Number(run.workflow_id || 0);
+              if (!Number.isInteger(workflowId) || workflowId <= 0) throw new Error("missing workflow id");
+              const { data: workflow } = await github.rest.actions.getWorkflow({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                workflow_id: workflowId,
+              });
+              workflowPath = workflow.path || "";
+            }
+            if (workflowPath !== ".github/workflows/ci.yml") throw new Error(`unexpected workflow path: ${workflowPath}`);
             if (run.event !== "pull_request") throw new Error(`unexpected event: ${run.event}`);
             if (run.conclusion !== "success") throw new Error(`unexpected conclusion: ${run.conclusion}`);
             if (run.repository.id !== context.payload.repository.id) throw new Error("repository id mismatch");

CHANGELOG.md

@@ -2,90 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## [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
-
-- event description support rich text (#1975)
-
-### Bug Fixes
-
-- **slides**: restrict canvas overflow checks
-- **slides**: upgrade text overflow to error above 10px threshold
-- **slides**: detect letterSpacing-driven text overflow
-- **slides**: downgrade background-decoration text overflow to info
-- **slides**: allow chartParsedValues roundtrip tag
-- refine character width estimation for lark-slides text lint
-- **slides**: preserve info lint severity
-- **slides**: text may over flow shape
-- exempt ghost text from slides lint
-
-## [v1.0.77] - 2026-07-24
-
-### Features
-
-- introducing official card icon (#1973)
-- **apps**: validate +file-list --page-size against server (0, 200] range (#2007)
-- **apps**: support absolute and relative upload paths (#2005)
-- **slides**: fill xml-schema-quick-ref gaps that forced XSD fallback (#2026)
-- **slides**: add layout density lint for sparse/empty containers (#2022)
-- add risk-control protection (#1910)
-
-### Bug Fixes
-
-- **slides**: normalize presentation flag aliases (#2032)
-- **base**: classify +form-submit as high-risk-write (#1969)
-- **slides**: declare screenshot scope
-- **slides**: support CSV multi-value for --slide-id in screenshot (#2047)
-
-### Documentation
-
-- **skill**: clarify scope handling for query expansion (#2030)
-- **base**: clarify complete and partial updates (#1993)
-- **skills**: clarify callout child rules (#2048)
-
-### Misc
-
-- fix/task id handling (#2023)
-- fix/task search pagination (#2041)
-
 ## [v1.0.75] - 2026-07-22
 
 ### Features
@@ -1722,10 +1638,6 @@ Bundled AI agent skills for intelligent assistance:
 - Bilingual documentation (English & Chinese).
 - CI/CD pipelines: linting, testing, coverage reporting, and automated releases.
 
-[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
 [v1.0.74]: https://github.com/larksuite/cli/releases/tag/v1.0.74
 [v1.0.73]: https://github.com/larksuite/cli/releases/tag/v1.0.73

README.md

@@ -285,29 +285,6 @@ To reduce these risks, the tool enables default security protections at multiple
 
 We recommend using the Lark/Feishu bot integrated with this tool as a private conversational assistant. Do not add it to group chats or allow other users to interact with it, to avoid abuse of permissions or data leakage.
 
-To reduce the security risks associated with access token theft, the CLI sends a minimal set of risk-control signals with OpenAPI requests made to exact official Feishu/Lark HTTPS domains. These signals are used to help identify anomalous API activity. This protection is enabled by default. The information sent is limited to:
-
-- Operating system type: macOS, Windows, or Linux
-- Device hardware model: for example, Mac17,9
-
-To disable this protection for the current workspace, run:
-
-```bash
-lark-cli config risk-control off
-```
-
-To enable this protection for the current workspace, run:
-
-```bash
-lark-cli config risk-control on
-```
-
-To restore the default policy for the current workspace, run:
-
-```bash
-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

README.zh.md

@@ -286,29 +286,6 @@ lark-cli schema im.messages.delete
 
 我们建议您将对接本工具的飞书机器人作为私人对话助手使用，请勿将其拉入群聊或允许其他用户与其交互，以避免权限被滥用或数据泄露。
 
-为降低访问令牌被盗用后的安全风险，CLI 在向飞书/Lark 官方 HTTPS 精确域名发起 OpenAPI 请求时，会随请求发送一组最小化的风控信号，用于辅助识别异常调用行为。该保护默认开启，发送的信息仅包括：
-
-- 操作系统类型：macOS、Windows 或 Linux
-- 设备的硬件产品型号：例如 Mac17,9
-
-如需让当前 workspace 退出该保护，可执行以下命令：
-
-```bash
-lark-cli config risk-control off
-```
-
-如需开启当前 workspace 的保护，可执行以下命令：
-
-```bash
-lark-cli config risk-control on
-```
-
-恢复当前 workspace 默认策略可执行：
-
-```bash
-lark-cli config risk-control default
-```
-
 请您充分知悉全部使用风险，使用本工具即视为您自愿承担相关所有责任。
 
 ## Star History

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/config.go

@@ -31,7 +31,6 @@ func NewCmdConfig(f *cmdutil.Factory) *cobra.Command {
 	cmd.AddCommand(NewCmdConfigShow(f, nil))
 	cmd.AddCommand(NewCmdConfigDefaultAs(f))
 	cmd.AddCommand(NewCmdConfigStrictMode(f))
-	cmd.AddCommand(NewCmdConfigRiskControl(f))
 	cmd.AddCommand(NewCmdConfigPolicy(f))
 	cmd.AddCommand(NewCmdConfigPlugins(f))
 	cmd.AddCommand(NewCmdConfigKeychainDowngrade(f))

cmd/config/risk_control.go

@@ -1,80 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package config
-
-import (
-	"fmt"
-
-	"github.com/spf13/cobra"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/core"
-)
-
-// NewCmdConfigRiskControl creates the workspace risk-control policy command.
-func NewCmdConfigRiskControl(f *cmdutil.Factory) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "risk-control [on|off|default]",
-		Short: "Manage workspace account-protection policy",
-		Long: `View or set the account-protection risk-control policy for this workspace.
-
-Account protection is on by default. Use off to opt this workspace out, on to
-opt it back in explicitly, or default to remove the explicit preference.`,
-		Args: cobra.MaximumNArgs(1),
-		// This is persistent workspace policy, not credential management.
-		PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
-			cmd.SilenceUsage = true
-			return nil
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			config, err := core.LoadOrNotConfigured()
-			if err != nil {
-				return err
-			}
-			if len(args) == 0 {
-				printRiskControl(f, config)
-				return nil
-			}
-
-			switch args[0] {
-			case "on":
-				enabled := true
-				config.RiskControl = &enabled
-			case "off":
-				enabled := false
-				config.RiskControl = &enabled
-			case "default":
-				config.RiskControl = nil
-			default:
-				return errs.NewValidationError(errs.SubtypeInvalidArgument,
-					"invalid risk-control value %q, valid values: on | off | default", args[0])
-			}
-
-			if err := core.SaveMultiAppConfig(config); err != nil {
-				return errs.NewInternalError(errs.SubtypeStorage,
-					"failed to save risk-control policy: %v", err).WithCause(err)
-			}
-			fmt.Fprintf(f.IOStreams.ErrOut, "Risk control set to %s (workspace)\n", args[0])
-			return nil
-		},
-	}
-	cmdutil.SetRisk(cmd, cmdutil.RiskWrite)
-	return cmd
-}
-
-func printRiskControl(f *cmdutil.Factory, config *core.MultiAppConfig) {
-	source := "default"
-	if config.RiskControl != nil {
-		source = "workspace"
-	}
-	fmt.Fprintf(f.IOStreams.Out, "risk-control: %s (source: %s)\n", riskControlState(config.RiskControlEnabled()), source)
-}
-
-func riskControlState(enabled bool) string {
-	if enabled {
-		return "on"
-	}
-	return "off"
-}

cmd/config/risk_control_test.go

@@ -1,130 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package config
-
-import (
-	"errors"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/core"
-)
-
-func TestRiskControlWorkspacePolicy(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	config := &core.MultiAppConfig{Apps: []core.AppConfig{{
-		AppId: "cli_test", AppSecret: core.PlainSecret("secret"), Brand: core.BrandFeishu,
-	}}}
-	if err := core.SaveMultiAppConfig(config); err != nil {
-		t.Fatal(err)
-	}
-
-	f, stdout, stderr, _ := cmdutil.TestFactory(t, nil)
-	cmd := NewCmdConfigRiskControl(f)
-	cmd.SetArgs([]string{"off"})
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("set off: %v", err)
-	}
-	loaded, err := core.LoadMultiAppConfig()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if loaded.RiskControl == nil || *loaded.RiskControl {
-		t.Fatalf("RiskControl = %v, want explicit false", loaded.RiskControl)
-	}
-	if !strings.Contains(stderr.String(), "set to off") {
-		t.Fatalf("stderr = %q", stderr.String())
-	}
-
-	stdout.Reset()
-	cmd = NewCmdConfigRiskControl(f)
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("show: %v", err)
-	}
-	if got := stdout.String(); got != "risk-control: off (source: workspace)\n" {
-		t.Fatalf("stdout = %q", got)
-	}
-
-	cmd = NewCmdConfigRiskControl(f)
-	cmd.SetArgs([]string{"on"})
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("set on: %v", err)
-	}
-	loaded, err = core.LoadMultiAppConfig()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if loaded.RiskControl == nil || !*loaded.RiskControl {
-		t.Fatalf("RiskControl = %v, want explicit true", loaded.RiskControl)
-	}
-
-	cmd = NewCmdConfigRiskControl(f)
-	cmd.SetArgs([]string{"default"})
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("reset default: %v", err)
-	}
-	loaded, err = core.LoadMultiAppConfig()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if loaded.RiskControl != nil {
-		t.Fatalf("RiskControl = %v, want nil", loaded.RiskControl)
-	}
-
-	stdout.Reset()
-	cmd = NewCmdConfigRiskControl(f)
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("show default: %v", err)
-	}
-	if got := stdout.String(); got != "risk-control: on (source: default)\n" {
-		t.Fatalf("stdout = %q", got)
-	}
-}
-
-func TestRiskControlWorkspacePolicyRejectsInvalidValue(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-	if err := core.SaveMultiAppConfig(&core.MultiAppConfig{Apps: []core.AppConfig{{
-		AppId: "cli_test", AppSecret: core.PlainSecret("secret"), Brand: core.BrandFeishu,
-	}}}); err != nil {
-		t.Fatal(err)
-	}
-
-	f, _, _, _ := cmdutil.TestFactory(t, nil)
-	cmd := NewCmdConfigRiskControl(f)
-	cmd.SetArgs([]string{"invalid"})
-	err := cmd.Execute()
-	var validationErr *errs.ValidationError
-	if !errors.As(err, &validationErr) {
-		t.Fatalf("error = %T %v, want *errs.ValidationError", err, err)
-	}
-	if validationErr.Subtype != errs.SubtypeInvalidArgument {
-		t.Fatalf("subtype = %q, want %q", validationErr.Subtype, errs.SubtypeInvalidArgument)
-	}
-}
-
-func TestRiskControlWorkspacePolicyAllowedWithExternalCredentials(t *testing.T) {
-	f := newConfigFactoryWithExternalProvider(t)
-	config := &core.MultiAppConfig{Apps: []core.AppConfig{{
-		AppId: "cli_test", AppSecret: core.PlainSecret("secret"), Brand: core.BrandFeishu,
-	}}}
-	if err := core.SaveMultiAppConfig(config); err != nil {
-		t.Fatal(err)
-	}
-
-	cmd := NewCmdConfig(f)
-	cmd.SetArgs([]string{"risk-control", "off"})
-	if err := cmd.Execute(); err != nil {
-		t.Fatalf("set off with external credentials: %v", err)
-	}
-
-	loaded, err := core.LoadMultiAppConfig()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if loaded.RiskControl == nil || *loaded.RiskControl {
-		t.Fatalf("RiskControl = %v, want explicit false", loaded.RiskControl)
-	}
-}

internal/cmdutil/factory_default.go

@@ -22,7 +22,6 @@ import (
 	"github.com/larksuite/cli/internal/credential"
 	"github.com/larksuite/cli/internal/keychain"
 	"github.com/larksuite/cli/internal/registry"
-	"github.com/larksuite/cli/internal/riskcontrol"
 	_ "github.com/larksuite/cli/internal/security/contentsafety" // register content safety provider
 	"github.com/larksuite/cli/internal/transport"
 	_ "github.com/larksuite/cli/internal/vfs/localfileio" // register default FileIO provider
@@ -34,7 +33,7 @@ import (
 //	Phase 1: HttpClient (no credential dependency)
 //	Phase 2: Credential (sole data source for account info)
 //	Phase 3: Config derived from Credential
-//	Phase 4: LarkClient derived from Credential and workspace policy
+//	Phase 4: LarkClient derived from Credential
 func NewDefault(streams *IOStreams, inv InvocationContext) *Factory {
 	streams = normalizeStreams(streams)
 	f := &Factory{
@@ -55,10 +54,9 @@ 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)
+	f.HttpClient = cachedHttpClientFunc(f)
 
 	// Phase 2: Credential (sole data source)
 	// Keychain is read via closure so callers can replace f.Keychain after construction.
@@ -69,7 +67,7 @@ func NewDefault(streams *IOStreams, inv InvocationContext) *Factory {
 		ErrOut:     f.IOStreams.ErrOut,
 	})
 
-	// Phase 3: Runtime config contains resolved account data only.
+	// Phase 3: Config derived from Credential via an explicit conversion boundary.
 	f.Config = sync.OnceValues(func() (*core.CliConfig, error) {
 		acct, err := f.Credential.ResolveAccount(context.Background())
 		if err != nil {
@@ -80,9 +78,8 @@ func NewDefault(streams *IOStreams, inv InvocationContext) *Factory {
 		return cfg, nil
 	})
 
-	// Phase 4: LarkClient composes account data and workspace policy at the SDK
-	// transport boundary.
-	f.LarkClient = cachedLarkClientFunc(f, workspaceConfig)
+	// Phase 4: LarkClient from Credential (placeholder AppSecret)
+	f.LarkClient = cachedLarkClientFunc(f)
 
 	return f
 }
@@ -111,16 +108,13 @@ func safeRedirectPolicy(req *http.Request, via []*http.Request) error {
 // .StderrIsTerminal field, which tests set directly.
 var warnIfProxied = transport.WarnIfProxied
 
-func cachedHttpClientFunc(f *Factory, workspaceConfig workspaceConfigSource) func() (*http.Client, error) {
+func cachedHttpClientFunc(f *Factory) func() (*http.Client, error) {
 	return sync.OnceValues(func() (*http.Client, error) {
 		if f.IOStreams.StderrIsTerminal {
 			warnIfProxied(f.IOStreams.ErrOut)
 		}
 
-		hostSignalSource := resolveSDKHostSignalSource(workspaceConfig)
-
 		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
@@ -134,7 +128,7 @@ func cachedHttpClientFunc(f *Factory, workspaceConfig workspaceConfigSource) fun
 	})
 }
 
-func cachedLarkClientFunc(f *Factory, workspaceConfig workspaceConfigSource) func() (*lark.Client, error) {
+func cachedLarkClientFunc(f *Factory) func() (*lark.Client, error) {
 	return sync.OnceValues(func() (*lark.Client, error) {
 		acct, err := f.Credential.ResolveAccount(context.Background())
 		if err != nil {
@@ -148,15 +142,8 @@ func cachedLarkClientFunc(f *Factory, workspaceConfig workspaceConfigSource) fun
 		if f.IOStreams.StderrIsTerminal {
 			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:     sdkTransport,
+			Transport:     buildSDKTransport(),
 			CheckRedirect: safeRedirectPolicy,
 		}))
 		ep := core.ResolveEndpoints(acct.Brand)
@@ -165,8 +152,9 @@ func cachedLarkClientFunc(f *Factory, workspaceConfig workspaceConfigSource) fun
 	})
 }
 
-func wrapSDKTransport(next http.RoundTripper) http.RoundTripper {
-	var sdkTransport http.RoundTripper = &RetryTransport{Base: next}
+func buildSDKTransport() http.RoundTripper {
+	var sdkTransport http.RoundTripper = transport.Shared()
+	sdkTransport = &RetryTransport{Base: sdkTransport}
 	sdkTransport = &UserAgentTransport{Base: sdkTransport}
 	sdkTransport = &BuildHeaderTransport{Base: sdkTransport}
 	sdkTransport = &auth.SecurityPolicyTransport{Base: sdkTransport}

internal/cmdutil/factory_http_test.go

@@ -6,15 +6,10 @@ package cmdutil
 import (
 	"io"
 	"testing"
-
-	"github.com/larksuite/cli/internal/core"
 )
 
 func TestCachedHttpClientFunc_ReturnsSameInstance(t *testing.T) {
-	isEnabled := false
-	f, _, _, _ := TestFactory(t, &core.CliConfig{AppID: "test-app"})
-	f.IOStreams.ErrOut = io.Discard
-	fn := cachedHttpClientFunc(f, staticWorkspaceConfig{config: &core.MultiAppConfig{RiskControl: &isEnabled}})
+	fn := cachedHttpClientFunc(&Factory{IOStreams: &IOStreams{ErrOut: io.Discard}})
 
 	c1, err := fn()
 	if err != nil {
@@ -34,10 +29,7 @@ func TestCachedHttpClientFunc_ReturnsSameInstance(t *testing.T) {
 }
 
 func TestCachedHttpClientFunc_HasTimeout(t *testing.T) {
-	isEnabled := false
-	f, _, _, _ := TestFactory(t, &core.CliConfig{AppID: "test-app"})
-	f.IOStreams.ErrOut = io.Discard
-	fn := cachedHttpClientFunc(f, staticWorkspaceConfig{config: &core.MultiAppConfig{RiskControl: &isEnabled}})
+	fn := cachedHttpClientFunc(&Factory{IOStreams: &IOStreams{ErrOut: io.Discard}})
 	c, _ := fn()
 	if c.Timeout == 0 {
 		t.Error("expected non-zero timeout")
@@ -45,10 +37,7 @@ func TestCachedHttpClientFunc_HasTimeout(t *testing.T) {
 }
 
 func TestCachedHttpClientFunc_HasRedirectPolicy(t *testing.T) {
-	isEnabled := false
-	f, _, _, _ := TestFactory(t, &core.CliConfig{AppID: "test-app"})
-	f.IOStreams.ErrOut = io.Discard
-	fn := cachedHttpClientFunc(f, staticWorkspaceConfig{config: &core.MultiAppConfig{RiskControl: &isEnabled}})
+	fn := cachedHttpClientFunc(&Factory{IOStreams: &IOStreams{ErrOut: io.Discard}})
 	c, _ := fn()
 	if c.CheckRedirect == nil {
 		t.Error("expected CheckRedirect to be set (safeRedirectPolicy)")

internal/cmdutil/factory_proxy_warn_test.go

@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	_ "github.com/larksuite/cli/extension/credential/env" // registers the env-backed account provider
-	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/envvars"
 )
 
@@ -37,15 +36,13 @@ var proxyWarnGateCases = []struct {
 // TestCachedHttpClientFunc_ProxyWarnGate verifies the http-client init path
 // invokes WarnIfProxied only when stderr is an interactive terminal.
 func TestCachedHttpClientFunc_ProxyWarnGate(t *testing.T) {
-	isEnabled := false
 	for _, tc := range proxyWarnGateCases {
 		t.Run(tc.name, func(t *testing.T) {
 			calls := installProxyWarnSpy(t)
 
-			f, _, _, _ := TestFactory(t, &core.CliConfig{AppID: "test-app"})
-			f.IOStreams.ErrOut = io.Discard
-			f.IOStreams.StderrIsTerminal = tc.terminal
-			fn := cachedHttpClientFunc(f, staticWorkspaceConfig{config: &core.MultiAppConfig{RiskControl: &isEnabled}})
+			fn := cachedHttpClientFunc(&Factory{IOStreams: &IOStreams{
+				ErrOut: io.Discard, StderrIsTerminal: tc.terminal,
+			}})
 			if _, err := fn(); err != nil {
 				t.Fatalf("http client init: %v", err)
 			}
@@ -76,7 +73,7 @@ func TestCachedLarkClientFunc_ProxyWarnGate(t *testing.T) {
 			// normalizeStreams copies the struct (out := *s), so the
 			// StderrIsTerminal field survives into f.IOStreams.
 			f := NewDefault(&IOStreams{ErrOut: io.Discard, StderrIsTerminal: tc.terminal}, InvocationContext{})
-			if _, err := cachedLarkClientFunc(f, nil)(); err != nil {
+			if _, err := cachedLarkClientFunc(f)(); err != nil {
 				t.Fatalf("lark client init: %v", err)
 			}
 

internal/cmdutil/localfile.go

@@ -1,36 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package cmdutil
-
-import (
-	"io/fs"
-
-	"github.com/larksuite/cli/extension/fileio"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/internal/vfs"
-)
-
-// StatLocalFile returns metadata for a path in the process filesystem namespace.
-// It is intended for advisory validation; callers must validate the opened file
-// again before using its contents.
-func StatLocalFile(path string) (fs.FileInfo, error) {
-	localPath, err := validate.LocalInputPath(path)
-	if err != nil {
-		return nil, &fileio.PathValidationError{Err: err}
-	}
-	return vfs.Stat(localPath)
-}
-
-// OpenLocalFile opens a path in the process filesystem namespace.
-// Absolute and relative paths are accepted. It is the shared replacement for
-// direct os.Open/os.ReadFile use in commands that intentionally read local
-// paths outside the workspace sandbox. Callers inspect the returned descriptor
-// before reading so validation and use apply to the same opened file.
-func OpenLocalFile(path string) (fs.File, error) {
-	localPath, err := validate.LocalInputPath(path)
-	if err != nil {
-		return nil, &fileio.PathValidationError{Err: err}
-	}
-	return vfs.Open(localPath)
-}

internal/cmdutil/localfile_test.go

@@ -1,96 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package cmdutil
-
-import (
-	"errors"
-	"io"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/larksuite/cli/extension/fileio"
-	"github.com/larksuite/cli/internal/vfs"
-)
-
-func TestOpenLocalFile_AcceptsAbsoluteAndParentRelativePaths(t *testing.T) {
-	root := t.TempDir()
-	workDir := filepath.Join(root, "work")
-	if err := os.Mkdir(workDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	path := filepath.Join(root, "input.txt")
-	if err := os.WriteFile(path, []byte("content"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	TestChdir(t, workDir)
-
-	for _, input := range []string{path, filepath.Join("..", "input.txt")} {
-		f, err := OpenLocalFile(input)
-		if err != nil {
-			t.Fatalf("OpenLocalFile(%q) error = %v", input, err)
-		}
-		got, readErr := io.ReadAll(f)
-		closeErr := f.Close()
-		if readErr != nil || closeErr != nil || string(got) != "content" {
-			t.Fatalf("OpenLocalFile(%q) content=%q read=%v close=%v", input, got, readErr, closeErr)
-		}
-	}
-}
-
-func TestOpenLocalFile_RejectsInvalidInput(t *testing.T) {
-	if _, err := OpenLocalFile("input\n.txt"); !errors.Is(err, fileio.ErrPathValidation) {
-		t.Fatalf("OpenLocalFile() error = %v, want ErrPathValidation", err)
-	}
-}
-
-func TestStatLocalFile_ReturnsMetadata(t *testing.T) {
-	info, err := StatLocalFile(t.TempDir())
-	if err != nil {
-		t.Fatalf("StatLocalFile() error = %v", err)
-	}
-	if !info.IsDir() {
-		t.Fatalf("StatLocalFile() mode = %v, want directory", info.Mode())
-	}
-}
-
-func TestOpenLocalFile_DoesNotStatBeforeOpen(t *testing.T) {
-	path := filepath.Join(t.TempDir(), "input.txt")
-	if err := os.WriteFile(path, []byte("content"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-
-	previous := vfs.DefaultFS
-	counting := &countingLocalFileFS{FS: previous}
-	vfs.DefaultFS = counting
-	t.Cleanup(func() { vfs.DefaultFS = previous })
-
-	f, err := OpenLocalFile(path)
-	if err != nil {
-		t.Fatalf("OpenLocalFile() error = %v", err)
-	}
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if counting.openCalls != 1 || counting.statCalls != 0 {
-		t.Fatalf("OpenLocalFile() calls: Open=%d Stat=%d, want Open=1 Stat=0", counting.openCalls, counting.statCalls)
-	}
-}
-
-type countingLocalFileFS struct {
-	vfs.FS
-	openCalls int
-	statCalls int
-}
-
-func (f *countingLocalFileFS) Open(name string) (*os.File, error) {
-	f.openCalls++
-	return f.FS.Open(name)
-}
-
-func (f *countingLocalFileFS) Stat(name string) (fs.FileInfo, error) {
-	f.statCalls++
-	return f.FS.Stat(name)
-}

internal/cmdutil/risk_control.go

@@ -1,28 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package cmdutil
-
-import (
-	"github.com/larksuite/cli/internal/core"
-	"github.com/larksuite/cli/internal/riskcontrol"
-)
-
-type workspaceConfigSource interface {
-	MultiAppConfig() (*core.MultiAppConfig, error)
-}
-
-// resolveSDKHostSignalSource applies workspace policy at the SDK transport
-// boundary.
-func resolveSDKHostSignalSource(config workspaceConfigSource) riskcontrol.Source {
-	if config == nil {
-		return nil
-	}
-	workspace, configErr := config.MultiAppConfig()
-	// Default-on means an existing config with no explicit preference. Absent
-	// or unreadable config cannot authorize host-signal collection.
-	if configErr != nil || !workspace.RiskControlEnabled() {
-		return nil
-	}
-	return riskcontrol.NewHostSource()
-}

internal/cmdutil/risk_control_test.go

@@ -1,45 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package cmdutil
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/larksuite/cli/internal/core"
-)
-
-type staticWorkspaceConfig struct {
-	config *core.MultiAppConfig
-	err    error
-}
-
-func (s staticWorkspaceConfig) MultiAppConfig() (*core.MultiAppConfig, error) {
-	return s.config, s.err
-}
-
-func TestResolveSDKHostSignalSource(t *testing.T) {
-	disabled := false
-	tests := []struct {
-		name       string
-		config     workspaceConfigSource
-		wantSource bool
-	}{
-		{name: "workspace default on", config: staticWorkspaceConfig{config: &core.MultiAppConfig{}}, wantSource: true},
-		{name: "workspace opt-out", config: staticWorkspaceConfig{config: &core.MultiAppConfig{RiskControl: &disabled}}},
-		{name: "missing config", config: staticWorkspaceConfig{err: errors.New("file does not exist")}},
-		{name: "unreadable config", config: staticWorkspaceConfig{err: errors.New("permission denied")}},
-		{name: "nil config value", config: staticWorkspaceConfig{}},
-		{name: "nil config source"},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			got := resolveSDKHostSignalSource(test.config)
-			if (got != nil) != test.wantSource {
-				t.Fatalf("resolveSDKHostSignalSource() = %T, wantSource %t", got, test.wantSource)
-			}
-		})
-	}
-}

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/transport_test.go

@@ -15,7 +15,6 @@ import (
 
 	exttransport "github.com/larksuite/cli/extension/transport"
 	internalauth "github.com/larksuite/cli/internal/auth"
-	"github.com/larksuite/cli/internal/riskcontrol"
 )
 
 type roundTripFunc func(*http.Request) (*http.Response, error)
@@ -92,13 +91,13 @@ func TestRetryTransport_DefaultNoRetry(t *testing.T) {
 }
 
 // ---------------------------------------------------------------------------
-// wrapSDKTransport chain composition
+// buildSDKTransport chain composition
 // ---------------------------------------------------------------------------
 
-func TestWrapSDKTransport_IncludesRetryTransport(t *testing.T) {
-	transport := wrapSDKTransport(riskcontrol.NewTransport(http.DefaultTransport, nil))
+func TestBuildSDKTransport_IncludesRetryTransport(t *testing.T) {
+	transport := buildSDKTransport()
 
-	// Chain: SecurityPolicy → BuildHeader → UserAgent → Retry → RiskControl → Base
+	// Chain: SecurityPolicy → BuildHeader → UserAgent → Retry → Base
 	sec, ok := transport.(*internalauth.SecurityPolicyTransport)
 	if !ok {
 		t.Fatalf("outer transport type = %T, want *auth.SecurityPolicyTransport", transport)
@@ -111,23 +110,18 @@ func TestWrapSDKTransport_IncludesRetryTransport(t *testing.T) {
 	if !ok {
 		t.Fatalf("layer after BuildHeader = %T, want *UserAgentTransport", bh.Base)
 	}
-	retry, ok := ua.Base.(*RetryTransport)
-	if !ok {
+	if _, ok := ua.Base.(*RetryTransport); !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()
+func TestBuildSDKTransport_WithExtension(t *testing.T) {
 	exttransport.Register(&stubTransportProvider{})
-	t.Cleanup(func() { exttransport.Register(previous) })
+	t.Cleanup(func() { exttransport.Register(nil) })
 
-	transport := wrapSDKTransport(riskcontrol.NewTransport(http.DefaultTransport, nil))
+	transport := buildSDKTransport()
 
-	// Chain: extensionMiddleware → SecurityPolicy → BuildHeader → UserAgent → Retry → RiskControl → Base
+	// Chain: extensionMiddleware → SecurityPolicy → BuildHeader → UserAgent → Retry → Base
 	mid, ok := transport.(*extensionMiddleware)
 	if !ok {
 		t.Fatalf("outer transport type = %T, want *extensionMiddleware", transport)
@@ -144,23 +138,17 @@ func TestWrapSDKTransport_WithExtension(t *testing.T) {
 	if !ok {
 		t.Fatalf("layer after BuildHeader = %T, want *UserAgentTransport", bh.Base)
 	}
-	retry, ok := ua.Base.(*RetryTransport)
-	if !ok {
+	if _, ok := ua.Base.(*RetryTransport); !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()
+func TestBuildSDKTransport_WithoutExtension(t *testing.T) {
 	exttransport.Register(nil)
-	t.Cleanup(func() { exttransport.Register(previous) })
 
-	transport := wrapSDKTransport(riskcontrol.NewTransport(http.DefaultTransport, nil))
+	transport := buildSDKTransport()
 
-	// Chain: SecurityPolicy → BuildHeader → UserAgent → Retry → RiskControl → Base
+	// Chain: SecurityPolicy → BuildHeader → UserAgent → Retry → Base
 	sec, ok := transport.(*internalauth.SecurityPolicyTransport)
 	if !ok {
 		t.Fatalf("outer transport type = %T, want *auth.SecurityPolicyTransport", transport)
@@ -173,13 +161,9 @@ func TestWrapSDKTransport_WithoutExtension(t *testing.T) {
 	if !ok {
 		t.Fatalf("layer after BuildHeader = %T, want *UserAgentTransport", bh.Base)
 	}
-	retry, ok := ua.Base.(*RetryTransport)
-	if !ok {
+	if _, ok := ua.Base.(*RetryTransport); !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)
-	}
 }
 
 // ---------------------------------------------------------------------------
@@ -277,40 +261,6 @@ func (buildTamperingInterceptor) PreRoundTrip(req *http.Request) func(*http.Resp
 	return nil
 }
 
-type riskHeaderTamperingInterceptor struct{}
-
-func (riskHeaderTamperingInterceptor) PreRoundTrip(req *http.Request) func(*http.Response, error) {
-	req.Header.Set(riskcontrol.HeaderOSType, "extension-value")
-	req.Header.Set(riskcontrol.HeaderProductModel, "extension-value")
-	return nil
-}
-
-func TestWrapSDKTransport_StripsExtensionRiskHeaders(t *testing.T) {
-	previous := exttransport.GetProvider()
-	exttransport.Register(&stubTransportProvider{interceptor: riskHeaderTamperingInterceptor{}})
-	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.StatusOK, Body: http.NoBody}, nil
-	})
-	req, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/open-apis/test", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	req.Header.Set("Authorization", "Bearer token")
-
-	resp, err := wrapSDKTransport(riskcontrol.NewTransport(network, nil)).RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-	if received.Get(riskcontrol.HeaderOSType) != "" || received.Get(riskcontrol.HeaderProductModel) != "" {
-		t.Fatalf("extension risk headers reached network: %v", received)
-	}
-}
-
 // TestBuildHeaderTransport_SDKChain_OverridesTamperedHeader verifies that the
 // 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
@@ -327,7 +277,7 @@ func TestBuildHeaderTransport_SDKChain_OverridesTamperedHeader(t *testing.T) {
 	exttransport.Register(&stubTransportProvider{interceptor: buildTamperingInterceptor{}})
 	t.Cleanup(func() { exttransport.Register(nil) })
 
-	// Replicate the SDK chain layering used by wrapSDKTransport.
+	// Replicate the SDK chain layering used by buildSDKTransport.
 	var base http.RoundTripper = http.DefaultTransport
 	base = &RetryTransport{Base: base}
 	base = &UserAgentTransport{Base: base}

internal/core/config.go

@@ -60,18 +60,11 @@ func (a *AppConfig) ProfileName() string {
 // MultiAppConfig is the multi-app config file format.
 type MultiAppConfig struct {
 	StrictMode  StrictMode  `json:"strictMode,omitempty"`
-	RiskControl *bool       `json:"riskControl,omitempty"`
 	CurrentApp  string      `json:"currentApp,omitempty"`
 	PreviousApp string      `json:"previousApp,omitempty"`
 	Apps        []AppConfig `json:"apps"`
 }
 
-// RiskControlEnabled resolves the workspace policy. An omitted preference
-// keeps the default-on account-protection behavior.
-func (m *MultiAppConfig) RiskControlEnabled() bool {
-	return m != nil && (m.RiskControl == nil || *m.RiskControl)
-}
-
 // CurrentAppConfig returns the currently active app config.
 // Resolution priority: profileOverride > CurrentApp field > Apps[0].
 func (m *MultiAppConfig) CurrentAppConfig(profileOverride string) *AppConfig {

internal/core/config_snapshot.go

@@ -1,37 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package core
-
-import (
-	"io/fs"
-	"sync"
-)
-
-// ConfigSnapshot lazily captures one stable view of config.json for a CLI
-// invocation. All runtime consumers share the same load result so account and
-// workspace policy resolution cannot observe different file revisions. Callers
-// must treat the returned config as read-only.
-type ConfigSnapshot struct {
-	load func() (*MultiAppConfig, error)
-}
-
-// NewConfigSnapshot creates a lazily loaded invocation-scoped config snapshot.
-func NewConfigSnapshot() *ConfigSnapshot {
-	return newConfigSnapshot(LoadMultiAppConfig)
-}
-
-func newConfigSnapshot(load func() (*MultiAppConfig, error)) *ConfigSnapshot {
-	if load == nil {
-		return &ConfigSnapshot{}
-	}
-	return &ConfigSnapshot{load: sync.OnceValues(load)}
-}
-
-// MultiAppConfig returns the captured persistent config and load error.
-func (s *ConfigSnapshot) MultiAppConfig() (*MultiAppConfig, error) {
-	if s == nil || s.load == nil {
-		return nil, fs.ErrNotExist
-	}
-	return s.load()
-}

internal/core/config_snapshot_test.go

@@ -1,58 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package core
-
-import (
-	"errors"
-	"io/fs"
-	"testing"
-)
-
-func TestConfigSnapshotLoadsOnce(t *testing.T) {
-	calls := 0
-	want := &MultiAppConfig{}
-	snapshot := newConfigSnapshot(func() (*MultiAppConfig, error) {
-		calls++
-		return want, nil
-	})
-
-	for range 2 {
-		config, err := snapshot.MultiAppConfig()
-		if err != nil {
-			t.Fatal(err)
-		}
-		if config != want {
-			t.Fatal("snapshot returned a different config instance")
-		}
-	}
-	if calls != 1 {
-		t.Fatalf("config loads = %d, want 1", calls)
-	}
-}
-
-func TestConfigSnapshotZeroValueIsMissing(t *testing.T) {
-	config, err := (&ConfigSnapshot{}).MultiAppConfig()
-	if config != nil || !errors.Is(err, fs.ErrNotExist) {
-		t.Fatalf("MultiAppConfig() = (%v, %v), want (nil, fs.ErrNotExist)", config, err)
-	}
-}
-
-func TestConfigSnapshotCachesError(t *testing.T) {
-	calls := 0
-	want := errors.New("load failed")
-	snapshot := newConfigSnapshot(func() (*MultiAppConfig, error) {
-		calls++
-		return nil, want
-	})
-
-	for range 2 {
-		config, err := snapshot.MultiAppConfig()
-		if config != nil || !errors.Is(err, want) {
-			t.Fatalf("MultiAppConfig() = (%v, %v), want (nil, %v)", config, err, want)
-		}
-	}
-	if calls != 1 {
-		t.Fatalf("config loads = %d, want 1", calls)
-	}
-}

internal/core/config_test.go

@@ -60,9 +60,7 @@ func TestAppConfig_LangOmitEmpty(t *testing.T) {
 }
 
 func TestMultiAppConfig_RoundTrip(t *testing.T) {
-	disabled := false
 	config := &MultiAppConfig{
-		RiskControl: &disabled,
 		Apps: []AppConfig{{
 			AppId: "cli_test", AppSecret: PlainSecret("s"),
 			Brand: BrandLark, Lang: "zh", Users: []AppUser{},
@@ -86,9 +84,6 @@ func TestMultiAppConfig_RoundTrip(t *testing.T) {
 	if got.Apps[0].Brand != BrandLark {
 		t.Errorf("Brand = %q, want %q", got.Apps[0].Brand, BrandLark)
 	}
-	if got.RiskControl == nil || *got.RiskControl {
-		t.Errorf("RiskControl = %v, want explicit false", got.RiskControl)
-	}
 }
 
 func TestResolveConfigFromMulti_RejectsSecretKeyMismatch(t *testing.T) {

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/riskcontrol/osmodel.go

@@ -1,142 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-// Package deviceinfo collects the platform hardware product model and the
-// platform values used by device-related risk-control headers.
-package riskcontrol
-
-import (
-	"runtime"
-	"strings"
-	"sync"
-	"unicode"
-	"unicode/utf8"
-
-	"golang.org/x/net/http/httpguts"
-)
-
-// OSType is the server-side risk-control operating-system enum.
-type OSType string
-
-// OS type enum values for X-Agent-Os-Type.
-const (
-	OSTypeUnknown = "0"
-	OSTypeWindows = "1"
-	OSTypeLinux   = "2"
-	OSTypeMacOS   = "3"
-)
-
-const (
-	// TerminalTypePC is the fixed X-Agent-Terminal-Type value for the CLI.
-	TerminalTypePC = "1"
-
-	// Unknown is used when the hardware product model cannot be collected.
-	Unknown = "Unknown"
-
-	// deviceModelMaxBytes bounds the value added to X-Agent-Device-Type.
-	// Device models are short identifiers; a larger value is treated as
-	// malformed rather than truncated so the header never misrepresents it.
-	deviceModelMaxBytes = 256
-)
-
-// Snapshot contains the deliberately small risk-control signal set.
-// ProductModel is omitted when the platform cannot provide a safe value.
-type Snapshot struct {
-	OSType       OSType
-	ProductModel string
-}
-
-// Source supplies one immutable process-level snapshot.
-type Source interface {
-	Snapshot() Snapshot
-}
-
-// HostSource lazily reads host signals once, after outbound policy authorizes
-// the first request. Failed probes are cached and are not retried per request.
-type HostSource struct {
-	once      sync.Once
-	value     Snapshot
-	readModel func() string
-}
-
-// NewHostSource creates the production host signal source.
-func NewHostSource() *HostSource {
-	return &HostSource{readModel: readDeviceModel}
-}
-
-// Snapshot returns the cached host signal snapshot.
-func (s *HostSource) Snapshot() Snapshot {
-	if s == nil {
-		return Snapshot{}
-	}
-	s.once.Do(func() {
-		readModel := s.readModel
-		if readModel == nil {
-			readModel = readDeviceModel
-		}
-		s.value = Snapshot{
-			OSType:       GetOSType(OSName()),
-			ProductModel: normalizeDeviceModel(readModel()),
-		}
-	})
-	return s.value
-}
-
-// normalizeModel removes non-printable characters and returns a model only
-// when the remaining text is safe to use as an HTTP header value. Input that
-// cannot produce a valid model is rejected so Get can fall back to Unknown.
-func normalizeDeviceModel(model string) string {
-	if !utf8.ValidString(model) {
-		return ""
-	}
-	model = strings.Map(func(r rune) rune {
-		switch {
-		case r == '\r' || r == '\n' || r == '\x00':
-			return -1
-		case unicode.IsSpace(r):
-			return ' '
-		case unicode.IsPrint(r):
-			return r
-		default:
-			return -1
-		}
-	}, model)
-
-	model = strings.Join(strings.Fields(model), " ")
-
-	if model == "" || len(model) > deviceModelMaxBytes {
-		return ""
-	}
-	if !httpguts.ValidHeaderFieldValue(model) {
-		return ""
-	}
-	return model
-}
-
-// GetOSType maps a platform name to the X-Agent-Os-Type enum.
-func GetOSType(osName string) OSType {
-	switch osName {
-	case "Windows":
-		return OSTypeWindows
-	case "Linux":
-		return OSTypeLinux
-	case "MacOS":
-		return OSTypeMacOS
-	default:
-		return OSTypeUnknown
-	}
-}
-
-// OSName returns the platform name used by GetOSType.
-func OSName() string {
-	switch runtime.GOOS {
-	case "darwin":
-		return "MacOS"
-	case "windows":
-		return "Windows"
-	case "linux":
-		return "Linux"
-	default:
-		return runtime.GOOS
-	}
-}

internal/riskcontrol/osmodel_darwin.go

@@ -1,27 +0,0 @@
-//go:build darwin
-
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-import "golang.org/x/sys/unix"
-
-// readDeviceModel reads the current product key first and falls back to the
-// legacy model key. Trying both keys is more robust than branching on a macOS
-// version because virtualized or restricted environments may expose only one.
-func readDeviceModel() string {
-	return readDarwinDeviceModel(unix.Sysctl)
-}
-
-func readDarwinDeviceModel(readSysctl func(string) (string, error)) string {
-	for _, key := range [...]string{"hw.product", "hw.model"} {
-		model, err := readSysctl(key)
-		if err == nil {
-			if model = normalizeDeviceModel(model); model != "" {
-				return model
-			}
-		}
-	}
-	return ""
-}

internal/riskcontrol/osmodel_darwin_test.go

@@ -1,48 +0,0 @@
-//go:build darwin
-
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-import (
-	"errors"
-	"reflect"
-	"testing"
-)
-
-func TestReadDarwinDeviceModelPrefersProductAndFallsBackToModel(t *testing.T) {
-	t.Run("product available", func(t *testing.T) {
-		var keys []string
-		got := readDarwinDeviceModel(func(key string) (string, error) {
-			keys = append(keys, key)
-			if key == "hw.product" {
-				return "Mac16,1", nil
-			}
-			return "", errors.New("unexpected fallback")
-		})
-		if got != "Mac16,1" {
-			t.Fatalf("model = %q, want %q", got, "Mac16,1")
-		}
-		if want := []string{"hw.product"}; !reflect.DeepEqual(keys, want) {
-			t.Fatalf("sysctl keys = %v, want %v", keys, want)
-		}
-	})
-
-	t.Run("product unavailable", func(t *testing.T) {
-		var keys []string
-		got := readDarwinDeviceModel(func(key string) (string, error) {
-			keys = append(keys, key)
-			if key == "hw.model" {
-				return "MacBookPro18,3", nil
-			}
-			return "", errors.New("not available")
-		})
-		if got != "MacBookPro18,3" {
-			t.Fatalf("model = %q, want %q", got, "MacBookPro18,3")
-		}
-		if want := []string{"hw.product", "hw.model"}; !reflect.DeepEqual(keys, want) {
-			t.Fatalf("sysctl keys = %v, want %v", keys, want)
-		}
-	})
-}

internal/riskcontrol/osmodel_linux.go

@@ -1,17 +0,0 @@
-//go:build linux
-
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-// readDeviceModel returns a stable device model for Linux. DMI and device-tree
-// values vary widely and can expose the host or virtualization platform when
-// the CLI runs in a container or sandbox.
-func readDeviceModel() string {
-	return readLinuxDeviceModel()
-}
-
-func readLinuxDeviceModel() string {
-	return "linux"
-}

internal/riskcontrol/osmodel_linux_test.go

@@ -1,20 +0,0 @@
-//go:build linux
-
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-import "testing"
-
-func TestReadDeviceModelReturnsLinux(t *testing.T) {
-	if got := readDeviceModel(); got != "linux" {
-		t.Fatalf("readDeviceModel() = %q, want %q", got, "linux")
-	}
-}
-
-func TestReadLinuxDeviceModel(t *testing.T) {
-	if got := readLinuxDeviceModel(); got != "linux" {
-		t.Fatalf("readLinuxDeviceModel() = %q, want %q", got, "linux")
-	}
-}

internal/riskcontrol/osmodel_other.go

@@ -1,11 +0,0 @@
-//go:build !darwin && !windows && !linux
-
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-// readDeviceModel returns an empty model on unsupported platforms.
-func readDeviceModel() string {
-	return ""
-}

internal/riskcontrol/osmodel_test.go

@@ -1,143 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-import (
-	"fmt"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"unicode"
-)
-
-func TestHostSourceCachesNonEmptyModel(t *testing.T) {
-	calls := 0
-	s := &HostSource{readModel: func() string {
-		calls++
-		return "  MacBookPro18,3\n"
-	}}
-
-	if got := s.Snapshot(); got.ProductModel != "MacBookPro18,3" {
-		t.Fatalf("first Snapshot().ProductModel = %q, want %q", got.ProductModel, "MacBookPro18,3")
-	}
-	if got := s.Snapshot(); got.ProductModel != "MacBookPro18,3" {
-		t.Fatalf("second Snapshot().ProductModel = %q, want cached model", got.ProductModel)
-	}
-	if calls != 1 {
-		t.Fatalf("read called %d times, want 1", calls)
-	}
-}
-
-func TestHostSourceCachesEmptyModel(t *testing.T) {
-	calls := 0
-	s := &HostSource{readModel: func() string {
-		calls++
-		return ""
-	}}
-
-	if got := s.Snapshot(); got.ProductModel != "" {
-		t.Fatalf("first Snapshot().ProductModel = %q, want empty", got.ProductModel)
-	}
-	if got := s.Snapshot(); got.ProductModel != "" {
-		t.Fatalf("second Snapshot().ProductModel = %q, want cached empty result", got.ProductModel)
-	}
-	if calls != 1 {
-		t.Fatalf("read called %d times, want 1", calls)
-	}
-}
-
-func TestHostSourceReadsOnceAcrossConcurrentCalls(t *testing.T) {
-	var calls atomic.Int32
-	s := &HostSource{readModel: func() string {
-		calls.Add(1)
-		return "ThinkPad X1 Carbon"
-	}}
-
-	const goroutines = 32
-	var wg sync.WaitGroup
-	wg.Add(goroutines)
-	for i := 0; i < goroutines; i++ {
-		go func() {
-			defer wg.Done()
-			snapshot := s.Snapshot()
-			if snapshot.ProductModel != "ThinkPad X1 Carbon" {
-				t.Errorf("Snapshot().ProductModel = %q, want %q", snapshot.ProductModel, "ThinkPad X1 Carbon")
-			}
-		}()
-	}
-	wg.Wait()
-
-	if got := calls.Load(); got != 1 {
-		t.Fatalf("read called %d times, want 1", got)
-	}
-}
-
-func TestNormalizeDeviceModel(t *testing.T) {
-	tests := []struct {
-		name  string
-		model string
-		want  string
-	}{
-		{name: "trims surrounding whitespace", model: "  MacBookPro18,3\n", want: "MacBookPro18,3"},
-		{name: "trims device tree terminator", model: "Raspberry Pi 5\x00", want: "Raspberry Pi 5"},
-		{name: "allows printable Unicode", model: "联想 ThinkPad X1", want: "联想 ThinkPad X1"},
-		{name: "rejects empty", model: " \t\r\n"},
-		{name: "rejects invalid UTF-8", model: string([]byte{'M', 0xff, '1'})},
-		{name: "removes CRLF", model: "model\r\nname", want: "modelname"},
-		{name: "normalizes tab", model: "model\tname", want: "model name"},
-		{name: "removes NUL", model: "model\x00name", want: "modelname"},
-		{name: "removes control character", model: "model\x1fname", want: "modelname"},
-		{name: "removes DEL", model: "model\x7fname", want: "modelname"},
-		{name: "normalizes Unicode line separator", model: "model\u2028name", want: "model name"},
-		{name: "collapses whitespace", model: "  model\t \u00a0 name  ", want: "model name"},
-		{name: "accepts maximum byte length", model: strings.Repeat("a", deviceModelMaxBytes), want: strings.Repeat("a", deviceModelMaxBytes)},
-		{name: "rejects overlong value", model: strings.Repeat("a", deviceModelMaxBytes+1)},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := normalizeDeviceModel(tt.model); got != tt.want {
-				t.Fatalf("normalizeDeviceModel(%q) = %q, want %q", tt.model, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestNormalizeDeviceModelRemovesHTTPControlBytes(t *testing.T) {
-	for value := 0; value <= 0x7f; value++ {
-		if value >= 0x20 && value < 0x7f {
-			continue
-		}
-		t.Run(fmt.Sprintf("0x%02x", value), func(t *testing.T) {
-			model := "model" + string(rune(value)) + "name"
-			want := "modelname"
-			if value != '\r' && value != '\n' && value != '\x00' && unicode.IsSpace(rune(value)) {
-				want = "model name"
-			}
-			if got := normalizeDeviceModel(model); got != want {
-				t.Fatalf("normalizeDeviceModel(%q) = %q, want %q", model, got, want)
-			}
-		})
-	}
-}
-
-func TestGetOSType(t *testing.T) {
-	tests := []struct {
-		name string
-		want OSType
-	}{
-		{name: "Windows", want: OSTypeWindows},
-		{name: "Linux", want: OSTypeLinux},
-		{name: "MacOS", want: OSTypeMacOS},
-		{name: "unknown", want: OSTypeUnknown},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := GetOSType(tt.name); got != tt.want {
-				t.Errorf("GetOSType(%q) = %q, want %q", tt.name, got, tt.want)
-			}
-		})
-	}
-}

internal/riskcontrol/osmodel_windows.go

@@ -1,44 +0,0 @@
-//go:build windows
-
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-import "golang.org/x/sys/windows/registry"
-
-// systemInfoRegistryPaths lists registry locations in device-model lookup order.
-var systemInfoRegistryPaths = [...]string{
-	`HARDWARE\DESCRIPTION\System\BIOS`,
-	`SYSTEM\CurrentControlSet\Control\SystemInformation`,
-	`SYSTEM\HardwareConfig\Current`,
-}
-
-// readDeviceModel returns the first product name found in the Windows registry.
-func readDeviceModel() string {
-	return readWindowsDeviceModel(readWindowsRegistryModel)
-}
-
-func readWindowsRegistryModel(path string) (string, error) {
-	key, err := registry.OpenKey(registry.LOCAL_MACHINE, path, registry.READ)
-	if err != nil {
-		return "", err
-	}
-	defer key.Close()
-
-	model, _, err := key.GetStringValue("SystemProductName")
-	return model, err
-}
-
-func readWindowsDeviceModel(readRegistryModel func(string) (string, error)) string {
-	for _, path := range systemInfoRegistryPaths {
-		model, err := readRegistryModel(path)
-		if err != nil {
-			continue
-		}
-		if model = normalizeDeviceModel(model); model != "" {
-			return model
-		}
-	}
-	return ""
-}

internal/riskcontrol/osmodel_windows_test.go

@@ -1,78 +0,0 @@
-//go:build windows
-
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-import (
-	"errors"
-	"reflect"
-	"testing"
-)
-
-func TestReadWindowsDeviceModelFallback(t *testing.T) {
-	readError := errors.New("registry read failed")
-	tests := []struct {
-		name      string
-		values    map[string]string
-		errors    map[string]error
-		want      string
-		wantPaths []string
-	}{
-		{
-			name:      "first path wins",
-			values:    map[string]string{systemInfoRegistryPaths[0]: "Surface Laptop"},
-			want:      "Surface Laptop",
-			wantPaths: []string{systemInfoRegistryPaths[0]},
-		},
-		{
-			name: "read failure falls back",
-			errors: map[string]error{
-				systemInfoRegistryPaths[0]: readError,
-			},
-			values: map[string]string{
-				systemInfoRegistryPaths[1]: "ThinkPad X1 Carbon",
-			},
-			want:      "ThinkPad X1 Carbon",
-			wantPaths: systemInfoRegistryPaths[:2],
-		},
-		{
-			name: "empty normalized value falls back",
-			values: map[string]string{
-				systemInfoRegistryPaths[0]: " \r\n\x00",
-				systemInfoRegistryPaths[1]: "Latitude 7450",
-			},
-			want:      "Latitude 7450",
-			wantPaths: systemInfoRegistryPaths[:2],
-		},
-		{
-			name: "all paths fail",
-			errors: map[string]error{
-				systemInfoRegistryPaths[0]: readError,
-				systemInfoRegistryPaths[1]: readError,
-				systemInfoRegistryPaths[2]: readError,
-			},
-			wantPaths: systemInfoRegistryPaths[:],
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var paths []string
-			got := readWindowsDeviceModel(func(path string) (string, error) {
-				paths = append(paths, path)
-				if err := tt.errors[path]; err != nil {
-					return "", err
-				}
-				return tt.values[path], nil
-			})
-			if got != tt.want {
-				t.Fatalf("model = %q, want %q", got, tt.want)
-			}
-			if !reflect.DeepEqual(paths, tt.wantPaths) {
-				t.Fatalf("registry paths = %v, want %v", paths, tt.wantPaths)
-			}
-		})
-	}
-}

internal/riskcontrol/transport.go

@@ -1,138 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-import (
-	"net/http"
-	"net/url"
-	"strings"
-
-	"github.com/larksuite/cli/internal/core"
-	internaltransport "github.com/larksuite/cli/internal/transport"
-)
-
-const (
-	HeaderProductModel = "X-Agent-Device-Type"
-	HeaderOSType       = "X-Agent-Os-Type"
-)
-
-var restrictedHeaders = [...]string{HeaderProductModel, HeaderOSType}
-
-// Transport is the feature's final outbound boundary. It removes caller- or
-// extension-supplied signal headers first and writes trusted values only after
-// authorizing an official SDK origin and authentication state.
-type Transport struct {
-	next   http.RoundTripper
-	source Source
-}
-
-// NewTransport creates the final SDK outbound policy boundary. A nil source
-// disables collection and injection while preserving restricted-header
-// stripping for opt-out and extension-credential requests.
-func NewTransport(next http.RoundTripper, source Source) *Transport {
-	if next == nil {
-		next = internaltransport.Fallback()
-	}
-	return &Transport{
-		next:   next,
-		source: source,
-	}
-}
-
-// RoundTrip implements http.RoundTripper.
-func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
-	req = req.Clone(req.Context())
-	if req.Header == nil {
-		req.Header = make(http.Header)
-	}
-	stripRestrictedHeaders(req.Header)
-
-	if t.source != nil && t.routeAllowsSignals(req) {
-		snapshot := t.source.Snapshot()
-		if isSupportedOSType(snapshot.OSType) {
-			req.Header.Set(HeaderOSType, string(snapshot.OSType))
-		}
-		if model := normalizeDeviceModel(snapshot.ProductModel); model != "" {
-			req.Header.Set(HeaderProductModel, model)
-		}
-	}
-	return t.next.RoundTrip(req)
-}
-
-func isSupportedOSType(value OSType) bool {
-	switch value {
-	case OSTypeWindows, OSTypeLinux, OSTypeMacOS:
-		return true
-	default:
-		return false
-	}
-}
-
-func stripRestrictedHeaders(header http.Header) {
-	for name := range header {
-		for _, restricted := range restrictedHeaders {
-			if strings.EqualFold(name, restricted) {
-				delete(header, name)
-				break
-			}
-		}
-	}
-}
-
-type origin struct {
-	scheme string
-	host   string
-	port   string
-}
-
-var officialFeishuOrigins = [...]origin{
-	apiOrigin(core.BrandFeishu, core.ResolveEndpoints(core.BrandFeishu).Open),
-	apiOrigin(core.BrandLark, core.ResolveEndpoints(core.BrandLark).Open),
-	apiOrigin(core.BrandFeishu, core.ResolveEndpoints(core.BrandFeishu).Accounts),
-	apiOrigin(core.BrandLark, core.ResolveEndpoints(core.BrandLark).Accounts),
-}
-
-func (t *Transport) routeAllowsSignals(req *http.Request) bool {
-	if req == nil || req.URL == nil {
-		return false
-	}
-	return isOfficialFeishuOrigin(originOf(req.URL))
-}
-
-func originOf(value *url.URL) origin {
-	if value == nil {
-		return origin{}
-	}
-	scheme := strings.ToLower(value.Scheme)
-	port := value.Port()
-	if port == "" {
-		switch scheme {
-		case "https":
-			port = "443"
-		case "http":
-			port = "80"
-		}
-	}
-	return origin{scheme: scheme, host: strings.ToLower(value.Hostname()), port: port}
-}
-
-func apiOrigin(brand core.LarkBrand, endpointURL string) origin {
-	endpoint, err := url.Parse(endpointURL)
-	if err != nil {
-		return origin{}
-	}
-	return originOf(endpoint)
-}
-
-func isOfficialFeishuOrigin(candidate origin) bool {
-	if candidate.scheme != "https" || candidate.port != "443" {
-		return false
-	}
-	for _, official := range officialFeishuOrigins {
-		if candidate == official {
-			return true
-		}
-	}
-	return false
-}

internal/riskcontrol/transport_test.go

@@ -1,124 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package riskcontrol
-
-import (
-	"net/http"
-	"strings"
-	"sync/atomic"
-	"testing"
-)
-
-type roundTripFunc func(*http.Request) (*http.Response, error)
-
-func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f(req)
-}
-
-type countingSource struct {
-	calls atomic.Int32
-}
-
-func (s *countingSource) Snapshot() Snapshot {
-	s.calls.Add(1)
-	return Snapshot{OSType: OSTypeMacOS, ProductModel: "Mac16,1"}
-}
-
-type staticSource Snapshot
-
-func (s staticSource) Snapshot() Snapshot { return Snapshot(s) }
-
-func TestTransportAuthorizesBeforeCollecting(t *testing.T) {
-	tests := []struct {
-		name          string
-		requestURL    string
-		authorization string
-		wantSignals   bool
-	}{
-		{name: "authenticated official HTTPS", requestURL: "https://open.feishu.cn/open-apis/test", authorization: "Bearer token", wantSignals: true},
-		{name: "Lark official HTTPS", requestURL: "https://open.larksuite.com/open-apis/test", authorization: "Bearer token", wantSignals: true},
-		{name: "official explicit HTTPS port", requestURL: "https://OPEN.FEISHU.CN:443/open-apis/test", authorization: "Bearer token", wantSignals: true},
-		{name: "unauthenticated", requestURL: "https://open.feishu.cn/open-apis/test", wantSignals: true},
-		{name: "official non-OpenAPI origin", requestURL: "https://accounts.feishu.cn/open-apis/test", authorization: "Bearer token", wantSignals: true},
-		{name: "off domain", requestURL: "https://example.com/test", authorization: "Bearer token", wantSignals: false},
-		{name: "lookalike", requestURL: "https://open.feishu.cn.evil.example/test", authorization: "Bearer token", wantSignals: false},
-		{name: "plain HTTP", requestURL: "http://open.feishu.cn/test", authorization: "Bearer token", wantSignals: false},
-		{name: "non-default port", requestURL: "https://open.feishu.cn:8443/test", authorization: "Bearer token", wantSignals: false},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			source := &countingSource{}
-			var received http.Header
-			base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-				received = req.Header.Clone()
-				return &http.Response{StatusCode: http.StatusOK, Body: http.NoBody}, nil
-			})
-			req, err := http.NewRequest(http.MethodGet, test.requestURL, nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			req.Header.Set("Authorization", test.authorization)
-			req.Header.Set(HeaderOSType, "caller-value")
-			req.Header.Set(HeaderProductModel, "caller-value")
-			req.Header["x-agent-device-type"] = []string{"non-canonical-caller-value"}
-
-			resp, err := NewTransport(base, source).RoundTrip(req)
-			if err != nil {
-				t.Fatal(err)
-			}
-			resp.Body.Close()
-
-			gotSignals := received.Get(HeaderOSType) != ""
-			if gotSignals != test.wantSignals {
-				t.Fatalf("signals present = %t, want %t; headers=%v", gotSignals, test.wantSignals, received)
-			}
-			wantCalls := int32(0)
-			if test.wantSignals {
-				wantCalls = 1
-			}
-			if got := source.calls.Load(); got != wantCalls {
-				t.Fatalf("Snapshot calls = %d, want %d", got, wantCalls)
-			}
-			if got := req.Header.Get(HeaderOSType); got != "caller-value" {
-				t.Fatalf("caller request OS header = %q, want unchanged", got)
-			}
-			if got := req.Header.Get(HeaderProductModel); got != "caller-value" {
-				t.Fatalf("caller request product-model header = %q, want unchanged", got)
-			}
-			if !test.wantSignals {
-				for name := range received {
-					if strings.EqualFold(name, HeaderProductModel) || strings.EqualFold(name, HeaderOSType) {
-						t.Fatalf("restricted header leaked as %q", name)
-					}
-				}
-			}
-		})
-	}
-}
-
-func TestTransportValidatesSourceSnapshot(t *testing.T) {
-	var received http.Header
-	base := roundTripFunc(func(req *http.Request) (*http.Response, error) {
-		received = req.Header.Clone()
-		return &http.Response{StatusCode: http.StatusOK, Body: http.NoBody}, nil
-	})
-	req, err := http.NewRequest(http.MethodGet, "https://open.feishu.cn/open-apis/test", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	req.Header.Set("Authorization", "Bearer token")
-
-	resp, err := NewTransport(base, staticSource{
-		OSType:       OSType("unsupported"),
-		ProductModel: "unsafe\nvalue",
-	}).RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resp.Body.Close()
-	if received.Get(HeaderOSType) == "" && received.Get(HeaderProductModel) == "" {
-		t.Fatalf("no signals collected: %v", received)
-	}
-}

internal/validate/path.go

@@ -17,13 +17,6 @@ func SafeInputPath(path string) (string, error) {
 	return localfileio.SafeInputPath(path)
 }
 
-// LocalInputPath validates a local input path without restricting it to the
-// current working directory. It delegates to localfileio.LocalInputPath so
-// command validation and shared local-file readers use one policy.
-func LocalInputPath(path string) (string, error) {
-	return localfileio.LocalInputPath(path)
-}
-
 // SafeEnvDirPath validates an environment-provided application directory path.
 // Delegates to localfileio.SafeEnvDirPath.
 func SafeEnvDirPath(path, envName string) (string, error) {

internal/validate/path_test.go

@@ -211,18 +211,6 @@ func TestSafeLocalFlagPath(t *testing.T) {
 	}
 }
 
-func TestLocalInputPath_AllowsLocalPathsAndRejectsUnsafeCharacters(t *testing.T) {
-	for _, path := range []string{"/tmp/report.pdf", "../report.pdf"} {
-		got, err := LocalInputPath(path)
-		if err != nil || got != path {
-			t.Fatalf("LocalInputPath(%q) = %q, %v; want unchanged path", path, got, err)
-		}
-	}
-	if _, err := LocalInputPath("report\n.pdf"); err == nil {
-		t.Fatal("LocalInputPath() unexpectedly accepted a control character")
-	}
-}
-
 func TestSafeUploadPath_AllowsTempFileAbsolutePath(t *testing.T) {
 	// GIVEN: a real temp file (absolute path under os.TempDir())
 	f, err := os.CreateTemp("", "upload-test-*.bin")

internal/vfs/localfileio/path.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"path/filepath"
 	"strings"
-	"unicode"
 
 	"github.com/larksuite/cli/internal/charcheck"
 	"github.com/larksuite/cli/internal/vfs"
@@ -23,32 +22,6 @@ func SafeInputPath(path string) (string, error) {
 	return safePath(path, "--file")
 }
 
-// LocalInputPath validates an input path in the process local filesystem
-// namespace. It intentionally does not impose cwd containment or canonicalize
-// the path: absolute paths, parent-relative paths, and symlink traversal retain
-// their normal OS semantics. Character validation remains mandatory because
-// paths are user-controlled and may appear in errors or progress output.
-func LocalInputPath(path string) (string, error) {
-	if strings.TrimSpace(path) == "" {
-		return "", fmt.Errorf("local input path must not be empty")
-	}
-	if strings.IndexFunc(path, unicode.IsControl) >= 0 {
-		return "", fmt.Errorf("local input path must not contain control characters")
-	}
-	if err := charcheck.RejectControlChars(path, "local input path"); err != nil {
-		return "", err
-	}
-	if err := validateLocalInputPlatform(path); err != nil {
-		return "", err
-	}
-	return path, nil
-}
-
-func isWindowsNonLocalNamespace(path string) bool {
-	normalized := strings.ReplaceAll(path, "/", `\`)
-	return strings.HasPrefix(normalized, `\\`) || strings.HasPrefix(normalized, `\??\`)
-}
-
 // SafeLocalFlagPath validates a flag value as a local file path.
 // Empty values and http/https URLs are returned unchanged without validation.
 func SafeLocalFlagPath(flagName, value string) (string, error) {
@@ -56,7 +29,7 @@ func SafeLocalFlagPath(flagName, value string) (string, error) {
 		return value, nil
 	}
 	if _, err := SafeInputPath(value); err != nil {
-		return "", fmt.Errorf("%s: %w", flagName, err)
+		return "", fmt.Errorf("%s: %v", flagName, err)
 	}
 	return value, nil
 }

internal/vfs/localfileio/path_local_other.go

@@ -1,8 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-//go:build !windows
-
-package localfileio
-
-func validateLocalInputPlatform(string) error { return nil }

internal/vfs/localfileio/path_local_windows.go

@@ -1,33 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-//go:build windows
-
-package localfileio
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-)
-
-func validateLocalInputPlatform(path string) error {
-	if isWindowsNonLocalNamespace(path) {
-		return fmt.Errorf("local input path must not use a Windows network or device namespace")
-	}
-
-	cleaned := filepath.Clean(path)
-	volume := filepath.VolumeName(cleaned)
-	remainder := strings.TrimLeft(cleaned[len(volume):], `\/`)
-	for _, component := range strings.FieldsFunc(remainder, func(r rune) bool {
-		return r == '\\' || r == '/'
-	}) {
-		if component == "." || component == ".." {
-			continue
-		}
-		if !filepath.IsLocal(component) {
-			return fmt.Errorf("local input path contains a reserved Windows path component %q", component)
-		}
-	}
-	return nil
-}

internal/vfs/localfileio/path_local_windows_test.go

@@ -1,27 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-//go:build windows
-
-package localfileio
-
-import "testing"
-
-func TestLocalInputPath_RejectsWindowsNetworkDeviceAndReservedPaths(t *testing.T) {
-	for _, input := range []string{
-		`\\server\share\report.pdf`,
-		`//server/share/report.pdf`,
-		`\\.\pipe\upload`,
-		`\\?\C:\Users\agent\report.pdf`,
-		`\\?\UNC\server\share\report.pdf`,
-		`\??\C:\Users\agent\report.pdf`,
-		`C:\Users\agent\NUL.txt`,
-		`CON`,
-	} {
-		t.Run(input, func(t *testing.T) {
-			if _, err := LocalInputPath(input); err == nil {
-				t.Fatalf("LocalInputPath(%q) unexpectedly succeeded", input)
-			}
-		})
-	}
-}

internal/vfs/localfileio/path_test.go

@@ -4,7 +4,6 @@
 package localfileio
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -72,72 +71,6 @@ func TestSafeOutputPath_RejectsPathTraversalAndDangerousInput(t *testing.T) {
 	}
 }
 
-func TestLocalInputPath_AllowsLocalNamespaceWithoutRewriting(t *testing.T) {
-	for _, input := range []string{
-		"/tmp/report.pdf",
-		"../outside/report.pdf",
-		"./report.pdf",
-		"nested/../report.pdf",
-		`C:\Users\agent\report.pdf`,
-		"报告.pdf",
-	} {
-		t.Run(input, func(t *testing.T) {
-			got, err := LocalInputPath(input)
-			if err != nil {
-				t.Fatalf("LocalInputPath(%q) error = %v", input, err)
-			}
-			if got != input {
-				t.Fatalf("LocalInputPath(%q) = %q, want path preserved verbatim", input, got)
-			}
-		})
-	}
-}
-
-func TestWindowsNonLocalNamespace(t *testing.T) {
-	for _, input := range []string{
-		`\\server\share\report.pdf`,
-		`//server/share/report.pdf`,
-		`\\.\pipe\upload`,
-		`\\?\C:\Users\agent\report.pdf`,
-		`\\?\UNC\server\share\report.pdf`,
-		`\??\C:\Users\agent\report.pdf`,
-	} {
-		if !isWindowsNonLocalNamespace(input) {
-			t.Errorf("isWindowsNonLocalNamespace(%q) = false, want true", input)
-		}
-	}
-
-	for _, input := range []string{
-		`C:\Users\agent\report.pdf`,
-		`C:/Users/agent/report.pdf`,
-		`..\outside\report.pdf`,
-		`.\report.pdf`,
-	} {
-		if isWindowsNonLocalNamespace(input) {
-			t.Errorf("isWindowsNonLocalNamespace(%q) = true, want false", input)
-		}
-	}
-}
-
-func TestLocalInputPath_RejectsEmptyControlAndDangerousUnicode(t *testing.T) {
-	for _, input := range []string{
-		"",
-		"   ",
-		"file\x00.txt",
-		"file\tname.txt",
-		"file\nname.txt",
-		"file\rname.txt",
-		"file\u202Ename.txt",
-		"file\u200Bname.txt",
-	} {
-		t.Run(fmt.Sprintf("%q", input), func(t *testing.T) {
-			if _, err := LocalInputPath(input); err == nil {
-				t.Fatalf("LocalInputPath(%q) unexpectedly succeeded", input)
-			}
-		})
-	}
-}
-
 func TestSafeOutputPath_ReturnsCanonicalAbsolutePath(t *testing.T) {
 	// GIVEN: a clean temp directory as CWD
 	dir := t.TempDir()

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.80",
+  "version": "1.0.76",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@larksuite/cli",
-      "version": "1.0.80",
+      "version": "1.0.76",
       "cpu": [
         "x64",
         "arm64",

package.json

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

scripts/semantic-review-workflow.test.sh

@@ -176,15 +176,7 @@ if ! grep -Fq "if: always() && github.event.workflow_run.conclusion == 'success'
   exit 1
 fi
 
-if grep -Fq 'run.name !== "CI"' "$workflow"; then
-  echo "semantic-review must not use the dynamic workflow run name as workflow identity" >&2
-  exit 1
-fi
-
-require_in_step "$summary_verify_step" 'github.rest.actions.getWorkflow' "PR quality summary must resolve static workflow metadata"
-require_in_step "$summary_verify_step" 'workflow.name !== "CI"' "PR quality summary must verify the static workflow name"
-require_in_step "$summary_verify_step" 'workflow.path !== ".github/workflows/ci.yml"' "PR quality summary must verify the static workflow path"
-require_in_step "$summary_verify_step" 'run.path && run.path !== workflow.path' "PR quality summary must reject workflow path metadata mismatches"
+require_in_step "$summary_verify_step" 'workflowPath !== ".github/workflows/ci.yml"' "PR quality summary must verify the triggering workflow path"
 require_in_step "$summary_verify_step" 'run.event !== "pull_request"' "PR quality summary must only handle pull_request workflow_run events"
 require_in_step "$summary_verify_step" 'run.repository.id !== context.payload.repository.id' "PR quality summary must verify workflow_run repository id"
 require_in_step "$summary_verify_step" 'const targetHeadSha = run.head_sha' "PR quality summary must use the CI run head SHA as the verified PR head"
@@ -209,10 +201,7 @@ require_in_step "$summary_publish_step" 'CI_QUALITY_SUMMARY_BASE_SHA' "PR qualit
 require_in_step "$summary_publish_step" 'CI_QUALITY_SUMMARY_RUN_ID' "PR quality summary publisher must receive verified workflow run id"
 require_in_step "$summary_publish_step" 'require("./scripts/ci-quality-summary-publish.js")' "PR quality summary publisher must use the shared CI publisher script"
 
-require_in_step "$verify_step" 'github.rest.actions.getWorkflow' "semantic-review must resolve static workflow metadata"
-require_in_step "$verify_step" 'workflow.name !== "CI"' "semantic-review must verify the static workflow name"
-require_in_step "$verify_step" 'workflow.path !== ".github/workflows/ci.yml"' "semantic-review must verify the static workflow path"
-require_in_step "$verify_step" 'run.path && run.path !== workflow.path' "semantic-review must reject workflow path metadata mismatches"
+require_in_step "$verify_step" 'workflowPath !== ".github/workflows/ci.yml"' "semantic-review must verify the triggering workflow path"
 require_in_step "$verify_step" 'run.repository.id !== context.payload.repository.id' "semantic-review must verify workflow_run repository id"
 require_in_step "$verify_step" 'run.event !== "pull_request"' "semantic-review must only handle pull_request workflow_run events"
 require_in_step "$verify_step" 'run.conclusion !== "success"' "semantic-review must only consume successful CI runs"

shortcuts/apps/apps_file_list.go

@@ -12,23 +12,10 @@ import (
 	"github.com/larksuite/cli/shortcuts/common"
 )
 
-// maxFileListPageSize 是 file_list 分页上限，与后端 paas_storage checkMaxKeys 的 (0, 200] 契约对齐：
-// page_size > 200 服务端直接返回 ErrInvalidRequest("maxKeys not in range (0, 200]")。CLI 前置校验避免无谓往返。
-// 注：服务端对 page_size<=0 会兜底为默认值，但 CLI 默认已是 20、显式传 <1 属误用，故与其它 list 命令一致地按 [1, 200] 校验。
-const maxFileListPageSize = 200
-
-// validateFileListPageSize 前置校验 --page-size ∈ [1, maxFileListPageSize]，与后端 checkMaxKeys 的 (0, 200] 契约对齐。
-func validateFileListPageSize(n int) error {
-	if n < 1 || n > maxFileListPageSize {
-		return appsValidationParamError("--page-size", "--page-size must be between 1 and %d", maxFileListPageSize)
-	}
-	return nil
-}
-
 // AppsFileList lists files in a Miaoda app's storage (cursor pagination)。
 //
 // GET /apps/{app_id}/storage/file_list。过滤器：--name / --path / --type / --size-gt /
-// --size-lt / --uploaded-since / --uploaded-until（精确或区间），分页 --page-size(1..200)/--page-token。
+// --size-lt / --uploaded-since / --uploaded-until（精确或区间），分页 --page-size/--page-token。
 // file 域不分 dev/online，无 --env。
 //
 // pretty 渲染 5 列：file_name / path / size / type / uploaded_at；空结果打 "No files found."。
@@ -54,17 +41,13 @@ var AppsFileList = common.Shortcut{
 		{Name: "size-lt", Type: "int", Desc: "filter: size less than (bytes)"},
 		{Name: "uploaded-since", Desc: "filter: uploaded at or after; relative (7d/2h/30s) | date (2026-04-15) | datetime (2026-04-15T10:00:00) | ISO 8601 w/ TZ (bare date/datetime read in local timezone)"},
 		{Name: "uploaded-until", Desc: "filter: uploaded at or before; relative (7d/2h/30s) | date (2026-04-15) | datetime (2026-04-15T10:00:00) | ISO 8601 w/ TZ (bare date/datetime read in local timezone)"},
-		{Name: "page-size", Type: "int", Default: "20", Desc: "page size (1..200)"},
+		{Name: "page-size", Type: "int", Default: "20", Desc: "page size"},
 		{Name: "page-token", Desc: "pagination cursor from previous response"},
 	},
 	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
 		if _, err := requireAppID(rctx.Str("app-id")); err != nil {
 			return err
 		}
-		// page_size 前置校验：对齐后端 checkMaxKeys 的 (0, 200] 契约，避免 >200 触发服务端 ErrInvalidRequest。
-		if err := validateFileListPageSize(rctx.Int("page-size")); err != nil {
-			return err
-		}
 		// 设计原则三：<timestamp> 多格式 → 归一化为 RFC3339 UTC，回写到 flag 供 buildFileListParams 透传。
 		for _, f := range []string{"uploaded-since", "uploaded-until"} {
 			if strings.TrimSpace(rctx.Str(f)) == "" {

shortcuts/apps/apps_file_list_test.go

@@ -82,34 +82,6 @@ func TestAppsFileList_RequiresAppID(t *testing.T) {
 	}
 }
 
-// TestAppsFileList_PageSizeOutOfRange 验证 --page-size 超出 (0, 200] 契约时前置报 --page-size 校验错误，不发请求。
-func TestAppsFileList_PageSizeOutOfRange(t *testing.T) {
-	for _, ps := range []string{"0", "201", "500"} {
-		factory, stdout, _ := newAppsExecuteFactory(t)
-		err := runAppsShortcut(t, AppsFileList,
-			[]string{"+file-list", "--app-id", "app_x", "--page-size", ps, "--as", "user"}, factory, stdout)
-		var ve *errs.ValidationError
-		if !errors.As(err, &ve) {
-			t.Fatalf("page-size=%s: err = %T %v, want *errs.ValidationError", ps, err, err)
-		}
-		if ve.Param != "--page-size" {
-			t.Fatalf("page-size=%s: Param = %q, want --page-size", ps, ve.Param)
-		}
-	}
-}
-
-// TestAppsFileList_PageSizeBoundaryOK 验证边界值 1 与 200 通过校验（dry-run 不报错并把 page_size 下发）。
-func TestAppsFileList_PageSizeBoundaryOK(t *testing.T) {
-	for _, ps := range []string{"1", "200"} {
-		factory, stdout, _ := newAppsExecuteFactory(t)
-		if err := runAppsShortcut(t, AppsFileList,
-			[]string{"+file-list", "--app-id", "app_x", "--page-size", ps, "--dry-run", "--as", "user"},
-			factory, stdout); err != nil {
-			t.Fatalf("page-size=%s: dry-run err=%v", ps, err)
-		}
-	}
-}
-
 // 过滤器 + 分页全部进 query（size-gt/lt 走 int，uploaded_since/until 原样）。
 func TestAppsFileList_DryRunSendsFiltersAndPagination(t *testing.T) {
 	factory, stdout, _ := newAppsExecuteFactory(t)

shortcuts/apps/apps_file_upload.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 
 	"github.com/larksuite/cli/errs"
+	"github.com/larksuite/cli/internal/cmdutil"
 	"github.com/larksuite/cli/shortcuts/common"
 )
 
@@ -46,7 +47,21 @@ var AppsFileUpload = common.Shortcut{
 		if _, err := requireAppID(rctx.Str("app-id")); err != nil {
 			return err
 		}
-		return rctx.ValidateLocalFileFlag("file", fileUploadMaxBytes)
+		f := strings.TrimSpace(rctx.Str("file"))
+		if f == "" {
+			return errs.NewValidationError(errs.SubtypeInvalidArgument, "--file is required").WithParam("--file")
+		}
+		st, err := rctx.FileIO().Stat(f)
+		if err != nil {
+			return errs.NewValidationError(errs.SubtypeInvalidArgument, "--file: %v", err).WithParam("--file").WithCause(err)
+		}
+		if st.IsDir() {
+			return errs.NewValidationError(errs.SubtypeInvalidArgument, "--file must be a file, not a directory").WithParam("--file")
+		}
+		if st.Size() > fileUploadMaxBytes {
+			return errs.NewValidationError(errs.SubtypeInvalidArgument, "file size %d bytes exceeds the 100 MB upload limit", st.Size()).WithParam("--file")
+		}
+		return nil
 	},
 	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
 		appID, _ := requireAppID(rctx.Str("app-id"))
@@ -61,9 +76,9 @@ var AppsFileUpload = common.Shortcut{
 			return err
 		}
 		localPath := strings.TrimSpace(rctx.Str("file"))
-		content, err := rctx.ReadLocalFileFlag("file", fileUploadMaxBytes)
+		content, err := cmdutil.ReadInputFile(rctx.FileIO(), localPath)
 		if err != nil {
-			return err
+			return errs.NewValidationError(errs.SubtypeInvalidArgument, "--file: %v", err).WithParam("--file").WithCause(err)
 		}
 		fileName := filepath.Base(localPath)
 		contentType := mimeByExt(fileName)

shortcuts/apps/apps_file_upload_test.go

@@ -12,7 +12,6 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -59,17 +58,22 @@ func TestAppsFileUpload_RejectsDirectory(t *testing.T) {
 	}
 }
 
-// TestAppsFileUpload_DryRunPreUpload verifies that dry-run validates the local
-// file and previews the pre-upload request without reading or uploading it.
+// TestAppsFileUpload_DryRunPreUpload 验证 dry-run 输出 POST file_pre_upload，body.file_name 取文件 basename。
 func TestAppsFileUpload_DryRunPreUpload(t *testing.T) {
-	absolutePath := filepath.Join(t.TempDir(), "logo.png")
-	if err := os.WriteFile(absolutePath, []byte("not-read-by-dry-run"), 0o600); err != nil {
+	// Validate 会 Stat --file（在 DryRun 之前），故 dry-run 也需要真实存在的文件。
+	dir := t.TempDir()
+	if err := os.WriteFile(filepath.Join(dir, "logo.png"), []byte("x"), 0o600); err != nil {
 		t.Fatal(err)
 	}
+	oldWD, _ := os.Getwd()
+	if err := os.Chdir(dir); err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { _ = os.Chdir(oldWD) })
 
 	factory, stdout, _ := newAppsExecuteFactory(t)
 	if err := runAppsShortcut(t, AppsFileUpload,
-		[]string{"+file-upload", "--app-id", "app_x", "--file", absolutePath, "--dry-run", "--as", "user"}, factory, stdout); err != nil {
+		[]string{"+file-upload", "--app-id", "app_x", "--file", "logo.png", "--dry-run", "--as", "user"}, factory, stdout); err != nil {
 		t.Fatalf("dry-run err=%v", err)
 	}
 	var env dryRunAPIEnvelope
@@ -83,18 +87,6 @@ func TestAppsFileUpload_DryRunPreUpload(t *testing.T) {
 	}
 }
 
-func TestAppsFileUpload_DryRunRejectsMissingFile(t *testing.T) {
-	missingAbsolutePath := filepath.Join(t.TempDir(), "does-not-exist", "logo.png")
-
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsFileUpload,
-		[]string{"+file-upload", "--app-id", "app_x", "--file", missingAbsolutePath, "--dry-run", "--as", "user"}, factory, stdout)
-	var validationErr *errs.ValidationError
-	if !errors.As(err, &validationErr) || validationErr.Subtype != errs.SubtypeInvalidArgument || validationErr.Param != "--file" {
-		t.Fatalf("error = %T %v, want invalid_argument for --file", err, err)
-	}
-}
-
 // 三步直传：pre-upload → 客户端 PUT 字节 → callback。
 func TestAppsFileUpload_EndToEnd(t *testing.T) {
 	var putBody []byte
@@ -157,142 +149,6 @@ func TestAppsFileUpload_EndToEnd(t *testing.T) {
 	}
 }
 
-// TestAppsFileUpload_AcceptsAbsolutePath verifies that file-upload can read an
-// absolute path outside the current working directory.
-func TestAppsFileUpload_AcceptsAbsolutePath(t *testing.T) {
-	var putBody []byte
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodPut {
-			w.WriteHeader(http.StatusMethodNotAllowed)
-			return
-		}
-		putBody, _ = io.ReadAll(r.Body)
-		w.Header().Set("ETag", `"etag-abs"`)
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer srv.Close()
-
-	// Keep the process cwd unchanged so the temporary file is outside it.
-	dir := t.TempDir()
-	absFile := filepath.Join(dir, "report.pdf")
-	if !filepath.IsAbs(absFile) {
-		t.Fatalf("test setup: %q is not absolute", absFile)
-	}
-	if err := os.WriteFile(absFile, []byte("PDFBYTES"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST", URL: "/open-apis/spark/v1/apps/app_x/storage/file_pre_upload",
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{"upload_url": srv.URL, "upload_id": "up-abs"}},
-	})
-	reg.Register(&httpmock.Stub{
-		Method: "POST", URL: "/open-apis/spark/v1/apps/app_x/storage/file_upload_callback",
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{
-			"file_name": "report.pdf", "path": "/1858537546760999.pdf", "size_bytes": 8,
-		}},
-	})
-
-	if err := runAppsShortcut(t, AppsFileUpload,
-		[]string{"+file-upload", "--app-id", "app_x", "--file", absFile, "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute with absolute path err=%v", err)
-	}
-	if string(putBody) != "PDFBYTES" {
-		t.Fatalf("PUT body = %q, want file bytes", putBody)
-	}
-}
-
-func TestAppsFileUpload_AcceptsParentRelativePathOutsideCWD(t *testing.T) {
-	var putBody []byte
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		putBody, _ = io.ReadAll(r.Body)
-		w.Header().Set("ETag", `"etag-parent"`)
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer srv.Close()
-
-	root := t.TempDir()
-	workDir := filepath.Join(root, "work")
-	if err := os.Mkdir(workDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(root, "report.pdf"), []byte("PARENT"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	oldWD, _ := os.Getwd()
-	if err := os.Chdir(workDir); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { _ = os.Chdir(oldWD) })
-
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST", URL: "/open-apis/spark/v1/apps/app_x/storage/file_pre_upload",
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{"upload_url": srv.URL, "upload_id": "up-parent"}},
-	})
-	reg.Register(&httpmock.Stub{
-		Method: "POST", URL: "/open-apis/spark/v1/apps/app_x/storage/file_upload_callback",
-		Body: map[string]interface{}{"code": 0, "data": map[string]interface{}{
-			"file_name": "report.pdf", "path": "/parent.pdf", "size_bytes": 6,
-		}},
-	})
-
-	if err := runAppsShortcut(t, AppsFileUpload,
-		[]string{"+file-upload", "--app-id", "app_x", "--file", filepath.Join("..", "report.pdf"), "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute with parent-relative path err=%v", err)
-	}
-	if string(putBody) != "PARENT" {
-		t.Fatalf("PUT body = %q, want PARENT", putBody)
-	}
-}
-
-func TestAppsFileUpload_RejectsFileAboveLimit(t *testing.T) {
-	path := filepath.Join(t.TempDir(), "too-large.bin")
-	f, err := os.Create(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Truncate(fileUploadMaxBytes + 1); err != nil {
-		_ = f.Close()
-		t.Fatal(err)
-	}
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err = runAppsShortcut(t, AppsFileUpload,
-		[]string{"+file-upload", "--app-id", "app_x", "--file", path, "--as", "user"}, factory, stdout)
-	var validationErr *errs.ValidationError
-	if !errors.As(err, &validationErr) || validationErr.Param != "--file" {
-		t.Fatalf("error = %T %v, want --file ValidationError", err, err)
-	}
-	if !strings.Contains(validationErr.Error(), "limit") {
-		t.Fatalf("error = %v, want size limit context", validationErr)
-	}
-}
-
-func TestAppsFileUpload_RejectsDeviceWithoutReadingIt(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("/dev/zero is unavailable on Windows")
-	}
-	if _, err := os.Stat("/dev/zero"); err != nil {
-		t.Skipf("/dev/zero unavailable: %v", err)
-	}
-
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsFileUpload,
-		[]string{"+file-upload", "--app-id", "app_x", "--file", "/dev/zero", "--as", "user"}, factory, stdout)
-	var validationErr *errs.ValidationError
-	if !errors.As(err, &validationErr) || validationErr.Param != "--file" {
-		t.Fatalf("error = %T %v, want --file ValidationError", err, err)
-	}
-	if !strings.Contains(validationErr.Error(), "regular file") {
-		t.Fatalf("error = %v, want non-regular-file context", validationErr)
-	}
-}
-
 // TestSanitizeUploadFileName_Cases 验证 sanitizeUploadFileName：空格转 %20、去 TOS 非法字符、全非法兜底、非 ASCII 百分号编码。
 func TestSanitizeUploadFileName_Cases(t *testing.T) {
 	cases := []struct{ in, want string }{

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

@@ -25,21 +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},
+		{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 {
-		api := common.NewDryRunAPI().
+		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"))
-		// 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_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_form_submit.go

@@ -26,7 +26,7 @@ var BaseFormSubmit = common.Shortcut{
 	Service:     "base",
 	Command:     "+form-submit",
 	Description: "Submit a form (fill and submit form data)",
-	Risk:        "high-risk-write",
+	Risk:        "write",
 	Scopes:      []string{"base:form:update", "docs:document.media:upload"},
 	AuthTypes:   authTypes(),
 	HasFormat:   true,
@@ -39,7 +39,6 @@ var BaseFormSubmit = common.Shortcut{
 		`Example (no attachments): --share-token shrXXXX --json '{"fields":{"Service Rating":5,"Review":"Good service"}}'`,
 		`Example (with attachments): --share-token shrXXXX --base-token basXXX --json '{"fields":{"Service Rating":5},"attachments":{"Attachment":["./report.pdf"]}}'`,
 		`Cell values in "fields" follow lark-base-cell-value.md conventions; "attachments" maps field names to local file path arrays — the CLI uploads them in parallel and merges them into the submission.`,
-		baseHighRiskYesTip,
 	},
 	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
 		return validateFormSubmit(runtime)

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,9 +170,7 @@ func executeBaseURLResolve(runtime *common.RuntimeContext) error {
 	switch classifyBaseURL(parsed) {
 	case "base_url":
 		out := resolveBaseURL(parsed)
-		if err := enrichBaseResolveHint(runtime, out, resolveBaseURLSelection(parsed)); err != nil {
-			return err
-		}
+		enrichBaseResolveHint(runtime, out)
 		runtime.OutFormat(out, nil, nil)
 		return nil
 	case "wiki_url":
@@ -205,11 +178,6 @@ func executeBaseURLResolve(runtime *common.RuntimeContext) error {
 		if err != nil {
 			return err
 		}
-		selection := resolveBaseURLSelection(parsed)
-		applyBaseURLSelection(out, selection)
-		if err := enrichBaseResolveHint(runtime, out, selection); err != nil {
-			return err
-		}
 		runtime.OutFormat(out, nil, nil)
 		return nil
 	case "record_share_url":
@@ -283,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)
@@ -426,94 +368,13 @@ func executeBaseTitleResolve(runtime *common.RuntimeContext) error {
 	}
 }
 
-func enrichBaseResolveHint(runtime *common.RuntimeContext, out map[string]interface{}, selection baseURLSelection) error {
+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 nil
+		return
 	}
-
-	block, found, err := resolveSelectedBaseBlock(runtime, baseToken, selectedBlockID)
-	if err != nil {
-		return err
-	}
-	if 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 nil
-	}
-
-	out["hint"] = resolveUnknownBlockHint()
-	return nil
-}
-
-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)
@@ -522,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,8 +4,6 @@
 package base
 
 import (
-	"errors"
-	"net/http"
 	"strings"
 	"testing"
 
@@ -19,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",
@@ -36,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{})
@@ -67,241 +62,45 @@ func TestBaseURLResolveBaseURL(t *testing.T) {
 		}
 	})
 
-	t.Run("unconfirmed selected block stays neutral", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(baseBlockListResolveStub("bas123",
-			map[string]interface{}{"id": "tbl_other", "type": "table", "name": "Other"},
-		))
+	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("block list error is returned", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(baseBlockListScopeErrorStub("bas123"))
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve", "--url", "https://example.larkoffice.com/base/bas123?table=tbl123&view=vew_stale", "--as", "bot",
-		}, factory, stdout)
-		assertBaseBlockReadPermissionError(t, err, stdout)
-	})
-
-	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 baseBlockListScopeErrorStub(baseToken string) *httpmock.Stub {
-	return &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/base/v3/bases/" + baseToken + "/blocks/list",
-		Body: map[string]interface{}{
-			"code": 99991672,
-			"msg":  "access denied",
-			"error": map[string]interface{}{
-				"permission_violations": []interface{}{
-					map[string]interface{}{"subject": "base:block:read"},
-				},
-			},
-		},
-	}
 }
 
 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",
@@ -315,70 +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 table coordinates return block list error", func(t *testing.T) {
-		factory, stdout, reg := newExecuteFactory(t)
-		reg.Register(wikiBaseNodeStub("wik123", "bas123", "Demo Base"))
-		reg.Register(baseBlockListScopeErrorStub("bas123"))
-
-		err := runShortcutWithAuthTypes(t, BaseURLResolve, authTypes(), []string{
-			"+url-resolve",
-			"--url", "https://example.larkoffice.com/wiki/wik123?table=tbl123&view=vew_stale",
-			"--as", "bot",
-		}, factory, stdout)
-		assertBaseBlockReadPermissionError(t, err, stdout)
-	})
-
-	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{
@@ -401,50 +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 assertBaseBlockReadPermissionError(t *testing.T, err error, stdout interface {
-	Len() int
-	String() string
-}) {
-	t.Helper()
-	if err == nil {
-		t.Fatal("expected block-list error to be returned")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed problem, got %T %v", err, err)
-	}
-	if p.Category != errs.CategoryAuthorization || p.Subtype != errs.SubtypeAppScopeNotApplied || p.Code != 99991672 {
-		t.Fatalf("unexpected problem: %#v", p)
-	}
-	var permissionErr *errs.PermissionError
-	if !errors.As(err, &permissionErr) {
-		t.Fatalf("expected PermissionError, got %T %v", err, err)
-	}
-	if len(permissionErr.MissingScopes) != 1 || permissionErr.MissingScopes[0] != "base:block:read" {
-		t.Fatalf("missing scopes=%v", permissionErr.MissingScopes)
-	}
-	if stdout.Len() != 0 {
-		t.Fatalf("stdout should stay empty when block-list fails: %s", stdout.String())
-	}
-}
-
 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
@@ -2103,8 +2056,8 @@ func TestBaseFormSubmitShortcut(t *testing.T) {
 		if s.Service != "base" {
 			t.Fatalf("Service=%q want base", s.Service)
 		}
-		if s.Risk != "high-risk-write" {
-			t.Fatalf("Risk=%q want high-risk-write", s.Risk)
+		if s.Risk != "write" {
+			t.Fatalf("Risk=%q want write", s.Risk)
 		}
 		if !s.HasFormat {
 			t.Fatal("HasFormat should be true")
@@ -2404,7 +2357,6 @@ func TestExecuteFormSubmit(t *testing.T) {
 			"+form-submit",
 			"--share-token", "shr_exec1",
 			"--json", `{"fields":{"Name":"Alice","Rating":5}}`,
-			"--yes",
 		}
 		if err := runShortcut(t, BaseFormSubmit, args, factory, stdout); err != nil {
 			t.Fatalf("err=%v", err)
@@ -2473,7 +2425,6 @@ func TestExecuteFormSubmit(t *testing.T) {
 			"--share-token", "shr_exec6",
 			"--base-token", "bas_exec6",
 			"--json", `{"attachments":{"File":["./nonexistent.pdf"]}}`,
-			"--yes",
 		}
 		err := runShortcut(t, BaseFormSubmit, args, factory, stdout)
 		if err == nil {
@@ -2522,7 +2473,6 @@ func TestExecuteFormSubmit(t *testing.T) {
 			"--share-token", "shr_dedup",
 			"--base-token", "bas_dedup",
 			"--json", `{"attachments":{"FieldA":["./shared.pdf"],"FieldB":["./shared.pdf"]}}`,
-			"--yes",
 		}
 		if err := runShortcut(t, BaseFormSubmit, args, factory, stdout); err != nil {
 			t.Fatalf("err=%v", err)
@@ -2534,33 +2484,6 @@ func TestExecuteFormSubmit(t *testing.T) {
 	})
 }
 
-// TestFormSubmitRequiresConfirmation pins the high-risk-write classification:
-// without --yes the runner's confirmation gate must fire before Execute runs,
-// returning a typed confirmation_required error and touching no API.
-func TestFormSubmitRequiresConfirmation(t *testing.T) {
-	if BaseFormSubmit.Risk != "high-risk-write" {
-		t.Fatalf("Risk=%q want high-risk-write", BaseFormSubmit.Risk)
-	}
-
-	factory, stdout, _ := newExecuteFactory(t)
-	args := []string{
-		"+form-submit",
-		"--share-token", "shr_confirm",
-		"--json", `{"fields":{"Rating":5}}`,
-	}
-	err := runShortcut(t, BaseFormSubmit, args, factory, stdout)
-	if err == nil {
-		t.Fatal("expected confirmation_required error without --yes")
-	}
-	problem, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed error, got %T: %v", err, err)
-	}
-	if problem.Subtype != errs.SubtypeConfirmationRequired {
-		t.Fatalf("subtype=%q want %q", problem.Subtype, errs.SubtypeConfirmationRequired)
-	}
-}
-
 func TestUploadAttachmentsParallel(t *testing.T) {
 	t.Run("single file upload via execute path", func(t *testing.T) {
 		tmpDir := t.TempDir()
@@ -2597,7 +2520,6 @@ func TestUploadAttachmentsParallel(t *testing.T) {
 			"--share-token", "shr_para1",
 			"--base-token", "bas_para1",
 			"--json", `{"attachments":{"Doc":["./doc.txt"]}}`,
-			"--yes",
 		}
 		if err := runShortcut(t, BaseFormSubmit, args, factory, stdout); err != nil {
 			t.Fatalf("err=%v", err)
@@ -2632,7 +2554,6 @@ func TestUploadAttachmentsParallel(t *testing.T) {
 			"--share-token", "shr_err",
 			"--base-token", "bas_err",
 			"--json", `{"attachments":{"Bad":["./bad.txt"]}}`,
-			"--yes",
 		}
 		err := runShortcut(t, BaseFormSubmit, args, factory, stdout)
 		if err == nil {

shortcuts/calendar/calendar_agenda.go

@@ -250,8 +250,6 @@ var CalendarAgenda = common.Shortcut{
 					}
 				}
 
-				collapseDescription(e)
-
 				filtered = append(filtered, e)
 			}
 		}

shortcuts/calendar/calendar_create.go

@@ -20,6 +20,7 @@ import (
 func buildEventData(runtime *common.RuntimeContext, startTs, endTs string) map[string]interface{} {
 	eventData := map[string]interface{}{
 		"summary":          runtime.Str("summary"),
+		"description":      runtime.Str("description"),
 		"start_time":       map[string]string{"timestamp": startTs},
 		"end_time":         map[string]string{"timestamp": endTs},
 		"attendee_ability": "can_modify_event",
@@ -32,9 +33,6 @@ func buildEventData(runtime *common.RuntimeContext, startTs, endTs string) map[s
 	if rrule := runtime.Str("rrule"); rrule != "" {
 		eventData["recurrence"] = rrule
 	}
-	if description := descriptionToSend(runtime); description != "" {
-		eventData["description_rich"] = description
-	}
 	return eventData
 }
 
@@ -120,7 +118,7 @@ var CalendarCreate = common.Shortcut{
 		{Name: "summary", Desc: "event title"},
 		{Name: "start", Desc: "start time (ISO 8601)", Required: true},
 		{Name: "end", Desc: "end time (ISO 8601)", Required: true},
-		{Name: "description", Desc: "event description as Markdown (@file or - for stdin); the unified description field. Supports bold/italic/underline/strikethrough, links, headings (`#`..`###`), blockquotes (`>`), ordered/unordered lists, horizontal rules (`---`), GFM tables, and images (`![name](url)`; a remote URL is used as-is, and a local image path relative to and inside the current working directory is auto-uploaded to Lark drive and rendered inline — absolute/out-of-cwd paths are rejected). A Lark doc URL (bare or as a Markdown link) is auto-resolved to an inline doc-mention chip showing its title. Inside a GFM table cell, stack multiple lines with `<br>`; each line may itself be an ordered/unordered list item, image or styled text (e.g. `1. a<br>2. b`, `- x<br>- y`, `![p](url)<br>**bold**`).", Input: []string{common.File, common.Stdin}},
+		{Name: "description", Desc: "event description"},
 		{Name: "attendee-ids", Desc: "attendee IDs, comma-separated (supports user ou_, chat oc_, room omm_)"},
 		{Name: "calendar-id", Desc: "calendar ID (default: primary)"},
 		{Name: "rrule", Desc: "recurrence rule (rfc5545)"},
@@ -233,9 +231,6 @@ var CalendarCreate = common.Shortcut{
 		if err != nil {
 			return errs.NewValidationError(errs.SubtypeInvalidArgument, "--end: %v", err).WithParam("--end")
 		}
-		if err := resolveDescriptionImages(runtime, calendarId); err != nil {
-			return err
-		}
 
 		eventData := buildEventData(runtime, startTs, endTs)
 

shortcuts/calendar/calendar_get.go

@@ -81,7 +81,6 @@ type calendarEvent struct {
 	OrganizerCalendarID string                    `json:"organizer_calendar_id,omitempty"`
 	Summary             string                    `json:"summary,omitempty"`
 	Description         string                    `json:"description,omitempty"`
-	DescriptionRich     string                    `json:"description_rich,omitempty"`
 	StartTime           *calendarEventTime        `json:"start_time,omitempty"`
 	EndTime             *calendarEventTime        `json:"end_time,omitempty"`
 	VChat               *calendarEventVChat       `json:"vchat,omitempty"`
@@ -170,7 +169,7 @@ func buildCalendarEventOutput(event *calendarEvent) (map[string]interface{}, err
 	if status, _ := out["status"].(string); status != "cancelled" {
 		delete(out, "status")
 	}
-	collapseDescription(out)
+
 	return out, nil
 }
 

shortcuts/calendar/calendar_test.go

@@ -988,15 +988,9 @@ func TestUpdate_PatchEventOnly(t *testing.T) {
 	if err := json.Unmarshal(stub.CapturedBody, &body); err != nil {
 		t.Fatalf("unmarshal captured patch body: %v", err)
 	}
-	// --description is the unified field, treated as rich text and sent as
-	// description_rich; the CLI never sends the plain description field
-	// (mutually exclusive downstream).
-	if body["summary"] != "Updated Meeting" || body["description_rich"] != "Updated description" {
+	if body["summary"] != "Updated Meeting" || body["description"] != "Updated description" {
 		t.Fatalf("unexpected patch body: %#v", body)
 	}
-	if _, ok := body["description"]; ok {
-		t.Fatalf("plain description must not be sent, got: %#v", body)
-	}
 	if body["need_notification"] != false {
 		t.Fatalf("need_notification = %#v, want false", body["need_notification"])
 	}
@@ -1370,62 +1364,6 @@ func TestAgenda_Success(t *testing.T) {
 	}
 }
 
-func TestAgenda_UnifiesDescriptionRich(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, defaultConfig())
-
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/events/instance_view",
-		Body: map[string]interface{}{
-			"code": 0, "msg": "ok",
-			"data": map[string]interface{}{
-				"items": []interface{}{
-					map[string]interface{}{
-						"event_id":         "evt_rich",
-						"summary":          "Rich",
-						"status":           "confirmed",
-						"description":      "[测试]\n友情提醒",
-						"description_rich": "友情提醒",
-						"start_time":       map[string]interface{}{"timestamp": "1742515200"},
-						"end_time":         map[string]interface{}{"timestamp": "1742518800"},
-					},
-					map[string]interface{}{
-						"event_id":    "evt_plain",
-						"summary":     "Plain",
-						"status":      "confirmed",
-						"description": "just text",
-						"start_time":  map[string]interface{}{"timestamp": "1742515200"},
-						"end_time":    map[string]interface{}{"timestamp": "1742518800"},
-					},
-				},
-			},
-		},
-	})
-
-	err := mountAndRun(t, CalendarAgenda, []string{
-		"+agenda",
-		"--start", "2025-03-21",
-		"--end", "2025-03-21",
-		"--as", "bot",
-	}, f, stdout)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	out := stdout.String()
-	// Read exposes a single unified description field: it carries the rich
-	// (Markdown) value when present, and the plain text otherwise. The internal
-	// description_rich key is never surfaced.
-	if !strings.Contains(out, "\"description\": \"友情提醒\"") {
-		t.Errorf("expected rich value surfaced under description, got: %s", out)
-	}
-	if !strings.Contains(out, "\"description\": \"just text\"") {
-		t.Errorf("expected plain description surfaced for plain-only event, got: %s", out)
-	}
-	if strings.Contains(out, "description_rich") {
-		t.Errorf("description_rich must not appear in output, got: %s", out)
-	}
-}
-
 func TestAgenda_EmptyResult(t *testing.T) {
 	f, stdout, _, reg := cmdutil.TestFactory(t, defaultConfig())
 
@@ -3437,72 +3375,6 @@ func TestGet_Success_FlattensAndConvertsTimes(t *testing.T) {
 	}
 }
 
-func TestGet_UnifiesDescriptionRich(t *testing.T) {
-	// Read exposes a single unified description field carrying the rich value
-	// when present, and the plain text otherwise; description_rich is dropped.
-	t.Run("rich present", func(t *testing.T) {
-		f, stdout, _, reg := cmdutil.TestFactory(t, defaultConfig())
-		reg.Register(&httpmock.Stub{
-			Method: "GET",
-			URL:    "/open-apis/calendar/v4/calendars/cal_test123/events/evt_rich",
-			Body: map[string]interface{}{
-				"code": 0, "msg": "success",
-				"data": map[string]interface{}{
-					"event": map[string]interface{}{
-						"event_id":         "evt_rich",
-						"summary":          "Rich",
-						"description":      "[表格]",
-						"description_rich": "| a | b |\n| --- | --- |\n| c | d |",
-						"start_time":       map[string]interface{}{"timestamp": "1742515200", "timezone": "Asia/Shanghai"},
-						"end_time":         map[string]interface{}{"timestamp": "1742518800", "timezone": "Asia/Shanghai"},
-					},
-				},
-			},
-		})
-		if err := mountAndRun(t, CalendarGet, []string{"+get", "--calendar-id", "cal_test123", "--event-id", "evt_rich", "--as", "bot"}, f, stdout); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-		out := stdout.String()
-		if !strings.Contains(out, "| a | b |") {
-			t.Errorf("expected rich value surfaced under description, got: %s", out)
-		}
-		if strings.Contains(out, "description_rich") {
-			t.Errorf("description_rich must not appear in output, got: %s", out)
-		}
-	})
-
-	// When only a plain description exists, it is surfaced under description.
-	t.Run("only plain surfaces under description", func(t *testing.T) {
-		f, stdout, _, reg := cmdutil.TestFactory(t, defaultConfig())
-		reg.Register(&httpmock.Stub{
-			Method: "GET",
-			URL:    "/open-apis/calendar/v4/calendars/cal_test123/events/evt_plain",
-			Body: map[string]interface{}{
-				"code": 0, "msg": "success",
-				"data": map[string]interface{}{
-					"event": map[string]interface{}{
-						"event_id":    "evt_plain",
-						"summary":     "Plain",
-						"description": "just text",
-						"start_time":  map[string]interface{}{"timestamp": "1742515200", "timezone": "Asia/Shanghai"},
-						"end_time":    map[string]interface{}{"timestamp": "1742518800", "timezone": "Asia/Shanghai"},
-					},
-				},
-			},
-		})
-		if err := mountAndRun(t, CalendarGet, []string{"+get", "--calendar-id", "cal_test123", "--event-id", "evt_plain", "--as", "bot"}, f, stdout); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-		out := stdout.String()
-		if !strings.Contains(out, "\"description\": \"just text\"") {
-			t.Errorf("expected plain description surfaced, got: %s", out)
-		}
-		if strings.Contains(out, "description_rich") {
-			t.Errorf("description_rich must not appear in output, got: %s", out)
-		}
-	})
-}
-
 func TestGet_CancelledStatus_PreservesStatus(t *testing.T) {
 	f, stdout, _, reg := cmdutil.TestFactory(t, defaultConfig())
 

shortcuts/calendar/calendar_update.go

@@ -29,7 +29,7 @@ var CalendarUpdate = common.Shortcut{
 		{Name: "event-id", Desc: "event ID to update", Required: true},
 		{Name: "calendar-id", Desc: "calendar ID (default: primary)"},
 		{Name: "summary", Desc: "event title"},
-		{Name: "description", Desc: "event description as Markdown (@file or - for stdin); the unified description field. Supports bold/italic/underline/strikethrough, links, headings (`#`..`###`), blockquotes (`>`), ordered/unordered lists, horizontal rules (`---`), GFM tables, and images (`![name](url)`; a remote URL is used as-is, and a local image path relative to and inside the current working directory is auto-uploaded to Lark drive and rendered inline — absolute/out-of-cwd paths are rejected). A Lark doc URL (bare or as a Markdown link) is auto-resolved to an inline doc-mention chip showing its title. Inside a GFM table cell, stack multiple lines with `<br>`; each line may itself be an ordered/unordered list item, image or styled text (e.g. `1. a<br>2. b`, `- x<br>- y`, `![p](url)<br>**bold**`). Passing an empty string clears the description.", Input: []string{common.File, common.Stdin}},
+		{Name: "description", Desc: "event description"},
 		{Name: "start", Desc: "new start time (ISO 8601); requires --end"},
 		{Name: "end", Desc: "new end time (ISO 8601); requires --start"},
 		{Name: "rrule", Desc: "recurrence rule (rfc5545)"},
@@ -109,13 +109,11 @@ func buildCalendarUpdateEventData(runtime *common.RuntimeContext) (map[string]in
 	body := map[string]interface{}{}
 	hasFields := false
 
-	if runtime.Cmd.Flags().Changed("summary") {
-		body["summary"] = runtime.Str("summary")
-		hasFields = true
-	}
-	if runtime.Cmd.Flags().Changed("description") {
-		body["description_rich"] = runtime.Str("description")
-		hasFields = true
+	for _, field := range []string{"summary", "description"} {
+		if runtime.Cmd.Flags().Changed(field) {
+			body[field] = runtime.Str(field)
+			hasFields = true
+		}
 	}
 	if runtime.Cmd.Flags().Changed("rrule") {
 		rrule := strings.TrimSpace(runtime.Str("rrule"))
@@ -358,12 +356,6 @@ func executeCalendarUpdate(ctx context.Context, runtime *common.RuntimeContext)
 		return errs.NewValidationError(errs.SubtypeInvalidArgument, "specify --event-id").WithParam("--event-id")
 	}
 
-	if runtime.Cmd.Flags().Changed("description") {
-		if err := resolveDescriptionImages(runtime, calendarID); err != nil {
-			return err
-		}
-	}
-
 	body, hasEventFields, err := buildCalendarUpdateEventData(runtime)
 	if err != nil {
 		return err
@@ -436,10 +428,8 @@ func calendarUpdateResult(eventID string, event map[string]interface{}, addedCou
 	if summary, _ := event["summary"].(string); summary != "" {
 		result["summary"] = summary
 	}
-	if rich, _ := event["description_rich"].(string); rich != "" {
-		result["description"] = rich
-	} else if plain, _ := event["description"].(string); plain != "" {
-		result["description"] = plain
+	if description, _ := event["description"].(string); description != "" {
+		result["description"] = description
 	}
 	if start := formatCalendarEventTime(event["start_time"]); start != "" {
 		result["start"] = start

shortcuts/calendar/description_rich_images.go

@@ -1,172 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package calendar
-
-import (
-	"fmt"
-	"image"
-
-	// Register the common image decoders so DecodeConfig can read intrinsic
-	// dimensions for PNG/JPEG/GIF sources.
-	_ "image/gif"
-	_ "image/jpeg"
-	_ "image/png"
-	"net/url"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/core"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-const calendarMediaParentType = "calendar"
-
-var markdownImageRe = regexp.MustCompile(`!\[([^\]]*)\]\(([^)]*)\)`)
-
-func resolveDescriptionImages(runtime *common.RuntimeContext, calendarID string) error {
-	md := runtime.Str("description")
-	if md == "" || !strings.Contains(md, "![") {
-		return nil
-	}
-	rewritten, changed, err := uploadLocalDescriptionImages(runtime, calendarID, md)
-	if err != nil {
-		return err
-	}
-	if changed {
-		if err := runtime.Cmd.Flags().Set("description", rewritten); err != nil {
-			return errs.NewInternalError(errs.SubtypeUnknown, "failed to update --description after image upload: %v", err).WithCause(err)
-		}
-	}
-	return nil
-}
-
-func uploadLocalDescriptionImages(runtime *common.RuntimeContext, calendarID, md string) (string, bool, error) {
-	matches := markdownImageRe.FindAllStringSubmatchIndex(md, -1)
-	if len(matches) == 0 {
-		return md, false, nil
-	}
-	var out strings.Builder
-	last := 0
-	changed := false
-	cache := map[string]string{}
-	for _, m := range matches {
-		altStart, altEnd, srcStart, srcEnd := m[2], m[3], m[4], m[5]
-		src := strings.TrimSpace(md[srcStart:srcEnd])
-		if !isLocalImageSrc(src) {
-			continue
-		}
-		alt := md[altStart:altEnd]
-		uploadedURL, err := resolveLocalImage(runtime, calendarID, src, alt, cache)
-		if err != nil {
-			return "", false, err
-		}
-		out.WriteString(md[last:srcStart])
-		out.WriteString(uploadedURL)
-		last = srcEnd
-		changed = true
-	}
-	if !changed {
-		return md, false, nil
-	}
-	out.WriteString(md[last:])
-	return out.String(), true, nil
-}
-
-func resolveLocalImage(runtime *common.RuntimeContext, calendarID, src, alt string, cache map[string]string) (string, error) {
-	localPath := localImagePath(src)
-	if cached, ok := cache[localPath]; ok {
-		return cached, nil
-	}
-
-	safePath, err := validate.SafeInputPath(localPath)
-	if err != nil {
-		return "", errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"--description image %q could not be read: %v", src, err).
-			WithParam("--description").
-			WithHint("reference local images by a path inside the current working directory (e.g. ./images/pic.png; cd there first), or use an already-uploaded Lark image URL").
-			WithCause(err)
-	}
-
-	info, err := runtime.FileIO().Stat(localPath)
-	if err != nil {
-		return "", common.WrapInputStatErrorTyped(err)
-	}
-
-	fileToken, err := common.UploadDriveMediaAllTyped(runtime, common.DriveMediaUploadAllConfig{
-		FilePath:   localPath,
-		FileName:   filepath.Base(safePath),
-		FileSize:   info.Size(),
-		ParentType: calendarMediaParentType,
-		ParentNode: &calendarID,
-	})
-	if err != nil {
-		return "", err
-	}
-
-	width, height := decodeImageDimensions(runtime, localPath)
-	uploadedURL := buildCalendarImagePreviewURL(runtime.Config.Brand, fileToken, width, height, info.Size())
-	cache[localPath] = uploadedURL
-	return uploadedURL, nil
-}
-
-func decodeImageDimensions(runtime *common.RuntimeContext, path string) (int, int) {
-	f, err := runtime.FileIO().Open(path)
-	if err != nil {
-		return 0, 0
-	}
-	defer f.Close()
-	cfg, _, err := image.DecodeConfig(f)
-	if err != nil {
-		return 0, 0
-	}
-	return cfg.Width, cfg.Height
-}
-
-func isLocalImageSrc(src string) bool {
-	if src == "" {
-		return false
-	}
-	lower := strings.ToLower(src)
-	switch {
-	case strings.HasPrefix(lower, "http://"), strings.HasPrefix(lower, "https://"), strings.HasPrefix(lower, "data:"):
-		return false
-	case strings.HasPrefix(lower, "file://"):
-		return true
-	}
-	if i := strings.Index(src, "://"); i > 0 {
-		return false
-	}
-	return true
-}
-
-func localImagePath(src string) string {
-	s := strings.TrimSpace(src)
-	if strings.HasPrefix(strings.ToLower(s), "file://") {
-		if u, err := url.Parse(s); err == nil && u.Path != "" {
-			s = u.Path
-		}
-	}
-	if decoded, err := url.PathUnescape(s); err == nil {
-		return decoded
-	}
-	return s
-}
-
-func buildCalendarImagePreviewURL(brand core.LarkBrand, fileToken string, width, height int, size int64) string {
-	host := "internal-api-drive-stream.feishu.cn"
-	if brand == core.BrandLark {
-		host = "internal-api-drive-stream.larksuite.com"
-	}
-	u := fmt.Sprintf("https://%s/space/api/box/stream/download/preview/%s?preview_type=16", host, fileToken)
-	if width > 0 && height > 0 {
-		u += fmt.Sprintf("&im_w=%d&im_h=%d", width, height)
-	}
-	if size > 0 {
-		u += fmt.Sprintf("&im_size=%d", size)
-	}
-	return u
-}

shortcuts/calendar/description_rich_images_test.go

@@ -1,279 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package calendar
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"image"
-	"image/png"
-	"net/url"
-	"os"
-	"path/filepath"
-	"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"
-)
-
-func TestIsLocalImageSrc(t *testing.T) {
-	cases := []struct {
-		src  string
-		want bool
-	}{
-		{"./images/pic.png", true},
-		{"images/pic.png", true},
-		{"../assets/a.png", true},
-		{"/Users/me/Desktop/a.png", true},
-		{`C:\Users\me\a.png`, true},
-		{"file:///Users/me/a.png", true},
-		{"图片和附件/测试图片.png", true},
-		{"https://example.com/a.png", false},
-		{"http://example.com/a.png", false},
-		{"HTTPS://EXAMPLE.com/a.png", false},
-		{"data:image/png;base64,iVBOR", false},
-		{"ftp://host/a.png", false},
-		{"", false},
-	}
-	for _, c := range cases {
-		if got := isLocalImageSrc(c.src); got != c.want {
-			t.Errorf("isLocalImageSrc(%q) = %v, want %v", c.src, got, c.want)
-		}
-	}
-}
-
-func TestLocalImagePath(t *testing.T) {
-	cases := []struct{ in, want string }{
-		{"images/pic.png", "images/pic.png"},
-		{"images/my%20pic.png", "images/my pic.png"},
-		{"file:///Users/me/a.png", "/Users/me/a.png"},
-	}
-	for _, c := range cases {
-		if got := localImagePath(c.in); got != c.want {
-			t.Errorf("localImagePath(%q) = %q, want %q", c.in, got, c.want)
-		}
-	}
-}
-
-// TestBuildCalendarImagePreviewURL guards the contract the OpenAPI service
-// relies on: a Lark host (so token extraction triggers) whose final path
-// segment is exactly the uploaded file token.
-func TestBuildCalendarImagePreviewURL(t *testing.T) {
-	for _, tc := range []struct {
-		brand    core.LarkBrand
-		hostFrag string
-	}{
-		{core.BrandFeishu, "feishu.cn"},
-		{core.BrandLark, "larksuite"},
-	} {
-		raw := buildCalendarImagePreviewURL(tc.brand, "boxcnTOKEN123", 416, 306, 142568)
-		u, err := url.Parse(raw)
-		if err != nil {
-			t.Fatalf("built URL not parseable: %v", err)
-		}
-		if !strings.Contains(u.Host, tc.hostFrag) {
-			t.Errorf("brand %s host = %q, want fragment %q", tc.brand, u.Host, tc.hostFrag)
-		}
-		segs := strings.Split(strings.Trim(u.Path, "/"), "/")
-		if last := segs[len(segs)-1]; last != "boxcnTOKEN123" {
-			t.Errorf("last path segment = %q, want token", last)
-		}
-		q := u.Query()
-		if q.Get("im_w") != "416" || q.Get("im_h") != "306" || q.Get("im_size") != "142568" {
-			t.Errorf("dimension params missing: im_w=%q im_h=%q im_size=%q", q.Get("im_w"), q.Get("im_h"), q.Get("im_size"))
-		}
-	}
-
-	// With unknown dimensions the helper params are omitted entirely.
-	raw := buildCalendarImagePreviewURL(core.BrandFeishu, "boxcnTOKEN123", 0, 0, 0)
-	if strings.Contains(raw, "im_w") || strings.Contains(raw, "im_size") {
-		t.Errorf("expected no dimension params for unknown size, got %q", raw)
-	}
-}
-
-// TestUploadLocalDescriptionImages_RemoteUntouched verifies remote/data images
-// pass through unchanged and never trigger an upload (runtime unused → nil).
-func TestUploadLocalDescriptionImages_RemoteUntouched(t *testing.T) {
-	md := "text ![a](https://example.com/a.png) more ![b](data:image/png;base64,xx)"
-	got, changed, err := uploadLocalDescriptionImages(nil, "cal", md)
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	if changed {
-		t.Errorf("changed = true, want false")
-	}
-	if got != md {
-		t.Errorf("markdown mutated: %q", got)
-	}
-}
-
-// TestCreate_UploadsLocalDescriptionImage runs +create with a local image path,
-// mocks the drive upload, and asserts the create body's description_rich carries
-// the uploaded token (not the local path).
-func TestCreate_UploadsLocalDescriptionImage(t *testing.T) {
-	dir := t.TempDir()
-	orig, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Chdir(dir); err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(orig)
-	if err := os.WriteFile(filepath.Join(dir, "pic.png"), []byte("PNGDATA"), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	f, stdout, _, reg := cmdutil.TestFactory(t, defaultConfig())
-
-	uploadStub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/medias/upload_all",
-		Body:   map[string]interface{}{"code": 0, "msg": "ok", "data": map[string]interface{}{"file_token": "boxcnTOKEN123"}},
-	}
-	reg.Register(uploadStub)
-
-	createStub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/calendar/v4/calendars/cal_test123/events",
-		Body: map[string]interface{}{"code": 0, "msg": "ok", "data": map[string]interface{}{
-			"event": map[string]interface{}{
-				"event_id":   "evt_001",
-				"summary":    "Pic",
-				"start_time": map[string]interface{}{"timestamp": "1742515200"},
-				"end_time":   map[string]interface{}{"timestamp": "1742518800"},
-			},
-		}},
-	}
-	reg.Register(createStub)
-
-	runErr := mountAndRun(t, CalendarCreate, []string{
-		"+create",
-		"--summary", "Pic",
-		"--start", "2025-03-21T00:00:00+08:00",
-		"--end", "2025-03-21T01:00:00+08:00",
-		"--calendar-id", "cal_test123",
-		"--description", "![pic](./pic.png)",
-		"--as", "bot",
-	}, f, stdout)
-	if runErr != nil {
-		t.Fatalf("unexpected error: %v", runErr)
-	}
-
-	if uploadStub.CapturedBody == nil {
-		t.Fatalf("expected drive upload to be called")
-	}
-	if createStub.CapturedBody == nil {
-		t.Fatalf("expected create event to be called")
-	}
-	var body map[string]interface{}
-	if err := json.Unmarshal(createStub.CapturedBody, &body); err != nil {
-		t.Fatalf("create body unmarshal: %v", err)
-	}
-	dr, _ := body["description_rich"].(string)
-	if !strings.Contains(dr, "boxcnTOKEN123") {
-		t.Fatalf("description_rich should contain uploaded token, got %q", dr)
-	}
-	if strings.Contains(dr, "./pic.png") {
-		t.Fatalf("local path should be rewritten away, got %q", dr)
-	}
-}
-
-// TestCreate_LocalImageCarriesDimensions verifies a real decodable image's
-// intrinsic width/height and byte size are appended to the rewritten drive URL
-// (so the facade can populate originalWidth/originalHeight and the client can
-// render the image inline).
-func TestCreate_LocalImageCarriesDimensions(t *testing.T) {
-	dir := t.TempDir()
-	orig, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Chdir(dir); err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(orig)
-
-	var buf bytes.Buffer
-	if err := png.Encode(&buf, image.NewRGBA(image.Rect(0, 0, 5, 7))); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(dir, "pic.png"), buf.Bytes(), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	f, stdout, _, reg := cmdutil.TestFactory(t, defaultConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/drive/v1/medias/upload_all",
-		Body:   map[string]interface{}{"code": 0, "msg": "ok", "data": map[string]interface{}{"file_token": "boxcnTOKEN123"}},
-	})
-	createStub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/calendar/v4/calendars/cal_test123/events",
-		Body: map[string]interface{}{"code": 0, "msg": "ok", "data": map[string]interface{}{
-			"event": map[string]interface{}{
-				"event_id":   "evt_001",
-				"summary":    "Pic",
-				"start_time": map[string]interface{}{"timestamp": "1742515200"},
-				"end_time":   map[string]interface{}{"timestamp": "1742518800"},
-			},
-		}},
-	}
-	reg.Register(createStub)
-
-	runErr := mountAndRun(t, CalendarCreate, []string{
-		"+create",
-		"--summary", "Pic",
-		"--start", "2025-03-21T00:00:00+08:00",
-		"--end", "2025-03-21T01:00:00+08:00",
-		"--calendar-id", "cal_test123",
-		"--description", "![pic](./pic.png)",
-		"--as", "bot",
-	}, f, stdout)
-	if runErr != nil {
-		t.Fatalf("unexpected error: %v", runErr)
-	}
-	var body map[string]interface{}
-	if err := json.Unmarshal(createStub.CapturedBody, &body); err != nil {
-		t.Fatalf("create body unmarshal: %v", err)
-	}
-	dr, _ := body["description_rich"].(string)
-	if !strings.Contains(dr, "im_w=5") || !strings.Contains(dr, "im_h=7") {
-		t.Fatalf("description_rich should carry image dimensions, got %q", dr)
-	}
-	if !strings.Contains(dr, "im_size=") {
-		t.Fatalf("description_rich should carry image byte size, got %q", dr)
-	}
-}
-
-// TestCreate_LocalImageAbsolutePathRejected verifies an out-of-cwd absolute path
-// yields a typed --description validation error before any API call.
-func TestCreate_LocalImageAbsolutePathRejected(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, defaultConfig())
-
-	runErr := mountAndRun(t, CalendarCreate, []string{
-		"+create",
-		"--summary", "Pic",
-		"--start", "2025-03-21T00:00:00+08:00",
-		"--end", "2025-03-21T01:00:00+08:00",
-		"--calendar-id", "cal_test123",
-		"--description", "![p](/etc/hosts)",
-		"--as", "bot",
-	}, f, stdout)
-	if runErr == nil {
-		t.Fatalf("expected error for absolute image path")
-	}
-	var ve *errs.ValidationError
-	if !errors.As(runErr, &ve) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", runErr, runErr)
-	}
-	if ve.Param != "--description" {
-		t.Errorf("param = %q, want --description", ve.Param)
-	}
-}

shortcuts/calendar/helpers.go

@@ -30,26 +30,6 @@ func resolveStartEnd(runtime *common.RuntimeContext) (string, string) {
 	return startInput, endInput
 }
 
-func collapseDescription(event map[string]interface{}) {
-	if event == nil {
-		return
-	}
-	rich, _ := event["description_rich"].(string)
-	plain, _ := event["description"].(string)
-	delete(event, "description_rich")
-	switch {
-	case rich != "":
-		event["description"] = rich
-	case plain != "":
-		event["description"] = plain
-	default:
-		delete(event, "description")
-	}
-}
-func descriptionToSend(runtime *common.RuntimeContext) string {
-	return runtime.Str("description")
-}
-
 func hasExplicitBotFlag(cmd *cobra.Command) bool {
 	if cmd == nil {
 		return false

shortcuts/common/localfile.go

@@ -1,146 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package common
-
-import (
-	"errors"
-	"io"
-	"io/fs"
-	"math"
-	"strings"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/extension/fileio"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/validate"
-)
-
-// ValidateLocalFileFlag validates that a local input path exists, is a regular
-// file, and does not exceed maxBytes. Absolute and relative paths use
-// the process filesystem namespace.
-func (ctx *RuntimeContext) ValidateLocalFileFlag(flagName string, maxBytes int64) error {
-	path, param, err := ctx.localFileFlag(flagName, maxBytes)
-	if err != nil {
-		return err
-	}
-
-	info, err := cmdutil.StatLocalFile(path)
-	if err != nil {
-		return localFileReadError(param, path, "inspect", err)
-	}
-	if err := localFileRegularError(param, path, info.Mode()); err != nil {
-		return err
-	}
-	if info.Size() > maxBytes {
-		return localFileSizeError(param, path, info.Size(), maxBytes)
-	}
-	return nil
-}
-
-// ReadLocalFileFlag is the shared replacement for direct os.ReadFile calls in
-// shortcuts. It accepts absolute and relative paths, enforces a hard size
-// limit, and returns command-facing typed errors.
-func (ctx *RuntimeContext) ReadLocalFileFlag(flagName string, maxBytes int64) (data []byte, retErr error) {
-	path, param, err := ctx.localFileFlag(flagName, maxBytes)
-	if err != nil {
-		return nil, err
-	}
-	f, err := cmdutil.OpenLocalFile(path)
-	if err != nil {
-		return nil, localFileReadError(param, path, "open", err)
-	}
-	defer func() {
-		if err := f.Close(); err != nil && retErr == nil {
-			data = nil
-			retErr = errs.NewInternalError(errs.SubtypeFileIO, "cannot close %s %q: %v", param, path, err).WithCause(err)
-		}
-	}()
-
-	openedInfo, err := f.Stat()
-	if err != nil {
-		return nil, localFileReadError(param, path, "inspect opened", err)
-	}
-	if err := localFileRegularError(param, path, openedInfo.Mode()); err != nil {
-		return nil, err
-	}
-	if openedInfo.Size() > maxBytes {
-		return nil, localFileSizeError(param, path, openedInfo.Size(), maxBytes)
-	}
-
-	readLimit := maxBytes + 1
-	if maxBytes == math.MaxInt64 {
-		readLimit = maxBytes
-	}
-	data, err = io.ReadAll(io.LimitReader(f, readLimit))
-	if err != nil {
-		return nil, localFileReadError(param, path, "read", err)
-	}
-	if int64(len(data)) > maxBytes {
-		return nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"%s %q grew beyond the %d-byte limit while being read", param, path, maxBytes).
-			WithParam(param)
-	}
-	return data, nil
-}
-
-func (ctx *RuntimeContext) localFileFlag(flagName string, maxBytes int64) (path, param string, err error) {
-	name, param, err := localFileFlagNames(flagName)
-	if err != nil {
-		return "", "", err
-	}
-	if ctx == nil || ctx.Cmd == nil {
-		return "", param, errs.NewInternalError(errs.SubtypeUnknown, "cannot read %s: runtime command is unavailable", param)
-	}
-
-	path = strings.TrimSpace(ctx.Str(name))
-	if path == "" {
-		return "", param, errs.NewValidationError(errs.SubtypeInvalidArgument, "%s is required", param).WithParam(param)
-	}
-	if _, err := validate.LocalInputPath(path); err != nil {
-		return "", param, errs.NewValidationError(errs.SubtypeInvalidArgument, "invalid %s path: %v", param, err).
-			WithParam(param).
-			WithCause(err)
-	}
-	if maxBytes < 0 {
-		return "", param, errs.NewInternalError(errs.SubtypeUnknown, "invalid read limit configured for %s", param)
-	}
-	return path, param, nil
-}
-
-func localFileRegularError(param, path string, mode fs.FileMode) error {
-	if mode.IsRegular() {
-		return nil
-	}
-	return errs.NewValidationError(errs.SubtypeInvalidArgument,
-		"%s %q is not a regular file", param, path).
-		WithParam(param)
-}
-
-func localFileReadError(param, path, op string, cause error) error {
-	if errors.Is(cause, fileio.ErrPathValidation) {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument, "invalid %s %q: %v", param, path, cause).
-			WithParam(param).
-			WithCause(cause)
-	}
-	if errors.Is(cause, fs.ErrNotExist) {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument, "%s %q does not exist", param, path).
-			WithParam(param).
-			WithCause(cause)
-	}
-	return errs.NewInternalError(errs.SubtypeFileIO, "cannot %s %s %q: %v", op, param, path, cause).WithCause(cause)
-}
-
-func localFileSizeError(param, path string, size, limit int64) error {
-	return errs.NewValidationError(errs.SubtypeInvalidArgument,
-		"%s %q is %d bytes; limit is %d bytes", param, path, size, limit).
-		WithParam(param)
-}
-
-func localFileFlagNames(flagName string) (name, param string, err error) {
-	name = strings.TrimLeft(strings.TrimSpace(flagName), "-")
-	if name == "" {
-		return "", "", errs.NewInternalError(errs.SubtypeUnknown, "local file flag name must not be empty")
-	}
-	return name, "--" + name, nil
-}

shortcuts/common/localfile_test.go

@@ -1,95 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package common
-
-import (
-	"context"
-	"errors"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/spf13/cobra"
-)
-
-func TestReadLocalFileFlag_AcceptsAbsolutePath(t *testing.T) {
-	path := filepath.Join(t.TempDir(), "input.txt")
-	if err := os.WriteFile(path, []byte("content"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	rctx := localFileTestRuntime(t, path)
-
-	if err := rctx.ValidateLocalFileFlag("file", 7); err != nil {
-		t.Fatalf("ValidateLocalFileFlag() error = %v", err)
-	}
-	got, err := rctx.ReadLocalFileFlag("file", 7)
-	if err != nil || string(got) != "content" {
-		t.Fatalf("ReadLocalFileFlag() = %q, %v; want content", got, err)
-	}
-}
-
-func TestValidateLocalFileFlag_ReturnsTypedInputErrors(t *testing.T) {
-	for _, tc := range []struct {
-		name string
-		path func(t *testing.T) string
-		max  int64
-	}{
-		{name: "invalid characters", path: func(*testing.T) string { return "input\n.txt" }, max: 10},
-		{name: "missing file", path: func(t *testing.T) string { return filepath.Join(t.TempDir(), "missing") }, max: 10},
-		{name: "directory", path: func(t *testing.T) string { return t.TempDir() }, max: 10},
-		{name: "too large", path: func(t *testing.T) string {
-			path := filepath.Join(t.TempDir(), "large")
-			if err := os.WriteFile(path, []byte("123456"), 0o600); err != nil {
-				t.Fatal(err)
-			}
-			return path
-		}, max: 5},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			err := localFileTestRuntime(t, tc.path(t)).ValidateLocalFileFlag("file", tc.max)
-			var validationErr *errs.ValidationError
-			if !errors.As(err, &validationErr) || validationErr.Subtype != errs.SubtypeInvalidArgument || validationErr.Param != "--file" {
-				t.Fatalf("error = %T %v, want invalid_argument for --file", err, err)
-			}
-		})
-	}
-}
-
-func TestReadLocalFileFlag_ReturnsTypedInputErrors(t *testing.T) {
-	for _, tc := range []struct {
-		name string
-		path func(t *testing.T) string
-		max  int64
-	}{
-		{name: "invalid characters", path: func(*testing.T) string { return "input\n.txt" }, max: 10},
-		{name: "missing file", path: func(t *testing.T) string { return filepath.Join(t.TempDir(), "missing") }, max: 10},
-		{name: "directory", path: func(t *testing.T) string { return t.TempDir() }, max: 10},
-		{name: "too large", path: func(t *testing.T) string {
-			path := filepath.Join(t.TempDir(), "large")
-			if err := os.WriteFile(path, []byte("123456"), 0o600); err != nil {
-				t.Fatal(err)
-			}
-			return path
-		}, max: 5},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			_, err := localFileTestRuntime(t, tc.path(t)).ReadLocalFileFlag("file", tc.max)
-			var validationErr *errs.ValidationError
-			if !errors.As(err, &validationErr) || validationErr.Subtype != errs.SubtypeInvalidArgument || validationErr.Param != "--file" {
-				t.Fatalf("error = %T %v, want invalid_argument for --file", err, err)
-			}
-		})
-	}
-}
-
-func localFileTestRuntime(t *testing.T, path string) *RuntimeContext {
-	t.Helper()
-	cmd := &cobra.Command{Use: "test"}
-	cmd.Flags().String("file", "", "")
-	if err := cmd.Flags().Set("file", path); err != nil {
-		t.Fatal(err)
-	}
-	return &RuntimeContext{ctx: context.Background(), Cmd: cmd}
-}

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/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_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)
-	}
-}

shortcuts/drive/drive_list_comments.go

@@ -348,7 +348,7 @@ func driveListCommentsScopeParam(scope string) (*bool, bool) {
 }
 
 func buildDriveListCommentsOutput(target driveListCommentsTarget, data map[string]interface{}) map[string]interface{} {
-	items := driveCommentItems(data)
+	items := common.GetSlice(data, "items")
 	return map[string]interface{}{
 		"file_token": target.FileToken,
 		"file_type":  target.FileType,

shortcuts/drive/drive_list_comments_test.go

@@ -525,38 +525,3 @@ func TestDriveListCommentsExecuteAppsPageURL(t *testing.T) {
 		t.Fatalf("count = %#v, want 1", got)
 	}
 }
-
-func TestDriveListCommentsOmittedItemsNormalized(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{"has_more": false, "page_token": ""},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveListComments, []string{
-		"+list-comments",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--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)
-	}
-}

shortcuts/drive/drive_list_replies.go

@@ -1,156 +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 driveListRepliesOp = driveCommentOp{
-	Label: "replies list",
-	Types: []string{"doc", "docx", "sheet", "file", "slides", "bitable", "apps"},
-}
-
-type driveListRepliesSpec struct {
-	Ref          driveCommentRef
-	CommentID    string
-	PageSize     int
-	PageToken    string
-	NeedReaction bool
-}
-
-// DriveListReplies lists the replies of one comment through the Drive comment
-// reply list API, while accepting Wiki URLs/tokens and resolving them to the
-// underlying object.
-var DriveListReplies = common.Shortcut{
-	Service:           "drive",
-	Command:           "+list-replies",
-	Description:       "List replies of a comment on 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(driveListRepliesOp),
-		common.Flag{Name: "comment-id", Desc: "comment ID whose replies to list (from drive +list-comments)", Required: true},
-		common.Flag{Name: "page-size", Type: "int", Default: "50", Desc: "page size, 1-100"},
-		common.Flag{Name: "page-token", Desc: "pagination token from previous response"},
-		common.Flag{Name: "need-reaction", Type: "bool", Desc: "include reaction data on replies"},
-	),
-	Tips: []string{
-		"Comment IDs come from `drive +list-comments` (items[].comment_id).",
-		"The root reply (the comment body itself) is the earliest-created reply: it is items[0] of the FIRST page only (no --page-token); items[0] of later pages is a regular reply.",
-		"Wiki URLs/tokens are resolved to the underlying document automatically.",
-	},
-	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		_, err := readDriveListRepliesSpec(runtime)
-		return err
-	},
-	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
-		spec, err := readDriveListRepliesSpec(runtime)
-		if err != nil {
-			return common.NewDryRunAPI().Set("error", err.Error())
-		}
-		return buildDriveListRepliesDryRun(spec)
-	},
-	Execute: func(ctx context.Context, runtime *common.RuntimeContext) error {
-		spec, err := readDriveListRepliesSpec(runtime)
-		if err != nil {
-			return err
-		}
-
-		target, err := resolveDriveCommentTarget(ctx, runtime, driveListRepliesOp, spec.Ref)
-		if err != nil {
-			return err
-		}
-
-		fmt.Fprintf(runtime.IO().ErrOut, "Listing replies of 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(
-			"GET",
-			path,
-			buildDriveListRepliesParams(spec, target.FileType),
-			nil,
-		)
-		if err != nil {
-			return err
-		}
-
-		items := driveCommentItems(data)
-		runtime.Out(driveCommentTargetOutput(target, map[string]interface{}{
-			"comment_id": spec.CommentID,
-			"items":      items,
-			"has_more":   common.GetBool(data, "has_more"),
-			"page_token": common.GetString(data, "page_token"),
-			"count":      len(items),
-		}), nil)
-		return nil
-	},
-}
-
-func readDriveListRepliesSpec(runtime *common.RuntimeContext) (driveListRepliesSpec, error) {
-	ref, err := resolveDriveCommentInput(driveListRepliesOp, runtime.Str("url"), runtime.Str("token"), runtime.Str("type"))
-	if err != nil {
-		return driveListRepliesSpec{}, err
-	}
-	commentID := strings.TrimSpace(runtime.Str("comment-id"))
-	if err := validateDriveCommentPathID(commentID, "--comment-id"); err != nil {
-		return driveListRepliesSpec{}, err
-	}
-	pageSize := runtime.Int("page-size")
-	if pageSize < 1 || pageSize > 100 {
-		return driveListRepliesSpec{}, errs.NewValidationError(errs.SubtypeInvalidArgument, "--page-size must be between 1 and 100").WithParam("--page-size")
-	}
-	return driveListRepliesSpec{
-		Ref:          ref,
-		CommentID:    commentID,
-		PageSize:     pageSize,
-		PageToken:    strings.TrimSpace(runtime.Str("page-token")),
-		NeedReaction: runtime.Bool("need-reaction"),
-	}, nil
-}
-
-func buildDriveListRepliesParams(spec driveListRepliesSpec, fileType string) map[string]interface{} {
-	params := map[string]interface{}{
-		"file_type": fileType,
-		"page_size": spec.PageSize,
-	}
-	if spec.PageToken != "" {
-		params["page_token"] = spec.PageToken
-	}
-	if spec.NeedReaction {
-		params["need_reaction"] = true
-	}
-	return params
-}
-
-func buildDriveListRepliesDryRun(spec driveListRepliesSpec) *common.DryRunAPI {
-	if spec.Ref.Type == "wiki" {
-		return common.NewDryRunAPI().
-			Desc("2-step orchestration: resolve wiki -> list comment replies").
-			GET("/open-apis/wiki/v2/spaces/get_node").
-			Desc("[1] Resolve wiki node to underlying document").
-			Params(map[string]interface{}{"token": spec.Ref.Token}).
-			GET("/open-apis/drive/v1/files/<obj_token from step 1>/comments/:comment_id/replies").
-			Desc("[2] List replies of comment on resolved document").
-			Params(buildDriveListRepliesParams(spec, "<obj_type from step 1>")).
-			Set("comment_id", spec.CommentID)
-	}
-
-	return common.NewDryRunAPI().
-		Desc("1-step request: list comment replies").
-		GET("/open-apis/drive/v1/files/:file_token/comments/:comment_id/replies").
-		Params(buildDriveListRepliesParams(spec, spec.Ref.Type)).
-		Set("file_token", spec.Ref.Token).
-		Set("comment_id", spec.CommentID)
-}

shortcuts/drive/drive_list_replies_test.go

@@ -1,425 +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 TestDriveListRepliesExecuteDocx(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/comment_1/replies",
-		OnMatch: func(req *http.Request) {
-			query := req.URL.Query()
-			if got := query.Get("file_type"); got != "docx" {
-				t.Errorf("file_type = %q, want docx", got)
-			}
-			if got := query.Get("page_size"); got != "50" {
-				t.Errorf("page_size = %q, want 50 (default)", got)
-			}
-			if query.Has("page_token") {
-				t.Errorf("page_token should be omitted when not set, got %q", query.Get("page_token"))
-			}
-			if query.Has("need_reaction") {
-				t.Errorf("need_reaction should be omitted when not set, got %q", query.Get("need_reaction"))
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{
-				"items": []interface{}{
-					map[string]interface{}{
-						"reply_id": "reply_1",
-						"content": map[string]interface{}{
-							"elements": []interface{}{
-								map[string]interface{}{
-									"type":     "text_run",
-									"text_run": map[string]interface{}{"text": "根回复正文"},
-								},
-							},
-						},
-					},
-					map[string]interface{}{"reply_id": "reply_2"},
-				},
-				"has_more":   true,
-				"page_token": "next_page",
-			},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveListReplies, []string{
-		"+list-replies",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "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, "comment_id", "data.comment_id"); got != "comment_1" {
-		t.Fatalf("comment_id = %q, want comment_1", got)
-	}
-	items := mustSliceValue(t, data["items"], "data.items")
-	if len(items) != 2 {
-		t.Fatalf("len(items) = %d, want 2", len(items))
-	}
-	firstItem := mustMapValue(t, items[0], "data.items[0]")
-	if got := mustStringField(t, firstItem, "reply_id", "data.items[0].reply_id"); got != "reply_1" {
-		t.Fatalf("items[0].reply_id = %q, want reply_1", got)
-	}
-	firstContent := mustMapValue(t, firstItem["content"], "data.items[0].content")
-	firstElements := mustSliceValue(t, firstContent["elements"], "data.items[0].content.elements")
-	firstElement := mustMapValue(t, firstElements[0], "data.items[0].content.elements[0]")
-	firstText := mustMapValue(t, firstElement["text_run"], "data.items[0].content.elements[0].text_run")
-	if got := mustStringField(t, firstText, "text", "data.items[0].content.elements[0].text_run.text"); got != "根回复正文" {
-		t.Fatalf("items[0] text = %q, want 根回复正文", got)
-	}
-	secondItem := mustMapValue(t, items[1], "data.items[1]")
-	if got := mustStringField(t, secondItem, "reply_id", "data.items[1].reply_id"); got != "reply_2" {
-		t.Fatalf("items[1].reply_id = %q, want reply_2", got)
-	}
-	if got := data["count"]; got != float64(2) {
-		t.Fatalf("count = %#v, want 2", got)
-	}
-	if got := data["has_more"]; got != true {
-		t.Fatalf("has_more = %#v, want true", got)
-	}
-	if got := mustStringField(t, data, "page_token", "data.page_token"); got != "next_page" {
-		t.Fatalf("page_token = %q, want next_page", got)
-	}
-}
-
-func TestDriveListRepliesExecuteViaWikiToBitable(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":  "bitable",
-					"obj_token": "bitableFromWiki",
-				},
-			},
-		},
-	})
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/drive/v1/files/bitableFromWiki/comments/comment_1/replies",
-		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": []interface{}{map[string]interface{}{"reply_id": "reply_1"}},
-			},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveListReplies, []string{
-		"+list-replies",
-		"--token", "wikiResource",
-		"--type", "wiki",
-		"--comment-id", "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)
-	}
-	if got := mustStringField(t, data, "wiki_token", "data.wiki_token"); got != "wikiResource" {
-		t.Fatalf("wiki_token = %q, want wikiResource", got)
-	}
-	items := mustSliceValue(t, data["items"], "data.items")
-	item := mustMapValue(t, items[0], "data.items[0]")
-	if got := mustStringField(t, item, "reply_id", "data.items[0].reply_id"); got != "reply_1" {
-		t.Fatalf("items[0].reply_id = %q, want reply_1", got)
-	}
-}
-
-func TestDriveListRepliesPaginationAndReactionParams(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/comment_1/replies",
-		OnMatch: func(req *http.Request) {
-			query := req.URL.Query()
-			if got := query.Get("page_size"); got != "10" {
-				t.Errorf("page_size = %q, want 10", got)
-			}
-			if got := query.Get("page_token"); got != "cursor_1" {
-				t.Errorf("page_token = %q, want cursor_1", got)
-			}
-			if got := query.Get("need_reaction"); got != "true" {
-				t.Errorf("need_reaction = %q, want true", got)
-			}
-			if got := query.Get("user_id_type"); got != "" {
-				t.Errorf("user_id_type = %q, want omitted (flag removed)", got)
-			}
-		},
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{"items": []interface{}{}},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveListReplies, []string{
-		"+list-replies",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--page-size", "10",
-		"--page-token", "cursor_1",
-		"--need-reaction",
-		"--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 := data["count"]; got != float64(0) {
-		t.Fatalf("count = %#v, want 0", got)
-	}
-}
-
-func TestDriveListRepliesValidation(t *testing.T) {
-	tests := []struct {
-		name      string
-		args      []string
-		wantErr   string
-		wantParam string
-	}{
-		{
-			name: "unsafe comment id",
-			args: []string{
-				"+list-replies",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--comment-id", "../admin",
-			},
-			wantErr:   "path traversal",
-			wantParam: "--comment-id",
-		},
-		{
-			name: "empty comment id",
-			args: []string{
-				"+list-replies",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--comment-id", " ",
-			},
-			wantErr:   "--comment-id must not be empty",
-			wantParam: "--comment-id",
-		},
-		{
-			name: "page size too small",
-			args: []string{
-				"+list-replies",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--comment-id", "comment_1",
-				"--page-size", "0",
-			},
-			wantErr:   "--page-size must be between 1 and 100",
-			wantParam: "--page-size",
-		},
-		{
-			name: "page size too large",
-			args: []string{
-				"+list-replies",
-				"--url", "https://example.larksuite.com/docx/docxResource",
-				"--comment-id", "comment_1",
-				"--page-size", "101",
-			},
-			wantErr:   "--page-size must be between 1 and 100",
-			wantParam: "--page-size",
-		},
-		{
-			name: "unsupported url type",
-			args: []string{
-				"+list-replies",
-				"--url", "https://example.larksuite.com/drive/folder/folderResource",
-				"--comment-id", "comment_1",
-			},
-			wantErr:   "replies list 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, DriveListReplies, 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 TestDriveListRepliesPropagatesAPIError(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/comment_1/replies",
-		Body: map[string]interface{}{
-			"code": 1069301,
-			"msg":  "comment not found",
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveListReplies, []string{
-		"+list-replies",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--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 TestDriveListRepliesWikiNodeIncompleteResponse(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, DriveListReplies, []string{
-		"+list-replies",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-id", "comment_1",
-		"--as", "user",
-	}, f, stdout)
-	if err == nil || !strings.Contains(err.Error(), "incomplete node data") {
-		t.Fatalf("expected incomplete-node error, got %v", err)
-	}
-}
-
-func TestDriveListRepliesDryRunDirect(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveListReplies, []string{
-		"+list-replies",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "comment_1",
-		"--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, "method", "api[0].method"); got != "GET" {
-		t.Fatalf("api[0].method = %q, want GET", got)
-	}
-	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 resolved path segments", got)
-	}
-	params := mustMapValue(t, call["params"], "api[0].params")
-	if got := params["need_reaction"]; got != true {
-		t.Fatalf("api[0].params.need_reaction = %#v, want true", got)
-	}
-}
-
-func TestDriveListRepliesDryRunWiki(t *testing.T) {
-	f, stdout, _, _ := cmdutil.TestFactory(t, driveTestConfig())
-	err := mountAndRunDrive(t, DriveListReplies, []string{
-		"+list-replies",
-		"--url", "https://example.larksuite.com/wiki/wikiResource",
-		"--comment-id", "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 != "GET" {
-		t.Fatalf("api[1].method = %q, want GET", got)
-	}
-	if got := mustStringField(t, step2, "url", "api[1].url"); !strings.Contains(got, "/comments/comment_1/replies") {
-		t.Fatalf("api[1].url = %q, want resolved comment ID", got)
-	}
-}
-
-func TestDriveListRepliesOmittedItemsNormalized(t *testing.T) {
-	f, stdout, _, reg := cmdutil.TestFactory(t, driveTestConfig())
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/drive/v1/files/docxResource/comments/comment_1/replies",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "success",
-			"data": map[string]interface{}{"has_more": false, "page_token": ""},
-		},
-	})
-
-	err := mountAndRunDrive(t, DriveListReplies, []string{
-		"+list-replies",
-		"--url", "https://example.larksuite.com/docx/docxResource",
-		"--comment-id", "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)
-	}
-}