User Style & Template Management

agent/factory.py

@@ -56,9 +56,9 @@ def _resolve_model_id(requested: str | None, default: str) -> str:
 
 
 _MCP_FACTORIES = [
-    lambda jwt_token: mcp_agentcore_runtime(jwt_token=jwt_token),
-    lambda jwt_token: mcp_aws_knowledge(),
-    lambda jwt_token: mcp_aws_pricing(),
+    lambda jwt_token, tool_filters=None: mcp_agentcore_runtime(jwt_token=jwt_token, tool_filters=tool_filters),
+    lambda jwt_token, tool_filters=None: mcp_aws_knowledge(),
+    lambda jwt_token, tool_filters=None: mcp_aws_pricing(),
 ]
 
 
@@ -101,9 +101,11 @@ def create_agent(mode: str, user_id: str, session_id: str, jwt_token: str, chat_
     # MCP servers
     mcp_servers = []
     mcp_status = []
-    for (name, required), factory_fn in zip(MCP_DEFS, _MCP_FACTORIES):
+    for i, ((name, required), factory_fn) in enumerate(zip(MCP_DEFS, _MCP_FACTORIES)):
         try:
-            mcp_servers.append(factory_fn(jwt_token))
+            # Apply tool_filters only to the Presentation Maker server (index 0)
+            filters = {"allowed": cfg.allowed_tools} if (i == 0 and cfg.allowed_tools) else None
+            mcp_servers.append(factory_fn(jwt_token, tool_filters=filters))
             mcp_status.append({"name": name, "status": "ok"})
         except Exception as e:
             mcp_status.append({"name": name, "status": "error", "error": str(e)})

agent/mcp_clients.py

@@ -19,24 +19,30 @@
 ]
 
 
-def mcp_agentcore_runtime(jwt_token: str) -> MCPClient:
+def mcp_agentcore_runtime(jwt_token: str, tool_filters: dict | None = None) -> MCPClient:
     """Pattern 1: Amazon Bedrock AgentCore Runtime MCP Server with JWT Bearer authentication.
 
     Args:
         jwt_token: JWT access token from the caller (without "Bearer " prefix).
+        tool_filters: Optional tool filter dict (e.g. {"allowed": ["tool1", "tool2"]}).
     """
     region = os.environ.get("AWS_REGION", os.environ.get("AWS_DEFAULT_REGION", "us-east-1"))
     runtime_arn = os.environ["MCP_RUNTIME_ARN"]
     encoded_arn = urllib.parse.quote(runtime_arn, safe="")
     url = f"https://bedrock-agentcore.{region}.amazonaws.com/runtimes/{encoded_arn}/invocations?qualifier=DEFAULT"
 
+    kwargs: dict = {}
+    if tool_filters:
+        kwargs["tool_filters"] = tool_filters
+
     return MCPClient(
         lambda: streamablehttp_client(
             url=url,
             headers={"Authorization": f"Bearer {jwt_token}"},
             timeout=120,
             terminate_on_close=False,
         ),
+        **kwargs,
     )
 
 

agent/modes/__init__.py

@@ -17,11 +17,14 @@ class ModeConfig:
         use_composer: Include compose_slides tool.
         agent_model: Which model setting to use for the main agent — "chat" for
             conversations/planning, "create" for modes that also generate artifacts.
+        allowed_tools: If set, only these MCP tool names are loaded from the
+            Presentation Maker server. None = all tools except style-only tools.
     """
 
     parts: list[Part] = field(default_factory=list)
     use_composer: bool = True
     agent_model: Literal["chat", "create"] = "chat"
+    allowed_tools: list[str] | None = None
 
 
 # Shared parts — referenced by multiple modes
@@ -40,6 +43,21 @@ class ModeConfig:
     prefill_text="Starting the Briefing phase. I'll read the workflow to conduct the hearing properly.",
 )
 
+# Tool allowlists — explicit control over which MCP tools each mode can use.
+# run_style_python is only available to style_creator.
+_DECK_TOOLS = [
+    "init_presentation", "analyze_template", "read_uploaded_file",
+    "list_styles", "apply_style", "read_examples", "list_workflows",
+    "read_workflows", "list_guides", "read_guides", "search_assets",
+    "list_asset_sources", "list_templates",
+    "run_python", "generate_pptx", "get_preview", "code_to_slide",
+    "grid", "import_attachment",
+]
+
+_STYLE_TOOLS = [
+    "run_style_python", "list_styles", "analyze_template", "read_uploaded_file",
+]
+
 
 MODES: dict[str, ModeConfig] = {
     "separated": ModeConfig(parts=[
@@ -51,7 +69,7 @@ class ModeConfig:
         _WF_SLIDE_GROUPS,
         _NOW,
         _PREFETCH_BRIEFING,
-    ]),
+    ], allowed_tools=_DECK_TOOLS),
     "vibe": ModeConfig(parts=[
         _COMMON_LANGUAGE,
         Part(Source.file("role/vibe_agent"), target="system"),
@@ -61,7 +79,7 @@ class ModeConfig:
         _WF_POST_COMPOSE,
         _WF_SLIDE_GROUPS,
         _NOW,
-    ]),
+    ], allowed_tools=_DECK_TOOLS),
     "single": ModeConfig(
         parts=[
             _COMMON_LANGUAGE,
@@ -71,6 +89,7 @@ class ModeConfig:
         ],
         use_composer=False,
         agent_model="create",
+        allowed_tools=_DECK_TOOLS,
     ),
     # Composer is a sub-agent invoked by compose_slides; ModeConfig is used
     # by compose_slides to build its prompt via the same resolve_parts path.
@@ -94,5 +113,22 @@ class ModeConfig:
                  target="history:tool_result", label="read_examples"),
         ],
         use_composer=False,
+        allowed_tools=_DECK_TOOLS,
+    ),
+    "style_creator": ModeConfig(
+        parts=[
+            _COMMON_LANGUAGE,
+            Part(Source.file("role/style_creator"), target="system"),
+            _NOW,
+            Part(
+                Source.mcp("read_workflows", {"names": ["create-style"]}),
+                target="history:tool_result",
+                label="read_workflows",
+                prefill_text="I'll read the style creation workflow.",
+            ),
+        ],
+        use_composer=False,
+        agent_model="create",
+        allowed_tools=_STYLE_TOOLS,
     ),
 }

agent/prompts/role/style_creator.md

@@ -0,0 +1,61 @@
+You are a style creator for spec-driven-presentation-maker.
+You create reusable style guides (HTML files) through dialogue with the user.
+Respond in the same language as the user.
+
+## Your Role
+
+Help users create presentation styles that capture their design preferences.
+A style is an HTML file with CSS variables and example slides that an agent reads
+to understand how to design presentations.
+
+## Workflow
+
+Follow the `create-style` workflow loaded in your context. It defines the full process:
+1. Gather preferences (analyze references, ask about design direction)
+2. Find the premise (the core idea tying preferences together)
+3. Design the style (tokens → composition → HTML)
+4. Review with user (iterate until confirmed)
+
+**Critical:** Do NOT skip to HTML generation. Gather preferences and confirm direction first.
+
+## Tools
+
+**Primary tool: `run_style_python`**
+
+Execute Python code in a sandbox with file I/O access.
+
+Workspace layout:
+- `style.html` — the target style file (read/write, saved back when save=True)
+- `ref/{name}.html` — reference styles (read-only, loaded via ref_styles parameter)
+
+Usage patterns:
+- Read a reference: `run_style_python(code="html = open('ref/corporate-executive.html').read(); print(html[:500])", ref_styles=["corporate-executive"])`
+- Create/edit style: `run_style_python(code="open('style.html','w').write(html)", style_name="style-20260506-1430", save=True)`
+- Compute colors: `run_style_python(code="from colorsys import rgb_to_hls; print(rgb_to_hls(0.2, 0.4, 0.6))")`
+
+Import statements are allowed — PIL, colorsys, numpy are available for color computation and palette extraction.
+
+The user's first message contains `[Style: <name>]` — use this as the `style_name` parameter.
+
+**Other tools:**
+- `list_styles` — see available styles (discover names for ref_styles)
+- `analyze_template` — analyze reference PPTX themes
+- `hearing` — display questions to the user
+
+## HTML Writing Strategy
+
+Write incrementally via `run_style_python`:
+1. First call: full HTML skeleton (head, :root variables, base CSS, first slide) with save=True
+2. Subsequent calls: read back with `open('style.html').read()`, add/modify slides, save=True
+3. Each save triggers a live preview update for the user
+
+## Quality Standards
+
+- All design tokens in `:root` as CSS variables
+- All colors via `var()` references, never hardcoded in elements
+- Text style classes (`.t-title`, `.t-body`, etc.) reference CSS variables
+- Inline style only for position/size (`left`, `top`, `width`, `height`)
+- Coordinate system: 1920×1080 absolute positioning
+- Font sizes: pt units only
+- `body { zoom: 0.7; }` for display scaling
+- 5–6 slides maximum (cover + design areas)

api/common.py

@@ -18,6 +18,8 @@
 def get_user_id(event: Any) -> str:
     """Extract user ID (Cognito sub) from API Gateway authorizer claims.
 
+    Supports both REST API (v1) and HTTP API (v2) JWT authorizer formats.
+
     Args:
         event: Powertools current_event with request_context.authorizer.
 
@@ -27,9 +29,13 @@ def get_user_id(event: Any) -> str:
     Raises:
         ValueError: If authorizer claims or sub are missing.
     """
-    authorizer = event.request_context.authorizer
-    claims = (authorizer or {}).get("claims", {})
-    sub = claims.get("sub")
+    # HTTP API v2: requestContext.authorizer.jwt.claims
+    # REST API v1: requestContext.authorizer.claims
+    raw = event.raw_event.get("requestContext", {}).get("authorizer", {})
+    if "jwt" in raw:
+        sub = raw["jwt"].get("claims", {}).get("sub")
+    else:
+        sub = raw.get("claims", {}).get("sub")
     if not sub:
         raise ValueError("Unauthorized: missing user identity")
     return sub
@@ -38,15 +44,19 @@ def get_user_id(event: Any) -> str:
 def get_user_alias(event: Any) -> str:
     """Extract user alias (email prefix) from API Gateway authorizer claims.
 
+    Supports both REST API (v1) and HTTP API (v2) JWT authorizer formats.
+
     Args:
         event: Powertools current_event with request_context.authorizer.
 
     Returns:
         Alias string (email prefix before @), or empty string if unavailable.
     """
-    authorizer = event.request_context.authorizer
-    claims = (authorizer or {}).get("claims", {})
-    email = claims.get("email", "")
+    raw = event.raw_event.get("requestContext", {}).get("authorizer", {})
+    if "jwt" in raw:
+        email = raw["jwt"].get("claims", {}).get("email", "")
+    else:
+        email = raw.get("claims", {}).get("email", "")
     return email.split("@")[0] if email else ""