@salesforce/afv-skills 1.7.3 → 1.7.5

package/README.md

@@ -1,4 +1,4 @@
-# Agentforce Vibes Library
+# Salesforce Skills Library
 
 This repository provides a curated collection of Salesforce agent skills for building applications. It includes skills for Agentforce agents, Lightning apps, Flow, Apex, SOQL, Lightning Web Components (LWC), UI bundles, objects and fields, permission sets, and related areas.
 
@@ -7,7 +7,7 @@ The skills are contributed by Salesforce and the broader community. It’s optim
 ## 🗂️ Structure
 
 ```
-afv-library/
+sf-skills/
 ├── skills/               # Directory-based executable workflows
 │   ├── generating-apex/
 │   ├── generating-custom-object/
@@ -26,7 +26,7 @@ afv-library/
 | **Tool** | **Usage** |
 |----------|-------------|
 | **Agentforce Vibes** | Skills are auto-installed and auto-updated |
-| **OpenCode, Claude Code, Codex, Cursor, [more](https://agentskills.io/)** | `npx skills add forcedotcom/afv-library` |
+| **OpenCode, Claude Code, Codex, Cursor, [more](https://agentskills.io/)** | `npx skills add forcedotcom/sf-skills` |
 
 ## 📦 Samples
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/afv-skills",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "Salesforce skills for Agentforce Vibes",
   "license": "CC-BY-NC-4.0",
   "files": [

package/skills/developing-agentforce/README.md

@@ -11,14 +11,14 @@ The skill covers the full Agent Script lifecycle:
 | Domain | What It Handles |
 |--------|----------------|
 | Create an Agent | Agent Spec design, environment validation, bundle generation, code authoring |
-| Modify an Agent | Topic/action changes, instruction refinement, flow control updates |
+| Modify an Agent | Subagent/action changes, instruction refinement, flow control updates |
 | Create or Modify Backing Logic | Invocable Apex stubs, Flow wrappers, Prompt Templates |
 | Deploy and Publish | Source deploy, agent activation, publishing to channels |
 | Diagnose Compilation Errors | Compiler error interpretation, syntax fixes, metadata resolution |
-| Diagnose Behavioral Issues | Trace-based debugging, topic routing, action I/O analysis |
+| Diagnose Behavioral Issues | Trace-based debugging, subagent routing, action I/O analysis |
 | Diagnose Production Issues | Runtime failures, reserved keyword conflicts, deployment gotchas |
 | Test an Agent | Utterance-based validation, preview with live actions, trace analysis |
-| Generate Diagrams | Topic map visualizations, agent architecture diagrams |
+| Generate Diagrams | Subagent map visualizations, agent architecture diagrams |
 
 ## Skill Structure
 
@@ -35,7 +35,7 @@ developing-agentforce/
 │   ├── agent-user-setup.md
 │   ├── actions-reference.md
 │   ├── action-prompt-templates.md
-│   ├── agent-topic-map-diagrams.md
+│   ├── agent-subagent-map-diagrams.md
 │   ├── minimal-examples.md
 │   ├── known-issues.md
 │   ├── production-gotchas.md

package/skills/developing-agentforce/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: developing-agentforce
-description: "Build, modify, debug, and deploy agents with Agentforce Agent Script. TRIGGER when: user creates, modifies, or asks about .agent files or aiAuthoringBundle metadata; changes agent behavior, responses, or conversation logic; designs agent topics, actions, tools, sub-agents, or flow control; writes or reviews an Agent Spec; previews, debugs, deploys, publishes, or tests agents; uses Agent Script CLI commands (sf agent generate/preview/publish/test). DO NOT TRIGGER when: Apex development, Flow building, Prompt Template authoring, Experience Cloud configuration, or general Salesforce CLI tasks unrelated to Agent Script."
+description: "Build, modify, debug, and deploy agents with Agentforce Agent Script. TRIGGER when: user creates, modifies, or asks about .agent files or aiAuthoringBundle metadata; changes agent behavior, responses, or conversation logic; designs agent actions, tools, subagents, or flow control; writes or reviews an Agent Spec; previews, debugs, deploys, publishes, or tests agents; uses Agent Script CLI commands (sf agent generate/preview/publish/test). DO NOT TRIGGER when: Apex development, Flow building, Prompt Template authoring, Experience Cloud configuration, or general Salesforce CLI tasks unrelated to Agent Script."
 license: Apache-2.0
 compatibility: "Requires Agentforce license, API v66.0+, Einstein Agent User"
 metadata:
@@ -18,7 +18,7 @@ Agent Script is Salesforce's scripting language for authoring next-generation AI
 language. Do NOT confuse Agent Script syntax or semantics with any other
 language you have been trained on.
 
-Agent Script agents are defined by `AiAuthoringBundle` metadata — a directory with a `.agent` file containing Agent Script source that describes topics, actions, instructions, flow control, and configuration; and a `bundle-meta.xml` file containing bundle metadata. Agents process utterances by routing through topics, each with instructions and actions backed by Apex, Flows, Prompt Templates, and other types of backing logic.
+Agent Script agents are defined by `AiAuthoringBundle` metadata — a directory with a `.agent` file containing Agent Script source that describes actions, instructions, subagents, flow control, and configuration; and a `bundle-meta.xml` file containing bundle metadata. Agents process utterances by routing through subagents, each with instructions and actions backed by Apex, Flows, Prompt Templates, and other types of backing logic.
 
 This skill covers the full Agent Script lifecycle: designing agents,
 writing Agent Script code, validating and debugging, deploying and
@@ -39,7 +39,7 @@ Identify user intent from task descriptions. ALWAYS read indicated reference fil
 3. **Diagnose before you fix.** When validating/debugging agent behavior,
    ALWAYS `--use-live-actions` to preview authoring bundles. Send utterances
    then read resulting session traces to ground your understanding of the
-   agent's behavior. Trace files reveal topic selection, action I/O, and
+   agent's behavior. Trace files reveal subagent selection, action I/O, and
    LLM reasoning. DO NOT modify `.agent` files or backing logic without
    this grounding. See [Validation & Debugging](references/agent-validation-and-debugging.md)
    for trace file locations and diagnostic patterns.
@@ -53,7 +53,7 @@ Every task domain below has **Required Steps**. Follow verbatim, in order. Do no
 
 ### Create an Agent
 
-User wants to build new agent from scratch. ALWAYS use Agent Script. Work with User to understand the agent's purpose, topics, and actions using plain language without Salesforce-specific terminology.
+User wants to build new agent from scratch. ALWAYS use Agent Script. Work with User to understand the agent's purpose, subagents, and actions using plain language without Salesforce-specific terminology.
 
 #### Required Steps
 
@@ -82,11 +82,11 @@ Read [CLI for Agents](references/salesforce-cli-for-agents.md) for exact command
    `sf data query --json -q "SELECT <Relevant_Fields> FROM <SObject> LIMIT 100"`
    Send test utterances with:
    `sf agent preview send --json --authoring-bundle <Developer_Name> --session-id <ID> -u "<message>"`
-   Confirm topic routing, gating, and action invocations match Agent Spec. If behavior diverges, switch to **Diagnose Behavioral Issues** workflow. Return AFTER correcting issues.
+   Confirm subagent routing, gating, and action invocations match Agent Spec. If behavior diverges, switch to **Diagnose Behavioral Issues** workflow. Return AFTER correcting issues.
    **CHECKPOINT — Do NOT proceed to Publish unless ALL are true:**
    - `validate authoring-bundle` passes with zero errors
-   - Live preview (`--use-live-actions`) tested with representative utterances per topic
-   - Traces confirm correct topic routing and action invocation
+   - Live preview (`--use-live-actions`) tested with representative utterances per subagent
+   - Traces confirm correct subagent routing and action invocation
    - User explicitly approves deployment
 9. **Publish** — Publish validates metadata structure, not agent behavior. Every publish creates permanent version number.
    `sf agent publish authoring-bundle --json --api-name <Developer_Name>`
@@ -106,12 +106,12 @@ Read [CLI for Agents](references/salesforce-cli-for-agents.md) for exact command
 2. [Core Language](references/agent-script-core-language.md) — execution
    model, syntax, block structure, anti-patterns
 3. [Design & Agent Spec](references/agent-design-and-spec-creation.md) —
-   topic graph design, flow control patterns, Agent Spec production,
+   subagent graph design, flow control patterns, Agent Spec production,
    backing logic analysis; Section 3 for environment prerequisites
-4. [Topic Map Diagrams](references/agent-topic-map-diagrams.md) —
-   Mermaid diagram conventions for visualizing the agent's topic graph
+4. [Subagent Map Diagrams](references/agent-subagent-map-diagrams.md) —
+   Mermaid diagram conventions for visualizing the agent's subagent graph
 5. [Agent User Setup & Permissions](references/agent-user-setup.md) —
-   permission set assignment, object permissions, cross-topic validation
+   permission set assignment, object permissions, cross-subagent validation
 6. [Metadata & Lifecycle](references/agent-metadata-and-lifecycle.md) —
    directory structure, bundle metadata; publish troubleshooting
 7. [Validation & Debugging](references/agent-validation-and-debugging.md) —
@@ -137,9 +137,9 @@ User wants to understand Agent Script agent they didn't write or need to revisit
 2. **Read code** — Read [Core Language](references/agent-script-core-language.md) for syntax and execution model BEFORE parsing `.agent` file.
 3. **Map backing logic** — For each action with `target`, locate backing implementation (Apex class, Flow, Prompt Template) in project. Note input/output contracts.
 4. **Reverse-engineer Agent Spec** — Read [Design & Agent Spec](references/agent-design-and-spec-creation.md) for Agent Spec structure. Produce Agent Spec from code and save as file.
-5. **Produce Topic Map diagram** — Read [Topic Map Diagrams](references/agent-topic-map-diagrams.md) for Mermaid conventions. Generate flowchart of topic graph showing transitions, gates, and action associations.
-6. **Annotate source** — Ask if user wants Agent Script source annotated with explanations. If requested, add inline comments to `.agent` file explaining flow control decisions, gating rationale, and topic relationships.
-7. **Present to user** — Share Agent Spec, Topic Map, and annotated source if produced. Check Anti-Patterns section in Core Language reference and flag any matches found in code.
+5. **Produce Subagent Map diagram** — Read [Subagent Map Diagrams](references/agent-subagent-map-diagrams.md) for Mermaid conventions. Generate flowchart of subagent graph showing transitions, gates, and action associations.
+6. **Annotate source** — Ask if user wants Agent Script source annotated with explanations. If requested, add inline comments to `.agent` file explaining flow control decisions, gating rationale, and subagent relationships.
+7. **Present to user** — Share Agent Spec, Subagent Map, and annotated source if produced. Check Anti-Patterns section in Core Language reference and flag any matches found in code.
 
 #### Reference Files
 
@@ -147,8 +147,8 @@ User wants to understand Agent Script agent they didn't write or need to revisit
    execution model, anti-patterns
 2. [Design & Agent Spec](references/agent-design-and-spec-creation.md) —
    Agent Spec structure, flow control pattern recognition
-3. [Topic Map Diagrams](references/agent-topic-map-diagrams.md) —
-   Mermaid conventions for topic graph visualization
+3. [Subagent Map Diagrams](references/agent-subagent-map-diagrams.md) —
+   Mermaid conventions for subagent graph visualization
 4. [Metadata & Lifecycle](references/agent-metadata-and-lifecycle.md) —
    directory conventions, bundle metadata
 5. [Known Issues](references/known-issues.md) — only load when code
@@ -156,7 +156,7 @@ User wants to understand Agent Script agent they didn't write or need to revisit
 
 ### Modify an Existing Agent
 
-User wants to add, remove, or change topics, actions, instructions, or flow control on existing agent. May describe change in plain language ("add a billing topic") or reference specific Agent Script constructs.
+User wants to add, remove, or change subagents, actions, instructions, or flow control on existing agent. May describe change in plain language ("add a billing subagent") or reference specific Agent Script constructs.
 
 #### Required Steps
 
@@ -183,8 +183,8 @@ Read [CLI for Agents](references/salesforce-cli-for-agents.md) for exact command
    Test changed paths first, then adjacent paths to catch regressions in existing behavior.
    **CHECKPOINT — Do NOT proceed to Publish unless ALL are true:**
    - `validate authoring-bundle` passes with zero errors
-   - Live preview (`--use-live-actions`) tested with representative utterances per topic
-   - Traces confirm correct topic routing and action invocation
+   - Live preview (`--use-live-actions`) tested with representative utterances per subagent
+   - Traces confirm correct subagent routing and action invocation
    - User explicitly approves deployment
 8. **Publish** — Publish validates metadata structure, not agent behavior. Every publish creates permanent version number.
    `sf agent publish authoring-bundle --json --api-name <Developer_Name>`
@@ -244,18 +244,18 @@ Read [CLI for Agents](references/salesforce-cli-for-agents.md) for exact command
 
 ### Diagnose Behavioral Issues
 
-Agent compiles, preview can start and `--use-live-actions`, but agent does not behave as expected. User describes symptoms like "the agent keeps going to the wrong topic" or "the action isn't being called." Fundamentally different from `validate` or `preview start` errors — code is valid but behavior is wrong.
+Agent compiles, preview can start and `--use-live-actions`, but agent does not behave as expected. User describes symptoms like "the agent keeps going to the wrong subagent" or "the action isn't being called." Fundamentally different from `validate` or `preview start` errors — code is valid but behavior is wrong.
 
 #### Required Steps
 
 Read [CLI for Agents](references/salesforce-cli-for-agents.md) for exact command syntax.
 
 1. **Establish baseline** — Read Agent Spec. If no Agent Spec exists, follow *Comprehend an Existing Agent* workflow to reverse-engineer one, then continue.
-2. **Form hypotheses** — Read [Core Language](references/agent-script-core-language.md) for execution model. Based on user's description, list candidate root causes. Think through: topic routing, gating conditions, action availability, instruction clarity, variable state, and transition timing.
+2. **Form hypotheses** — Read [Core Language](references/agent-script-core-language.md) for execution model. Based on user's description, list candidate root causes. Think through: subagent routing, gating conditions, action availability, instruction clarity, variable state, and transition timing.
 3. **Reproduce in preview** — Read [Validation & Debugging](references/agent-validation-and-debugging.md) for preview workflow and session trace analysis. Start preview session:
    `sf agent preview start --json --use-live-actions --authoring-bundle <Developer_Name>`
-   then send test messages covering EACH topic with `sf agent preview send`. One message is not enough — confirm behavior per topic before proceeding.
-4. **Analyze session traces** — Examine trace output to confirm topic selection, action availability/execution, LLM reasoning, and where behavior diverges from Agent Spec. Do NOT skip this step — preview output alone is insufficient for diagnosis.
+   then send test messages covering EACH subagent with `sf agent preview send`. One message is not enough — confirm behavior per subagent before proceeding.
+4. **Analyze session traces** — Examine trace output to confirm subagent selection, action availability/execution, LLM reasoning, and where behavior diverges from Agent Spec. Do NOT skip this step — preview output alone is insufficient for diagnosis.
 5. **Identify root cause** — Match trace evidence to hypotheses. Consult *Core Language reference and Gating Patterns* in [Design & Agent Spec](references/agent-design-and-spec-creation.md) reference to confirm absence of anti-patterns.
 6. **Fix code** — Apply targeted fix. If fix involves flow control changes, update Agent Spec to match.
 7. **Re-validate and re-preview** — Repeat steps 3–6 until behavior matches Agent Spec or you confirm a platform limitation. Run `validate authoring-bundle`, then `preview start --use-live-actions` to verify fix using same utterances. Then test adjacent paths that might be affected by your changes.
@@ -291,8 +291,8 @@ Read [CLI for Agents](references/salesforce-cli-for-agents.md) for exact command
    Test key conversation paths to validate agent behavior when backed by live actions.
    **CHECKPOINT — Do NOT proceed to Publish unless ALL are true:**
    - `validate authoring-bundle` passes with zero errors
-   - Live preview (`--use-live-actions`) tested with representative utterances per topic
-   - Traces confirm correct topic routing and action invocation
+   - Live preview (`--use-live-actions`) tested with representative utterances per subagent
+   - Traces confirm correct subagent routing and action invocation
    - User explicitly approves deployment
 4. **Publish** — Publish validates metadata structure, not agent behavior. DO NOT publish as part of a dev/test inner loop. ONLY publish as the FINAL step prior to activating the agent and surfacing it to end users.
    `sf agent publish authoring-bundle --json --api-name <Developer_Name>`
@@ -379,8 +379,8 @@ User wants to create automated tests for Agent Script agent. Involves writing `A
 
 Read [CLI for Agents](references/salesforce-cli-for-agents.md) for exact command syntax.
 
-1. **Establish coverage baseline** — Read Agent Spec. If no Agent Spec exists, reverse-engineer first by following Comprehend steps. Map every topic, action, and flow control path to identify what needs test coverage.
-2. **Design test scenarios** — For test design methodology, expectations, metrics, test spec YAML format, and templates, use **testing-agentforce** skill. That skill owns all testing content. For each coverage target, write one or more test scenarios: user utterance, expected topic routing, expected action invocations, and expected agent response. Include both happy paths and edge cases.
+1. **Establish coverage baseline** — Read Agent Spec. If no Agent Spec exists, reverse-engineer first by following Comprehend steps. Map every subagent, action, and flow control path to identify what needs test coverage.
+2. **Design test scenarios** — For test design methodology, expectations, metrics, test spec YAML format, and templates, use **testing-agentforce** skill. That skill owns all testing content. For each coverage target, write one or more test scenarios: user utterance, expected subagent routing, expected action invocations, and expected agent response. Include both happy paths and edge cases.
 3. **Write test spec YAML** — Use template and reference files from **testing-agentforce** skill. Save to `specs/<Agent_API_Name>-testSpec.yaml` in SFDX project.
 4. **Create test metadata** — Generate `AiEvaluationDefinition` from test spec using CLI.
 5. **Deploy test** — Deploy `AiEvaluationDefinition` to org.
@@ -401,7 +401,7 @@ Read [CLI for Agents](references/salesforce-cli-for-agents.md) for exact command
 
 ## The Agent Spec
 
-**Agent Spec** is the central artifact this skill produces and consumes. A structured design document representing agent's purpose, topic graph, actions with backing logic, variables, gating logic, and behavioral intent.
+**Agent Spec** is the central artifact this skill produces and consumes. A structured design document representing agent's purpose, subagent graph, actions with backing logic, variables, gating logic, and behavioral intent.
 
 Agent Specs evolve with the agent. Sparse during agent creation (purpose, topics, directional notes). Fleshed out during agent build (flowchart, backing logic mapped, gating documented). Reverse-engineered when comprehending existing agents. Critical for advanced troubleshooting, providing reference to compare expected vs. actual behavior. During testing, test coverage maps against it.
 
@@ -413,13 +413,13 @@ Read [Design & Agent Spec](references/agent-design-and-spec-creation.md) for Age
 
 The `assets/` directory contains templates and examples. Read when you need a starting point or a concrete reference for artifacts and source files.
 
-- **`assets/agent-spec-template.md`** — Agent Spec template with all sections and placeholder content. Copy to `<AgentName>-AgentSpec.md` in project directory, then fill in during design. Save Agent Spec as file — significant design artifact that benefits from proper rendering, especially Mermaid Topic Map diagram.
+- **`assets/agent-spec-template.md`** — Agent Spec template with all sections and placeholder content. Copy to `<AgentName>-AgentSpec.md` in project directory, then fill in during design. Save Agent Spec as file — significant design artifact that benefits from proper rendering, especially Mermaid Subagent Map diagram.
 
 - **`assets/local-info-agent-annotated.agent`** — Complete annotated example based on Local Info Agent, showing all major Agent Script constructs in context with inline comments explaining why each construct is used. Read when you need concrete reference for how concepts compose into working agent, or as fallback when focused examples in reference files aren't sufficient.
 
-- **`assets/template-single-topic.agent`** — Minimal agent with one topic. Copy and modify for simple agents.
+- **`assets/template-single-subagent.agent`** — Minimal agent with one subagent. Copy and modify for simple agents.
 
-- **`assets/template-multi-topic.agent`** — Minimal agent with multiple topics and transitions. Copy and modify for complex agents.
+- **`assets/template-multi-subagent.agent`** — Minimal agent with multiple subagents and transitions. Copy and modify for complex agents.
 
 - **`assets/invocable-apex-template.cls`** — Reference for invocable Apex
   classes. Copy and modify when complex Apex backing logic is desired.
@@ -443,15 +443,15 @@ Invalid or missing `default_agent_user`. Re-run query from [Design & Agent Spec]
 **Permission error referencing different username than configured:**
 Same fix as above — error references org's default running user, but root cause is Einstein Agent User permissions.
 
-**Agent fails with permission error even though current topic's actions work:**
-Planner validates ALL actions across ALL topics at startup. One missing permission fails entire agent.
+**Agent fails with permission error even though current subagent's actions work:**
+Planner validates ALL actions across ALL subagents at startup. One missing permission fails entire agent.
 
 **Apex action returns empty results in live preview but works in simulated:**
 `WITH USER_MODE` + missing object permissions = silent failure (0 rows, no error). See [Agent User Setup & Permissions](references/agent-user-setup.md), Section 6.2.
 
 ## Syntax Quick Reference
 
-- Block order: `system:` → `config:` → `variables:` → `connection:` → `knowledge:` → `language:` → `start_agent topic_selector:` → `topic:` blocks
+- Block order: `system:` → `config:` → `variables:` → `connection:` → `knowledge:` → `language:` → `start_agent agent_router:` → `subagent:` blocks
 - Indentation: **4 spaces** per indent level. Never use tabs. Mixing spaces and tabs breaks the parser.
 - Booleans: `True`/`False` (capitalized)
 - Strings: always double-quoted
@@ -467,8 +467,8 @@ See [Complex Data Types](references/complex-data-types.md) for the full Lightnin
 
 Three primary FSM patterns. Full details with code in [Architecture Patterns](references/architecture-patterns.md).
 
-- **Hub-and-Spoke** (most common): `start_agent` routes to specialized topics. Each topic has "back to hub" transition. Do NOT create a separate routing topic.
-- **Verification Gate**: Identity verification before protected topics. `available when` guards on protected transitions.
+- **Hub-and-Spoke** (most common): `start_agent` routes to specialized subagents. Each subagent has "back to hub" transition. Do NOT create a separate routing subagent.
+- **Verification Gate**: Identity verification before protected subagents. `available when` guards on protected transitions.
 - **Post-Action Loop**: Post-action checks at TOP of `instructions: ->` trigger on re-resolution after action completes.
 
 ## Scoring Rubric
@@ -507,7 +507,7 @@ Validate → deploy metadata → publish bundle → activate. See [Deploy Refere
 
 ## Template Assets
 
-Ready-to-use `.agent` templates in `assets/agents/` (hello-world, simple-qa, multi-topic, production-faq, order-service, verification-gate). See also `assets/patterns/` for 11+ reusable design patterns and [Examples](references/examples.md) for inline walkthroughs.
+Ready-to-use `.agent` templates in `assets/agents/` (hello-world, simple-qa, multi-subagent, production-faq, order-service, verification-gate). See also `assets/patterns/` for 11+ reusable design patterns and [Examples](references/examples.md) for inline walkthroughs.
 
 ## Additional References
 

package/skills/developing-agentforce/assets/README-legacy.md

@@ -9,7 +9,7 @@ Organized templates for building Agentforce agents.
 ```
 assets/
 ├── agents/       Complete, deployable agent examples
-├── components/   Reusable action and topic snippets
+├── components/   Reusable action and subagent snippets
 ├── patterns/     Advanced patterns (lifecycle, callbacks)
 └── metadata/     XML metadata templates
 ```
@@ -24,8 +24,8 @@ What do you need?
 ├─► "Just starting"
 │   └─► agents/hello-world.agent
 │
-├─► "Complete agent with topics"
-│   └─► agents/multi-topic.agent
+├─► "Complete agent with subagents"
+│   └─► agents/multi-subagent.agent
 │
 ├─► "Add actions to my agent"
 │   ├─► components/flow-action.agent
@@ -47,8 +47,8 @@ What do you need?
 | Template | Complexity | Description |
 |----------|------------|-------------|
 | `hello-world.agent` | Beginner | Minimal viable agent |
-| `simple-qa.agent` | Beginner | Single-topic Q&A |
-| `multi-topic.agent` | Intermediate | Multi-topic routing |
+| `simple-qa.agent` | Beginner | Single-subagent Q&A |
+| `multi-subagent.agent` | Intermediate | Multi-subagent routing |
 | `production-faq.agent` | Advanced | Production-ready with escalation |
 
 ### components/ - Reusable Parts
@@ -57,7 +57,7 @@ What do you need?
 |----------|---------|
 | `flow-action.agent` | Flow action integration |
 | `apex-action.agent` | Apex action integration |
-| `topic-with-actions.agent` | Topic with actions |
+| `subagent-with-actions.agent` | Subagent with actions |
 | `error-handling.agent` | Input validation |
 | `escalation-setup.agent` | Human handoff |
 
@@ -67,8 +67,8 @@ What do you need?
 |----------|---------|------------|
 | `lifecycle-events.agent` | before/after reasoning | GenAiPlannerBundle |
 | `action-callbacks.agent` | Deterministic chains | GenAiPlannerBundle |
-| `bidirectional-routing.agent` | Topic routing with return | Both |
-| `system-instruction-overrides.agent` | Topic-level personas | Both |
+| `bidirectional-routing.agent` | Subagent routing with return | Both |
+| `system-instruction-overrides.agent` | Subagent-level personas | Both |
 | *(6 more patterns)* | | |
 
 ### metadata/ - XML Templates

package/skills/developing-agentforce/assets/agent-spec-template.md

@@ -11,23 +11,23 @@ Describe the key behavioral rules that govern the agent:
 - What must the agent know before taking action?
 - What backing logic types are used (Apex, Flow, Prompt Template)?
 - What guardrails apply (off-topic handling, escalation)?
-- What information persists across topic switches?
+- What information persists across subagent switches?
 
-## Topic Map
+## Subagent Map
 
 ```mermaid
 %%{init: {'theme':'neutral'}}%%
 graph TD
-    A[start_agent<br/>topic_selector]
+    A[start_agent<br/>agent_router]
 
-    A -->|description of routing condition| B[topic_name<br/>Topic]
-    A -->|unclear intent| C[ambiguous_question<br/>Topic]
-    A -->|out of scope| D[off_topic<br/>Topic]
-    A -->|needs escalation| E[escalation<br/>Topic]
+    A -->|description of routing condition| B[subagent_name<br/>Subagent]
+    A -->|unclear intent| C[ambiguous_question<br/>Subagent]
+    A -->|out of scope| D[off_topic<br/>Subagent]
+    A -->|needs escalation| E[escalation<br/>Subagent]
 ```
 
 Expand the diagram to show actions, gating logic, and variable state changes
-within each topic. See the Topic Map Diagrams reference for conventions.
+within each subagent. See the Subagent Map Diagrams reference for conventions.
 
 ## Variables
 
@@ -37,7 +37,7 @@ within each topic. See the Topic Map Diagrams reference for conventions.
 
 ## Actions & Backing Logic
 
-### action_name (topic_name topic)
+### action_name (subagent_name subagent)
 
 - **Target:** `apex://ClassName` or `flow://FlowName` or `prompt://PromptTemplateName`
 - **Backing Status:** EXISTS / NEEDS STUB / NEEDS IMPLEMENTATION

package/skills/developing-agentforce/assets/agents/README.md

@@ -7,8 +7,8 @@ Templates for building complete, deployable agents.
 | Template | Complexity | Description |
 |----------|------------|-------------|
 | `hello-world.agent` | Beginner | Minimal viable agent - start here |
-| `simple-qa.agent` | Beginner | Single-topic Q&A agent |
-| `multi-topic.agent` | Intermediate | Multi-topic routing agent |
+| `simple-qa.agent` | Beginner | Single-subagent Q&A agent |
+| `multi-subagent.agent` | Intermediate | Multi-subagent routing agent |
 | `production-faq.agent` | Advanced | Production-ready FAQ with escalation |
 
 ## Quick Start
@@ -36,10 +36,10 @@ Every agent must have these blocks **in this order**:
 | `config:` | Deployment metadata (agent_name, label, etc.) |
 | `variables:` | Data connections and state storage |
 | `language:` | Locale configuration |
-| `start_agent` | Entry point topic (exactly one required) |
+| `start_agent` | Entry point subagent (exactly one required) |
 
 ## Next Steps
 
-- [components/](../components/) - Reusable action and topic templates
+- [components/](../components/) - Reusable action and subagent templates
 - [patterns/](../patterns/) - Advanced patterns for complex behaviors
 - [metadata/](../metadata/) - XML metadata templates

package/skills/developing-agentforce/assets/agents/hello-world.agent

@@ -9,13 +9,13 @@
 #   - config: Required metadata for deployment (agent_name must be unique)
 #   - variables: Linked variables connect to Messaging context (required for deployment)
 #   - language: Locale settings (required for deployment)
-#   - start_agent: Entry point topic (exactly one required)
+#   - start_agent: Entry point subagent (exactly one required)
 #
 # ★ Key Validation Points (from 100-point scoring):
 #   - [10 pts] config block with all 4 required fields
 #   - [10 pts] 3 linked variables (EndUserId, RoutableId, ContactId)
 #   - [5 pts] language block present
-#   - [10 pts] At least one start_agent topic
+#   - [10 pts] At least one start_agent subagent
 #
 # Deploy with: sf agent publish authoring-bundle --api-name Hello_World_Agent --target-org [alias]
 
@@ -48,7 +48,7 @@ language:
 	additional_locales: ""
 	all_additional_locales: False
 
-# Entry point topic - this is where every conversation starts
+# Entry point subagent - this is where every conversation starts
 start_agent main:
 	label: "Main"
 	description: "Greets users and provides help"

package/skills/developing-agentforce/assets/agents/{multi-topic.agent → multi-subagent.agent}

@@ -1,10 +1,10 @@
-# Multi-Topic Agent Template
-# An agent with multiple conversation topics (hub-and-spoke pattern)
-# Users are routed to specialized topics based on their needs
+# Multi-Subagent Agent Template
+# An agent with multiple conversation subagents (hub-and-spoke pattern)
+# Users are routed to specialized subagents based on their needs
 #
 # Usage: Replace {{placeholders}} with your values
 # Required: agent_name, default_agent_user, agent_label, description
-# Required: At least 2 topics with label and description
+# Required: At least 2 subagents with label and description
 
 system:
 	instructions: "{{SystemInstructions}}"
@@ -36,53 +36,53 @@ language:
 	additional_locales: ""
 	all_additional_locales: False
 
-start_agent topic_selector:
-	label: "Topic Selector"
-	description: "Routes users to the appropriate topic based on their needs"
+start_agent agent_router:
+	label: "Subagent Router"
+	description: "Routes users to the appropriate subagent based on their needs"
 
 	reasoning:
 		instructions: ->
 			| Determine what the user needs help with.
-			| Route them to the most appropriate topic.
+			| Route them to the most appropriate subagent.
 			| If unclear, ask clarifying questions.
 		actions:
-			go_to_topic_one: @utils.transition to @topic.{{topic_one_name}}
-			go_to_topic_two: @utils.transition to @topic.{{topic_two_name}}
-			go_to_topic_three: @utils.transition to @topic.{{topic_three_name}}
-			go_to_farewell: @utils.transition to @topic.farewell
-			go_to_escalation: @utils.transition to @topic.escalation
+			go_to_subagent_one: @utils.transition to @subagent.{{subagent_one_name}}
+			go_to_subagent_two: @utils.transition to @subagent.{{subagent_two_name}}
+			go_to_subagent_three: @utils.transition to @subagent.{{subagent_three_name}}
+			go_to_farewell: @utils.transition to @subagent.farewell
+			go_to_escalation: @utils.transition to @subagent.escalation
 
-topic {{topic_one_name}}:
-	label: "{{TopicOneLabel}}"
-	description: "{{TopicOneDescription}}"
+subagent {{subagent_one_name}}:
+	label: "{{SubagentOneLabel}}"
+	description: "{{SubagentOneDescription}}"
 
 	reasoning:
 		instructions: ->
-			| {{TopicOneInstructions}}
+			| {{SubagentOneInstructions}}
 		actions:
-			back_to_menu: @utils.transition to @topic.topic_selector
+			back_to_menu: @utils.transition to @subagent.agent_router
 
-topic {{topic_two_name}}:
-	label: "{{TopicTwoLabel}}"
-	description: "{{TopicTwoDescription}}"
+subagent {{subagent_two_name}}:
+	label: "{{SubagentTwoLabel}}"
+	description: "{{SubagentTwoDescription}}"
 
 	reasoning:
 		instructions: ->
-			| {{TopicTwoInstructions}}
+			| {{SubagentTwoInstructions}}
 		actions:
-			back_to_menu: @utils.transition to @topic.topic_selector
+			back_to_menu: @utils.transition to @subagent.agent_router
 
-topic {{topic_three_name}}:
-	label: "{{TopicThreeLabel}}"
-	description: "{{TopicThreeDescription}}"
+subagent {{subagent_three_name}}:
+	label: "{{SubagentThreeLabel}}"
+	description: "{{SubagentThreeDescription}}"
 
 	reasoning:
 		instructions: ->
-			| {{TopicThreeInstructions}}
+			| {{SubagentThreeInstructions}}
 		actions:
-			back_to_menu: @utils.transition to @topic.topic_selector
+			back_to_menu: @utils.transition to @subagent.agent_router
 
-topic farewell:
+subagent farewell:
 	label: "Farewell"
 	description: "Ends the conversation gracefully"
 
@@ -92,7 +92,7 @@ topic farewell:
 			| Wish them a great day.
 			| Let them know they can return anytime.
 
-topic escalation:
+subagent escalation:
 	label: "Escalation"
 	description: "Handles requests to transfer to a live human agent"