@josephyan/qingflow-cli 0.2.0-beta.81 → 0.2.0-beta.83

package/src/qingflow_mcp/cli/commands/builder.py

@@ -69,13 +69,6 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
 
     package = builder_subparsers.add_parser("package", help="应用包")
     package_subparsers = package.add_subparsers(dest="builder_package_command", required=True)
-    package_list = package_subparsers.add_parser("list", help="列出应用包")
-    package_list.add_argument("--trial-status", default="all")
-    package_list.set_defaults(handler=_handle_package_list, format_hint="builder_summary")
-
-    package_resolve = package_subparsers.add_parser("resolve", help="解析应用包")
-    package_resolve.add_argument("--package-name", required=True)
-    package_resolve.set_defaults(handler=_handle_package_resolve, format_hint="builder_summary")
 
     solution = builder_subparsers.add_parser("solution", help="解决方案")
     solution_subparsers = solution.add_subparsers(dest="builder_solution_command", required=True)
@@ -85,30 +78,13 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     solution_install.add_argument("--solution-source", default="solutionDetail")
     solution_install.set_defaults(handler=_handle_solution_install, format_hint="builder_summary")
 
-    package_create = package_subparsers.add_parser("create", help="创建应用包")
-    package_create.add_argument("--package-name", required=True)
-    package_create.add_argument("--icon")
-    package_create.add_argument("--color")
-    package_create.add_argument("--visibility-file")
-    package_create.set_defaults(handler=_handle_package_create, format_hint="builder_summary")
-
     package_get = package_subparsers.add_parser("get", help="读取应用包详情")
-    package_get.add_argument("--tag-id", type=int, required=True)
+    package_get.add_argument("--package-id", type=int, required=True)
     package_get.set_defaults(handler=_handle_package_get, format_hint="builder_summary")
 
-    package_update = package_subparsers.add_parser("update", help="更新应用包")
-    package_update.add_argument("--tag-id", type=int, required=True)
-    package_update.add_argument("--package-name")
-    package_update.add_argument("--icon")
-    package_update.add_argument("--color")
-    package_update.add_argument("--visibility-file")
-    package_update.set_defaults(handler=_handle_package_update, format_hint="builder_summary")
-
-    package_attach_app = package_subparsers.add_parser("attach-app", help="将应用挂载到应用包")
-    package_attach_app.add_argument("--tag-id", type=int, required=True)
-    package_attach_app.add_argument("--app-key", required=True)
-    package_attach_app.add_argument("--app-title", dest="legacy_app_title", help=argparse.SUPPRESS)
-    package_attach_app.set_defaults(handler=_handle_package_attach_app, format_hint="builder_summary")
+    package_apply = package_subparsers.add_parser("apply", help="创建或更新应用包配置")
+    package_apply.add_argument("--config-file", required=True)
+    package_apply.set_defaults(handler=_handle_package_apply, format_hint="builder_summary")
 
     app = builder_subparsers.add_parser("app", help="应用")
     app_subparsers = app.add_subparsers(dest="builder_app_command", required=True)
@@ -116,7 +92,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     app_resolve = app_subparsers.add_parser("resolve", help="解析应用")
     app_resolve.add_argument("--app-key", default="")
     app_resolve.add_argument("--app-name", default="")
-    app_resolve.add_argument("--package-tag-id", type=int)
+    app_resolve.add_argument("--package-id", type=int)
     app_resolve.set_defaults(handler=_handle_app_resolve, format_hint="builder_summary")
 
     app_release_lock = app_subparsers.add_parser("release-edit-lock-if-mine", help="释放当前账号持有的编辑锁")
@@ -182,7 +158,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     portal_apply = portal_subparsers.add_parser("apply", help="更新门户")
     portal_apply.add_argument("--dash-key", default="")
     portal_apply.add_argument("--dash-name", default="")
-    portal_apply.add_argument("--package-tag-id", type=int)
+    portal_apply.add_argument("--package-id", type=int)
     portal_apply.add_argument("--publish", action=argparse.BooleanOptionalAction, default=True)
     portal_apply.add_argument("--sections-file", required=True)
     portal_apply.add_argument("--visibility-file")
@@ -198,7 +174,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     schema_apply_subparsers = schema_apply.add_subparsers(dest="builder_schema_command", required=True)
     schema_apply_apply = schema_apply_subparsers.add_parser("apply", help="执行字段变更")
     schema_apply_apply.add_argument("--app-key", default="")
-    schema_apply_apply.add_argument("--package-tag-id", type=int)
+    schema_apply_apply.add_argument("--package-id", type=int)
     schema_apply_apply.add_argument("--app-name", default="")
     schema_apply_apply.add_argument("--app-title", default="")
     schema_apply_apply.add_argument("--icon")
@@ -252,7 +228,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     publish_verify_subparsers = publish_verify.add_subparsers(dest="builder_publish_command", required=True)
     publish_verify_verify = publish_verify_subparsers.add_parser("verify", help="校验应用发布")
     publish_verify_verify.add_argument("--app-key", required=True)
-    publish_verify_verify.add_argument("--expected-package-tag-id", type=int)
+    publish_verify_verify.add_argument("--expected-package-id", type=int)
     publish_verify_verify.set_defaults(handler=_handle_publish_verify, format_hint="builder_summary")
 
     view = builder_subparsers.add_parser("view", help="视图详情")
@@ -268,10 +244,6 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     chart_get.set_defaults(handler=_handle_chart_get, format_hint="builder_summary")
 
 
-def _handle_package_list(args: argparse.Namespace, context: CliContext) -> dict:
-    return context.builder.package_list(profile=args.profile, trial_status=args.trial_status)
-
-
 def _handle_file_upload_local(args: argparse.Namespace, context: CliContext) -> dict:
     return context.files.file_upload_local(
         profile=args.profile,
@@ -335,10 +307,6 @@ def _handle_role_create(args: argparse.Namespace, context: CliContext) -> dict:
     )
 
 
-def _handle_package_resolve(args: argparse.Namespace, context: CliContext) -> dict:
-    return context.builder.package_resolve(profile=args.profile, package_name=args.package_name)
-
-
 def _handle_solution_install(args: argparse.Namespace, context: CliContext) -> dict:
     return context.builder.solution_install(
         profile=args.profile,
@@ -348,63 +316,36 @@ def _handle_solution_install(args: argparse.Namespace, context: CliContext) -> d
     )
 
 
-def _handle_package_create(args: argparse.Namespace, context: CliContext) -> dict:
-    return context.builder.package_create(
-        profile=args.profile,
-        package_name=args.package_name,
-        icon=args.icon,
-        color=args.color,
-        visibility=load_object_arg(args.visibility_file, option_name="--visibility-file"),
-    )
-
-
 def _handle_package_get(args: argparse.Namespace, context: CliContext) -> dict:
-    return context.builder.package_get(profile=args.profile, tag_id=args.tag_id)
-
+    return context.builder.package_get(profile=args.profile, package_id=args.package_id)
 
-def _handle_package_update(args: argparse.Namespace, context: CliContext) -> dict:
-    return context.builder.package_update(
-        profile=args.profile,
-        tag_id=args.tag_id,
-        package_name=args.package_name,
-        icon=args.icon,
-        color=args.color,
-        visibility=load_object_arg(args.visibility_file, option_name="--visibility-file"),
-    )
 
-
-def _handle_package_attach_app(args: argparse.Namespace, context: CliContext) -> dict:
-    if (args.legacy_app_title or "").strip():
-        raise_config_error(
-            "package attach-app no longer accepts app_title.",
-            fix_hint="Use `--app-key` to identify the app to attach.",
-        )
-    return context.builder.package_attach_app(
-        profile=args.profile,
-        tag_id=args.tag_id,
-        app_key=args.app_key,
-    )
+def _handle_package_apply(args: argparse.Namespace, context: CliContext) -> dict:
+    config = load_object_arg(args.config_file, option_name="--config-file")
+    if not isinstance(config, dict):
+        raise_config_error("package apply --config-file must contain a JSON object.")
+    return context.builder.package_apply(profile=args.profile, **config)
 
 
 def _handle_app_resolve(args: argparse.Namespace, context: CliContext) -> dict:
     has_app_key = bool((args.app_key or "").strip())
     has_app_name = bool((args.app_name or "").strip())
-    has_package_tag_id = args.package_tag_id is not None
-    if has_app_key and (has_app_name or has_package_tag_id):
+    has_package_id = args.package_id is not None
+    if has_app_key and (has_app_name or has_package_id):
         raise_config_error(
             "app resolve accepts exactly one selector mode.",
-            fix_hint="Use only `--app-key`, or use `--app-name` together with `--package-tag-id`.",
+            fix_hint="Use only `--app-key`, or use `--app-name` together with `--package-id`.",
         )
-    if not has_app_key and not (has_app_name and has_package_tag_id):
+    if not has_app_key and not (has_app_name and has_package_id):
         raise_config_error(
-            "app resolve requires either --app-key, or --app-name together with --package-tag-id.",
-            fix_hint="For an existing known app, pass `--app-key`. For package-scoped lookup, pass both `--app-name` and `--package-tag-id`.",
+            "app resolve requires either --app-key, or --app-name together with --package-id.",
+            fix_hint="For an existing known app, pass `--app-key`. For package-scoped lookup, pass both `--app-name` and `--package-id`.",
         )
     return context.builder.app_resolve(
         profile=args.profile,
         app_key=args.app_key,
         app_name=args.app_name,
-        package_tag_id=args.package_tag_id,
+        package_id=args.package_id,
     )
 
 
@@ -487,23 +428,23 @@ def _handle_schema_apply(args: argparse.Namespace, context: CliContext) -> dict:
     has_app_key = bool((args.app_key or "").strip())
     has_app_name = bool((args.app_name or "").strip())
     has_app_title = bool((args.app_title or "").strip())
-    has_package_tag_id = args.package_tag_id is not None
+    has_package_id = args.package_id is not None
     if has_app_key:
-        if args.create_if_missing or has_package_tag_id:
+        if args.create_if_missing or has_package_id:
             raise_config_error(
                 "schema apply edit mode accepts --app-key and optional --app-name only.",
-                fix_hint="For existing apps, use `--app-key` and optionally `--app-name`. For create mode, use `--package-tag-id --app-name --create-if-missing`.",
+                fix_hint="For existing apps, use `--app-key` and optionally `--app-name`. For create mode, use `--package-id --app-name --create-if-missing`.",
             )
     else:
-        if not args.create_if_missing or not has_package_tag_id or not (has_app_name or has_app_title):
+        if not args.create_if_missing or not has_package_id or not (has_app_name or has_app_title):
             raise_config_error(
-                "schema apply create mode requires --package-tag-id, --app-name, and --create-if-missing.",
-                fix_hint="Use `--app-key` for existing apps, or pass `--package-tag-id --app-name --create-if-missing` to create a new app.",
+                "schema apply create mode requires --package-id, --app-name, and --create-if-missing.",
+                fix_hint="Use `--app-key` for existing apps, or pass `--package-id --app-name --create-if-missing` to create a new app.",
             )
     return context.builder.app_schema_apply(
         profile=args.profile,
         app_key=args.app_key,
-        package_tag_id=args.package_tag_id,
+        package_id=args.package_id,
         app_name=args.app_name,
         app_title=args.app_title,
         icon=args.icon,
@@ -561,22 +502,22 @@ def _handle_charts_apply(args: argparse.Namespace, context: CliContext) -> dict:
 def _handle_portal_apply(args: argparse.Namespace, context: CliContext) -> dict:
     has_dash_key = bool((args.dash_key or "").strip())
     has_dash_name = bool((args.dash_name or "").strip())
-    has_package_tag_id = args.package_tag_id is not None
-    if has_dash_key and has_package_tag_id:
+    has_package_id = args.package_id is not None
+    if has_dash_key and has_package_id:
         raise_config_error(
             "portal apply accepts exactly one selector mode.",
-            fix_hint="Use `--dash-key` to update an existing portal, or use `--package-tag-id --dash-name` to create a new portal.",
+            fix_hint="Use `--dash-key` to update an existing portal, or use `--package-id --dash-name` to create a new portal.",
         )
-    if not has_dash_key and not (has_package_tag_id and has_dash_name):
+    if not has_dash_key and not (has_package_id and has_dash_name):
         raise_config_error(
-            "portal apply requires either --dash-key, or --package-tag-id together with --dash-name.",
-            fix_hint="Use `--dash-key` for an existing portal. For create mode, pass `--package-tag-id --dash-name`.",
+            "portal apply requires either --dash-key, or --package-id together with --dash-name.",
+            fix_hint="Use `--dash-key` for an existing portal. For create mode, pass `--package-id --dash-name`.",
         )
     return context.builder.portal_apply(
         profile=args.profile,
         dash_key=args.dash_key,
         dash_name=args.dash_name,
-        package_tag_id=args.package_tag_id,
+        package_id=args.package_id,
         publish=bool(args.publish),
         sections=require_list_arg(args.sections_file, option_name="--sections-file"),
         visibility=load_object_arg(args.visibility_file, option_name="--visibility-file"),
@@ -593,5 +534,5 @@ def _handle_publish_verify(args: argparse.Namespace, context: CliContext) -> dic
     return context.builder.app_publish_verify(
         profile=args.profile,
         app_key=args.app_key,
-        expected_package_tag_id=args.expected_package_tag_id,
+        expected_package_id=args.expected_package_id,
     )

package/src/qingflow_mcp/public_surface.py

@@ -115,17 +115,13 @@ BUILDER_PUBLIC_TOOL_SPECS: tuple[PublicToolSpec, ...] = (
     PublicToolSpec(BUILDER_DOMAIN, "workspace_select", ("workspace_select",), ("builder", "workspace", "select"), cli_public=False),
     PublicToolSpec(BUILDER_DOMAIN, "file_upload_local", ("file_upload_local",), ("builder", "file", "upload-local"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "feedback_submit", ("feedback_submit",), ("builder", "feedback", "submit"), has_contract=True),
-    PublicToolSpec(BUILDER_DOMAIN, "package_list", ("package_list",), ("builder", "package", "list"), has_contract=True, cli_show_effective_context=True),
-    PublicToolSpec(BUILDER_DOMAIN, "package_resolve", ("package_resolve",), ("builder", "package", "resolve"), has_contract=True, cli_show_effective_context=True),
     PublicToolSpec(BUILDER_DOMAIN, "builder_tool_contract", ("builder_tool_contract",), ("builder", "contract"), has_contract=False),
-    PublicToolSpec(BUILDER_DOMAIN, "package_create", ("package_create",), ("builder", "package", "create"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "package_get", ("package_get",), ("builder", "package", "get"), has_contract=True, cli_show_effective_context=True),
-    PublicToolSpec(BUILDER_DOMAIN, "package_update", ("package_update",), ("builder", "package", "update"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
+    PublicToolSpec(BUILDER_DOMAIN, "package_apply", ("package_apply",), ("builder", "package", "apply"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "solution_install", ("solution_install",), ("builder", "solution", "install"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "member_search", ("member_search",), ("builder", "member", "search"), has_contract=True, cli_show_effective_context=True),
     PublicToolSpec(BUILDER_DOMAIN, "role_search", ("role_search",), ("builder", "role", "search"), has_contract=True, cli_show_effective_context=True),
     PublicToolSpec(BUILDER_DOMAIN, "role_create", ("role_create",), ("builder", "role", "create"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
-    PublicToolSpec(BUILDER_DOMAIN, "package_attach_app", ("package_attach_app",), ("builder", "package", "attach-app"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "app_release_edit_lock_if_mine", ("app_release_edit_lock_if_mine",), ("builder", "app", "release-edit-lock-if-mine"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "app_resolve", ("app_resolve",), ("builder", "app", "resolve"), has_contract=True, cli_show_effective_context=True),
     PublicToolSpec(BUILDER_DOMAIN, "app_custom_button_list", ("app_custom_button_list",), ("builder", "button", "list"), has_contract=True, cli_show_effective_context=True),

package/src/qingflow_mcp/response_trim.py

@@ -445,15 +445,13 @@ _register_policy(
 _register_policy(
     (BUILDER_DOMAIN,),
     (
-        "package_list",
-        "package_resolve",
         "builder_tool_contract",
+        "package_get",
+        "package_apply",
         "solution_install",
-        "package_create",
         "member_search",
         "role_search",
         "role_create",
-        "package_attach_app",
         "app_release_edit_lock_if_mine",
         "app_resolve",
         "app_custom_button_list",

package/src/qingflow_mcp/server_app_builder.py

@@ -32,15 +32,15 @@ def build_builder_server() -> FastMCP:
         instructions=(
             "Use this server for AI-native Qingflow builder workflows. "
             "`feedback_submit` is always available as a cross-cutting helper when the current capability is unsupported, awkward, or still cannot satisfy the user's need after reasonable use; it does not require Qingflow login or workspace selection, and it should be called only after explicit user confirmation. "
-            "Follow the resource path resolve -> summary read -> apply -> attach -> publish_verify. "
+            "Follow the resource path resolve -> summary read -> apply -> publish_verify. "
             "Use builder_tool_contract when you need a machine-readable contract, aliases, allowed enums, or a minimal valid example for a public builder tool. "
             "Use solution_install when the user explicitly wants to install a packaged solution/template by solution_key, optionally copying bundled demo data. "
-            "If creating a new package may be appropriate, ask the user to confirm package creation before calling package_create; otherwise use package_resolve/package_list and app_resolve to locate resources, "
+            "If creating or updating an app package may be appropriate, use package_apply with explicit user intent; otherwise use package_get and app_resolve to locate resources, "
             "app_get/app_get_fields/app_repair_code_blocks/app_get_layout/app_get_views/app_get_flow/app_get_charts/portal_list/portal_get/view_get/chart_get for configuration reads, "
             "member_search/role_search/role_create when workflow assignees must come from the directory or role catalog, preferring roles over explicit members unless the user explicitly names members, "
             "then app_schema_apply/app_layout_apply/app_flow_apply/app_views_apply/app_charts_apply/portal_apply to execute normalized patches; these apply tools perform planning, normalization, and dependency checks internally where applicable. Schema/layout/views noop requests skip publish, charts are immediate-live without publish and resolve targets by chart_id first then exact unique chart name, portal updates are replace-only and publish=false only guarantees draft/base-info updates, and flow should use publish=false whenever you only want draft/precheck behavior. "
             "For code_block fields with output bindings, always use qf_output assignment rather than const/let qf_output, and use app_repair_code_blocks when an existing form hangs because output-bound fields stay loading. "
-            "Use package_attach_app to attach apps to packages, and app_publish_verify for explicit final publish verification. "
+            "Use package_apply to manage package metadata, visibility, grouping, and ordering, and app_publish_verify for explicit final publish verification. "
             "For workflow edits, keep the public builder surface on stable linear flows only: start/approve/fill/copy/webhook/end. Branch and condition nodes are intentionally disabled because the backend workflow route is not front-end stable for those node types. Declare node assignees and editable fields explicitly. "
             "If builder writes are blocked by the current user's own edit lock, use app_release_edit_lock_if_mine with the lock owner details from the failed result. "
             "Do not handcraft internal solution payloads or rely on build_id/stage/repair. "
@@ -179,48 +179,36 @@ def build_builder_server() -> FastMCP:
                 raise RuntimeError(json.dumps(trim_error_response(payload), ensure_ascii=False)) from None
             raise
 
-    @server.tool()
-    def package_list(profile: str = DEFAULT_PROFILE, trial_status: str = "all") -> dict:
-        return ai_builder.package_list(profile=profile, trial_status=trial_status)
-
-    @server.tool()
-    def package_resolve(profile: str = DEFAULT_PROFILE, package_name: str = "") -> dict:
-        return ai_builder.package_resolve(profile=profile, package_name=package_name)
-
     @server.tool()
     def builder_tool_contract(tool_name: str = "") -> dict:
         return ai_builder.builder_tool_contract(tool_name=tool_name)
 
     @server.tool()
-    def package_create(
-        profile: str = DEFAULT_PROFILE,
-        package_name: str = "",
-        icon: str | None = None,
-        color: str | None = None,
-        visibility: dict | None = None,
-    ) -> dict:
-        return ai_builder.package_create(profile=profile, package_name=package_name, icon=icon, color=color, visibility=visibility)
-
-    @server.tool()
-    def package_get(profile: str = DEFAULT_PROFILE, tag_id: int = 0) -> dict:
-        return ai_builder.package_get(profile=profile, tag_id=tag_id)
+    def package_get(profile: str = DEFAULT_PROFILE, package_id: int = 0) -> dict:
+        return ai_builder.package_get(profile=profile, package_id=package_id)
 
     @server.tool()
-    def package_update(
+    def package_apply(
         profile: str = DEFAULT_PROFILE,
-        tag_id: int = 0,
+        package_id: int | None = None,
         package_name: str | None = None,
+        create_if_missing: bool = False,
         icon: str | None = None,
         color: str | None = None,
         visibility: dict | None = None,
+        items: list[dict] | None = None,
+        allow_detach: bool = False,
     ) -> dict:
-        return ai_builder.package_update(
+        return ai_builder.package_apply(
             profile=profile,
-            tag_id=tag_id,
+            package_id=package_id,
             package_name=package_name,
+            create_if_missing=create_if_missing,
             icon=icon,
             color=color,
             visibility=visibility,
+            items=items,
+            allow_detach=allow_detach,
         )
 
     @server.tool()
@@ -280,14 +268,6 @@ def build_builder_server() -> FastMCP:
             role_icon=role_icon,
         )
 
-    @server.tool()
-    def package_attach_app(
-        profile: str = DEFAULT_PROFILE,
-        tag_id: int = 0,
-        app_key: str = "",
-    ) -> dict:
-        return ai_builder.package_attach_app(profile=profile, tag_id=tag_id, app_key=app_key)
-
     @server.tool()
     def app_release_edit_lock_if_mine(
         profile: str = DEFAULT_PROFILE,
@@ -307,22 +287,22 @@ def build_builder_server() -> FastMCP:
         profile: str = DEFAULT_PROFILE,
         app_key: str = "",
         app_name: str = "",
-        package_tag_id: int | None = None,
+        package_id: int | None = None,
     ) -> dict:
         has_app_key = bool((app_key or "").strip())
         has_app_name = bool((app_name or "").strip())
-        has_package_tag_id = package_tag_id is not None
-        if has_app_key and (has_app_name or has_package_tag_id):
+        has_package_id = package_id is not None
+        if has_app_key and (has_app_name or has_package_id):
             return _config_failure(
                 "app_resolve accepts exactly one selector mode.",
-                fix_hint="Use only `app_key`, or use `app_name` together with `package_tag_id`.",
+                fix_hint="Use only `app_key`, or use `app_name` together with `package_id`.",
             )
-        if not has_app_key and not (has_app_name and has_package_tag_id):
+        if not has_app_key and not (has_app_name and has_package_id):
             return _config_failure(
-                "app_resolve requires either app_key, or app_name together with package_tag_id.",
-                fix_hint="For an existing known app, pass `app_key`. For package-scoped lookup, pass both `app_name` and `package_tag_id`.",
+                "app_resolve requires either app_key, or app_name together with package_id.",
+                fix_hint="For an existing known app, pass `app_key`. For package-scoped lookup, pass both `app_name` and `package_id`.",
             )
-        return ai_builder.app_resolve(profile=profile, app_key=app_key, app_name=app_name, package_tag_id=package_tag_id)
+        return ai_builder.app_resolve(profile=profile, app_key=app_key, app_name=app_name, package_id=package_id)
 
     @server.tool()
     def app_custom_button_list(profile: str = DEFAULT_PROFILE, app_key: str = "") -> dict:
@@ -406,7 +386,7 @@ def build_builder_server() -> FastMCP:
     def app_schema_apply(
         profile: str = DEFAULT_PROFILE,
         app_key: str = "",
-        package_tag_id: int | None = None,
+        package_id: int | None = None,
         app_name: str = "",
         app_title: str = "",
         icon: str = "",
@@ -421,22 +401,22 @@ def build_builder_server() -> FastMCP:
         has_app_key = bool((app_key or "").strip())
         has_app_name = bool((app_name or "").strip())
         has_app_title = bool((app_title or "").strip())
-        has_package_tag_id = package_tag_id is not None
+        has_package_id = package_id is not None
         if has_app_key:
-            if create_if_missing or has_package_tag_id:
+            if create_if_missing or has_package_id:
                 return _config_failure(
                     "app_schema_apply edit mode accepts app_key and optional app_name rename only.",
-                    fix_hint="For existing apps, use `app_key` and optionally `app_name`. For create mode, use `package_tag_id + app_name + create_if_missing=true`.",
+                    fix_hint="For existing apps, use `app_key` and optionally `app_name`. For create mode, use `package_id + app_name + create_if_missing=true`.",
                 )
-        elif not (create_if_missing and has_package_tag_id and (has_app_name or has_app_title)):
+        elif not (create_if_missing and has_package_id and (has_app_name or has_app_title)):
             return _config_failure(
-                "app_schema_apply create mode requires package_tag_id, app_name, and create_if_missing=true.",
-                fix_hint="Use `app_key` for existing apps, or pass `package_tag_id + app_name + create_if_missing=true` to create a new app.",
+                "app_schema_apply create mode requires package_id, app_name, and create_if_missing=true.",
+                fix_hint="Use `app_key` for existing apps, or pass `package_id + app_name + create_if_missing=true` to create a new app.",
             )
         return ai_builder.app_schema_apply(
             profile=profile,
             app_key=app_key,
-            package_tag_id=package_tag_id,
+            package_id=package_id,
             app_name=app_name,
             app_title=app_title,
             icon=icon,
@@ -514,7 +494,7 @@ def build_builder_server() -> FastMCP:
         profile: str = DEFAULT_PROFILE,
         dash_key: str = "",
         dash_name: str = "",
-        package_tag_id: int | None = None,
+        package_id: int | None = None,
         publish: bool = True,
         sections: list[dict] | None = None,
         visibility: dict | None = None,
@@ -527,22 +507,22 @@ def build_builder_server() -> FastMCP:
     ) -> dict:
         has_dash_key = bool((dash_key or "").strip())
         has_dash_name = bool((dash_name or "").strip())
-        has_package_tag_id = package_tag_id is not None
-        if has_dash_key and has_package_tag_id:
+        has_package_id = package_id is not None
+        if has_dash_key and has_package_id:
             return _config_failure(
                 "portal_apply accepts exactly one selector mode.",
-                fix_hint="Use `dash_key` to update an existing portal, or use `package_tag_id + dash_name` to create a new portal.",
+                fix_hint="Use `dash_key` to update an existing portal, or use `package_id + dash_name` to create a new portal.",
             )
-        if not has_dash_key and not (has_package_tag_id and has_dash_name):
+        if not has_dash_key and not (has_package_id and has_dash_name):
             return _config_failure(
-                "portal_apply requires either dash_key, or package_tag_id together with dash_name.",
-                fix_hint="Use `dash_key` for an existing portal. For create mode, pass `package_tag_id + dash_name`.",
+                "portal_apply requires either dash_key, or package_id together with dash_name.",
+                fix_hint="Use `dash_key` for an existing portal. For create mode, pass `package_id + dash_name`.",
             )
         return ai_builder.portal_apply(
             profile=profile,
             dash_key=dash_key,
             dash_name=dash_name,
-            package_tag_id=package_tag_id,
+            package_id=package_id,
             publish=publish,
             sections=sections or [],
             visibility=visibility,
@@ -558,12 +538,12 @@ def build_builder_server() -> FastMCP:
     def app_publish_verify(
         profile: str = DEFAULT_PROFILE,
         app_key: str = "",
-        expected_package_tag_id: int | None = None,
+        expected_package_id: int | None = None,
     ) -> dict:
         return ai_builder.app_publish_verify(
             profile=profile,
             app_key=app_key,
-            expected_package_tag_id=expected_package_tag_id,
+            expected_package_id=expected_package_id,
         )
 
     return server