@@ -19,6 +19,23 @@
 
 logger = get_logger(__name__)
 
+
+def parse_feature_flag_input(value):
+    """Parse the --flag value as AAZ shorthand syntax, falling back to JSON.
+
+    Mirrors AAZAnyTypeArgAction.decode_str: shorthand is tried first and, because the shorthand
+    parser rejects double-quoted JSON, valid JSON falls through to shell_safe_json_parse. The
+    @file/@- convention is expanded to file content by the CLI core before this runs.
+    """
+    from azure.cli.core.aaz._utils import AAZShortHandSyntaxParser
+    from azure.cli.core.aaz.exceptions import AAZInvalidShorthandSyntaxError
+
+    try:
+        return AAZShortHandSyntaxParser()(value)
+    except AAZInvalidShorthandSyntaxError:
+        return shell_safe_json_parse(value, preserve_order=True)
+
+
 # Feature Flag Models #
 
 
 
@@ -627,6 +627,12 @@
         - name: Set an enhanced feature flag with null label using connection string and set a description.
           text:
             az appconfig enhanced-feature-flag set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --description "This is a colorful feature"
+        - name: Enable an enhanced feature flag while setting it.
+          text:
+            az appconfig enhanced-feature-flag set -n MyAppConfiguration --feature color --enable
+        - name: Disable an enhanced feature flag while setting it.
+          text:
+            az appconfig enhanced-feature-flag set -n MyAppConfiguration --feature color --enable false
         - name: Set an enhanced feature flag using your 'az login' credentials.
           text:
             az appconfig enhanced-feature-flag set --endpoint https://myappconfiguration.azconfig.io --feature color --label MyLabel --auth-mode login
@@ -639,6 +645,18 @@
         - name: Disable telemetry on an enhanced feature flag.
           text:
             az appconfig enhanced-feature-flag set -n MyAppConfiguration --feature color --telemetry-enabled false
+        - name: Set the entire enhanced feature flag from an inline JSON object.
+          text:
+            az appconfig enhanced-feature-flag set -n MyAppConfiguration --flag '{"name":"Beta","enabled":true,"conditions":{"requirement_type":"Any","filters":[{"name":"Microsoft.TimeWindow","parameters":{"Start":"Wed, 01 Jan 2025 00:00:00 GMT"}}]}}'
+        - name: Set the entire enhanced feature flag using shorthand syntax.
+          text:
+            az appconfig enhanced-feature-flag set -n MyAppConfiguration --flag "{name:Beta,enabled:true,conditions:{requirement_type:Any,filters:[{name:Microsoft.TimeWindow,parameters:{Start:'Wed, 01 Jan 2025 00:00:00 GMT'}}]}}"
+        - name: Set the entire enhanced feature flag from a JSON file.
+          text:
+            az appconfig enhanced-feature-flag set -n MyAppConfiguration --flag @flag.json
+        - name: Set the entire enhanced feature flag by reading the JSON from stdin.
+          text:
+            cat flag.json | az appconfig enhanced-feature-flag set -n MyAppConfiguration --flag @-
     """
 
 helps['appconfig enhanced-feature-flag delete'] = """
 
@@ -14,7 +14,9 @@
                                                 resource_group_name_type)
 from azure.cli.core.commands.validators import \
     get_default_location_from_resource_group
+from argcomplete.completers import FilesCompleter
 from ._constants import ImportExportProfiles, ImportMode, FeatureFlagConstants, ARMAuthenticationMode
+from ._featuremodels import parse_feature_flag_input
 
 from ._validators import (validate_appservice_name_or_id, validate_aks_cluster_name_or_id,
                           validate_sku, validate_snapshot_query_fields,
@@ -29,7 +31,7 @@
                           validate_strict_import, validate_export_as_reference, validate_snapshot_filters,
                           validate_snapshot_export, validate_snapshot_import, validate_tag_filters,
                           validate_import_tag_filters, validate_dry_run, validate_kv_revision_retention_period,
-                          validate_public_network_args)
+                          validate_public_network_args, validate_feature_flag)
 
 
 def load_arguments(self, _):
@@ -472,15 +474,24 @@ def load_arguments(self, _):
 
     with self.argument_context('appconfig enhanced-feature-flag') as c:
         c.argument('name', arg_type=data_plane_name_arg_type)
-        c.argument('feature', validator=validate_feature, help="Name of the enhanced feature flag. Enhanced feature flag name cannot contain the '%' or ':' characters.")
+        c.argument('feature', options_list=['--feature-name', '--feature'], validator=validate_feature, help="Name of the enhanced feature flag. Enhanced feature flag name cannot contain the '%' or ':' characters.")
         c.argument('label', help="If no label specified, uses the null label.")
 
     with self.argument_context('appconfig enhanced-feature-flag set') as c:
+        c.argument('enable', arg_type=get_three_state_flag(), help='Enable or disable the enhanced feature flag.')
         c.argument('description', help='Description of the enhanced feature flag to be set.')
         c.argument('requirement_type', arg_type=get_enum_type([FeatureFlagConstants.REQUIREMENT_TYPE_ALL, FeatureFlagConstants.REQUIREMENT_TYPE_ANY]),
                    help='Requirement type determines if filters should use "Any" or "All" logic when evaluating the state of an enhanced feature flag.')
         c.argument('telemetry_enabled', arg_type=get_three_state_flag(), help='Enable or disable telemetry for the enhanced feature flag.')
         c.argument('tags', arg_type=tags_type)
+        c.argument('flag', options_list=['--flag'], type=parse_feature_flag_input,
+                   completer=FilesCompleter(), validator=validate_feature_flag,
+                   help="The entire enhanced feature flag, using the same property names, casing and types as the "
+                        "data-plane API and 'az appconfig enhanced-feature-flag show' (name, enabled, description, "
+                        "conditions, allocation, variants, telemetry, tags). Accepts a JSON object, a shorthand-syntax "
+                        "object, a file path with @ prefix (e.g. @flag.json), or @- to read from stdin. Providing --flag "
+                        "replaces the entire feature flag and cannot be combined with --enable, --description, "
+                        "--requirement-type or --telemetry-enabled.")
 
     with self.argument_context('appconfig enhanced-feature-flag show') as c:
         c.argument('fields', arg_type=enhanced_feature_fields_arg_type)
 
@@ -24,7 +24,7 @@
                      validate_feature_flag_key,
                      is_http_endpoint)
 from ._models import QueryFields
-from ._constants import ImportExportProfiles
+from ._constants import ImportExportProfiles, FeatureFlagConstants
 from ._featuremodels import FeatureQueryFields
 from ._snapshotmodels import SnapshotQueryFields
 
@@ -330,6 +330,72 @@ def validate_feature(namespace):
         validate_feature_flag_name(namespace.feature)
 
 
+# Properties allowed in the enhanced feature flag input accepted by --flag. Matches the schema
+# emitted by 'az appconfig enhanced-feature-flag show' and the data-plane /ff API, so a flag can be
+# shown, edited and set back.
+FEATURE_FLAG_PROPERTIES = {
+    FeatureFlagConstants.NAME,
+    FeatureFlagConstants.ENABLED,
+    FeatureFlagConstants.LABEL,
+    FeatureFlagConstants.DESCRIPTION,
+    FeatureFlagConstants.CONDITIONS,
+    FeatureFlagConstants.ALLOCATION,
+    FeatureFlagConstants.VARIANTS,
+    FeatureFlagConstants.TELEMETRY,
+    FeatureFlagConstants.TAGS,
+}
+
+# Read-only properties emitted by 'show' that are tolerated (and ignored) on input.
+FEATURE_FLAG_READONLY_PROPERTIES = {
+    FeatureFlagConstants.LAST_MODIFIED,
+    "etag",
+}
+
+
+def validate_feature_flag(namespace):
+    if getattr(namespace, 'flag', None) is None:
+        return
+
+    # --flag is a full-object replacement; it cannot be mixed with the per-property content flags.
+    conflicting = {
+        '--enable': namespace.enable,
+        '--description': namespace.description,
+        '--requirement-type': namespace.requirement_type,
+        '--telemetry-enabled': namespace.telemetry_enabled,
+    }
+    specified = [option for option, value in conflicting.items() if value is not None]
+    if specified:
+        raise MutuallyExclusiveArgumentError(
+            "--flag cannot be combined with {}. Provide the entire feature flag with --flag, "
+            "or set individual properties without --flag.".format(", ".join(specified)))
+
+    flag = namespace.flag
+    if not isinstance(flag, dict):
+        raise InvalidArgumentValueError(
+            "--flag must be a JSON object or shorthand-syntax object representing a single feature flag.")
+
+    allowed = FEATURE_FLAG_PROPERTIES | FEATURE_FLAG_READONLY_PROPERTIES
+    unknown_keys = set(flag.keys()) - allowed
+    if unknown_keys:
+        raise InvalidArgumentValueError(
+            "Unsupported feature flag propert{}: {}. Allowed properties: {}.".format(
+                "y" if len(unknown_keys) == 1 else "ies",
+                ", ".join(sorted(unknown_keys)),
+                ", ".join(sorted(FEATURE_FLAG_PROPERTIES))))
+
+    flag_name = flag.get(FeatureFlagConstants.NAME)
+    if namespace.feature is None and flag_name is None:
+        raise RequiredArgumentMissingError(
+            "The feature flag 'name' is required. Provide it inside --flag or via --feature-name.")
+
+    if namespace.feature is not None and flag_name is not None and namespace.feature != flag_name:
+        raise MutuallyExclusiveArgumentError(
+            "Feature name mismatch: --feature-name '{}' does not match the 'name' '{}' in --flag. "
+            "Provide only one, or make them identical.".format(namespace.feature, flag_name))
+
+    validate_feature_flag_name(flag_name if flag_name is not None else namespace.feature)
+
+
 def validate_feature_key(namespace):
     if namespace.key is not None:
         validate_feature_flag_key(namespace.key)
 
@@ -24,45 +24,62 @@
 
 
 def set_feature(cmd,
-                feature,
+                feature=None,
                 name=None,
                 label=None,
+                enable=None,
                 description=None,
                 requirement_type=None,
                 telemetry_enabled=None,
                 tags=None,
+                flag=None,
                 yes=False,
                 connection_string=None,
                 auth_mode="key",
                 endpoint=None):
     feature_flag_client = get_appconfig_feature_flag_client(cmd, name, connection_string, auth_mode, endpoint)
 
-    try:
-        feature_flag = feature_flag_client.get_feature_flag(name=feature, label=label)
-    except ResourceNotFoundError:
-        feature_flag = None
-    except HttpResponseError as exception:
-        raise CLIErrors.AzureResponseError("Failed to retrieve enhanced feature flag from config store. " + str(exception))
-
-    if feature_flag is None:
-        feature_flag = FeatureFlag(name=feature, enabled=False, label=label)
-
-    if description is not None:
-        feature_flag.description = description
-
-    if requirement_type is not None:
-        if feature_flag.conditions is None:
-            feature_flag.conditions = FeatureFlagConditions()
-        feature_flag.conditions.requirement_type = requirement_type
-
-    if telemetry_enabled is not None:
-        if feature_flag.telemetry is None:
-            feature_flag.telemetry = FeatureFlagTelemetryConfiguration(enabled=telemetry_enabled)
-        else:
-            feature_flag.telemetry.enabled = telemetry_enabled
-
-    if tags is not None:
-        feature_flag.tags = tags
+    if flag is not None:
+        # --flag mirrors the data-plane /ff schema (also emitted by 'show'), so deserialize it with the SDK.
+        flag_to_load = {k: v for k, v in flag.items()
+                        if k not in (FeatureFlagConstants.LAST_MODIFIED, "etag")}
+        if feature is not None:
+            flag_to_load[FeatureFlagConstants.NAME] = feature
+        feature_flag = FeatureFlag.from_dict(flag_to_load)
+        if label is not None:
+            feature_flag.label = label
+        if tags is not None:
+            feature_flag.tags = tags
+    else:
+        try:
+            feature_flag = feature_flag_client.get_feature_flag(name=feature, label=label)
+        except ResourceNotFoundError:
+            feature_flag = None
+        except HttpResponseError as exception:
+            raise CLIErrors.AzureResponseError("Failed to retrieve enhanced feature flag from config store. " + str(exception))
+
+        if feature_flag is None:
+            feature_flag = FeatureFlag(name=feature, enabled=False, label=label)
+
+        if enable is not None:
+            feature_flag.enabled = enable
+
+        if description is not None:
+            feature_flag.description = description
+
+        if requirement_type is not None:
+            if feature_flag.conditions is None:
+                feature_flag.conditions = FeatureFlagConditions()
+            feature_flag.conditions.requirement_type = requirement_type
+
+        if telemetry_enabled is not None:
+            if feature_flag.telemetry is None:
+                feature_flag.telemetry = FeatureFlagTelemetryConfiguration(enabled=telemetry_enabled)
+            else:
+                feature_flag.telemetry.enabled = telemetry_enabled
+
+        if tags is not None:
+            feature_flag.tags = tags
 
     entry = json.dumps(_serialize_feature_flag(feature_flag), indent=2, sort_keys=True, ensure_ascii=False, default=str)
     confirmation_message = "Are you sure you want to set the enhanced feature flag: \n" + entry + "\n"