perf(startup): resolve brand & strict-mode without decrypting the app secret

Building the command tree resolved brand (auth login --domain help) and strict mode (per-command identity-flag registration via ResolveStrictMode) through f.Config(), which decrypts the app secret. On macOS that is a Keychain (securityd IPC) read on every invocation -- even --help/--version/ schema/completion, which never use the secret. brand and strict mode are plain config.json fields, so route them through a secret-free metadata path: - credential: add (*DefaultAccountProvider).ResolveMeta and a cached (*CredentialProvider).ResolveMeta returning brand + SupportedIdentities, via an optional metaResolver capability; external providers fall back to ResolveAccount (they do not touch the keychain). - cmdutil: ResolveStrictMode now uses ResolveMeta; add Factory.ConfigBrand. - auth login help text and shortcut registration read ConfigBrand. The app secret is still decrypted on demand when a command actually calls the API (auth status etc. unchanged). Measured on macOS (GOMAXPROCS=1): lark-cli --help 35.4ms -> 21.4ms (-40%); no behavior change on Linux/Windows (local secret backends are cheap).
fix(registry): drop unused typedInitialized var; refresh OrderedProps doc
2026-07-04 06:29:52 +08:00 · 2026-06-10 17:46:03 +08:00 · 2026-06-10 14:46:18 +08:00 · 2026-06-10 14:13:56 +08:00 · 2026-06-09 18:36:58 +08:00 · 2026-06-09 16:49:40 +08:00
307 changed files with 3538 additions and 25670 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ tests/mail/reports/
 .hammer/
 .lark-slides/
 internal/registry/meta_data.json
+internal/registry/metastatic/meta_data_gen.go
 cmd/api/download.bin
 app.log
 /sidecar-server-demo
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -73,20 +73,20 @@ linters:
          - forbidigo
      # errs-typed-only enforced on paths already migrated to errs.NewXxxError.
      # Add a path when its migration is complete.
-      - path-except: (internal/auth/|internal/errcompat/|internal/errclass/|internal/client/|internal/cmdutil/factory\.go|cmd/auth/|cmd/config/|cmd/service/|shortcuts/common/mcp_client\.go|shortcuts/base/|shortcuts/calendar/|shortcuts/contact/|shortcuts/doc/|shortcuts/drive/|shortcuts/im/|shortcuts/mail/|shortcuts/markdown/|shortcuts/minutes/|shortcuts/okr/|shortcuts/sheets/|shortcuts/slides/|shortcuts/task/|shortcuts/vc/|shortcuts/whiteboard/|internal/event/consume/|cmd/event/|events/|shortcuts/event/)
+      - path-except: (internal/auth/|internal/errcompat/|internal/errclass/|internal/client/|internal/cmdutil/factory\.go|cmd/auth/|cmd/config/|cmd/service/|shortcuts/common/mcp_client\.go|shortcuts/base/|shortcuts/calendar/|shortcuts/drive/|shortcuts/im/|shortcuts/mail/|shortcuts/minutes/|shortcuts/okr/|shortcuts/task/|shortcuts/vc/|shortcuts/whiteboard/)
        text: errs-typed-only
        linters:
          - forbidigo
      # errs-no-bare-wrap enforced on paths fully migrated to typed final
      # errors. Scoped separately from errs-typed-only because cmd/auth/,
      # cmd/config/ still have residual fmt.Errorf and must not be caught.
-      - path-except: (shortcuts/base/|shortcuts/calendar/|shortcuts/contact/|shortcuts/doc/|shortcuts/drive/|shortcuts/im/|shortcuts/mail/|shortcuts/markdown/|shortcuts/minutes/|shortcuts/okr/|shortcuts/sheets/|shortcuts/slides/|shortcuts/task/|shortcuts/vc/|shortcuts/whiteboard/|shortcuts/common/mcp_client\.go|cmd/event/|events/|shortcuts/event/)
+      - path-except: (shortcuts/base/|shortcuts/calendar/|shortcuts/drive/|shortcuts/im/|shortcuts/mail/|shortcuts/minutes/|shortcuts/okr/|shortcuts/task/|shortcuts/vc/|shortcuts/whiteboard/|shortcuts/common/mcp_client\.go)
        text: errs-no-bare-wrap
        linters:
          - forbidigo
      # errs-no-legacy-helper enforced on domains whose shared validation/save
      # helpers have migrated to typed final errors.
-      - path-except: (shortcuts/base/|shortcuts/calendar/|shortcuts/contact/|shortcuts/doc/|shortcuts/drive/|shortcuts/im/|shortcuts/mail/|shortcuts/markdown/|shortcuts/minutes/|shortcuts/okr/|shortcuts/sheets/|shortcuts/slides/|shortcuts/task/|shortcuts/vc/|shortcuts/whiteboard/|cmd/event/|events/|shortcuts/event/)
+      - path-except: (shortcuts/base/|shortcuts/calendar/|shortcuts/drive/|shortcuts/im/|shortcuts/mail/|shortcuts/minutes/|shortcuts/okr/|shortcuts/task/|shortcuts/vc/|shortcuts/whiteboard/)
        text: errs-no-legacy-helper
        linters:
          - forbidigo
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -2,6 +2,8 @@ version: 2

 before:
  hooks:
+    # fetch_meta.py also regenerates the static Go registry (meta_data_gen.go),
+    # the sole source of the embedded command tree.
    - python3 scripts/fetch_meta.py

 builds:
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -75,31 +75,7 @@ The one rule to internalize: **every error message you write will be parsed by a

 ### Structured errors in commands

-Command-facing failures must be typed `errs.*` errors — never the legacy `output.Err*` helpers and never a final bare `fmt.Errorf`. AI agents parse the stderr envelope's `type` / `subtype` / `param` / `hint` fields to decide their next action; the full taxonomy lives in `errs/ERROR_CONTRACT.md`.
-
-Picking a constructor:
-
-| Failure | Constructor |
-|---------|-------------|
-| User flag/arg fails validation | `errs.NewValidationError(errs.SubtypeInvalidArgument, ...).WithParam("--flag")` |
-| Valid request, wrong system state | `errs.NewValidationError(errs.SubtypeFailedPrecondition, ...).WithHint(...)` |
-| Lark API returned `code != 0` | `runtime.CallAPITyped` (shortcuts) / `errclass.BuildAPIError` (raw responses) — never hand-build |
-| Network / transport failure | `errs.NewNetworkError(errs.SubtypeNetworkTransport, ...)` |
-| Local file I/O failure | `errs.NewInternalError(errs.SubtypeFileIO, ...)` — validate the path first (`validate.SafeInputPath` / `SafeOutputPath`) and use `vfs.*` |
-| Unclassified lower-layer error as final | `errs.NewInternalError(errs.SubtypeUnknown, ...).WithCause(err)` |
-| Lower layer already returned a typed error | pass it through unchanged — re-wrapping downgrades its classification |
-
-Signatures that are easy to guess wrong:
-
- `runtime.CallAPITyped(method, url string, params map[string]interface{}, data interface{}) (map[string]interface{}, error)` — it performs the HTTP request itself and classifies `code != 0` into a typed error; just return the error it gives you.
- Typed pass-through check: `if _, ok := errs.ProblemOf(err); ok { return err }` — `ProblemOf` returns `(*errs.Problem, bool)`, not a nilable pointer.
- `.WithParam` exists only on `*errs.ValidationError`. `InternalError` / `NetworkError` have no param field — file or endpoint context goes in the message or `.WithHint(...)`.
-
-`forbidigo` + `lint/errscontract` reject the legacy `output.Err*` helpers, bare final `fmt.Errorf` / `errors.New`, and legacy envelope literals on migrated paths. Beyond what lint catches, three authoring conventions apply:
-
- Preserve the underlying error with `.WithCause(err)` so `errors.Is` / `errors.Unwrap` keep working.
- `param` names only the user input that actually failed. Recovery guidance goes in `.WithHint(...)`; machine-readable recovery fields (`missing_scopes`, `log_id`) carry server/system ground truth only — never caller-side guesses.
- Error-path tests assert typed metadata via `errs.ProblemOf` (`category` / `subtype` / `param`) and cause preservation, not message substrings alone.
+`RunE` functions must return `output.Errorf` / `output.ErrWithHint` — never bare `fmt.Errorf`. AI agents parse stderr as JSON; bare errors break this contract.

 ### stdout is data, stderr is everything else

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,86 +2,6 @@

 All notable changes to this project will be documented in this file.

-## [v1.0.51] - 2026-06-10
-
-### Features
-
- **apps**: Support multi dev modes (#1175)
- **im**: Complete audio/post rendering and add opt-in `--download-resources` (#1245)
- **base**: Configure initial base table schema (#1377)
- **vc**: Add recording event support (#1369)
- **minutes**: Replace words for transcript (#1372)
- **markdown**: Emit typed error envelopes across the markdown domain (#1347)
- **sheets**: Emit typed error envelopes across the sheets domain (#1348)
- **slides**: Emit typed error envelopes across the slides domain (#1349)
-
-### Documentation
-
- **skills**: Warn about `@file` absolute path restriction in lark-doc skills (#1375)
- **skills**: Remove unsupported ⚠️ from callout emoji list (#1374)
-
-## [v1.0.50] - 2026-06-09
-
-### Features
-
- **doc**: Emit typed error envelopes across the doc domain (#1346)
- **event**: Emit typed error envelopes across the event domain (#1289)
- **contact**: Emit typed error envelopes across the contact domain (#1287)
- **sheets**: Guard `+csv-put --csv` against a path passed without `@` (#1337)
- **cli**: Adjust agent timeout hint output conditions (#1328)
-
-### Bug Fixes
-
- **drive**: Add `@file`/stdin support to `+add-comment --content` (#1343)
- **slides**: Build create URL locally instead of drive metas call (#1329)
- **cli**: Clarify `--block-id` supports comma-separated batch delete in help text (#1336)
-
-### Documentation
-
- **doc**: Replace append with `block_insert_after` in skeleton workflow guidance (#1340)
- **doc**: Document `<folder-manager>` resource block (#1168)
- **drive**: Add drive comment location guidance (#1258)
-
-## [v1.0.49] - 2026-06-08
-
-### Features
-
- **events**: Add whiteboard event domain with per-board subscription (#1265)
- **im**: Support feed group (#1102)
- **im**: Add feed shortcut create, list, and remove shortcuts (#1273)
- **im**: Format feed group error handling (#1308)
- **im**: Return typed error envelopes across the im domain (#1230)
- **base**: Emit typed error envelopes across the base domain (#1248)
- **calendar**: Emit typed error envelopes across the calendar domain (#1232)
- **task**: Emit typed error envelopes across the task domain (#1231)
- **okr,whiteboard**: Emit typed error envelopes across both domains (#1236)
- **minutes,vc**: Emit typed error envelopes across both domains (#1234)
- **markdown**: Harden create upload failures (#1325)
- **drive**: Harden inspect shortcut failures (#1324)
- **slides**: Add IconPark lookup for Lark slides (#1123)
- **doc**: Remove docs v1 API (#1291)
- **cli**: Add `skills` command to read embedded skill content (#1318)
- **cli**: Fetch official skills index (#1301)
- **shared**: Document relative-path-only file arguments (#1319)
- **scopes**: Clear `recommend.allow` scope auto-approve overrides (#1272)
- **shortcuts**: Check shortcut example commands against the live CLI tree (#1244)
-
-### Bug Fixes
-
- **events**: Keep bounded event consume runs alive after stdin EOF (#1285)
- **drive**: Use docs secure label read scope (#1281)
-
-### Documentation
-
- **approval**: Restructure skill with intent table and scope boundaries (#1307)
- **skills**: Tighten drive and markdown guardrails (#1326)
- **skills**: Optimize calendar, vc, and minutes skill guidance (#1269)
- **markdown**: Add markdown domain template (#1293)
- **markdown**: Improve lark-markdown skill guidance (#1279)
- **doc**: Improve lark-doc skill guidance (#1283)
- **wiki**: Optimize skill guidance and routing boundaries (#1275)
- **slides**: Tighten routing/boundary and reconcile in-slide whiteboard (#1169)
-
 ## [v1.0.48] - 2026-06-04

 ### Features
@@ -1106,9 +1026,6 @@ Bundled AI agent skills for intelligent assistance:
 - Bilingual documentation (English & Chinese).
 - CI/CD pipelines: linting, testing, coverage reporting, and automated releases.

-[v1.0.51]: https://github.com/larksuite/cli/releases/tag/v1.0.51
-[v1.0.50]: https://github.com/larksuite/cli/releases/tag/v1.0.50
-[v1.0.49]: https://github.com/larksuite/cli/releases/tag/v1.0.49
 [v1.0.48]: https://github.com/larksuite/cli/releases/tag/v1.0.48
 [v1.0.47]: https://github.com/larksuite/cli/releases/tag/v1.0.47
 [v1.0.46]: https://github.com/larksuite/cli/releases/tag/v1.0.46
--- a/3
+++ b/3
@@ -12,6 +12,9 @@ PREFIX   ?= /usr/local

 all: test

+# fetch_meta fetches meta_data.json AND regenerates the static Go registry
+# (internal/registry/metastatic/meta_data_gen.go) — the sole build-time source
+# of the embedded command tree. Both are gitignored; build/vet/test depend on it.
 fetch_meta:
 	python3 scripts/fetch_meta.py

--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The official [Lark/Feishu](https://www.larksuite.com/) CLI tool, maintained by t
 | ✍️ Approval   | Query approval tasks, approve/reject/transfer tasks, cancel and CC instances                                                      |
 | 🎯 OKR        | Query, create, update OKRs; manage objective & key results, alignments, indicators and progress.                                  |
 | 📋 Project    | Meegle — manage work items, schedules, and data via the standalone [meegle-cli](https://github.com/larksuite/meegle-cli) (install separately) |
-| 🔗 Apps       | Create Spark/Miaoda apps, publish HTML/static sites, run cloud generation, and manage access scope                                 |
+| 🔗 Apps       | Develop, deploy HTML, web pages and applications                                                                                  |

 ## Installation & Quick Start

--- a/README.zh.md
+++ b/README.zh.md
@@ -41,7 +41,7 @@
 | ✍️ 审批     | 查询审批任务、同意/拒绝/转交审批任务、撤回与抄送审批实例              |
 | 🎯 OKR  | 查询、创建、更新 OKR，管理目标、关键结果、对齐、指标和进展记录        |
 | 📋 飞书项目 | 管理工作项、排期与数据 — 由独立的 [meegle-cli](https://github.com/larksuite/meegle-cli) 提供（需单独安装） |
-| 🔗 应用     | 创建妙搭（Spark/Miaoda）应用、发布 HTML/静态站点、云端生成迭代、管理可用范围                                                                                                   |
+| 🔗 应用     | 开发、部署 HTML、Web 页面和应用                                                                                                          |

 ## 安装与快速开始

--- a/cmd/auth/login.go
+++ b/cmd/auth/login.go
@@ -72,10 +72,12 @@ to generate QR codes (supports ASCII and PNG formats).`,

 	cmd.Flags().StringVar(&opts.Scope, "scope", "", "scopes to request (space- or comma-separated). Combines additively with --domain/--recommend")
 	cmd.Flags().BoolVar(&opts.Recommend, "recommend", false, "request only recommended (auto-approve) scopes")
+	// Brand only — never decrypt the app secret just to build help text
+	// (avoids a keychain read on every `auth login --help` / completion).
 	var helpBrand core.LarkBrand
-	if f != nil && f.Config != nil {
-		if cfg, err := f.Config(); err == nil && cfg != nil {
-			helpBrand = cfg.Brand
+	if f != nil && f.ConfigBrand != nil {
+		if b, ok := f.ConfigBrand(); ok {
+			helpBrand = b
 		}
 	}
 	available := sortedKnownDomains(helpBrand)
@@ -296,11 +298,10 @@ func authLoginRun(opts *LoginOptions) error {
 	}

 	// Step 2: Show user code and verification URL.
-	// JSON mode embeds AgentTimeoutHint as a structured field so agents that
-	// capture stdout into a JSON parser see it without stream-mixing surprises.
-	// Text mode prints the hint to stderr only when running under a non-TTY
-	// (i.e. piped / agent harness), since humans reading a terminal don't need
-	// the agent-oriented instructions.
+	// Both branches surface AgentTimeoutHint, but on different channels:
+	// JSON mode embeds it as a structured field (so an agent that captures
+	// stdout into a JSON parser sees it without stream-mixing surprises),
+	// text mode prints to stderr (alongside the URL prompt).
 	if opts.JSON {
 		data := map[string]interface{}{
 			"event":                     "device_authorization",
@@ -318,9 +319,7 @@ func authLoginRun(opts *LoginOptions) error {
 	} else {
 		fmt.Fprintf(f.IOStreams.ErrOut, msg.OpenURL)
 		fmt.Fprintf(f.IOStreams.ErrOut, "  %s\n\n", authResp.VerificationUriComplete)
-		if f.IOStreams != nil && !f.IOStreams.IsTerminal {
-			fmt.Fprintln(f.IOStreams.ErrOut, msg.AgentTimeoutHint)
-		}
+		fmt.Fprintln(f.IOStreams.ErrOut, msg.AgentTimeoutHint)
 	}

 	// Step 3: Poll for token
@@ -407,11 +406,10 @@ func authLoginPollDeviceCode(opts *LoginOptions, config *core.CliConfig, msg *lo
 			fmt.Fprintf(f.IOStreams.ErrOut, "[lark-cli] [WARN] auth login: failed to remove cached requested scopes: %v\n", err)
 		}
 	}
-	// Skip the stderr hint in JSON mode (the --no-wait call that issued
-	// the device_code already surfaced it as a JSON field), and also skip it
-	// when running on an interactive terminal — the agent-oriented
-	// instructions only matter for piped / harness environments.
-	if !opts.JSON && f.IOStreams != nil && !f.IOStreams.IsTerminal {
+	// Skip the stderr hint in JSON mode — the --no-wait call that issued the
+	// device_code already returned the hint as a JSON field, and writing
+	// text to stderr would pollute consumers that combine streams via 2>&1.
+	if !opts.JSON {
 		fmt.Fprintln(f.IOStreams.ErrOut, msg.AgentTimeoutHint)
 	}
 	log(msg.WaitingAuth)
--- a/cmd/command_tree_dump_test.go
+++ b/cmd/command_tree_dump_test.go
@@ -0,0 +1,87 @@
+// Copyright (c) 2026 Lark Technologies Pte. Ltd.
+// SPDX-License-Identifier: MIT
+
+// Tree-dump tool: dumps the full command tree (paths, flags, descriptions,
+// annotations) in a canonical, line-stable form so two builds can be diffed
+// byte-for-byte (e.g. before/after a registry change). Set LARK_TREE_DUMP=<path>
+// to write the dump; otherwise the test is a no-op. Not a committed golden — the
+// meta data is fetched/gitignored and drifts.
+package cmd_test
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/larksuite/cli/cmd"
+	"github.com/larksuite/cli/internal/cmdutil"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+)
+
+func esc(s string) string {
+	s = strings.ReplaceAll(s, "\\", "\\\\")
+	s = strings.ReplaceAll(s, "\n", "\\n")
+	s = strings.ReplaceAll(s, "\t", "\\t")
+	s = strings.ReplaceAll(s, "\r", "\\r")
+	return s
+}
+
+func dumpCommandTree(root *cobra.Command) string {
+	var lines []string
+	var walk func(c *cobra.Command)
+	walk = func(c *cobra.Command) {
+		path := strings.TrimSpace(strings.TrimPrefix(c.CommandPath(), "lark-cli"))
+		head := fmt.Sprintf("CMD %q use=%q short=%q long=%q runnable=%t hidden=%t",
+			path, esc(c.Use), esc(c.Short), esc(c.Long), c.Runnable(), c.Hidden)
+		lines = append(lines, head)
+
+		if len(c.Annotations) > 0 {
+			keys := make([]string, 0, len(c.Annotations))
+			for k := range c.Annotations {
+				keys = append(keys, k)
+			}
+			sort.Strings(keys)
+			for _, k := range keys {
+				lines = append(lines, fmt.Sprintf("  ann %s=%q", k, esc(c.Annotations[k])))
+			}
+		}
+
+		var flags []string
+		c.Flags().VisitAll(func(f *pflag.Flag) {
+			flags = append(flags, fmt.Sprintf("  flag --%s -%s type=%s def=%q usage=%q",
+				f.Name, f.Shorthand, f.Value.Type(), esc(f.DefValue), esc(f.Usage)))
+		})
+		sort.Strings(flags)
+		lines = append(lines, flags...)
+
+		subs := c.Commands()
+		sort.Slice(subs, func(i, j int) bool { return subs[i].Name() < subs[j].Name() })
+		for _, sub := range subs {
+			walk(sub)
+		}
+	}
+	walk(root)
+	return strings.Join(lines, "\n") + "\n"
+}
+
+func TestDumpCommandTree(t *testing.T) {
+	out := os.Getenv("LARK_TREE_DUMP")
+	if out == "" {
+		t.Skip("set LARK_TREE_DUMP=<path> to dump the command tree")
+	}
+	// Deterministic: embedded meta only (no remote cache), empty config dir so
+	// strict-mode/plugins/policy cannot reshape the tree.
+	t.Setenv("LARKSUITE_CLI_REMOTE_META", "off")
+	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
+
+	root := cmd.Build(context.Background(), cmdutil.InvocationContext{})
+	dump := dumpCommandTree(root)
+	if err := os.WriteFile(out, []byte(dump), 0644); err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("wrote %d bytes, %d lines to %s", len(dump), strings.Count(dump, "\n"), out)
+}
--- a/cmd/event/bus.go
+++ b/cmd/event/bus.go
@@ -12,7 +12,6 @@ import (

 	"github.com/spf13/cobra"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/cmdutil"
 	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/event"
@@ -39,8 +38,7 @@ func NewCmdBus(f *cmdutil.Factory) *cobra.Command {

 			logger, err := bus.SetupBusLogger(eventsDir)
 			if err != nil {
-				return errs.NewInternalError(errs.SubtypeFileIO,
-					"set up bus logger: %s", err).WithCause(err)
+				return err
 			}

 			tr := transport.New()
@@ -60,14 +58,7 @@ func NewCmdBus(f *cmdutil.Factory) *cobra.Command {
 				}
 			}()

-			if err := b.Run(ctx); err != nil {
-				if _, ok := errs.ProblemOf(err); ok {
-					return err
-				}
-				return errs.NewInternalError(errs.SubtypeUnknown,
-					"event bus daemon exited: %s", err).WithCause(err)
-			}
-			return nil
+			return b.Run(ctx)
 		},
 	}

--- a/cmd/event/bus_test.go
+++ b/cmd/event/bus_test.go
@@ -1,45 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package event
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/core"
-)
-
-// The hidden `event _bus` daemon command must exit with a typed file_io error
-// when its log directory cannot be created (the error is only visible in the
-// forked process's captured stderr / bus.log).
-func TestBusCommandLoggerSetupFailureIsTypedFileIO(t *testing.T) {
-	dir := t.TempDir()
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", dir)
-	// Block the events/ root with a regular file so MkdirAll fails.
-	if err := os.WriteFile(filepath.Join(dir, "events"), []byte("x"), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	f, _, _, _ := cmdutil.TestFactory(t, &core.CliConfig{
-		AppID: "cli_bus_test", AppSecret: "secret", Brand: core.BrandFeishu,
-	})
-	cmd := NewCmdBus(f)
-	cmd.SetArgs([]string{})
-
-	err := cmd.Execute()
-	if err == nil {
-		t.Fatal("expected logger setup error")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs error, got %T: %v", err, err)
-	}
-	if p.Category != errs.CategoryInternal || p.Subtype != errs.SubtypeFileIO {
-		t.Errorf("problem = %s/%s, want %s/%s", p.Category, p.Subtype,
-			errs.CategoryInternal, errs.SubtypeFileIO)
-	}
-}
--- a/cmd/event/consume.go
+++ b/cmd/event/consume.go
@@ -16,7 +16,6 @@ import (

 	"github.com/spf13/cobra"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/appmeta"
 	"github.com/larksuite/cli/internal/auth"
 	"github.com/larksuite/cli/internal/cmdutil"
@@ -102,10 +101,11 @@ func runConsume(cmd *cobra.Command, f *cmdutil.Factory, eventKey string, o consu

 	if o.jqExpr != "" {
 		if err := output.ValidateJqExpression(o.jqExpr); err != nil {
-			return errs.NewValidationError(errs.SubtypeInvalidArgument, "%s", err).
-				WithParam("--jq").
-				WithCause(err).
-				WithHint("see `lark-cli event consume --help` EXAMPLES for common patterns, or `lark-cli event schema %s` for valid field paths", eventKey)
+			return output.ErrWithHint(
+				output.ExitValidation, "validation",
+				err.Error(),
+				fmt.Sprintf("see `lark-cli event consume --help` EXAMPLES for common patterns, or `lark-cli event schema %s` for valid field paths", eventKey),
+			)
 		}
 	}

@@ -261,12 +261,12 @@ func preflightScopes(ctx context.Context, pf *preflightCtx) error {
 	if len(missing) == 0 {
 		return nil
 	}
-	return errs.NewPermissionError(errs.SubtypeMissingScope,
-		"missing required scopes for EventKey %s (as %s): %s",
-		pf.eventKey, pf.identity, strings.Join(missing, ", ")).
-		WithIdentity(string(pf.identity)).
-		WithMissingScopes(missing...).
-		WithHint("%s", scopeRemediationHint(pf.identity, missing, pf.appID, pf.brand))
+	return output.ErrWithHint(
+		output.ExitAuth, "auth",
+		fmt.Sprintf("missing required scopes for EventKey %s (as %s): %s",
+			pf.eventKey, pf.identity, strings.Join(missing, ", ")),
+		scopeRemediationHint(pf.identity, missing, pf.appID, pf.brand),
+	)
 }

 // scopeRemediationHint returns an identity-appropriate fix for missing scopes.
@@ -301,27 +301,23 @@ func preflightEventTypes(pf *preflightCtx) error {
 	if len(missing) == 0 {
 		return nil
 	}
-	return errs.NewValidationError(errs.SubtypeFailedPrecondition,
-		"EventKey %s requires event types not subscribed in console: %s",
-		pf.keyDef.Key, strings.Join(missing, ", ")).
-		WithHint("subscribe these events and publish a new app version at: %s",
-			consoleEventSubscriptionURL(pf.brand, pf.appID))
+	return output.ErrWithHint(
+		output.ExitValidation, "validation",
+		fmt.Sprintf("EventKey %s requires event types not subscribed in console: %s",
+			pf.keyDef.Key, strings.Join(missing, ", ")),
+		fmt.Sprintf("subscribe these events and publish a new app version at: %s",
+			consoleEventSubscriptionURL(pf.brand, pf.appID)),
+	)
 }

 // sanitizeOutputDir rejects absolute/parent-escaping paths and ~ (SafeOutputPath treats it as a literal dir name).
 func sanitizeOutputDir(dir string) (string, error) {
 	if strings.HasPrefix(dir, "~") {
-		return "", errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"%s; use a relative path like ./output instead", errOutputDirTilde).
-			WithParam("--output-dir").
-			WithCause(errOutputDirTilde)
+		return "", output.ErrValidation("%s; use a relative path like ./output instead", errOutputDirTilde)
 	}
 	safe, err := validate.SafeOutputPath(dir)
 	if err != nil {
-		return "", errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"%s %q: %s", errOutputDirUnsafe, dir, err).
-			WithParam("--output-dir").
-			WithCause(errOutputDirUnsafe)
+		return "", output.ErrValidation("%s %q: %s", errOutputDirUnsafe, dir, err)
 	}
 	return safe, nil
 }
@@ -333,21 +329,18 @@ func resolveTenantToken(ctx context.Context, f *cmdutil.Factory, appID string) (
 	}
 	result, err := f.Credential.ResolveToken(ctx, credential.NewTokenSpec(core.AsBot, appID))
 	if err != nil {
-		if _, ok := errs.ProblemOf(err); ok {
-			return "", err
-		}
-		return "", errs.NewAuthenticationError(errs.SubtypeTokenMissing,
-			"resolve tenant access token: %s", err).WithCause(err)
+		return "", output.ErrAuth("resolve tenant access token: %s", err)
 	}
 	if result == nil || result.Token == "" {
-		return "", errs.NewAuthenticationError(errs.SubtypeTokenMissing,
-			"no tenant access token available for app %s", appID).
-			WithHint("Check that app_secret is configured (lark-cli config show) and try 'lark-cli auth login'.")
+		return "", output.ErrWithHint(
+			output.ExitAuth, "auth",
+			fmt.Sprintf("no tenant access token available for app %s", appID),
+			"Check that app_secret is configured (lark-cli config show) and try 'lark-cli auth login'.",
+		)
 	}
 	return result.Token, nil
 }

-// Sentinels for errors.Is checks; call sites wrap them as typed ValidationError causes.
 var (
 	errInvalidParamFormat = errors.New("invalid --param format")
 	errOutputDirTilde     = errors.New("--output-dir does not support ~ expansion")
@@ -359,10 +352,7 @@ func parseParams(raw []string) (map[string]string, error) {
 	for _, kv := range raw {
 		k, v, ok := strings.Cut(kv, "=")
 		if !ok || k == "" {
-			return nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"%s %q: expected key=value", errInvalidParamFormat, kv).
-				WithParam("--param").
-				WithCause(errInvalidParamFormat)
+			return nil, output.ErrValidation("%s %q: expected key=value", errInvalidParamFormat, kv)
 		}
 		m[k] = v
 	}
--- a/cmd/event/consume_test.go
+++ b/cmd/event/consume_test.go
@@ -4,14 +4,9 @@
 package event

 import (
-	"context"
 	"errors"
 	"strings"
 	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/credential"
 )

 func TestParseParams(t *testing.T) {
@@ -78,7 +73,6 @@ func TestParseParams(t *testing.T) {
 				if tc.wantEcho != "" && !strings.Contains(err.Error(), tc.wantEcho) {
 					t.Errorf("err %q should echo %q so user sees the bad input", err.Error(), tc.wantEcho)
 				}
-				assertInvalidArgumentParam(t, err, "--param")
 				return
 			}
 			if err != nil {
@@ -96,77 +90,6 @@ func TestParseParams(t *testing.T) {
 	}
 }

-// emptyTokenResolver resolves to a result that carries no token.
-type emptyTokenResolver struct{}
-
-func (emptyTokenResolver) ResolveToken(_ context.Context, _ credential.TokenSpec) (*credential.TokenResult, error) {
-	return &credential.TokenResult{}, nil
-}
-
-// failingTokenResolver fails outright with an untyped error.
-type failingTokenResolver struct{}
-
-func (failingTokenResolver) ResolveToken(_ context.Context, _ credential.TokenSpec) (*credential.TokenResult, error) {
-	return nil, errors.New("backend unavailable")
-}
-
-func factoryWithResolver(r credential.DefaultTokenResolver) *cmdutil.Factory {
-	return &cmdutil.Factory{Credential: credential.NewCredentialProvider(nil, nil, r, nil)}
-}
-
-func TestResolveTenantToken_EmptyTokenResult(t *testing.T) {
-	_, err := resolveTenantToken(context.Background(), factoryWithResolver(emptyTokenResolver{}), "cli_x")
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs error, got %T: %v", err, err)
-	}
-	if p.Category != errs.CategoryAuthentication || p.Subtype != errs.SubtypeTokenMissing {
-		t.Errorf("problem = %s/%s, want %s/%s", p.Category, p.Subtype,
-			errs.CategoryAuthentication, errs.SubtypeTokenMissing)
-	}
-	var malformed *credential.MalformedTokenResultError
-	if !errors.As(err, &malformed) {
-		t.Error("empty-token failure should preserve the credential-layer cause")
-	}
-}
-
-func TestResolveTenantToken_ResolverFailure(t *testing.T) {
-	_, err := resolveTenantToken(context.Background(), factoryWithResolver(failingTokenResolver{}), "cli_x")
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs error, got %T: %v", err, err)
-	}
-	if p.Category != errs.CategoryAuthentication || p.Subtype != errs.SubtypeTokenMissing {
-		t.Errorf("problem = %s/%s, want %s/%s", p.Category, p.Subtype,
-			errs.CategoryAuthentication, errs.SubtypeTokenMissing)
-	}
-	if errors.Unwrap(err) == nil {
-		t.Error("resolver failure should preserve its cause")
-	}
-}
-
-// assertInvalidArgumentParam verifies err is a typed validation error with
-// subtype invalid_argument naming the given flag in its param field.
-func assertInvalidArgumentParam(t *testing.T, err error, param string) {
-	t.Helper()
-	var ve *errs.ValidationError
-	if !errors.As(err, &ve) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", err, err)
-	}
-	if ve.Subtype != errs.SubtypeInvalidArgument {
-		t.Errorf("subtype = %s, want %s", ve.Subtype, errs.SubtypeInvalidArgument)
-	}
-	if ve.Param != param {
-		t.Errorf("param = %q, want %q", ve.Param, param)
-	}
-}
-
 func TestSanitizeOutputDir(t *testing.T) {
 	cases := []struct {
 		name       string
@@ -207,7 +130,6 @@ func TestSanitizeOutputDir(t *testing.T) {
 				if !errors.Is(err, tc.wantSentry) {
 					t.Fatalf("want errors.Is(err, %v), got %q", tc.wantSentry, err.Error())
 				}
-				assertInvalidArgumentParam(t, err, "--output-dir")
 				return
 			}
 			if err != nil {
--- a/cmd/event/preflight_test.go
+++ b/cmd/event/preflight_test.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/appmeta"
 	"github.com/larksuite/cli/internal/core"
 	eventlib "github.com/larksuite/cli/internal/event"
+	"github.com/larksuite/cli/internal/output"
 )

 func newPreflightCtx(appID string, brand core.LarkBrand, identity core.Identity, keyDef *eventlib.KeyDefinition, appVer *appmeta.AppVersion) *preflightCtx {
@@ -89,17 +89,19 @@ func TestPreflightEventTypes_MissingBlocks(t *testing.T) {
 	if !strings.Contains(err.Error(), "mail.user_mailbox.event.message_read_v1") {
 		t.Errorf("error should name the missing event type, got: %v", err)
 	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs error, got %T: %v", err, err)
+	var exit *output.ExitError
+	if !errors.As(err, &exit) {
+		t.Fatalf("expected output.ExitError, got %T: %v", err, err)
 	}
-	if p.Category != errs.CategoryValidation || p.Subtype != errs.SubtypeFailedPrecondition {
-		t.Errorf("problem = %s/%s, want %s/%s", p.Category, p.Subtype,
-			errs.CategoryValidation, errs.SubtypeFailedPrecondition)
+	if exit.Code != output.ExitValidation {
+		t.Errorf("ExitCode = %d, want ExitValidation (%d)", exit.Code, output.ExitValidation)
+	}
+	if exit.Detail == nil {
+		t.Fatal("expected Detail with hint")
 	}
 	wantURL := "https://open.feishu.cn/app/cli_XXXXXXXXXXXXXXXX/event"
-	if !strings.Contains(p.Hint, wantURL) {
-		t.Errorf("hint missing subscription URL %q\ngot: %s", wantURL, p.Hint)
+	if !strings.Contains(exit.Detail.Hint, wantURL) {
+		t.Errorf("hint missing subscription URL %q\ngot: %s", wantURL, exit.Detail.Hint)
 	}
 }

@@ -143,19 +145,17 @@ func TestPreflightScopes_Bot_MissingBlocks(t *testing.T) {
 	if !strings.Contains(err.Error(), "im:message.group_at_msg") {
 		t.Errorf("error should name missing scope, got: %v", err)
 	}
-	var permErr *errs.PermissionError
-	if !errors.As(err, &permErr) {
-		t.Fatalf("expected *errs.PermissionError, got %T: %v", err, err)
+	var exit *output.ExitError
+	if !errors.As(err, &exit) {
+		t.Fatalf("expected output.ExitError, got %T: %v", err, err)
 	}
-	if permErr.Category != errs.CategoryAuthorization || permErr.Subtype != errs.SubtypeMissingScope {
-		t.Errorf("problem = %s/%s, want %s/%s", permErr.Category, permErr.Subtype,
-			errs.CategoryAuthorization, errs.SubtypeMissingScope)
+	if exit.Code != output.ExitAuth {
+		t.Errorf("ExitCode = %d, want ExitAuth (%d)", exit.Code, output.ExitAuth)
 	}
-	wantMissing := []string{"im:message.group_at_msg"}
-	if len(permErr.MissingScopes) != 1 || permErr.MissingScopes[0] != wantMissing[0] {
-		t.Errorf("MissingScopes = %v, want %v", permErr.MissingScopes, wantMissing)
+	if exit.Detail == nil {
+		t.Fatal("expected Detail with hint, got nil Detail")
 	}
-	hint := permErr.Hint
+	hint := exit.Detail.Hint
 	wantSubstrings := []string{
 		"https://open.feishu.cn/app/cli_x/auth?q=",
 		"im:message.group_at_msg",
--- a/cmd/event/runtime.go
+++ b/cmd/event/runtime.go
@@ -6,8 +6,8 @@ package event
 import (
 	"context"
 	"encoding/json"
+	"fmt"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/client"
 	"github.com/larksuite/cli/internal/core"
 )
@@ -26,11 +26,7 @@ func (r *consumeRuntime) CallAPI(ctx context.Context, method, path string, body
 		As:     r.accessIdentity,
 	})
 	if err != nil {
-		if _, ok := errs.ProblemOf(err); ok {
-			return nil, err
-		}
-		return nil, errs.NewNetworkError(errs.SubtypeNetworkTransport,
-			"api %s %s: %s", method, path, err).WithCause(err)
+		return nil, err
 	}
 	// Non-JSON HTTP errors (gateway text/plain 404 etc.) skip OAPI envelope parsing.
 	ct := resp.Header.Get("Content-Type")
@@ -40,20 +36,11 @@ func (r *consumeRuntime) CallAPI(ctx context.Context, method, path string, body
 		if len(body) > maxBodyEcho {
 			body = body[:maxBodyEcho] + "…(truncated)"
 		}
-		if resp.StatusCode >= 500 {
-			return nil, errs.NewNetworkError(errs.SubtypeNetworkServer,
-				"api %s %s returned %d: %s", method, path, resp.StatusCode, body).WithRetryable()
-		}
-		return nil, errs.NewInternalError(errs.SubtypeInvalidResponse,
-			"api %s %s returned %d: %s", method, path, resp.StatusCode, body)
+		return nil, fmt.Errorf("api %s %s returned %d: %s", method, path, resp.StatusCode, body)
 	}
 	result, err := client.ParseJSONResponse(resp)
 	if err != nil {
-		if _, ok := errs.ProblemOf(err); ok {
-			return nil, err
-		}
-		return nil, errs.NewInternalError(errs.SubtypeInvalidResponse,
-			"api %s %s: %s", method, path, err).WithCause(err)
+		return nil, err
 	}
 	if apiErr := r.client.CheckResponse(result, r.accessIdentity); apiErr != nil {
 		return json.RawMessage(resp.RawBody), apiErr
--- a/cmd/event/runtime_test.go
+++ b/cmd/event/runtime_test.go
@@ -1,147 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package event
-
-import (
-	"context"
-	"errors"
-	"io"
-	"net/http"
-	"strings"
-	"testing"
-
-	lark "github.com/larksuite/oapi-sdk-go/v3"
-	larkcore "github.com/larksuite/oapi-sdk-go/v3/core"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/client"
-	"github.com/larksuite/cli/internal/core"
-	"github.com/larksuite/cli/internal/credential"
-)
-
-// staticTokenResolver always returns a fixed token without any HTTP calls.
-type staticTokenResolver struct{}
-
-func (s *staticTokenResolver) ResolveToken(_ context.Context, _ credential.TokenSpec) (*credential.TokenResult, error) {
-	return &credential.TokenResult{Token: "test-token"}, nil
-}
-
-// stubRoundTripper intercepts every outgoing request with a canned response.
-type stubRoundTripper struct {
-	respond func(*http.Request) (*http.Response, error)
-}
-
-func (s stubRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) { return s.respond(r) }
-
-func newTestConsumeRuntime(rt http.RoundTripper) *consumeRuntime {
-	sdk := lark.NewClient("test-app", "test-secret",
-		lark.WithEnableTokenCache(false),
-		lark.WithLogLevel(larkcore.LogLevelError),
-		lark.WithHttpClient(&http.Client{Transport: rt}),
-	)
-	return &consumeRuntime{
-		client: &client.APIClient{
-			SDK:        sdk,
-			ErrOut:     io.Discard,
-			Credential: credential.NewCredentialProvider(nil, nil, &staticTokenResolver{}, nil),
-			Config:     &core.CliConfig{AppID: "test-app", AppSecret: "test-secret", Brand: core.BrandFeishu},
-		},
-		accessIdentity: core.AsBot,
-	}
-}
-
-func stubResponse(status int, contentType, body string) func(*http.Request) (*http.Response, error) {
-	return func(r *http.Request) (*http.Response, error) {
-		return &http.Response{
-			StatusCode: status,
-			Header:     http.Header{"Content-Type": []string{contentType}},
-			Body:       io.NopCloser(strings.NewReader(body)),
-			Request:    r,
-		}, nil
-	}
-}
-
-func requireCallAPIProblem(t *testing.T, err error, category errs.Category, subtype errs.Subtype) {
-	t.Helper()
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs error, got %T: %v", err, err)
-	}
-	if p.Category != category || p.Subtype != subtype {
-		t.Fatalf("problem = %s/%s, want %s/%s", p.Category, p.Subtype, category, subtype)
-	}
-}
-
-func TestConsumeRuntimeCallAPI_NonJSONHTTPError(t *testing.T) {
-	r := newTestConsumeRuntime(stubRoundTripper{respond: stubResponse(http.StatusNotFound, "text/plain", "gone")})
-	_, err := r.CallAPI(context.Background(), "GET", "/open-apis/event/v1/connection", nil)
-	requireCallAPIProblem(t, err, errs.CategoryInternal, errs.SubtypeInvalidResponse)
-	if !strings.Contains(err.Error(), "returned 404") {
-		t.Errorf("error should echo the HTTP status, got: %v", err)
-	}
-}
-
-func TestConsumeRuntimeCallAPI_NonJSONHTTPErrorTruncatesLongBody(t *testing.T) {
-	long := strings.Repeat("x", 300)
-	r := newTestConsumeRuntime(stubRoundTripper{respond: stubResponse(http.StatusBadGateway, "text/html", long)})
-	_, err := r.CallAPI(context.Background(), "GET", "/open-apis/event/v1/connection", nil)
-	requireCallAPIProblem(t, err, errs.CategoryNetwork, errs.SubtypeNetworkServer)
-	p, _ := errs.ProblemOf(err)
-	if !p.Retryable {
-		t.Fatal("5xx non-JSON response should be marked retryable")
-	}
-	if !strings.Contains(err.Error(), "…(truncated)") {
-		t.Errorf("long body should be truncated in the message, got: %v", err)
-	}
-}
-
-func TestConsumeRuntimeCallAPI_UnparsableJSONBody(t *testing.T) {
-	r := newTestConsumeRuntime(stubRoundTripper{respond: stubResponse(http.StatusOK, "application/json", "{not json")})
-	_, err := r.CallAPI(context.Background(), "GET", "/open-apis/event/v1/connection", nil)
-	requireCallAPIProblem(t, err, errs.CategoryInternal, errs.SubtypeInvalidResponse)
-}
-
-func TestConsumeRuntimeCallAPI_TransportFailure(t *testing.T) {
-	r := newTestConsumeRuntime(stubRoundTripper{respond: func(*http.Request) (*http.Response, error) {
-		return nil, errors.New("connection refused")
-	}})
-	_, err := r.CallAPI(context.Background(), "GET", "/open-apis/event/v1/connection", nil)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs error, got %T: %v", err, err)
-	}
-	if p.Category != errs.CategoryNetwork {
-		t.Fatalf("category = %s, want %s", p.Category, errs.CategoryNetwork)
-	}
-}
-
-func TestConsumeRuntimeCallAPI_EnvelopeErrorIsTyped(t *testing.T) {
-	r := newTestConsumeRuntime(stubRoundTripper{respond: stubResponse(http.StatusOK, "application/json",
-		`{"code":99991663,"msg":"app not found"}`)})
-	_, err := r.CallAPI(context.Background(), "GET", "/open-apis/event/v1/connection", nil)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	if _, ok := errs.ProblemOf(err); !ok {
-		t.Fatalf("envelope error should be typed via BuildAPIError, got %T: %v", err, err)
-	}
-}
-
-func TestConsumeRuntimeCallAPI_Success(t *testing.T) {
-	r := newTestConsumeRuntime(stubRoundTripper{respond: stubResponse(http.StatusOK, "application/json",
-		`{"code":0,"data":{"ok":true}}`)})
-	raw, err := r.CallAPI(context.Background(), "GET", "/open-apis/event/v1/connection", nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if !strings.Contains(string(raw), `"code":0`) {
-		t.Errorf("raw body should pass through, got: %s", raw)
-	}
-}
--- a/cmd/event/schema.go
+++ b/cmd/event/schema.go
@@ -11,7 +11,6 @@ import (

 	"github.com/spf13/cobra"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/cmdutil"
 	eventlib "github.com/larksuite/cli/internal/event"
 	"github.com/larksuite/cli/internal/event/schemas"
@@ -40,14 +39,12 @@ func resolveSchemaJSON(def *eventlib.KeyDefinition) (json.RawMessage, []string,
 	if len(def.Schema.FieldOverrides) > 0 {
 		var parsed map[string]interface{}
 		if err := json.Unmarshal(base, &parsed); err != nil {
-			return nil, nil, errs.NewInternalError(errs.SubtypeUnknown,
-				"parse base schema for field overrides: %s", err).WithCause(err)
+			return nil, nil, err
 		}
 		orphans := schemas.ApplyFieldOverrides(parsed, def.Schema.FieldOverrides)
 		out, err := json.Marshal(parsed)
 		if err != nil {
-			return nil, nil, errs.NewInternalError(errs.SubtypeUnknown,
-				"serialize schema with field overrides: %s", err).WithCause(err)
+			return nil, nil, err
 		}
 		return out, orphans, nil
 	}
@@ -76,7 +73,7 @@ func renderSpec(s *eventlib.SchemaSpec) (json.RawMessage, error) {
 		copy(buf, s.Raw)
 		return buf, nil
 	}
-	return nil, errs.NewInternalError(errs.SubtypeUnknown, "schemaSpec has neither Type nor Raw")
+	return nil, fmt.Errorf("schemaSpec has neither Type nor Raw")
 }

 func NewCmdSchema(f *cmdutil.Factory) *cobra.Command {
@@ -168,7 +165,7 @@ func runSchema(f *cmdutil.Factory, key string, asJSON bool) error {

 	resolved, _, err := resolveSchemaJSON(def)
 	if err != nil {
-		return err
+		return output.Errorf(output.ExitInternal, "internal", "resolve schema: %v", err)
 	}
 	if resolved != nil {
 		fmt.Fprintf(out, "\nOutput Schema:\n")
--- a/cmd/event/schema_test.go
+++ b/cmd/event/schema_test.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 	"testing"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/cmdutil"
 	"github.com/larksuite/cli/internal/core"
 	eventlib "github.com/larksuite/cli/internal/event"
@@ -130,38 +129,3 @@ func TestResolveSchemaJSON_CustomWithOverlay(t *testing.T) {
 		t.Errorf("overlay format = %v, want open_id", got)
 	}
 }
-
-func TestRenderSpec_EmptySpecIsTypedInternalError(t *testing.T) {
-	_, err := renderSpec(&eventlib.SchemaSpec{})
-	if err == nil {
-		t.Fatal("expected error for spec with neither Type nor Raw")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs error, got %T: %v", err, err)
-	}
-	if p.Category != errs.CategoryInternal {
-		t.Errorf("category = %s, want %s", p.Category, errs.CategoryInternal)
-	}
-}
-
-func TestResolveSchemaJSON_InvalidBaseWithOverridesIsTypedInternalError(t *testing.T) {
-	def := &eventlib.KeyDefinition{
-		Key: "synthetic.invalid.base",
-		Schema: eventlib.SchemaDef{
-			Custom:         &eventlib.SchemaSpec{Raw: json.RawMessage("{not json")},
-			FieldOverrides: map[string]schemas.FieldMeta{"x": {}},
-		},
-	}
-	_, _, err := resolveSchemaJSON(def)
-	if err == nil {
-		t.Fatal("expected error for unparsable base schema")
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs error, got %T: %v", err, err)
-	}
-	if p.Category != errs.CategoryInternal {
-		t.Errorf("category = %s, want %s", p.Category, errs.CategoryInternal)
-	}
-}
--- a/cmd/event/suggestions.go
+++ b/cmd/event/suggestions.go
@@ -8,8 +8,8 @@ import (
 	"sort"
 	"strings"

-	"github.com/larksuite/cli/errs"
 	eventlib "github.com/larksuite/cli/internal/event"
+	"github.com/larksuite/cli/internal/output"
 	"github.com/larksuite/cli/internal/suggest"
 )

@@ -64,6 +64,9 @@ func unknownEventKeyErr(key string) error {
 	if guesses := suggestEventKeys(key); len(guesses) > 0 {
 		msg += " — did you mean " + formatSuggestions(guesses) + "?"
 	}
-	return errs.NewValidationError(errs.SubtypeInvalidArgument, "%s", msg).
-		WithHint("Run 'lark-cli event list' to see available keys.")
+	return output.ErrWithHint(
+		output.ExitValidation, "validation",
+		msg,
+		"Run 'lark-cli event list' to see available keys.",
+	)
 }
--- a/cmd/service/service.go
+++ b/cmd/service/service.go
@@ -18,6 +18,7 @@ import (
 	"github.com/larksuite/cli/internal/errclass"
 	"github.com/larksuite/cli/internal/output"
 	"github.com/larksuite/cli/internal/registry"
+	"github.com/larksuite/cli/internal/registry/metaschema"
 	"github.com/larksuite/cli/internal/util"
 	"github.com/larksuite/cli/internal/validate"
 	larkcore "github.com/larksuite/oapi-sdk-go/v3/core"
@@ -30,74 +31,56 @@ func RegisterServiceCommands(parent *cobra.Command, f *cmdutil.Factory) {
 }

 func RegisterServiceCommandsWithContext(ctx context.Context, parent *cobra.Command, f *cmdutil.Factory) {
-	for _, project := range registry.ListFromMetaProjects() {
-		spec := registry.LoadFromMeta(project)
-		if spec == nil {
+	for _, spec := range registry.TypedServices() {
+		if spec.Name == "" || spec.ServicePath == "" || len(spec.Resources) == 0 {
 			continue
 		}
-		specName := registry.GetStrFromMap(spec, "name")
-		servicePath := registry.GetStrFromMap(spec, "servicePath")
-		if specName == "" || servicePath == "" {
-			continue
-		}
-		resources, _ := spec["resources"].(map[string]interface{})
-		if resources == nil {
-			continue
-		}
-		registerServiceWithContext(ctx, parent, spec, resources, f)
+		registerServiceWithContext(ctx, parent, spec, f)
 	}
 }

 func registerService(parent *cobra.Command, spec map[string]interface{}, resources map[string]interface{}, f *cmdutil.Factory) {
-	registerServiceWithContext(context.Background(), parent, spec, resources, f)
+	svc := registry.MapToService(spec)
+	svc.Resources = registry.MapToResources(resources)
+	registerServiceWithContext(context.Background(), parent, svc, f)
 }

-func registerServiceWithContext(ctx context.Context, parent *cobra.Command, spec map[string]interface{}, resources map[string]interface{}, f *cmdutil.Factory) {
-	specName := registry.GetStrFromMap(spec, "name")
-	specDesc := registry.GetServiceDescription(specName, "en")
+func registerServiceWithContext(ctx context.Context, parent *cobra.Command, spec metaschema.Service, f *cmdutil.Factory) {
+	specDesc := registry.GetServiceDescription(spec.Name, "en")
 	if specDesc == "" {
-		specDesc = registry.GetStrFromMap(spec, "description")
+		specDesc = spec.Description
 	}

 	// Find existing service command or create one
 	var svc *cobra.Command
 	for _, c := range parent.Commands() {
-		if c.Name() == specName {
+		if c.Name() == spec.Name {
 			svc = c
 			break
 		}
 	}
 	if svc == nil {
 		svc = &cobra.Command{
-			Use:   specName,
+			Use:   spec.Name,
 			Short: specDesc,
 		}
 		parent.AddCommand(svc)
 	}

-	for resName, resource := range resources {
-		resMap, _ := resource.(map[string]interface{})
-		if resMap == nil {
-			continue
-		}
-		registerResourceWithContext(ctx, svc, spec, resName, resMap, f)
+	for _, resource := range spec.Resources {
+		registerResourceWithContext(ctx, svc, spec, resource, f)
 	}
 }

-func registerResourceWithContext(ctx context.Context, parent *cobra.Command, spec map[string]interface{}, name string, resource map[string]interface{}, f *cmdutil.Factory) {
+func registerResourceWithContext(ctx context.Context, parent *cobra.Command, spec metaschema.Service, resource metaschema.Resource, f *cmdutil.Factory) {
 	res := &cobra.Command{
-		Use:   name,
-		Short: name + " operations",
+		Use:   resource.Name,
+		Short: resource.Name + " operations",
 	}
 	parent.AddCommand(res)

-	methods, _ := resource["methods"].(map[string]interface{})
-	for methodName, method := range methods {
-		methodMap, _ := method.(map[string]interface{})
-		if methodMap == nil {
-			continue
-		}
-		registerMethodWithContext(ctx, res, spec, methodMap, methodName, name, f)
+	for _, method := range resource.Methods {
+		registerMethodWithContext(ctx, res, spec, method, method.Name, resource.Name, f)
 	}
 }

@@ -125,31 +108,36 @@ type ServiceMethodOptions struct {
 	FileFields []string // auto-detected file field names from metadata
 }

-// detectFileFields delegates to the shared cmdutil.DetectFileFields helper.
-func detectFileFields(method map[string]interface{}) []string {
-	return cmdutil.DetectFileFields(method)
+// detectFileFieldsTyped returns the names of file-type fields in the method's
+// request body (used to decide whether to register --file).
+func detectFileFieldsTyped(m metaschema.Method) []string {
+	var fields []string
+	for _, fld := range m.RequestBody {
+		if fld.Type == "file" {
+			fields = append(fields, fld.Name)
+		}
+	}
+	return fields
 }

-func registerMethodWithContext(ctx context.Context, parent *cobra.Command, spec map[string]interface{}, method map[string]interface{}, name string, resName string, f *cmdutil.Factory) {
+func registerMethodWithContext(ctx context.Context, parent *cobra.Command, spec metaschema.Service, method metaschema.Method, name string, resName string, f *cmdutil.Factory) {
 	parent.AddCommand(NewCmdServiceMethodWithContext(ctx, f, spec, method, name, resName, nil))
 }

-// NewCmdServiceMethod creates a command for a dynamically registered service method.
+// NewCmdServiceMethod creates a command for a dynamically registered service
+// method from map specs (kept for tests; converts to typed internally).
 func NewCmdServiceMethod(f *cmdutil.Factory, spec, method map[string]interface{}, name, resName string, runF func(*ServiceMethodOptions) error) *cobra.Command {
-	return NewCmdServiceMethodWithContext(context.Background(), f, spec, method, name, resName, runF)
+	return NewCmdServiceMethodWithContext(context.Background(), f, registry.MapToService(spec), registry.MapToMethod(name, method), name, resName, runF)
 }

-func NewCmdServiceMethodWithContext(ctx context.Context, f *cmdutil.Factory, spec, method map[string]interface{}, name, resName string, runF func(*ServiceMethodOptions) error) *cobra.Command {
-	desc := registry.GetStrFromMap(method, "description")
-	httpMethod := registry.GetStrFromMap(method, "httpMethod")
-	risk := registry.GetStrFromMap(method, "risk")
-	specName := registry.GetStrFromMap(spec, "name")
-	schemaPath := fmt.Sprintf("%s.%s.%s", specName, resName, name)
+func NewCmdServiceMethodWithContext(ctx context.Context, f *cmdutil.Factory, spec metaschema.Service, method metaschema.Method, name, resName string, runF func(*ServiceMethodOptions) error) *cobra.Command {
+	desc := method.Description
+	httpMethod := method.HTTPMethod
+	risk := method.Risk
+	schemaPath := fmt.Sprintf("%s.%s.%s", spec.Name, resName, name)

 	opts := &ServiceMethodOptions{
 		Factory:    f,
-		Spec:       spec,
-		Method:     method,
 		SchemaPath: schemaPath,
 	}
 	var asStr string
@@ -159,6 +147,10 @@ func NewCmdServiceMethodWithContext(ctx context.Context, f *cmdutil.Factory, spe
 		Short: desc,
 		Long:  fmt.Sprintf("%s\n\nView parameter definitions before calling:\n  lark-cli schema %s", desc, schemaPath),
 		RunE: func(cmd *cobra.Command, args []string) error {
+			// Materialize the maps the execution path still reads lazily — only
+			// when THIS command actually runs, never at startup.
+			opts.Spec = registry.ServiceToMap(spec)
+			opts.Method = registry.MethodToMap(method)
 			opts.Cmd = cmd
 			opts.Ctx = cmd.Context()
 			opts.As = core.Identity(asStr)
@@ -188,7 +180,7 @@ func NewCmdServiceMethodWithContext(ctx context.Context, f *cmdutil.Factory, spe
 	}

 	// Conditionally register --file for methods with file-type fields.
-	fileFields := detectFileFields(method)
+	fileFields := detectFileFieldsTyped(method)
 	opts.FileFields = fileFields
 	if len(fileFields) > 0 {
 		switch httpMethod {
@@ -200,10 +192,15 @@ func NewCmdServiceMethodWithContext(ctx context.Context, f *cmdutil.Factory, spe
 		return []string{"json", "ndjson", "table", "csv"}, cobra.ShellCompDirectiveNoFileComp
 	})

-	cmdutil.SetTips(cmd, registry.GetStrSliceFromMap(method, "tips"))
+	// meta_data.json carries no per-method tips; SetTips(nil) matches prior behavior.
+	cmdutil.SetTips(cmd, nil)
 	cmdutil.SetRisk(cmd, risk)
-	if tokens, ok := method["accessTokens"].([]interface{}); ok && len(tokens) > 0 {
-		cmdutil.SetSupportedIdentities(cmd, cmdutil.AccessTokensToIdentities(tokens))
+	if len(method.AccessTokens) > 0 {
+		toks := make([]interface{}, len(method.AccessTokens))
+		for i, t := range method.AccessTokens {
+			toks[i] = t
+		}
+		cmdutil.SetSupportedIdentities(cmd, cmdutil.AccessTokensToIdentities(toks))
 	}

 	return cmd
--- a/cmd/service/service_test.go
+++ b/cmd/service/service_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/larksuite/cli/internal/cmdutil"
 	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/httpmock"
+	"github.com/larksuite/cli/internal/registry"
 	"github.com/spf13/cobra"
 )

@@ -752,7 +753,7 @@ func TestDetectFileFields(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := detectFileFields(tt.method)
+			got := detectFileFieldsTyped(registry.MapToMethod("", tt.method))
 			if len(got) != len(tt.want) {
 				t.Errorf("detectFileFields() = %v, want %v", got, tt.want)
 				return
--- a/events/minutes/preconsume.go
+++ b/events/minutes/preconsume.go
@@ -5,9 +5,9 @@ package minutes

 import (
 	"context"
+	"fmt"
 	"time"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/event"
 )

@@ -16,8 +16,7 @@ const cleanupTimeout = 5 * time.Second
 func subscriptionPreConsume(eventType, subscribePath, unsubscribePath string) func(context.Context, event.APIClient, map[string]string) (func(), error) {
 	return func(ctx context.Context, rt event.APIClient, _ map[string]string) (func(), error) {
 		if rt == nil {
-			return nil, errs.NewInternalError(errs.SubtypeUnknown,
-				"runtime API client is required for pre-consume subscription")
+			return nil, fmt.Errorf("runtime API client is required for pre-consume subscription")
 		}

 		body := map[string]string{"event_type": eventType}
--- a/events/vc/note_detail_retry_test.go
+++ b/events/vc/note_detail_retry_test.go
@@ -1,35 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package vc
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-)
-
-// isLarkCode must match the API code on typed errs.* errors — the consume
-// runtime classifies OAPI failures via errclass.BuildAPIError, so the
-// not-found retry in fillVCNoteGeneratedDetails depends on this reading
-// Problem.Code rather than the legacy envelope shape.
-func TestIsLarkCode_MatchesTypedAPIErrorCode(t *testing.T) {
-	typedNotFound := errs.NewAPIError(errs.SubtypeNotFound, "note not ready").
-		WithCode(vcNoteDetailNotFoundCode)
-	if !isLarkCode(typedNotFound, vcNoteDetailNotFoundCode) {
-		t.Fatal("typed API error carrying the not-found code must match (retry path)")
-	}
-	if isLarkCode(typedNotFound, 99999) {
-		t.Error("a different expected code must not match")
-	}
-
-	otherTyped := errs.NewAPIError(errs.SubtypeServerError, "boom").WithCode(500)
-	if isLarkCode(otherTyped, vcNoteDetailNotFoundCode) {
-		t.Error("typed error with another code must not match")
-	}
-
-	if isLarkCode(errors.New("plain failure"), vcNoteDetailNotFoundCode) {
-		t.Error("untyped error must not match")
-	}
-}
--- a/events/vc/note_generated.go
+++ b/events/vc/note_generated.go
@@ -6,11 +6,12 @@ package vc
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"time"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/event"
+	"github.com/larksuite/cli/internal/output"
 	"github.com/larksuite/cli/internal/validate"
 )

@@ -147,8 +148,9 @@ func fillVCNoteGeneratedDetails(ctx context.Context, rt event.APIClient, out *VC
 }

 func isLarkCode(err error, code int) bool {
-	if p, ok := errs.ProblemOf(err); ok {
-		return p.Code == code
+	var exitErr *output.ExitError
+	if errors.As(err, &exitErr) && exitErr.Detail != nil {
+		return exitErr.Detail.Code == code
 	}
 	return false
 }
--- a/events/vc/preconsume.go
+++ b/events/vc/preconsume.go
@@ -5,9 +5,9 @@ package vc

 import (
 	"context"
+	"fmt"
 	"time"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/event"
 )

@@ -16,8 +16,7 @@ const cleanupTimeout = 5 * time.Second
 func subscriptionPreConsume(eventType, subscribePath, unsubscribePath string) func(context.Context, event.APIClient, map[string]string) (func(), error) {
 	return func(ctx context.Context, rt event.APIClient, _ map[string]string) (func(), error) {
 		if rt == nil {
-			return nil, errs.NewInternalError(errs.SubtypeUnknown,
-				"runtime API client is required for pre-consume subscription")
+			return nil, fmt.Errorf("runtime API client is required for pre-consume subscription")
 		}

 		body := map[string]string{"event_type": eventType}
--- a/events/vc/recording_ended.go
+++ b/events/vc/recording_ended.go
@@ -1,84 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package vc
-
-import (
-	"context"
-	"encoding/json"
-	"strconv"
-	"time"
-
-	"github.com/larksuite/cli/internal/event"
-)
-
-// VCRecordingEndedOutput is the flattened shape for vc.recording.recording_ended_v1.
-type VCRecordingEndedOutput struct {
-	Type      string `json:"type"                 desc:"Event type; always vc.recording.recording_ended_v1"`
-	EventID   string `json:"event_id,omitempty"   desc:"Globally unique event ID; safe for deduplication"`
-	EventTime string `json:"event_time,omitempty" desc:"Time when the recording ended and uploaded successfully, in RFC3339 / ISO 8601 with the current system timezone"`
-	UniqueKey string `json:"unique_key,omitempty" desc:"Unique key generated for one recording_bean recording session"`
-	Source    string `json:"source,omitempty"     desc:"Recording source; always recording_bean"`
-}
-
-type recordingEndedEnvelope struct {
-	Header struct {
-		EventID    string `json:"event_id"`
-		EventType  string `json:"event_type"`
-		CreateTime string `json:"create_time"`
-	} `json:"header"`
-	Event recordingEndedEvent `json:"event"`
-}
-
-type recordingEndedEvent struct {
-	UniqueKey string `json:"unique_key"`
-	Source    string `json:"source"`
-}
-
-func processVCRecordingEnded(_ context.Context, _ event.APIClient, raw *event.RawEvent, _ map[string]string) (json.RawMessage, error) {
-	envelope, ok := parseRecordingEndedEnvelope(raw)
-	if !ok {
-		return raw.Payload, nil
-	}
-	if !isRecordingEndedBeanEvent(envelope) {
-		return nil, nil
-	}
-	out := &VCRecordingEndedOutput{
-		Type:      recordingEndedEventType(envelope, raw),
-		EventID:   envelope.Header.EventID,
-		EventTime: recordingEndedEventTime(envelope.Header.CreateTime),
-		UniqueKey: envelope.Event.UniqueKey,
-		Source:    envelope.Event.Source,
-	}
-	return json.Marshal(out)
-}
-
-func parseRecordingEndedEnvelope(raw *event.RawEvent) (*recordingEndedEnvelope, bool) {
-	var envelope recordingEndedEnvelope
-	if err := json.Unmarshal(raw.Payload, &envelope); err != nil {
-		return nil, false
-	}
-	return &envelope, true
-}
-
-func isRecordingEndedBeanEvent(envelope *recordingEndedEnvelope) bool {
-	return envelope != nil && envelope.Event.Source == "recording_bean"
-}
-
-func recordingEndedEventType(envelope *recordingEndedEnvelope, raw *event.RawEvent) string {
-	if envelope != nil && envelope.Header.EventType != "" {
-		return envelope.Header.EventType
-	}
-	return raw.EventType
-}
-
-func recordingEndedEventTime(raw string) string {
-	if raw == "" {
-		return ""
-	}
-	millis, err := strconv.ParseInt(raw, 10, 64)
-	if err != nil {
-		return ""
-	}
-	return time.UnixMilli(millis).Local().Format(time.RFC3339)
-}
--- a/events/vc/recording_started.go
+++ b/events/vc/recording_started.go
@@ -1,84 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package vc
-
-import (
-	"context"
-	"encoding/json"
-	"strconv"
-	"time"
-
-	"github.com/larksuite/cli/internal/event"
-)
-
-// VCRecordingStartedOutput is the flattened shape for vc.recording.recording_started_v1.
-type VCRecordingStartedOutput struct {
-	Type      string `json:"type"                 desc:"Event type; always vc.recording.recording_started_v1"`
-	EventID   string `json:"event_id,omitempty"   desc:"Globally unique event ID; safe for deduplication"`
-	EventTime string `json:"event_time,omitempty" desc:"Recording start time in RFC3339 / ISO 8601 with the current system timezone"`
-	UniqueKey string `json:"unique_key,omitempty" desc:"Unique key generated for one recording_bean recording session"`
-	Source    string `json:"source,omitempty"     desc:"Recording source; always recording_bean"`
-}
-
-type recordingStartedEnvelope struct {
-	Header struct {
-		EventID    string `json:"event_id"`
-		EventType  string `json:"event_type"`
-		CreateTime string `json:"create_time"`
-	} `json:"header"`
-	Event recordingStartedEvent `json:"event"`
-}
-
-type recordingStartedEvent struct {
-	UniqueKey string `json:"unique_key"`
-	Source    string `json:"source"`
-}
-
-func processVCRecordingStarted(_ context.Context, _ event.APIClient, raw *event.RawEvent, _ map[string]string) (json.RawMessage, error) {
-	envelope, ok := parseRecordingStartedEnvelope(raw)
-	if !ok {
-		return raw.Payload, nil
-	}
-	if !isRecordingStartedBeanEvent(envelope) {
-		return nil, nil
-	}
-	out := &VCRecordingStartedOutput{
-		Type:      recordingStartedEventType(envelope, raw),
-		EventID:   envelope.Header.EventID,
-		EventTime: recordingStartedEventTime(envelope.Header.CreateTime),
-		UniqueKey: envelope.Event.UniqueKey,
-		Source:    envelope.Event.Source,
-	}
-	return json.Marshal(out)
-}
-
-func parseRecordingStartedEnvelope(raw *event.RawEvent) (*recordingStartedEnvelope, bool) {
-	var envelope recordingStartedEnvelope
-	if err := json.Unmarshal(raw.Payload, &envelope); err != nil {
-		return nil, false
-	}
-	return &envelope, true
-}
-
-func isRecordingStartedBeanEvent(envelope *recordingStartedEnvelope) bool {
-	return envelope != nil && envelope.Event.Source == "recording_bean"
-}
-
-func recordingStartedEventType(envelope *recordingStartedEnvelope, raw *event.RawEvent) string {
-	if envelope != nil && envelope.Header.EventType != "" {
-		return envelope.Header.EventType
-	}
-	return raw.EventType
-}
-
-func recordingStartedEventTime(raw string) string {
-	if raw == "" {
-		return ""
-	}
-	millis, err := strconv.ParseInt(raw, 10, 64)
-	if err != nil {
-		return ""
-	}
-	return time.UnixMilli(millis).Local().Format(time.RFC3339)
-}
--- a/events/vc/recording_test.go
+++ b/events/vc/recording_test.go
@@ -1,468 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package vc
-
-import (
-	"context"
-	"encoding/json"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/larksuite/cli/internal/event"
-)
-
-func TestVCKeys_RecordingEventsRegistered(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	for _, tc := range []struct {
-		eventType string
-	}{
-		{eventTypeRecordingStarted},
-		{eventTypeRecordingTranscriptGenerated},
-		{eventTypeRecordingEnded},
-	} {
-		t.Run(tc.eventType, func(t *testing.T) {
-			def, ok := event.Lookup(tc.eventType)
-			if !ok {
-				t.Fatalf("%s should be registered via Keys()", tc.eventType)
-			}
-			if def.Schema.Custom == nil {
-				t.Error("Processed key must set Schema.Custom")
-			}
-			if def.Schema.Native != nil {
-				t.Error("Processed key must not set Schema.Native")
-			}
-			if def.Process == nil {
-				t.Error("Process must not be nil for processed key")
-			}
-			if def.PreConsume == nil {
-				t.Error("PreConsume must not be nil for processed key")
-			}
-			if len(def.Scopes) != 1 || def.Scopes[0] != "vc:recording:read" {
-				t.Errorf("Scopes = %v", def.Scopes)
-			}
-			if len(def.AuthTypes) != 1 || def.AuthTypes[0] != "user" {
-				t.Errorf("AuthTypes = %v", def.AuthTypes)
-			}
-			if len(def.RequiredConsoleEvents) != 1 || def.RequiredConsoleEvents[0] != tc.eventType {
-				t.Errorf("RequiredConsoleEvents = %v", def.RequiredConsoleEvents)
-			}
-			if !strings.Contains(def.Description, "recording_bean") {
-				t.Errorf("Description should document recording_bean source, got %q", def.Description)
-			}
-			if !strings.Contains(def.Description, "connected to Feishu software") {
-				t.Errorf("Description should document Feishu software connection requirement, got %q", def.Description)
-			}
-			if strings.Contains(def.Description, "future") || strings.Contains(def.Description, "software_recording") {
-				t.Errorf("Description should not mention future sources, got %q", def.Description)
-			}
-			if tc.eventType == eventTypeRecordingEnded && (strings.Contains(def.Description, "object_type") || strings.Contains(def.Description, "object_id")) {
-				t.Errorf("ended Description should not document object metadata, got %q", def.Description)
-			}
-			wantSchemaType := reflect.TypeOf(VCRecordingStartedOutput{})
-			switch tc.eventType {
-			case eventTypeRecordingTranscriptGenerated:
-				wantSchemaType = reflect.TypeOf(VCRecordingTranscriptGeneratedOutput{})
-			case eventTypeRecordingEnded:
-				wantSchemaType = reflect.TypeOf(VCRecordingEndedOutput{})
-			}
-			if def.Schema.Custom.Type != wantSchemaType {
-				t.Errorf("Custom schema Type = %v, want %v", def.Schema.Custom.Type, wantSchemaType)
-			}
-		})
-	}
-}
-
-func TestProcessVCRecordingStarted(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	out := runRecordingProcess[VCRecordingStartedOutput](t, eventTypeRecordingStarted, processVCRecordingStarted, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "ev_rec_start_001",
-			"event_type": "vc.recording.recording_started_v1",
-			"create_time": "1761782400000"
-		},
-		"event": {
-			"unique_key": "recording_001",
-			"source": "recording_bean"
-		}
-	}`)
-
-	if out.Type != eventTypeRecordingStarted {
-		t.Errorf("Type = %q", out.Type)
-	}
-	if out.EventID != "ev_rec_start_001" || out.EventTime != recordingTestEventTime(1761782400000) {
-		t.Errorf("EventID/EventTime = %q/%q", out.EventID, out.EventTime)
-	}
-	if out.UniqueKey != "recording_001" || out.Source != "recording_bean" {
-		t.Errorf("UniqueKey/Source = %q/%q", out.UniqueKey, out.Source)
-	}
-}
-
-func TestProcessVCRecordingTranscriptGenerated(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	got := runRecordingProcessRaw(t, eventTypeRecordingTranscriptGenerated, processVCRecordingTranscriptGenerated, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "ev_rec_transcript_001",
-			"event_type": "vc.recording.recording_transcript_generated_v1",
-			"create_time": "1761782400100"
-		},
-		"event": {
-			"unique_key": "recording_001",
-			"source": "recording_bean",
-			"transcript_items": [
-				{
-					"speaker": {
-						"id": {
-							"open_id": "ou_0f8bf7acdf2ae69553ecbdbfbbd10a53",
-							"union_id": "on_bc03f16d781bff4178a5d11e48eb1867",
-							"user_id": null
-						},
-						"user_type": 100,
-						"user_role": 1,
-						"user_name": "Alice"
-					},
-					"text": "hello world",
-					"language": "en_us",
-					"start_time_ms": "1761782399000",
-					"end_time_ms": "1761782400000",
-					"sentence_id": "987654321"
-				},
-				{
-					"speaker": {
-						"user_name": "Bob"
-					},
-					"text": "second sentence",
-					"language": "en_us",
-					"start_time_ms": "1761782401000",
-					"end_time_ms": "1761782402000",
-					"sentence_id": "987654322"
-				}
-			]
-		}
-	}`)
-	if got == nil {
-		t.Fatal("Process output is nil")
-	}
-	var out VCRecordingTranscriptGeneratedOutput
-	if err := json.Unmarshal(got, &out); err != nil {
-		t.Fatalf("Process output is not valid JSON: %v\nraw=%s", err, string(got))
-	}
-
-	if out.Type != eventTypeRecordingTranscriptGenerated {
-		t.Errorf("Type = %q", out.Type)
-	}
-	if out.UniqueKey != "recording_001" || out.Source != "recording_bean" {
-		t.Errorf("UniqueKey/Source = %q/%q", out.UniqueKey, out.Source)
-	}
-	if out.EventTime != recordingTestEventTime(1761782400100) {
-		t.Errorf("EventTime = %q", out.EventTime)
-	}
-	if len(out.TranscriptItems) != 2 {
-		t.Fatalf("TranscriptItems len = %d, want 2", len(out.TranscriptItems))
-	}
-	item := out.TranscriptItems[0]
-	if item.SpeakerName != "Alice" || item.Text != "hello world" {
-		t.Errorf("Transcript speaker/text = %q/%q", item.SpeakerName, item.Text)
-	}
-	if item.StartTime != recordingTestEventTime(1761782399000) || item.EndTime != recordingTestEventTime(1761782400000) {
-		t.Errorf("Transcript timing = %q/%q", item.StartTime, item.EndTime)
-	}
-	if item.SentenceID != "987654321" {
-		t.Errorf("SentenceID = %q, want 987654321", item.SentenceID)
-	}
-	if out.TranscriptItems[1].SpeakerName != "Bob" || out.TranscriptItems[1].SentenceID != "987654322" {
-		t.Errorf("second transcript item = %+v", out.TranscriptItems[1])
-	}
-	itemJSON, err := json.Marshal(item)
-	if err != nil {
-		t.Fatalf("marshal transcript item: %v", err)
-	}
-	var itemFields map[string]any
-	if err := json.Unmarshal(itemJSON, &itemFields); err != nil {
-		t.Fatalf("unmarshal transcript item JSON: %v", err)
-	}
-	wantItemFields := map[string]bool{
-		"speaker_name": true,
-		"text":         true,
-		"start_time":   true,
-		"end_time":     true,
-		"sentence_id":  true,
-	}
-	for gotField := range itemFields {
-		if !wantItemFields[gotField] {
-			t.Errorf("Transcript item should not contain field %q, got %s", gotField, string(itemJSON))
-		}
-	}
-	for wantField := range wantItemFields {
-		if _, ok := itemFields[wantField]; !ok {
-			t.Errorf("Transcript item missing field %q, got %s", wantField, string(itemJSON))
-		}
-	}
-	for _, unexpected := range []string{
-		`"seq_id"`,
-		`"speaker"`,
-		`"user_open_id"`,
-		`"user_type"`,
-		`"user_role"`,
-		`"language"`,
-		`"start_time_ms"`,
-		`"end_time_ms"`,
-		`"sequence_id"`,
-		`"transcript_item"`,
-	} {
-		if strings.Contains(string(got), unexpected) {
-			t.Errorf("Transcript output should not contain %s, got %s", unexpected, string(got))
-		}
-	}
-	if !strings.Contains(string(got), `"sentence_id":"987654321"`) {
-		t.Errorf("Transcript output should contain sentence_id, got %s", string(got))
-	}
-}
-
-func TestProcessVCRecordingEnded(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	out := runRecordingProcess[VCRecordingEndedOutput](t, eventTypeRecordingEnded, processVCRecordingEnded, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "ev_rec_end_001",
-			"event_type": "vc.recording.recording_ended_v1",
-			"create_time": "1761782400200"
-		},
-		"event": {
-			"unique_key": "recording_001",
-			"source": "recording_bean",
-			"object_type": "minutes",
-			"object_id": "minute_token_001"
-		}
-	}`)
-
-	if out.Type != eventTypeRecordingEnded {
-		t.Errorf("Type = %q", out.Type)
-	}
-	if out.UniqueKey != "recording_001" || out.Source != "recording_bean" {
-		t.Errorf("UniqueKey/Source = %q/%q", out.UniqueKey, out.Source)
-	}
-	if out.EventTime != recordingTestEventTime(1761782400200) {
-		t.Errorf("EventTime = %q", out.EventTime)
-	}
-}
-
-func TestProcessVCRecordingEnded_DropsObjectMetadata(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	got := runRecordingProcessRaw(t, eventTypeRecordingEnded, processVCRecordingEnded, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "ev_rec_end_001",
-			"event_type": "vc.recording.recording_ended_v1",
-			"create_time": "1761782400200"
-		},
-		"event": {
-			"unique_key": "recording_001",
-			"source": "recording_bean",
-			"object_type": "minutes",
-			"object_id": "minute_token_001"
-		}
-	}`)
-
-	if strings.Contains(string(got), "object_type") || strings.Contains(string(got), "object_id") {
-		t.Fatalf("ended output should drop object metadata, got %s", string(got))
-	}
-}
-
-func TestProcessVCRecording_DropsTimestampField(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	got := runRecordingProcessRaw(t, eventTypeRecordingStarted, processVCRecordingStarted, `{
-		"schema": "2.0",
-		"header": {
-			"event_id": "ev_rec_start_001",
-			"event_type": "vc.recording.recording_started_v1",
-			"create_time": "1761782400000"
-		},
-		"event": {
-			"unique_key": "recording_001",
-			"source": "recording_bean"
-		}
-	}`)
-
-	if strings.Contains(string(got), `"timestamp"`) {
-		t.Fatalf("recording output should use event_time instead of timestamp, got %s", string(got))
-	}
-	if !strings.Contains(string(got), `"event_time":"`+recordingTestEventTime(1761782400000)+`"`) {
-		t.Fatalf("recording output should include ISO 8601 event_time, got %s", string(got))
-	}
-}
-
-func TestProcessVCRecording_NonRecordingBeanFiltered(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	for _, tc := range []struct {
-		name      string
-		eventType string
-		process   event.ProcessFunc
-		payload   string
-	}{
-		{
-			name:      "started",
-			eventType: eventTypeRecordingStarted,
-			process:   processVCRecordingStarted,
-			payload: `{
-				"schema": "2.0",
-				"header": {"event_id": "ev_rec_start_001", "event_type": "vc.recording.recording_started_v1"},
-				"event": {"unique_key": "recording_001", "source": "software_recording"}
-			}`,
-		},
-		{
-			name:      "transcript",
-			eventType: eventTypeRecordingTranscriptGenerated,
-			process:   processVCRecordingTranscriptGenerated,
-			payload: `{
-				"schema": "2.0",
-				"header": {"event_id": "ev_rec_transcript_001", "event_type": "vc.recording.recording_transcript_generated_v1"},
-				"event": {"unique_key": "recording_001", "source": "software_recording", "transcript_items": []}
-			}`,
-		},
-		{
-			name:      "ended",
-			eventType: eventTypeRecordingEnded,
-			process:   processVCRecordingEnded,
-			payload: `{
-				"schema": "2.0",
-				"header": {"event_id": "ev_rec_end_001", "event_type": "vc.recording.recording_ended_v1"},
-				"event": {"unique_key": "recording_001", "source": "software_recording"}
-			}`,
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			got := runRecordingProcessRaw(t, tc.eventType, tc.process, tc.payload)
-			if got != nil {
-				t.Fatalf("non-recording_bean event should be filtered, got %s", string(got))
-			}
-		})
-	}
-}
-
-func TestProcessVCRecording_MalformedPayloadPassthrough(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	for _, tc := range []struct {
-		name      string
-		eventType string
-		process   event.ProcessFunc
-	}{
-		{name: "started", eventType: eventTypeRecordingStarted, process: processVCRecordingStarted},
-		{name: "transcript", eventType: eventTypeRecordingTranscriptGenerated, process: processVCRecordingTranscriptGenerated},
-		{name: "ended", eventType: eventTypeRecordingEnded, process: processVCRecordingEnded},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			raw := &event.RawEvent{
-				EventType: tc.eventType,
-				Payload:   json.RawMessage(`not json`),
-				Timestamp: time.Now(),
-			}
-			got, err := tc.process(context.Background(), nil, raw, nil)
-			if err != nil {
-				t.Fatalf("Process should swallow parse errors, got %v", err)
-			}
-			if string(got) != "not json" {
-				t.Errorf("malformed fallback output = %q, want original bytes", string(got))
-			}
-		})
-	}
-}
-
-func TestVCRecording_PreConsumeSubscriptionLifecycle(t *testing.T) {
-	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
-
-	for _, tc := range []struct {
-		eventType string
-	}{
-		{eventTypeRecordingStarted},
-		{eventTypeRecordingTranscriptGenerated},
-		{eventTypeRecordingEnded},
-	} {
-		t.Run(tc.eventType, func(t *testing.T) {
-			def, ok := event.Lookup(tc.eventType)
-			if !ok {
-				t.Fatalf("%s should be registered via Keys()", tc.eventType)
-			}
-
-			type call struct {
-				method string
-				path   string
-				body   any
-			}
-			var calls []call
-			rt := &stubAPIClient{
-				callFn: func(_ context.Context, method, path string, body any) (json.RawMessage, error) {
-					calls = append(calls, call{method: method, path: path, body: body})
-					return json.RawMessage(`{"code":0,"msg":"success","data":{}}`), nil
-				},
-			}
-
-			cleanup, err := def.PreConsume(context.Background(), rt, nil)
-			if err != nil {
-				t.Fatalf("PreConsume error: %v", err)
-			}
-			if cleanup == nil {
-				t.Fatal("cleanup must not be nil")
-			}
-			if len(calls) != 1 {
-				t.Fatalf("calls after subscribe = %d, want 1", len(calls))
-			}
-			if calls[0].method != "POST" || calls[0].path != pathRecordingSubscribe {
-				t.Fatalf("subscribe call = %+v", calls[0])
-			}
-			assertSubscriptionRequest(t, calls[0].body, tc.eventType)
-
-			cleanup()
-			if len(calls) != 2 {
-				t.Fatalf("calls after cleanup = %d, want 2", len(calls))
-			}
-			if calls[1].method != "POST" || calls[1].path != pathRecordingUnsubscribe {
-				t.Fatalf("unsubscribe call = %+v", calls[1])
-			}
-			assertSubscriptionRequest(t, calls[1].body, tc.eventType)
-		})
-	}
-}
-
-func runRecordingProcess[T any](t *testing.T, eventType string, process event.ProcessFunc, payload string) T {
-	t.Helper()
-	got := runRecordingProcessRaw(t, eventType, process, payload)
-	if got == nil {
-		t.Fatal("Process output is nil")
-	}
-	var out T
-	if err := json.Unmarshal(got, &out); err != nil {
-		t.Fatalf("Process output is not valid JSON: %v\nraw=%s", err, string(got))
-	}
-	return out
-}
-
-func runRecordingProcessRaw(t *testing.T, eventType string, process event.ProcessFunc, payload string) json.RawMessage {
-	t.Helper()
-	raw := &event.RawEvent{
-		EventType: eventType,
-		Payload:   json.RawMessage(payload),
-		Timestamp: time.Now(),
-	}
-	got, err := process(context.Background(), nil, raw, nil)
-	if err != nil {
-		t.Fatalf("Process error: %v", err)
-	}
-	return got
-}
-
-func recordingTestEventTime(millis int64) string {
-	return time.UnixMilli(millis).Local().Format(time.RFC3339)
-}
--- a/events/vc/recording_transcript_generated.go
+++ b/events/vc/recording_transcript_generated.go
@@ -1,163 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package vc
-
-import (
-	"context"
-	"encoding/json"
-	"strconv"
-	"time"
-
-	"github.com/larksuite/cli/internal/event"
-)
-
-// VCRecordingTranscriptItemOutput is one flattened transcript item for recording events.
-type VCRecordingTranscriptItemOutput struct {
-	SpeakerName string `json:"speaker_name,omitempty" desc:"Speaker display name"`
-	Text        string `json:"text,omitempty"         desc:"Transcript text"`
-	StartTime   string `json:"start_time,omitempty"   desc:"Transcript item start time in RFC3339 / ISO 8601 with the current system timezone"`
-	EndTime     string `json:"end_time,omitempty"     desc:"Transcript item end time in RFC3339 / ISO 8601 with the current system timezone"`
-	SentenceID  string `json:"sentence_id,omitempty"  desc:"Transcript sentence ID"`
-}
-
-// VCRecordingTranscriptGeneratedOutput is the flattened shape for vc.recording.recording_transcript_generated_v1.
-type VCRecordingTranscriptGeneratedOutput struct {
-	Type            string                            `json:"type"                       desc:"Event type; always vc.recording.recording_transcript_generated_v1"`
-	EventID         string                            `json:"event_id,omitempty"         desc:"Globally unique event ID; safe for deduplication"`
-	EventTime       string                            `json:"event_time,omitempty"       desc:"Time when this batch of transcript items was generated, in RFC3339 / ISO 8601 with the current system timezone"`
-	UniqueKey       string                            `json:"unique_key,omitempty"       desc:"Unique key generated for one recording_bean recording session"`
-	Source          string                            `json:"source,omitempty"           desc:"Recording source; always recording_bean"`
-	TranscriptItems []VCRecordingTranscriptItemOutput `json:"transcript_items,omitempty" desc:"Generated transcript items"`
-}
-
-type recordingTranscriptGeneratedEnvelope struct {
-	Header struct {
-		EventID    string `json:"event_id"`
-		EventType  string `json:"event_type"`
-		CreateTime string `json:"create_time"`
-	} `json:"header"`
-	Event recordingTranscriptGeneratedEvent `json:"event"`
-}
-
-type recordingTranscriptGeneratedEvent struct {
-	UniqueKey       string                               `json:"unique_key"`
-	Source          string                               `json:"source"`
-	TranscriptItems []recordingTranscriptGeneratedItemIn `json:"transcript_items"`
-}
-
-type recordingTranscriptGeneratedItemIn struct {
-	Speaker     *recordingTranscriptGeneratedSpeakerIn `json:"speaker"`
-	Text        string                                 `json:"text"`
-	StartTimeMs recordingTranscriptGeneratedString     `json:"start_time_ms"`
-	EndTimeMs   recordingTranscriptGeneratedString     `json:"end_time_ms"`
-	SentenceID  string                                 `json:"sentence_id"`
-}
-
-type recordingTranscriptGeneratedSpeakerIn struct {
-	UserName string `json:"user_name"`
-}
-
-type recordingTranscriptGeneratedString string
-
-func processVCRecordingTranscriptGenerated(_ context.Context, _ event.APIClient, raw *event.RawEvent, _ map[string]string) (json.RawMessage, error) {
-	envelope, ok := parseRecordingTranscriptGeneratedEnvelope(raw)
-	if !ok {
-		return raw.Payload, nil
-	}
-	if !isRecordingTranscriptGeneratedBeanEvent(envelope) {
-		return nil, nil
-	}
-	out := &VCRecordingTranscriptGeneratedOutput{
-		Type:            recordingTranscriptGeneratedEventType(envelope, raw),
-		EventID:         envelope.Header.EventID,
-		EventTime:       recordingTranscriptGeneratedEventTime(envelope.Header.CreateTime),
-		UniqueKey:       envelope.Event.UniqueKey,
-		Source:          envelope.Event.Source,
-		TranscriptItems: recordingTranscriptItems(envelope.Event.TranscriptItems),
-	}
-	return json.Marshal(out)
-}
-
-func parseRecordingTranscriptGeneratedEnvelope(raw *event.RawEvent) (*recordingTranscriptGeneratedEnvelope, bool) {
-	var envelope recordingTranscriptGeneratedEnvelope
-	if err := json.Unmarshal(raw.Payload, &envelope); err != nil {
-		return nil, false
-	}
-	return &envelope, true
-}
-
-func isRecordingTranscriptGeneratedBeanEvent(envelope *recordingTranscriptGeneratedEnvelope) bool {
-	return envelope != nil && envelope.Event.Source == "recording_bean"
-}
-
-func recordingTranscriptGeneratedEventType(envelope *recordingTranscriptGeneratedEnvelope, raw *event.RawEvent) string {
-	if envelope != nil && envelope.Header.EventType != "" {
-		return envelope.Header.EventType
-	}
-	return raw.EventType
-}
-
-func recordingTranscriptGeneratedEventTime(raw string) string {
-	return recordingTranscriptGeneratedMillisToLocalRFC3339(raw)
-}
-
-func recordingTranscriptGeneratedMillisToLocalRFC3339(raw string) string {
-	if raw == "" {
-		return ""
-	}
-	millis, err := strconv.ParseInt(raw, 10, 64)
-	if err != nil {
-		return ""
-	}
-	return time.UnixMilli(millis).Local().Format(time.RFC3339)
-}
-
-func recordingTranscriptItems(items []recordingTranscriptGeneratedItemIn) []VCRecordingTranscriptItemOutput {
-	if len(items) == 0 {
-		return nil
-	}
-	out := make([]VCRecordingTranscriptItemOutput, 0, len(items))
-	for _, item := range items {
-		out = append(out, recordingTranscriptItem(item))
-	}
-	return out
-}
-
-func recordingTranscriptItem(item recordingTranscriptGeneratedItemIn) VCRecordingTranscriptItemOutput {
-	return VCRecordingTranscriptItemOutput{
-		SpeakerName: recordingSpeakerName(item.Speaker),
-		Text:        item.Text,
-		StartTime:   recordingTranscriptGeneratedMillisToLocalRFC3339(item.StartTimeMs.String()),
-		EndTime:     recordingTranscriptGeneratedMillisToLocalRFC3339(item.EndTimeMs.String()),
-		SentenceID:  item.SentenceID,
-	}
-}
-
-func recordingSpeakerName(speaker *recordingTranscriptGeneratedSpeakerIn) string {
-	if speaker == nil {
-		return ""
-	}
-	return speaker.UserName
-}
-
-func (s *recordingTranscriptGeneratedString) UnmarshalJSON(data []byte) error {
-	if string(data) == "null" {
-		return nil
-	}
-	var str string
-	if err := json.Unmarshal(data, &str); err == nil {
-		*s = recordingTranscriptGeneratedString(str)
-		return nil
-	}
-	var num json.Number
-	if err := json.Unmarshal(data, &num); err != nil {
-		return err
-	}
-	*s = recordingTranscriptGeneratedString(num.String())
-	return nil
-}
-
-func (s recordingTranscriptGeneratedString) String() string {
-	return string(s)
-}
--- a/events/vc/register.go
+++ b/events/vc/register.go
@@ -11,18 +11,13 @@ import (
 )

 const (
-	eventTypeMeetingEnded                 = "vc.meeting.participant_meeting_ended_v1"
-	eventTypeNoteGenerated                = "vc.note.generated_v1"
-	eventTypeRecordingStarted             = "vc.recording.recording_started_v1"
-	eventTypeRecordingTranscriptGenerated = "vc.recording.recording_transcript_generated_v1"
-	eventTypeRecordingEnded               = "vc.recording.recording_ended_v1"
+	eventTypeMeetingEnded  = "vc.meeting.participant_meeting_ended_v1"
+	eventTypeNoteGenerated = "vc.note.generated_v1"

-	pathMeetingSubscribe     = "/open-apis/vc/v1/meetings/subscription"
-	pathMeetingUnsubscribe   = "/open-apis/vc/v1/meetings/unsubscription"
-	pathNoteSubscribe        = "/open-apis/vc/v1/notes/subscription"
-	pathNoteUnsubscribe      = "/open-apis/vc/v1/notes/unsubscription"
-	pathRecordingSubscribe   = "/open-apis/vc/v1/recordings/subscription"
-	pathRecordingUnsubscribe = "/open-apis/vc/v1/recordings/unsubscription"
+	pathMeetingSubscribe   = "/open-apis/vc/v1/meetings/subscription"
+	pathMeetingUnsubscribe = "/open-apis/vc/v1/meetings/unsubscription"
+	pathNoteSubscribe      = "/open-apis/vc/v1/notes/subscription"
+	pathNoteUnsubscribe    = "/open-apis/vc/v1/notes/unsubscription"

 	pathNoteDetailFmt = "/open-apis/vc/v1/notes/%s"
 )
@@ -62,53 +57,5 @@ func Keys() []event.KeyDefinition {
 			},
 			RequiredConsoleEvents: []string{eventTypeNoteGenerated},
 		},
-		{
-			Key:         eventTypeRecordingStarted,
-			DisplayName: "Recording started",
-			Description: "Triggered when a recording_bean recording starts; only generated when connected to Feishu software.",
-			EventType:   eventTypeRecordingStarted,
-			Schema: event.SchemaDef{
-				Custom: &event.SchemaSpec{Type: reflect.TypeOf(VCRecordingStartedOutput{})},
-			},
-			Process:    processVCRecordingStarted,
-			PreConsume: subscriptionPreConsume(eventTypeRecordingStarted, pathRecordingSubscribe, pathRecordingUnsubscribe),
-			Scopes:     []string{"vc:recording:read"},
-			AuthTypes: []string{
-				"user",
-			},
-			RequiredConsoleEvents: []string{eventTypeRecordingStarted},
-		},
-		{
-			Key:         eventTypeRecordingTranscriptGenerated,
-			DisplayName: "Recording transcript generated",
-			Description: "Triggered when recording_bean transcript items are generated; only generated when connected to Feishu software.",
-			EventType:   eventTypeRecordingTranscriptGenerated,
-			Schema: event.SchemaDef{
-				Custom: &event.SchemaSpec{Type: reflect.TypeOf(VCRecordingTranscriptGeneratedOutput{})},
-			},
-			Process:    processVCRecordingTranscriptGenerated,
-			PreConsume: subscriptionPreConsume(eventTypeRecordingTranscriptGenerated, pathRecordingSubscribe, pathRecordingUnsubscribe),
-			Scopes:     []string{"vc:recording:read"},
-			AuthTypes: []string{
-				"user",
-			},
-			RequiredConsoleEvents: []string{eventTypeRecordingTranscriptGenerated},
-		},
-		{
-			Key:         eventTypeRecordingEnded,
-			DisplayName: "Recording ended",
-			Description: "Triggered when a recording_bean recording ends and uploads successfully; only generated when connected to Feishu software.",
-			EventType:   eventTypeRecordingEnded,
-			Schema: event.SchemaDef{
-				Custom: &event.SchemaSpec{Type: reflect.TypeOf(VCRecordingEndedOutput{})},
-			},
-			Process:    processVCRecordingEnded,
-			PreConsume: subscriptionPreConsume(eventTypeRecordingEnded, pathRecordingSubscribe, pathRecordingUnsubscribe),
-			Scopes:     []string{"vc:recording:read"},
-			AuthTypes: []string{
-				"user",
-			},
-			RequiredConsoleEvents: []string{eventTypeRecordingEnded},
-		},
 	}
 }
--- a/events/whiteboard/preconsume.go
+++ b/events/whiteboard/preconsume.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"time"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/event"
 	"github.com/larksuite/cli/internal/validate"
 )
@@ -25,15 +24,11 @@ const cleanupTimeout = 5 * time.Second
 func whiteboardSubscriptionPreConsume(eventType string) func(context.Context, event.APIClient, map[string]string) (func(), error) {
 	return func(ctx context.Context, rt event.APIClient, params map[string]string) (func(), error) {
 		if rt == nil {
-			return nil, errs.NewInternalError(errs.SubtypeUnknown,
-				"runtime API client is required for pre-consume subscription")
+			return nil, fmt.Errorf("runtime API client is required for pre-consume subscription")
 		}
 		whiteboardID := params["whiteboard_id"]
 		if whiteboardID == "" {
-			return nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"param whiteboard_id is required for %s", eventType).
-				WithParam("--param").
-				WithHint("pass it as --param whiteboard_id=<id>; run `lark-cli event schema %s` for details", eventType)
+			return nil, fmt.Errorf("param whiteboard_id is required for %s", eventType)
 		}
 		encoded := validate.EncodePathSegment(whiteboardID)
 		subscribePath := fmt.Sprintf("/open-apis/board/v1/whiteboards/%s/subscribe", encoded)
--- a/events/whiteboard/preconsume_test.go
+++ b/events/whiteboard/preconsume_test.go
@@ -11,7 +11,6 @@ import (
 	"sync"
 	"testing"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/event"
 )

@@ -59,16 +58,6 @@ func TestWhiteboardSubscriptionPreConsume_MissingWhiteboardID(t *testing.T) {
 	if !strings.Contains(err.Error(), "whiteboard_id") {
 		t.Fatalf("error should mention whiteboard_id, got: %v", err)
 	}
-	var ve *errs.ValidationError
-	if !errors.As(err, &ve) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", err, err)
-	}
-	if ve.Subtype != errs.SubtypeInvalidArgument || ve.Param != "--param" {
-		t.Errorf("subtype/param = %s/%q, want %s/%q", ve.Subtype, ve.Param, errs.SubtypeInvalidArgument, "--param")
-	}
-	if ve.Hint == "" {
-		t.Error("missing whiteboard_id should carry a hint")
-	}
 }

 // TestWhiteboardSubscriptionPreConsume_NilRuntime verifies that PreConsume
@@ -81,9 +70,6 @@ func TestWhiteboardSubscriptionPreConsume_NilRuntime(t *testing.T) {
 	if err == nil {
 		t.Fatalf("expected error when runtime client is nil")
 	}
-	if p, ok := errs.ProblemOf(err); !ok || p.Category != errs.CategoryInternal {
-		t.Errorf("nil-runtime invariant should be a typed internal error, got %T: %v", err, err)
-	}
 }

 // TestWhiteboardSubscriptionPreConsume_SubscribeError verifies that a
--- a/internal/cmdutil/factory.go
+++ b/internal/cmdutil/factory.go
@@ -30,10 +30,11 @@ type InvocationContext struct {
 }

 type Factory struct {
-	Config     func() (*core.CliConfig, error) // lazily loads app config from Credential
-	HttpClient func() (*http.Client, error)    // HTTP client for non-Lark API calls (with retry and security headers)
-	LarkClient func() (*lark.Client, error)    // Lark SDK client for all Open API calls
-	IOStreams  *IOStreams                      // stdin/stdout/stderr streams
+	Config      func() (*core.CliConfig, error) // lazily loads app config from Credential
+	ConfigBrand func() (core.LarkBrand, bool)   // brand only, no secret decryption — for startup help/registration (avoids keychain)
+	HttpClient  func() (*http.Client, error)    // HTTP client for non-Lark API calls (with retry and security headers)
+	LarkClient  func() (*lark.Client, error)    // Lark SDK client for all Open API calls
+	IOStreams   *IOStreams                      // stdin/stdout/stderr streams

 	Invocation           InvocationContext       // Immutable call context; do not mutate after Factory construction.
 	Keychain             keychain.KeychainAccess // secret storage (real keychain in prod, mock in tests)
@@ -151,11 +152,14 @@ func (f *Factory) ResolveStrictMode(ctx context.Context) core.StrictMode {
 	if f.Credential == nil {
 		return core.StrictModeOff
 	}
-	acct, err := f.Credential.ResolveAccount(ctx)
-	if err != nil || acct == nil {
+	// Strict mode is plain config metadata; resolve it WITHOUT decrypting the
+	// app secret so identity-flag registration at startup never touches the
+	// keychain (ResolveStrictMode is called per command during Build).
+	_, supported, ok := f.Credential.ResolveMeta(ctx)
+	if !ok {
 		return core.StrictModeOff
 	}
-	ids := extcred.IdentitySupport(acct.SupportedIdentities)
+	ids := extcred.IdentitySupport(supported)
 	switch {
 	case ids.BotOnly():
 		return core.StrictModeBot
--- a/internal/cmdutil/factory_default.go
+++ b/internal/cmdutil/factory_default.go
@@ -78,6 +78,18 @@ func NewDefault(streams *IOStreams, inv InvocationContext) *Factory {
 		return cfg, nil
 	})

+	// ConfigBrand resolves just the brand without decrypting the app secret, so
+	// brand-aware help and shortcut registration at startup do not touch the
+	// keychain. It still initializes the registry with the resolved brand — the
+	// same side effect Config has, minus the secret.
+	f.ConfigBrand = sync.OnceValues(func() (core.LarkBrand, bool) {
+		brand, _, ok := f.Credential.ResolveMeta(context.Background())
+		if ok {
+			registry.InitWithBrand(brand)
+		}
+		return brand, ok
+	})
+
 	// Phase 4: LarkClient from Credential (placeholder AppSecret)
 	f.LarkClient = cachedLarkClientFunc(f)

--- a/internal/cmdutil/testing.go
+++ b/internal/cmdutil/testing.go
@@ -65,7 +65,13 @@ func TestFactory(t *testing.T, config *core.CliConfig) (*Factory, *bytes.Buffer,
 	)

 	f := &Factory{
-		Config:         func() (*core.CliConfig, error) { return config, nil },
+		Config: func() (*core.CliConfig, error) { return config, nil },
+		ConfigBrand: func() (core.LarkBrand, bool) {
+			if config != nil {
+				return config.Brand, true
+			}
+			return "", false
+		},
 		HttpClient:     func() (*http.Client, error) { return mockClient, nil },
 		LarkClient:     func() (*lark.Client, error) { return testLarkClient, nil },
 		IOStreams:      &IOStreams{In: nil, Out: stdoutBuf, ErrOut: stderrBuf},
--- a/internal/credential/credential_provider.go
+++ b/internal/credential/credential_provider.go
@@ -21,6 +21,14 @@ type DefaultAccountResolver interface {
 	ResolveAccount(ctx context.Context) (*Account, error)
 }

+// metaResolver is an optional capability: resolve config metadata (brand +
+// strict-mode identity support) without resolving the app secret (no keychain
+// access). Providers that don't implement it fall back to ResolveAccount inside
+// CredentialProvider.ResolveMeta.
+type metaResolver interface {
+	ResolveMeta(ctx context.Context) (core.LarkBrand, uint8, bool)
+}
+
 // DefaultTokenResolver is implemented by the default token provider.
 type DefaultTokenResolver interface {
 	ResolveToken(ctx context.Context, req TokenSpec) (*TokenResult, error)
@@ -141,6 +149,11 @@ type CredentialProvider struct {
 	accountErr     error
 	selectedSource credentialSource

+	metaOnce   sync.Once
+	metaBrand  core.LarkBrand
+	metaIdents uint8
+	metaOK     bool
+
 	hintOnce sync.Once
 	hint     *IdentityHint
 	hintErr  error
@@ -172,6 +185,44 @@ func (p *CredentialProvider) ResolveAccount(ctx context.Context) (*Account, erro
 	return p.account, p.accountErr
 }

+// ResolveMeta resolves config metadata — brand and strict-mode identity support
+// — cheaply, WITHOUT decrypting the app secret for the default
+// (config.json/keychain) provider. It mirrors doResolveAccount's provider
+// selection: external providers (env/sidecar) are asked first via ResolveAccount
+// (they do not touch the keychain), then the default provider's keychain-free
+// metaResolver path. Cached after first call. Best-effort: returns ok=false when
+// nothing is configured, so callers keep their defaults. Used for brand-aware
+// help text, shortcut registration, and strict-mode checks at startup, where
+// decrypting the secret would be wasteful.
+func (p *CredentialProvider) ResolveMeta(ctx context.Context) (core.LarkBrand, uint8, bool) {
+	p.metaOnce.Do(func() {
+		p.metaBrand, p.metaIdents, p.metaOK = p.doResolveMeta(ctx)
+	})
+	return p.metaBrand, p.metaIdents, p.metaOK
+}
+
+func (p *CredentialProvider) doResolveMeta(ctx context.Context) (core.LarkBrand, uint8, bool) {
+	for _, prov := range p.providers {
+		acct, err := prov.ResolveAccount(ctx)
+		if err != nil {
+			return "", 0, false
+		}
+		if acct != nil {
+			internal := convertAccount(acct)
+			return internal.Brand, internal.SupportedIdentities, true
+		}
+	}
+	if p.defaultAcct != nil {
+		if mr, ok := p.defaultAcct.(metaResolver); ok {
+			return mr.ResolveMeta(ctx)
+		}
+		if acct, err := p.defaultAcct.ResolveAccount(ctx); err == nil && acct != nil {
+			return acct.Brand, acct.SupportedIdentities, true
+		}
+	}
+	return "", 0, false
+}
+
 func (p *CredentialProvider) doResolveAccount(ctx context.Context) (*Account, error) {
 	for _, prov := range p.providers {
 		acct, err := prov.ResolveAccount(ctx)
--- a/internal/credential/default_provider.go
+++ b/internal/credential/default_provider.go
@@ -76,6 +76,23 @@ func (p *DefaultAccountProvider) ResolveAccount(ctx context.Context) (*Account,
 	return AccountFromCliConfig(cfg), nil
 }

+// ResolveMeta returns config metadata — brand and the strict-mode identity
+// support — from config.json WITHOUT resolving the app secret (no keychain
+// access). Both are plain config fields, so brand-aware help, shortcut
+// registration, and strict-mode checks at startup need not decrypt the secret.
+// Returns ok=false when no config exists, so callers keep their defaults.
+func (p *DefaultAccountProvider) ResolveMeta(_ context.Context) (core.LarkBrand, uint8, bool) {
+	multi, err := core.LoadMultiAppConfig()
+	if err != nil {
+		return "", 0, false
+	}
+	app := multi.CurrentAppConfig(p.profile)
+	if app == nil {
+		return "", 0, false
+	}
+	return app.Brand, strictModeToIdentitySupport(multi, p.profile), true
+}
+
 // strictModeToIdentitySupport maps the config-level strict mode to
 // the SupportedIdentities bitflag using an already-loaded MultiAppConfig.
 func strictModeToIdentitySupport(multi *core.MultiAppConfig, profileOverride string) uint8 {
--- a/internal/event/consume/consume.go
+++ b/internal/event/consume/consume.go
@@ -14,7 +14,6 @@ import (
 	"sync/atomic"
 	"time"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/event"
 	"github.com/larksuite/cli/internal/event/transport"
 )
@@ -45,9 +44,7 @@ func Run(ctx context.Context, tr transport.IPC, appID, profileName, domain strin

 	keyDef, ok := event.Lookup(opts.EventKey)
 	if !ok {
-		return errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"unknown EventKey: %s", opts.EventKey).
-			WithHint("run `lark-cli event list` to see available keys")
+		return fmt.Errorf("unknown EventKey: %s\nRun 'lark-cli event list' to see available keys", opts.EventKey)
 	}

 	if err := validateParams(keyDef, opts.Params); err != nil {
@@ -83,8 +80,7 @@ func Run(ctx context.Context, tr transport.IPC, appID, profileName, domain strin

 	ack, br, err := doHello(conn, opts.EventKey, []string{keyDef.EventType})
 	if err != nil {
-		return errs.NewInternalError(errs.SubtypeUnknown,
-			"event bus handshake failed: %s", err).WithCause(err)
+		return fmt.Errorf("handshake failed: %w", err)
 	}

 	var cleanup func()
@@ -94,11 +90,7 @@ func Run(ctx context.Context, tr transport.IPC, appID, profileName, domain strin
 		}
 		cleanup, err = keyDef.PreConsume(ctx, opts.Runtime, opts.Params)
 		if err != nil {
-			if _, ok := errs.ProblemOf(err); ok {
-				return err
-			}
-			return errs.NewInternalError(errs.SubtypeUnknown,
-				"pre-consume failed: %s", err).WithCause(err)
+			return fmt.Errorf("pre-consume failed: %w", err)
 		}
 	}

@@ -160,10 +152,8 @@ func validateParams(def *event.KeyDefinition, params map[string]string) error {
 	for _, p := range def.Params {
 		if p.Required {
 			if _, ok := params[p.Name]; !ok {
-				return errs.NewValidationError(errs.SubtypeInvalidArgument,
-					"required param %q missing for EventKey %s", p.Name, def.Key).
-					WithParam("--param").
-					WithHint("pass it as --param %s=<value>; run `lark-cli event schema %s` for details", p.Name, def.Key)
+				return fmt.Errorf("required param %q missing for EventKey %s. Run 'lark-cli event schema %s' for details",
+					p.Name, def.Key, def.Key)
 			}
 		}
 	}
@@ -179,15 +169,11 @@ func validateParams(def *event.KeyDefinition, params map[string]string) error {
 			continue
 		}
 		if len(validNames) == 0 {
-			return errs.NewValidationError(errs.SubtypeInvalidArgument,
-				"unknown param %q: EventKey %s accepts no params", k, def.Key).
-				WithParam("--param").
-				WithHint("run `lark-cli event schema %s` for details", def.Key)
+			return fmt.Errorf("unknown param %q: EventKey %s accepts no params. Run 'lark-cli event schema %s' for details",
+				k, def.Key, def.Key)
 		}
-		return errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"unknown param %q for EventKey %s. valid params: %s", k, def.Key, strings.Join(validNames, ", ")).
-			WithParam("--param").
-			WithHint("run `lark-cli event schema %s` for details", def.Key)
+		return fmt.Errorf("unknown param %q for EventKey %s. valid params: %s. Run 'lark-cli event schema %s' for details",
+			k, def.Key, strings.Join(validNames, ", "), def.Key)
 	}
 	return nil
 }
--- a/internal/event/consume/jq.go
+++ b/internal/event/consume/jq.go
@@ -8,21 +8,17 @@ import (
 	"fmt"

 	"github.com/itchyny/gojq"
-
-	"github.com/larksuite/cli/errs"
 )

 // CompileJQ compiles once for hot-path reuse; exported so callers can preflight before side effects.
 func CompileJQ(expr string) (*gojq.Code, error) {
 	query, err := gojq.Parse(expr)
 	if err != nil {
-		return nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"invalid jq expression: %s", err).WithParam("--jq").WithCause(err)
+		return nil, fmt.Errorf("invalid jq expression: %w", err)
 	}
 	code, err := gojq.Compile(query)
 	if err != nil {
-		return nil, errs.NewValidationError(errs.SubtypeInvalidArgument,
-			"jq compile error: %s", err).WithParam("--jq").WithCause(err)
+		return nil, fmt.Errorf("jq compile error: %w", err)
 	}
 	return code, nil
 }
--- a/internal/event/consume/loop_jq_test.go
+++ b/internal/event/consume/loop_jq_test.go
@@ -5,13 +5,10 @@ package consume

 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"strings"
 	"sync"
 	"testing"
-
-	"github.com/larksuite/cli/errs"
 )

 func TestCompileJQReportsErrorEarly(t *testing.T) {
@@ -23,16 +20,6 @@ func TestCompileJQReportsErrorEarly(t *testing.T) {
 	if !strings.Contains(msg, "compile") && !strings.Contains(msg, "parse") && !strings.Contains(msg, "invalid") {
 		t.Errorf("error should mention compile/parse/invalid, got: %v", err)
 	}
-	var ve *errs.ValidationError
-	if !errors.As(err, &ve) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", err, err)
-	}
-	if ve.Subtype != errs.SubtypeInvalidArgument || ve.Param != "--jq" {
-		t.Errorf("subtype/param = %s/%q, want %s/%q", ve.Subtype, ve.Param, errs.SubtypeInvalidArgument, "--jq")
-	}
-	if errors.Unwrap(err) == nil {
-		t.Error("compile error should preserve its cause")
-	}
 }

 func TestCompileJQReturnsUsableCode(t *testing.T) {
--- a/internal/event/consume/sink.go
+++ b/internal/event/consume/sink.go
@@ -13,7 +13,6 @@ import (
 	"sync/atomic"
 	"time"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/vfs"
 )

@@ -24,8 +23,7 @@ type Sink interface {
 func newSink(opts Options) (Sink, error) {
 	if opts.OutputDir != "" {
 		if err := vfs.MkdirAll(opts.OutputDir, 0755); err != nil {
-			return nil, errs.NewInternalError(errs.SubtypeFileIO,
-				"create output dir: %s", err).WithCause(err)
+			return nil, fmt.Errorf("create output dir: %w", err)
 		}
 		// PID disambiguates filenames across processes sharing a Dir.
 		return &DirSink{Dir: opts.OutputDir, pid: os.Getpid()}, nil
--- a/internal/event/consume/startup.go
+++ b/internal/event/consume/startup.go
@@ -16,7 +16,6 @@ import (
 	"path/filepath"
 	"time"

-	"github.com/larksuite/cli/errs"
 	"github.com/larksuite/cli/internal/core"
 	"github.com/larksuite/cli/internal/event"
 	"github.com/larksuite/cli/internal/event/protocol"
@@ -52,9 +51,10 @@ func EnsureBus(ctx context.Context, tr transport.IPC, appID, profileName, domain
 		} else {
 			fmt.Fprintf(errOut, "[event] remote connection check: online_instance_cnt=%d\n", count)
 			if count > 0 {
-				return nil, errs.NewValidationError(errs.SubtypeFailedPrecondition,
-					"another event bus is already connected to this app (%d active connection(s) detected via API); only one bus should run globally to avoid duplicate event delivery", count).
-					WithHint("use `lark-cli event status` to check, or `lark-cli event stop` on the other machine first")
+				return nil, fmt.Errorf("another event bus is already connected to this app "+
+					"(%d active connection(s) detected via API).\n"+
+					"Only one bus should run globally to avoid duplicate event delivery.\n"+
+					"Use 'lark-cli event status' to check, or 'lark-cli event stop' on the other machine first", count)
 			}
 		}
 	} else {
@@ -65,10 +65,8 @@ func EnsureBus(ctx context.Context, tr transport.IPC, appID, profileName, domain
 	pid, forkErr := forkBus(tr, appID, profileName, domain)
 	if forkErr != nil && !errors.Is(forkErr, lockfile.ErrHeld) {
 		eventsRoot := filepath.Join(core.GetConfigDir(), "events")
-		return nil, errs.NewInternalError(errs.SubtypeUnknown,
-			"failed to start event bus daemon: %s", forkErr).
-			WithCause(forkErr).
-			WithHint("check disk space, permissions on %s, and `lark-cli doctor`", eventsRoot)
+		return nil, fmt.Errorf("failed to start event bus daemon: %w\n"+
+			"Check: disk space, permissions on %s, and 'lark-cli doctor'", forkErr, eventsRoot)
 	}
 	if pid > 0 {
 		announceForkedBus(errOut, pid)
@@ -90,9 +88,7 @@ func EnsureBus(ctx context.Context, tr transport.IPC, appID, profileName, domain
 	fmt.Fprintln(errOut, "[event] event bus exited unexpectedly.")
 	fmt.Fprintln(errOut, "[event] please check app credentials (lark-cli config show) and retry.")
 	fmt.Fprintf(errOut, "[event] logs: %s\n", logPath)
-	return nil, errs.NewInternalError(errs.SubtypeUnknown,
-		"failed to connect to event bus within %v (app=%s)", dialTimeout, appID).
-		WithHint("check app credentials (`lark-cli config show`) and retry; bus logs: %s", logPath)
+	return nil, fmt.Errorf("failed to connect to event bus within %v (app=%s)", dialTimeout, appID)
 }

 // probeAndDialBus distinguishes a healthy bus from a mid-shutdown listener via StatusQuery first.
--- a/internal/event/consume/startup_guard_test.go
+++ b/internal/event/consume/startup_guard_test.go
@@ -1,99 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package consume
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"io"
-	"net"
-	"strconv"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/event"
-)
-
-// failDialTransport refuses every dial so EnsureBus falls through to the
-// remote-connection check without a local bus.
-type failDialTransport struct{}
-
-func (failDialTransport) Listen(string) (net.Listener, error) { return nil, errors.New("no listen") }
-func (failDialTransport) Dial(string) (net.Conn, error)       { return nil, errors.New("refused") }
-func (failDialTransport) Address(string) string               { return "guard-test-addr" }
-func (failDialTransport) Cleanup(string)                      {}
-
-// remoteBusyAPIClient reports active remote WebSocket connections.
-type remoteBusyAPIClient struct{ count int }
-
-func (c remoteBusyAPIClient) CallAPI(context.Context, string, string, interface{}) (json.RawMessage, error) {
-	return json.RawMessage(`{"code":0,"msg":"ok","data":{"online_instance_cnt":` +
-		strconv.Itoa(c.count) + `}}`), nil
-}
-
-func TestEnsureBus_RemoteBusAlreadyConnectedIsFailedPrecondition(t *testing.T) {
-	conn, err := EnsureBus(context.Background(), failDialTransport{},
-		"cli_guard_test", "", "", remoteBusyAPIClient{count: 2}, io.Discard)
-	if conn != nil {
-		t.Fatal("expected nil conn when a remote bus is already connected")
-	}
-	if err == nil {
-		t.Fatal("expected single-bus guard error")
-	}
-	var ve *errs.ValidationError
-	if !errors.As(err, &ve) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", err, err)
-	}
-	if ve.Subtype != errs.SubtypeFailedPrecondition {
-		t.Errorf("subtype = %s, want %s", ve.Subtype, errs.SubtypeFailedPrecondition)
-	}
-	if !strings.Contains(ve.Hint, "event stop") {
-		t.Errorf("hint should point at `event stop`, got: %q", ve.Hint)
-	}
-}
-
-func TestRun_UnknownEventKeyIsTypedValidation(t *testing.T) {
-	err := Run(context.Background(), failDialTransport{}, "cli_x", "", "", Options{
-		EventKey: "bogus.run.key",
-		ErrOut:   io.Discard,
-	})
-	if err == nil {
-		t.Fatal("expected unknown EventKey error")
-	}
-	var ve *errs.ValidationError
-	if !errors.As(err, &ve) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", err, err)
-	}
-	if ve.Subtype != errs.SubtypeInvalidArgument {
-		t.Errorf("subtype = %s, want %s", ve.Subtype, errs.SubtypeInvalidArgument)
-	}
-	if !strings.Contains(ve.Hint, "event list") {
-		t.Errorf("hint should point at `event list`, got: %q", ve.Hint)
-	}
-}
-
-func TestRun_InvalidJQFailsBeforeAnySideEffect(t *testing.T) {
-	event.RegisterKey(event.KeyDefinition{
-		Key:       "consume.runtest.jq",
-		EventType: "consume.runtest.jq_v1",
-		Schema:    event.SchemaDef{Custom: &event.SchemaSpec{Raw: json.RawMessage(`{}`)}},
-	})
-	err := Run(context.Background(), failDialTransport{}, "cli_x", "", "", Options{
-		EventKey: "consume.runtest.jq",
-		JQExpr:   "[invalid{{{",
-		ErrOut:   io.Discard,
-	})
-	if err == nil {
-		t.Fatal("expected jq validation error")
-	}
-	var ve *errs.ValidationError
-	if !errors.As(err, &ve) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", err, err)
-	}
-	if ve.Param != "--jq" {
-		t.Errorf("param = %q, want %q", ve.Param, "--jq")
-	}
-}
--- a/internal/event/consume/validate_params_test.go
+++ b/internal/event/consume/validate_params_test.go
@@ -1,64 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package consume
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/event"
-)
-
-func requireParamValidationError(t *testing.T, err error) {
-	t.Helper()
-	if err == nil {
-		t.Fatal("expected validation error, got nil")
-	}
-	var ve *errs.ValidationError
-	if !errors.As(err, &ve) {
-		t.Fatalf("expected *errs.ValidationError, got %T: %v", err, err)
-	}
-	if ve.Subtype != errs.SubtypeInvalidArgument || ve.Param != "--param" {
-		t.Errorf("subtype/param = %s/%q, want %s/%q", ve.Subtype, ve.Param, errs.SubtypeInvalidArgument, "--param")
-	}
-	if ve.Hint == "" {
-		t.Error("param validation error should hint at `lark-cli event schema`")
-	}
-}
-
-func TestValidateParams_RequiredMissing(t *testing.T) {
-	def := &event.KeyDefinition{
-		Key:    "x.test",
-		Params: []event.ParamDef{{Name: "chat_id", Required: true}},
-	}
-	requireParamValidationError(t, validateParams(def, map[string]string{}))
-}
-
-func TestValidateParams_UnknownParam(t *testing.T) {
-	def := &event.KeyDefinition{
-		Key:    "x.test",
-		Params: []event.ParamDef{{Name: "chat_id"}},
-	}
-	requireParamValidationError(t, validateParams(def, map[string]string{"nope": "1"}))
-}
-
-func TestValidateParams_UnknownParamNoParamsAccepted(t *testing.T) {
-	def := &event.KeyDefinition{Key: "x.test"}
-	requireParamValidationError(t, validateParams(def, map[string]string{"nope": "1"}))
-}
-
-func TestValidateParams_DefaultAppliedAndValidPasses(t *testing.T) {
-	def := &event.KeyDefinition{
-		Key:    "x.test",
-		Params: []event.ParamDef{{Name: "mode", Required: true, Default: "all"}},
-	}
-	params := map[string]string{}
-	if err := validateParams(def, params); err != nil {
-		t.Fatalf("default should satisfy required param, got: %v", err)
-	}
-	if params["mode"] != "all" {
-		t.Errorf("default not applied, params=%v", params)
-	}
-}
--- a/internal/registry/loader.go
+++ b/internal/registry/loader.go
@@ -19,72 +19,32 @@ import (
 //go:embed scope_priorities.json scope_overrides.json
 var registryFS embed.FS

-// embeddedMetaJSON is set by loader_embedded.go when meta_data.json is compiled in.
-var embeddedMetaJSON []byte
-
-// EmbeddedMetaJSON returns the raw embedded meta_data.json bytes for callers
-// that need to parse key order or other JSON-level structure not exposed by
-// LoadFromMeta (which loses map insertion order).
-func EmbeddedMetaJSON() []byte {
-	return embeddedMetaJSON
-}
-
-var (
-	embeddedServicesMap  map[string]map[string]interface{} // service name -> spec
-	embeddedServiceNames []string                          // sorted
-	embeddedParseOnce    sync.Once
-)
-
-// parseEmbeddedServices parses embeddedMetaJSON into a service name → spec map
-// without touching mergedServices. Safe to call multiple times (sync.Once).
-func parseEmbeddedServices() {
-	embeddedParseOnce.Do(func() {
-		embeddedServicesMap = make(map[string]map[string]interface{})
-		if len(embeddedMetaJSON) == 0 {
-			return
-		}
-		var wrapper struct {
-			Services []map[string]interface{} `json:"services"`
-		}
-		if err := json.Unmarshal(embeddedMetaJSON, &wrapper); err != nil {
-			return
-		}
-		for _, svc := range wrapper.Services {
-			name, _ := svc["name"].(string)
-			if name == "" {
-				continue
-			}
-			embeddedServicesMap[name] = svc
-		}
-		embeddedServiceNames = make([]string, 0, len(embeddedServicesMap))
-		for name := range embeddedServicesMap {
-			embeddedServiceNames = append(embeddedServiceNames, name)
-		}
-		sort.Strings(embeddedServiceNames)
-	})
-}
-
-// EmbeddedSpec returns the embedded spec for one service, or nil if unknown.
-// Bypasses remote overlay — used for deterministic envelope output.
+// EmbeddedSpec returns the embedded baseline spec for one service as a map, or
+// nil if the service is unknown. It reads the static compile-time registry
+// (metastatic.Registry) and bypasses the remote overlay, so envelope output is
+// deterministic across machines.
 func EmbeddedSpec(serviceName string) map[string]interface{} {
-	parseEmbeddedServices()
-	return embeddedServicesMap[serviceName]
+	if svc, ok := baselineServiceByName(serviceName); ok {
+		return ServiceToMap(svc)
+	}
+	return nil
 }

-// EmbeddedServiceNames returns sorted embedded service names (no overlay).
-// Returns a defensive copy — callers must not mutate the package-level slice.
+// EmbeddedServiceNames returns the embedded baseline service names, sorted
+// (no remote overlay).
 func EmbeddedServiceNames() []string {
-	parseEmbeddedServices()
-	out := make([]string, len(embeddedServiceNames))
-	copy(out, embeddedServiceNames)
+	svcs := baselineServices()
+	out := make([]string, 0, len(svcs))
+	for _, s := range svcs {
+		out = append(out, s.Name)
+	}
+	sort.Strings(out)
 	return out
 }

 var (
-	mergedServices    = make(map[string]map[string]interface{}) // project name → parsed spec
-	mergedProjectList []string                                  // sorted project names
-	embeddedVersion   string                                    // version from embedded meta_data.json
-	initOnce          sync.Once
+	embeddedVersion string // baseline data version (from the static registry)
+	initOnce        sync.Once
 )

 // Init initializes the registry with default brand (feishu).
@@ -101,55 +61,27 @@ func Init() {
 func InitWithBrand(brand core.LarkBrand) {
 	initOnce.Do(func() {
 		configuredBrand = brand
-		// 1. Load embedded meta_data.json as baseline (no-op if not compiled in)
-		loadEmbeddedIntoMerged()
-		// 2. Remote overlay
+		// 1. Baseline version: the static compile-time registry (metastatic).
+		embeddedVersion = baselineVersion()
+		// 2. Remote overlay — still fetched/refreshed at runtime, decoded into
+		//    the same typed shape and merged over the baseline.
 		if remoteEnabled() && cacheWritable() {
-			// Check if brand changed since last cache
 			meta, metaErr := loadCacheMeta()
 			brandChanged := metaErr == nil && meta.Brand != "" && meta.Brand != string(brand)

 			if !brandChanged {
-				if cached, err := loadCachedMerged(); err == nil {
-					overlayMergedServices(cached)
-				}
+				_ = loadCachedTyped()
 			}
-			if len(mergedServices) == 0 || brandChanged {
-				// No data at all or brand changed — must sync fetch
+			if !hasTypedData() || brandChanged {
+				// No data at all (e.g. stub build, no cache) or brand changed.
 				doSyncFetch()
 			} else if shouldRefresh(meta) || metaErr != nil {
-				// Have embedded/cached data; refresh in background if TTL expired or first run
 				triggerBackgroundRefresh()
 			}
 		}
-		// 3. Build sorted project list
-		rebuildProjectList()
 	})
 }

-// loadEmbeddedIntoMerged parses the embedded meta_data.json and populates
-// mergedServices. No-op if meta_data.json is not compiled in.
-func loadEmbeddedIntoMerged() {
-	if len(embeddedMetaJSON) == 0 {
-		return
-	}
-	var reg MergedRegistry
-	if err := json.Unmarshal(embeddedMetaJSON, &reg); err != nil {
-		return
-	}
-	embeddedVersion = reg.Version
-	overlayMergedServices(&reg)
-}
-
-// rebuildProjectList rebuilds the sorted list of project names from mergedServices.
-func rebuildProjectList() {
-	mergedProjectList = make([]string, 0, len(mergedServices))
-	for name := range mergedServices {
-		mergedProjectList = append(mergedProjectList, name)
-	}
-	sort.Strings(mergedProjectList)
-}
-
 var cachedAllScopes map[string][]string

 // CollectAllScopesFromMeta collects all unique scopes from from_meta/*.json
@@ -226,7 +158,11 @@ func CollectAllScopesFromMeta(identity string) []string {
 // It returns data from the merged registry (embedded + cached remote overlay).
 func LoadFromMeta(project string) map[string]interface{} {
 	Init()
-	return mergedServices[project]
+	svc, ok := typedServiceByName(project)
+	if !ok {
+		return nil
+	}
+	return ServiceToMap(svc)
 }

 // ListFromMetaProjects lists available service project names (sorted).
@@ -234,7 +170,7 @@ func LoadFromMeta(project string) map[string]interface{} {
 //go:noinline
 func ListFromMetaProjects() []string {
 	Init()
-	return mergedProjectList
+	return typedServiceNames()
 }

 // DefaultScopeScore is the score assigned to scopes not in the priorities table.
--- a/internal/registry/loader_embedded.go
+++ b/internal/registry/loader_embedded.go
@@ -1,20 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package registry
-
-import "embed"
-
-//go:embed meta_data*.json
-var metaFS embed.FS
-
-//go:embed meta_data_default.json
-var embeddedMetaDataDefaultJSON []byte
-
-func init() {
-	if data, err := metaFS.ReadFile("meta_data.json"); err == nil && len(data) > 0 {
-		embeddedMetaJSON = data
-	} else {
-		embeddedMetaJSON = embeddedMetaDataDefaultJSON
-	}
-}
--- a/internal/registry/meta_data_default.json
+++ b/internal/registry/meta_data_default.json
@@ -1 +0,0 @@
-{"version":"0.0.0","services":[]}
--- a/internal/registry/metaschema/types.go
+++ b/internal/registry/metaschema/types.go
@@ -0,0 +1,99 @@
+// Copyright (c) 2026 Lark Technologies Pte. Ltd.
+// SPDX-License-Identifier: MIT
+
+// Package metaschema defines the typed shape of the command-spec registry
+// (meta_data.json). The embedded baseline is emitted as static Go data in
+// package metastatic (no runtime JSON parse, no startup allocation); the remote
+// overlay is decoded into these same types at runtime.
+//
+// All container fields are slices (never maps): a package-level slice literal is
+// laid out in the binary's data section and costs zero heap allocation at
+// startup, whereas a map literal builds an hmap at init time. Map keys from the
+// JSON (resource/method/field names) are preserved in the Name field.
+package metaschema
+
+// Registry is the top level of meta_data.json: {version, services:[...]}.
+type Registry struct {
+	Version  string
+	Services []Service
+}
+
+// Service is one API domain (e.g. "im", "calendar").
+type Service struct {
+	Name        string
+	Version     string
+	Title       string
+	Description string
+	ServicePath string
+	Resources   []Resource // JSON "resources" map, keyed by Resource.Name
+}
+
+// Resource groups methods under a service (e.g. "messages").
+type Resource struct {
+	Name    string
+	Methods []Method // JSON "methods" map, keyed by Method.Name
+}
+
+// Method is a single API call.
+type Method struct {
+	Name           string // JSON map key
+	ID             string
+	Path           string
+	HTTPMethod     string
+	Description    string
+	Risk           string
+	DocURL         string
+	Danger         bool
+	Scopes         []string
+	AccessTokens   []string
+	ParameterOrder []string
+	RequiredScopes []string
+	Parameters     []Field     // JSON "parameters" map, keyed by Field.Name
+	RequestBody    []Field     // JSON "requestBody" map
+	ResponseBody   []Field     // JSON "responseBody" map
+	Affordance     *Affordance // optional AI-facing usage overlay; nil on most methods
+}
+
+// Field is one parameter / request-body / response-body entry. Nested object
+// fields recurse via Properties.
+type Field struct {
+	Name        string // JSON map key
+	Type        string
+	Location    string
+	Description string
+	Default     string
+	Example     string
+	EnumName    string
+	Min         string
+	Max         string
+	Ref         string
+	Required    bool
+	Options     []Option
+	Enum        []string
+	Annotations []string
+	Properties  []Field
+}
+
+// Option is one allowed value for a field with an enum-like option list.
+type Option struct {
+	Value       string
+	Description string
+}
+
+// Affordance is the optional AI-facing usage overlay for a method, surfaced in
+// the schema envelope as _meta.affordance. Absent (nil) on most methods; it is
+// authored upstream in registry-config.yaml and merged into meta_data.json.
+type Affordance struct {
+	UseWhen       []string
+	DoNotUseWhen  []string
+	Prerequisites []string
+	Examples      []AffordanceExample
+	Related       []string
+}
+
+// AffordanceExample is one ready-to-run example: a one-line description plus a
+// complete lark-cli command string.
+type AffordanceExample struct {
+	Description string
+	Command     string
+}
--- a/internal/registry/metastatic/gen.go
+++ b/internal/registry/metastatic/gen.go
@@ -0,0 +1,255 @@
+// Copyright (c) 2026 Lark Technologies Pte. Ltd.
+// SPDX-License-Identifier: MIT
+
+//go:build ignore
+
+// Command gen reads internal/registry/meta_data.json and emits
+// meta_data_gen.go: the embedded command spec as a single static
+// metaschema.Registry literal (zero runtime JSON parse, zero startup heap
+// allocation). Run via: go run internal/registry/metastatic/gen.go
+//
+// Maps in the JSON (resources/methods/fields) are emitted as slices sorted by
+// key so generation is deterministic.
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"go/format"
+	"os"
+	"sort"
+	"strings"
+)
+
+const (
+	inPath  = "internal/registry/meta_data.json"
+	outPath = "internal/registry/metastatic/meta_data_gen.go"
+)
+
+func gs(m map[string]any, k string) string {
+	if v, ok := m[k].(string); ok {
+		return v
+	}
+	return ""
+}
+func gb(m map[string]any, k string) bool {
+	if v, ok := m[k].(bool); ok {
+		return v
+	}
+	return false
+}
+func gss(m map[string]any, k string) []string {
+	raw, _ := m[k].([]any)
+	out := make([]string, 0, len(raw))
+	for _, e := range raw {
+		if s, ok := e.(string); ok {
+			out = append(out, s)
+		}
+	}
+	return out
+}
+func gm(m map[string]any, k string) map[string]any {
+	if v, ok := m[k].(map[string]any); ok {
+		return v
+	}
+	return nil
+}
+func sortedKeys(m map[string]any) []string {
+	ks := make([]string, 0, len(m))
+	for k := range m {
+		ks = append(ks, k)
+	}
+	sort.Strings(ks)
+	return ks
+}
+
+func emitStrSlice(b *strings.Builder, name string, vs []string) {
+	if len(vs) == 0 {
+		return
+	}
+	fmt.Fprintf(b, "%s: []string{", name)
+	for _, v := range vs {
+		fmt.Fprintf(b, "%q, ", v)
+	}
+	b.WriteString("},\n")
+}
+
+func emitOptions(b *strings.Builder, raw []any) {
+	if len(raw) == 0 {
+		return
+	}
+	b.WriteString("Options: []metaschema.Option{")
+	for _, e := range raw {
+		o, _ := e.(map[string]any)
+		fmt.Fprintf(b, "{Value: %q, Description: %q}, ", gs(o, "value"), gs(o, "description"))
+	}
+	b.WriteString("},\n")
+}
+
+// emitFields emits a metaschema.Field slice from a JSON map[fieldName]fieldSpec.
+func emitFields(b *strings.Builder, label string, fm map[string]any) {
+	if len(fm) == 0 {
+		return
+	}
+	fmt.Fprintf(b, "%s: []metaschema.Field{\n", label)
+	for _, name := range sortedKeys(fm) {
+		f, _ := fm[name].(map[string]any)
+		if f == nil {
+			continue
+		}
+		b.WriteString("{")
+		fmt.Fprintf(b, "Name: %q, ", name)
+		for _, kv := range []struct{ k, field string }{
+			{"type", "Type"}, {"location", "Location"}, {"description", "Description"},
+			{"default", "Default"}, {"example", "Example"}, {"enumName", "EnumName"},
+			{"min", "Min"}, {"max", "Max"}, {"ref", "Ref"},
+		} {
+			if v := gs(f, kv.k); v != "" {
+				fmt.Fprintf(b, "%s: %q, ", kv.field, v)
+			}
+		}
+		if gb(f, "required") {
+			b.WriteString("Required: true, ")
+		}
+		emitStrSlice(b, "Enum", gss(f, "enum"))
+		emitStrSlice(b, "Annotations", gss(f, "annotations"))
+		if opts, ok := f["options"].([]any); ok {
+			emitOptions(b, opts)
+		}
+		if props := gm(f, "properties"); props != nil {
+			emitFields(b, "Properties", props)
+		}
+		b.WriteString("},\n")
+	}
+	b.WriteString("},\n")
+}
+
+// emitAffordance emits a metaschema.Affordance literal from a method's
+// "affordance" JSON object, or nothing when absent/empty.
+func emitAffordance(b *strings.Builder, raw map[string]any) {
+	if raw == nil {
+		return
+	}
+	useWhen := gss(raw, "use_when")
+	doNot := gss(raw, "do_not_use_when")
+	prereq := gss(raw, "prerequisites")
+	related := gss(raw, "related")
+	examples, _ := raw["examples"].([]any)
+	if len(useWhen) == 0 && len(doNot) == 0 && len(prereq) == 0 && len(related) == 0 && len(examples) == 0 {
+		return
+	}
+	b.WriteString("Affordance: &metaschema.Affordance{")
+	emitStrSlice(b, "UseWhen", useWhen)
+	emitStrSlice(b, "DoNotUseWhen", doNot)
+	emitStrSlice(b, "Prerequisites", prereq)
+	if len(examples) > 0 {
+		b.WriteString("Examples: []metaschema.AffordanceExample{")
+		for _, e := range examples {
+			ex, _ := e.(map[string]any)
+			fmt.Fprintf(b, "{Description: %q, Command: %q}, ", gs(ex, "description"), gs(ex, "command"))
+		}
+		b.WriteString("},\n")
+	}
+	emitStrSlice(b, "Related", related)
+	b.WriteString("},\n")
+}
+
+func emitMethods(b *strings.Builder, mm map[string]any) {
+	b.WriteString("Methods: []metaschema.Method{\n")
+	for _, name := range sortedKeys(mm) {
+		m, _ := mm[name].(map[string]any)
+		if m == nil {
+			continue
+		}
+		b.WriteString("{")
+		fmt.Fprintf(b, "Name: %q, ID: %q, Path: %q, HTTPMethod: %q, Description: %q, ",
+			name, gs(m, "id"), gs(m, "path"), gs(m, "httpMethod"), gs(m, "description"))
+		if v := gs(m, "risk"); v != "" {
+			fmt.Fprintf(b, "Risk: %q, ", v)
+		}
+		if v := gs(m, "docUrl"); v != "" {
+			fmt.Fprintf(b, "DocURL: %q, ", v)
+		}
+		if gb(m, "danger") {
+			b.WriteString("Danger: true, ")
+		}
+		b.WriteString("\n")
+		emitStrSlice(b, "Scopes", gss(m, "scopes"))
+		emitStrSlice(b, "AccessTokens", gss(m, "accessTokens"))
+		emitStrSlice(b, "ParameterOrder", gss(m, "parameterOrder"))
+		emitStrSlice(b, "RequiredScopes", gss(m, "requiredScopes"))
+		emitFields(b, "Parameters", gm(m, "parameters"))
+		emitFields(b, "RequestBody", gm(m, "requestBody"))
+		emitFields(b, "ResponseBody", gm(m, "responseBody"))
+		emitAffordance(b, gm(m, "affordance"))
+		b.WriteString("},\n")
+	}
+	b.WriteString("},\n")
+}
+
+func main() {
+	data, err := os.ReadFile(inPath)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "read:", err)
+		os.Exit(1)
+	}
+	var reg map[string]any
+	if err := json.Unmarshal(data, &reg); err != nil {
+		fmt.Fprintln(os.Stderr, "unmarshal:", err)
+		os.Exit(1)
+	}
+
+	var b strings.Builder
+	b.WriteString("// Code generated from meta_data.json by gen.go. DO NOT EDIT.\n")
+	b.WriteString("// Gitignored; produced at build time by `make fetch_meta`.\n\n")
+	b.WriteString("package metastatic\n\n")
+	b.WriteString("import \"github.com/larksuite/cli/internal/registry/metaschema\"\n\n")
+	b.WriteString("// registryData holds the command spec as static Go data. It is a\n")
+	b.WriteString("// package-level var, so its backing arrays live in the binary's static\n")
+	b.WriteString("// section (zero heap alloc on read). init() wires it into the Registry\n")
+	b.WriteString("// declared by stub.go with a single struct-header copy. No build tag is\n")
+	b.WriteString("// needed: when this generated file is absent (fresh checkout) stub.go's\n")
+	b.WriteString("// empty Registry stands alone; when present, init() augments it.\n")
+	b.WriteString("var registryData = metaschema.Registry{\n")
+	fmt.Fprintf(&b, "Version: %q,\n", gs(reg, "version"))
+	b.WriteString("Services: []metaschema.Service{\n")
+	svcs, _ := reg["services"].([]any)
+	for _, sv := range svcs {
+		s, _ := sv.(map[string]any)
+		if s == nil {
+			continue
+		}
+		b.WriteString("{")
+		fmt.Fprintf(&b, "Name: %q, Version: %q, Title: %q, Description: %q, ServicePath: %q,\n",
+			gs(s, "name"), gs(s, "version"), gs(s, "title"), gs(s, "description"), gs(s, "servicePath"))
+		b.WriteString("Resources: []metaschema.Resource{\n")
+		res := gm(s, "resources")
+		for _, rname := range sortedKeys(res) {
+			r, _ := res[rname].(map[string]any)
+			if r == nil {
+				continue
+			}
+			fmt.Fprintf(&b, "{Name: %q,\n", rname)
+			emitMethods(&b, gm(r, "methods"))
+			b.WriteString("},\n")
+		}
+		b.WriteString("},\n") // Resources
+		b.WriteString("},\n") // Service
+	}
+	b.WriteString("},\n")  // Services
+	b.WriteString("}\n\n") // registryData literal
+	b.WriteString("func init() { Registry = registryData }\n")
+
+	src, err := format.Source([]byte(b.String()))
+	if err != nil {
+		// Write unformatted for debugging, then fail.
+		_ = os.WriteFile(outPath+".broken", []byte(b.String()), 0644)
+		fmt.Fprintln(os.Stderr, "gofmt:", err)
+		os.Exit(1)
+	}
+	if err := os.WriteFile(outPath, src, 0644); err != nil {
+		fmt.Fprintln(os.Stderr, "write:", err)
+		os.Exit(1)
+	}
+	fmt.Printf("wrote %s (%d services, %d bytes)\n", outPath, len(svcs), len(src))
+}
--- a/internal/registry/metastatic/stub.go
+++ b/internal/registry/metastatic/stub.go
@@ -0,0 +1,15 @@
+// Copyright (c) 2026 Lark Technologies Pte. Ltd.
+// SPDX-License-Identifier: MIT
+
+package metastatic
+
+import "github.com/larksuite/cli/internal/registry/metaschema"
+
+// Registry is the command spec as static Go data. It is declared here (zero
+// value) so the package always compiles, and populated by meta_data_gen.go's
+// init() when that generated file is present. On a fresh checkout the generated
+// file is absent — it is gitignored and produced at build time by
+// `make gen_meta` — so Registry stays empty. This keeps the "heavy spec is
+// never committed, only generated" model, now without a build tag: the
+// generated file augments this one rather than replacing it under a tag.
+var Registry = metaschema.Registry{}
--- a/internal/registry/metastatic_validate_test.go
+++ b/internal/registry/metastatic_validate_test.go
@@ -0,0 +1,90 @@
+// Copyright (c) 2026 Lark Technologies Pte. Ltd.
+// SPDX-License-Identifier: MIT
+
+// Validation for the static-meta registry: the generated metastatic.Registry is
+// the sole embedded baseline (no JSON parsed at runtime), and a deep read of it
+// allocates nothing. The data is generated from meta_data.json at build time
+// (`make fetch_meta`) and is gitignored, so these tests skip on a bare checkout
+// where it has not been generated yet.
+package registry
+
+import (
+	"testing"
+
+	"github.com/larksuite/cli/internal/registry/metaschema"
+	"github.com/larksuite/cli/internal/registry/metastatic"
+)
+
+func countFieldsStatic(fs []metaschema.Field) int {
+	n := 0
+	for _, f := range fs {
+		n++
+		n += countFieldsStatic(f.Properties)
+	}
+	return n
+}
+
+func countStatic() (svc, res, meth, fld int) {
+	svc = len(metastatic.Registry.Services)
+	for _, s := range metastatic.Registry.Services {
+		for _, r := range s.Resources {
+			res++
+			for _, m := range r.Methods {
+				meth++
+				fld += countFieldsStatic(m.Parameters) + countFieldsStatic(m.RequestBody) + countFieldsStatic(m.ResponseBody)
+			}
+		}
+	}
+	return
+}
+
+// TestStaticRegistryPopulated checks the generated registry carries data. It
+// skips on a bare checkout where meta_data_gen.go has not been generated yet.
+func TestStaticRegistryPopulated(t *testing.T) {
+	if len(metastatic.Registry.Services) == 0 {
+		t.Skip("static registry empty; run `make fetch_meta` to generate it")
+	}
+	svc, res, meth, fld := countStatic()
+	t.Logf("static: services=%d resources=%d methods=%d fields=%d", svc, res, meth, fld)
+	if svc == 0 || res == 0 || meth == 0 || fld == 0 {
+		t.Fatalf("static registry incomplete: svc=%d res=%d meth=%d fld=%d", svc, res, meth, fld)
+	}
+	if metastatic.Registry.Version == "" {
+		t.Error("static registry has empty Version")
+	}
+}
+
+var sinkInt int
+
+// --- zero-alloc: a deep read of the static registry must allocate nothing ---
+
+func deepReadStatic() int {
+	n := 0
+	for _, s := range metastatic.Registry.Services {
+		n += len(s.Name)
+		for _, r := range s.Resources {
+			for _, m := range r.Methods {
+				n += len(m.ID) + len(m.Scopes) + countFieldsStatic(m.Parameters) + countFieldsStatic(m.ResponseBody)
+			}
+		}
+	}
+	return n
+}
+
+func TestStaticReadZeroAlloc(t *testing.T) {
+	if len(metastatic.Registry.Services) == 0 {
+		t.Skip("static registry empty; run `make fetch_meta` to generate it")
+	}
+	avg := testing.AllocsPerRun(50, func() { sinkInt = deepReadStatic() })
+	t.Logf("static deep-read: %.1f allocs/op", avg)
+	if avg > 0 {
+		t.Errorf("static read allocates %.1f/op, want 0 (data should be in the binary, not heap)", avg)
+	}
+}
+
+func BenchmarkReadStaticRegistry(b *testing.B) {
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		sinkInt = deepReadStatic()
+	}
+}
--- a/internal/registry/remote.go
+++ b/internal/registry/remote.go
@@ -147,22 +147,6 @@ func saveCacheMeta(meta CacheMeta) error {
 	return validate.AtomicWrite(cacheMetaPath(), data, 0644)
 }

-func loadCachedMerged() (*MergedRegistry, error) {
-	path := cachePath()
-	data, err := vfs.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-	var reg MergedRegistry
-	if err := json.Unmarshal(data, &reg); err != nil {
-		// Cache corrupted — remove it so next run triggers a fresh fetch
-		vfs.Remove(path)
-		vfs.Remove(cacheMetaPath())
-		return nil, err
-	}
-	return &reg, nil
-}
-
 func saveCachedMerged(data []byte, meta CacheMeta) error {
 	if err := vfs.MkdirAll(cacheDir(), 0700); err != nil {
 		return err
@@ -253,7 +237,7 @@ func doSyncFetch() {
 		Brand:       string(configuredBrand),
 	}
 	_ = saveCachedMerged(data, meta)
-	overlayMergedServices(reg)
+	_ = loadCachedTyped()
 }

 // --- background refresh ---
@@ -308,15 +292,3 @@ func shouldRefresh(meta CacheMeta) bool {
 	}
 	return time.Since(time.Unix(meta.LastCheckAt, 0)) > metaTTL()
 }
-
-// overlayMergedServices merges remote services into the in-memory map.
-// Remote entries override embedded entries with the same name.
-func overlayMergedServices(reg *MergedRegistry) {
-	for _, svc := range reg.Services {
-		name, ok := svc["name"].(string)
-		if !ok || name == "" {
-			continue
-		}
-		mergedServices[name] = svc
-	}
-}
--- a/internal/registry/remote_test.go
+++ b/internal/registry/remote_test.go
@@ -15,6 +15,8 @@ import (
 	"time"

 	"github.com/larksuite/cli/internal/core"
+	"github.com/larksuite/cli/internal/registry/metaschema"
+	"github.com/larksuite/cli/internal/registry/metastatic"
 )

 // waitBackgroundRefresh blocks until any in-flight background refresh started by
@@ -30,8 +32,7 @@ func resetInit() {
 	// reads globals this function mutates (see CI race: TestComputeMinimumScopeSet → Tenant).
 	waitBackgroundRefresh()
 	initOnce = sync.Once{}
-	mergedServices = make(map[string]map[string]interface{})
-	mergedProjectList = nil
+	resetTyped()
 	embeddedVersion = ""
 	cachedAllScopes = nil
 	cachedScopePriorities = nil
@@ -55,16 +56,10 @@ func TestResetInitClearsEmbeddedVersion(t *testing.T) {
 	}
 }

-// hasEmbeddedServices returns true if meta_data.json with real services is compiled in.
+// hasEmbeddedServices returns true if the static registry has services compiled
+// in (generated from meta_data.json at build time).
 func hasEmbeddedServices() bool {
-	if len(embeddedMetaJSON) == 0 {
-		return false
-	}
-	var reg MergedRegistry
-	if err := json.Unmarshal(embeddedMetaJSON, &reg); err != nil {
-		return false
-	}
-	return len(reg.Services) > 0
+	return len(metastatic.Registry.Services) > 0
 }

 // testRegistry returns a minimal MergedRegistry with one service.
@@ -302,50 +297,36 @@ func TestMetaTTL(t *testing.T) {
 	}
 }

-func TestOverlayMergedServices(t *testing.T) {
+func TestRemoteOverlayTyped(t *testing.T) {
 	resetInit()
-	mergedServices = make(map[string]map[string]interface{})
-	mergedServices["existing"] = map[string]interface{}{"name": "existing", "version": "v1"}
+	setRemoteOverrides([]metaschema.Service{
+		{Name: "existing", Version: "v2"},
+		{Name: "brand_new", Version: "v1"},
+	})

-	reg := &MergedRegistry{
-		Services: []map[string]interface{}{
-			{"name": "existing", "version": "v2"},
-			{"name": "brand_new", "version": "v1"},
-		},
+	// override present
+	if s, ok := typedServiceByName("existing"); !ok || s.Version != "v2" {
+		t.Errorf("expected existing override v2, got %+v ok=%v", s, ok)
 	}
-	overlayMergedServices(reg)
-
-	// existing should be overridden
-	if v := mergedServices["existing"]["version"].(string); v != "v2" {
-		t.Errorf("expected existing to be overridden to v2, got %s", v)
-	}
-	// brand_new should be added
-	if _, ok := mergedServices["brand_new"]; !ok {
+	// new service added
+	if _, ok := typedServiceByName("brand_new"); !ok {
 		t.Error("expected brand_new to be added")
 	}
 }

-func TestOverlayMergedServicesDoesNotPolluteFollowingInit(t *testing.T) {
+func TestRemoteOverlayDoesNotPolluteFollowingInit(t *testing.T) {
 	resetInit()
 	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
 	t.Setenv("LARKSUITE_CLI_REMOTE_META", "off")

-	const leakedExisting = "test_isolation_existing_sentinel"
-	const leakedOverlay = "test_isolation_overlay_sentinel"
-
-	mergedServices = map[string]map[string]interface{}{
-		leakedExisting: {"name": leakedExisting, "version": "v1"},
-	}
-	overlayMergedServices(&MergedRegistry{Services: []map[string]interface{}{{"name": leakedOverlay, "version": "v1"}}})
+	const leaked = "test_isolation_overlay_sentinel"
+	setRemoteOverrides([]metaschema.Service{{Name: leaked, Version: "v1"}})

 	resetInit()
 	Init()

-	if spec := LoadFromMeta(leakedExisting); spec != nil {
-		t.Fatalf("polluted service %q survived resetInit", leakedExisting)
-	}
-	if spec := LoadFromMeta(leakedOverlay); spec != nil {
-		t.Fatalf("polluted service %q survived resetInit", leakedOverlay)
+	if spec := LoadFromMeta(leaked); spec != nil {
+		t.Fatalf("polluted service %q survived resetInit", leaked)
 	}
 }

@@ -425,8 +406,8 @@ func TestCorruptedCache_SelfHeals(t *testing.T) {
 	metaData, _ := json.Marshal(meta)
 	os.WriteFile(filepath.Join(cDir, "remote_meta.meta.json"), metaData, 0644)

-	// loadCachedMerged should fail and remove the corrupted files
-	_, err := loadCachedMerged()
+	// loadCachedTyped should fail and remove the corrupted files
+	err := loadCachedTyped()
 	if err == nil {
 		t.Fatal("expected error for corrupted cache")
 	}
--- a/internal/registry/typed.go
+++ b/internal/registry/typed.go
@@ -0,0 +1,579 @@
+// Copyright (c) 2026 Lark Technologies Pte. Ltd.
+// SPDX-License-Identifier: MIT
+
+package registry
+
+import (
+	"encoding/json"
+	"sort"
+	"sync"
+
+	"github.com/larksuite/cli/internal/registry/metaschema"
+	"github.com/larksuite/cli/internal/registry/metastatic"
+	"github.com/larksuite/cli/internal/vfs"
+)
+
+// This file is the typed registry layer for the static-meta migration.
+//
+//   - The embedded baseline is metastatic.Registry: static Go data laid out in
+//     the binary at compile time (zero startup cost). It is empty on a fresh
+//     checkout (stub.go) until the generated meta_data_gen.go is produced by
+//     `make fetch_meta`; no build tag is involved.
+//   - The remote overlay (~/.lark-cli/cache/remote_meta.json) is still fetched
+//     and refreshed at runtime, decoded into the same typed shape, and merged
+//     over the baseline as per-service overrides.
+//
+// Startup (command-tree build) reads these typed structs directly. Execution-
+// path consumers that still expect map[string]interface{} go through
+// ServiceToMap, which rebuilds one service's map lazily, on demand — never the
+// whole spec at startup.
+
+var (
+	typedMu         sync.RWMutex
+	remoteOverrides map[string]metaschema.Service // service name -> remote override
+	typedNamesCache []string
+)
+
+// resetTyped clears the typed overlay state (test/teardown helper).
+func resetTyped() {
+	typedMu.Lock()
+	defer typedMu.Unlock()
+	remoteOverrides = nil
+	typedNamesCache = nil
+}
+
+// baselineServices returns the embedded baseline service specs: the static
+// compile-time data in metastatic.Registry (zero parse, zero alloc). It is
+// empty only on a fresh checkout where meta_data_gen.go has not been generated
+// yet (see stub.go).
+var (
+	baselineOnce sync.Once
+	baselineSvcs []metaschema.Service
+	baselineVer  string
+)
+
+func loadBaseline() {
+	baselineOnce.Do(func() {
+		baselineSvcs = metastatic.Registry.Services
+		baselineVer = metastatic.Registry.Version
+	})
+}
+
+func baselineServices() []metaschema.Service {
+	loadBaseline()
+	return baselineSvcs
+}
+
+func baselineVersion() string {
+	loadBaseline()
+	return baselineVer
+}
+
+// baselineServiceByName returns the embedded baseline service spec by name.
+func baselineServiceByName(name string) (metaschema.Service, bool) {
+	svcs := baselineServices()
+	for i := range svcs {
+		if svcs[i].Name == name {
+			return svcs[i], true
+		}
+	}
+	return metaschema.Service{}, false
+}
+
+// typedServiceByName returns the effective typed spec for a service: the remote
+// override if present, otherwise the static baseline.
+func typedServiceByName(name string) (metaschema.Service, bool) {
+	typedMu.RLock()
+	if s, ok := remoteOverrides[name]; ok {
+		typedMu.RUnlock()
+		return s, true
+	}
+	typedMu.RUnlock()
+	return baselineServiceByName(name)
+}
+
+// typedServiceNames returns all effective service names (baseline + remote
+// additions), sorted. Cached until the overlay changes.
+func typedServiceNames() []string {
+	typedMu.RLock()
+	if typedNamesCache != nil {
+		out := typedNamesCache
+		typedMu.RUnlock()
+		return out
+	}
+	typedMu.RUnlock()
+
+	seen := make(map[string]bool)
+	for _, s := range baselineServices() {
+		seen[s.Name] = true
+	}
+	typedMu.RLock()
+	for name := range remoteOverrides {
+		seen[name] = true
+	}
+	typedMu.RUnlock()
+
+	names := make([]string, 0, len(seen))
+	for n := range seen {
+		names = append(names, n)
+	}
+	sort.Strings(names)
+
+	typedMu.Lock()
+	typedNamesCache = names
+	typedMu.Unlock()
+	return names
+}
+
+// setRemoteOverrides installs the parsed remote overlay (called from Init).
+func setRemoteOverrides(svcs []metaschema.Service) {
+	typedMu.Lock()
+	defer typedMu.Unlock()
+	if remoteOverrides == nil {
+		remoteOverrides = make(map[string]metaschema.Service, len(svcs))
+	}
+	for _, s := range svcs {
+		remoteOverrides[s.Name] = s
+	}
+	typedNamesCache = nil
+}
+
+// TypedService returns the effective typed spec for a service (remote override
+// or static baseline). Public accessor for the command-tree builder.
+func TypedService(name string) (metaschema.Service, bool) {
+	Init()
+	return typedServiceByName(name)
+}
+
+// TypedServices returns all effective service specs, sorted by name. Reading
+// these builds nothing on the heap (static data); the remote overlay, if any,
+// was allocated once at Init.
+func TypedServices() []metaschema.Service {
+	Init()
+	names := typedServiceNames()
+	out := make([]metaschema.Service, 0, len(names))
+	for _, n := range names {
+		if s, ok := typedServiceByName(n); ok {
+			out = append(out, s)
+		}
+	}
+	return out
+}
+
+// hasTypedData reports whether any typed spec is available (static baseline or
+// remote overlay). False only when the static registry has not been generated
+// (fresh checkout) and there is no cache.
+func hasTypedData() bool {
+	if len(baselineServices()) > 0 {
+		return true
+	}
+	typedMu.RLock()
+	defer typedMu.RUnlock()
+	return len(remoteOverrides) > 0
+}
+
+// loadCachedTyped reads the on-disk remote cache, decodes it into the typed
+// shape, and installs it as the remote overlay (typed replacement for the old
+// map-based loadCachedMerged + overlay).
+func loadCachedTyped() error {
+	data, err := vfs.ReadFile(cachePath())
+	if err != nil {
+		return err
+	}
+	var reg wireRegistry
+	if err := json.Unmarshal(data, &reg); err != nil {
+		// Cache corrupted — remove it so the next run triggers a fresh fetch.
+		_ = vfs.Remove(cachePath())
+		_ = vfs.Remove(cacheMetaPath())
+		return err
+	}
+	svcs := make([]metaschema.Service, 0, len(reg.Services))
+	for _, ws := range reg.Services {
+		svcs = append(svcs, wireToService(ws))
+	}
+	setRemoteOverrides(svcs)
+	return nil
+}
+
+// --- typed -> map[string]interface{} shim (lazy, per service, execution-path) ---
+
+func strList(ss []string) []interface{} {
+	if len(ss) == 0 {
+		return nil
+	}
+	out := make([]interface{}, len(ss))
+	for i, s := range ss {
+		out[i] = s
+	}
+	return out
+}
+
+func fieldToMap(f metaschema.Field) map[string]interface{} {
+	m := map[string]interface{}{}
+	put := func(k, v string) {
+		if v != "" {
+			m[k] = v
+		}
+	}
+	put("type", f.Type)
+	put("location", f.Location)
+	put("description", f.Description)
+	put("default", f.Default)
+	put("example", f.Example)
+	put("enumName", f.EnumName)
+	put("min", f.Min)
+	put("max", f.Max)
+	put("ref", f.Ref)
+	if f.Required {
+		m["required"] = true
+	}
+	if v := strList(f.Enum); v != nil {
+		m["enum"] = v
+	}
+	if v := strList(f.Annotations); v != nil {
+		m["annotations"] = v
+	}
+	if len(f.Options) > 0 {
+		opts := make([]interface{}, len(f.Options))
+		for i, o := range f.Options {
+			opts[i] = map[string]interface{}{"value": o.Value, "description": o.Description}
+		}
+		m["options"] = opts
+	}
+	if len(f.Properties) > 0 {
+		m["properties"] = fieldsToMap(f.Properties)
+	}
+	return m
+}
+
+func fieldsToMap(fs []metaschema.Field) map[string]interface{} {
+	if len(fs) == 0 {
+		return nil
+	}
+	m := make(map[string]interface{}, len(fs))
+	for _, f := range fs {
+		m[f.Name] = fieldToMap(f)
+	}
+	return m
+}
+
+// affordanceToMap rebuilds the JSON-shaped affordance object (snake_case keys)
+// so the schema assembler's parseAffordance(method["affordance"]) keeps working
+// through the typed registry. Returns nil when the overlay carries nothing.
+func affordanceToMap(a *metaschema.Affordance) map[string]interface{} {
+	m := map[string]interface{}{}
+	if v := strList(a.UseWhen); v != nil {
+		m["use_when"] = v
+	}
+	if v := strList(a.DoNotUseWhen); v != nil {
+		m["do_not_use_when"] = v
+	}
+	if v := strList(a.Prerequisites); v != nil {
+		m["prerequisites"] = v
+	}
+	if len(a.Examples) > 0 {
+		ex := make([]interface{}, len(a.Examples))
+		for i, e := range a.Examples {
+			ex[i] = map[string]interface{}{"description": e.Description, "command": e.Command}
+		}
+		m["examples"] = ex
+	}
+	if v := strList(a.Related); v != nil {
+		m["related"] = v
+	}
+	if len(m) == 0 {
+		return nil
+	}
+	return m
+}
+
+func MethodToMap(mth metaschema.Method) map[string]interface{} {
+	m := map[string]interface{}{
+		"id":          mth.ID,
+		"path":        mth.Path,
+		"httpMethod":  mth.HTTPMethod,
+		"description": mth.Description,
+	}
+	if mth.Risk != "" {
+		m["risk"] = mth.Risk
+	}
+	if mth.DocURL != "" {
+		m["docUrl"] = mth.DocURL
+	}
+	if mth.Danger {
+		m["danger"] = true
+	}
+	if v := strList(mth.Scopes); v != nil {
+		m["scopes"] = v
+	}
+	if v := strList(mth.AccessTokens); v != nil {
+		m["accessTokens"] = v
+	}
+	if v := strList(mth.ParameterOrder); v != nil {
+		m["parameterOrder"] = v
+	}
+	if v := strList(mth.RequiredScopes); v != nil {
+		m["requiredScopes"] = v
+	}
+	if v := fieldsToMap(mth.Parameters); v != nil {
+		m["parameters"] = v
+	}
+	if v := fieldsToMap(mth.RequestBody); v != nil {
+		m["requestBody"] = v
+	}
+	if v := fieldsToMap(mth.ResponseBody); v != nil {
+		m["responseBody"] = v
+	}
+	if mth.Affordance != nil {
+		if am := affordanceToMap(mth.Affordance); am != nil {
+			m["affordance"] = am
+		}
+	}
+	return m
+}
+
+// ServiceToMap rebuilds the JSON-shaped map[string]interface{} for one service,
+// so execution-path consumers (and method RunE) keep working unchanged.
+func ServiceToMap(s metaschema.Service) map[string]interface{} {
+	resources := make(map[string]interface{}, len(s.Resources))
+	for _, r := range s.Resources {
+		methods := make(map[string]interface{}, len(r.Methods))
+		for _, mth := range r.Methods {
+			methods[mth.Name] = MethodToMap(mth)
+		}
+		resources[r.Name] = map[string]interface{}{"methods": methods}
+	}
+	return map[string]interface{}{
+		"name":        s.Name,
+		"version":     s.Version,
+		"title":       s.Title,
+		"description": s.Description,
+		"servicePath": s.ServicePath,
+		"resources":   resources,
+	}
+}
+
+// --- map[string]interface{} -> typed (for the map-based wrappers still used by
+// tests; production builds from typed directly) ---
+
+func ifaceStrs(v interface{}) []string {
+	raw, _ := v.([]interface{})
+	if len(raw) == 0 {
+		return nil
+	}
+	out := make([]string, 0, len(raw))
+	for _, e := range raw {
+		if s, ok := e.(string); ok {
+			out = append(out, s)
+		}
+	}
+	return out
+}
+
+func sortedMapKeys(m map[string]interface{}) []string {
+	ks := make([]string, 0, len(m))
+	for k := range m {
+		ks = append(ks, k)
+	}
+	sort.Strings(ks)
+	return ks
+}
+
+func mapToField(name string, m map[string]interface{}) metaschema.Field {
+	f := metaschema.Field{
+		Name: name, Type: GetStrFromMap(m, "type"), Location: GetStrFromMap(m, "location"),
+		Description: GetStrFromMap(m, "description"), Default: GetStrFromMap(m, "default"),
+		Example: GetStrFromMap(m, "example"), EnumName: GetStrFromMap(m, "enumName"),
+		Min: GetStrFromMap(m, "min"), Max: GetStrFromMap(m, "max"), Ref: GetStrFromMap(m, "ref"),
+		Enum: ifaceStrs(m["enum"]), Annotations: ifaceStrs(m["annotations"]),
+	}
+	if b, ok := m["required"].(bool); ok {
+		f.Required = b
+	}
+	if opts, ok := m["options"].([]interface{}); ok {
+		for _, o := range opts {
+			om, _ := o.(map[string]interface{})
+			f.Options = append(f.Options, metaschema.Option{Value: GetStrFromMap(om, "value"), Description: GetStrFromMap(om, "description")})
+		}
+	}
+	f.Properties = mapToFields(m["properties"])
+	return f
+}
+
+func mapToFields(v interface{}) []metaschema.Field {
+	fm, _ := v.(map[string]interface{})
+	if len(fm) == 0 {
+		return nil
+	}
+	out := make([]metaschema.Field, 0, len(fm))
+	for _, k := range sortedMapKeys(fm) {
+		em, _ := fm[k].(map[string]interface{})
+		out = append(out, mapToField(k, em))
+	}
+	return out
+}
+
+func MapToMethod(name string, m map[string]interface{}) metaschema.Method {
+	return metaschema.Method{
+		Name: name, ID: GetStrFromMap(m, "id"), Path: GetStrFromMap(m, "path"),
+		HTTPMethod: GetStrFromMap(m, "httpMethod"), Description: GetStrFromMap(m, "description"),
+		Risk: GetStrFromMap(m, "risk"), DocURL: GetStrFromMap(m, "docUrl"),
+		Danger:         boolFromMap(m, "danger"),
+		Scopes:         ifaceStrs(m["scopes"]),
+		AccessTokens:   ifaceStrs(m["accessTokens"]),
+		ParameterOrder: ifaceStrs(m["parameterOrder"]),
+		RequiredScopes: ifaceStrs(m["requiredScopes"]),
+		Parameters:     mapToFields(m["parameters"]),
+		RequestBody:    mapToFields(m["requestBody"]),
+		ResponseBody:   mapToFields(m["responseBody"]),
+	}
+}
+
+func boolFromMap(m map[string]interface{}, k string) bool {
+	b, _ := m[k].(bool)
+	return b
+}
+
+func MapToResources(v interface{}) []metaschema.Resource {
+	rm, _ := v.(map[string]interface{})
+	if len(rm) == 0 {
+		return nil
+	}
+	out := make([]metaschema.Resource, 0, len(rm))
+	for _, rk := range sortedMapKeys(rm) {
+		res, _ := rm[rk].(map[string]interface{})
+		mm, _ := res["methods"].(map[string]interface{})
+		methods := make([]metaschema.Method, 0, len(mm))
+		for _, mk := range sortedMapKeys(mm) {
+			methodMap, _ := mm[mk].(map[string]interface{})
+			methods = append(methods, MapToMethod(mk, methodMap))
+		}
+		out = append(out, metaschema.Resource{Name: rk, Methods: methods})
+	}
+	return out
+}
+
+// MapToService converts a JSON-shaped service spec (with embedded "resources")
+// into the typed form.
+func MapToService(spec map[string]interface{}) metaschema.Service {
+	return metaschema.Service{
+		Name: GetStrFromMap(spec, "name"), Version: GetStrFromMap(spec, "version"),
+		Title: GetStrFromMap(spec, "title"), Description: GetStrFromMap(spec, "description"),
+		ServicePath: GetStrFromMap(spec, "servicePath"), Resources: MapToResources(spec["resources"]),
+	}
+}
+
+// --- remote JSON (wire) -> typed ---
+
+type wireRegistry struct {
+	Version  string        `json:"version"`
+	Services []wireService `json:"services"`
+}
+
+type wireService struct {
+	Name        string                  `json:"name"`
+	Version     string                  `json:"version"`
+	Title       string                  `json:"title"`
+	Description string                  `json:"description"`
+	ServicePath string                  `json:"servicePath"`
+	Resources   map[string]wireResource `json:"resources"`
+}
+
+type wireResource struct {
+	Methods map[string]wireMethod `json:"methods"`
+}
+
+type wireMethod struct {
+	ID             string               `json:"id"`
+	Path           string               `json:"path"`
+	HTTPMethod     string               `json:"httpMethod"`
+	Description    string               `json:"description"`
+	Risk           string               `json:"risk"`
+	DocURL         string               `json:"docUrl"`
+	Danger         bool                 `json:"danger"`
+	Scopes         []string             `json:"scopes"`
+	AccessTokens   []string             `json:"accessTokens"`
+	ParameterOrder []string             `json:"parameterOrder"`
+	RequiredScopes []string             `json:"requiredScopes"`
+	Parameters     map[string]wireField `json:"parameters"`
+	RequestBody    map[string]wireField `json:"requestBody"`
+	ResponseBody   map[string]wireField `json:"responseBody"`
+}
+
+type wireField struct {
+	Type        string               `json:"type"`
+	Location    string               `json:"location"`
+	Description string               `json:"description"`
+	Default     string               `json:"default"`
+	Example     string               `json:"example"`
+	EnumName    string               `json:"enumName"`
+	Min         string               `json:"min"`
+	Max         string               `json:"max"`
+	Ref         string               `json:"ref"`
+	Required    bool                 `json:"required"`
+	Options     []metaschema.Option  `json:"options"`
+	Enum        []string             `json:"enum"`
+	Annotations []string             `json:"annotations"`
+	Properties  map[string]wireField `json:"properties"`
+}
+
+func sortedFieldKeys(m map[string]wireField) []string {
+	ks := make([]string, 0, len(m))
+	for k := range m {
+		ks = append(ks, k)
+	}
+	sort.Strings(ks)
+	return ks
+}
+
+func wireFields(m map[string]wireField) []metaschema.Field {
+	if len(m) == 0 {
+		return nil
+	}
+	out := make([]metaschema.Field, 0, len(m))
+	for _, name := range sortedFieldKeys(m) {
+		wf := m[name]
+		out = append(out, metaschema.Field{
+			Name: name, Type: wf.Type, Location: wf.Location, Description: wf.Description,
+			Default: wf.Default, Example: wf.Example, EnumName: wf.EnumName,
+			Min: wf.Min, Max: wf.Max, Ref: wf.Ref, Required: wf.Required,
+			Options: wf.Options, Enum: wf.Enum, Annotations: wf.Annotations,
+			Properties: wireFields(wf.Properties),
+		})
+	}
+	return out
+}
+
+func wireToService(ws wireService) metaschema.Service {
+	resKeys := make([]string, 0, len(ws.Resources))
+	for k := range ws.Resources {
+		resKeys = append(resKeys, k)
+	}
+	sort.Strings(resKeys)
+	resources := make([]metaschema.Resource, 0, len(resKeys))
+	for _, rk := range resKeys {
+		wr := ws.Resources[rk]
+		methKeys := make([]string, 0, len(wr.Methods))
+		for k := range wr.Methods {
+			methKeys = append(methKeys, k)
+		}
+		sort.Strings(methKeys)
+		methods := make([]metaschema.Method, 0, len(methKeys))
+		for _, mk := range methKeys {
+			wm := wr.Methods[mk]
+			methods = append(methods, metaschema.Method{
+				Name: mk, ID: wm.ID, Path: wm.Path, HTTPMethod: wm.HTTPMethod,
+				Description: wm.Description, Risk: wm.Risk, DocURL: wm.DocURL, Danger: wm.Danger,
+				Scopes: wm.Scopes, AccessTokens: wm.AccessTokens,
+				ParameterOrder: wm.ParameterOrder, RequiredScopes: wm.RequiredScopes,
+				Parameters: wireFields(wm.Parameters), RequestBody: wireFields(wm.RequestBody),
+				ResponseBody: wireFields(wm.ResponseBody),
+			})
+		}
+		resources = append(resources, metaschema.Resource{Name: rk, Methods: methods})
+	}
+	return metaschema.Service{
+		Name: ws.Name, Version: ws.Version, Title: ws.Title,
+		Description: ws.Description, ServicePath: ws.ServicePath, Resources: resources,
+	}
+}
--- a/internal/schema/assembler.go
+++ b/internal/schema/assembler.go
@@ -4,290 +4,14 @@
 package schema

 import (
-	"bytes"
 	"encoding/json"
 	"sort"
 	"strconv"
-	"sync"

 	"github.com/larksuite/cli/internal/cmdutil"
 	"github.com/larksuite/cli/internal/registry"
 )

-// MethodKeyOrder records the natural meta_data.json key order for one method's
-// parameters / requestBody / responseBody. Nested object key orders are stored
-// under NestedKeys, keyed by dotted path from the method root
-// (e.g. "responseBody.items.properties").
-type MethodKeyOrder struct {
-	Parameters   []string
-	RequestBody  []string
-	ResponseBody []string
-	NestedKeys   map[string][]string
-}
-
-var (
-	keyOrderIndex    map[string]*MethodKeyOrder // dottedPath -> order
-	keyOrderInitOnce sync.Once
-)
-
-// lookupKeyOrder returns the key-order record for service.resourcePath.method,
-// or nil if the method is not in the embedded data (e.g. remote-cached).
-func lookupKeyOrder(service string, resourcePath []string, method string) *MethodKeyOrder {
-	keyOrderInitOnce.Do(buildKeyOrderIndex)
-	if keyOrderIndex == nil {
-		return nil
-	}
-	dotted := dottedPath(service, resourcePath, method)
-	return keyOrderIndex[dotted]
-}
-
-func dottedPath(service string, resourcePath []string, method string) string {
-	var buf bytes.Buffer
-	buf.WriteString(service)
-	for _, r := range resourcePath {
-		buf.WriteByte('.')
-		buf.WriteString(r)
-	}
-	buf.WriteByte('.')
-	buf.WriteString(method)
-	return buf.String()
-}
-
-// buildKeyOrderIndex parses the embedded meta_data.json bytes once at init,
-// walking services -> resources -> methods -> {parameters,requestBody,responseBody}
-// and recording each map's key insertion order via json.Decoder.Token().
-func buildKeyOrderIndex() {
-	raw := registry.EmbeddedMetaJSON()
-	if len(raw) == 0 {
-		return
-	}
-	keyOrderIndex = make(map[string]*MethodKeyOrder)
-
-	dec := json.NewDecoder(bytes.NewReader(raw))
-	// Top-level: { "services": [...], "version": "..." }
-	if !expectDelim(dec, '{') {
-		return
-	}
-	for dec.More() {
-		key, _ := readKey(dec)
-		if key != "services" {
-			skipValue(dec)
-			continue
-		}
-		if !expectDelim(dec, '[') {
-			return
-		}
-		for dec.More() {
-			parseService(dec)
-		}
-		// closing ]
-		_, _ = dec.Token()
-	}
-}
-
-// parseService consumes one service object inside services[].
-// meta_data.json may emit "resources" before "name", so we first capture both
-// raw fields, then walk resources with the resolved service name.
-func parseService(dec *json.Decoder) {
-	if !expectDelim(dec, '{') {
-		return
-	}
-	var serviceName string
-	var resourcesRaw json.RawMessage
-	for dec.More() {
-		key, _ := readKey(dec)
-		switch key {
-		case "name":
-			tok, _ := dec.Token()
-			if s, ok := tok.(string); ok {
-				serviceName = s
-			}
-		case "resources":
-			if err := dec.Decode(&resourcesRaw); err != nil {
-				skipValue(dec)
-			}
-		default:
-			skipValue(dec)
-		}
-	}
-	_, _ = dec.Token() // closing }
-	if serviceName != "" && len(resourcesRaw) > 0 {
-		subDec := json.NewDecoder(bytes.NewReader(resourcesRaw))
-		parseResources(subDec, serviceName, nil)
-	}
-}
-
-// parseResources walks a resources map (resName -> resource object).
-// resourcePath is the accumulated path of parent resources (for nested resources).
-func parseResources(dec *json.Decoder, service string, resourcePath []string) {
-	if !expectDelim(dec, '{') {
-		return
-	}
-	for dec.More() {
-		resName, _ := readKey(dec)
-		parseResourceObj(dec, service, append(resourcePath, resName))
-	}
-	_, _ = dec.Token()
-}
-
-// parseResourceObj consumes one resource value: { methods: {...}, ... } and may
-// recurse into nested resources via "resources" key if present.
-func parseResourceObj(dec *json.Decoder, service string, resourcePath []string) {
-	if !expectDelim(dec, '{') {
-		return
-	}
-	for dec.More() {
-		key, _ := readKey(dec)
-		switch key {
-		case "methods":
-			parseMethods(dec, service, resourcePath)
-		case "resources":
-			parseResources(dec, service, resourcePath)
-		default:
-			skipValue(dec)
-		}
-	}
-	_, _ = dec.Token()
-}
-
-// parseMethods consumes the methods map (methodName -> method object).
-func parseMethods(dec *json.Decoder, service string, resourcePath []string) {
-	if !expectDelim(dec, '{') {
-		return
-	}
-	for dec.More() {
-		methodName, _ := readKey(dec)
-		mko := parseMethod(dec)
-		dotted := dottedPath(service, resourcePath, methodName)
-		keyOrderIndex[dotted] = mko
-	}
-	_, _ = dec.Token()
-}
-
-// parseMethod consumes one method object and records key orders.
-func parseMethod(dec *json.Decoder) *MethodKeyOrder {
-	mko := &MethodKeyOrder{NestedKeys: make(map[string][]string)}
-	if !expectDelim(dec, '{') {
-		return mko
-	}
-	for dec.More() {
-		key, _ := readKey(dec)
-		switch key {
-		case "parameters":
-			mko.Parameters = recordObjectKeysRecursive(dec, "parameters", mko.NestedKeys)
-		case "requestBody":
-			mko.RequestBody = recordObjectKeysRecursive(dec, "requestBody", mko.NestedKeys)
-		case "responseBody":
-			mko.ResponseBody = recordObjectKeysRecursive(dec, "responseBody", mko.NestedKeys)
-		default:
-			skipValue(dec)
-		}
-	}
-	_, _ = dec.Token()
-	return mko
-}
-
-// recordObjectKeysRecursive consumes an object and records the top-level key
-// order. It also recurses into each child's "properties" submap, recording
-// nested orders under prefix.subpath in nestedKeys. Returns the top-level keys
-// in order.
-func recordObjectKeysRecursive(dec *json.Decoder, prefix string, nestedKeys map[string][]string) []string {
-	if !expectDelim(dec, '{') {
-		return nil
-	}
-	var order []string
-	for dec.More() {
-		key, _ := readKey(dec)
-		order = append(order, key)
-		// Each child value is itself an object; we want its nested "properties" order if present.
-		consumeFieldRecursive(dec, prefix+"."+key, nestedKeys)
-	}
-	_, _ = dec.Token()
-	if prefix != "" && len(order) > 0 {
-		nestedKeys[prefix] = order
-	}
-	return order
-}
-
-// consumeFieldRecursive consumes a field object (e.g. one parameter spec) and,
-// if it contains "properties": {...}, recursively records that submap's order.
-func consumeFieldRecursive(dec *json.Decoder, path string, nestedKeys map[string][]string) {
-	tok, err := dec.Token()
-	if err != nil {
-		return
-	}
-	delim, ok := tok.(json.Delim)
-	if !ok || delim != '{' {
-		// Not an object — skip the rest of the value
-		skipValueAfterToken(dec, tok)
-		return
-	}
-	for dec.More() {
-		fieldKey, _ := readKey(dec)
-		if fieldKey == "properties" {
-			recordObjectKeysRecursive(dec, path+".properties", nestedKeys)
-		} else {
-			skipValue(dec)
-		}
-	}
-	_, _ = dec.Token()
-}
-
-// --- json.Decoder helpers ---
-
-func expectDelim(dec *json.Decoder, want json.Delim) bool {
-	tok, err := dec.Token()
-	if err != nil {
-		return false
-	}
-	delim, ok := tok.(json.Delim)
-	return ok && delim == want
-}
-
-func readKey(dec *json.Decoder) (string, error) {
-	tok, err := dec.Token()
-	if err != nil {
-		return "", err
-	}
-	s, _ := tok.(string)
-	return s, nil
-}
-
-// skipValue consumes the next complete value (scalar, object, or array).
-func skipValue(dec *json.Decoder) {
-	tok, err := dec.Token()
-	if err != nil {
-		return
-	}
-	skipValueAfterToken(dec, tok)
-}
-
-func skipValueAfterToken(dec *json.Decoder, tok json.Token) {
-	delim, ok := tok.(json.Delim)
-	if !ok {
-		return
-	}
-	// We started inside a container of type `delim` ({ or [) and must eat
-	// tokens until that container closes, tracking nested containers of any
-	// kind. depth counts how many open containers we are currently inside.
-	_ = delim
-	depth := 1
-	for depth > 0 {
-		t, err := dec.Token()
-		if err != nil {
-			return
-		}
-		if d, ok := t.(json.Delim); ok {
-			switch d {
-			case '{', '[':
-				depth++
-			case '}', ']':
-				depth--
-			}
-		}
-	}
-}
-
 // coerceLiteral converts a meta_data literal (default / enum / example) to
 // the JSON Schema type declared by the field (integer/number/boolean/string).
 // meta_data stores every literal as a string, so without coercion an
@@ -501,10 +225,6 @@ func buildOrderedProps(raw map[string]interface{}, nestedPath string) (*OrderedP
 	return op, required
 }

-// currentMethodOrder is the per-method key-order context used by orderedKeys.
-// It is set inside AssembleEnvelope (under assembleMu) and reset on return.
-var currentMethodOrder *MethodKeyOrder
-
 // parseAffordance lifts the affordance overlay from a method's raw meta_data.json
 // entry into a typed *Affordance. Returns nil when the field is absent, malformed,
 // or carries no populated subfields.
@@ -611,8 +331,6 @@ func buildMeta(method map[string]interface{}) *Meta {
 // The params / data wrapping mirrors the CLI's actual flag layout:
 // path+query → --params JSON, body → --data JSON, file → --file. AI consumers
 // can pluck inputSchema.properties.params and pass it verbatim to --params.
-//
-// Caller must set currentMethodOrder for property-order preservation.
 func buildInputSchema(method map[string]interface{}) *InputSchema {
 	is := &InputSchema{
 		Type:       "object",
@@ -738,27 +456,11 @@ func buildOutputSchema(method map[string]interface{}) *OutputSchema {
 	return os
 }

-// assembleMu serializes AssembleEnvelope calls so that the package-level
-// currentMethodOrder pointer is safe for concurrent callers.
-var assembleMu sync.Mutex
-
 // AssembleEnvelope is the main entry point: takes a service / resource path /
 // method name plus its meta_data spec, and produces a fully assembled MCP
 // envelope. Output is fully determined by inputs (same arguments → same
-// envelope), but assembly briefly publishes the per-method key-order context
-// through the package-level currentMethodOrder so orderedKeys can reach it
-// without threading it through every helper. assembleMu serializes that
-// publish, which is why concurrent callers are still safe — they queue
-// rather than run in parallel.
-//
-// If parallelism becomes a bottleneck, replace currentMethodOrder with an
-// assembler struct or pass *MethodKeyOrder explicitly down the call chain.
+// envelope).
 func AssembleEnvelope(serviceName string, resourcePath []string, methodName string, method map[string]interface{}) Envelope {
-	assembleMu.Lock()
-	defer assembleMu.Unlock()
-	currentMethodOrder = lookupKeyOrder(serviceName, resourcePath, methodName)
-	defer func() { currentMethodOrder = nil }()
-
 	name := serviceName
 	for _, r := range resourcePath {
 		name += " " + r
@@ -836,35 +538,10 @@ func walkMethods(resources map[string]interface{}, parentPath []string,
 	}
 }

-// orderedKeys returns the keys of raw in their meta_data natural order if
-// the current per-method key-order context has them recorded; otherwise
-// alphabetical fallback.
-func orderedKeys(raw map[string]interface{}, nestedPath string) []string {
-	if currentMethodOrder != nil && nestedPath != "" {
-		if order, ok := currentMethodOrder.NestedKeys[nestedPath]; ok {
-			// Filter to keys that actually exist in raw (defensive)
-			out := make([]string, 0, len(order))
-			seen := make(map[string]bool)
-			for _, k := range order {
-				if _, ok := raw[k]; ok {
-					out = append(out, k)
-					seen[k] = true
-				}
-			}
-			// Append any keys present in raw but missing from order (defensive),
-			// alphabetically for determinism.
-			var extra []string
-			for k := range raw {
-				if !seen[k] {
-					extra = append(extra, k)
-				}
-			}
-			sort.Strings(extra)
-			out = append(out, extra...)
-			return out
-		}
-	}
-	// Fallback: alphabetical
+// orderedKeys returns the keys of raw in alphabetical order. Field display
+// order is not preserved: the schema envelope is consumed as a JSON Schema (MCP
+// tool spec), where object property order carries no meaning.
+func orderedKeys(raw map[string]interface{}, _ string) []string {
 	keys := make([]string, 0, len(raw))
 	for k := range raw {
 		keys = append(keys, k)
--- a/internal/schema/assembler_test.go
+++ b/internal/schema/assembler_test.go
@@ -7,10 +7,12 @@ import (
 	"encoding/json"
 	"os"
 	"reflect"
+	"sort"
 	"strings"
 	"testing"

 	"github.com/larksuite/cli/internal/registry"
+	"github.com/larksuite/cli/internal/registry/metaschema"
 )

 // TestMain isolates registry-backed tests from any host ~/.lark-cli cache so
@@ -35,58 +37,6 @@ func TestMain(m *testing.M) {
 	os.Exit(code)
 }

-func TestKeyOrderIndex_ImReactionsList(t *testing.T) {
-	// We only assert key-set membership, not absolute order — the upstream
-	// meta_data API does not guarantee a stable JSON key sequence across
-	// fetches, so hard-coding the order makes CI flaky. Order preservation
-	// from input to output is tested separately in TestBuildInputSchema_*.
-	order := lookupKeyOrder("im", []string{"reactions"}, "list")
-	if order == nil {
-		t.Fatal("expected key order for im.reactions.list, got nil")
-	}
-	wantParams := map[string]bool{
-		"message_id": true, "reaction_type": true, "page_token": true,
-		"page_size": true, "user_id_type": true,
-	}
-	if got, want := len(order.Parameters), len(wantParams); got != want {
-		t.Errorf("parameters count = %d, want %d (got %v)", got, want, order.Parameters)
-	}
-	for _, k := range order.Parameters {
-		if !wantParams[k] {
-			t.Errorf("unexpected parameter key %q", k)
-		}
-	}
-	// im.reactions.list 是 GET，没有 requestBody
-	if len(order.RequestBody) != 0 {
-		t.Errorf("expected empty RequestBody, got %v", order.RequestBody)
-	}
-}
-
-func TestKeyOrderIndex_ImImagesCreate(t *testing.T) {
-	// Membership-only assertion; see comment on TestKeyOrderIndex_ImReactionsList.
-	order := lookupKeyOrder("im", []string{"images"}, "create")
-	if order == nil {
-		t.Fatal("expected key order for im.images.create, got nil")
-	}
-	wantBody := map[string]bool{"image_type": true, "image": true}
-	if got, want := len(order.RequestBody), len(wantBody); got != want {
-		t.Errorf("requestBody count = %d, want %d (got %v)", got, want, order.RequestBody)
-	}
-	for _, k := range order.RequestBody {
-		if !wantBody[k] {
-			t.Errorf("unexpected requestBody key %q", k)
-		}
-	}
-}
-
-func TestKeyOrderIndex_UnknownPath(t *testing.T) {
-	// 远端缓存的命令（不在 embedded 内）查不到 key order，返回 nil 走字母序兜底
-	order := lookupKeyOrder("nonexistent_service", []string{"foo"}, "bar")
-	if order != nil {
-		t.Errorf("expected nil for unknown path, got %+v", order)
-	}
-}
-
 func TestConvertProperty_BasicTypes(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -288,9 +238,6 @@ func TestConvertProperty_DescriptionDefaultExample(t *testing.T) {

 func TestBuildInputSchema_ReactionsList(t *testing.T) {
 	method := loadMethodFromRegistry(t, "im", []string{"reactions"}, "list")
-	mko := lookupKeyOrder("im", []string{"reactions"}, "list")
-	currentMethodOrder = mko
-	defer func() { currentMethodOrder = nil }()

 	is := buildInputSchema(method)

@@ -313,16 +260,15 @@ func TestBuildInputSchema_ReactionsList(t *testing.T) {
 	if !reflect.DeepEqual(params.Required, []string{"message_id"}) {
 		t.Errorf("params.Required = %v, want [message_id]", params.Required)
 	}
-	if !reflect.DeepEqual(params.Properties.Order, mko.Parameters) {
-		t.Errorf("params.properties order = %v, want (from key index) %v",
-			params.Properties.Order, mko.Parameters)
+	// Property order is alphabetical now: the envelope is a JSON Schema (MCP
+	// tool spec) where object property order carries no meaning.
+	if !sort.StringsAreSorted(params.Properties.Order) {
+		t.Errorf("params.properties order not alphabetical: %v", params.Properties.Order)
 	}
 }

 func TestBuildInputSchema_ImagesCreate_FileAndBody(t *testing.T) {
 	method := loadMethodFromRegistry(t, "im", []string{"images"}, "create")
-	currentMethodOrder = lookupKeyOrder("im", []string{"images"}, "create")
-	defer func() { currentMethodOrder = nil }()

 	is := buildInputSchema(method)

@@ -382,9 +328,6 @@ func TestBuildInputSchema_HighRiskWriteInjectsYes(t *testing.T) {
 			},
 		},
 	}
-	currentMethodOrder = nil
-	defer func() { currentMethodOrder = nil }()
-
 	is := buildInputSchema(method)

 	// yes lives at inputSchema.properties.yes (sibling of params/data)
@@ -413,9 +356,6 @@ func TestBuildInputSchema_HighRiskWriteInjectsYes(t *testing.T) {

 func TestBuildInputSchema_NoYesForReadRisk(t *testing.T) {
 	method := loadMethodFromRegistry(t, "im", []string{"reactions"}, "list")
-	mko := lookupKeyOrder("im", []string{"reactions"}, "list")
-	currentMethodOrder = mko
-	defer func() { currentMethodOrder = nil }()

 	is := buildInputSchema(method)
 	if _, ok := is.Properties.Map["yes"]; ok {
@@ -425,9 +365,6 @@ func TestBuildInputSchema_NoYesForReadRisk(t *testing.T) {

 func TestBuildOutputSchema_ReactionsList(t *testing.T) {
 	method := loadMethodFromRegistry(t, "im", []string{"reactions"}, "list")
-	mko := lookupKeyOrder("im", []string{"reactions"}, "list")
-	currentMethodOrder = mko
-	defer func() { currentMethodOrder = nil }()

 	os := buildOutputSchema(method)

@@ -613,6 +550,45 @@ func TestBuildMeta_AffordanceFromMethod(t *testing.T) {
 	}
 }

+// TestBuildMeta_AffordanceThroughTypedRegistry guards the static-registry path:
+// a method's affordance must survive metaschema.Method -> registry.MethodToMap
+// -> buildMeta, so `schema --format json` keeps emitting _meta.affordance after
+// the embedded-JSON-to-typed-registry migration. Without typed-side support the
+// overlay is silently stripped whenever meta_data.json carries affordance.
+func TestBuildMeta_AffordanceThroughTypedRegistry(t *testing.T) {
+	mth := metaschema.Method{
+		Name: "primary",
+		Affordance: &metaschema.Affordance{
+			UseWhen:       []string{"用户想拿到自己默认日历的 ID"},
+			DoNotUseWhen:  []string{"已经知道某个具体日历的 ID"},
+			Prerequisites: []string{"user 身份登录"},
+			Examples: []metaschema.AffordanceExample{
+				{Description: "取主日历", Command: "lark-cli calendar calendars primary"},
+			},
+			Related: []string{"calendars.list", "calendars.get"},
+		},
+	}
+	method := registry.MethodToMap(mth)
+	m := buildMeta(method)
+	if m.Affordance == nil {
+		t.Fatal("affordance dropped through the typed registry (MethodToMap -> buildMeta)")
+	}
+	a := m.Affordance
+	if len(a.UseWhen) != 1 || a.UseWhen[0] != "用户想拿到自己默认日历的 ID" {
+		t.Errorf("UseWhen = %v", a.UseWhen)
+	}
+	if len(a.DoNotUseWhen) != 1 || len(a.Prerequisites) != 1 {
+		t.Errorf("DoNotUseWhen=%v Prerequisites=%v", a.DoNotUseWhen, a.Prerequisites)
+	}
+	if len(a.Examples) != 1 || a.Examples[0].Description != "取主日历" ||
+		a.Examples[0].Command != "lark-cli calendar calendars primary" {
+		t.Errorf("Examples = %+v", a.Examples)
+	}
+	if len(a.Related) != 2 {
+		t.Errorf("Related = %v", a.Related)
+	}
+}
+
 func TestBuildMeta_MissingDocURLOmitted(t *testing.T) {
 	method := map[string]interface{}{
 		"scopes":       []interface{}{"x"},
@@ -634,7 +610,6 @@ func TestBuildMeta_MissingDocURLOmitted(t *testing.T) {
 func TestBuildOutputSchema_EmptyResponseBody(t *testing.T) {
 	// 装配器对空 responseBody 应生成 properties = {} （不 nil）
 	method := map[string]interface{}{}
-	currentMethodOrder = nil
 	os := buildOutputSchema(method)
 	if os.Type != "object" {
 		t.Errorf("Type = %q, want \"object\"", os.Type)
--- a/internal/schema/types.go
+++ b/internal/schema/types.go
@@ -83,9 +83,13 @@ type AffordanceCase struct {
 	Command     string `json:"command"`
 }

-// OrderedProps is map[string]Property with preserved key order on MarshalJSON.
-// It is used wherever JSON output must reflect meta_data.json's natural field
-// order rather than Go's default alphabetical map encoding.
+// OrderedProps is map[string]Property that emits its keys in Order on
+// MarshalJSON. Order is now populated alphabetically (see orderedKeys): the
+// schema envelope is an MCP tool spec / JSON Schema, where object property
+// order carries no meaning. The machinery that once preserved meta_data.json's
+// natural field order was removed with the static-registry migration; Order is
+// retained so MarshalJSON has one stable key sequence (and callers that leave
+// it empty fall back to alphabetical over Map).
 type OrderedProps struct {
 	Order []string
 	Map   map[string]Property
--- a/lint/errscontract/rule_no_legacy_common_helper_call.go
+++ b/lint/errscontract/rule_no_legacy_common_helper_call.go
@@ -15,21 +15,12 @@ import (
 // legacy validation/save helpers are forbidden; callers must use the typed
 // common replacements or construct an errs.* typed error directly.
 var migratedCommonHelperPaths = []string{
-	"cmd/event/",
-	"events/",
-	"internal/event/consume/",
 	"shortcuts/base/",
 	"shortcuts/calendar/",
-	"shortcuts/contact/",
-	"shortcuts/doc/",
 	"shortcuts/drive/",
-	"shortcuts/event/",
 	"shortcuts/mail/",
-	"shortcuts/markdown/",
 	"shortcuts/minutes/",
 	"shortcuts/okr/",
-	"shortcuts/sheets/",
-	"shortcuts/slides/",
 	"shortcuts/task/",
 	"shortcuts/vc/",
 	"shortcuts/whiteboard/",
--- a/lint/errscontract/rule_no_legacy_envelope_literal.go
+++ b/lint/errscontract/rule_no_legacy_envelope_literal.go
@@ -16,21 +16,12 @@ import (
 // call sites must return a typed errs.* error instead. Future domains opt in by
 // appending their path prefix here.
 var migratedEnvelopePaths = []string{
-	"cmd/event/",
-	"events/",
-	"internal/event/consume/",
 	"shortcuts/base/",
 	"shortcuts/calendar/",
-	"shortcuts/contact/",
-	"shortcuts/doc/",
 	"shortcuts/drive/",
-	"shortcuts/event/",
 	"shortcuts/mail/",
-	"shortcuts/markdown/",
 	"shortcuts/minutes/",
 	"shortcuts/okr/",
-	"shortcuts/sheets/",
-	"shortcuts/slides/",
 	"shortcuts/task/",
 	"shortcuts/vc/",
 	"shortcuts/whiteboard/",
--- a/lint/errscontract/rule_no_legacy_runtime_api_call.go
+++ b/lint/errscontract/rule_no_legacy_runtime_api_call.go
@@ -27,11 +27,6 @@ import (
 // is not matched. runtime.DoAPI / runtime.RawAPI are intentionally not listed:
 // they return the raw response for the caller to classify and do not emit a
 // legacy envelope themselves.
-//
-// Files that do not import shortcuts/common are skipped: the legacy helpers
-// are methods on common.RuntimeContext, so a same-named method on another
-// receiver (for example the event domain's APIClient interface, whose
-// implementation classifies into typed errs.* errors) is not a legacy call.
 func CheckNoLegacyRuntimeAPICall(path, src string) []Violation {
 	if !isMigratedEnvelopePath(path) || strings.HasSuffix(path, "_test.go") {
 		return nil
@@ -41,9 +36,6 @@ func CheckNoLegacyRuntimeAPICall(path, src string) []Violation {
 	if err != nil {
 		return nil
 	}
-	if !importsPath(file, commonImportPath) {
-		return nil
-	}
 	var out []Violation
 	ast.Inspect(file, func(n ast.Node) bool {
 		call, ok := n.(*ast.CallExpr)
@@ -79,16 +71,3 @@ func matchLegacyRuntimeAPIMethod(name string) (string, bool) {
 	}
 	return "", false
 }
-
-// importsPath reports whether the file imports the given package path.
-func importsPath(file *ast.File, importPath string) bool {
-	for _, imp := range file.Imports {
-		if imp.Path == nil {
-			continue
-		}
-		if strings.Trim(imp.Path.Value, "`\"") == importPath {
-			return true
-		}
-	}
-	return false
-}
--- a/lint/errscontract/rules_test.go
+++ b/lint/errscontract/rules_test.go
@@ -620,7 +620,6 @@ func boom() error {

 func TestCheckNoLegacyEnvelopeLiteral_RejectsExitErrorLiteralOnMigratedShortcutPaths(t *testing.T) {
 	for _, path := range []string{
-		"shortcuts/markdown/markdown_fetch.go",
 		"shortcuts/okr/okr_image_upload.go",
 		"shortcuts/task/task_update.go",
 		"shortcuts/whiteboard/whiteboard_update.go",
@@ -692,7 +691,7 @@ func boom() error {
 	return &output.ExitError{Code: 1}
 }
 `
-	v := CheckNoLegacyEnvelopeLiteral("shortcuts/unmigrated/foo.go", src)
+	v := CheckNoLegacyEnvelopeLiteral("shortcuts/contact/foo.go", src)
 	if len(v) != 0 {
 		t.Errorf("non-migrated path should pass, got: %+v", v)
 	}
@@ -814,8 +813,6 @@ func boom() error {
 func TestCheckNoLegacyRuntimeAPICall_RejectsCallAPIOnDrivePath(t *testing.T) {
 	src := `package drive

-import "github.com/larksuite/cli/shortcuts/common"
-
 func boom(runtime *common.RuntimeContext) error {
 	_, err := runtime.CallAPI("POST", "/x", nil, nil)
 	return err
@@ -836,8 +833,6 @@ func boom(runtime *common.RuntimeContext) error {
 func TestCheckNoLegacyRuntimeAPICall_RejectsCallAPIOnTaskPath(t *testing.T) {
 	src := `package task

-import "github.com/larksuite/cli/shortcuts/common"
-
 func boom(runtime *common.RuntimeContext) error {
 	_, err := runtime.CallAPI("POST", "/x", nil, nil)
 	return err
@@ -858,8 +853,6 @@ func boom(runtime *common.RuntimeContext) error {
 func TestCheckNoLegacyRuntimeAPICall_RejectsDoAPIJSONWithLogIDOnDrivePath(t *testing.T) {
 	src := `package drive

-import "github.com/larksuite/cli/shortcuts/common"
-
 func boom(runtime *common.RuntimeContext) error {
 	_, err := runtime.DoAPIJSONWithLogID("POST", "/x", nil, nil)
 	return err
@@ -914,7 +907,7 @@ func boom(runtime *common.RuntimeContext) error {
 	return err
 }
 `
-	v := CheckNoLegacyRuntimeAPICall("shortcuts/unmigrated/sample.go", src)
+	v := CheckNoLegacyRuntimeAPICall("shortcuts/contact/contact_get.go", src)
 	if len(v) != 0 {
 		t.Errorf("non-migrated path must not fire, got: %+v", v)
 	}
@@ -951,13 +944,9 @@ func TestCheckNoLegacyCommonHelperCall_RejectsLegacyHelpersOnMigratedPath(t *tes
 		"HandleApiResult",
 	}
 	paths := []string{
-		"shortcuts/doc/docs_fetch_v2.go",
 		"shortcuts/drive/drive_search.go",
 		"shortcuts/mail/mail_send.go",
-		"shortcuts/markdown/markdown_fetch.go",
 		"shortcuts/okr/okr_progress_create.go",
-		"shortcuts/sheets/helpers.go",
-		"shortcuts/slides/slides_create.go",
 		"shortcuts/task/task_update.go",
 		"shortcuts/whiteboard/whiteboard_query.go",
 	}
@@ -1008,74 +997,6 @@ func boom() {
 	}
 }

-func TestCheckNoLegacyCommonHelperCall_CoversDocPathWithAliasAndFunctionValue(t *testing.T) {
-	src := `package migrated
-
-import c "github.com/larksuite/cli/shortcuts/common"
-
-func boom() {
-	f := c.FlagErrorf
-	_ = f
-	c.WrapInputStatError(nil)
-}
-`
-	v := CheckNoLegacyCommonHelperCall("shortcuts/doc/docs_fetch_v2.go", src)
-	if len(v) != 2 {
-		t.Fatalf("expected 2 violations for aliased/function-value legacy helpers on doc path, got %d: %+v", len(v), v)
-	}
-}
-
-func TestCheckNoLegacyCommonHelperCall_CoversSheetsPathWithAliasAndFunctionValue(t *testing.T) {
-	src := `package migrated
-
-import c "github.com/larksuite/cli/shortcuts/common"
-
-func boom() {
-	f := c.FlagErrorf
-	_ = f
-	c.WrapInputStatError(nil)
-}
-`
-	v := CheckNoLegacyCommonHelperCall("shortcuts/sheets/helpers.go", src)
-	if len(v) != 2 {
-		t.Fatalf("expected 2 violations for aliased/function-value legacy helpers on sheets path, got %d: %+v", len(v), v)
-	}
-}
-
-func TestCheckNoLegacyCommonHelperCall_CoversSlidesPathWithAliasAndFunctionValue(t *testing.T) {
-	src := `package migrated
-
-import c "github.com/larksuite/cli/shortcuts/common"
-
-func boom() {
-	f := c.FlagErrorf
-	_ = f
-	c.WrapInputStatError(nil)
-}
-`
-	v := CheckNoLegacyCommonHelperCall("shortcuts/slides/slides_create.go", src)
-	if len(v) != 2 {
-		t.Fatalf("expected 2 violations for aliased/function-value legacy helpers on slides path, got %d: %+v", len(v), v)
-	}
-}
-
-func TestCheckNoLegacyCommonHelperCall_CoversMarkdownPathWithAliasAndFunctionValue(t *testing.T) {
-	src := `package migrated
-
-import c "github.com/larksuite/cli/shortcuts/common"
-
-func boom() {
-	f := c.FlagErrorf
-	_ = f
-	c.WrapInputStatError(nil)
-}
-`
-	v := CheckNoLegacyCommonHelperCall("shortcuts/markdown/markdown_fetch.go", src)
-	if len(v) != 2 {
-		t.Fatalf("expected 2 violations for aliased/function-value legacy helpers on markdown path, got %d: %+v", len(v), v)
-	}
-}
-
 func TestCheckNoLegacyCommonHelperCall_AllowsNonMigratedPath(t *testing.T) {
 	src := `package contact

@@ -1085,7 +1006,7 @@ func boom() {
 	common.FlagErrorf("legacy allowed until domain migrates")
 }
 `
-	v := CheckNoLegacyCommonHelperCall("shortcuts/unmigrated/sample.go", src)
+	v := CheckNoLegacyCommonHelperCall("shortcuts/contact/contact_get.go", src)
 	if len(v) != 0 {
 		t.Errorf("non-migrated path must pass, got: %+v", v)
 	}
@@ -1155,23 +1076,3 @@ func boom() error {
 		t.Fatalf("expected 1 violation for function-value reference, got %d: %+v", len(v), v)
 	}
 }
-
-func TestCheckNoLegacyRuntimeAPICall_SkipsNonCommonReceiver(t *testing.T) {
-	// The event domain's APIClient interface has a same-named CallAPI method
-	// whose implementation classifies into typed errs.* errors; without the
-	// shortcuts/common import the call cannot be the legacy RuntimeContext
-	// helper and must not fire.
-	src := `package vc
-
-import "github.com/larksuite/cli/internal/event"
-
-func boom(rt event.APIClient) error {
-	_, err := rt.CallAPI(nil, "POST", "/x", nil)
-	return err
-}
-`
-	v := CheckNoLegacyRuntimeAPICall("events/vc/preconsume.go", src)
-	if len(v) != 0 {
-		t.Errorf("non-common CallAPI receiver must not fire, got: %+v", v)
-	}
-}
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@larksuite/cli",
-  "version": "1.0.51",
+  "version": "1.0.48",
  "description": "The official CLI for Lark/Feishu open platform",
  "bin": {
    "lark-cli": "scripts/run.js"
--- a/scripts/build-pkg-pr-new.sh
+++ b/scripts/build-pkg-pr-new.sh
@@ -6,6 +6,7 @@ OUT_DIR="$ROOT_DIR/.pkg-pr-new"

 cd "$ROOT_DIR"

+# fetch_meta.py also regenerates the static Go registry (meta_data_gen.go).
 python3 scripts/fetch_meta.py

 rm -rf "$OUT_DIR"
--- a/scripts/fetch_meta.py
+++ b/scripts/fetch_meta.py
@@ -63,6 +63,19 @@ def fetch_remote(brand):
    return data


+def run_gen():
+    """Regenerate the static Go registry (metastatic/meta_data_gen.go) from
+    meta_data.json. Run after every fetch so any caller that fetches also
+    produces the sole build-time source of the embedded command tree — no build
+    tag, no JSON embedded in the binary. Output is gitignored."""
+    print("fetch-meta: generating static Go registry (metastatic/meta_data_gen.go)", file=sys.stderr)
+    subprocess.run(
+        ["go", "run", "internal/registry/metastatic/gen.go"],
+        cwd=ROOT,
+        check=True,
+    )
+
+
 def main():
    parser = argparse.ArgumentParser(description="Fetch meta_data.json for build-time embedding")
    parser.add_argument("--brand", default="feishu", choices=["feishu", "lark"],
@@ -71,27 +84,29 @@ def main():
                        help="force refresh from remote even if local file exists")
    args = parser.parse_args()

-    if os.path.exists(OUT_PATH) and not args.force:
-        if os.path.isfile(OUT_PATH):
-            try:
-                with open(OUT_PATH, "r", encoding="utf-8") as fp:
-                    local = json.load(fp)
-                if local.get("services"):
-                    print(f"fetch-meta: {OUT_PATH} already exists, skipping (use --force to re-fetch)", file=sys.stderr)
-                    return
-                print(f"fetch-meta: {OUT_PATH} has no services, re-fetching", file=sys.stderr)
-            except (OSError, json.JSONDecodeError):
-                print(f"fetch-meta: {OUT_PATH} is invalid JSON, re-fetching", file=sys.stderr)
-        else:
-            print(f"fetch-meta: {OUT_PATH} is not a file, re-fetching", file=sys.stderr)
+    have_valid = False
+    if os.path.isfile(OUT_PATH) and not args.force:
+        try:
+            with open(OUT_PATH, "r", encoding="utf-8") as fp:
+                local = json.load(fp)
+            have_valid = bool(local.get("services"))
+        except (OSError, json.JSONDecodeError):
+            have_valid = False

-    data = fetch_remote(args.brand)
-    count = len(data.get("services", []))
-    print(f"fetch-meta: OK, {count} services from remote API", file=sys.stderr)
+    if have_valid:
+        print(f"fetch-meta: {OUT_PATH} already exists, skipping fetch (use --force to re-fetch)", file=sys.stderr)
+    else:
+        data = fetch_remote(args.brand)
+        count = len(data.get("services", []))
+        print(f"fetch-meta: OK, {count} services from remote API", file=sys.stderr)
+        with open(OUT_PATH, "w") as fp:
+            json.dump(data, fp, ensure_ascii=False, indent=2)
+            fp.write("\n")

-    with open(OUT_PATH, "w") as fp:
-        json.dump(data, fp, ensure_ascii=False, indent=2)
-        fp.write("\n")
+    # Always (re)generate the static Go registry so every fetch also produces
+    # the embedded command tree — the build-time replacement for the old
+    # embedded meta_data.json.
+    run_gen()


 if __name__ == "__main__":
--- a/shortcuts/apps/apps_access_scope_get.go
+++ b/shortcuts/apps/apps_access_scope_get.go
@@ -21,12 +21,9 @@ var AppsAccessScopeGet = common.Shortcut{
 	Command:     "+access-scope-get",
 	Description: "Get Miaoda app access scope configuration",
 	Risk:        "read",
-	Tips: []string{
-		"Example: lark-cli apps +access-scope-get --app-id <app_id>",
-	},
-	Scopes:    []string{"spark:app:read"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
+	Scopes:      []string{"spark:app:read"},
+	AuthTypes:   []string{"user"},
+	HasFormat:   true,
 	Flags: []common.Flag{
 		{Name: "app-id", Desc: "app ID", Required: true},
 	},
@@ -45,9 +42,9 @@ var AppsAccessScopeGet = common.Shortcut{
 	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
 		appID := strings.TrimSpace(rctx.Str("app-id"))
 		path := fmt.Sprintf("%s/apps/%s/access-scope", apiBasePath, validate.EncodePathSegment(appID))
-		data, err := rctx.CallAPITyped("GET", path, nil, nil)
+		data, err := rctx.CallAPI("GET", path, nil, nil)
 		if err != nil {
-			return withAppsHint(err, "verify --app-id is correct and you have access to the app; list your apps with `lark-cli apps +list`")
+			return err
 		}
 		// 原样透传 — 保留服务端字符串枚举 (All/Tenant/Range)，不合并 users/departments/chats。
 		rctx.OutFormat(data, nil, func(w io.Writer) {
--- a/shortcuts/apps/apps_access_scope_set.go
+++ b/shortcuts/apps/apps_access_scope_set.go
@@ -27,14 +27,9 @@ var AppsAccessScopeSet = common.Shortcut{
 	Command:     "+access-scope-set",
 	Description: "Set Miaoda app access scope (specific / public / tenant)",
 	Risk:        "write",
-	Tips: []string{
-		`Example: lark-cli apps +access-scope-set --app-id <app_id> --scope tenant`,
-		`Example: lark-cli apps +access-scope-set --app-id <app_id> --scope public --require-login`,
-		`Example: lark-cli apps +access-scope-set --app-id <app_id> --scope specific --targets '[{"type":"user","id":"<open_id>"}]'`,
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
+	Scopes:      []string{"spark:app:write"},
+	AuthTypes:   []string{"user"},
+	HasFormat:   true,
 	Flags: []common.Flag{
 		{Name: "app-id", Desc: "app ID", Required: true},
 		{Name: "scope", Desc: "scope: specific | public | tenant", Required: true, Enum: []string{"specific", "public", "tenant"}},
@@ -69,9 +64,9 @@ var AppsAccessScopeSet = common.Shortcut{
 		}
 		appID := strings.TrimSpace(rctx.Str("app-id"))
 		path := fmt.Sprintf("%s/apps/%s/access-scope", apiBasePath, validate.EncodePathSegment(appID))
-		data, err := rctx.CallAPITyped("PUT", path, nil, body)
+		data, err := rctx.CallAPI("PUT", path, nil, body)
 		if err != nil {
-			return withAppsHint(err, "verify --app-id is correct; for scope=specific, each --targets id must be a valid open_id/department_id/chat_id and --approver a valid open_id; review the current scope with `lark-cli apps +access-scope-get --app-id <app_id>`")
+			return err
 		}
 		rctx.OutFormat(data, nil, func(w io.Writer) {
 			fmt.Fprintf(w, "access-scope set: %s\n", rctx.Str("scope"))
--- a/shortcuts/apps/apps_access_scope_set_test.go
+++ b/shortcuts/apps/apps_access_scope_set_test.go
@@ -8,62 +8,9 @@ import (
 	"strings"
 	"testing"

-	"github.com/spf13/cobra"
-
 	"github.com/larksuite/cli/internal/httpmock"
-	"github.com/larksuite/cli/shortcuts/common"
 )

-func testRuntimeAccessScope(t *testing.T, scope, targets, approver string, applyEnabled, requireLogin bool) *common.RuntimeContext {
-	t.Helper()
-	cmd := &cobra.Command{Use: "access-scope-set"}
-	cmd.Flags().String("scope", scope, "")
-	cmd.Flags().String("targets", targets, "")
-	cmd.Flags().String("approver", approver, "")
-	cmd.Flags().Bool("apply-enabled", applyEnabled, "")
-	cmd.Flags().Bool("require-login", requireLogin, "")
-	return common.TestNewRuntimeContext(cmd, nil)
-}
-
-func TestBuildAccessScopeBody_Branches(t *testing.T) {
-	t.Run("invalid scope", func(t *testing.T) {
-		if _, err := buildAccessScopeBody(testRuntimeAccessScope(t, "bogus", "", "", false, false)); err == nil {
-			t.Error("unknown scope must error")
-		}
-	})
-	t.Run("specific with all target kinds and approver", func(t *testing.T) {
-		body, err := buildAccessScopeBody(testRuntimeAccessScope(t,
-			"specific",
-			`[{"type":"user","id":"u1"},{"type":"department","id":"d1"},{"type":"chat","id":"c1"}]`,
-			"ou_appr", true, false))
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-		if body["scope"] != "Range" {
-			t.Errorf("scope=%v want Range", body["scope"])
-		}
-		for _, k := range []string{"users", "departments", "chats", "apply_config"} {
-			if _, ok := body[k]; !ok {
-				t.Errorf("missing %q in body=%v", k, body)
-			}
-		}
-	})
-	t.Run("specific with invalid targets JSON", func(t *testing.T) {
-		if _, err := buildAccessScopeBody(testRuntimeAccessScope(t, "specific", "{bad", "", false, false)); err == nil {
-			t.Error("invalid targets JSON must error")
-		}
-	})
-	t.Run("public sets require_login", func(t *testing.T) {
-		body, err := buildAccessScopeBody(testRuntimeAccessScope(t, "public", "", "", false, true))
-		if err != nil {
-			t.Fatalf("err=%v", err)
-		}
-		if body["scope"] != "All" || body["require_login"] != true {
-			t.Errorf("public body=%v", body)
-		}
-	})
-}
-
 func TestAppsAccessScopeSet_Specific(t *testing.T) {
 	factory, stdout, reg := newAppsExecuteFactory(t)
 	stub := &httpmock.Stub{
@@ -254,44 +201,3 @@ func TestAppsAccessScopeSet_TrimsAppIDInPath(t *testing.T) {
 		t.Fatalf("execute err=%v", err)
 	}
 }
-
-func TestSplitAccessScopeTargets_Partitions(t *testing.T) {
-	users, departments, chats := splitAccessScopeTargets([]map[string]interface{}{
-		{"type": "user", "id": "u1"},
-		{"type": "department", "id": "d1"},
-		{"type": "chat", "id": "c1"},
-		{"type": "user", "id": "  "},   // empty id skipped
-		{"type": "unknown", "id": "x"}, // unknown type skipped
-	})
-	if len(users) != 1 || users[0] != "u1" {
-		t.Errorf("users=%v want [u1]", users)
-	}
-	if len(departments) != 1 || departments[0] != "d1" {
-		t.Errorf("departments=%v want [d1]", departments)
-	}
-	if len(chats) != 1 || chats[0] != "c1" {
-		t.Errorf("chats=%v want [c1]", chats)
-	}
-}
-
-func TestValidateTargetsJSON_Cases(t *testing.T) {
-	cases := []struct {
-		name    string
-		in      string
-		wantErr bool
-	}{
-		{"invalid json", "{not json", true},
-		{"empty array", "[]", true},
-		{"bad type", `[{"type":"role","id":"r1"}]`, true},
-		{"empty id", `[{"type":"user","id":"  "}]`, true},
-		{"valid", `[{"type":"user","id":"u1"}]`, false},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			err := validateTargetsJSON(c.in)
-			if (err != nil) != c.wantErr {
-				t.Errorf("validateTargetsJSON(%q) err=%v wantErr=%v", c.in, err, c.wantErr)
-			}
-		})
-	}
-}
--- a/shortcuts/apps/apps_callapi_typed_test.go
+++ b/shortcuts/apps/apps_callapi_typed_test.go
@@ -1,71 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-// TestAppsList_503IsRetryableTypedError pins the typed-error upgrade: a 5xx
-// response from the apps list endpoint must surface as a typed errs.Problem with
-// Retryable == true (via CallAPITyped → httpStatusError). The pre-migration
-// CallAPI path produced a legacy *output.ExitError with no Retryable field, so
-// this test fails until AppsList is migrated to CallAPITyped.
-func TestAppsList_503IsRetryableTypedError(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps",
-		Status: 503,
-		// A gateway-style non-JSON body (text/html) forces the status-based
-		// classifier (httpStatusError) rather than the API-envelope path.
-		Headers: http.Header{"Content-Type": []string{"text/html"}},
-		RawBody: []byte("<html><body>503 Service Unavailable</body></html>"),
-	})
-
-	err := runAppsShortcut(t, AppsList,
-		[]string{"+list", "--as", "user"}, factory, stdout)
-	if err == nil {
-		t.Fatalf("expected an error on 503, got nil; stdout:\n%s", stdout.String())
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected a typed errs.Problem on 503, got %T: %v", err, err)
-	}
-	if !p.Retryable {
-		t.Fatalf("expected Retryable == true on 503, got Problem=%+v", p)
-	}
-}
-
-// TestAppsList_SuccessShapeUnchanged pins that the success path is
-// output-shape-neutral after migration: a 200 envelope still yields a success
-// stdout envelope carrying the app_id.
-func TestAppsList_SuccessShapeUnchanged(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"items": []interface{}{
-					map[string]interface{}{"app_id": "a", "name": "n"},
-				},
-			},
-		},
-	})
-
-	if err := runAppsShortcut(t, AppsList,
-		[]string{"+list", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	if got := stdout.String(); !strings.Contains(got, `"app_id": "a"`) {
-		t.Fatalf("stdout missing app_id: %s", got)
-	}
-}
--- a/shortcuts/apps/apps_chat.go
+++ b/shortcuts/apps/apps_chat.go
@@ -1,83 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// AppsChat sends a user message to a session, starting/continuing a conversation.
-// Async: the message is queued and the response carries no business payload (no
-// turn_id, no next_poll_after_ms — the turn is not generated yet). Poll
-// +session-get; it returns next_poll_after_ms, and once the turn runs its handle
-// is in latest_turn.turn_id.
-
-// Turn cost varies sharply by init state: the first +chat on a not-initialized
-// app runs a one-time design + first-generation pass server-side (~20-50 min);
-// chat on an already-initialized app is incremental and finishes in minutes.
-// The init-state check and matching polling cadence live in the lark-apps
-// skill reference (references/lark-apps-cloud-dev.md) — the canonical source.
-var AppsChat = common.Shortcut{
-	Service:     appsService,
-	Command:     "+chat",
-	Description: "Send a message to a session to start/continue a conversation",
-	Risk:        "write",
-	Tips: []string{
-		`Example: lark-cli apps +chat --app-id <app_id> --session-id <session_id> --message "做一个待办清单页面"`,
-		`Example: lark-cli apps +chat --app-id <app_id> --session-id <session_id> --message "把首页标题改为 我的待办"`,
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "app ID", Required: true},
-		{Name: "session-id", Desc: "session ID", Required: true},
-		{Name: "message", Desc: "user message text", Required: true},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		if strings.TrimSpace(rctx.Str("app-id")) == "" {
-			return output.ErrValidation("--app-id is required")
-		}
-		if strings.TrimSpace(rctx.Str("session-id")) == "" {
-			return output.ErrValidation("--session-id is required")
-		}
-		// Do not echo --message content in the error (spec §4 redaction).
-		if strings.TrimSpace(rctx.Str("message")) == "" {
-			return output.ErrValidation("--message is required")
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		return common.NewDryRunAPI().
-			POST(chatPath(rctx.Str("app-id"), rctx.Str("session-id"))).
-			Desc("Send a message to a session").
-			Body(buildChatBody(rctx))
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		data, err := rctx.CallAPITyped("POST", chatPath(rctx.Str("app-id"), rctx.Str("session-id")), nil, buildChatBody(rctx))
-		if err != nil {
-			return withAppsHint(err, "if the session_id is unknown or invalid, list this app's sessions with `lark-cli apps +session-list --app-id "+strings.TrimSpace(rctx.Str("app-id"))+"`")
-		}
-		rctx.OutFormat(data, nil, func(w io.Writer) {
-			fmt.Fprintf(w, "message sent; poll +session-get for turn status\n")
-		})
-		return nil
-	},
-}
-
-func chatPath(appID, sessionID string) string {
-	return sessionPath(appID, sessionID) + "/chat"
-}
-
-func buildChatBody(rctx *common.RuntimeContext) map[string]interface{} {
-	return map[string]interface{}{
-		"message": strings.TrimSpace(rctx.Str("message")),
-	}
-}
--- a/shortcuts/apps/apps_chat_test.go
+++ b/shortcuts/apps/apps_chat_test.go
@@ -1,104 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-func TestAppsChat_Success(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sessions/conv_x/chat",
-		Body: map[string]interface{}{
-			"code": 0,
-			// +chat is async and returns NO business payload (no turn_id, no
-			// next_poll_after_ms — the turn is not generated yet). turn_id and the
-			// poll interval are read later from +session-get.
-			"data": map[string]interface{}{},
-		},
-	}
-	reg.Register(stub)
-	if err := runAppsShortcut(t, AppsChat,
-		[]string{"+chat", "--app-id", "app_x", "--session-id", "conv_x", "--message", "把首页表头改成蓝色", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	var sent map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &sent); err != nil {
-		t.Fatalf("decode body: %v", err)
-	}
-	if sent["message"] != "把首页表头改成蓝色" {
-		t.Fatalf("body.message = %v", sent["message"])
-	}
-	if _, present := sent["attachment_ids"]; present {
-		t.Fatalf("attachment_ids must not be sent this iteration: %v", sent)
-	}
-	// +chat carries no next_poll_after_ms; the CLI must not fabricate one.
-	if got := stdout.String(); strings.Contains(got, "next_poll_after_ms") {
-		t.Fatalf("stdout must not reference next_poll_after_ms (chat returns none): %s", got)
-	}
-}
-
-func TestAppsChat_Pretty(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sessions/conv_x/chat",
-		Body:   map[string]interface{}{"code": 0, "data": map[string]interface{}{}},
-	})
-	if err := runAppsShortcut(t, AppsChat,
-		[]string{"+chat", "--app-id", "app_x", "--session-id", "conv_x", "--message", "hi", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	if got := stdout.String(); !strings.Contains(got, "message sent") || !strings.Contains(got, "+session-get") {
-		t.Fatalf("pretty wrong: %q", got)
-	}
-}
-
-func TestAppsChat_RequiresMessage(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsChat,
-		[]string{"+chat", "--app-id", "app_x", "--session-id", "conv_x", "--message", "", "--as", "user"}, factory, stdout)
-	if err == nil || !strings.Contains(err.Error(), "message") {
-		t.Fatalf("expected --message required error, got %v", err)
-	}
-}
-
-// Security: a non-blank message that fails for another reason must never be echoed.
-// Here we assert the blank-message error names the field only (no content leak path).
-func TestAppsChat_ValidationDoesNotEchoMessage(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	// blank message triggers validation; the error must mention the flag, not any content.
-	err := runAppsShortcut(t, AppsChat,
-		[]string{"+chat", "--app-id", "", "--session-id", "conv_x", "--message", "secret-content-xyz", "--as", "user"}, factory, stdout)
-	if err == nil {
-		t.Fatalf("expected validation error")
-	}
-	if strings.Contains(err.Error(), "secret-content-xyz") {
-		t.Fatalf("validation error must not echo --message content: %v", err)
-	}
-}
-
-func TestAppsChat_DryRun(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsChat,
-		[]string{"+chat", "--app-id", "app_x", "--session-id", "conv_x", "--message", "hi", "--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	got := stdout.String()
-	if !strings.Contains(got, "/open-apis/spark/v1/apps/app_x/sessions/conv_x/chat") {
-		t.Fatalf("dry-run missing endpoint: %s", got)
-	}
-	if !strings.Contains(got, `"message": "hi"`) {
-		t.Fatalf("dry-run missing message body: %s", got)
-	}
-}
--- a/shortcuts/apps/apps_create.go
+++ b/shortcuts/apps/apps_create.go
@@ -13,24 +13,18 @@ import (
 	"github.com/larksuite/cli/shortcuts/common"
 )

-const createHint = "verify --app-type is html or full_stack and --name is non-empty; if this is a permission error, confirm your account can create Miaoda apps"
-
 // AppsCreate creates a new Miaoda app.
 var AppsCreate = common.Shortcut{
 	Service:     appsService,
 	Command:     "+create",
 	Description: "Create a new Miaoda app",
 	Risk:        "write",
-	Tips: []string{
-		`Example: lark-cli apps +create --name "审批系统" --app-type full_stack`,
-		`Example: lark-cli apps +create --name "活动页" --app-type html --description "活动报名"`,
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
+	Scopes:      []string{"spark:app:write"},
+	AuthTypes:   []string{"user"},
+	HasFormat:   true,
 	Flags: []common.Flag{
 		{Name: "name", Desc: "app display name", Required: true},
-		{Name: "app-type", Desc: "app type", Required: true, Enum: []string{"html", "full_stack"}},
+		{Name: "app-type", Desc: "app type (currently only: HTML)", Required: true},
 		{Name: "description", Desc: "app description"},
 		{Name: "icon-url", Desc: "app icon URL (server uses default if omitted)"},
 	},
@@ -38,6 +32,13 @@ var AppsCreate = common.Shortcut{
 		if strings.TrimSpace(rctx.Str("name")) == "" {
 			return output.ErrValidation("--name is required")
 		}
+		appType := strings.TrimSpace(rctx.Str("app-type"))
+		if appType == "" {
+			return output.ErrValidation("--app-type is required")
+		}
+		if !validAppTypes[appType] {
+			return output.ErrValidation(fmt.Sprintf("--app-type %q is not supported (allowed: HTML)", appType))
+		}
 		return nil
 	},
 	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
@@ -47,9 +48,9 @@ var AppsCreate = common.Shortcut{
 			Body(buildAppsCreateBody(rctx))
 	},
 	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		data, err := rctx.CallAPITyped("POST", apiBasePath+"/apps", nil, buildAppsCreateBody(rctx))
+		data, err := rctx.CallAPI("POST", apiBasePath+"/apps", nil, buildAppsCreateBody(rctx))
 		if err != nil {
-			return withAppsHint(err, createHint)
+			return err
 		}
 		rctx.OutFormat(data, nil, func(w io.Writer) {
 			fmt.Fprintf(w, "created: %s\n", common.GetString(data, "app", "app_id"))
@@ -58,13 +59,15 @@ var AppsCreate = common.Shortcut{
 	},
 }

+// 应用类型枚举。当前只有 HTML，未来会扩展（SPA、NATIVE、...）。
+var validAppTypes = map[string]bool{
+	"HTML": true,
+}
+
 func buildAppsCreateBody(rctx *common.RuntimeContext) map[string]interface{} {
-	// --app-type is constrained to the lowercase enum (html / full_stack) by the
-	// flag's Enum, so send it through verbatim. Legacy uppercase compatibility is
-	// a server concern and is intentionally not surfaced by the CLI.
 	body := map[string]interface{}{
 		"name":     strings.TrimSpace(rctx.Str("name")),
-		"app_type": rctx.Str("app-type"),
+		"app_type": strings.TrimSpace(rctx.Str("app-type")),
 	}
 	if desc := strings.TrimSpace(rctx.Str("description")); desc != "" {
 		body["description"] = desc
--- a/shortcuts/apps/apps_create_test.go
+++ b/shortcuts/apps/apps_create_test.go
@@ -22,7 +22,6 @@ import (

 func newAppsExecuteFactory(t *testing.T) (*cmdutil.Factory, *bytes.Buffer, *httpmock.Registry) {
 	t.Helper()
-	t.Setenv("HOME", t.TempDir())
 	t.Setenv("LARKSUITE_CLI_CONFIG_DIR", t.TempDir())
 	cfg := &core.CliConfig{
 		AppID:      "test-app-" + strings.ToLower(t.Name()),
@@ -69,7 +68,7 @@ func TestAppsCreate_Success(t *testing.T) {
 	reg.Register(stub)

 	if err := runAppsShortcut(t, AppsCreate,
-		[]string{"+create", "--name", "Demo", "--app-type", "html", "--description", "d", "--as", "user"},
+		[]string{"+create", "--name", "Demo", "--app-type", "HTML", "--description", "d", "--as", "user"},
 		factory, stdout); err != nil {
 		t.Fatalf("execute err=%v", err)
 	}
@@ -84,8 +83,8 @@ func TestAppsCreate_Success(t *testing.T) {
 	if sent["name"] != "Demo" {
 		t.Fatalf("body.name = %v", sent["name"])
 	}
-	if sent["app_type"] != "html" {
-		t.Fatalf("body.app_type = %v (want html)", sent["app_type"])
+	if sent["app_type"] != "HTML" {
+		t.Fatalf("body.app_type = %v (want HTML)", sent["app_type"])
 	}
 	if sent["description"] != "d" {
 		t.Fatalf("body.description = %v", sent["description"])
@@ -109,7 +108,7 @@ func TestAppsCreate_WithIconURL(t *testing.T) {
 	})

 	if err := runAppsShortcut(t, AppsCreate,
-		[]string{"+create", "--name", "Demo", "--app-type", "html", "--icon-url", "https://example.com/icon.svg", "--as", "user"},
+		[]string{"+create", "--name", "Demo", "--app-type", "HTML", "--icon-url", "https://example.com/icon.svg", "--as", "user"},
 		factory, stdout); err != nil {
 		t.Fatalf("execute err=%v", err)
 	}
@@ -134,7 +133,7 @@ func TestAppsCreate_PrettyOutputReadsNestedAppID(t *testing.T) {
 	})

 	if err := runAppsShortcut(t, AppsCreate,
-		[]string{"+create", "--name", "Demo", "--app-type", "html", "--format", "pretty", "--as", "user"},
+		[]string{"+create", "--name", "Demo", "--app-type", "HTML", "--format", "pretty", "--as", "user"},
 		factory, stdout); err != nil {
 		t.Fatalf("execute err=%v", err)
 	}
@@ -145,7 +144,7 @@ func TestAppsCreate_PrettyOutputReadsNestedAppID(t *testing.T) {

 func TestAppsCreate_RequiresName(t *testing.T) {
 	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsCreate, []string{"+create", "--app-type", "html", "--as", "user"}, factory, stdout)
+	err := runAppsShortcut(t, AppsCreate, []string{"+create", "--app-type", "HTML", "--as", "user"}, factory, stdout)
 	if err == nil || !strings.Contains(err.Error(), "name") {
 		t.Fatalf("expected name required error, got %v", err)
 	}
@@ -160,31 +159,20 @@ func TestAppsCreate_RequiresAppType(t *testing.T) {
 	}
 }

-// TestAppsCreate_RejectsInvalidAppType pins that --app-type is a strict
-// lowercase enum (html / full_stack). Unknown values and legacy uppercase are
-// both rejected by the flag's Enum — the CLI does not normalize case; legacy
-// uppercase compatibility is a server-side concern, not surfaced by the client.
 func TestAppsCreate_RejectsInvalidAppType(t *testing.T) {
-	for _, appType := range []string{"spa", "HTML", "Full_Stack"} {
-		t.Run(appType, func(t *testing.T) {
-			factory, stdout, _ := newAppsExecuteFactory(t)
-			err := runAppsShortcut(t, AppsCreate,
-				[]string{"+create", "--name", "Demo", "--app-type", appType, "--as", "user"},
-				factory, stdout)
-			if err == nil || !strings.Contains(err.Error(), "invalid value") {
-				t.Fatalf("expected invalid-enum error for %q, got %v", appType, err)
-			}
-			if !strings.Contains(err.Error(), "full_stack") {
-				t.Fatalf("expected enum error to list allowed values, got %v", err)
-			}
-		})
+	factory, stdout, _ := newAppsExecuteFactory(t)
+	err := runAppsShortcut(t, AppsCreate,
+		[]string{"+create", "--name", "Demo", "--app-type", "spa", "--as", "user"},
+		factory, stdout)
+	if err == nil || !strings.Contains(err.Error(), "not supported") {
+		t.Fatalf("expected unsupported app-type error, got %v", err)
 	}
 }

 func TestAppsCreate_DryRun(t *testing.T) {
 	factory, stdout, _ := newAppsExecuteFactory(t)
 	if err := runAppsShortcut(t, AppsCreate,
-		[]string{"+create", "--name", "Demo", "--app-type", "html", "--dry-run", "--as", "user"},
+		[]string{"+create", "--name", "Demo", "--app-type", "HTML", "--dry-run", "--as", "user"},
 		factory, stdout); err != nil {
 		t.Fatalf("dry-run err=%v", err)
 	}
@@ -195,55 +183,7 @@ func TestAppsCreate_DryRun(t *testing.T) {
 	if !strings.Contains(got, `"name": "Demo"`) {
 		t.Fatalf("dry-run missing body: %s", got)
 	}
-	if !strings.Contains(got, `"app_type": "html"`) {
+	if !strings.Contains(got, `"app_type": "HTML"`) {
 		t.Fatalf("dry-run missing app_type: %s", got)
 	}
 }
-
-func TestAppsCreate_FullstackSuccess(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"app": map[string]interface{}{"app_id": "app_fs", "name": "Demo"},
-			},
-		},
-	}
-	reg.Register(stub)
-
-	if err := runAppsShortcut(t, AppsCreate,
-		[]string{"+create", "--name", "Demo", "--app-type", "full_stack", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-
-	var sent map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &sent); err != nil {
-		t.Fatalf("decode body: %v", err)
-	}
-	if sent["app_type"] != "full_stack" {
-		t.Fatalf("body.app_type = %v (want full_stack)", sent["app_type"])
-	}
-	if _, present := sent["message"]; present {
-		t.Fatalf("message should never be sent: %v", sent)
-	}
-}
-
-func TestAppsCreate_FullstackDryRun(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsCreate,
-		[]string{"+create", "--name", "Demo", "--app-type", "full_stack", "--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	got := stdout.String()
-	if !strings.Contains(got, `"app_type": "full_stack"`) {
-		t.Fatalf("dry-run missing app_type full_stack: %s", got)
-	}
-	if strings.Contains(got, `"message"`) {
-		t.Fatalf("dry-run should not contain message: %s", got)
-	}
-}
--- a/shortcuts/apps/apps_db_env_create.go
+++ b/shortcuts/apps/apps_db_env_create.go
@@ -1,98 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-const dbEnvCreateHint = "verify --app-id is correct; if the app is already multi-env this is a conflict — inspect current tables with `lark-cli apps +db-table-list --app-id <app_id> --env dev`"
-
-// AppsDBEnvCreate creates a DB environment for a Miaoda app（拆分单库为 dev/online 多环境）。
-//
-// 调 POST /apps/{app_id}/db_dev_init。--env 指定要创建的环境，由调用方传入，目前只支持 dev。
-// 不可逆：单库一旦拆成 dev/online 双库无法回退。Risk: high-risk-write 触发框架自动注入 --yes 确认关卡。
-var AppsDBEnvCreate = common.Shortcut{
-	Service:     appsService,
-	Command:     "+db-env-create",
-	Description: "Create a DB environment (split single-env DB into dev/online, irreversible)",
-	Risk:        "high-risk-write",
-	Tips: []string{
-		"Example: lark-cli apps +db-env-create --env dev --sync-data --app-id <app_id> --yes",
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app id", Required: true},
-		{Name: "env", Default: "dev", Enum: []string{"dev"}, Desc: "environment to create (only dev supported for now)"},
-		{Name: "sync-data", Type: "bool", Desc: "copy existing online data into the new environment (default off)"},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		_, err := requireAppID(rctx.Str("app-id"))
-		return err
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID, _ := requireAppID(rctx.Str("app-id"))
-		return common.NewDryRunAPI().
-			POST(appDbEnvCreatePath(appID)).
-			Desc("Create Miaoda app DB environment").
-			Body(buildDBEnvCreateBody(rctx))
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID, err := requireAppID(rctx.Str("app-id"))
-		if err != nil {
-			return err
-		}
-		data, err := rctx.CallAPITyped("POST", appDbEnvCreatePath(appID), nil, buildDBEnvCreateBody(rctx))
-		if err != nil {
-			return withAppsHint(err, dbEnvCreateHint)
-		}
-		rctx.OutFormat(data, nil, func(w io.Writer) {
-			renderEnvCreatePretty(w, data)
-		})
-		return nil
-	},
-}
-
-// buildDBEnvCreateBody 构造 db 环境创建 body：sync_data（bool）。
-// --env 目前只支持 dev、服务端接口本身即创建 dev 环境，故不下发 env 字段（仅做 CLI 入参校验/前向兼容）。
-func buildDBEnvCreateBody(rctx *common.RuntimeContext) map[string]interface{} {
-	return map[string]interface{}{
-		"sync_data": rctx.Bool("sync-data"),
-	}
-}
-
-// renderEnvCreatePretty 输出 4 行（pretty 模式）：
-//
-//	✓ Multi-env initialized
-//	Environments: dev, online
-//	Data synced: yes
-//	Note: structure changes in dev now need to be released to online.
-func renderEnvCreatePretty(w io.Writer, data map[string]interface{}) {
-	fmt.Fprintln(w, "✓ Multi-env initialized")
-
-	if envs, ok := data["environments"].([]interface{}); ok && len(envs) > 0 {
-		names := make([]string, 0, len(envs))
-		for _, e := range envs {
-			if s, ok := e.(string); ok {
-				names = append(names, s)
-			}
-		}
-		fmt.Fprintf(w, "Environments: %s\n", strings.Join(names, ", "))
-	}
-
-	synced := "no"
-	if ds, ok := data["data_synced"].(bool); ok && ds {
-		synced = "yes"
-	}
-	fmt.Fprintf(w, "Data synced: %s\n", synced)
-
-	fmt.Fprintln(w, "Note: structure changes in dev now need to be released to online.")
-}
--- a/shortcuts/apps/apps_db_env_create_test.go
+++ b/shortcuts/apps/apps_db_env_create_test.go
@@ -1,124 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-func TestAppsDBEnvCreate_WithYesPostsSyncData(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/db_dev_init", // URL 仍走 db_dev_init，CLI 命令名 +db-env-create
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"status":       "initialized",
-				"environments": []interface{}{"dev", "online"},
-				"data_synced":  true,
-			},
-		},
-	}
-	reg.Register(stub)
-	if err := runAppsShortcut(t, AppsDBEnvCreate,
-		[]string{"+db-env-create", "--app-id", "app_x", "--env", "dev", "--sync-data", "--yes", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-
-	var sent map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &sent); err != nil {
-		t.Fatalf("decode body: %v", err)
-	}
-	if sent["sync_data"] != true {
-		t.Fatalf("body.sync_data = %v (want true)", sent["sync_data"])
-	}
-	if !strings.Contains(stdout.String(), "initialized") {
-		t.Fatalf("stdout should include status, got %s", stdout.String())
-	}
-}
-
-// 不传 --sync-data（默认）→ body.sync_data=false
-func TestAppsDBEnvCreate_SyncDataFalseByDefault(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	stub := &httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/db_dev_init",
-		Body:   map[string]interface{}{"code": 0, "data": map[string]interface{}{"status": "initialized"}},
-	}
-	reg.Register(stub)
-	if err := runAppsShortcut(t, AppsDBEnvCreate,
-		[]string{"+db-env-create", "--app-id", "app_x", "--env", "dev", "--yes", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	var sent map[string]interface{}
-	if err := json.Unmarshal(stub.CapturedBody, &sent); err != nil {
-		t.Fatalf("decode body: %v", err)
-	}
-	if sent["sync_data"] != false {
-		t.Fatalf("body.sync_data = %v (want false by default)", sent["sync_data"])
-	}
-}
-
-func TestAppsDBEnvCreate_PrettyEmitsAllFourLines(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/db_dev_init",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"status":       "initialized",
-				"environments": []interface{}{"dev", "online"},
-				"data_synced":  true,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBEnvCreate,
-		[]string{"+db-env-create", "--app-id", "app_x", "--env", "dev", "--sync-data", "--yes", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	wantLines := []string{
-		"✓ Multi-env initialized",
-		"Environments: dev, online",
-		"Data synced: yes",
-		"Note: structure changes in dev now need to be released to online.",
-	}
-	for _, line := range wantLines {
-		if !strings.Contains(got, line) {
-			t.Errorf("pretty output missing line %q\ngot:\n%s", line, got)
-		}
-	}
-}
-
-func TestAppsDBEnvCreate_DryRunNoConfirm(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsDBEnvCreate,
-		[]string{"+db-env-create", "--app-id", "app_x", "--env", "dev", "--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	if got := stdout.String(); !strings.Contains(got, "/open-apis/spark/v1/apps/app_x/db_dev_init") {
-		t.Fatalf("dry-run missing endpoint: %s", got)
-	}
-}
-
-// --env 只接受 dev：传 online 应被 enum 校验拒绝。
-func TestAppsDBEnvCreate_RejectsNonDevEnv(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsDBEnvCreate,
-		[]string{"+db-env-create", "--app-id", "app_x", "--env", "online", "--yes", "--as", "user"},
-		factory, stdout)
-	if err == nil || !strings.Contains(err.Error(), "env") {
-		t.Fatalf("expected env enum rejection, got %v", err)
-	}
-}
--- a/shortcuts/apps/apps_db_execute.go
+++ b/shortcuts/apps/apps_db_execute.go
@@ -1,520 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/larksuite/cli/internal/cmdutil"
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// AppsDBExecute executes SQL against a Miaoda app database.
-//
-// POST /apps/{app_id}/sql_commands，CLI 永远带 ?transactional=false 进入 DBA 模式
-// （不默认包事务、支持 DDL、result 字符串内嵌结构化 JSON）。
-//
-// pretty 渲染 6 种形态：
-//   - 单 SELECT：表格（列间两空格、列对齐填充）
-//   - 空 SELECT：`(0 rows)`
-//   - 单 DML：`✓ N row(s) <verb>`（verb 跟 sql_type：INSERT→inserted/UPDATE→updated/DELETE→deleted）
-//   - 单 DDL：`✓ DDL executed`
-//   - 多语句全部成功：逐条 `Statement K: ✓ <summary>` + 末尾 `✓ N statements executed`
-//   - 多语句部分失败：`Statement K: ✗ <message> [<code>]` + 末尾「前序语句已落地」提示
-//
-// 失败语义：server 多语句失败仍返 code:0，把失败语句标成 ERROR 哨兵塞进 result。Execute 检测到哨兵
-// 后升级成 typed api_error（exit 非 0、detail 带 statement_index / completed / rolled_back），
-// 避免 agent 误判 ok:true 假成功。CLI 永远 DBA 模式（transactional=false），失败前的语句已 auto-commit
-// 落地，故 rolled_back=false（真机 boe 实证）。
-//
-// JSON envelope（成功路径）：CLI 把 server 返的 result 字符串解出来放进 `data.results` 数组。
-//
-// Risk: high-risk-write —— SQL 可含 DML/DDL，框架对所有执行强制 --yes 确认关卡（--dry-run 预览豁免）。
-//
-// SQL 来源二选一：--sql（内联文本，或 - 读 stdin）/ --file（.sql 文件路径，受 CLI 相对路径约束）。
-// --file 在 Validate 阶段读出内容、归一化到 --sql，下游统一从 rctx.Str("sql") 取。
-var AppsDBExecute = common.Shortcut{
-	Service:     appsService,
-	Command:     "+db-execute",
-	Description: "Execute SQL (SELECT / DML / DDL) against a Miaoda app database",
-	Risk:        "high-risk-write",
-	Tips: []string{
-		`Example: lark-cli apps +db-execute --app-id <app_id> --sql "SELECT * FROM orders LIMIT 10" --yes`,
-		`Example: lark-cli apps +db-execute --app-id <app_id> --env dev --file ./migration.sql --yes`,
-		"Tip: filter fields with --jq, e.g. -q '.data.results[].sql_type'",
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app id", Required: true},
-		{Name: "sql", Desc: "SQL text; use - to read stdin. Mutually exclusive with --file",
-			Input: []string{common.Stdin}},
-		{Name: "file", Desc: "path to a .sql file (relative to cwd). Mutually exclusive with --sql"},
-		{Name: "env", Default: "dev", Enum: []string{"dev", "online"}, Desc: "target db environment (default dev; use --env online for the online environment)"},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		if _, err := requireAppID(rctx.Str("app-id")); err != nil {
-			return err
-		}
-		sql := strings.TrimSpace(rctx.Str("sql"))
-		file := strings.TrimSpace(rctx.Str("file"))
-		if sql != "" && file != "" {
-			return output.ErrValidation("--sql and --file are mutually exclusive")
-		}
-		if file != "" {
-			data, err := cmdutil.ReadInputFile(rctx.FileIO(), file)
-			if err != nil {
-				return output.ErrValidation("--file: %v", err)
-			}
-			// 归一化：把文件内容写回 --sql，下游（DryRun/Execute）统一从 sql 取。
-			rctx.Cmd.Flags().Set("sql", string(data))
-			sql = strings.TrimSpace(string(data))
-		}
-		if sql == "" {
-			return output.ErrValidation("one of --sql or --file is required (use --sql - to read stdin)")
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID, _ := requireAppID(rctx.Str("app-id"))
-		return common.NewDryRunAPI().
-			POST(appSQLPath(appID)).
-			Desc("Execute SQL on Miaoda app database").
-			Params(buildDBSQLParams(rctx)).
-			Body(buildDBSQLBody(rctx))
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID, err := requireAppID(rctx.Str("app-id"))
-		if err != nil {
-			return err
-		}
-		raw, err := rctx.CallAPITyped("POST", appSQLPath(appID),
-			buildDBSQLParams(rctx),
-			buildDBSQLBody(rctx))
-		if err != nil {
-			return withAppsHint(err, "verify table/column names with `lark-cli apps +db-table-get --app-id "+appID+" --table <table>`; for day-to-day debugging target the dev database with `--env dev`")
-		}
-
-		// server `result: string` 内嵌结构化数组 —— CLI 解出来放进 envelope 的 data.results，
-		// 让 json/pretty 路径都基于同一份反序列化产物渲染。
-		stmts := parseSQLResult(common.GetString(raw, "result"))
-		// 注意：data.results 在 json（默认）路径下原样透出全部行，CLI 侧不再二次截断。
-		// 这不是无界 token 黑洞 —— server 对单条 SELECT 结果集有 1000 行硬上限，超出会直接
-		// 返报错（而非静默截断）。需要更大结果集时请在 SQL 里显式 LIMIT/分页，由调用方控制规模。
-		data := map[string]interface{}{"results": stmts}
-
-		// 多语句 / 单语句失败：server 仍返 code:0，把失败语句标成 ERROR 哨兵塞进 result。
-		// 升级成 typed api_error（exit 非 0），别让 agent 误判 ok:true 假成功。
-		// pretty 模式仍把逐条 ✓/✗ 摘要打到 stdout（人看），再返回 error（envelope→stderr）。
-		if errIdx, errStmt, failed := findErrorSentinel(stmts); failed {
-			if rctx.Format == "pretty" {
-				renderSQLPretty(rctx.IO().Out, stmts)
-			}
-			return sqlStatementError(stmts, errIdx, errStmt)
-		}
-
-		rctx.OutFormat(data, nil, func(w io.Writer) {
-			renderSQLPretty(w, stmts)
-		})
-		return nil
-	},
-}
-
-// findErrorSentinel 在 statements 里找 ERROR 哨兵（server 失败时追加在失败语句位置）。
-// 返回失败语句下标（0-based）、该 ERROR statement、是否命中。
-func findErrorSentinel(stmts []map[string]interface{}) (int, map[string]interface{}, bool) {
-	for i, s := range stmts {
-		if common.GetString(s, "sql_type") == "ERROR" {
-			return i, s, true
-		}
-	}
-	return 0, nil, false
-}
-
-// sqlStatementError 把 ERROR 哨兵升级成 typed api_error。
-//
-// CLI 永远 DBA 模式（transactional=false），真机 boe 实证：失败语句之前的语句已逐条 auto-commit
-// 落地，不存在外层事务回滚。因此 rolled_back=false、completed 列出已落地的前序语句，hint 提示用户
-// 别整批重跑（否则会重复写入）。
-func sqlStatementError(stmts []map[string]interface{}, errIdx int, errStmt map[string]interface{}) error {
-	code, msg := parseErrorSentinel(common.GetString(errStmt, "data"))
-	stmtNo := errIdx + 1 // 1-based 给人看
-	fullMsg := fmt.Sprintf("%s (at statement %d of %d)", msg, stmtNo, len(stmts))
-
-	apiErr := output.ErrAPI(code, fullMsg, map[string]interface{}{
-		"statement_index": errIdx,
-		"completed":       stmts[:errIdx],
-		"rolled_back":     false,
-	})
-	if apiErr.Detail != nil {
-		if errIdx > 0 {
-			apiErr.Detail.Hint = fmt.Sprintf(
-				"statements 1-%d were already applied (DBA mode auto-commits each statement); fix statement %d and re-run only the remaining statements.",
-				errIdx, stmtNo)
-		} else {
-			apiErr.Detail.Hint = "no statements were applied; fix the SQL and re-run."
-		}
-	}
-	return apiErr
-}
-
-// parseErrorSentinel 解析 ERROR 哨兵的 data（`{code,message}` JSON），返回数值 code 与 message。
-// code 兼容 int / "k_dl_1300002" / 数字字符串多形态（复用 codeString），解析失败回退 0 / 原文。
-func parseErrorSentinel(data string) (int, string) {
-	if data == "" {
-		return 0, "(unknown error)"
-	}
-	var e struct {
-		Code    interface{} `json:"code"`
-		Message string      `json:"message"`
-	}
-	if err := json.Unmarshal([]byte(data), &e); err != nil {
-		return 0, data
-	}
-	code := 0
-	if cs := codeString(e.Code); cs != "" {
-		if n, convErr := strconv.Atoi(cs); convErr == nil {
-			code = n
-		}
-	}
-	if e.Message == "" {
-		return code, "(unknown error)"
-	}
-	return code, e.Message
-}
-
-// buildDBSQLParams 构造 sql 接口的 query：env + 强制 transactional=false（DBA 模式）。
-//
-// CLI 永远走 DBA 模式，原子性由用户在 SQL 内显式 BEGIN/COMMIT 控制；不暴露 transactional flag 给用户。
-func buildDBSQLParams(rctx *common.RuntimeContext) map[string]interface{} {
-	return map[string]interface{}{
-		"env":           rctx.Str("env"),
-		"transactional": false,
-	}
-}
-
-// buildDBSQLBody 构造 sql 接口的 body：仅 sql（来源由 Validate 归一化到 --sql）。
-func buildDBSQLBody(rctx *common.RuntimeContext) map[string]interface{} {
-	return map[string]interface{}{
-		"sql": rctx.Str("sql"),
-	}
-}
-
-// parseSQLResult 从 server result 字符串反序列化出 statements 数组，兼容两种 wire 形态：
-//
-//  1. 结构化形态：`[{"sql_type":"SELECT","data":"[...]","record_count":N}, ...]`
-//     —— 每条 statement 含 sql_type / data / record_count / affected_rows 元数据。
-//
-//  2. 字符串数组形态：`["[{...rows...}]", "", ...]`
-//     —— 每条 statement 一个字符串：SELECT 是 rows JSON、DML/DDL 是空串；
-//     无 sql_type 元数据，CLI 端按内容形态推断（SELECT vs OK）。
-//
-// 解析失败时返回单元素 fallback `{sql_type:"RAW", data:resultStr}`，pretty 路径原样打。
-func parseSQLResult(resultStr string) []map[string]interface{} {
-	if resultStr == "" {
-		return nil
-	}
-
-	// 形态 1：结构化数组（每元素是 object）
-	var structured []map[string]interface{}
-	if err := json.Unmarshal([]byte(resultStr), &structured); err == nil && isStructuredResult(structured) {
-		return structured
-	}
-
-	// 形态 2：字符串数组（每元素是 rows JSON 或 ""）
-	var legacy []string
-	if err := json.Unmarshal([]byte(resultStr), &legacy); err == nil {
-		out := make([]map[string]interface{}, 0, len(legacy))
-		for _, rowsJSON := range legacy {
-			out = append(out, normalizeLegacyStatement(rowsJSON))
-		}
-		return out
-	}
-
-	return []map[string]interface{}{{"sql_type": "RAW", "data": resultStr}}
-}
-
-// isStructuredResult 判断反序列化出来的 []map 是不是新形态：第一条元素含 sql_type 字段。
-// 兼容场景：[]map 反序列化 legacy `[""]` 可能也能成（空 map），用 sql_type 存在性区分。
-func isStructuredResult(stmts []map[string]interface{}) bool {
-	if len(stmts) == 0 {
-		return false
-	}
-	_, ok := stmts[0]["sql_type"]
-	return ok
-}
-
-// normalizeLegacyStatement 把 legacy wire 一个字符串元素转成跟新形态一致的 map。
-// 推断规则：data 是非空 rows 数组 → sql_type=SELECT；空串 / 空数组 → sql_type=OK（DML/DDL 老 wire 不可分）。
-func normalizeLegacyStatement(rowsJSON string) map[string]interface{} {
-	stmt := map[string]interface{}{
-		"sql_type": "OK",
-		"data":     rowsJSON,
-	}
-	trimmed := strings.TrimSpace(rowsJSON)
-	if trimmed == "" || trimmed == "null" {
-		return stmt
-	}
-	var rows []interface{}
-	if err := json.Unmarshal([]byte(trimmed), &rows); err != nil {
-		// 非 JSON 数组（理论上 server 不会返这种），按原样保留 sql_type=OK
-		return stmt
-	}
-	// 是 JSON 数组 → 视作 SELECT，含 record_count
-	stmt["sql_type"] = "SELECT"
-	stmt["record_count"] = float64(len(rows))
-	return stmt
-}
-
-// renderSQLPretty 按 statements 数量分单条 / 多条两种渲染路径。
-func renderSQLPretty(w io.Writer, stmts []map[string]interface{}) {
-	if len(stmts) == 0 {
-		fmt.Fprintln(w, "(empty result)")
-		return
-	}
-	if len(stmts) == 1 {
-		renderSingleStatementPretty(w, stmts[0])
-		return
-	}
-	renderMultiStatementPretty(w, stmts)
-}
-
-// renderSingleStatementPretty 单条 statement pretty（无 Statement header）。
-func renderSingleStatementPretty(w io.Writer, s map[string]interface{}) {
-	sqlType := common.GetString(s, "sql_type")
-	switch {
-	case sqlType == "SELECT":
-		renderSelectRowsAsTable(w, common.GetString(s, "data"))
-	case sqlType == "ERROR":
-		// 单条就挂的极端场景：直接打 ERROR 行（跟多语句失败的最后一行格式一致）。
-		fmt.Fprintln(w, "✗ "+errorSummary(common.GetString(s, "data")))
-	case isDMLType(sqlType):
-		// 结构化 wire 下 INSERT / UPDATE / DELETE / MERGE：✓ N row(s) <verb>
-		fmt.Fprintln(w, "✓ "+dmlSummary(sqlType, s["affected_rows"]))
-	case sqlType == "OK":
-		// legacy wire 下 DML / DDL 都映射成 OK（老 wire 不带 sql_type 元数据，无法区分动词 / 行数）
-		fmt.Fprintln(w, "✓ ok")
-	default:
-		// 其余皆 DDL：真机 boe 返细粒度动词 CREATE_TABLE / DROP_TABLE / ALTER_TABLE / TRUNCATE 等。
-		fmt.Fprintln(w, "✓ DDL executed")
-	}
-}
-
-// renderMultiStatementPretty 多条 statement pretty：
-//   - 每条用 "Statement K: ✓ <summary>" / "Statement K: ✗ <error> [<code>]"
-//   - SELECT 用 "Statement K: SELECT (N row(s))" 头 + 紧跟表格
-//   - 末尾汇总：全部成功 "✓ N statements executed"；遇 ERROR 哨兵打「前序语句已落地」提示
-//     （DBA 模式不回滚），失败本身由 Execute 升级成 typed error（exit 非 0）
-func renderMultiStatementPretty(w io.Writer, stmts []map[string]interface{}) {
-	failedIdx := -1
-	successCount := 0
-	for i, s := range stmts {
-		sqlType := common.GetString(s, "sql_type")
-		idx := i + 1
-		switch {
-		case sqlType == "ERROR":
-			fmt.Fprintf(w, "Statement %d: ✗ %s\n", idx, errorSummary(common.GetString(s, "data")))
-			failedIdx = i
-		case sqlType == "SELECT":
-			rc := intOrZero(s["record_count"])
-			fmt.Fprintf(w, "Statement %d: SELECT (%d row%s)\n", idx, rc, plural(rc))
-			renderSelectRowsAsTable(w, common.GetString(s, "data"))
-			successCount++
-		case isDMLType(sqlType):
-			fmt.Fprintf(w, "Statement %d: ✓ %s\n", idx, dmlSummary(sqlType, s["affected_rows"]))
-			successCount++
-		case sqlType == "OK":
-			fmt.Fprintf(w, "Statement %d: ✓ ok\n", idx)
-			successCount++
-		default:
-			// DDL 族：CREATE_TABLE / DROP_TABLE / ALTER_TABLE / TRUNCATE / CREATE_INDEX ...
-			fmt.Fprintf(w, "Statement %d: ✓ DDL executed\n", idx)
-			successCount++
-		}
-		if i < len(stmts)-1 {
-			fmt.Fprintln(w) // statements 间留空行
-		}
-	}
-	fmt.Fprintln(w)
-	if failedIdx >= 0 {
-		// CLI 永远 DBA 模式（transactional=false），失败语句之前的语句已 auto-commit 落地，
-		// 不存在整批回滚 —— 如实告诉用户，避免整批重跑导致重复写入。
-		if successCount > 0 {
-			fmt.Fprintf(w, "(statement %d failed; %d statement%s before it already applied — DBA mode auto-commits each)\n",
-				failedIdx+1, successCount, plural(int64(successCount)))
-		} else {
-			fmt.Fprintf(w, "(statement %d failed; no statements applied)\n", failedIdx+1)
-		}
-	} else {
-		fmt.Fprintf(w, "✓ %d statements executed\n", successCount)
-	}
-}
-
-// renderSelectRowsAsTable 把 SELECT 的 data（rows JSON 数组字符串）解析并渲染成对齐表格。
-// 空结果输出 "(0 rows)"。
-func renderSelectRowsAsTable(w io.Writer, dataJSON string) {
-	if dataJSON == "" || dataJSON == "[]" {
-		fmt.Fprintln(w, "(0 rows)")
-		return
-	}
-	var rows []map[string]interface{}
-	if err := json.Unmarshal([]byte(dataJSON), &rows); err != nil {
-		// 数据不符合预期 schema —— 原样打 fallback。
-		fmt.Fprintln(w, dataJSON)
-		return
-	}
-	if len(rows) == 0 {
-		fmt.Fprintln(w, "(0 rows)")
-		return
-	}
-	headers := collectColumns(rows)
-	cells := make([][]string, 0, len(rows))
-	for _, row := range rows {
-		line := make([]string, 0, len(headers))
-		for _, h := range headers {
-			line = append(line, cellString(row[h]))
-		}
-		cells = append(cells, line)
-	}
-	renderAlignedTable(w, headers, cells)
-}
-
-// collectColumns 按首行字段顺序收集列名；首行 key 顺序由 encoding/json 反序列化决定（map 无序），
-// 排序后保证输出稳定。列顺序在示例里跟 SQL SELECT 顺序一致——但 Go encoding/json 反序列化丢列序，
-// 这里按字典序保证可重现，agent / 测试可稳定 assert。
-func collectColumns(rows []map[string]interface{}) []string {
-	set := map[string]struct{}{}
-	for _, r := range rows {
-		for k := range r {
-			set[k] = struct{}{}
-		}
-	}
-	cols := make([]string, 0, len(set))
-	for k := range set {
-		cols = append(cols, k)
-	}
-	sort.Strings(cols)
-	return cols
-}
-
-// cellString 把任意 JSON value 转字符串显示（null → 空串；非字符串/数字 → JSON 编码）。
-func cellString(v interface{}) string {
-	switch x := v.(type) {
-	case nil:
-		return ""
-	case string:
-		return x
-	case bool:
-		if x {
-			return "true"
-		}
-		return "false"
-	case float64:
-		// 整数值不输出小数（id=101 而不是 101.000000）。
-		if x == float64(int64(x)) {
-			return fmt.Sprintf("%d", int64(x))
-		}
-		return fmt.Sprintf("%g", x)
-	}
-	b, err := json.Marshal(v)
-	if err != nil {
-		return fmt.Sprintf("%v", v)
-	}
-	return string(b)
-}
-
-// dmlSummary 把 sql_type + affected_rows 渲染成 "N row(s) <verb>" 字符串。
-//
-// 动词映射：INSERT → inserted / UPDATE → updated / DELETE → deleted / MERGE → merged。
-// 未知 sql_type 默认 "affected"。
-func dmlSummary(sqlType string, affectedRows interface{}) string {
-	n := intOrZero(affectedRows)
-	verb := dmlVerb(sqlType)
-	return fmt.Sprintf("%d row%s %s", n, plural(n), verb)
-}
-
-// isDMLType 判断 sql_type 是否是行级 DML（带 affected_rows 语义）。
-// 真机 boe wire：SELECT 走表格、INSERT/UPDATE/DELETE/MERGE 走行数摘要、其余（CREATE_TABLE /
-// DROP_TABLE / ALTER_TABLE / TRUNCATE / CREATE_INDEX ...）一律按 DDL 处理。
-func isDMLType(sqlType string) bool {
-	switch strings.ToUpper(sqlType) {
-	case "INSERT", "UPDATE", "DELETE", "MERGE":
-		return true
-	}
-	return false
-}
-
-func dmlVerb(sqlType string) string {
-	switch strings.ToUpper(sqlType) {
-	case "INSERT":
-		return "inserted"
-	case "UPDATE":
-		return "updated"
-	case "DELETE":
-		return "deleted"
-	case "MERGE":
-		return "merged"
-	}
-	return "affected"
-}
-
-func plural(n int64) string {
-	if n == 1 {
-		return ""
-	}
-	return "s"
-}
-
-// errorSummary 从 ERROR 哨兵的 data 字段（{code, message} JSON）解析出 "message [code]" 形态。
-// 解析失败时回退到原文。
-func errorSummary(data string) string {
-	if data == "" {
-		return "(unknown error)"
-	}
-	var e struct {
-		Code    interface{} `json:"code"`
-		Message string      `json:"message"`
-	}
-	if err := json.Unmarshal([]byte(data), &e); err != nil {
-		return data
-	}
-	codeStr := codeString(e.Code)
-	if codeStr != "" {
-		return fmt.Sprintf("%s [%s]", e.Message, codeStr)
-	}
-	return e.Message
-}
-
-// codeString 处理 code 字段在 wire 上可能是 int / "k_dl_1300015" / 数字字符串等多形态。
-func codeString(c interface{}) string {
-	switch x := c.(type) {
-	case nil:
-		return ""
-	case string:
-		// "k_dl_1300015" → 抽 1300015；纯数字保持原样。
-		if strings.HasPrefix(x, "k_dl_") {
-			return strings.TrimPrefix(x, "k_dl_")
-		}
-		return x
-	case float64:
-		return fmt.Sprintf("%d", int64(x))
-	}
-	return ""
-}
-
-// intOrZero 把 JSON number 转 int64；nil / 类型不匹配返回 0。
-func intOrZero(raw interface{}) int64 {
-	if n, ok := numericAsFloat(raw); ok {
-		return int64(n)
-	}
-	return 0
-}
--- a/shortcuts/apps/apps_db_execute_test.go
+++ b/shortcuts/apps/apps_db_execute_test.go
@@ -1,797 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"encoding/json"
-	"errors"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/httpmock"
-	"github.com/larksuite/cli/internal/output"
-)
-
-func TestAppsDBExecute_SingleSELECTJSONEnvelopeWrapsResults(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				// DBA 模式 result：结构化数组 JSON 字符串
-				"result": `[{"sql_type":"SELECT","data":"[{\"id\":101,\"total_cents\":2500}]","record_count":1}]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "select 1", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	// JSON envelope 应该把 result 字符串 parse 之后放进 data.results
-	var env struct {
-		Data struct {
-			Results []map[string]interface{} `json:"results"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &env); err != nil {
-		t.Fatalf("decode envelope: %v\n%s", err, stdout.String())
-	}
-	if len(env.Data.Results) != 1 {
-		t.Fatalf("data.results = %d items (want 1)", len(env.Data.Results))
-	}
-	if env.Data.Results[0]["sql_type"] != "SELECT" {
-		t.Fatalf("results[0].sql_type = %v", env.Data.Results[0]["sql_type"])
-	}
-}
-
-func TestAppsDBExecute_DryRunSendsTransactionalFalse(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "select 1", "--env", "dev", "--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	var env struct {
-		API []struct {
-			Method string                 `json:"method"`
-			URL    string                 `json:"url"`
-			Body   map[string]interface{} `json:"body"`
-			Params map[string]interface{} `json:"params"`
-		} `json:"api"`
-	}
-	if err := json.Unmarshal([]byte(stdout.String()), &env); err != nil {
-		t.Fatalf("decode: %v\n%s", err, stdout.String())
-	}
-	if env.API[0].Method != "POST" || env.API[0].URL != "/open-apis/spark/v1/apps/app_x/sql_commands" {
-		t.Fatalf("method/url = %s %s", env.API[0].Method, env.API[0].URL)
-	}
-	if env.API[0].Body["sql"] != "select 1" {
-		t.Fatalf("body.sql = %v", env.API[0].Body["sql"])
-	}
-	if env.API[0].Params["env"] != "dev" {
-		t.Fatalf("params.env = %v", env.API[0].Params["env"])
-	}
-	if env.API[0].Params["transactional"] != false {
-		t.Fatalf("params.transactional = %v (want false, CLI is DBA mode)", env.API[0].Params["transactional"])
-	}
-	if _, ok := env.API[0].Body["transactional"]; ok {
-		t.Fatalf("transactional should NOT be in body, got body=%v", env.API[0].Body)
-	}
-}
-
-func TestAppsDBExecute_RejectsEmptySQL(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "   ", "--as", "user"}, factory, stdout)
-	if err == nil || !strings.Contains(err.Error(), "--sql or --file") {
-		t.Fatalf("expected empty-sql error, got %v", err)
-	}
-}
-
-// --sql 与 --file 互斥
-func TestAppsDBExecute_RejectsSQLAndFileTogether(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "SELECT 1", "--file", "x.sql", "--as", "user"}, factory, stdout)
-	if err == nil || !strings.Contains(err.Error(), "mutually exclusive") {
-		t.Fatalf("expected mutual-exclusion error, got %v", err)
-	}
-}
-
-// --file 读取相对路径 .sql 文件 → 内容进 body.sql（dry-run 验证）
-func TestAppsDBExecute_FileReadsSQLIntoBody(t *testing.T) {
-	dir := t.TempDir()
-	sqlPath := filepath.Join(dir, "m.sql")
-	if err := os.WriteFile(sqlPath, []byte("SELECT 42 AS answer;\n"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	// 切到临时目录，使相对路径校验通过（CLI 仅接受 cwd 内相对路径）。
-	// 用 os.Chdir + 还原而非 t.Chdir：后者要 Go 1.24，本仓库 go.mod 为 1.23。
-	oldWD, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Chdir(dir); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { _ = os.Chdir(oldWD) })
-
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--app-id", "app_x", "--env", "dev", "--file", "m.sql", "--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	var env struct {
-		API []struct {
-			Body map[string]interface{} `json:"body"`
-		} `json:"api"`
-	}
-	if err := json.Unmarshal([]byte(stdout.String()), &env); err != nil {
-		t.Fatalf("decode: %v\n%s", err, stdout.String())
-	}
-	if env.API[0].Body["sql"] != "SELECT 42 AS answer;\n" {
-		t.Fatalf("body.sql = %v, want file content", env.API[0].Body["sql"])
-	}
-}
-
-// ============================================================================
-// legacy wire 形态测试 —— BOE server 实测返这种 ["rows-json-string", ...]
-// 形态而非 spec 里的 [{sql_type, data, ...}]，CLI 端必须兼容。
-// 输入用 BOE 真实抓包数据（test_scripts/boe_e2e/run.log）。
-// ============================================================================
-
-func TestAppsDBExecute_LegacyWireSingleSelect(t *testing.T) {
-	// BOE 实测：SELECT 1 AS x  →  result: "[\"[{\\\"x\\\":1}]\"]"
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `["[{\"x\":1}]"]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "SELECT 1 AS x", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	if !strings.Contains(got, "x") {
-		t.Errorf("missing header 'x':\n%s", got)
-	}
-	if !strings.Contains(got, "1") {
-		t.Errorf("missing value row '1':\n%s", got)
-	}
-	// 不应回退到 RAW
-	if strings.Contains(got, "RAW") || strings.Contains(got, "[\\\"") {
-		t.Errorf("should not fall back to RAW or raw-string passthrough:\n%s", got)
-	}
-}
-
-func TestAppsDBExecute_LegacyWireSingleSelectJSONEnvelope(t *testing.T) {
-	// 验证 JSON envelope 也把 legacy result 正确归一化进 data.results
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `["[{\"x\":1}]"]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "SELECT 1 AS x", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	var env struct {
-		Data struct {
-			Results []map[string]interface{} `json:"results"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal(stdout.Bytes(), &env); err != nil {
-		t.Fatalf("decode: %v\n%s", err, stdout.String())
-	}
-	if len(env.Data.Results) != 1 {
-		t.Fatalf("results length = %d, want 1; got: %v", len(env.Data.Results), env.Data.Results)
-	}
-	if env.Data.Results[0]["sql_type"] != "SELECT" {
-		t.Fatalf("results[0].sql_type = %v, want SELECT", env.Data.Results[0]["sql_type"])
-	}
-	if env.Data.Results[0]["record_count"] != float64(1) {
-		t.Fatalf("results[0].record_count = %v, want 1", env.Data.Results[0]["record_count"])
-	}
-}
-
-func TestAppsDBExecute_LegacyWireMultiSelect(t *testing.T) {
-	// BOE 实测：SELECT 1; SELECT 2  →  result: "[\"[{\\\"?column?\\\":1}]\",\"[{\\\"?column?\\\":2}]\"]"
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `["[{\"?column?\":1}]","[{\"?column?\":2}]"]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "SELECT 1; SELECT 2;", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	// 多语句应有 Statement N: header
-	if !strings.Contains(got, "Statement 1: SELECT") || !strings.Contains(got, "Statement 2: SELECT") {
-		t.Errorf("missing Statement headers:\n%s", got)
-	}
-	// 末尾应有 ✓ N statements executed
-	if !strings.Contains(got, "✓ 2 statements executed") {
-		t.Errorf("missing summary line:\n%s", got)
-	}
-}
-
-func TestAppsDBExecute_LegacyWireDDLEmptyResult(t *testing.T) {
-	// BOE 实测：CREATE TABLE  →  result: "" （空字符串，无 rows）
-	// 老 wire 不区分 DDL/DML/无返回，统一标 "ok"
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": ``, // 空字符串
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "CREATE TABLE foo (id INT)", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	// result="" 触发 parseSQLResult 返 nil → renderSQLPretty 输出 "(empty result)"
-	if !strings.Contains(got, "(empty result)") {
-		t.Errorf("expected '(empty result)' for empty result string, got:\n%s", got)
-	}
-}
-
-func TestAppsDBExecute_LegacyWireMultiSelectWithRealTable(t *testing.T) {
-	// BOE 实测真实表抓包（course 表第一行）：复杂 JSON 含 CJK / timestamp / uuid 字段
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `["[{\"id\":\"abc-123\",\"title\":\"高效沟通\",\"capacity\":30}]"]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "SELECT id,title,capacity FROM course LIMIT 1", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	// 验证 CJK / uuid / int 都能正确显示在表格里
-	for _, want := range []string{"id", "title", "capacity", "abc-123", "高效沟通", "30"} {
-		if !strings.Contains(got, want) {
-			t.Errorf("missing %q in pretty output:\n%s", want, got)
-		}
-	}
-}
-
-// pretty 单 SELECT：表格输出，列间两空格，无 Statement header。
-func TestAppsDBExecute_PrettySingleSelectTable(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `[{"sql_type":"SELECT","data":"[{\"id\":101,\"total_cents\":2500},{\"id\":102,\"total_cents\":1800}]","record_count":2}]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "select", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	if strings.Contains(got, "Statement 1:") {
-		t.Errorf("single statement pretty should NOT have Statement header\noutput:\n%s", got)
-	}
-	// 列按字典序排序：id / total_cents
-	if !strings.Contains(got, "id   total_cents") {
-		t.Errorf("missing header row\noutput:\n%s", got)
-	}
-	if !strings.Contains(got, "101  2500") || !strings.Contains(got, "102  1800") {
-		t.Errorf("missing data rows\noutput:\n%s", got)
-	}
-}
-
-func TestAppsDBExecute_PrettyEmptySelect(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `[{"sql_type":"SELECT","data":"[]","record_count":0}]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "select", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	if !strings.Contains(stdout.String(), "(0 rows)") {
-		t.Fatalf("empty SELECT should print (0 rows), got:\n%s", stdout.String())
-	}
-}
-
-func TestAppsDBExecute_PrettySingleDMLAndDDL(t *testing.T) {
-	cases := []struct {
-		name    string
-		result  string
-		wantStr string
-	}{
-		{"INSERT_1_row", `[{"sql_type":"INSERT","data":"","affected_rows":1}]`, "✓ 1 row inserted"},
-		{"UPDATE_5_rows", `[{"sql_type":"UPDATE","data":"","affected_rows":5}]`, "✓ 5 rows updated"},
-		{"DELETE_0_rows", `[{"sql_type":"DELETE","data":"","affected_rows":0}]`, "✓ 0 rows deleted"},
-		{"DDL", `[{"sql_type":"DDL","data":"","affected_rows":0}]`, "✓ DDL executed"},
-		// 真机 boe 实测：DDL 的 sql_type 是细粒度动词（CREATE_TABLE / DROP_TABLE / ALTER_TABLE...），
-		// data 是 "[]"、无 affected_rows。必须识别为 DDL，而不是落到 dmlSummary 渲染成 "0 rows affected"。
-		{"CREATE_TABLE", `[{"sql_type":"CREATE_TABLE","data":"[]"}]`, "✓ DDL executed"},
-		{"DROP_TABLE", `[{"sql_type":"DROP_TABLE","data":"[]"}]`, "✓ DDL executed"},
-		{"ALTER_TABLE", `[{"sql_type":"ALTER_TABLE","data":"[]"}]`, "✓ DDL executed"},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			factory, stdout, reg := newAppsExecuteFactory(t)
-			reg.Register(&httpmock.Stub{
-				Method: "POST",
-				URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-				Body:   map[string]interface{}{"code": 0, "data": map[string]interface{}{"result": c.result}},
-			})
-			if err := runAppsShortcut(t, AppsDBExecute,
-				[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "x", "--format", "pretty", "--as", "user"},
-				factory, stdout); err != nil {
-				t.Fatalf("execute err=%v", err)
-			}
-			if !strings.Contains(stdout.String(), c.wantStr) {
-				t.Errorf("want %q\ngot:\n%s", c.wantStr, stdout.String())
-			}
-		})
-	}
-}
-
-func TestAppsDBExecute_PrettyMultiStatementsAllSuccess(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `[` +
-					`{"sql_type":"INSERT","data":"","affected_rows":1},` +
-					`{"sql_type":"UPDATE","data":"","affected_rows":1},` +
-					`{"sql_type":"SELECT","data":"[{\"id\":999}]","record_count":1}` +
-					`]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "x", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	for _, line := range []string{
-		"Statement 1: ✓ 1 row inserted",
-		"Statement 2: ✓ 1 row updated",
-		"Statement 3: SELECT (1 row)",
-		"✓ 3 statements executed",
-	} {
-		if !strings.Contains(got, line) {
-			t.Errorf("missing %q in pretty output\nfull:\n%s", line, got)
-		}
-	}
-}
-
-// TestAppsDBExecute_PrettyMultiStatementsDDL 钉住真机 boe 多语句 DDL 的 wire：
-// CREATE_TABLE / DROP_TABLE（data="[]"、无 affected_rows）须渲染成 "✓ DDL executed"，
-// 不能落到 dmlSummary 变成 "0 rows affected"。
-func TestAppsDBExecute_PrettyMultiStatementsDDL(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `[{"sql_type":"CREATE_TABLE","data":"[]"},{"sql_type":"DROP_TABLE","data":"[]"}]`,
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "x", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	for _, line := range []string{
-		"Statement 1: ✓ DDL executed",
-		"Statement 2: ✓ DDL executed",
-		"✓ 2 statements executed",
-	} {
-		if !strings.Contains(got, line) {
-			t.Errorf("missing %q in pretty output\nfull:\n%s", line, got)
-		}
-	}
-	if strings.Contains(got, "rows affected") {
-		t.Errorf("DDL must not render as 'rows affected'\nfull:\n%s", got)
-	}
-}
-
-func TestAppsDBExecute_PrettyMultiStatementsPartialFailureWithErrorSentinel(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `[` +
-					`{"sql_type":"INSERT","data":"","affected_rows":1},` +
-					`{"sql_type":"ERROR","data":"{\"code\":1300015,\"message\":\"syntax error at or near 'SELEC'\"}"}` +
-					`]`,
-			},
-		},
-	})
-	// pretty 失败路径：逐条 ✓/✗ 摘要照打到 stdout（人看），同时返回 typed error（exit 非 0）。
-	err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "x", "--format", "pretty", "--as", "user"},
-		factory, stdout)
-	if err == nil {
-		t.Fatalf("pretty multi-statement failure must still return a typed error; stdout:\n%s", stdout.String())
-	}
-	got := stdout.String()
-	for _, line := range []string{
-		"Statement 1: ✓ 1 row inserted",
-		"Statement 2: ✗ syntax error at or near 'SELEC' [1300015]",
-	} {
-		if !strings.Contains(got, line) {
-			t.Errorf("missing %q in pretty output\nfull:\n%s", line, got)
-		}
-	}
-	// DBA 模式（transactional=false）前序语句已 auto-commit 落地，绝不能误报「rolled back」。
-	if strings.Contains(got, "rolled back") {
-		t.Errorf("DBA mode must NOT claim rollback (prior statements persisted); got:\n%s", got)
-	}
-	if strings.Contains(got, "statements executed") {
-		t.Errorf("failed run should NOT print success summary; got:\n%s", got)
-	}
-}
-
-// TestAppsDBExecute_MultiStatementFailureReturnsTypedError 钉死「多语句失败 → typed api_error」：
-// json 默认不再打 ok:true 假成功，而是返回 *output.ExitError（type=api_error、非零 exit），
-// detail 带 statement_index / completed / rolled_back。rolled_back=false 因 CLI 永远 DBA 模式
-// （真机 boe 实证：失败前的语句已落地）。
-func TestAppsDBExecute_MultiStatementFailureReturnsTypedError(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `[` +
-					`{"sql_type":"INSERT","data":"","affected_rows":1},` +
-					`{"sql_type":"ERROR","data":"{\"code\":\"k_dl_1300002\",\"message\":\"duplicate key value violates unique constraint\"}"}` +
-					`]`,
-			},
-		},
-	})
-	err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "x", "--as", "user"},
-		factory, stdout)
-	if err == nil {
-		t.Fatalf("multi-statement failure must return a typed error; stdout:\n%s", stdout.String())
-	}
-	// json 失败路径不得打成功 envelope。
-	if strings.Contains(stdout.String(), `"ok": true`) {
-		t.Errorf("must not emit ok:true success envelope on failure; stdout:\n%s", stdout.String())
-	}
-	var exitErr *output.ExitError
-	if !errors.As(err, &exitErr) || exitErr.Detail == nil {
-		t.Fatalf("want *output.ExitError with detail, got %T: %v", err, err)
-	}
-	if exitErr.Detail.Type != "api_error" {
-		t.Errorf("error.type = %q, want api_error", exitErr.Detail.Type)
-	}
-	if exitErr.Detail.Code != 1300002 {
-		t.Errorf("error.code = %d, want 1300002", exitErr.Detail.Code)
-	}
-	if !strings.Contains(exitErr.Detail.Message, "(at statement 2 of 2)") {
-		t.Errorf("error.message missing statement locator: %q", exitErr.Detail.Message)
-	}
-	if output.ExitCodeOf(err) != output.ExitAPI {
-		t.Errorf("exit = %d, want %d (ExitAPI)", output.ExitCodeOf(err), output.ExitAPI)
-	}
-	detail, ok := exitErr.Detail.Detail.(map[string]interface{})
-	if !ok {
-		t.Fatalf("error.detail not a map: %T", exitErr.Detail.Detail)
-	}
-	if detail["statement_index"] != 1 {
-		t.Errorf("statement_index = %v, want 1", detail["statement_index"])
-	}
-	if detail["rolled_back"] != false {
-		t.Errorf("rolled_back = %v, want false (DBA mode persists prior statements)", detail["rolled_back"])
-	}
-	if completed, ok := detail["completed"].([]map[string]interface{}); !ok || len(completed) != 1 {
-		t.Errorf("completed = %v, want 1 persisted statement", detail["completed"])
-	}
-}
-
-// TestAppsDBExecute_SingleErrorReturnsTypedError 单条语句失败（server 也返 code:0 + ERROR 哨兵）
-// 同样升级成 typed error：statement_index=0、completed 空、message 标注 (at statement 1 of 1)。
-func TestAppsDBExecute_SingleErrorReturnsTypedError(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/sql_commands",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"result": `[{"sql_type":"ERROR","data":"{\"code\":\"k_dl_000002\",\"message\":\"syntax error at or near 'SELEC'\"}"}]`,
-			},
-		},
-	})
-	err := runAppsShortcut(t, AppsDBExecute,
-		[]string{"+db-execute", "--yes", "--app-id", "app_x", "--sql", "x", "--as", "user"},
-		factory, stdout)
-	if err == nil {
-		t.Fatalf("single ERROR sentinel must return a typed error; stdout:\n%s", stdout.String())
-	}
-	var exitErr *output.ExitError
-	if !errors.As(err, &exitErr) || exitErr.Detail == nil {
-		t.Fatalf("want *output.ExitError with detail, got %T: %v", err, err)
-	}
-	if !strings.Contains(exitErr.Detail.Message, "(at statement 1 of 1)") {
-		t.Errorf("error.message missing locator: %q", exitErr.Detail.Message)
-	}
-	detail, _ := exitErr.Detail.Detail.(map[string]interface{})
-	if detail["statement_index"] != 0 {
-		t.Errorf("statement_index = %v, want 0", detail["statement_index"])
-	}
-	if completed, ok := detail["completed"].([]map[string]interface{}); !ok || len(completed) != 0 {
-		t.Errorf("completed = %v, want empty", detail["completed"])
-	}
-}
-
-func TestCellString_AllKinds(t *testing.T) {
-	cases := []struct {
-		name string
-		in   interface{}
-		want string
-	}{
-		{"nil", nil, ""},
-		{"string", "hello", "hello"},
-		{"bool true", true, "true"},
-		{"bool false", false, "false"},
-		{"int float", float64(101), "101"},
-		{"fractional", float64(1.25), "1.25"},
-		{"object", map[string]interface{}{"a": float64(1)}, `{"a":1}`},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			if got := cellString(c.in); got != c.want {
-				t.Errorf("cellString(%v)=%q want %q", c.in, got, c.want)
-			}
-		})
-	}
-}
-
-func TestCodeString_Forms(t *testing.T) {
-	cases := []struct {
-		name string
-		in   interface{}
-		want string
-	}{
-		{"nil", nil, ""},
-		{"k_dl prefix", "k_dl_1300015", "1300015"},
-		{"plain string", "1300015", "1300015"},
-		{"float64", float64(42), "42"},
-		{"unsupported", []int{1}, ""},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			if got := codeString(c.in); got != c.want {
-				t.Errorf("codeString(%v)=%q want %q", c.in, got, c.want)
-			}
-		})
-	}
-}
-
-func TestDmlVerb_AllVerbs(t *testing.T) {
-	cases := map[string]string{
-		"INSERT":       "inserted",
-		"update":       "updated",
-		"DELETE":       "deleted",
-		"Merge":        "merged",
-		"CREATE_TABLE": "affected",
-	}
-	for in, want := range cases {
-		if got := dmlVerb(in); got != want {
-			t.Errorf("dmlVerb(%q)=%q want %q", in, got, want)
-		}
-	}
-}
-
-func TestIntOrZero_Cases(t *testing.T) {
-	if got := intOrZero(float64(5)); got != 5 {
-		t.Errorf("intOrZero(5)=%d want 5", got)
-	}
-	if got := intOrZero("x"); got != 0 {
-		t.Errorf("intOrZero(non-numeric)=%d want 0", got)
-	}
-	if got := intOrZero(nil); got != 0 {
-		t.Errorf("intOrZero(nil)=%d want 0", got)
-	}
-}
-
-func TestErrorSummary_Cases(t *testing.T) {
-	cases := []struct {
-		name, in, want string
-	}{
-		{"empty", "", "(unknown error)"},
-		{"malformed json", "not json", "not json"},
-		{"with code", `{"code":"k_dl_1300015","message":"boom"}`, "boom [1300015]"},
-		{"no code", `{"message":"plain"}`, "plain"},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			if got := errorSummary(c.in); got != c.want {
-				t.Errorf("errorSummary(%q)=%q want %q", c.in, got, c.want)
-			}
-		})
-	}
-}
-
-func TestParseErrorSentinel_Cases(t *testing.T) {
-	cases := []struct {
-		name, in string
-		wantCode int
-		wantMsg  string
-	}{
-		{"empty", "", 0, "(unknown error)"},
-		{"malformed", "xyz", 0, "xyz"},
-		{"code+msg", `{"code":"1300015","message":"boom"}`, 1300015, "boom"},
-		{"empty msg", `{"code":"1300015","message":""}`, 1300015, "(unknown error)"},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			code, msg := parseErrorSentinel(c.in)
-			if code != c.wantCode || msg != c.wantMsg {
-				t.Errorf("parseErrorSentinel(%q)=%d,%q want %d,%q", c.in, code, msg, c.wantCode, c.wantMsg)
-			}
-		})
-	}
-}
-
-func TestIsStructuredResult_Cases(t *testing.T) {
-	if !isStructuredResult([]map[string]interface{}{{"sql_type": "SELECT"}}) {
-		t.Error("expected structured=true when sql_type present")
-	}
-	if isStructuredResult([]map[string]interface{}{{}}) {
-		t.Error("expected structured=false when sql_type absent")
-	}
-	if isStructuredResult(nil) {
-		t.Error("expected structured=false for empty")
-	}
-}
-
-func TestNormalizeLegacyStatement_Cases(t *testing.T) {
-	t.Run("empty -> OK", func(t *testing.T) {
-		got := normalizeLegacyStatement("")
-		if got["sql_type"] != "OK" {
-			t.Errorf("got sql_type=%v want OK", got["sql_type"])
-		}
-	})
-	t.Run("null -> OK", func(t *testing.T) {
-		got := normalizeLegacyStatement("null")
-		if got["sql_type"] != "OK" {
-			t.Errorf("got sql_type=%v want OK", got["sql_type"])
-		}
-	})
-	t.Run("rows -> SELECT", func(t *testing.T) {
-		got := normalizeLegacyStatement(`[{"id":1}]`)
-		if got["sql_type"] != "SELECT" {
-			t.Errorf("got sql_type=%v want SELECT", got["sql_type"])
-		}
-		if got["record_count"] != float64(1) {
-			t.Errorf("got record_count=%v want 1", got["record_count"])
-		}
-	})
-	t.Run("non-json kept as OK", func(t *testing.T) {
-		got := normalizeLegacyStatement(`notjson`)
-		if got["sql_type"] != "OK" {
-			t.Errorf("got sql_type=%v want OK", got["sql_type"])
-		}
-	})
-}
-
-func TestCellString_MarshalFallback(t *testing.T) {
-	// complex128 is not switch-handled and json.Marshal rejects it →
-	// falls back to fmt.Sprintf("%v", v), which is deterministic for complex.
-	if got := cellString(complex(1, 2)); got != "(1+2i)" {
-		t.Errorf("cellString(complex)=%q want (1+2i)", got)
-	}
-}
-
-func TestRenderSingleStatementPretty_Branches(t *testing.T) {
-	cases := []struct {
-		name   string
-		stmt   map[string]interface{}
-		substr string
-	}{
-		{"select empty", map[string]interface{}{"sql_type": "SELECT", "data": "[]"}, "(0 rows)"},
-		{"error", map[string]interface{}{"sql_type": "ERROR", "data": `{"message":"boom"}`}, "✗ boom"},
-		{"dml insert", map[string]interface{}{"sql_type": "INSERT", "affected_rows": float64(3)}, "✓ 3 rows inserted"},
-		{"legacy ok", map[string]interface{}{"sql_type": "OK"}, "✓ ok"},
-		{"ddl default", map[string]interface{}{"sql_type": "CREATE_TABLE"}, "✓ DDL executed"},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			var b strings.Builder
-			renderSingleStatementPretty(&b, c.stmt)
-			if !strings.Contains(b.String(), c.substr) {
-				t.Errorf("output %q does not contain %q", b.String(), c.substr)
-			}
-		})
-	}
-}
-
-func TestRenderSelectRowsAsTable_Branches(t *testing.T) {
-	cases := []struct {
-		name   string
-		data   string
-		substr string
-	}{
-		{"empty string", "", "(0 rows)"},
-		{"empty array", "[]", "(0 rows)"},
-		{"malformed fallback", "{bad", "{bad"},
-		{"rows", `[{"id":1}]`, "id"},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			var b strings.Builder
-			renderSelectRowsAsTable(&b, c.data)
-			if !strings.Contains(b.String(), c.substr) {
-				t.Errorf("output %q does not contain %q", b.String(), c.substr)
-			}
-		})
-	}
-}
--- a/shortcuts/apps/apps_db_table_get.go
+++ b/shortcuts/apps/apps_db_table_get.go
@@ -1,87 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-const dbTableGetHint = "verify --app-id and --table are correct; list tables with `lark-cli apps +db-table-list --app-id <app_id>`; if targeting --env dev, create it first with `lark-cli apps +db-env-create --app-id <app_id> --env dev`"
-
-// AppsDBTableGet gets one table's structure (动词对齐 +db-table-list)。
-//
-// GET /apps/{app_id}/tables/{table_name}。
-//
-// `--format` 同时驱动 CLI 渲染和 server 请求形态：
-//   - `--format json`（默认）/ table / ndjson / csv：CLI 不传 format query，response 含结构化
-//     columns / indexes / constraints / stats，envelope 化输出。
-//   - `--format pretty`：CLI 给 server 带 ?format=ddl，response 含 ddl 字符串，stdout 直接打
-//     ddl 内容（无 envelope / 无表格包装）。
-var AppsDBTableGet = common.Shortcut{
-	Service:     appsService,
-	Command:     "+db-table-get",
-	Description: "Get a table's structure: columns, indexes and constraints",
-	Risk:        "read",
-	Tips: []string{
-		"Example: lark-cli apps +db-table-get --app-id <app_id> --table <table>",
-		"Tip: filter fields with --jq (json format), e.g. -q '.data.columns[].name'",
-	},
-	Scopes:    []string{"spark:app:read"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app id", Required: true},
-		{Name: "table", Desc: "table name", Required: true},
-		{Name: "env", Default: "online", Enum: []string{"dev", "online"}, Desc: "target db environment"},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		if _, err := requireAppID(rctx.Str("app-id")); err != nil {
-			return err
-		}
-		if strings.TrimSpace(rctx.Str("table")) == "" {
-			return output.ErrValidation("--table is required")
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID, _ := requireAppID(rctx.Str("app-id"))
-		return common.NewDryRunAPI().
-			GET(appTablePath(appID, strings.TrimSpace(rctx.Str("table")))).
-			Desc("Get Miaoda app db table schema").
-			Params(buildDBTableGetParams(rctx))
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID, err := requireAppID(rctx.Str("app-id"))
-		if err != nil {
-			return err
-		}
-		path := appTablePath(appID, strings.TrimSpace(rctx.Str("table")))
-		data, err := rctx.CallAPITyped("GET", path, buildDBTableGetParams(rctx), nil)
-		if err != nil {
-			return withAppsHint(err, dbTableGetHint)
-		}
-		rctx.OutFormat(data, nil, func(w io.Writer) {
-			// pretty 模式：stdout 直接打 ddl 文本（无 trailing newline，由 server 返回的字符串决定）。
-			io.WriteString(w, common.GetString(data, "ddl"))
-		})
-		return nil
-	},
-}
-
-// buildDBTableGetParams 构造 schema 接口的 query。
-//
-// CLI 检测 rctx.Format == "pretty" 时给 server 带 format=ddl，要求返 CREATE 语句文本；
-// 其他 format（含默认 json）不传该参数，让 server 返默认结构化字段。
-func buildDBTableGetParams(rctx *common.RuntimeContext) map[string]interface{} {
-	params := map[string]interface{}{"env": rctx.Str("env")}
-	if rctx.Format == "pretty" {
-		params["format"] = "ddl"
-	}
-	return params
-}
--- a/shortcuts/apps/apps_db_table_get_test.go
+++ b/shortcuts/apps/apps_db_table_get_test.go
@@ -1,131 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-func TestAppsDBTableGet_DefaultJSONReturnsStructuredFields(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/tables/orders",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"name":        "orders",
-				"description": "订单表",
-				"columns": []interface{}{
-					map[string]interface{}{
-						"name": "id", "data_type": "int8",
-						"is_primary_key": true, "is_unique": true,
-						"is_allow_null": false, "default_value": "",
-					},
-				},
-				"indexes": []interface{}{
-					map[string]interface{}{"name": "orders_pkey", "type": "btree", "columns": []interface{}{"id"}, "definition": "..."},
-				},
-				"constraints": []interface{}{
-					map[string]interface{}{"type": "primary_key", "name": "orders_pkey", "columns": []interface{}{"id"}},
-				},
-				"estimated_row_count": 1200,
-				"size_bytes":          81920,
-			},
-		},
-	})
-
-	if err := runAppsShortcut(t, AppsDBTableGet,
-		[]string{"+db-table-get", "--app-id", "app_x", "--table", "orders", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	if got := stdout.String(); !strings.Contains(got, `"name": "orders"`) {
-		t.Fatalf("stdout missing schema name: %s", got)
-	}
-}
-
-// --format pretty 是触发 DDL 模式的唯一开关。
-// 用 --format json + --dry-run 走 JSON envelope 路径方便 parse，但 query 形态由代码内部
-// 根据 rctx.Format 决定 —— 这里我们直接传 --format pretty + --dry-run，pretty 模式下 dry-run
-// 输出是 plain text 列表，用 substring 校验 format=ddl 出现在 URL query 中。
-func TestAppsDBTableGet_PrettyFormatSendsFormatDDLQuery(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsDBTableGet,
-		[]string{"+db-table-get", "--app-id", "app_x", "--table", "orders", "--format", "pretty", "--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	got := stdout.String()
-	if !strings.Contains(got, "/open-apis/spark/v1/apps/app_x/tables/orders") {
-		t.Fatalf("missing URL in dry-run output:\n%s", got)
-	}
-	if !strings.Contains(got, "format=ddl") {
-		t.Fatalf("--format=pretty should trigger ?format=ddl, got:\n%s", got)
-	}
-}
-
-func TestAppsDBTableGet_NonPrettyFormatsOmitFormatQuery(t *testing.T) {
-	// 默认 json / table / ndjson / csv 都走 schema 路径 —— CLI 不传 format query。
-	for _, format := range []string{"json", "table", "ndjson", "csv"} {
-		t.Run(format, func(t *testing.T) {
-			factory, stdout, _ := newAppsExecuteFactory(t)
-			args := []string{"+db-table-get", "--app-id", "app_x", "--table", "orders", "--format", format, "--dry-run", "--as", "user"}
-			if err := runAppsShortcut(t, AppsDBTableGet, args, factory, stdout); err != nil {
-				t.Fatalf("dry-run err=%v", err)
-			}
-			var env struct {
-				API []struct {
-					Params map[string]interface{} `json:"params"`
-				} `json:"api"`
-			}
-			if err := json.Unmarshal([]byte(stdout.String()), &env); err != nil {
-				t.Fatalf("decode: %v", err)
-			}
-			if _, ok := env.API[0].Params["format"]; ok {
-				t.Fatalf("--format=%s should omit format query, got %v", format, env.API[0].Params)
-			}
-		})
-	}
-}
-
-func TestAppsDBTableGet_PrettyOutputIsDDLTextOnly(t *testing.T) {
-	// pretty 模式 stdout 直接打 ddl 字段文本，无 envelope / 表格包装。
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	ddl := "CREATE TABLE orders (\n  id bigint NOT NULL,\n  PRIMARY KEY (id)\n);"
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/tables/orders",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{"ddl": ddl},
-		},
-	})
-
-	if err := runAppsShortcut(t, AppsDBTableGet,
-		[]string{"+db-table-get", "--app-id", "app_x", "--table", "orders", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	if !strings.Contains(got, "CREATE TABLE orders") {
-		t.Fatalf("pretty output should contain raw DDL, got:\n%s", got)
-	}
-	if strings.Contains(got, `"data":`) || strings.Contains(got, `"ddl":`) {
-		t.Fatalf("pretty output should not be JSON envelope, got:\n%s", got)
-	}
-}
-
-func TestAppsDBTableGet_RequiresTable(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsDBTableGet,
-		[]string{"+db-table-get", "--app-id", "app_x", "--as", "user"}, factory, stdout)
-	if err == nil || !strings.Contains(err.Error(), "table") {
-		t.Fatalf("expected table required error, got %v", err)
-	}
-}
--- a/shortcuts/apps/apps_db_table_list.go
+++ b/shortcuts/apps/apps_db_table_list.go
@@ -1,301 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-const dbTableListHint = "verify --app-id is correct; if targeting --env dev, create it first with `lark-cli apps +db-env-create --app-id <app_id> --env dev`"
-
-// AppsDBTableList lists tables in a Miaoda app's database.
-//
-// GET /apps/{app_id}/tables（cursor 分页），response items[] 含 estimated_row_count /
-// size_bytes optional 字段，默认返回，不必额外传 query。
-//
-// 输出裁剪：server 给每张表回完整 columns[]（与 +db-table-get 同源、内容一致）。CLI 用白名单
-// 投影（dbTableListItem）只组装产品要求字段、把 columns[] 折算成 column_count，避免逐表重复列定义
-// 放大 token、并与 +db-table-get 职责区分。完整列定义 / 索引 / 约束 / DDL 用 +db-table-get。
-//
-// pretty 渲染 5 列：name / description / estimated_row_count / size / columns（即 column_count）；
-// 列间两空格、列对齐填充、空 description 用 "—" 占位、size 按 KB/MB/GB 友好格式化。
-var AppsDBTableList = common.Shortcut{
-	Service:     appsService,
-	Command:     "+db-table-list",
-	Description: "List tables in a Miaoda app database (cursor pagination)",
-	Risk:        "read",
-	Tips: []string{
-		"Example: lark-cli apps +db-table-list --app-id <app_id>",
-		"Tip: filter fields with --jq, e.g. -q '.data.items[].name'",
-	},
-	Scopes:    []string{"spark:app:read"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app id", Required: true},
-		{Name: "env", Default: "online", Enum: []string{"dev", "online"}, Desc: "target db environment"},
-		{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 {
-		_, err := requireAppID(rctx.Str("app-id"))
-		return err
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID, _ := requireAppID(rctx.Str("app-id"))
-		return common.NewDryRunAPI().
-			GET(appTablesPath(appID)).
-			Desc("List Miaoda app db tables").
-			Params(buildDBTableListParams(rctx))
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID, err := requireAppID(rctx.Str("app-id"))
-		if err != nil {
-			return err
-		}
-		data, err := rctx.CallAPITyped("GET", appTablesPath(appID), buildDBTableListParams(rctx), nil)
-		if err != nil {
-			return withAppsHint(err, dbTableListHint)
-		}
-		// 白名单投影：只把产品要求的字段组装进 dbTableListItem，替换 server 原始 items[]。
-		// server 给每张表回完整 columns[]（与 +db-table-get 同源、逐字节一致），在 list 里逐表
-		// 重复既放大 token 又与 schema 职责重叠。这里用白名单而非 delete 黑名单 —— server 后续新增
-		// 字段不会自动泄漏进 CLI 输出。需要完整列定义 / 索引 / 约束 / DDL 用 +db-table-get。
-		items := projectTableListItems(data["items"])
-		data["items"] = items
-		rctx.OutFormat(data, nil, func(w io.Writer) {
-			renderTableListPretty(w, items)
-		})
-		return nil
-	},
-}
-
-// dbTableListItem 是 +db-table-list 对外输出的「产品要求字段」白名单。
-// 改字段在此处增删即可，无需在 Execute 里逐个 delete server 返回的多余字段。
-type dbTableListItem struct {
-	Name              string      `json:"name"`
-	Description       string      `json:"description"`
-	EstimatedRowCount interface{} `json:"estimated_row_count,omitempty"`
-	SizeBytes         interface{} `json:"size_bytes,omitempty"`
-	ColumnCount       int         `json:"column_count"`
-}
-
-// projectTableListItems 把 server 原始 items[]（map）投影成白名单 dbTableListItem 切片。
-// column_count 由 server 返回的 columns[] 长度派生（随后 columns[] 不再透出）。
-func projectTableListItems(raw interface{}) []dbTableListItem {
-	arr, _ := raw.([]interface{})
-	out := make([]dbTableListItem, 0, len(arr))
-	for _, it := range arr {
-		m, ok := it.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		out = append(out, dbTableListItem{
-			Name:              common.GetString(m, "name"),
-			Description:       common.GetString(m, "description"),
-			EstimatedRowCount: m["estimated_row_count"],
-			SizeBytes:         m["size_bytes"],
-			ColumnCount:       deriveColumnCount(m),
-		})
-	}
-	return out
-}
-
-func buildDBTableListParams(rctx *common.RuntimeContext) map[string]interface{} {
-	params := map[string]interface{}{
-		"env":       rctx.Str("env"),
-		"page_size": rctx.Int("page-size"),
-	}
-	if token := strings.TrimSpace(rctx.Str("page-token")); token != "" {
-		params["page_token"] = token
-	}
-	return params
-}
-
-// renderTableListPretty 5 列输出，列间两空格、列对齐填充。
-//
-// 列名：name / description / estimated_row_count / size / columns。
-// 空 description 用 "—" 占位；size 由 size_bytes 经 humanBytes 友好格式化；
-// columns 列取白名单投影的 column_count。
-func renderTableListPretty(w io.Writer, items []dbTableListItem) {
-	headers := []string{"name", "description", "estimated_row_count", "size", "columns"}
-	rows := make([][]string, 0, len(items))
-	for _, item := range items {
-		desc := item.Description
-		if desc == "" {
-			desc = "—"
-		}
-		rows = append(rows, []string{
-			item.Name,
-			desc,
-			intString(item.EstimatedRowCount),
-			humanBytes(item.SizeBytes),
-			fmt.Sprintf("%d", item.ColumnCount),
-		})
-	}
-	renderAlignedTable(w, headers, rows)
-}
-
-// renderAlignedTable 输出列对齐表格：列间两空格、列宽按每列最长 cell 填充、
-// 不画 `|` 和 `-` 分隔线、不依赖 TTY 着色。
-func renderAlignedTable(w io.Writer, headers []string, rows [][]string) {
-	if len(headers) == 0 {
-		return
-	}
-	widths := make([]int, len(headers))
-	for i, h := range headers {
-		widths[i] = displayWidth(h)
-	}
-	for _, row := range rows {
-		for i, cell := range row {
-			if i >= len(widths) {
-				break
-			}
-			if dw := displayWidth(cell); dw > widths[i] {
-				widths[i] = dw
-			}
-		}
-	}
-	writeRow := func(cells []string) {
-		for i, cell := range cells {
-			if i >= len(widths) {
-				continue
-			}
-			if i > 0 {
-				io.WriteString(w, "  ")
-			}
-			io.WriteString(w, cell)
-			if i < len(widths)-1 {
-				pad := widths[i] - displayWidth(cell)
-				if pad > 0 {
-					io.WriteString(w, strings.Repeat(" ", pad))
-				}
-			}
-		}
-		io.WriteString(w, "\n")
-	}
-	writeRow(headers)
-	for _, r := range rows {
-		writeRow(r)
-	}
-}
-
-// displayWidth 估算字符串在 monospace 终端下的显示宽度。
-// ASCII 占 1 列；CJK / 全角字符占 2 列；其他多字节字符按 rune 数算（保守）。
-func displayWidth(s string) int {
-	w := 0
-	for _, r := range s {
-		switch {
-		case r < 0x80:
-			w++
-		case isWide(r):
-			w += 2
-		default:
-			w++
-		}
-	}
-	return w
-}
-
-func isWide(r rune) bool {
-	switch {
-	case r >= 0x1100 && r <= 0x115F: // Hangul Jamo
-	case r >= 0x2E80 && r <= 0x303E: // CJK Radicals / Kangxi
-	case r >= 0x3041 && r <= 0x33FF: // Hiragana / Katakana / Bopomofo / CJK Symbols
-	case r >= 0x3400 && r <= 0x4DBF: // CJK Extension A
-	case r >= 0x4E00 && r <= 0x9FFF: // CJK Unified Ideographs
-	case r >= 0xA000 && r <= 0xA4CF: // Yi
-	case r >= 0xAC00 && r <= 0xD7A3: // Hangul Syllables
-	case r >= 0xF900 && r <= 0xFAFF: // CJK Compatibility Ideographs
-	case r >= 0xFE30 && r <= 0xFE4F: // CJK Compatibility Forms
-	case r >= 0xFF00 && r <= 0xFF60: // Fullwidth Forms
-	case r >= 0xFFE0 && r <= 0xFFE6: // Fullwidth Signs
-	case r >= 0x20000 && r <= 0x2FFFD: // CJK Extension B-F
-	case r >= 0x30000 && r <= 0x3FFFD: // CJK Extension G
-	default:
-		return false
-	}
-	return true
-}
-
-// humanBytes 把 size_bytes 数值转 KB / MB / GB 友好字符串。
-// 1 KiB = 1024 B；与 PG / 操作系统约定一致。
-func humanBytes(raw interface{}) string {
-	n, ok := numericAsFloat(raw)
-	if !ok {
-		return "—"
-	}
-	const unit = 1024.0
-	switch {
-	case n < unit:
-		return fmt.Sprintf("%d B", int64(n))
-	case n < unit*unit:
-		return fmt.Sprintf("%.0f KB", n/unit)
-	case n < unit*unit*unit:
-		return formatFloat(n/(unit*unit)) + " MB"
-	default:
-		return formatFloat(n/(unit*unit*unit)) + " GB"
-	}
-}
-
-// formatFloat 一位小数；整数值省略小数（24 KB 而不是 24.0 KB；1.5 MB 而不是 1 MB）。
-func formatFloat(f float64) string {
-	if f == float64(int64(f)) {
-		return fmt.Sprintf("%d", int64(f))
-	}
-	return fmt.Sprintf("%.1f", f)
-}
-
-// intString 把 JSON 反序列化进来的 number 转为整数字符串显示（estimated_row_count）。
-func intString(raw interface{}) string {
-	if n, ok := numericAsFloat(raw); ok {
-		return fmt.Sprintf("%d", int64(n))
-	}
-	return "—"
-}
-
-func numericAsFloat(raw interface{}) (float64, bool) {
-	switch v := raw.(type) {
-	case float64:
-		return v, true
-	case float32:
-		return float64(v), true
-	case int:
-		return float64(v), true
-	case int32:
-		return float64(v), true
-	case int64:
-		return float64(v), true
-	case uint:
-		return float64(v), true
-	case uint32:
-		return float64(v), true
-	case uint64:
-		return float64(v), true
-	case json.Number:
-		f, err := v.Float64()
-		if err != nil {
-			return 0, false
-		}
-		return f, true
-	case nil:
-		return 0, false
-	}
-	return 0, false
-}
-
-// deriveColumnCount 从 items[i].columns 数组长度派生 column_count。
-func deriveColumnCount(m map[string]interface{}) int {
-	cols, ok := m["columns"].([]interface{})
-	if !ok {
-		return 0
-	}
-	return len(cols)
-}
--- a/shortcuts/apps/apps_db_table_list_test.go
+++ b/shortcuts/apps/apps_db_table_list_test.go
@@ -1,309 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-// TestAppsDBTableList_BusinessErrorSurfacedAsTypedEnvelope 验证 server 业务错误
-// （code != 0，如单环境 app 查 env=dev 返 "Invalid DB Branch"）被 CLI 透出成
-// typed error —— 用 BOE 实测的错误码 / 文案做输入。
-//
-// 迁移到 runtime.CallAPITyped 后，非零 code 的业务错误由 errclass.BuildAPIError
-// 归类为 typed errs.* error（wire type 为 "api" 类别，不再是 legacy 的
-// *output.ExitError / "api_error"），但仍保留 code 与 message。与 drive/okr 等
-// 已迁移域一致：用 errs.ProblemOf 读 typed envelope，断言不弱化。
-func TestAppsDBTableList_BusinessErrorSurfacedAsTypedEnvelope(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/tables",
-		Body: map[string]interface{}{
-			"code": 500002511,
-			"msg":  "k_dl_1600000：Invalid DB Branch：dev",
-		},
-	})
-
-	err := runAppsShortcut(t, AppsDBTableList,
-		[]string{"+db-table-list", "--app-id", "app_x", "--env", "dev", "--as", "user"},
-		factory, stdout)
-	if err == nil {
-		t.Fatalf("expected business error to surface, got nil; stdout=%s", stdout.String())
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected a typed errs.Problem, got %T: %v", err, err)
-	}
-	if p.Category != errs.CategoryAPI {
-		t.Fatalf("error.type = %q, want %q", p.Category, errs.CategoryAPI)
-	}
-	if p.Code != 500002511 {
-		t.Fatalf("error.code = %d, want 500002511", p.Code)
-	}
-	if !strings.Contains(p.Message, "Invalid DB Branch") {
-		t.Fatalf("error.message missing 'Invalid DB Branch': %q", p.Message)
-	}
-}
-
-func TestAppsDBTableList_SuccessReturnsItemsWithStats(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/tables",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"has_more":   false,
-				"page_token": "",
-				"items": []interface{}{
-					map[string]interface{}{
-						"name":                "orders",
-						"description":         "订单表",
-						"columns":             []interface{}{map[string]interface{}{"name": "id"}, map[string]interface{}{"name": "user_id"}},
-						"estimated_row_count": 1200,
-						"size_bytes":          81920,
-					},
-				},
-			},
-		},
-	})
-
-	if err := runAppsShortcut(t, AppsDBTableList,
-		[]string{"+db-table-list", "--app-id", "app_x", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	if !strings.Contains(got, `"name": "orders"`) {
-		t.Fatalf("stdout missing table name: %s", got)
-	}
-	if !strings.Contains(got, `"estimated_row_count": 1200`) {
-		t.Fatalf("stdout missing estimated_row_count: %s", got)
-	}
-	// CLI 裁剪：json 默认不透出每表 columns[]，折算成 column_count（mock 给了 2 列）。
-	if !strings.Contains(got, `"column_count": 2`) {
-		t.Fatalf("stdout missing column_count (should replace columns[]): %s", got)
-	}
-	if strings.Contains(got, `"columns"`) {
-		t.Fatalf("stdout should NOT contain raw columns[] (stripped to column_count): %s", got)
-	}
-}
-
-// pretty 5 列 + 列名 (size / columns，不是 size_bytes / column_count) + size 友好格式（KB） +
-// 空 description 用 "—" 占位。
-func TestAppsDBTableList_PrettyRendersFiveColumnsHumanReadable(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/tables",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"items": []interface{}{
-					map[string]interface{}{
-						"name":                "orders",
-						"description":         "Order entries",
-						"columns":             []interface{}{map[string]interface{}{"name": "id"}, map[string]interface{}{"name": "user_id"}},
-						"estimated_row_count": 1200,
-						"size_bytes":          81920, // 80 KB
-					},
-					map[string]interface{}{
-						"name":                "customers",
-						"description":         "",
-						"columns":             []interface{}{map[string]interface{}{"name": "id"}},
-						"estimated_row_count": 350,
-						"size_bytes":          24576, // 24 KB
-					},
-				},
-			},
-		},
-	})
-	if err := runAppsShortcut(t, AppsDBTableList,
-		[]string{"+db-table-list", "--app-id", "app_x", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	// Header 行 5 列命名。
-	wantHeader := "name       description    estimated_row_count  size   columns"
-	// rows
-	wantOrders := "orders     Order entries  1200                 80 KB  2"
-	wantCustomers := "customers  —              350                  24 KB  1"
-	for _, want := range []string{wantHeader, wantOrders, wantCustomers} {
-		if !strings.Contains(got, want) {
-			t.Errorf("missing line %q\nactual output:\n%s", want, got)
-		}
-	}
-	// 禁止出现旧列名 / 原始字节。
-	for _, banned := range []string{"size_bytes", "column_count", "81920", "24576"} {
-		if strings.Contains(got, banned) {
-			t.Errorf("pretty output contains %q (must be human-formatted)\noutput:\n%s", banned, got)
-		}
-	}
-}
-
-func TestAppsDBTableList_RequiresAppID(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsDBTableList,
-		[]string{"+db-table-list", "--app-id", "  ", "--as", "user"}, factory, stdout)
-	if err == nil || !strings.Contains(err.Error(), "app-id") {
-		t.Fatalf("expected app-id required error, got %v", err)
-	}
-}
-
-func TestAppsDBTableList_DryRunSendsPaginationAndEnv(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsDBTableList,
-		[]string{"+db-table-list", "--app-id", "app_x", "--env", "dev",
-			"--page-size", "50", "--page-token", "cursor-abc",
-			"--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	var env struct {
-		API []struct {
-			Method string                 `json:"method"`
-			URL    string                 `json:"url"`
-			Params map[string]interface{} `json:"params"`
-		} `json:"api"`
-	}
-	if err := json.Unmarshal([]byte(stdout.String()), &env); err != nil {
-		t.Fatalf("decode dry-run: %v\n%s", err, stdout.String())
-	}
-	if env.API[0].Method != "GET" || env.API[0].URL != "/open-apis/spark/v1/apps/app_x/tables" {
-		t.Fatalf("dry-run method/url = %s %s", env.API[0].Method, env.API[0].URL)
-	}
-	if env.API[0].Params["env"] != "dev" {
-		t.Fatalf("dry-run params.env = %v (want dev)", env.API[0].Params["env"])
-	}
-	if pz, _ := env.API[0].Params["page_size"].(float64); int(pz) != 50 {
-		t.Fatalf("dry-run params.page_size = %v (want 50)", env.API[0].Params["page_size"])
-	}
-	if env.API[0].Params["page_token"] != "cursor-abc" {
-		t.Fatalf("dry-run params.page_token = %v (want cursor-abc)", env.API[0].Params["page_token"])
-	}
-}
-
-func TestAppsDBTableList_DoesNotSendIncludeStatsQuery(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsDBTableList,
-		[]string{"+db-table-list", "--app-id", "app_x", "--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	var env struct {
-		API []struct {
-			Params map[string]interface{} `json:"params"`
-		} `json:"api"`
-	}
-	if err := json.Unmarshal([]byte(stdout.String()), &env); err != nil {
-		t.Fatalf("decode: %v", err)
-	}
-	if _, ok := env.API[0].Params["include_stats"]; ok {
-		t.Fatalf("CLI should not send include_stats query, but got params=%v", env.API[0].Params)
-	}
-}
-
-func TestAppsDBTableList_RejectsBadEnv(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsDBTableList,
-		[]string{"+db-table-list", "--app-id", "app_x", "--env", "prod", "--as", "user"}, factory, stdout)
-	if err == nil || !strings.Contains(err.Error(), "env") {
-		t.Fatalf("expected env enum rejection, got %v", err)
-	}
-}
-
-func TestNumericAsFloat_AllTypes(t *testing.T) {
-	cases := []struct {
-		name string
-		in   interface{}
-		want float64
-		ok   bool
-	}{
-		{"float64", float64(3.5), 3.5, true},
-		{"float32", float32(2), 2, true},
-		{"int", int(7), 7, true},
-		{"int32", int32(8), 8, true},
-		{"int64", int64(9), 9, true},
-		{"uint", uint(10), 10, true},
-		{"uint32", uint32(11), 11, true},
-		{"uint64", uint64(12), 12, true},
-		{"json.Number valid", json.Number("13.5"), 13.5, true},
-		{"json.Number invalid", json.Number("abc"), 0, false},
-		{"nil", nil, 0, false},
-		{"unsupported string", "x", 0, false},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			got, ok := numericAsFloat(c.in)
-			if ok != c.ok || got != c.want {
-				t.Fatalf("numericAsFloat(%v) = %v,%v want %v,%v", c.in, got, ok, c.want, c.ok)
-			}
-		})
-	}
-}
-
-func TestFormatFloat_IntegerVsFractional(t *testing.T) {
-	cases := []struct {
-		in   float64
-		want string
-	}{
-		{24, "24"},
-		{1.5, "1.5"},
-		{2.04, "2.0"},
-		{0, "0"},
-	}
-	for _, c := range cases {
-		if got := formatFloat(c.in); got != c.want {
-			t.Errorf("formatFloat(%v)=%q want %q", c.in, got, c.want)
-		}
-	}
-}
-
-func TestHumanBytes_UnitBoundaries(t *testing.T) {
-	cases := []struct {
-		name string
-		in   interface{}
-		want string
-	}{
-		{"non-numeric", "x", "—"},
-		{"bytes", float64(512), "512 B"},
-		{"kb", float64(2048), "2 KB"},
-		{"mb fractional", float64(1572864), "1.5 MB"},
-		{"gb integer", float64(2 * 1024 * 1024 * 1024), "2 GB"},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			if got := humanBytes(c.in); got != c.want {
-				t.Errorf("humanBytes(%v)=%q want %q", c.in, got, c.want)
-			}
-		})
-	}
-}
-
-func TestIntString_Cases(t *testing.T) {
-	if got := intString(float64(42)); got != "42" {
-		t.Errorf("intString(42)=%q want 42", got)
-	}
-	if got := intString("x"); got != "—" {
-		t.Errorf("intString(non-numeric)=%q want —", got)
-	}
-}
-
-func TestDeriveColumnCount_Cases(t *testing.T) {
-	if got := deriveColumnCount(map[string]interface{}{"columns": []interface{}{1, 2, 3}}); got != 3 {
-		t.Errorf("deriveColumnCount=%d want 3", got)
-	}
-	if got := deriveColumnCount(map[string]interface{}{}); got != 0 {
-		t.Errorf("deriveColumnCount(missing)=%d want 0", got)
-	}
-	if got := deriveColumnCount(map[string]interface{}{"columns": "notarray"}); got != 0 {
-		t.Errorf("deriveColumnCount(wrongtype)=%d want 0", got)
-	}
-}
--- a/shortcuts/apps/apps_env_pull.go
+++ b/shortcuts/apps/apps_env_pull.go
@@ -1,380 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// envKeyPattern matches valid environment variable names: [A-Za-z_][A-Za-z0-9_]*
-var envKeyPattern = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`)
-
-type envPullDatabaseInfo struct {
-	Detected      bool
-	ExpiresAtRaw  string
-	ExpiresAtText string
-}
-
-// AppsEnvPull pulls startup env vars for an app into the local .env.local file.
-var AppsEnvPull = common.Shortcut{
-	Service:     appsService,
-	Command:     "+env-pull",
-	Description: "Pull app startup env vars into the local project .env.local",
-	Risk:        "write",
-	Tips: []string{
-		"Example: lark-cli apps +env-pull --app-id <app_id>",
-	},
-	Scopes:    []string{"spark:app:read"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "app ID"},
-		{Name: "project-path", Desc: "local project root path (defaults to current directory)"},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		if strings.TrimSpace(rctx.Str("app-id")) == "" {
-			return &errs.ValidationError{Problem: errs.Problem{Category: errs.CategoryValidation, Subtype: errs.SubtypeInvalidArgument, Message: "--app-id is required"}, Param: "app-id"}
-		}
-		_, envFile, err := resolveEnvPullTarget(strings.TrimSpace(rctx.Str("project-path")))
-		if err != nil {
-			return &errs.ValidationError{Problem: errs.Problem{Category: errs.CategoryValidation, Subtype: errs.SubtypeInvalidArgument, Message: fmt.Sprintf("--project-path: %v", err)}, Param: "project-path", Cause: err}
-		}
-		if err := checkEnvPullTarget(envFile); err != nil {
-			return err
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		projectPath, envFile, _ := resolveEnvPullTarget(strings.TrimSpace(rctx.Str("project-path")))
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		return common.NewDryRunAPI().
-			POST(fmt.Sprintf("%s/apps/%s/env_vars", apiBasePath, validate.EncodePathSegment(appID))).
-			Desc("Pull app startup env vars into the local .env.local file").
-			Set("project_path", projectPath).
-			Set("env_file", envFile)
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		_, envFile, err := resolveEnvPullTarget(strings.TrimSpace(rctx.Str("project-path")))
-		if err != nil {
-			return &errs.ValidationError{Problem: errs.Problem{Category: errs.CategoryValidation, Subtype: errs.SubtypeInvalidArgument, Message: fmt.Sprintf("--project-path: %v", err)}, Param: "project-path", Cause: err}
-		}
-		if err := checkEnvPullTarget(envFile); err != nil {
-			return err
-		}
-		if err := rctx.EnsureScopes([]string{"spark:app:read"}); err != nil {
-			return err
-		}
-
-		path := fmt.Sprintf("%s/apps/%s/env_vars", apiBasePath, validate.EncodePathSegment(appID))
-		data, err := rctx.CallAPITyped("POST", path, nil, nil)
-		if err != nil {
-			return withAppsHint(err, "verify --app-id is correct and you have access to the app; list your apps with `lark-cli apps +list`")
-		}
-
-		envVars, databaseInfo, skippedKeys, err := extractEnvPullVars(data)
-		if err != nil {
-			return err
-		}
-		if envVars == nil {
-			envVars = map[string]string{}
-		}
-		envVars["FORCE_DB_BRANCH"] = "dev"
-		original, err := readEnvPullFile(envFile)
-		if err != nil {
-			return err
-		}
-		merged, updated, created := mergeEnvPullFileContent(original, envVars)
-		if err := ensureEnvPullParentDir(envFile); err != nil {
-			return err
-		}
-		if err := validate.AtomicWrite(envFile, []byte(merged), 0o600); err != nil {
-			return &errs.InternalError{Problem: errs.Problem{Category: errs.CategoryInternal, Subtype: errs.SubtypeUnknown, Message: fmt.Sprintf("cannot write %s: %v", envFile, err)}, Cause: err}
-		}
-
-		result := buildEnvPullSuccessData(appID, envFile, databaseInfo)
-		rctx.OutFormat(result, nil, func(w io.Writer) {
-			writeEnvPullPretty(w, appID, envFile, databaseInfo, skippedKeys)
-		})
-		_ = updated
-		_ = created
-		return nil
-	},
-}
-
-func resolveEnvPullTarget(projectPath string) (string, string, error) {
-	if strings.TrimSpace(projectPath) == "" {
-		cwd, err := os.Getwd() //nolint:forbidigo // shortcuts cannot import internal/vfs; cwd lookup is local-only and bounded.
-		if err != nil {
-			return "", "", fmt.Errorf("cannot determine working directory: %w", err)
-		}
-		projectPath = cwd
-	}
-	if err := validate.RejectControlChars(projectPath, "--project-path"); err != nil {
-		return "", "", err
-	}
-	projectPath = filepath.Clean(projectPath)
-	return projectPath, filepath.Join(projectPath, ".env.local"), nil
-}
-
-func checkEnvPullTarget(envFile string) error {
-	info, err := os.Lstat(envFile) //nolint:forbidigo // shortcuts cannot import internal/vfs; direct lstat is needed to reject symlinks before write.
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return &errs.ValidationError{Problem: errs.Problem{Category: errs.CategoryValidation, Subtype: errs.SubtypeInvalidArgument, Message: fmt.Sprintf("cannot inspect %s: %v", envFile, err)}, Param: "project-path", Cause: err}
-	}
-	if info.Mode()&os.ModeSymlink != 0 {
-		return &errs.ValidationError{Problem: errs.Problem{Category: errs.CategoryValidation, Subtype: errs.SubtypeInvalidArgument, Message: fmt.Sprintf("target %s must be a regular file, not a symlink", envFile)}, Param: "project-path"}
-	}
-	if !info.Mode().IsRegular() {
-		return &errs.ValidationError{Problem: errs.Problem{Category: errs.CategoryValidation, Subtype: errs.SubtypeInvalidArgument, Message: fmt.Sprintf("target %s must be a regular file", envFile)}, Param: "project-path"}
-	}
-	return nil
-}
-
-func extractEnvPullVars(data map[string]interface{}) (map[string]string, envPullDatabaseInfo, []string, error) {
-	raw := data["env_vars"]
-	if raw == nil {
-		if nested, ok := data["data"].(map[string]interface{}); ok {
-			raw = nested["env_vars"]
-		}
-	}
-	if raw == nil {
-		return nil, envPullDatabaseInfo{}, nil, &errs.ValidationError{Problem: errs.Problem{Category: errs.CategoryValidation, Subtype: errs.SubtypeInvalidResponse, Message: "response field env_vars must be an object or array of key/value entries"}}
-	}
-
-	var skippedKeys []string
-	switch typed := raw.(type) {
-	case map[string]interface{}:
-		out := make(map[string]string, len(typed))
-		for key, value := range typed {
-			if !envKeyPattern.MatchString(key) {
-				skippedKeys = append(skippedKeys, key)
-				continue
-			}
-			s, ok := value.(string)
-			if !ok {
-				continue
-			}
-			out[key] = s
-		}
-		return out, envPullDatabaseInfo{Detected: hasEnvPullDatabase(out)}, skippedKeys, nil
-	case []interface{}:
-		out := make(map[string]string, len(typed))
-		info := envPullDatabaseInfo{}
-		for _, item := range typed {
-			entry, ok := item.(map[string]interface{})
-			if !ok {
-				continue
-			}
-			key, ok := entry["key"].(string)
-			if !ok || strings.TrimSpace(key) == "" {
-				continue
-			}
-			if !envKeyPattern.MatchString(key) {
-				skippedKeys = append(skippedKeys, key)
-				continue
-			}
-			value, ok := entry["value"].(string)
-			if !ok {
-				continue
-			}
-			out[key] = value
-			if key == "SUDA_DATABASE_URL" {
-				info.Detected = true
-				info.ExpiresAtRaw, info.ExpiresAtText = extractEnvPullDatabaseExpiry(entry["extras"])
-			}
-		}
-		return out, info, skippedKeys, nil
-	default:
-		return nil, envPullDatabaseInfo{}, nil, &errs.ValidationError{Problem: errs.Problem{Category: errs.CategoryValidation, Subtype: errs.SubtypeInvalidResponse, Message: "response field env_vars must be an object or array of key/value entries"}}
-	}
-}
-
-func readEnvPullFile(envFile string) (string, error) {
-	data, err := os.ReadFile(envFile) //nolint:forbidigo // shortcuts cannot import internal/vfs; validated local file read for a single env file.
-	if err != nil {
-		if os.IsNotExist(err) {
-			return "", nil
-		}
-		return "", &errs.InternalError{Problem: errs.Problem{Category: errs.CategoryInternal, Subtype: errs.SubtypeUnknown, Message: fmt.Sprintf("cannot read %s: %v", envFile, err)}, Cause: err}
-	}
-	return string(data), nil
-}
-
-func ensureEnvPullParentDir(envFile string) error {
-	dir := filepath.Dir(envFile)
-	if err := os.MkdirAll(dir, 0o755); err != nil { //nolint:forbidigo // shortcuts cannot import internal/vfs; local mkdir for target env parent dir.
-		return &errs.InternalError{Problem: errs.Problem{Category: errs.CategoryInternal, Subtype: errs.SubtypeUnknown, Message: fmt.Sprintf("cannot create %s: %v", dir, err)}, Cause: err}
-	}
-	return nil
-}
-
-func mergeEnvPullFileContent(original string, envVars map[string]string) (string, []string, []string) {
-	if len(envVars) == 0 {
-		if original == "" {
-			return "", nil, nil
-		}
-		return ensureTrailingNewline(original), nil, nil
-	}
-
-	normalized := strings.ReplaceAll(original, "\r\n", "\n")
-	lines := []string{}
-	if normalized != "" {
-		lines = strings.Split(normalized, "\n")
-		if len(lines) > 0 && lines[len(lines)-1] == "" {
-			lines = lines[:len(lines)-1]
-		}
-	}
-
-	used := make(map[string]bool, len(envVars))
-	updated := make([]string, 0, len(envVars))
-	for i, line := range lines {
-		key, ok := parseEnvPullAssignmentLine(line)
-		if !ok {
-			continue
-		}
-		value, exists := envVars[key]
-		if !exists {
-			continue
-		}
-		lines[i] = formatEnvPullAssignment(key, value)
-		updated = append(updated, key)
-		used[key] = true
-	}
-
-	created := make([]string, 0, len(envVars))
-	pending := make([]string, 0, len(envVars))
-	for key := range envVars {
-		if used[key] {
-			continue
-		}
-		pending = append(pending, key)
-	}
-	sort.Strings(pending)
-	for _, key := range pending {
-		lines = append(lines, formatEnvPullAssignment(key, envVars[key]))
-		created = append(created, key)
-	}
-
-	sort.Strings(updated)
-	content := strings.Join(lines, "\n")
-	if content != "" {
-		content += "\n"
-	}
-	return content, updated, created
-}
-
-func parseEnvPullAssignmentLine(line string) (string, bool) {
-	trimmed := strings.TrimSpace(line)
-	if trimmed == "" || strings.HasPrefix(trimmed, "#") {
-		return "", false
-	}
-	if strings.HasPrefix(trimmed, "export ") || strings.HasPrefix(trimmed, "export\t") {
-		remainder := strings.TrimSpace(strings.TrimPrefix(strings.TrimPrefix(trimmed, "export "), "export\t"))
-		if remainder == "" || strings.HasPrefix(remainder, "=") {
-			return "", false
-		}
-		trimmed = remainder
-	}
-	idx := strings.Index(trimmed, "=")
-	if idx <= 0 {
-		return "", false
-	}
-	key := strings.TrimSpace(trimmed[:idx])
-	if key == "" || strings.ContainsAny(key, " \t") {
-		return "", false
-	}
-	return key, true
-}
-
-func formatEnvPullAssignment(key, value string) string {
-	return fmt.Sprintf("%s=%s", key, strconv.Quote(value))
-}
-
-func buildEnvPullSuccessData(appID, envFile string, databaseInfo envPullDatabaseInfo) map[string]interface{} {
-	result := map[string]interface{}{
-		"app_id":   appID,
-		"env_file": envFile,
-	}
-	if databaseInfo.ExpiresAtRaw != "" {
-		result["database_url_expires_at"] = databaseInfo.ExpiresAtRaw
-	}
-	return result
-}
-
-func hasEnvPullDatabase(envVars map[string]string) bool {
-	_, ok := envVars["SUDA_DATABASE_URL"]
-	return ok
-}
-
-func extractEnvPullDatabaseExpiry(rawExtras interface{}) (string, string) {
-	extras, ok := rawExtras.([]interface{})
-	if !ok {
-		return "", ""
-	}
-	for _, raw := range extras {
-		entry, ok := raw.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		key, _ := entry["key"].(string)
-		if key != "expiresAt" {
-			continue
-		}
-		switch value := entry["value"].(type) {
-		case string:
-			rawValue := strings.TrimSpace(value)
-			ts, err := strconv.ParseInt(rawValue, 10, 64)
-			if err != nil {
-				return "", ""
-			}
-			return rawValue, time.Unix(ts, 0).Local().Format("2006-01-02 15:04:05 MST")
-		case float64:
-			ts := int64(value)
-			rawValue := strconv.FormatInt(ts, 10)
-			return rawValue, time.Unix(ts, 0).Local().Format("2006-01-02 15:04:05 MST")
-		}
-	}
-	return "", ""
-}
-
-func writeEnvPullPretty(w io.Writer, appID, envFile string, databaseInfo envPullDatabaseInfo, skippedKeys []string) {
-	fmt.Fprintf(w, "✓ App detected: %s\n", appID)
-	if databaseInfo.Detected {
-		fmt.Fprintln(w, "✓ Development database detected")
-	}
-	fmt.Fprintf(w, "✓ Local environment written to %s\n", envFile)
-	if databaseInfo.ExpiresAtText != "" {
-		fmt.Fprintln(w)
-		fmt.Fprintf(w, "DATABASE_URL is valid until %s.\n", databaseInfo.ExpiresAtText)
-	}
-	if len(skippedKeys) > 0 {
-		fmt.Fprintln(w)
-		fmt.Fprintf(w, "⚠ Skipped %d invalid key(s): %s (key names must match [A-Za-z_][A-Za-z0-9_]*)\n", len(skippedKeys), strings.Join(skippedKeys, ", "))
-	}
-	fmt.Fprintf(w, "Run `lark-cli apps +env-pull --app-id <app_id>` again to refresh it.\n")
-}
-
-func ensureTrailingNewline(s string) string {
-	if s == "" || strings.HasSuffix(s, "\n") {
-		return s
-	}
-	return s + "\n"
-}
--- a/shortcuts/apps/apps_env_pull_test.go
+++ b/shortcuts/apps/apps_env_pull_test.go
--- a/shortcuts/apps/apps_examples_test.go
+++ b/shortcuts/apps/apps_examples_test.go
@@ -1,52 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"regexp"
-	"strings"
-	"testing"
-)
-
-func TestAppsShortcutsHaveExamples(t *testing.T) {
-	realAppID := regexp.MustCompile(`app_[a-z0-9]{6,}`)
-	email := regexp.MustCompile(`[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[A-Za-z]{2,}`)
-	phone := regexp.MustCompile(`\b1[3-9]\d{9}\b`)
-	for _, s := range Shortcuts() {
-		hasExample := false
-		for _, tip := range s.Tips {
-			if strings.HasPrefix(tip, "Example: lark-cli apps +") {
-				hasExample = true
-			}
-			if realAppID.MatchString(tip) {
-				t.Errorf("%s tip leaks real-looking app id (use <app_id>): %q", s.Command, tip)
-			}
-			if email.MatchString(tip) || phone.MatchString(tip) {
-				t.Errorf("%s tip leaks PII: %q", s.Command, tip)
-			}
-		}
-		if !hasExample {
-			t.Errorf("%s has no \"Example: lark-cli apps +...\" tip", s.Command)
-		}
-	}
-}
-
-func TestHighFreqCommandsHaveMultipleExamples(t *testing.T) {
-	want := map[string]int{"+chat": 2, "+access-scope-set": 2}
-	for _, s := range Shortcuts() {
-		min, ok := want[s.Command]
-		if !ok {
-			continue
-		}
-		n := 0
-		for _, tip := range s.Tips {
-			if strings.HasPrefix(tip, "Example: lark-cli apps +") {
-				n++
-			}
-		}
-		if n < min {
-			t.Errorf("%s has %d Example tips, want >= %d", s.Command, n, min)
-		}
-	}
-}
--- a/shortcuts/apps/apps_hint_leak_test.go
+++ b/shortcuts/apps/apps_hint_leak_test.go
@@ -1,67 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"regexp"
-	"testing"
-)
-
-// TestAppsErrorHintsCarryNoSecretsOrPII guards the actionable error hints added
-// for the apps command-governance task. Those hints are inline string literals
-// spread across several files (apps_env_pull.go, apps_access_scope_set.go,
-// apps_access_scope_get.go, apps_init.go git-push path, and the
-// gitCredentialIssueHint const in git_credential.go). They are stable English
-// strings, so we assert the verbatim copies here: a real app_id, an email, or a
-// phone number must never appear in a hint. Placeholders like <app_id> are
-// expected and must NOT trip the real-app-id regex.
-func TestAppsErrorHintsCarryNoSecretsOrPII(t *testing.T) {
-	// These are copied verbatim from the source. If a hint changes, copy the new
-	// text here so this leak guard keeps tracking the real production string.
-	hints := []string{
-		// apps_env_pull.go:86 and apps_access_scope_get.go:50 (identical literals)
-		"verify --app-id is correct and you have access to the app; list your apps with `lark-cli apps +list`",
-		// apps_access_scope_set.go:74
-		"verify --app-id is correct; for scope=specific, each --targets id must be a valid open_id/department_id/chat_id and --approver a valid open_id; review the current scope with `lark-cli apps +access-scope-get --app-id <app_id>`",
-		// apps_init.go:483 (git push rejection)
-		"the push was rejected — the git output is in the message above; if it is a non-fast-forward (remote has new commits), sync the remote and retry; if it is an auth failure, make sure `lark-cli apps +git-credential-init` has succeeded",
-		// git_credential.go gitCredentialIssueHint const (referenced directly so a
-		// rename or text change breaks the build instead of silently drifting)
-		gitCredentialIssueHint,
-		// command-governance hints added for this task (referenced by const, no drift)
-		appIDListHint,
-		sessionStopHint,
-		createHint,
-		dbEnvCreateHint,
-		dbTableGetHint,
-		dbTableListHint,
-	}
-
-	realAppID := regexp.MustCompile(`app_[a-z0-9]{6,}`)
-	email := regexp.MustCompile(`[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[A-Za-z]{2,}`)
-	phone := regexp.MustCompile(`\b1[3-9]\d{9}\b`)
-	// An obvious secret: a PAT-like token or a "secret=..." / "token=..." pair.
-	secret := regexp.MustCompile(`(?i)(pat-[a-z0-9]+|secret\s*[=:]\s*\S|token\s*[=:]\s*\S)`)
-
-	for _, h := range hints {
-		if realAppID.MatchString(h) {
-			t.Errorf("hint leaks a real-looking app id (use <app_id>): %q", h)
-		}
-		if email.MatchString(h) {
-			t.Errorf("hint leaks an email address: %q", h)
-		}
-		if phone.MatchString(h) {
-			t.Errorf("hint leaks a phone number: %q", h)
-		}
-		if secret.MatchString(h) {
-			t.Errorf("hint leaks an obvious secret/token: %q", h)
-		}
-	}
-
-	// Sanity: the placeholder <app_id> must NOT match the real-app-id regex,
-	// otherwise the guard above would be a false positive on legitimate hints.
-	if realAppID.MatchString("<app_id>") {
-		t.Fatal("realAppID regex incorrectly matches the <app_id> placeholder")
-	}
-}
--- a/shortcuts/apps/apps_hints_more_test.go
+++ b/shortcuts/apps/apps_hints_more_test.go
@@ -1,129 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/httpmock"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-func assertHintContains(t *testing.T, sc common.Shortcut, args []string, stub *httpmock.Stub, want string) {
-	t.Helper()
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(stub)
-	err := runAppsShortcut(t, sc, args, factory, stdout)
-	if err == nil {
-		t.Fatalf("expected failure, got nil; stdout=%s", stdout.String())
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs.Problem, got %T: %v", err, err)
-	}
-	if !strings.Contains(p.Hint, want) {
-		t.Fatalf("hint %q does not contain %q", p.Hint, want)
-	}
-}
-
-func TestAppsSessionCreate_4xxFailureCarriesListHint(t *testing.T) {
-	assertHintContains(t, AppsSessionCreate,
-		[]string{"+session-create", "--app-id", "app_x", "--as", "user"},
-		&httpmock.Stub{Method: "POST", URL: "/open-apis/spark/v1/apps/app_x/sessions",
-			Status: http.StatusNotFound, Body: map[string]interface{}{"msg": "app not found"}},
-		"apps +list")
-}
-
-func TestAppsSessionList_4xxFailureCarriesListHint(t *testing.T) {
-	assertHintContains(t, AppsSessionList,
-		[]string{"+session-list", "--app-id", "app_x", "--as", "user"},
-		&httpmock.Stub{Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/sessions",
-			Status: http.StatusForbidden, Body: map[string]interface{}{"msg": "permission denied"}},
-		"apps +list")
-}
-
-func TestAppsUpdate_4xxFailureCarriesListHint(t *testing.T) {
-	assertHintContains(t, AppsUpdate,
-		[]string{"+update", "--app-id", "app_x", "--name", "n", "--as", "user"},
-		&httpmock.Stub{Method: "PATCH", URL: "/open-apis/spark/v1/apps/app_x",
-			Status: http.StatusNotFound, Body: map[string]interface{}{"msg": "app not found"}},
-		"apps +list")
-}
-
-func TestAppsReleaseList_4xxFailureCarriesListHint(t *testing.T) {
-	assertHintContains(t, AppsReleaseList,
-		[]string{"+release-list", "--app-id", "app_x", "--as", "user"},
-		&httpmock.Stub{Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/releases",
-			Status: http.StatusForbidden, Body: map[string]interface{}{"msg": "permission denied"}},
-		"apps +list")
-}
-
-func TestAppsSessionStop_4xxFailureCarriesSessionHint(t *testing.T) {
-	assertHintContains(t, AppsSessionStop,
-		[]string{"+session-stop", "--app-id", "app_x", "--session-id", "s1", "--turn-id", "t1", "--as", "user"},
-		&httpmock.Stub{Method: "POST", URL: "/open-apis/spark/v1/apps/app_x/sessions/s1/stop",
-			Status: http.StatusNotFound, Body: map[string]interface{}{"msg": "session not found"}},
-		"+session-list")
-}
-
-func TestAppsCreate_4xxFailureCarriesTypeHint(t *testing.T) {
-	assertHintContains(t, AppsCreate,
-		[]string{"+create", "--name", "n", "--app-type", "html", "--as", "user"},
-		&httpmock.Stub{Method: "POST", URL: "/open-apis/spark/v1/apps",
-			Status: http.StatusForbidden, Body: map[string]interface{}{"msg": "permission denied"}},
-		"full_stack")
-}
-
-func TestAppsDBEnvCreate_4xxFailureCarriesHint(t *testing.T) {
-	assertHintContains(t, AppsDBEnvCreate,
-		[]string{"+db-env-create", "--app-id", "app_x", "--env", "dev", "--yes", "--as", "user"},
-		&httpmock.Stub{Method: "POST", URL: "/open-apis/spark/v1/apps/app_x/db_dev_init",
-			Status: http.StatusConflict, Body: map[string]interface{}{"msg": "already multi-env"}},
-		"+db-table-list")
-}
-
-func TestAppsDBTableGet_4xxFailureCarriesHint(t *testing.T) {
-	assertHintContains(t, AppsDBTableGet,
-		[]string{"+db-table-get", "--app-id", "app_x", "--table", "users", "--as", "user"},
-		&httpmock.Stub{Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/tables/users",
-			Status: http.StatusNotFound, Body: map[string]interface{}{"msg": "table not found"}},
-		"+db-table-list")
-}
-
-func TestAppsDBTableList_4xxFailureCarriesHint(t *testing.T) {
-	assertHintContains(t, AppsDBTableList,
-		[]string{"+db-table-list", "--app-id", "app_x", "--env", "dev", "--as", "user"},
-		&httpmock.Stub{Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/tables",
-			Status: http.StatusNotFound, Body: map[string]interface{}{"msg": "dev env not found"}},
-		"+db-env-create")
-}
-
-// withAppsHint must only fill an EMPTY hint; an upstream-provided hint wins.
-func TestWithAppsHint_DoesNotOverrideUpstreamHint(t *testing.T) {
-	upstream := &errs.Problem{Message: "boom", Hint: "upstream specific hint"}
-	got := withAppsHint(upstream, appIDListHint)
-	p, ok := errs.ProblemOf(got)
-	if !ok {
-		t.Fatalf("expected typed problem, got %T", got)
-	}
-	if p.Hint != "upstream specific hint" {
-		t.Fatalf("upstream hint was overridden: %q", p.Hint)
-	}
-}
-
-// withAppsHint fills the hint when empty and leaves Message untouched.
-func TestWithAppsHint_FillsEmptyHintKeepsMessage(t *testing.T) {
-	p0 := &errs.Problem{Message: "boom"}
-	got := withAppsHint(p0, appIDListHint)
-	p, _ := errs.ProblemOf(got)
-	if p.Hint != appIDListHint {
-		t.Fatalf("hint not filled: %q", p.Hint)
-	}
-	if p.Message != "boom" {
-		t.Fatalf("message mutated: %q", p.Message)
-	}
-}
--- a/shortcuts/apps/apps_hints_test.go
+++ b/shortcuts/apps/apps_hints_test.go
@@ -1,91 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/larksuite/cli/errs"
-	"github.com/larksuite/cli/internal/httpmock"
-)
-
-// TestAppsEnvPull_4xxFailureCarriesListHint verifies that a 4xx failure from the
-// env_vars endpoint surfaces an actionable hint pointing at `lark-cli apps +list`.
-func TestAppsEnvPull_4xxFailureCarriesListHint(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/env_vars",
-		Status: http.StatusForbidden,
-		Body:   map[string]interface{}{"msg": "permission denied"},
-	})
-
-	err := runAppsShortcut(t, AppsEnvPull,
-		[]string{"+env-pull", "--app-id", "app_x", "--project-path", t.TempDir(), "--as", "user"},
-		factory, stdout)
-	if err == nil {
-		t.Fatalf("expected failure, got nil; stdout=%s", stdout.String())
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs.Problem, got %T: %v", err, err)
-	}
-	if !strings.Contains(p.Hint, "apps +list") {
-		t.Fatalf("hint missing `apps +list`: %q", p.Hint)
-	}
-}
-
-// TestAppsAccessScopeGet_4xxFailureCarriesListHint verifies the access-scope-get
-// 4xx failure points at `lark-cli apps +list`.
-func TestAppsAccessScopeGet_4xxFailureCarriesListHint(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/access-scope",
-		Status: http.StatusNotFound,
-		Body:   map[string]interface{}{"msg": "app not found"},
-	})
-
-	err := runAppsShortcut(t, AppsAccessScopeGet,
-		[]string{"+access-scope-get", "--app-id", "app_x", "--as", "user"},
-		factory, stdout)
-	if err == nil {
-		t.Fatalf("expected failure, got nil; stdout=%s", stdout.String())
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs.Problem, got %T: %v", err, err)
-	}
-	if !strings.Contains(p.Hint, "apps +list") {
-		t.Fatalf("hint missing `apps +list`: %q", p.Hint)
-	}
-}
-
-// TestAppsAccessScopeSet_4xxFailureCarriesScopeGetHint verifies the
-// access-scope-set 4xx failure points at `+access-scope-get`.
-func TestAppsAccessScopeSet_4xxFailureCarriesScopeGetHint(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "PUT",
-		URL:    "/open-apis/spark/v1/apps/app_x/access-scope",
-		Status: http.StatusBadRequest,
-		Body:   map[string]interface{}{"msg": "invalid target id"},
-	})
-
-	err := runAppsShortcut(t, AppsAccessScopeSet,
-		[]string{"+access-scope-set", "--app-id", "app_x", "--scope", "tenant", "--as", "user"},
-		factory, stdout)
-	if err == nil {
-		t.Fatalf("expected failure, got nil; stdout=%s", stdout.String())
-	}
-	p, ok := errs.ProblemOf(err)
-	if !ok {
-		t.Fatalf("expected typed errs.Problem, got %T: %v", err, err)
-	}
-	if !strings.Contains(p.Hint, "+access-scope-get") {
-		t.Fatalf("hint missing `+access-scope-get`: %q", p.Hint)
-	}
-}
--- a/shortcuts/apps/apps_html_publish.go
+++ b/shortcuts/apps/apps_html_publish.go
@@ -21,13 +21,9 @@ var AppsHTMLPublish = common.Shortcut{
 	Command:     "+html-publish",
 	Description: "Publish HTML to a Miaoda app (single multipart POST returns the access URL)",
 	Risk:        "write",
-	Tips: []string{
-		"Example: lark-cli apps +html-publish --app-id <app_id> --path ./dist",
-		"Example: lark-cli apps +html-publish --app-id <app_id> --path ./site --dry-run",
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
+	Scopes:      []string{"spark:app:write"},
+	AuthTypes:   []string{"user"},
+	HasFormat:   true,
 	Flags: []common.Flag{
 		{Name: "app-id", Desc: "Miaoda app ID", Required: true},
 		{Name: "path", Desc: "path to HTML file or directory", Required: true},
--- a/shortcuts/apps/apps_init.go
+++ b/shortcuts/apps/apps_init.go
@@ -1,674 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"unicode"
-
-	"github.com/larksuite/cli/internal/charcheck"
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// defaultInitBranch is the fixed remote branch +init checks out after clone.
-const defaultInitBranch = "sprint/default"
-
-// Fixed init commit subjects. Constants — never interpolate user input. The
-// empty-repo (`app init`) path splits the scaffolded tree into two commits;
-// the non-empty (`app sync`) path stays a single commit.
-const (
-	commitMsgAppCode   = "chore: initialize app project code"
-	commitMsgAppConfig = "chore: initialize miaoda app config"
-	commitMsgUpgrade   = "chore: initialize miaoda app repository"
-)
-
-// scaffold kinds returned by runScaffold and consumed by commitAndPushIfDirty.
-const (
-	scaffoldKindInit    = "init"
-	scaffoldKindUpgrade = "upgrade"
-)
-
-const (
-	miaodaCLIPkg    = "@lark-apaas/miaoda-cli@latest"
-	defaultTemplate = "nestjs-react-fullstack"
-	metaRelPath     = ".spark/meta.json"
-	steeringRelPath = ".agent/skills/steering"
-	seedReadme      = "README.md"
-)
-
-// initRunner is the commandRunner used by +init. Package-level so unit tests
-// can swap in a fakeCommandRunner. Production uses execCommandRunner.
-var initRunner commandRunner = execCommandRunner{}
-
-// AppsInit initializes a Miaoda app's code and local development environment.
-var AppsInit = common.Shortcut{
-	Service:     appsService,
-	Command:     "+init",
-	Description: "Initialize a Miaoda app's code and local development environment",
-	Risk:        "write",
-	Tips: []string{
-		"Example: lark-cli apps +init --app-id <app_id> --dir <dir>",
-		"Example: lark-cli apps +init --app-id <app_id> --dir <dir> --dry-run",
-	},
-	// +init makes no direct lark API calls (it shells out to the
-	// +git-credential-init subprocess, which enforces its own scopes), so it
-	// declares no scopes of its own. Explicit []string{} (not nil) per the
-	// convention enforced by TestAllShortcutsScopesNotNil.
-	Scopes:    []string{},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		// NOTE: --app-id is intentionally NOT Required:true. The framework maps
-		// Required:true to cobra's MarkFlagRequired, whose error is plain-text
-		// exit-1 (root.go handleRootError case 4), bypassing the structured
-		// envelope. The spec and the E2E assert exit-2 + a structured
-		// {"ok":false,"error":{...}} envelope for missing --app-id, so the empty
-		// check lives in Validate (output.ErrValidation -> ExitValidation=2).
-		{Name: "app-id", Desc: "Miaoda app ID"},
-		{Name: "dir", Desc: "clone target directory; absolute or relative path (default ./<app-id>)"},
-		{Name: "template", Desc: "code-init template for an empty repo; optional — if omitted, derived from the app's tech stack"},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		if strings.TrimSpace(rctx.Str("app-id")) == "" {
-			return output.ErrValidation("--app-id is required")
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		template := resolveTemplate(rctx, appID)
-		dry := common.NewDryRunAPI().
-			Desc("Initialize Miaoda app code (credential-init, clone, checkout, npx code-init, optional commit/push)").
-			Set("credential_init", fmt.Sprintf("apps +git-credential-init --app-id %s --format json", appID)).
-			Set("checkout", "git checkout "+defaultInitBranch).
-			Set("scaffold", fmt.Sprintf("empty repo: npx -y --prefer-online %s app init --template %s --app-id %s; non-empty: npx -y --prefer-online %s app sync + .spark/meta.json app_id patch + conditional skills sync --local", miaodaCLIPkg, template, appID, miaodaCLIPkg)).
-			Set("commit_push", "conditional: git add -A + commit + push origin "+defaultInitBranch+" when the working tree has changes").
-			Set("template", template).
-			Set("env_pull", fmt.Sprintf("apps +env-pull --app-id %s --project-path <clone_path> --format json (after successful init)", appID))
-		dir, err := resolveTargetPath(rctx, appID)
-		if err != nil {
-			dry.Set("dir_error", err.Error())
-			dir = defaultCloneDir(appID)
-		} else if isAlreadyInitialized(dir) {
-			dry.Set("already_initialized", true)
-		} else if e := ensureEmptyDir(dir); e != nil {
-			dry.Set("dir_error", e.Error())
-		}
-		dry.Set("clone", fmt.Sprintf("git clone -- <repository_url-from-credential-init> %s", dir))
-		dry.Set("clone_path", dir)
-		return dry
-	},
-	Execute: appsInitExecute,
-}
-
-// defaultCloneDir returns the default clone target (./<app-id>) for an app ID.
-func defaultCloneDir(appID string) string {
-	return filepath.Join(".", appID)
-}
-
-// resolveTemplate returns the scaffold template for an empty-repo `app init`.
-// An explicit --template wins. When omitted, it should be derived from the
-// app's tech stack.
-// TODO(apps-init): look up the app by appID via the apps API (e.g. `apps +list`
-// or a get-app endpoint), read its tech stack, and map tech-stack -> template
-// through a (future) enum. Until that lands, fall back to defaultTemplate.
-func resolveTemplate(rctx *common.RuntimeContext, appID string) string {
-	if t := strings.TrimSpace(rctx.Str("template")); t != "" {
-		return t
-	}
-	// TODO(apps-init): derive from app tech stack (apps API + enum mapping).
-	return defaultTemplate
-}
-
-// initLogf writes a one-line progress message to stderr. stdout stays reserved
-// for the structured JSON envelope, so progress never pollutes it. Callers must
-// never pass a raw repository_url (it may embed a token) — pass step names,
-// clone_path, branch, or scaffold kind, and route any URL through
-// redactURLCredentials first.
-func initLogf(rctx *common.RuntimeContext, format string, args ...interface{}) {
-	fmt.Fprintf(rctx.IO().ErrOut, "→ "+format+"\n", args...)
-}
-
-// resolveTargetPath computes the absolute clone target from --dir (or the
-// ./<app-id> default). Unlike the prior SafeInputPath approach it does NOT
-// confine to cwd — the clone destination is user-chosen (the skill prompts for
-// it). It rejects empty input and control characters; symlink/no-clobber
-// guarding happens in ensureEmptyDir.
-func resolveTargetPath(rctx *common.RuntimeContext, appID string) (string, error) {
-	raw := strings.TrimSpace(rctx.Str("dir"))
-	if raw == "" {
-		raw = defaultCloneDir(appID)
-	}
-	// Reject ALL control characters (incl. tab/newline — a newline in an echoed
-	// path is a log-injection vector); charcheck additionally rejects dangerous
-	// Unicode (bidi overrides, zero-width) that IsControl does not.
-	if strings.IndexFunc(raw, unicode.IsControl) >= 0 {
-		return "", output.ErrValidation("--dir must not contain control characters")
-	}
-	if err := charcheck.RejectControlChars(raw, "--dir"); err != nil {
-		return "", output.ErrValidation("%v", err)
-	}
-	abs, err := filepath.Abs(raw) //nolint:forbidigo // shortcuts cannot import internal/vfs (depguard rule shortcuts-no-vfs); raw is control-char-validated above, and FileIO.ResolvePath cannot resolve a clone target (it rejects absolute paths).
-	if err != nil {
-		return "", output.ErrValidation("--dir cannot be resolved: %v", err)
-	}
-	return abs, nil
-}
-
-// ensureEmptyDir refuses to clone into an existing non-empty dir, a symlink, or
-// a non-directory. A non-existent path is fine (git clone creates it). Uses
-// Lstat so a symlinked target is rejected rather than followed.
-func ensureEmptyDir(dir string) error {
-	info, err := os.Lstat(dir) //nolint:forbidigo // shortcuts cannot import internal/vfs (depguard rule shortcuts-no-vfs); dir is the validated clone target, and lstat is required to reject a symlink (FileIO has no Lstat; its Stat follows symlinks).
-	if os.IsNotExist(err) {
-		return nil
-	}
-	if err != nil {
-		return output.ErrValidation("--dir cannot be read: %v", err)
-	}
-	if info.Mode()&os.ModeSymlink != 0 {
-		return output.ErrValidation("--dir must not be a symlink: %q", dir)
-	}
-	if !info.IsDir() {
-		return output.ErrValidation("--dir exists and is not a directory: %q", dir)
-	}
-	entries, err := os.ReadDir(dir) //nolint:forbidigo // shortcuts cannot import internal/vfs (depguard rule shortcuts-no-vfs); dir is the validated clone target, and FileIO has no ReadDir.
-	if err != nil {
-		return output.ErrValidation("--dir cannot be read: %v", err)
-	}
-	if len(entries) > 0 {
-		return output.ErrValidation("target directory %q already exists and is not empty", dir)
-	}
-	return nil
-}
-
-// isAlreadyInitialized reports whether dir is an already-initialized Miaoda app
-// repo, detected by the presence of <dir>/.spark/meta.json (regardless of its
-// app_id value). Used to short-circuit +init into a friendly no-op.
-func isAlreadyInitialized(dir string) bool {
-	info, err := os.Stat(filepath.Join(dir, metaRelPath)) //nolint:forbidigo // shortcuts cannot import internal/vfs (depguard rule shortcuts-no-vfs); path is under the validated clone dir, and FileIO.Stat rejects absolute paths.
-	return err == nil && !info.IsDir()
-}
-
-// ensureMetaAppID patches <dir>/.spark/meta.json to include app_id when the file
-// exists but lacks (or has an empty) app_id. Other fields are preserved. When
-// the file does not exist, this is a no-op (we never create it).
-func ensureMetaAppID(dir, appID string) error {
-	path := filepath.Join(dir, metaRelPath)
-	b, err := os.ReadFile(path) //nolint:forbidigo // shortcuts cannot import internal/vfs (depguard rule shortcuts-no-vfs); path is under the validated clone dir, and FileIO.Open rejects absolute paths.
-	if os.IsNotExist(err) {
-		return nil
-	}
-	if err != nil {
-		return output.Errorf(output.ExitAPI, "meta_write", "read %s failed: %v", metaRelPath, err)
-	}
-	var m map[string]interface{}
-	if err := json.Unmarshal(b, &m); err != nil {
-		return output.Errorf(output.ExitAPI, "meta_write", "parse %s failed: %v", metaRelPath, err)
-	}
-	if cur, _ := m["app_id"].(string); strings.TrimSpace(cur) != "" {
-		return nil
-	}
-	if m == nil {
-		m = map[string]interface{}{}
-	}
-	m["app_id"] = appID
-	out, err := json.MarshalIndent(m, "", "  ")
-	if err != nil {
-		return output.Errorf(output.ExitAPI, "meta_write", "marshal %s failed: %v", metaRelPath, err)
-	}
-	if err := os.WriteFile(path, append(out, '\n'), 0o644); err != nil { //nolint:forbidigo // shortcuts cannot import internal/vfs (depguard rule shortcuts-no-vfs); path is under the validated clone dir, and FileIO.Save rejects absolute paths.
-		return output.Errorf(output.ExitAPI, "meta_write", "write %s failed: %v", metaRelPath, err)
-	}
-	return nil
-}
-
-// hasSteeringSkills reports whether <dir>/.agent/skills/steering exists as a dir.
-func hasSteeringSkills(dir string) bool {
-	info, err := os.Stat(filepath.Join(dir, steeringRelPath)) //nolint:forbidigo // shortcuts cannot import internal/vfs (depguard rule shortcuts-no-vfs); path is under the validated clone dir, and FileIO.Stat rejects absolute paths.
-	return err == nil && info.IsDir()
-}
-
-// isEmptyRepo reports whether the checked-out branch has no tracked files
-// other than the backend's default seed README.md. `git ls-files` listing
-// nothing — or only README.md — counts as empty (→ scaffold via `app init`).
-func isEmptyRepo(ctx context.Context, dir string) (bool, error) {
-	stdout, stderr, err := initRunner.Run(ctx, dir, "git", "ls-files")
-	if err != nil {
-		return false, output.Errorf(output.ExitAPI, "git_ls_files", "git ls-files failed: %s", gitErr(stderr, err))
-	}
-	for _, line := range strings.Split(strings.TrimSpace(stdout), "\n") {
-		f := strings.TrimSpace(line)
-		// Match the seed exactly (case- and path-sensitive): only a root-level
-		// "README.md" is the backend's default seed. A docs/README.md or readme.md
-		// is treated as real content (→ non-empty), which is the safe direction
-		// (skip scaffolding rather than risk overwriting). Extend this allow-list
-		// here if the backend's seed set grows.
-		if f == "" || f == seedReadme {
-			continue
-		}
-		return false, nil // a non-README tracked file → non-empty repo
-	}
-	return true, nil
-}
-
-// runScaffold runs the npx scaffolding step inside the cloned repo (cwd=dir).
-// Empty repo -> `app init`; non-empty -> `app sync` + meta app_id patch +
-// conditional `skills sync`. Returns "init" or "upgrade".
-func runScaffold(ctx context.Context, dir, appID, template string) (string, error) {
-	empty, err := isEmptyRepo(ctx, dir)
-	if err != nil {
-		return "", err
-	}
-	if empty {
-		// isEmptyRepo treats a repo with no tracked files — or only the backend's
-		// seed README.md — as empty. If other seed files (e.g. .gitignore) can
-		// appear, extend isEmptyRepo's allow-list accordingly.
-		if _, stderr, err := initRunner.Run(ctx, dir, "npx", "-y", "--prefer-online", miaodaCLIPkg, "app", "init", "--template", template, "--app-id", appID); err != nil {
-			return "", output.Errorf(output.ExitAPI, "npx_app_init", "npx app init failed: %s", gitErr(stderr, err))
-		}
-		return scaffoldKindInit, nil
-	}
-	if _, stderr, err := initRunner.Run(ctx, dir, "npx", "-y", "--prefer-online", miaodaCLIPkg, "app", "sync"); err != nil {
-		return "", output.Errorf(output.ExitAPI, "npx_app_sync", "npx app sync failed: %s", gitErr(stderr, err))
-	}
-	if err := ensureMetaAppID(dir, appID); err != nil {
-		return "", err
-	}
-	if !hasSteeringSkills(dir) {
-		if _, stderr, err := initRunner.Run(ctx, dir, "npx", "-y", "--prefer-online", miaodaCLIPkg, "skills", "sync", "--local"); err != nil {
-			return "", output.Errorf(output.ExitAPI, "npx_skills_sync", "npx skills sync failed: %s", gitErr(stderr, err))
-		}
-	}
-	return scaffoldKindUpgrade, nil
-}
-
-// parseRepoURLFromEnvelope extracts data.repository_url from a lark-cli JSON
-// envelope ({"ok":true,"data":{"repository_url":"..."}}). The field name
-// matches the contract emitted by `apps +git-credential-init`.
-func parseRepoURLFromEnvelope(stdout string) (string, error) {
-	var env struct {
-		OK   bool `json:"ok"`
-		Data struct {
-			RepositoryURL string `json:"repository_url"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal([]byte(stdout), &env); err != nil {
-		return "", output.Errorf(output.ExitInternal, "credential_init", "could not parse +git-credential-init output as JSON: %v", err)
-	}
-	if !env.OK {
-		return "", output.Errorf(output.ExitInternal, "credential_init", "+git-credential-init reported failure")
-	}
-	if strings.TrimSpace(env.Data.RepositoryURL) == "" {
-		return "", output.Errorf(output.ExitInternal, "credential_init", "+git-credential-init returned no repository_url")
-	}
-	return env.Data.RepositoryURL, nil
-}
-
-// parseEnvFileFromEnvelope extracts data.env_file from a `+env-pull` success
-// envelope ({"ok":true,"data":{"env_file":"..."}}) on stdout.
-func parseEnvFileFromEnvelope(stdout string) (string, error) {
-	var env struct {
-		OK   bool `json:"ok"`
-		Data struct {
-			EnvFile string `json:"env_file"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal([]byte(stdout), &env); err != nil {
-		return "", output.Errorf(output.ExitInternal, "env_pull", "could not parse +env-pull output as JSON: %v", err)
-	}
-	if !env.OK {
-		return "", output.Errorf(output.ExitInternal, "env_pull", "+env-pull reported failure")
-	}
-	if strings.TrimSpace(env.Data.EnvFile) == "" {
-		return "", output.Errorf(output.ExitInternal, "env_pull", "+env-pull returned no env_file")
-	}
-	return env.Data.EnvFile, nil
-}
-
-// parseEnvPullErrorEnvelope extracts a single-line reason from a `+env-pull`
-// error envelope ({"ok":false,"error":{"type":...,"message":...}}) on stderr.
-// Returns "" when stderr is not a parseable error envelope (caller falls back).
-func parseEnvPullErrorEnvelope(stderr string) string {
-	var env struct {
-		Error struct {
-			Type    string `json:"type"`
-			Message string `json:"message"`
-		} `json:"error"`
-	}
-	if err := json.Unmarshal([]byte(strings.TrimSpace(stderr)), &env); err != nil {
-		return ""
-	}
-	msg := strings.TrimSpace(env.Error.Message)
-	if msg == "" {
-		return ""
-	}
-	if t := strings.TrimSpace(env.Error.Type); t != "" {
-		return t + ": " + msg
-	}
-	return msg
-}
-
-// validateRepoURLScheme rejects any repository_url that is not http(s):// to
-// block git's dangerous transports (ext::, file://, ssh://) and option injection.
-func validateRepoURLScheme(repoURL string) error {
-	if strings.HasPrefix(repoURL, "http://") || strings.HasPrefix(repoURL, "https://") {
-		return nil
-	}
-	return output.Errorf(output.ExitValidation, "validation",
-		"repository_url from +git-credential-init must be http(s); refusing %q", redactURLCredentials(repoURL))
-}
-
-func appsInitExecute(ctx context.Context, rctx *common.RuntimeContext) error {
-	appID := strings.TrimSpace(rctx.Str("app-id"))
-
-	dir, err := resolveTargetPath(rctx, appID)
-	if err != nil {
-		return err
-	}
-
-	// Already-initialized short-circuit: a dir containing .spark/meta.json is an
-	// initialized Miaoda app repo -> skip clone/scaffold/commit, but still refresh
-	// the local env so a re-run picks up the latest startup env vars.
-	if isAlreadyInitialized(dir) {
-		initLogf(rctx, "Already initialized at %s — refreshing local environment", dir)
-		out := map[string]interface{}{
-			"app_id":     appID,
-			"clone_path": dir,
-			"scaffold":   "already_initialized",
-			"committed":  false,
-			"pushed":     false,
-		}
-		initLogf(rctx, "Pulling local environment variables...")
-		envFile, envPullErr := pullEnv(ctx, rctx, appID, dir)
-		envPulled := envPullErr == ""
-		out["env_pulled"] = envPulled
-		if envPulled {
-			initLogf(rctx, "Local environment written to %s", envFile)
-			out["env_file"] = envFile
-			out["message"] = "Repository already initialized. Local env refreshed — you can start developing."
-		} else {
-			initLogf(rctx, "Could not pull local env vars: %s", envPullErr)
-			out["env_pull_error"] = envPullErr
-			out["message"] = fmt.Sprintf("Repository already initialized. Could not pull local env vars automatically — run `lark-cli apps +env-pull --app-id %s` to retry.", appID)
-		}
-		rctx.OutFormat(out, nil, func(w io.Writer) {
-			fmt.Fprintf(w, "✓ Already initialized at %s\n", dir)
-			if envPulled {
-				fmt.Fprintf(w, "✓ Local environment written to %s\n", envFile)
-			} else {
-				fmt.Fprintf(w, "⚠ Could not pull local env vars: %s\n", envPullErr)
-				fmt.Fprintf(w, "  run `lark-cli apps +env-pull --app-id %s` to retry\n", appID)
-			}
-			fmt.Fprintln(w, "仓库已初始化完成，可以开始开发了。")
-		})
-		return nil
-	}
-
-	if _, err := exec.LookPath("git"); err != nil {
-		return output.ErrWithHint(output.ExitInternal, "dependency",
-			"git executable not found on PATH", "install git and ensure it is on your PATH")
-	}
-	if _, err := exec.LookPath("npx"); err != nil {
-		return output.ErrWithHint(output.ExitInternal, "dependency",
-			"npx executable not found on PATH", "install Node.js (which provides npx) and ensure it is on your PATH")
-	}
-
-	if err := ensureEmptyDir(dir); err != nil {
-		return err
-	}
-
-	initLogf(rctx, "Issuing repository credentials for %s...", appID)
-	repoURL, err := issueCredentials(ctx, rctx, appID)
-	if err != nil {
-		return err
-	}
-	if err := validateRepoURLScheme(repoURL); err != nil {
-		return err
-	}
-
-	initLogf(rctx, "Cloning into %s...", dir)
-	if _, stderr, err := initRunner.Run(ctx, "", "git", "clone", "--", repoURL, dir); err != nil {
-		return output.Errorf(output.ExitAPI, "git_clone", "git clone failed: %s", gitErr(stderr, err))
-	}
-	initLogf(rctx, "Checking out %s...", defaultInitBranch)
-	if _, stderr, err := initRunner.Run(ctx, dir, "git", "checkout", defaultInitBranch); err != nil {
-		return output.Errorf(output.ExitAPI, "git_checkout", "git checkout %s failed: %s", defaultInitBranch, gitErr(stderr, err))
-	}
-
-	initLogf(rctx, "Initializing app code (running miaoda-cli)...")
-	scaffold, err := runScaffold(ctx, dir, appID, resolveTemplate(rctx, appID))
-	if err != nil {
-		return err
-	}
-
-	committed, pushed, err := commitAndPushIfDirty(ctx, dir, scaffold)
-	if err != nil {
-		return err
-	}
-	if pushed {
-		initLogf(rctx, "Committed and pushed to %s", defaultInitBranch)
-	} else {
-		initLogf(rctx, "Working tree clean — skipped commit/push")
-	}
-
-	initLogf(rctx, "Pulling local environment variables...")
-	envFile, envPullErr := pullEnv(ctx, rctx, appID, dir)
-	envPulled := envPullErr == ""
-	if envPulled {
-		initLogf(rctx, "Local environment written to %s", envFile)
-	} else {
-		initLogf(rctx, "Could not pull local env vars: %s", envPullErr)
-	}
-
-	out := map[string]interface{}{
-		"app_id":         appID,
-		"repository_url": redactURLCredentials(repoURL),
-		"branch":         defaultInitBranch,
-		"clone_path":     dir,
-		"scaffold":       scaffold,
-		"committed":      committed,
-		"pushed":         pushed,
-		"env_pulled":     envPulled,
-		"message":        "Repository initialized. You can start developing.",
-	}
-	if envPulled {
-		out["env_file"] = envFile
-	} else {
-		out["env_pull_error"] = envPullErr
-		out["message"] = fmt.Sprintf("Repository initialized. Could not pull local env vars automatically — run `lark-cli apps +env-pull --app-id %s` to retry.", appID)
-	}
-	rctx.OutFormat(out, nil, func(w io.Writer) {
-		fmt.Fprintf(w, "✓ Repository initialized at %s\n", dir)
-		fmt.Fprintf(w, "  branch: %s\n  scaffold: %s\n", defaultInitBranch, scaffold)
-		if envPulled {
-			fmt.Fprintf(w, "✓ Local environment written to %s\n", envFile)
-		} else {
-			fmt.Fprintf(w, "⚠ Could not pull local env vars: %s\n", envPullErr)
-			fmt.Fprintf(w, "  run `lark-cli apps +env-pull --app-id %s` to retry\n", appID)
-		}
-		fmt.Fprintln(w, "仓库已初始化完成，可以开始开发了。")
-	})
-	return nil
-}
-
-// pullEnv runs `<self> apps +env-pull --app-id <appID> --project-path <dir>
-// --format json`, forwarding --as when set. Returns (envFile, "") on success or
-// ("", reason) on failure. Non-fatal by contract: the caller logs a warning and
-// continues. The success envelope is read from stdout, the error envelope from
-// stderr (lark-cli writes structured errors to stderr; see cmd/root.go
-// handleRootError). The reason is always redacted.
-func pullEnv(ctx context.Context, rctx *common.RuntimeContext, appID, dir string) (envFile, reason string) {
-	self, err := os.Executable()
-	if err != nil {
-		return "", redactURLCredentials(fmt.Sprintf("cannot locate lark-cli executable: %v", err))
-	}
-	args := []string{"apps", "+env-pull", "--app-id", appID, "--project-path", dir, "--format", "json"}
-	if as := strings.TrimSpace(rctx.Str("as")); as != "" {
-		args = append(args, "--as", as)
-	}
-	stdout, stderr, runErr := initRunner.Run(ctx, "", self, args...)
-	if runErr != nil {
-		r := parseEnvPullErrorEnvelope(stderr)
-		if r == "" {
-			r = gitErr(stderr, runErr)
-		}
-		return "", redactURLCredentials(r)
-	}
-	envFile, perr := parseEnvFileFromEnvelope(stdout)
-	if perr != nil {
-		return "", redactURLCredentials(perr.Error())
-	}
-	return envFile, ""
-}
-
-// issueCredentials runs `<self> apps +git-credential-init --app-id <id> --format json`
-// and returns the repo_url it reports. Forwards --as when set.
-func issueCredentials(ctx context.Context, rctx *common.RuntimeContext, appID string) (string, error) {
-	self, err := os.Executable()
-	if err != nil {
-		return "", output.Errorf(output.ExitInternal, "internal", "cannot locate lark-cli executable: %v", err)
-	}
-	args := []string{"apps", "+git-credential-init", "--app-id", appID, "--format", "json"}
-	if as := strings.TrimSpace(rctx.Str("as")); as != "" {
-		args = append(args, "--as", as)
-	}
-	stdout, stderr, err := initRunner.Run(ctx, "", self, args...)
-	if err != nil {
-		return "", output.ErrWithHint(output.ExitAPI, "credential_init",
-			fmt.Sprintf("apps +git-credential-init failed: %s", gitErr(stderr, err)),
-			"ensure apps +git-credential-init is available and you are logged in")
-	}
-	return parseRepoURLFromEnvelope(stdout)
-}
-
-// commitAndPushIfDirty commits and pushes only when the working tree has
-// changes; a clean tree is a no-op (returns false,false). For the empty-repo
-// init path (scaffoldKind == "init") it splits the scaffolded tree into two
-// commits — app project code, then Miaoda config (.spark/.agent) — skipping
-// either commit when that group has no changes (no empty commits). Other paths
-// commit once. Push is a single `git push origin <branch>` for all commits.
-func commitAndPushIfDirty(ctx context.Context, dir, scaffoldKind string) (committed, pushed bool, err error) {
-	status, stderr, runErr := initRunner.Run(ctx, dir, "git", "status", "--porcelain")
-	if runErr != nil {
-		return false, false, output.Errorf(output.ExitAPI, "git_status", "git status failed: %s", gitErr(stderr, runErr))
-	}
-	if strings.TrimSpace(status) == "" {
-		return false, false, nil
-	}
-
-	if scaffoldKind == scaffoldKindInit {
-		// Stage each group by its exact porcelain paths (never gitignored files),
-		// so neither `git add` errors on an ignored path like .agent.
-		appPaths, configPaths := classifyPorcelain(status)
-		if len(appPaths) > 0 {
-			if e := stageAndCommit(ctx, dir, commitMsgAppCode, appPaths...); e != nil {
-				return committed, false, e
-			}
-			committed = true
-		}
-		if len(configPaths) > 0 {
-			if e := stageAndCommit(ctx, dir, commitMsgAppConfig, configPaths...); e != nil {
-				return committed, false, e
-			}
-			committed = true
-		}
-	} else {
-		if e := stageAndCommit(ctx, dir, commitMsgUpgrade, "."); e != nil {
-			return false, false, e
-		}
-		committed = true
-	}
-
-	if !committed {
-		return false, false, nil
-	}
-
-	if _, se, e := initRunner.Run(ctx, dir, "git", "push", "origin", defaultInitBranch); e != nil {
-		return true, false, withAppsHint(
-			output.Errorf(output.ExitAPI, "git_push", "git push failed: %s", gitErr(se, e)),
-			"the push was rejected — the git output is in the message above; if it is a non-fast-forward (remote has new commits), sync the remote and retry; if it is an auth failure, make sure `lark-cli apps +git-credential-init` has succeeded")
-	}
-	return true, true, nil
-}
-
-// stageAndCommit stages the given pathspecs (`git add -A -- <pathspecs>`) and
-// makes one `git commit --no-verify -m message`. --no-verify skips the scaffold
-// repo's local pre-commit / commit-msg hooks (local only; the later push is not
-// --no-verify). Callers gate this on classifyPorcelain so the group is non-empty
-// and the commit never hits "nothing to commit".
-func stageAndCommit(ctx context.Context, dir, message string, pathspecs ...string) error {
-	addArgs := append([]string{"add", "-A", "--"}, pathspecs...)
-	if _, se, e := initRunner.Run(ctx, dir, "git", addArgs...); e != nil {
-		return output.Errorf(output.ExitAPI, "git_add", "git add failed: %s", gitErr(se, e))
-	}
-	if _, se, e := initRunner.Run(ctx, dir, "git", "commit", "--no-verify", "-m", message); e != nil {
-		return output.Errorf(output.ExitAPI, "git_commit", "git commit failed: %s", gitErr(se, e))
-	}
-	return nil
-}
-
-// classifyPorcelain parses `git status --porcelain` output and partitions the
-// changed paths into the "app code" group (anything outside .spark/ and .agent/)
-// and the "Miaoda config" group (.spark/ and .agent/). It returns the exact
-// porcelain paths so callers can stage them verbatim: porcelain never lists
-// gitignored files, so `git add -- <these paths>` never trips git's ignored-path
-// error. (Naming an ignored dir explicitly — or combining a "." pathspec with
-// :(exclude) magic — DOES error when a scaffold template gitignores e.g. .agent,
-// which is why we stage exact paths instead of pathspecs.)
-func classifyPorcelain(status string) (appPaths, configPaths []string) {
-	for _, line := range strings.Split(status, "\n") {
-		p := porcelainPath(line)
-		if p == "" {
-			continue
-		}
-		if isConfigPath(p) {
-			configPaths = append(configPaths, p)
-		} else {
-			appPaths = append(appPaths, p)
-		}
-	}
-	return appPaths, configPaths
-}
-
-// porcelainPath extracts the path from a `git status --porcelain` v1 line.
-// Format is "XY <path>" (2 status chars + space); rename/copy lines are
-// "XY <orig> -> <dest>" (dest is what matters). Quoted paths are unquoted.
-func porcelainPath(line string) string {
-	if len(line) < 4 {
-		return ""
-	}
-	p := line[3:]
-	if i := strings.Index(p, " -> "); i >= 0 {
-		p = p[i+len(" -> "):]
-	}
-	p = strings.TrimSpace(p)
-	p = strings.Trim(p, `"`)
-	return p
-}
-
-// isConfigPath reports whether p is the Miaoda app-config group: the .spark or
-// .agent directory itself, or anything under them. ".sparkrc" is NOT config.
-func isConfigPath(p string) bool {
-	return p == ".spark" || p == ".agent" ||
-		strings.HasPrefix(p, ".spark/") || strings.HasPrefix(p, ".agent/")
-}
-
-// gitErr builds a redacted, single-line error detail from stderr (falling back
-// to the exec error). Always redacts embedded credentials.
-func gitErr(stderr string, err error) string {
-	s := strings.TrimSpace(stderr)
-	if s == "" && err != nil {
-		s = err.Error()
-	}
-	return redactURLCredentials(s)
-}
--- a/shortcuts/apps/apps_init_test.go
+++ b/shortcuts/apps/apps_init_test.go
--- a/shortcuts/apps/apps_jq_tips_test.go
+++ b/shortcuts/apps/apps_jq_tips_test.go
@@ -1,30 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestListyCommandsHaveJqTip(t *testing.T) {
-	wantCmds := map[string]bool{
-		"+list": true, "+db-table-list": true, "+db-table-schema": true,
-		"+db-sql": true, "+release-list": true, "+session-list": true,
-	}
-	for _, s := range Shortcuts() {
-		if !wantCmds[s.Command] {
-			continue
-		}
-		has := false
-		for _, tip := range s.Tips {
-			if strings.Contains(tip, "--jq") || strings.Contains(tip, "-q '") {
-				has = true
-			}
-		}
-		if !has {
-			t.Errorf("%s should have a --jq filter tip", s.Command)
-		}
-	}
-}
--- a/shortcuts/apps/apps_list.go
+++ b/shortcuts/apps/apps_list.go
@@ -12,30 +12,23 @@ import (
 	"github.com/larksuite/cli/shortcuts/common"
 )

-// AppsList lists Miaoda apps visible to the calling user (cursor pagination).
+// AppsList lists Miaoda apps owned by the calling user (cursor pagination).
 //
-// Supports name fuzzy match (--keyword), ownership-dimension filter
-// (--ownership: all / mine / shared), and app-type filter (--app-type). See
-// lark-apps SKILL.md for when an agent should use this to resolve an app_id
-// from a user-supplied name (only when the user named an app and a downstream
-// op needs its app_id — never unconditional enumeration).
+// Hidden from --help / tab completion (Hidden: true) so agents do not discover it
+// as a way to enumerate / search applications. Direct invocation still works for
+// humans who know the command. When agents need an existing app_id, they should
+// ask the user to provide either the Miaoda app URL (extract app_id from the
+// path segment after /app/) or the app_id string directly; see lark-apps SKILL.md.
 var AppsList = common.Shortcut{
 	Service:     appsService,
 	Command:     "+list",
-	Description: "List Miaoda apps visible to the calling user (cursor pagination)",
+	Description: "List Miaoda apps owned by the calling user (cursor pagination)",
 	Risk:        "read",
-	Tips: []string{
-		"Example: lark-cli apps +list",
-		"Example: lark-cli apps +list --keyword <keyword>",
-		"Tip: filter fields with --jq, e.g. -q '.data.items[].app_id'",
-	},
-	Scopes:    []string{"spark:app:read"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
+	Scopes:      []string{"spark:app:read"},
+	AuthTypes:   []string{"user"},
+	HasFormat:   true,
+	Hidden:      true,
 	Flags: []common.Flag{
-		{Name: "keyword", Desc: "fuzzy match on app name"},
-		{Name: "ownership", Desc: "ownership filter: all (created by me + shared with me) | mine | shared", Enum: []string{"all", "mine", "shared"}},
-		{Name: "app-type", Desc: "app type filter (html or full_stack)", Enum: []string{"html", "full_stack"}},
 		{Name: "page-size", Type: "int", Default: "20", Desc: "page size"},
 		{Name: "page-token", Desc: "pagination cursor from previous response"},
 	},
@@ -46,42 +39,18 @@ var AppsList = common.Shortcut{
 			Params(buildAppsListParams(rctx))
 	},
 	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		data, err := rctx.CallAPITyped("GET", apiBasePath+"/apps", buildAppsListParams(rctx), nil)
+		data, err := rctx.CallAPI("GET", apiBasePath+"/apps", buildAppsListParams(rctx), nil)
 		if err != nil {
 			return err
 		}
-		// Project away icon_url (an image URL agents can't render) and created_at
-		// (redundant with updated_at) from every item BEFORE OutFormat, so json /
-		// table / pretty are all lean. Every other field (description, etc.) is kept.
-		rawItems, _ := data["items"].([]interface{})
-		items := make([]interface{}, 0, len(rawItems))
-		for _, item := range rawItems {
-			m, ok := item.(map[string]interface{})
-			if !ok {
-				items = append(items, item)
-				continue
-			}
-			out := make(map[string]interface{}, len(m))
-			for k, v := range m {
-				if k == "icon_url" || k == "created_at" {
-					continue
-				}
-				out[k] = v
-			}
-			items = append(items, out)
-		}
-		data["items"] = items
+		items, _ := data["items"].([]interface{})
 		rctx.OutFormat(data, nil, func(w io.Writer) {
-			// Curated pretty view (--format pretty) shows the columns most useful
-			// for visual scanning: app_id (to copy-paste downstream), name (to match
-			// what the user sees in the UI), is_published / online_url (publish state
-			// and post-publish access link — the actionable fields after a deploy),
-			// and updated_at (to pick the most recent variant). online_url can be long
-			// but is the key value once published; the renderer clamps column width.
-			// Unpublished apps carry no online_url, so that cell renders empty.
-			// description stays in the underlying data (--format json / table) but
-			// would make the curated view too wide. icon_url / created_at are trimmed
-			// from the data entirely above (not useful to an agent).
+			// Table view (--format table) intentionally shows only the columns
+			// most useful for visual scanning: app_id (to copy-paste downstream),
+			// name (to match what the user sees in the UI), and updated_at (to
+			// pick the most recent variant). description / icon_url / created_at
+			// stay in the underlying JSON (--format json) but would make the
+			// table too wide for a terminal.
 			rows := make([]map[string]interface{}, 0, len(items))
 			for _, item := range items {
 				m, ok := item.(map[string]interface{})
@@ -89,11 +58,9 @@ var AppsList = common.Shortcut{
 					continue
 				}
 				rows = append(rows, map[string]interface{}{
-					"app_id":       m["app_id"],
-					"name":         m["name"],
-					"is_published": m["is_published"],
-					"online_url":   m["online_url"],
-					"updated_at":   m["updated_at"],
+					"app_id":     m["app_id"],
+					"name":       m["name"],
+					"updated_at": m["updated_at"],
 				})
 			}
 			output.PrintTable(w, rows)
@@ -109,14 +76,5 @@ func buildAppsListParams(rctx *common.RuntimeContext) map[string]interface{} {
 	if token := strings.TrimSpace(rctx.Str("page-token")); token != "" {
 		params["page_token"] = token
 	}
-	if kw := strings.TrimSpace(rctx.Str("keyword")); kw != "" {
-		params["keyword"] = kw
-	}
-	if ownership := strings.TrimSpace(rctx.Str("ownership")); ownership != "" {
-		params["ownership"] = ownership
-	}
-	if at := strings.TrimSpace(rctx.Str("app-type")); at != "" {
-		params["app_type"] = at
-	}
 	return params
 }
--- a/shortcuts/apps/apps_list_test.go
+++ b/shortcuts/apps/apps_list_test.go
@@ -63,56 +63,6 @@ func TestAppsList_WithPageToken(t *testing.T) {
 	}
 }

-func TestAppsList_WithKeywordOwnershipAppType(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps?app_type=html&keyword=%E9%97%AE%E5%8D%B7&ownership=mine&page_size=20",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{"items": []interface{}{}, "has_more": false},
-		},
-	})
-	if err := runAppsShortcut(t, AppsList,
-		[]string{"+list", "--keyword", "问卷", "--ownership", "mine", "--app-type", "html", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-}
-
-func TestAppsList_InvalidOwnership(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsList,
-		[]string{"+list", "--ownership", "bogus", "--as", "user"}, factory, stdout)
-	if err == nil {
-		t.Fatalf("expected enum validation error for --ownership bogus")
-	}
-}
-
-func TestAppsList_InvalidAppType(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	err := runAppsShortcut(t, AppsList,
-		[]string{"+list", "--app-type", "HTML", "--as", "user"}, factory, stdout)
-	if err == nil {
-		t.Fatalf("expected enum validation error for --app-type HTML (hard cut to lowercase)")
-	}
-}
-
-func TestAppsList_DryRunWithFilters(t *testing.T) {
-	factory, stdout, _ := newAppsExecuteFactory(t)
-	if err := runAppsShortcut(t, AppsList,
-		[]string{"+list", "--keyword", "q", "--ownership", "all", "--app-type", "full_stack", "--dry-run", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("dry-run err=%v", err)
-	}
-	got := stdout.String()
-	for _, want := range []string{"keyword", "ownership", "app_type", "full_stack"} {
-		if !strings.Contains(got, want) {
-			t.Fatalf("dry-run missing %q: %s", want, got)
-		}
-	}
-}
-
 func TestAppsList_DryRun(t *testing.T) {
 	factory, stdout, _ := newAppsExecuteFactory(t)
 	if err := runAppsShortcut(t, AppsList,
@@ -128,86 +78,3 @@ func TestAppsList_DryRun(t *testing.T) {
 		t.Fatalf("dry-run missing page_size param: %s", got)
 	}
 }
-
-func TestAppsList_TrimsIconURLAndCreatedAt(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps?page_size=20",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"items": []interface{}{
-					map[string]interface{}{
-						"app_id":       "app_x",
-						"name":         "Trim Me",
-						"is_published": true,
-						"online_url":   "https://example.com/spark/faas/app_x",
-						"updated_at":   "2026-05-28T10:05:16Z",
-						"created_at":   "2026-05-01T08:00:00Z",
-						"icon_url":     "https://example.com/icon.png",
-						"description":  "An app to test trimming",
-					},
-				},
-				"page_token": "next_cursor",
-				"has_more":   true,
-			},
-		},
-	})
-
-	if err := runAppsShortcut(t, AppsList, []string{"+list", "--as", "user"}, factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	for _, drop := range []string{"icon_url", "created_at"} {
-		if strings.Contains(got, drop) {
-			t.Fatalf("default output should not contain %q:\n%s", drop, got)
-		}
-	}
-	for _, keep := range []string{"app_id", "name", "is_published", "online_url", "updated_at", "description"} {
-		if !strings.Contains(got, keep) {
-			t.Fatalf("default output missing %q:\n%s", keep, got)
-		}
-	}
-}
-
-func TestAppsList_PrettyShowsPublishFields(t *testing.T) {
-	factory, stdout, reg := newAppsExecuteFactory(t)
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps?page_size=20",
-		Body: map[string]interface{}{
-			"code": 0,
-			"data": map[string]interface{}{
-				"items": []interface{}{
-					map[string]interface{}{
-						"app_id":       "app_pub",
-						"name":         "Published App",
-						"is_published": true,
-						"online_url":   "https://example.com/spark/faas/app_pub",
-						"updated_at":   "2026-05-28T10:05:16Z",
-					},
-					map[string]interface{}{
-						"app_id":       "app_draft",
-						"name":         "Draft App",
-						"is_published": false,
-						"updated_at":   "2026-05-31T12:31:27Z",
-					},
-				},
-				"has_more": false,
-			},
-		},
-	})
-
-	if err := runAppsShortcut(t, AppsList,
-		[]string{"+list", "--format", "pretty", "--as", "user"},
-		factory, stdout); err != nil {
-		t.Fatalf("execute err=%v", err)
-	}
-	got := stdout.String()
-	for _, want := range []string{"is_published", "online_url", "https://example.com/spark/faas/app_pub", "true", "false"} {
-		if !strings.Contains(got, want) {
-			t.Fatalf("pretty output missing %q:\n%s", want, got)
-		}
-	}
-}
--- a/shortcuts/apps/apps_release_common.go
+++ b/shortcuts/apps/apps_release_common.go
@@ -1,40 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"io"
-
-	"github.com/larksuite/cli/internal/output"
-)
-
-// Gateway paths for the spark app.release OpenAPI methods.
-// Prefix reuses apiBasePath = "/open-apis/spark/v1" (same package).
-// Each path contains %s placeholders; use fmt.Sprintf to build the final URL.
-const (
-	releaseCreatePath = apiBasePath + "/apps/%s/releases"
-	releaseGetPath    = apiBasePath + "/apps/%s/releases/%s"
-	releaseListPath   = apiBasePath + "/apps/%s/releases"
-)
-
-// writeReleaseErrorLogTable renders a release's error_logs (a slice of
-// {step, error_log} maps from the gateway) as a two-column step/error_log
-// table via output.PrintTable. Used by +release-get to render a failed
-// release's error_logs. A nil/non-slice or
-// empty value yields an empty table (PrintTable prints "(no data)").
-func writeReleaseErrorLogTable(w io.Writer, raw interface{}) {
-	logs, _ := raw.([]interface{})
-	rows := make([]map[string]interface{}, 0, len(logs))
-	for _, l := range logs {
-		m, ok := l.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		rows = append(rows, map[string]interface{}{
-			"step":      m["step"],
-			"error_log": m["error_log"],
-		})
-	}
-	output.PrintTable(w, rows)
-}
--- a/shortcuts/apps/apps_release_create.go
+++ b/shortcuts/apps/apps_release_create.go
@@ -1,76 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// AppsReleaseCreate creates a release for a Miaoda app.
-var AppsReleaseCreate = common.Shortcut{
-	Service:     appsService,
-	Command:     "+release-create",
-	Description: "Create a release for a Miaoda app (returns release_id for status polling)",
-	Risk:        "write",
-	Tips: []string{
-		"Example: lark-cli apps +release-create --app-id <app_id>",
-		"Example: lark-cli apps +release-create --app-id <app_id> --branch sprint/default --dry-run",
-	},
-	Scopes:    []string{"spark:app:write"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app ID", Required: true},
-		{Name: "branch", Desc: "release branch (server uses default if omitted)"},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		if strings.TrimSpace(rctx.Str("app-id")) == "" {
-			return output.ErrValidation("--app-id is required")
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		branch := strings.TrimSpace(rctx.Str("branch"))
-		dry := common.NewDryRunAPI()
-		dry.POST(fmt.Sprintf(releaseCreatePath, validate.EncodePathSegment(appID))).
-			Desc("Create a release").
-			Body(buildPublishBody(branch))
-		return dry
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		branch := strings.TrimSpace(rctx.Str("branch"))
-		path := fmt.Sprintf(releaseCreatePath, validate.EncodePathSegment(appID))
-		data, err := rctx.CallAPITyped("POST", path, nil, buildPublishBody(branch))
-		if err != nil {
-			return withAppsHint(err, "if the push was rejected (non-fast-forward), sync first with `git pull --rebase origin sprint/default` then retry; inspect the failure via `lark-cli apps +release-get --app-id "+appID+" --release-id <release_id>`")
-		}
-		out := map[string]interface{}{
-			"release_id": common.GetString(data, "release_id"),
-			"status":     common.GetString(data, "status"),
-		}
-		rctx.OutFormat(out, nil, func(w io.Writer) {
-			fmt.Fprintf(w, "release_id: %s\nstatus: %s\n", out["release_id"], out["status"])
-		})
-		return nil
-	},
-}
-
-// buildPublishBody builds the create-release request body. app_id is in the
-// path, not the body. branch is included only when non-empty.
-func buildPublishBody(branch string) map[string]interface{} {
-	body := map[string]interface{}{}
-	if branch != "" {
-		body["branch"] = branch
-	}
-	return body
-}
--- a/shortcuts/apps/apps_release_create_test.go
+++ b/shortcuts/apps/apps_release_create_test.go
@@ -1,107 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"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 TestBuildPublishBody(t *testing.T) {
-	// branch included when non-empty; app_id is NOT in body (it's in the path)
-	b := buildPublishBody("feat/devops")
-	if b["branch"] != "feat/devops" {
-		t.Errorf("body = %v", b)
-	}
-	if _, ok := b["app_id"]; ok {
-		t.Errorf("app_id must not be in body, got %v", b)
-	}
-	// branch omitted when empty
-	b2 := buildPublishBody("")
-	if _, ok := b2["branch"]; ok {
-		t.Errorf("branch should be omitted when empty, got %v", b2)
-	}
-}
-
-func TestAppsReleaseCreateMeta(t *testing.T) {
-	if AppsReleaseCreate.Command != "+release-create" || AppsReleaseCreate.Risk != "write" {
-		t.Errorf("meta mismatch: %+v", AppsReleaseCreate)
-	}
-	if len(AppsReleaseCreate.Scopes) != 1 || AppsReleaseCreate.Scopes[0] != "spark:app:write" {
-		t.Errorf("scopes = %v", AppsReleaseCreate.Scopes)
-	}
-}
-
-// newReleaseCreateRuntimeContext builds a RuntimeContext whose cobra.Command has the
-// flags that AppsReleaseCreate.Execute reads (app-id, branch). Flag values are set
-// via the returned setter helper.
-func newReleaseCreateRuntimeContext(t *testing.T, appID, branch string) (*common.RuntimeContext, *bytes.Buffer, *httpmock.Registry) {
-	t.Helper()
-	cfg := &core.CliConfig{
-		AppID:      "test-app-" + strings.ToLower(t.Name()),
-		AppSecret:  "test-secret",
-		Brand:      core.BrandFeishu,
-		UserOpenId: "ou_test",
-	}
-	factory, stdoutBuf, _, reg := cmdutil.TestFactory(t, cfg)
-
-	cmd := &cobra.Command{Use: "test-release-create"}
-	cmd.SetContext(context.Background())
-	cmd.Flags().String("app-id", "", "")
-	cmd.Flags().String("branch", "", "")
-	_ = cmd.Flags().Set("app-id", appID)
-	if branch != "" {
-		_ = cmd.Flags().Set("branch", branch)
-	}
-
-	rctx := common.TestNewRuntimeContextForAPI(context.Background(), cmd, cfg, factory, core.AsUser)
-	return rctx, stdoutBuf, reg
-}
-
-func TestAppsReleaseCreateExecute_Success(t *testing.T) {
-	rctx, stdoutBuf, reg := newReleaseCreateRuntimeContext(t, "app_x", "main")
-	reg.Register(&httpmock.Stub{
-		Method: "POST",
-		URL:    "/open-apis/spark/v1/apps/app_x/releases",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "",
-			"data": map[string]interface{}{
-				"release_id": "123",
-				"status":     "publishing",
-			},
-		},
-	})
-
-	err := AppsReleaseCreate.Execute(context.Background(), rctx)
-	if err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-
-	var env struct {
-		OK   bool                   `json:"ok"`
-		Data map[string]interface{} `json:"data"`
-	}
-	if err := json.Unmarshal(stdoutBuf.Bytes(), &env); err != nil {
-		t.Fatalf("unmarshal output: %v\nraw: %s", err, stdoutBuf.String())
-	}
-	if !env.OK {
-		t.Fatalf("expected ok=true, got: %s", stdoutBuf.String())
-	}
-	if env.Data["release_id"] != "123" {
-		t.Errorf("release_id = %v, want 123", env.Data["release_id"])
-	}
-	if env.Data["status"] != "publishing" {
-		t.Errorf("status = %v, want publishing", env.Data["status"])
-	}
-}
--- a/shortcuts/apps/apps_release_get.go
+++ b/shortcuts/apps/apps_release_get.go
@@ -1,80 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// AppsReleaseGet fetches a single release's detail by release ID.
-var AppsReleaseGet = common.Shortcut{
-	Service:     appsService,
-	Command:     "+release-get",
-	Description: "Get a single release's status/detail by release ID",
-	Risk:        "read",
-	Tips: []string{
-		"Example: lark-cli apps +release-get --app-id <app_id> --release-id <release_id>",
-	},
-	Scopes:    []string{"spark:app:read"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app ID", Required: true},
-		{Name: "release-id", Desc: "release ID (the release_id returned by +release-create)", Required: true},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		if strings.TrimSpace(rctx.Str("app-id")) == "" {
-			return output.ErrValidation("--app-id is required")
-		}
-		if strings.TrimSpace(rctx.Str("release-id")) == "" {
-			return output.ErrValidation("--release-id is required")
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		releaseID := strings.TrimSpace(rctx.Str("release-id"))
-		dry := common.NewDryRunAPI()
-		dry.GET(fmt.Sprintf(releaseGetPath, validate.EncodePathSegment(appID), validate.EncodePathSegment(releaseID))).
-			Desc("Get release detail")
-		return dry
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		releaseID := strings.TrimSpace(rctx.Str("release-id"))
-		path := fmt.Sprintf(releaseGetPath, validate.EncodePathSegment(appID), validate.EncodePathSegment(releaseID))
-		data, err := rctx.CallAPITyped("GET", path, nil, nil)
-		if err != nil {
-			return withAppsHint(err, "if the release_id is unknown or invalid, list this app's releases with `lark-cli apps +release-list --app-id "+appID+"`")
-		}
-		out := data
-		if release, ok := data["release"].(map[string]interface{}); ok {
-			out = release
-		}
-		rctx.OutFormat(out, nil, func(w io.Writer) {
-			fmt.Fprintf(w, "release_id: %v\nstatus: %v\ncreated_at: %v\nupdated_at: %v\n",
-				out["release_id"], out["status"], out["created_at"], out["updated_at"])
-			if commitID, ok := out["commit_id"].(string); ok && commitID != "" {
-				fmt.Fprintf(w, "commit_id: %s\n", commitID)
-			}
-			status, _ := out["status"].(string)
-			switch status {
-			case "finished":
-				if url, ok := out["online_url"].(string); ok && url != "" {
-					fmt.Fprintf(w, "online_url: %s\n", url)
-				}
-			case "failed":
-				writeReleaseErrorLogTable(w, out["error_logs"])
-			}
-		})
-		return nil
-	},
-}
--- a/shortcuts/apps/apps_release_get_test.go
+++ b/shortcuts/apps/apps_release_get_test.go
@@ -1,300 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"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 TestAppsReleaseGetMeta(t *testing.T) {
-	if AppsReleaseGet.Command != "+release-get" || AppsReleaseGet.Risk != "read" {
-		t.Errorf("meta mismatch: %+v", AppsReleaseGet)
-	}
-	if len(AppsReleaseGet.Scopes) != 1 || AppsReleaseGet.Scopes[0] != "spark:app:read" {
-		t.Errorf("scopes = %v", AppsReleaseGet.Scopes)
-	}
-	// both --app-id and --release-id must be required
-	req := map[string]bool{}
-	for _, f := range AppsReleaseGet.Flags {
-		req[f.Name] = f.Required
-	}
-	if !req["app-id"] || !req["release-id"] {
-		t.Errorf("app-id and release-id must be Required; flags=%+v", AppsReleaseGet.Flags)
-	}
-}
-
-// newStatusRuntimeContext builds a RuntimeContext for AppsReleaseGet.Execute tests.
-func newStatusRuntimeContext(t *testing.T, appID, releaseID string) (*common.RuntimeContext, *bytes.Buffer, *httpmock.Registry) {
-	t.Helper()
-	cfg := &core.CliConfig{
-		AppID:      "test-app-" + strings.ToLower(t.Name()),
-		AppSecret:  "test-secret",
-		Brand:      core.BrandFeishu,
-		UserOpenId: "ou_test",
-	}
-	factory, stdoutBuf, _, reg := cmdutil.TestFactory(t, cfg)
-
-	cmd := &cobra.Command{Use: "test-release-get"}
-	cmd.SetContext(context.Background())
-	cmd.Flags().String("app-id", "", "")
-	cmd.Flags().String("release-id", "", "")
-	_ = cmd.Flags().Set("app-id", appID)
-	_ = cmd.Flags().Set("release-id", releaseID)
-
-	rctx := common.TestNewRuntimeContextForAPI(context.Background(), cmd, cfg, factory, core.AsUser)
-	return rctx, stdoutBuf, reg
-}
-
-func TestAppsReleaseGetExecute_Success(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "5")
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/releases/5",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "",
-			"data": map[string]interface{}{
-				"release": map[string]interface{}{
-					"release_id": "5",
-					"status":     "finished",
-					"created_at": "1700000000000",
-					"updated_at": "1700000000001",
-				},
-			},
-		},
-	})
-
-	err := AppsReleaseGet.Execute(context.Background(), rctx)
-	if err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-
-	var env struct {
-		OK   bool                   `json:"ok"`
-		Data map[string]interface{} `json:"data"`
-	}
-	if err := json.Unmarshal(stdoutBuf.Bytes(), &env); err != nil {
-		t.Fatalf("unmarshal output: %v\nraw: %s", err, stdoutBuf.String())
-	}
-	if !env.OK {
-		t.Fatalf("expected ok=true, got: %s", stdoutBuf.String())
-	}
-	// Execute unwraps the nested "release" object
-	if env.Data["release_id"] != "5" {
-		t.Errorf("release_id = %v, want 5", env.Data["release_id"])
-	}
-	if env.Data["status"] != "finished" {
-		t.Errorf("status = %v, want finished", env.Data["status"])
-	}
-}
-
-func TestAppsReleaseGetPrettyFinishedOnlineURL(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "5")
-	rctx.Format = "pretty"
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/releases/5",
-		Body: map[string]interface{}{
-			"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "5", "status": "finished",
-				"created_at": "1700000000000", "updated_at": "1700000000001",
-				"online_url": "https://example.feishu.cn/spark/faas/app_x",
-			}},
-		},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	out := stdoutBuf.String()
-	if !strings.Contains(out, "status: finished") {
-		t.Errorf("missing base fields:\n%s", out)
-	}
-	if !strings.Contains(out, "online_url: https://example.feishu.cn/spark/faas/app_x") {
-		t.Errorf("expected online_url line, got:\n%s", out)
-	}
-}
-
-func TestAppsReleaseGetPrettyFailedErrorLogs(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "6")
-	rctx.Format = "pretty"
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/releases/6",
-		Body: map[string]interface{}{
-			"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "6", "status": "failed",
-				"created_at": "1700000000000", "updated_at": "1700000000050",
-				"error_logs": []interface{}{
-					map[string]interface{}{"step": "build", "error_log": "compile error"},
-				},
-			}},
-		},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	out := stdoutBuf.String()
-	if !strings.Contains(out, "status: failed") {
-		t.Errorf("missing base fields:\n%s", out)
-	}
-	if !strings.Contains(out, "build") || !strings.Contains(out, "compile error") {
-		t.Errorf("expected error_logs table with step/error_log, got:\n%s", out)
-	}
-}
-
-func TestAppsReleaseGetPrettyPublishingNoExtra(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "7")
-	rctx.Format = "pretty"
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/releases/7",
-		Body: map[string]interface{}{"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "7", "status": "publishing",
-				"created_at": "1700000000000", "updated_at": "1700000000000",
-			}}},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	out := stdoutBuf.String()
-	if strings.Contains(out, "online_url:") || strings.Contains(out, "error_log") {
-		t.Errorf("publishing must not add extra fields, got:\n%s", out)
-	}
-}
-
-func TestAppsReleaseGetPrettyFinishedNoURL(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "8")
-	rctx.Format = "pretty"
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/releases/8",
-		Body: map[string]interface{}{"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "8", "status": "finished",
-				"created_at": "1700000000000", "updated_at": "1700000000001",
-			}}},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	if strings.Contains(stdoutBuf.String(), "online_url:") {
-		t.Errorf("finished without online_url must not print the line, got:\n%s", stdoutBuf.String())
-	}
-}
-
-func TestAppsReleaseGetPrettyFailedEmptyLogs(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "9")
-	rctx.Format = "pretty"
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/releases/9",
-		Body: map[string]interface{}{"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "9", "status": "failed",
-				"created_at": "1700000000000", "updated_at": "1700000000050",
-				"error_logs": []interface{}{},
-			}}},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	if strings.Contains(stdoutBuf.String(), "compile error") {
-		t.Errorf("empty error_logs must not render row content, got:\n%s", stdoutBuf.String())
-	}
-}
-
-func TestAppsReleaseGetPrettyCommitID(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "10")
-	rctx.Format = "pretty"
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/releases/10",
-		Body: map[string]interface{}{"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "10", "status": "publishing",
-				"created_at": "1700000000000", "updated_at": "1700000000000",
-				"commit_id": "1230aisdkjah9123913hi193",
-			}}},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	if !strings.Contains(stdoutBuf.String(), "commit_id: 1230aisdkjah9123913hi193") {
-		t.Errorf("expected commit_id line, got:\n%s", stdoutBuf.String())
-	}
-}
-
-func TestAppsReleaseGetPrettyNoCommitID(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "11")
-	rctx.Format = "pretty"
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/releases/11",
-		Body: map[string]interface{}{"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "11", "status": "publishing",
-				"created_at": "1700000000000", "updated_at": "1700000000000",
-			}}},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	if strings.Contains(stdoutBuf.String(), "commit_id:") {
-		t.Errorf("absent commit_id must not print commit_id line, got:\n%s", stdoutBuf.String())
-	}
-}
-
-func TestAppsReleaseGetPrettyEmptyCommitID(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "12")
-	rctx.Format = "pretty"
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/releases/12",
-		Body: map[string]interface{}{"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "12", "status": "publishing",
-				"created_at": "1700000000000", "updated_at": "1700000000000",
-				"commit_id": "",
-			}}},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	if strings.Contains(stdoutBuf.String(), "commit_id:") {
-		t.Errorf("empty commit_id must not print commit_id line, got:\n%s", stdoutBuf.String())
-	}
-}
-
-func TestAppsReleaseGetJSONOnlineURLPassthrough(t *testing.T) {
-	rctx, stdoutBuf, reg := newStatusRuntimeContext(t, "app_x", "5")
-	reg.Register(&httpmock.Stub{
-		Method: "GET", URL: "/open-apis/spark/v1/apps/app_x/releases/5",
-		Body: map[string]interface{}{"code": 0, "msg": "",
-			"data": map[string]interface{}{"release": map[string]interface{}{
-				"release_id": "5", "status": "finished",
-				"created_at": "1700000000000", "updated_at": "1700000000001",
-				"online_url": "https://example.feishu.cn/spark/faas/app_x",
-			}}},
-	})
-	if err := AppsReleaseGet.Execute(context.Background(), rctx); err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-	var env struct {
-		OK   bool                   `json:"ok"`
-		Data map[string]interface{} `json:"data"`
-	}
-	if err := json.Unmarshal(stdoutBuf.Bytes(), &env); err != nil {
-		t.Fatalf("unmarshal: %v\nraw: %s", err, stdoutBuf.String())
-	}
-	if env.Data["online_url"] != "https://example.feishu.cn/spark/faas/app_x" {
-		t.Errorf("JSON must passthrough online_url, got: %v", env.Data["online_url"])
-	}
-}
--- a/shortcuts/apps/apps_release_list.go
+++ b/shortcuts/apps/apps_release_list.go
@@ -1,98 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/larksuite/cli/internal/output"
-	"github.com/larksuite/cli/internal/validate"
-	"github.com/larksuite/cli/shortcuts/common"
-)
-
-// AppsReleaseList lists a Miaoda app's release history (most recent first).
-var AppsReleaseList = common.Shortcut{
-	Service:     appsService,
-	Command:     "+release-list",
-	Description: "List a Miaoda app's release history (most recent first)",
-	Risk:        "read",
-	Tips: []string{
-		"Example: lark-cli apps +release-list --app-id <app_id>",
-		"Tip: filter fields with --jq, e.g. -q '.data.releases[].release_id'",
-	},
-	Scopes:    []string{"spark:app:read"},
-	AuthTypes: []string{"user"},
-	HasFormat: true,
-	Flags: []common.Flag{
-		{Name: "app-id", Desc: "Miaoda app ID", Required: true},
-		{Name: "status", Enum: []string{"publishing", "finished", "failed"}, Desc: "filter by release status: publishing | finished | failed"},
-		{Name: "page-size", Type: "int", Default: "20", Desc: "page size (max 500)"},
-		{Name: "page-token", Desc: "pagination cursor from a previous response"},
-	},
-	Validate: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		if strings.TrimSpace(rctx.Str("app-id")) == "" {
-			return output.ErrValidation("--app-id is required")
-		}
-		return nil
-	},
-	DryRun: func(ctx context.Context, rctx *common.RuntimeContext) *common.DryRunAPI {
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		status := strings.TrimSpace(rctx.Str("status"))
-		pageSize := rctx.Int("page-size")
-		pageToken := strings.TrimSpace(rctx.Str("page-token"))
-		dry := common.NewDryRunAPI()
-		dry.GET(fmt.Sprintf(releaseListPath, validate.EncodePathSegment(appID))).
-			Desc("List release history").
-			Params(buildReleaseListQuery(status, pageSize, pageToken))
-		return dry
-	},
-	Execute: func(ctx context.Context, rctx *common.RuntimeContext) error {
-		appID := strings.TrimSpace(rctx.Str("app-id"))
-		status := strings.TrimSpace(rctx.Str("status"))
-		pageSize := rctx.Int("page-size")
-		pageToken := strings.TrimSpace(rctx.Str("page-token"))
-		path := fmt.Sprintf(releaseListPath, validate.EncodePathSegment(appID))
-		data, err := rctx.CallAPITyped("GET", path, buildReleaseListQuery(status, pageSize, pageToken), nil)
-		if err != nil {
-			return withAppsHint(err, appIDListHint)
-		}
-		releases, _ := data["releases"].([]interface{})
-		rctx.OutFormat(data, nil, func(w io.Writer) {
-			rows := make([]map[string]interface{}, 0, len(releases))
-			for _, it := range releases {
-				m, ok := it.(map[string]interface{})
-				if !ok {
-					continue
-				}
-				rows = append(rows, map[string]interface{}{
-					"release_id": m["release_id"],
-					"status":     m["status"],
-					"created_at": m["created_at"],
-					"updated_at": m["updated_at"],
-				})
-			}
-			output.PrintTable(w, rows)
-		})
-		return nil
-	},
-}
-
-// buildReleaseListQuery builds the list-releases query parameters. app_id is in
-// the path. page_size is always sent; status and page_token (snake) are included
-// only when non-empty.
-func buildReleaseListQuery(status string, pageSize int, pageToken string) map[string]interface{} {
-	q := map[string]interface{}{
-		"page_size": pageSize,
-	}
-	if status != "" {
-		q["status"] = status
-	}
-	if pageToken != "" {
-		q["page_token"] = pageToken
-	}
-	return q
-}
--- a/shortcuts/apps/apps_release_list_test.go
+++ b/shortcuts/apps/apps_release_list_test.go
@@ -1,129 +0,0 @@
-// Copyright (c) 2026 Lark Technologies Pte. Ltd.
-// SPDX-License-Identifier: MIT
-
-package apps
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"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 TestBuildReleaseListQuery(t *testing.T) {
-	// page_size always present; status/page_token omitted when empty; app_id is in the path
-	q := buildReleaseListQuery("", 0, "")
-	if q["page_size"] != 0 {
-		t.Errorf("page_size should always be present, got %v", q)
-	}
-	if _, ok := q["status"]; ok {
-		t.Errorf("status should be omitted when empty, got %v", q)
-	}
-	if _, ok := q["page_token"]; ok {
-		t.Errorf("page_token should be omitted when empty, got %v", q)
-	}
-	q2 := buildReleaseListQuery("finished", 30, "tok")
-	if q2["page_size"] != 30 {
-		t.Errorf("page_size = %v, want 30", q2["page_size"])
-	}
-	if q2["status"] != "finished" {
-		t.Errorf("status = %v, want finished", q2["status"])
-	}
-	if q2["page_token"] != "tok" {
-		t.Errorf("page_token = %v, want tok", q2["page_token"])
-	}
-	if _, ok := q2["app_id"]; ok {
-		t.Errorf("app_id must not be in query params, got %v", q2)
-	}
-}
-
-// newReleaseListRuntimeContext builds a RuntimeContext for AppsReleaseList.Execute tests.
-func newReleaseListRuntimeContext(t *testing.T, appID string) (*common.RuntimeContext, *bytes.Buffer, *httpmock.Registry) {
-	t.Helper()
-	cfg := &core.CliConfig{
-		AppID:      "test-app-" + strings.ToLower(t.Name()),
-		AppSecret:  "test-secret",
-		Brand:      core.BrandFeishu,
-		UserOpenId: "ou_test",
-	}
-	factory, stdoutBuf, _, reg := cmdutil.TestFactory(t, cfg)
-
-	cmd := &cobra.Command{Use: "test-release-list"}
-	cmd.SetContext(context.Background())
-	cmd.Flags().String("app-id", "", "")
-	cmd.Flags().String("status", "", "")
-	cmd.Flags().Int("page-size", 20, "")
-	cmd.Flags().String("page-token", "", "")
-	_ = cmd.Flags().Set("app-id", appID)
-
-	rctx := common.TestNewRuntimeContextForAPI(context.Background(), cmd, cfg, factory, core.AsUser)
-	return rctx, stdoutBuf, reg
-}
-
-func TestAppsReleaseListExecute_Success(t *testing.T) {
-	rctx, stdoutBuf, reg := newReleaseListRuntimeContext(t, "app_x")
-	reg.Register(&httpmock.Stub{
-		Method: "GET",
-		URL:    "/open-apis/spark/v1/apps/app_x/releases",
-		Body: map[string]interface{}{
-			"code": 0,
-			"msg":  "",
-			"data": map[string]interface{}{
-				"releases": []interface{}{
-					map[string]interface{}{
-						"release_id": "1",
-						"status":     "finished",
-						"created_at": "1700000000000",
-						"updated_at": "1700000000000",
-					},
-				},
-				"next_page_token": "tok",
-				"has_more":        true,
-			},
-		},
-	})
-
-	err := AppsReleaseList.Execute(context.Background(), rctx)
-	if err != nil {
-		t.Fatalf("Execute() = %v", err)
-	}
-
-	var env struct {
-		OK   bool                   `json:"ok"`
-		Data map[string]interface{} `json:"data"`
-	}
-	if err := json.Unmarshal(stdoutBuf.Bytes(), &env); err != nil {
-		t.Fatalf("unmarshal output: %v\nraw: %s", err, stdoutBuf.String())
-	}
-	if !env.OK {
-		t.Fatalf("expected ok=true, got: %s", stdoutBuf.String())
-	}
-
-	// releases passthrough
-	releases, ok := env.Data["releases"].([]interface{})
-	if !ok || len(releases) != 1 {
-		t.Fatalf("releases = %v", env.Data["releases"])
-	}
-	r0 := releases[0].(map[string]interface{})
-	if r0["release_id"] != "1" {
-		t.Errorf("releases[0].release_id = %v, want 1", r0["release_id"])
-	}
-	if r0["status"] != "finished" {
-		t.Errorf("releases[0].status = %v, want finished", r0["status"])
-	}
-
-	// pagination fields passthrough
-	if env.Data["next_page_token"] != "tok" {
-		t.Errorf("next_page_token = %v, want tok", env.Data["next_page_token"])
-	}
-	if env.Data["has_more"] != true {
-		t.Errorf("has_more = %v, want true", env.Data["has_more"])
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
shanglei	3b6aa7dc6a	perf(startup): resolve brand & strict-mode without decrypting the app secret Building the command tree resolved brand (auth login --domain help) and strict mode (per-command identity-flag registration via ResolveStrictMode) through f.Config(), which decrypts the app secret. On macOS that is a Keychain (securityd IPC) read on every invocation -- even --help/--version/ schema/completion, which never use the secret. brand and strict mode are plain config.json fields, so route them through a secret-free metadata path: - credential: add (DefaultAccountProvider).ResolveMeta and a cached (CredentialProvider).ResolveMeta returning brand + SupportedIdentities, via an optional metaResolver capability; external providers fall back to ResolveAccount (they do not touch the keychain). - cmdutil: ResolveStrictMode now uses ResolveMeta; add Factory.ConfigBrand. - auth login help text and shortcut registration read ConfigBrand. The app secret is still decrypted on demand when a command actually calls the API (auth status etc. unchanged). Measured on macOS (GOMAXPROCS=1): lark-cli --help 35.4ms -> 21.4ms (-40%); no behavior change on Linux/Windows (local secret backends are cheap).	2026-06-10 17:46:03 +08:00
shanglei	ed63e12725	fix(registry): drop unused typedInitialized var; refresh OrderedProps doc typedInitialized was only assigned (in resetTyped) and never read, so staticcheck's U1000 (golangci `unused`) flagged it and would block the lint gate. Remove the field and its assignment. Also refresh the OrderedProps comment: the static-registry migration removed the meta_data.json natural-order machinery, so Order is now populated alphabetically (orderedKeys). The comment still claimed natural-order preservation. No behavior change.	2026-06-10 14:46:18 +08:00
shanglei	761aa55cbf	feat(registry): carry affordance through the typed registry The static-meta migration modeled only the method fields it explicitly declared, but the schema assembler still reads method["affordance"] to build _meta.affordance. metaschema.Method had no Affordance field and MethodToMap did not backfill it, so any method whose meta_data.json entry carries an affordance overlay would silently lose _meta.affordance in `schema --format json` (the embedded-JSON loader preserved it via the untyped map). Local meta currently has zero affordance entries, so no existing test caught it. Model affordance in the typed registry: - metaschema.Method gains Affordance plus Affordance/AffordanceExample types - gen.go emits the affordance literal (static, zero-alloc) - MethodToMap rebuilds method["affordance"] so parseAffordance keeps working schema JSON mode reads EmbeddedSpec (static baseline via ServiceToMap), which bypasses the remote overlay for determinism, so the remote/wire and MapToMethod paths -- never affordance consumers -- are left untouched. Add TestBuildMeta_AffordanceThroughTypedRegistry covering Method -> MethodToMap -> buildMeta -> _meta.affordance.	2026-06-10 14:13:56 +08:00
shanglei	2098c3c412	perf(registry): drop embedded meta_data.json and the larkmeta build tag The startup baseline now comes solely from the generated static Go registry (metastatic.Registry), wired into the stub-declared Registry via a package-level var plus an init() struct-header copy. No build tag, no committed generated file, and zero startup allocation is preserved. - gen.go emits a tag-free `var registryData` + `func init()` instead of a //go:build larkmeta top-level `var Registry`; stub.go declares Registry unconditionally so the package always compiles - fetch_meta.py regenerates the static registry after fetching, so every build and CI step that fetches also produces it (no separate gen step, no CI change) - remove the //go:embed meta_data.json baseline and the JSON parse fallback; meta_data.json is now only the build-time input to the generator - EmbeddedSpec/EmbeddedServiceNames read the static baseline; drop the schema key-order machinery so envelope field order is alphabetical (JSON Schema property order is not semantic; parameterOrder for positional args is intact) - drop -tags larkmeta from Makefile, .goreleaser.yml, and build-pkg-pr-new.sh Command tree is byte-identical (8092 lines). registry/schema/cmd unit tests, the zero-alloc bench, and the e2e dry-run suite all pass.	2026-06-09 18:36:58 +08:00
shanglei	4215ad9908	feat(registry): build command tree from static typed meta (larkmeta) Migrate the startup command-tree build path to read compile-time static Go structs (metastatic.Registry, behind -tags larkmeta) instead of parsing the 1.9MB meta_data.json into map[string]interface{} (~170K heap objects) on every invocation. - typed.go: typed baseline + remote-overlay layer. Reads static data under -tags larkmeta (zero parse / zero alloc); falls back to parsing the embedded meta_data.json once for builds without the tag (dev/test). A lazy typed->map shim (ServiceToMap/MethodToMap) keeps execution-path consumers working unchanged. - service.go: registration chain and NewCmdServiceMethod read typed structs directly; map wrappers convert via MapToService/MapToMethod for existing tests; method RunE materializes opts.Spec/opts.Method lazily, never at startup. - loader.go/remote.go: baseline and cached remote overlay decode into the typed shape; runtime refresh preserved. - build pipeline: Makefile, goreleaser and pkg-pr-new run the generator and build with -tags larkmeta so shipped binaries carry the static data. Reading the full static registry is 0 B/op, 0 allocs/op; the built command tree is byte-identical to the JSON-parsed tree (verified via a canonical tree dump in both modes).	2026-06-09 16:49:40 +08:00
shanglei	0b305a2248	feat(registry): typed meta schema + static-data generator (larkmeta tag) Render the embedded command spec as static Go data (metaschema types + metastatic generator and stub) to eliminate the startup JSON parse and allocation. Behind the larkmeta build tag; the runtime still uses the JSON path (not yet wired). A validation test confirms the static data matches the JSON parse (13 services / 70 resources / 215 methods / 4233 fields) and that reads allocate nothing. Generated meta_data_gen.go is gitignored, like meta_data.json.	2026-06-09 15:37:30 +08:00