diff --git a/skills/activating-datacloud/SKILL.md b/skills/activating-datacloud/SKILL.md
index 62f7d2a..90f4c06 100644
--- a/skills/activating-datacloud/SKILL.md
+++ b/skills/activating-datacloud/SKILL.md
@@ -40,7 +40,7 @@ Ask for or infer:
 ## Core Operating Rules
 
 - Verify the upstream segment or insight is healthy before creating downstream delivery assets.
-- Run the shared readiness classifier before mutating activation assets: `node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase act --json`.
+- Run the shared readiness classifier before mutating activation assets: `node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase act --json`.
 - Inspect available platforms and targets before mutating activation setup.
 - Keep destination definitions deterministic and reusable where possible.
 - Treat downstream credential and platform constraints as separate validation concerns.
@@ -52,7 +52,7 @@ Ask for or infer:
 
 ### 1. Classify readiness for act work
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase act --json
+node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase act --json
 ```
 
 ### 2. Inspect destinations first
diff --git a/skills/analyzing-omnistudio-dependencies/SKILL.md b/skills/analyzing-omnistudio-dependencies/SKILL.md
index 8d6e177..e2ddfb8 100644
--- a/skills/analyzing-omnistudio-dependencies/SKILL.md
+++ b/skills/analyzing-omnistudio-dependencies/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: analyzing-omnistudio-dependencies
-description: "Cross-cutting OmniStudio analysis skill for namespace detection, dependency visualization, and impact analysis across OmniScripts, FlexCards, Integration Procedures, and Data Mappers. Use this skill to detect which OmniStudio namespace an org uses, build directed dependency graphs, perform impact analysis, and generate Mermaid diagrams of component relationships. TRIGGER when: user asks about OmniStudio dependencies, wants namespace detection (Core vs vlocity_cmt vs vlocity_ins), needs impact analysis, requests dependency diagrams, or asks which components are affected by a change. DO NOT TRIGGER when: authoring OmniScripts (use building-omnistudio-omniscript), building FlexCards (use building-omnistudio-flexcard), creating Integration Procedures (use building-omnistudio-integration-procedure), or configuring Data Mappers (use building-omnistudio-datamapper)."
+description: "Cross-cutting OmniStudio analysis skill for namespace detection, dependency visualization, and impact analysis across OmniScripts, FlexCards, Integration Procedures, and Data Mappers. TRIGGER when: user asks about OmniStudio dependencies, wants namespace detection (Core vs vlocity_cmt vs vlocity_ins), needs impact analysis, requests dependency graphs or Mermaid diagrams, or asks which components are affected by a change. DO NOT TRIGGER when: authoring OmniScripts (use building-omnistudio-omniscript), building FlexCards (use building-omnistudio-flexcard), creating Integration Procedures (use building-omnistudio-integration-procedure), or configuring Data Mappers (use building-omnistudio-datamapper)."
 metadata:
   version: "1.0"
 ---
diff --git a/skills/building-ui-bundle-app/SKILL.md b/skills/building-ui-bundle-app/SKILL.md
index 12026cf..9bbd693 100644
--- a/skills/building-ui-bundle-app/SKILL.md
+++ b/skills/building-ui-bundle-app/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: building-ui-bundle-app
-description: "MUST activate when the user wants to build, create, or generate a React application, React app, web application, single-page application (SPA), or frontend application — even if no project files exist yet. MUST also activate when the project contains a uiBundles/*/src/ directory or sfdx-project.json and the prompt says create, build, construct, or generate a new app, site, or page from scratch — even if the prompt also describes visual styling. MUST also activate when the task spans more than one ui-bundle skill. Use this skill when building a complete app end-to-end. This is the orchestrator that coordinates scaffolding, features, data access, frontend UI, integrations, and deployment in the correct dependency order. Without it, phases execute out of order and the app breaks. Do NOT use for Lightning Experience apps with custom objects (use generating-lightning-app). Do NOT use for single-concern edits to an existing page (use building-ui-bundle-frontend)."
+description: "MUST activate when the user wants to build, create, or generate a React application, React app, web application, single-page application (SPA), or frontend application — even if no project files exist yet. MUST also activate when the project contains a uiBundles/*/src/ directory or sfdx-project.json and the prompt says create, build, construct, or generate a new app, site, or page from scratch — even if the prompt also describes visual styling. MUST also activate when the task spans more than one ui-bundle skill. Use this skill when building a complete app end-to-end. Do NOT use for Lightning Experience apps with custom objects (use generating-lightning-app). Do NOT use for single-concern edits to an existing page (use building-ui-bundle-frontend)."
 metadata:
   version: "1.0"
   related-skills: generating-ui-bundle-metadata, generating-ui-bundle-features, using-ui-bundle-salesforce-data, building-ui-bundle-frontend, implementing-ui-bundle-agentforce-conversation-client, implementing-ui-bundle-file-upload, deploying-ui-bundle, generating-ui-bundle-site, generating-ui-bundle-custom-app
diff --git a/skills/connecting-datacloud/SKILL.md b/skills/connecting-datacloud/SKILL.md
index e9e48e4..a45ac86 100644
--- a/skills/connecting-datacloud/SKILL.md
+++ b/skills/connecting-datacloud/SKILL.md
@@ -43,7 +43,7 @@ Ask for or infer:
 ## Core Operating Rules
 
 - Verify the plugin runtime first; see [../orchestrating-datacloud/references/plugin-setup.md](../orchestrating-datacloud/references/plugin-setup.md).
-- Run the shared readiness classifier before mutating connections: `node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase connect --json`.
+- Run the shared readiness classifier before mutating connections: `node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase connect --json`.
 - Prefer read-only discovery before connection creation.
 - Suppress linked-plugin warning noise with `2>/dev/null` for standard usage.
 - Remember that `connection list` requires `--connector-type`.
@@ -59,7 +59,7 @@ Ask for or infer:
 
 ### 1. Classify readiness for connect work
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase connect --json
+node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase connect --json
 ```
 
 ### 2. Discover connector types
diff --git a/skills/creating-b2b-commerce-store/SKILL.md b/skills/creating-b2b-commerce-store/SKILL.md
index 2a21bbe..81d931a 100644
--- a/skills/creating-b2b-commerce-store/SKILL.md
+++ b/skills/creating-b2b-commerce-store/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: creating-b2b-commerce-store
 description: "Interactive workflow to create Commerce B2B Stores and retrieve storefront metadata. Use when users want to: create B2B Commerce stores, build Commerce storefronts, set up B2B stores from Vibes, retrieve Commerce metadata, deploy Commerce experiences, work with DigitalExperienceBundle for Commerce."
-Critical: "Agents must follow the interactive flow and NEVER create storefront metadata from scratch."
 compatibility: "Requires Commerce licenses, Experience Cloud, Salesforce CLI"
 metadata:
   version: "1.0"
diff --git a/skills/developing-agentforce/SKILL.md b/skills/developing-agentforce/SKILL.md
index 2f320de..33545cb 100644
--- a/skills/developing-agentforce/SKILL.md
+++ b/skills/developing-agentforce/SKILL.md
@@ -4,7 +4,6 @@ description: "Build, modify, debug, and deploy agents with Agentforce Agent Scri
 compatibility: "Requires Agentforce license, API v66.0+, Einstein Agent User"
 metadata:
   version: "1.0"
-  last_updated: "2026-04-08"
 ---
 
 # Agent Script Skill
diff --git a/skills/generating-apex/SKILL.md b/skills/generating-apex/SKILL.md
index 19416d2..89a6959 100644
--- a/skills/generating-apex/SKILL.md
+++ b/skills/generating-apex/SKILL.md
@@ -3,6 +3,7 @@ name: generating-apex
 description: "Primary Apex authoring skill for class generation, refactoring, and review. ALWAYS ACTIVATE when the user mentions Apex, .cls, triggers, or asks to create/refactor a class (service, selector, domain, batch, queueable, schedulable, invocable, DTO, utility, interface, abstract, exception, REST resource). Use this skill for requests involving SObject CRUD, mapping collections, fetching related records, scheduled jobs, batch jobs, trigger design, @AuraEnabled controllers, @RestResource endpoints, custom REST APIs, or code review of existing Apex."
 metadata:
   version: "1.0"
+  minApiVersion: "66.0"
 ---
 
 # Generating Apex
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/b2b-commerce-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/b2b-commerce-erd.md
index 7cf1699..4cb6898 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/b2b-commerce-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/b2b-commerce-erd.md
@@ -22,7 +22,7 @@ Pre-built data model for Salesforce B2B Commerce using `flowchart LR` format wit
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects WebStore,WebCart,CartItem,BuyerGroup,BuyerAccount \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/campaigns-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/campaigns-erd.md
index b6571d3..791d904 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/campaigns-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/campaigns-erd.md
@@ -21,7 +21,7 @@ Pre-built data model for Salesforce Campaigns using `flowchart LR` format with c
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects Campaign,CampaignMember,CampaignInfluence,Lead,Contact,Opportunity \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/consent-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/consent-erd.md
index 07055f1..d39575f 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/consent-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/consent-erd.md
@@ -24,7 +24,7 @@ Pre-built data model for Salesforce Consent Management (GDPR/Privacy) using `flo
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects Individual,ContactPointEmail,ContactPointPhone,DataUsePurpose,ContactPointConsent \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/files-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/files-erd.md
index f6a2ff1..83f20e3 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/files-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/files-erd.md
@@ -21,7 +21,7 @@ Pre-built data model for Salesforce Files (Content) using `flowchart LR` format
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects ContentDocument,ContentVersion,ContentDocumentLink,ContentWorkspace \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/forecasting-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/forecasting-erd.md
index d88e111..c118cf2 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/forecasting-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/forecasting-erd.md
@@ -21,7 +21,7 @@ Pre-built data model for Salesforce Collaborative Forecasts using `flowchart LR`
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects ForecastingItem,ForecastingQuota,Opportunity,OpportunitySplit \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/fsl-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/fsl-erd.md
index 0c7fcfc..f3de91f 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/fsl-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/fsl-erd.md
@@ -25,7 +25,7 @@ Pre-built data model for Salesforce Field Service (formerly Field Service Lightn
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects WorkOrder,WorkOrderLineItem,ServiceAppointment,ServiceResource,ServiceTerritory \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/party-model-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/party-model-erd.md
index 96fb08d..60457ca 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/party-model-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/party-model-erd.md
@@ -20,7 +20,7 @@ Pre-built data model for Salesforce Party Model used in Industry Clouds (Financi
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects Account,Contact,AccountContactRelation,AccountContactRole \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/quote-order-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/quote-order-erd.md
index e5d3d85..03ee621 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/quote-order-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/quote-order-erd.md
@@ -23,7 +23,7 @@ Pre-built data model for Salesforce Quotes and Orders using `flowchart LR` forma
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects Opportunity,Quote,QuoteLineItem,Order,OrderItem,Product2,Contract \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/revenue-cloud-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/revenue-cloud-erd.md
index d8e89e9..4591ade 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/revenue-cloud-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/revenue-cloud-erd.md
@@ -22,7 +22,7 @@ Pre-built data model for Salesforce Revenue Cloud (CPQ, Billing, Subscription Ma
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects ProductCatalog,ProductCategory,ProductSellingModel,PriceAdjustmentSchedule \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/sales-cloud-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/sales-cloud-erd.md
index e02ef67..07b807f 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/sales-cloud-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/sales-cloud-erd.md
@@ -22,7 +22,7 @@ Pre-built data model for Salesforce Sales Cloud using `flowchart LR` format with
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects Account,Contact,Lead,Opportunity,Product2,Campaign \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/salesforce-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/salesforce-erd.md
index edf2c92..a4b4b2b 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/salesforce-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/salesforce-erd.md
@@ -56,7 +56,7 @@ Use `flowchart LR` (left-to-right) for data model diagrams. This format supports
 Enrich diagrams with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects Account,Contact,Opportunity,Case \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/scheduler-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/scheduler-erd.md
index cd06af0..1ba71a8 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/scheduler-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/scheduler-erd.md
@@ -23,7 +23,7 @@ Pre-built data model for Salesforce Scheduler (Lightning Scheduler) using `flowc
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects ServiceAppointment,ServiceResource,ServiceTerritory,WorkType \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/service-cloud-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/service-cloud-erd.md
index 0732bed..8976d36 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/service-cloud-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/service-cloud-erd.md
@@ -23,7 +23,7 @@ Pre-built data model for Salesforce Service Cloud using `flowchart LR` format wi
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects Account,Contact,Case,Entitlement,ServiceContract,Asset \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/assets/datamodel/territory-management-erd.md b/skills/generating-mermaid-diagrams/assets/datamodel/territory-management-erd.md
index 489a273..ae9ca46 100644
--- a/skills/generating-mermaid-diagrams/assets/datamodel/territory-management-erd.md
+++ b/skills/generating-mermaid-diagrams/assets/datamodel/territory-management-erd.md
@@ -20,7 +20,7 @@ Pre-built data model for Salesforce Enterprise Territory Management (Territory2)
 Enrich diagram with live org data:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../../scripts/query-org-metadata.py \
     --objects Territory2Model,Territory2,Territory2Type,UserTerritory2Association,ObjectTerritory2Association \
     --target-org myorg
 ```
diff --git a/skills/generating-mermaid-diagrams/references/erd-conventions.md b/skills/generating-mermaid-diagrams/references/erd-conventions.md
index 7efa6c7..a0421ab 100644
--- a/skills/generating-mermaid-diagrams/references/erd-conventions.md
+++ b/skills/generating-mermaid-diagrams/references/erd-conventions.md
@@ -210,7 +210,7 @@ style std fill:#f0f9ff,stroke:#0369a1,stroke-dasharray:5
 Use the provided Python script for efficient metadata queries:
 
 ```bash
-python3 ~/.claude/skills/generating-mermaid-diagrams/scripts/query-org-metadata.py \
+python3 ../scripts/query-org-metadata.py \
     --objects Account,Contact,Lead,Opportunity,Case \
     --target-org myorg \
     --output table
diff --git a/skills/generating-mermaid-diagrams/references/preview-guide.md b/skills/generating-mermaid-diagrams/references/preview-guide.md
index 7fcc6e4..6540b6d 100644
--- a/skills/generating-mermaid-diagrams/references/preview-guide.md
+++ b/skills/generating-mermaid-diagrams/references/preview-guide.md
@@ -14,10 +14,7 @@ After generating the diagram, offer the user a localhost preview for real-time i
 2. Start preview server (runs in background):
    ```bash
    # From installed skill folder:
-   python ~/.claude/skills/generating-mermaid-diagrams/scripts/mermaid_preview.py start --file /tmp/mermaid-preview.mmd
-
-   # Or from project folder (if working locally):
-   python [project-root]/skills/generating-mermaid-diagrams/scripts/mermaid_preview.py start --file /tmp/mermaid-preview.mmd
+   python ../scripts/mermaid_preview.py start --file /tmp/mermaid-preview.mmd
    ```
 
 3. Provide URL to user:
@@ -37,7 +34,7 @@ After generating the diagram, offer the user a localhost preview for real-time i
 
 When user is done:
 ```bash
-python ~/.claude/skills/generating-mermaid-diagrams/scripts/mermaid_preview.py stop
+python ../scripts/mermaid_preview.py stop
 ```
 
 ## Preview Server Features
diff --git a/skills/harmonizing-datacloud/SKILL.md b/skills/harmonizing-datacloud/SKILL.md
index edf4bff..d22623e 100644
--- a/skills/harmonizing-datacloud/SKILL.md
+++ b/skills/harmonizing-datacloud/SKILL.md
@@ -40,7 +40,7 @@ Ask for or infer:
 ## Core Operating Rules
 
 - Inspect DMO schema before creating mappings.
-- Run the shared readiness classifier before mutating harmonization assets: `node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase harmonize --json`.
+- Run the shared readiness classifier before mutating harmonization assets: `node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase harmonize --json`.
 - Prefer `dmo list --all` when browsing the catalog, but use first-page `dmo list` for fast readiness checks.
 - Use `query describe` or `dmo get --json` instead of inventing unsupported describe flows.
 - Treat identity resolution runs as asynchronous and verify results after execution.
@@ -52,7 +52,7 @@ Ask for or infer:
 
 ### 1. Classify readiness for harmonize work
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase harmonize --json
+node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase harmonize --json
 ```
 
 ### 2. Inspect the catalog
diff --git a/skills/implementing-ui-bundle-agentforce-conversation-client/SKILL.md b/skills/implementing-ui-bundle-agentforce-conversation-client/SKILL.md
index e459913..7dd80b7 100644
--- a/skills/implementing-ui-bundle-agentforce-conversation-client/SKILL.md
+++ b/skills/implementing-ui-bundle-agentforce-conversation-client/SKILL.md
@@ -1,8 +1,7 @@
 ---
 name: implementing-ui-bundle-agentforce-conversation-client
-description: "Use this skill when the user asks to add, embed, integrate, configure, style, or remove an agent, chatbot, chat widget, conversation client, or AI assistant in a UI Bundle project. Covers styling (colors, fonts, spacing, borders), layout (inline vs floating, width, height, dimensions), and props (agentId, agentLabel, headerEnabled, showHeaderIcon, showAvatar, styleTokens). TRIGGER when: project contains a uiBundles/*/src/ directory and the task involves adding or modifying a chat widget, chatbot, or conversational AI; files under uiBundles/*/src/ import AgentforceConversationClient; user asks to add any chat or agent functionality to a page. DO NOT TRIGGER when: user wants to create a custom agent, chatbot, or chat widget component from scratch; the project has no uiBundles directory."
+description: "Use this skill when the user asks to add, embed, integrate, configure, style, or remove an agent, chatbot, chat widget, conversation client, or AI assistant in a UI Bundle project. TRIGGER when: project contains a uiBundles/*/src/ directory and the task involves adding or modifying a chat widget, chatbot, or conversational AI; files under uiBundles/*/src/ import AgentforceConversationClient; user asks to add any chat or agent functionality to a page. DO NOT TRIGGER when: user wants to create a custom agent, chatbot, or chat widget component from scratch; the project has no uiBundles directory."
 metadata:
-  author: ACC Components
   version: "1.1"
   package: "@salesforce/ui-bundle-template-feature-react-agentforce-conversation-client"
   sdk-package: "@salesforce/agentforce-conversation-client"
diff --git a/skills/investigating-agentforce-d360/SKILL.md b/skills/investigating-agentforce-d360/SKILL.md
index 3c5c43a..504ebcf 100644
--- a/skills/investigating-agentforce-d360/SKILL.md
+++ b/skills/investigating-agentforce-d360/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: investigating-agentforce-d360
-description: "Data Cloud 360° view of a single Agentforce session. Pulls 24 STDM + GenAI DMO rows via the DC Query REST API, assembles a hierarchical session tree (Interaction → Step → Generation → GatewayRequest), renders a human-readable summary with transcript + per-turn topic/action invocations + LLM generations + tool calls + audit chain. TRIGGER when user asks to trace, inspect, summarize, or describe a specific Agentforce session by session id (Agent Session UUID `019d…` or MessagingSession id `0Mw…`). Also triggers on session discovery — find/list/search sessions by time, agent, channel, outcome, or conversation text — when the user has no session id yet. DO NOT TRIGGER for design-time architecture questions (use investigating-agentforce-architecture instead) or for runtime perf/latency/SLO questions that require platform telemetry beyond Data Cloud."
+description: "Data Cloud 360° view of a single Agentforce session. TRIGGER when user asks to trace, inspect, summarize, or describe a specific Agentforce session by session id (Agent Session UUID `019d…` or MessagingSession id `0Mw…`). Also triggers on session discovery — find/list/search sessions by time, agent, channel, outcome, or conversation text — when the user has no session id yet. DO NOT TRIGGER for design-time architecture questions (use investigating-agentforce-architecture instead) or for runtime perf/latency/SLO questions that require platform telemetry beyond Data Cloud."
 metadata:
   version: "1.0"
 ---
diff --git a/skills/observing-agentforce/SKILL.md b/skills/observing-agentforce/SKILL.md
index c5324d7..c31a0ad 100644
--- a/skills/observing-agentforce/SKILL.md
+++ b/skills/observing-agentforce/SKILL.md
@@ -4,7 +4,6 @@ description: "Analyze production Agentforce agent behavior using session traces
 allowed-tools: Bash Read Write Edit Glob Grep
 metadata:
   version: "1.0"
-  last_updated: "2026-04-08"
   argument-hint: "<org-alias> [--agent-file <path>] [--session-id <id>] [--days <n>]"
   compatibility: claude-code
 ---
diff --git a/skills/observing-agentforce/references/stdm-queries.md b/skills/observing-agentforce/references/stdm-queries.md
index 9548832..1e0851d 100644
--- a/skills/observing-agentforce/references/stdm-queries.md
+++ b/skills/observing-agentforce/references/stdm-queries.md
@@ -23,18 +23,10 @@ Methods:
 # Ensure the classes directory exists
 mkdir -p <project-root>/force-app/main/default/classes
 
-# Copy from the installed skill location
-cp skills/observing-agentforce/apex/AgentforceOptimizeService.cls \
+# Copy from the skill's apex directory
+cp ../apex/AgentforceOptimizeService.cls \
    <project-root>/force-app/main/default/classes/
-cp skills/observing-agentforce/apex/AgentforceOptimizeService.cls-meta.xml \
-   <project-root>/force-app/main/default/classes/
-```
-
-If the skill is installed globally via the installer, use the installed path:
-```bash
-cp ~/.claude/skills/observing-agentforce/apex/AgentforceOptimizeService.cls \
-   <project-root>/force-app/main/default/classes/
-cp ~/.claude/skills/observing-agentforce/apex/AgentforceOptimizeService.cls-meta.xml \
+cp ../apex/AgentforceOptimizeService.cls-meta.xml \
    <project-root>/force-app/main/default/classes/
 ```
 
diff --git a/skills/orchestrating-datacloud/README.md b/skills/orchestrating-datacloud/README.md
index 5ce092c..c4c4beb 100644
--- a/skills/orchestrating-datacloud/README.md
+++ b/skills/orchestrating-datacloud/README.md
@@ -63,14 +63,12 @@ These are intentionally generic and should be adapted to the target org.
 
 ## Quick start
 
-> The script examples below assume the skill is installed under `~/.claude/skills/` via the full Claude Code installer. If you are working from a repo checkout, run the same scripts from that checkout path.
-
 ### 1. Verify the runtime
 
 ```bash
-bash ~/.claude/skills/orchestrating-datacloud/scripts/verify-plugin.sh
+bash ./scripts/verify-plugin.sh
 # or with an org alias
-bash ~/.claude/skills/orchestrating-datacloud/scripts/verify-plugin.sh myorg
+bash ./scripts/verify-plugin.sh myorg
 ```
 
 The helper treats `sf data360 doctor` as advisory and falls back to additional read-only smoke checks when an org is only partially provisioned.
@@ -78,9 +76,9 @@ The helper treats `sf data360 doctor` as advisory and falls back to additional r
 ### 2. Diagnose feature readiness before mutating
 
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o myorg --json
+node ./scripts/diagnose-org.mjs -o myorg --json
 # optional retrieve-plane probe, only when you know the table is real
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o myorg --phase retrieve --describe-table MyDMO__dlm --json
+node ./scripts/diagnose-org.mjs -o myorg --phase retrieve --describe-table MyDMO__dlm --json
 ```
 
 Use the diagnose helper to distinguish between:
@@ -94,7 +92,7 @@ Use the diagnose helper to distinguish between:
 ```bash
 python3 ~/.claude/sf-skills-install.py --with-datacloud-runtime
 # or run the helper script directly
-bash ~/.claude/skills/orchestrating-datacloud/scripts/bootstrap-plugin.sh
+bash ./scripts/bootstrap-plugin.sh
 ```
 
 ### 4. Start with read-only inspection
diff --git a/skills/orchestrating-datacloud/SKILL.md b/skills/orchestrating-datacloud/SKILL.md
index 9762343..f961426 100644
--- a/skills/orchestrating-datacloud/SKILL.md
+++ b/skills/orchestrating-datacloud/SKILL.md
@@ -92,7 +92,7 @@ Recommended checks:
 ```bash
 sf data360 man
 sf org display -o <alias>
-bash ~/.claude/skills/orchestrating-datacloud/scripts/verify-plugin.sh <alias>
+bash ./scripts/verify-plugin.sh <alias>
 ```
 
 Treat `sf data360 doctor` as a broad health signal, not the sole gate. On partially provisioned orgs it can fail even when read-only command families like connectors, DMOs, or segments still work.
@@ -100,12 +100,12 @@ Treat `sf data360 doctor` as a broad health signal, not the sole gate. On partia
 ### 2. Classify readiness before changing anything
 Run the shared classifier first:
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --json
+node ./scripts/diagnose-org.mjs -o <org> --json
 ```
 
 Only use a query-plane probe after you know the table name is real:
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase retrieve --describe-table MyDMO__dlm --json
+node ./scripts/diagnose-org.mjs -o <org> --phase retrieve --describe-table MyDMO__dlm --json
 ```
 
 Use the classifier to distinguish:
diff --git a/skills/orchestrating-datacloud/references/feature-readiness.md b/skills/orchestrating-datacloud/references/feature-readiness.md
index ddcb226..4c1ed74 100644
--- a/skills/orchestrating-datacloud/references/feature-readiness.md
+++ b/skills/orchestrating-datacloud/references/feature-readiness.md
@@ -27,13 +27,13 @@ Examples:
 Run the shared readiness classifier before mutation-heavy work:
 
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o myorg --json
+node ../scripts/diagnose-org.mjs -o myorg --json
 ```
 
 For retrieve/query work, only add a table probe when you already know the table name is real:
 
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o myorg --phase retrieve --describe-table MyDMO__dlm --json
+node ../scripts/diagnose-org.mjs -o myorg --phase retrieve --describe-table MyDMO__dlm --json
 ```
 
 ## Signal matrix
diff --git a/skills/orchestrating-datacloud/references/plugin-setup.md b/skills/orchestrating-datacloud/references/plugin-setup.md
index dd974ae..7e79c1c 100644
--- a/skills/orchestrating-datacloud/references/plugin-setup.md
+++ b/skills/orchestrating-datacloud/references/plugin-setup.md
@@ -18,8 +18,6 @@ The orchestrating-datacloud family uses a **community `sf data360` CLI runtime**
 
 ## Recommended setup path
 
-The command examples below assume the skill is installed under `~/.claude/skills/` via the full Claude Code installer. If you are working from a cloned sf-skills repo instead, run the same scripts from that checkout path.
-
 If you use the Python installer, it can install this optional runtime for you:
 
 ```bash
@@ -29,7 +27,7 @@ python3 ~/.claude/sf-skills-install.py --with-datacloud-runtime
 Or use the helper script directly:
 
 ```bash
-bash ~/.claude/skills/orchestrating-datacloud/scripts/bootstrap-plugin.sh
+bash ../scripts/bootstrap-plugin.sh
 ```
 
 By default it clones the plugin into `~/.sf-community-tools/datacloud/sf-cli-plugin-data360`, installs dependencies, compiles it, and links it into the local Salesforce CLI.
@@ -41,7 +39,7 @@ git clone https://github.com/Jaganpro/sf-cli-plugin-data360.git
 cd sf-cli-plugin-data360
 yarn install
 npx tsc
-node ~/.claude/skills/orchestrating-datacloud/scripts/generate-manifest.mjs .
+node ../scripts/generate-manifest.mjs .
 sf plugins link .
 ```
 
@@ -49,9 +47,9 @@ sf plugins link .
 
 ```bash
 sf data360 man
-bash ~/.claude/skills/orchestrating-datacloud/scripts/verify-plugin.sh
-bash ~/.claude/skills/orchestrating-datacloud/scripts/verify-plugin.sh myorg
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o myorg --json
+bash ../scripts/verify-plugin.sh
+bash ../scripts/verify-plugin.sh myorg
+node ../scripts/diagnose-org.mjs -o myorg --json
 ```
 
 For newer command families such as `sf data360 query hybrid` and recent pagination fixes, update the community runtime to the latest upstream commit by re-running the bootstrap helper.
@@ -80,7 +78,7 @@ sf data360 segment list -o myorg 2>/dev/null
 If you see `Warning: @gthoppae/sf-cli-plugin-data360 is a linked ESM module and cannot be auto-transpiled`, generate the oclif command manifest:
 
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/generate-manifest.mjs ~/.sf-community-tools/datacloud/sf-cli-plugin-data360
+node ../scripts/generate-manifest.mjs ~/.sf-community-tools/datacloud/sf-cli-plugin-data360
 ```
 
 This tells oclif to use pre-compiled output directly instead of attempting auto-transpilation. The `npx oclif manifest` alternative may fail on newer Node.js versions due to `@oclif/core` version mismatches.
diff --git a/skills/orchestrating-datacloud/scripts/diagnose-org.mjs b/skills/orchestrating-datacloud/scripts/diagnose-org.mjs
index 3d88c49..fd401b5 100755
--- a/skills/orchestrating-datacloud/scripts/diagnose-org.mjs
+++ b/skills/orchestrating-datacloud/scripts/diagnose-org.mjs
@@ -257,7 +257,7 @@ function guidanceFromProbe(scope, probe) {
   if (probe.state === 'runtime_missing') {
     return [
       'Install or relink the community sf data360 runtime before attempting Data Cloud work.',
-      'Use python3 ~/.claude/sf-skills-install.py --with-datacloud-runtime or bash ~/.claude/skills/orchestrating-datacloud/scripts/bootstrap-plugin.sh.',
+      'Use python3 ~/.claude/sf-skills-install.py --with-datacloud-runtime or bash ./scripts/bootstrap-plugin.sh.',
     ];
   }
 
diff --git a/skills/orchestrating-datacloud/scripts/verify-plugin.sh b/skills/orchestrating-datacloud/scripts/verify-plugin.sh
index 22121c9..d697ba4 100755
--- a/skills/orchestrating-datacloud/scripts/verify-plugin.sh
+++ b/skills/orchestrating-datacloud/scripts/verify-plugin.sh
@@ -10,7 +10,7 @@ fi
 
 if ! sf data360 man >/dev/null 2>&1; then
   echo "The community 'sf data360' runtime is not available." >&2
-  echo "Run bash ~/.claude/skills/orchestrating-datacloud/scripts/bootstrap-plugin.sh first." >&2
+  echo "Run bash ./scripts/bootstrap-plugin.sh first." >&2
   exit 1
 fi
 
@@ -54,5 +54,5 @@ fi
 
 echo "Verification complete."
 if [[ -n "${ORG}" ]]; then
-  echo "Next: node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o '${ORG}' --json"
+  echo "Next: node ./scripts/diagnose-org.mjs -o '${ORG}' --json"
 fi
diff --git a/skills/preparing-datacloud/SKILL.md b/skills/preparing-datacloud/SKILL.md
index 44b8490..10a3aa9 100644
--- a/skills/preparing-datacloud/SKILL.md
+++ b/skills/preparing-datacloud/SKILL.md
@@ -44,7 +44,7 @@ Ask for or infer:
 ## Core Operating Rules
 
 - Verify the external plugin runtime before running Data Cloud commands.
-- Run the shared readiness classifier before mutating ingestion assets: `node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase prepare --json`.
+- Run the shared readiness classifier before mutating ingestion assets: `node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase prepare --json`.
 - Prefer inspecting existing streams and DLOs before creating new ingestion assets.
 - Suppress linked-plugin warning noise with `2>/dev/null` for normal usage.
 - Treat DLO naming and field naming as Data Cloud-specific, not CRM-native.
@@ -59,7 +59,7 @@ Ask for or infer:
 
 ### 1. Classify readiness for prepare work
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase prepare --json
+node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase prepare --json
 ```
 
 ### 2. Inspect existing ingestion assets
diff --git a/skills/retrieving-datacloud/SKILL.md b/skills/retrieving-datacloud/SKILL.md
index 5e32944..7f38d10 100644
--- a/skills/retrieving-datacloud/SKILL.md
+++ b/skills/retrieving-datacloud/SKILL.md
@@ -39,7 +39,7 @@ Ask for or infer:
 ## Core Operating Rules
 
 - Treat Data Cloud SQL as its own query language, not SOQL.
-- Run the shared readiness classifier before relying on query/search surfaces: `node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase retrieve --json`.
+- Run the shared readiness classifier before relying on query/search surfaces: `node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase retrieve --json`.
 - Use describe before guessing columns.
 - Prefer `sqlv2` or async query flows for larger result sets.
 - Use vector search or hybrid search only when the search index lifecycle is healthy.
@@ -51,9 +51,9 @@ Ask for or infer:
 
 ### 1. Classify readiness for retrieve work
 ```bash
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase retrieve --json
+node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase retrieve --json
 # optional query-plane probe, only with a real table name
-node ~/.claude/skills/orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase retrieve --describe-table MyDMO__dlm --json
+node ../orchestrating-datacloud/scripts/diagnose-org.mjs -o <org> --phase retrieve --describe-table MyDMO__dlm --json
 ```
 
 ### 2. Choose the smallest correct query shape
diff --git a/skills/reviewing-lwc-mobile-offline/SKILL.md b/skills/reviewing-lwc-mobile-offline/SKILL.md
index 17aed62..6fe4587 100644
--- a/skills/reviewing-lwc-mobile-offline/SKILL.md
+++ b/skills/reviewing-lwc-mobile-offline/SKILL.md
@@ -4,7 +4,6 @@ description: "Review a Lightning Web Component for **mobile offline** compatibil
 metadata:
   version: "1.0"
 ---
-<!-- adk-managed-skill -->
 
 # Reviewing LWC Mobile Offline
 
diff --git a/skills/testing-agentforce/SKILL.md b/skills/testing-agentforce/SKILL.md
index d751bbf..83ad592 100644
--- a/skills/testing-agentforce/SKILL.md
+++ b/skills/testing-agentforce/SKILL.md
@@ -4,7 +4,6 @@ description: "Write, run, and analyze structured test suites for Agentforce agen
 allowed-tools: Bash Read Write Edit Glob Grep
 metadata:
   version: "1.0"
-  last_updated: "2026-04-08"
   argument-hint: "<org-alias> --authoring-bundle <AgentName> [--utterances <file>] | run <org> --target <flow://Name>"
   compatibility: claude-code
 ---
diff --git a/skills/using-mobile-native-capabilities/SKILL.md b/skills/using-mobile-native-capabilities/SKILL.md
index 2ac7602..ed057f4 100644
--- a/skills/using-mobile-native-capabilities/SKILL.md
+++ b/skills/using-mobile-native-capabilities/SKILL.md
@@ -4,7 +4,6 @@ description: "Build a Salesforce LWC that uses native mobile device capabilities
 metadata:
   version: "1.0"
 ---
-<!-- adk-managed-skill -->
 
 # Using Mobile Native Capabilities