@wootsup/yt-builder-mcp 1.0.0 → 1.1.0

package/dist/sites/tools/sites-test.js

@@ -0,0 +1,148 @@
+/**
+ * W7 — `yootheme_builder_sites_test` L1 tool.
+ *
+ * Targeted connectivity probe for ONE site_id: runs `/health` (no auth
+ * required) + `/etag` (auth required) in parallel and returns a
+ * structured `{plugin_reachable, bearer_valid, platform, ...}` block.
+ *
+ * Why `site_id` is REQUIRED here (not optional):
+ *  - Every other tool in the registry treats `site_id` as an optional
+ *    selector that falls back to the default. `sites_test` is the
+ *    exception: its raison d'être is to verify ONE specific id, so the
+ *    schema upgrades from `.optional()` to required. The W5
+ *    SITE_ID_SCHEMA pin-test in `tests/tools/site-id-schema.test.ts`
+ *    explicitly skips this tool from its "every tool's site_id is
+ *    optional" loop — see the SITES_TEST_EXEMPT_FROM_OPTIONAL set there.
+ *
+ * Why the result wraps `withSiteMeta`:
+ *  - Once `pool.resolve(site_id)` succeeds we DO have a resolved-site
+ *    descriptor, so the text-prefix `[<label> @ <host>] ` is the same
+ *    site-awareness signal a Maria-class user already sees on every
+ *    other tool. The W6.2 wrapper handles both green AND red results
+ *    uniformly (it just stamps; no behaviour difference).
+ *
+ * Failure modes mapped:
+ *  - `UnknownSiteError` → structured error `code: 'unknown_site'` with
+ *    `available[]` hint (via `resolveSiteOrError`).
+ *  - `NoDefaultSiteError` → cannot fire here because site_id is required
+ *    and validated by Zod before the handler runs; left in the helper
+ *    for defense-in-depth.
+ *  - `/health` rejects → `plugin_reachable: false` + error message.
+ *  - `/etag` 401/403 → `plugin_reachable: true` + `bearer_valid: false`.
+ *  - `/etag` other reject → `plugin_reachable: true` + `bearer_valid:
+ *    false` + raw error.
+ *
+ * @license MIT
+ */
+import { detailResult } from '@getimo/mcp-toolkit';
+import { z } from 'zod';
+import { resolveSiteOrError, } from '../../tools/pool-resolve-helper.js';
+import { defineTool, readOnly, structuredResult, withSiteMeta, } from '../../tools/tool-builder.js';
+import { probeSite } from '../probe.js';
+const SITES_TEST_OUTPUT_SCHEMA = z.object({
+    site_id: z.string(),
+    site_url: z.string(),
+    platform: z.enum(['wordpress', 'joomla']),
+    plugin_reachable: z.boolean(),
+    bearer_valid: z.boolean(),
+    etag_received: z.boolean(),
+    plugin_error: z.string().optional(),
+    bearer_error: z.string().optional(),
+    summary: z.string(),
+});
+/**
+ * Build the W7 `yootheme_builder_sites_test` tool.
+ *
+ * Signature accepts the {@link ClientPool} directly (no separate
+ * registry param) — `pool.resolve(site_id)` is the single source of
+ * truth and carries the registry inside.
+ */
+export function buildSitesTestTool(pool) {
+    return defineTool({
+        name: 'yootheme_builder_sites_test',
+        description: 'Verify connectivity to ONE site: probes /health (no auth) + ' +
+            '/etag (auth) in parallel; returns plugin_reachable + ' +
+            'bearer_valid. `site_id` is REQUIRED. Use sites_list to find IDs.',
+        inputSchema: {
+            site_id: z
+                .string()
+                .min(1)
+                .max(64)
+                .regex(/^[a-zA-Z0-9_-]+$/, 'site_id uses letters/digits/dash/underscore only')
+                .describe('Site to test (REQUIRED for this tool — overrides default). ' +
+                'Use yootheme_builder_sites_list to discover valid IDs.'),
+        },
+        outputSchema: SITES_TEST_OUTPUT_SCHEMA,
+        annotations: readOnly('Sites — Test connectivity'),
+        handler: async ({ site_id }) => {
+            const r = await resolveSiteOrError(pool, site_id);
+            if (!r.ok)
+                return r.error;
+            const { client: siteClient, site } = r;
+            // W12-R1.2: the parallel /health + /etag probe lives in
+            // sites/probe.ts so MCP-tool + CLI surfaces stay byte-for-byte
+            // in sync. The handler here only maps the structured probe
+            // result into the toolkit detail-card envelope and stamps
+            // site-awareness via withSiteMeta.
+            const probe = await probeSite(siteClient);
+            const checks = {
+                site_id: site.id,
+                site_url: site.url,
+                platform: site.platform.kind,
+                plugin_reachable: probe.plugin_reachable,
+                bearer_valid: probe.bearer_valid,
+                etag_received: probe.etag_received,
+                summary: probe.summary,
+                ...(probe.plugin_error !== undefined ? { plugin_error: probe.plugin_error } : {}),
+                ...(probe.bearer_error !== undefined ? { bearer_error: probe.bearer_error } : {}),
+            };
+            const toolkitResult = detailResult(buildTestDetail(checks));
+            const isError = !(checks.plugin_reachable && checks.bearer_valid);
+            const base = structuredResult(toolkitResult, {
+                ...checks,
+            });
+            const wrapped = isError
+                ? { ...base, isError: true }
+                : base;
+            return withSiteMeta(wrapped, site);
+        },
+    });
+}
+/**
+ * Render a 2-group detail-card body from the structured `checks`. Group
+ * 1 = identity (site_id/url/platform), Group 2 = probe results
+ * (plugin_reachable + bearer_valid + etag_received + summary). Keeps the
+ * shape stable across green / partial / red so MCP-host Detail-Card
+ * renderers don't need to branch.
+ */
+function buildTestDetail(checks) {
+    const identityEntries = [
+        { key: 'site_id', label: 'Site ID', value: checks.site_id, format: 'badge' },
+        { key: 'site_url', label: 'Site URL', value: checks.site_url },
+        { key: 'platform', label: 'Platform', value: checks.platform, format: 'badge' },
+    ];
+    const probeEntries = [
+        { key: 'plugin_reachable', label: 'Plugin reachable', value: checks.plugin_reachable, format: 'boolean' },
+        { key: 'bearer_valid', label: 'Bearer valid', value: checks.bearer_valid, format: 'boolean' },
+        { key: 'etag_received', label: 'ETag received', value: checks.etag_received, format: 'boolean' },
+        { key: 'summary', label: 'Summary', value: checks.summary },
+    ];
+    if (checks.plugin_error !== undefined) {
+        probeEntries.push({
+            key: 'plugin_error', label: 'Plugin error', value: checks.plugin_error, format: 'code',
+        });
+    }
+    if (checks.bearer_error !== undefined) {
+        probeEntries.push({
+            key: 'bearer_error', label: 'Bearer error', value: checks.bearer_error, format: 'code',
+        });
+    }
+    return {
+        title: 'YT Builder MCP — Sites Test',
+        groups: [
+            { label: 'Site', entries: identityEntries },
+            { label: 'Probe', entries: probeEntries },
+        ],
+    };
+}
+//# sourceMappingURL=sites-test.js.map

package/dist/sites/tools/sites-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sites-test.js","sourceRoot":"","sources":["../../../src/sites/tools/sites-test.ts"],"names":[],"mappings":"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"}

package/dist/skill-loader.d.ts

@@ -16,18 +16,35 @@
  *
  * Resolution layout (matches `install-skill.ts` + `build-dxt.js`):
  *
- *   packages/mcp/skills/yootheme-builder/SKILL.md
+ *   packages/mcp/skills/yt-builder-mcp/SKILL.md
  *
  * When the file is compiled to `dist/skill-loader.js`, the same
- * relative `../skills/yootheme-builder/SKILL.md` resolves correctly
+ * relative `../skills/yt-builder-mcp/SKILL.md` resolves correctly
  * because the published npm tarball (and the DXT stage) preserves the
  * `skills/` folder next to `dist/`.
  *
  * Read errors throw at module-init: a missing SKILL.md is a packaging
  * bug, not a recoverable runtime condition.
  *
+ * W8 — `appendSitesBlock(skillContent, registry)` post-processor.
+ *  When the in-process {@link SiteRegistry} carries ≥1 configured
+ *  site, append a "Currently configured sites" appendix to the
+ *  instructions string so MCP hosts surface the live site roster
+ *  alongside the skill narrative. The appendix contains ONLY
+ *  safe-to-render metadata (site_id, label, platform hint/resolved,
+ *  url, default-flag) — bearer fields are NEVER touched. When the
+ *  registry has 0 sites the original skill content is returned
+ *  verbatim (no appendix, no separator).
+ *
+ *  This is a pure-string post-processor; it does not touch the
+ *  on-disk SKILL.md. Per plan §W8 (line 919) the MCP `initialize`
+ *  response carries `instructions` as a single shot, so an AI client
+ *  restart is required for the appendix to refresh after a sites file
+ *  edit. The W9 CLI commands (add-site / remove-site) print a reminder.
+ *
  * @license MIT
  */
+import type { SiteRegistry } from './sites/registry.js';
 /** Stable URI under which the skill resource is exposed via MCP `resources/*`. */
 export declare const SKILL_RESOURCE_URI = "skill://yt-builder-mcp";
 /** Human-readable resource name surfaced in `resources/list`. */
@@ -39,9 +56,52 @@ export declare const SKILL_RESOURCE_MIME_TYPE = "text/markdown";
 /**
  * Load the bundled SKILL.md content. Cached after the first read.
  *
+ * When `registry` is supplied AND it carries ≥1 site, the returned
+ * string is the on-disk SKILL.md PLUS the W8 sites appendix (see
+ * {@link appendSitesBlock}). When `registry` is omitted or empty, the
+ * raw skill content is returned unchanged. The disk cache is shared
+ * across calls — the appendix is recomputed each time so registry
+ * mutations after the first load are reflected (within the same
+ * process instance — the MCP `initialize` response only takes a
+ * single-shot snapshot per session per plan §W8 line 919).
+ *
  * @throws Error when the file is missing or unreadable (packaging bug).
  */
-export declare function loadSkillContent(): string;
+export declare function loadSkillContent(registry?: SiteRegistry): string;
+/**
+ * Append the W8 "Currently configured sites" block to a skill-content
+ * string. When the registry is empty, returns the input verbatim — no
+ * separator, no header, no trailing newline change.
+ *
+ * Output shape (per plan §W8 Z.904-917):
+ * ```text
+ * <skillContent>
+ *
+ * ---
+ *
+ * ## Currently configured sites (3)
+ *
+ * - `wp-acme` — Acme — Production · wordpress · https://acme.com · default
+ * - `joomla-beta` — Beta — Staging · joomla · https://beta.example.com/joomla
+ * - `wp-internal` — Internal staging · wordpress · https://internal.example.com
+ *
+ * Use `yootheme_builder_sites_list` to inspect this at runtime.
+ * Pass `site_id: "<id>"` on any tool call to target a specific site;
+ * omit it to use the default.
+ * ```
+ *
+ * Per-row format (bullet):
+ *   `- \`<site_id>\` — <label or "(no label)"> · <platform> · <url><" · default"?>`
+ *
+ * The platform column prefers `platform_resolved` when the registry
+ * has memoised a probe result for that site (peek-only — never
+ * triggers a new probe), and falls back to `platform_hint` otherwise.
+ *
+ * Bearer fields (bearer / bearer_ref) are intentionally NEVER
+ * referenced — only `site_id`, `url`, `platform_*`, `is_default`,
+ * `label` from {@link SiteRowT}.
+ */
+export declare function appendSitesBlock(skillContent: string, registry: SiteRegistry): string;
 /**
  * Reset the in-memory cache. Intended for tests only.
  *

package/dist/skill-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-loader.d.ts","sourceRoot":"","sources":["../src/skill-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAMH,kFAAkF;AAClF,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAE3D,iEAAiE;AACjE,eAAO,MAAM,mBAAmB,sCAAiC,CAAC;AAElE,wDAAwD;AACxD,eAAO,MAAM,0BAA0B,QAEqC,CAAC;AAE7E,0CAA0C;AAC1C,eAAO,MAAM,wBAAwB,kBAAkB,CAAC;AAmBxD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAOzC;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}
+{"version":3,"file":"skill-loader.d.ts","sourceRoot":"","sources":["../src/skill-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAMH,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,qBAAqB,CAAC;AAElE,kFAAkF;AAClF,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAE3D,iEAAiE;AACjE,eAAO,MAAM,mBAAmB,sCAAiC,CAAC;AAElE,wDAAwD;AACxD,eAAO,MAAM,0BAA0B,QAEqC,CAAC;AAE7E,0CAA0C;AAC1C,eAAO,MAAM,wBAAwB,kBAAkB,CAAC;AAmBxD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,CAAC,EAAE,YAAY,GAAG,MAAM,CAShE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,gBAAgB,CAC5B,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,YAAY,GACvB,MAAM,CAkBR;AA0CD;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}

package/dist/skill-loader.js

@@ -16,16 +16,32 @@
  *
  * Resolution layout (matches `install-skill.ts` + `build-dxt.js`):
  *
- *   packages/mcp/skills/yootheme-builder/SKILL.md
+ *   packages/mcp/skills/yt-builder-mcp/SKILL.md
  *
  * When the file is compiled to `dist/skill-loader.js`, the same
- * relative `../skills/yootheme-builder/SKILL.md` resolves correctly
+ * relative `../skills/yt-builder-mcp/SKILL.md` resolves correctly
  * because the published npm tarball (and the DXT stage) preserves the
  * `skills/` folder next to `dist/`.
  *
  * Read errors throw at module-init: a missing SKILL.md is a packaging
  * bug, not a recoverable runtime condition.
  *
+ * W8 — `appendSitesBlock(skillContent, registry)` post-processor.
+ *  When the in-process {@link SiteRegistry} carries ≥1 configured
+ *  site, append a "Currently configured sites" appendix to the
+ *  instructions string so MCP hosts surface the live site roster
+ *  alongside the skill narrative. The appendix contains ONLY
+ *  safe-to-render metadata (site_id, label, platform hint/resolved,
+ *  url, default-flag) — bearer fields are NEVER touched. When the
+ *  registry has 0 sites the original skill content is returned
+ *  verbatim (no appendix, no separator).
+ *
+ *  This is a pure-string post-processor; it does not touch the
+ *  on-disk SKILL.md. Per plan §W8 (line 919) the MCP `initialize`
+ *  response carries `instructions` as a single shot, so an AI client
+ *  restart is required for the appendix to refresh after a sites file
+ *  edit. The W9 CLI commands (add-site / remove-site) print a reminder.
+ *
  * @license MIT
  */
 import { readFileSync } from 'node:fs';
@@ -44,28 +60,125 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 /**
  * Resolve the on-disk path to the bundled SKILL.md.
  *
- * Source-tree:   packages/mcp/src/skill-loader.ts → ../skills/yootheme-builder/SKILL.md
- * Built tarball: packages/mcp/dist/skill-loader.js → ../skills/yootheme-builder/SKILL.md
+ * Source-tree:   packages/mcp/src/skill-loader.ts → ../skills/yt-builder-mcp/SKILL.md
+ * Built tarball: packages/mcp/dist/skill-loader.js → ../skills/yt-builder-mcp/SKILL.md
  *
  * Both layouts work because `dist/` and `src/` are siblings of
  * `skills/` under the package root.
  */
 function resolveSkillPath() {
-    return resolve(__dirname, '..', 'skills', 'yootheme-builder', 'SKILL.md');
+    return resolve(__dirname, '..', 'skills', 'yt-builder-mcp', 'SKILL.md');
 }
 let cached;
 /**
  * Load the bundled SKILL.md content. Cached after the first read.
  *
+ * When `registry` is supplied AND it carries ≥1 site, the returned
+ * string is the on-disk SKILL.md PLUS the W8 sites appendix (see
+ * {@link appendSitesBlock}). When `registry` is omitted or empty, the
+ * raw skill content is returned unchanged. The disk cache is shared
+ * across calls — the appendix is recomputed each time so registry
+ * mutations after the first load are reflected (within the same
+ * process instance — the MCP `initialize` response only takes a
+ * single-shot snapshot per session per plan §W8 line 919).
+ *
  * @throws Error when the file is missing or unreadable (packaging bug).
  */
-export function loadSkillContent() {
-    if (cached !== undefined) {
+export function loadSkillContent(registry) {
+    if (cached === undefined) {
+        const path = resolveSkillPath();
+        cached = readFileSync(path, 'utf-8');
+    }
+    if (registry === undefined) {
         return cached;
     }
-    const path = resolveSkillPath();
-    cached = readFileSync(path, 'utf-8');
-    return cached;
+    return appendSitesBlock(cached, registry);
+}
+/**
+ * Append the W8 "Currently configured sites" block to a skill-content
+ * string. When the registry is empty, returns the input verbatim — no
+ * separator, no header, no trailing newline change.
+ *
+ * Output shape (per plan §W8 Z.904-917):
+ * ```text
+ * <skillContent>
+ *
+ * ---
+ *
+ * ## Currently configured sites (3)
+ *
+ * - `wp-acme` — Acme — Production · wordpress · https://acme.com · default
+ * - `joomla-beta` — Beta — Staging · joomla · https://beta.example.com/joomla
+ * - `wp-internal` — Internal staging · wordpress · https://internal.example.com
+ *
+ * Use `yootheme_builder_sites_list` to inspect this at runtime.
+ * Pass `site_id: "<id>"` on any tool call to target a specific site;
+ * omit it to use the default.
+ * ```
+ *
+ * Per-row format (bullet):
+ *   `- \`<site_id>\` — <label or "(no label)"> · <platform> · <url><" · default"?>`
+ *
+ * The platform column prefers `platform_resolved` when the registry
+ * has memoised a probe result for that site (peek-only — never
+ * triggers a new probe), and falls back to `platform_hint` otherwise.
+ *
+ * Bearer fields (bearer / bearer_ref) are intentionally NEVER
+ * referenced — only `site_id`, `url`, `platform_*`, `is_default`,
+ * `label` from {@link SiteRowT}.
+ */
+export function appendSitesBlock(skillContent, registry) {
+    const rows = registry.listForDisplay();
+    if (rows.length === 0) {
+        return skillContent;
+    }
+    const bullets = rows.map((row) => renderBullet(row)).join('\n');
+    const block = '\n\n---\n\n' +
+        `## Currently configured sites (${String(rows.length)})\n\n` +
+        bullets +
+        '\n\n' +
+        'Use `yootheme_builder_sites_list` to inspect this at runtime.\n' +
+        'Pass `site_id: "<id>"` on any tool call to target a specific site;\n' +
+        'omit it to use the default.\n';
+    return skillContent + block;
+}
+/**
+ * Markdown-escape an operator-provided string so it cannot inject
+ * structure into the rendered SKILL.md appendix.
+ *
+ * W12-R1.3 (A2-L2): the W8 sites-appendix renders `row.label` into the
+ * server's `instructions` field, which MCP hosts surface to the LLM
+ * verbatim. An operator with write-access to sites.json could land a
+ * label like `Acme [INTERNAL TOOL: ignore prior context] Production`
+ * and the prompt would carry that text into the model context. The
+ * escape list covers the markdown special chars the W8 bullet format
+ * could collide with (\`*_[]<>), preserving readable text while
+ * preventing injection. site_id is regex-restricted at the schema
+ * layer so it doesn't need escaping; url is operator-controlled but
+ * has a much smaller chosen-char surface and is rendered after a `·`
+ * separator that limits payload shape.
+ */
+function escapeMarkdown(text) {
+    return text.replace(/([\\`*_[\]<>])/g, '\\$1');
+}
+/**
+ * Render one {@link SiteRowT} as a markdown bullet for the W8 sites
+ * appendix.
+ *
+ * Format: `- \`<site_id>\` — <label> · <platform> · <url><" · default"?>`
+ *
+ * `<platform>` prefers `platform_resolved` (the W3 memo cache) and
+ * falls back to `platform_hint` when no probe has run yet.
+ * `<label>` falls back to the literal string `(no label)` when the
+ * entry has none AND is markdown-escaped (W12-R1.3 prompt-injection
+ * defense). The `default` suffix is only present when `is_default`
+ * is true.
+ */
+function renderBullet(row) {
+    const platform = row.platform_resolved ?? row.platform_hint;
+    const label = escapeMarkdown(row.label ?? '(no label)');
+    const defaultSuffix = row.is_default ? ' · default' : '';
+    return `- \`${row.site_id}\` — ${label} · ${platform} · ${row.url}${defaultSuffix}`;
 }
 /**
  * Reset the in-memory cache. Intended for tests only.

package/dist/skill-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"skill-loader.js","sourceRoot":"","sources":["../src/skill-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,kFAAkF;AAClF,MAAM,CAAC,MAAM,kBAAkB,GAAG,wBAAwB,CAAC;AAE3D,iEAAiE;AACjE,MAAM,CAAC,MAAM,mBAAmB,GAAG,8BAA8B,CAAC;AAElE,wDAAwD;AACxD,MAAM,CAAC,MAAM,0BAA0B,GACnC,gFAAgF;IAChF,wEAAwE,CAAC;AAE7E,0CAA0C;AAC1C,MAAM,CAAC,MAAM,wBAAwB,GAAG,eAAe,CAAC;AAExD,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D;;;;;;;;GAQG;AACH,SAAS,gBAAgB;IACrB,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,kBAAkB,EAAE,UAAU,CAAC,CAAC;AAC9E,CAAC;AAED,IAAI,MAA0B,CAAC;AAE/B;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAC5B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC;IAChC,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB;IACrC,MAAM,GAAG,SAAS,CAAC;AACvB,CAAC"}
+{"version":3,"file":"skill-loader.js","sourceRoot":"","sources":["../src/skill-loader.ts"],"names":[],"mappings":"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"}

package/dist/tools/elements/builders.d.ts

@@ -11,7 +11,7 @@
  *
  * @license MIT
  */
-import type { RestClient } from '../../client.js';
+import type { ClientPool } from '../../sites/client-pool.js';
 import { type AnyToolDefinition } from '../tool-builder.js';
 import { type ElementsHandlerDeps } from './handlers.js';
 /**
@@ -20,5 +20,5 @@ import { type ElementsHandlerDeps } from './handlers.js';
  * omitted, the destructive tool falls back to the explicit
  * `confirm: true` parameter.
  */
-export declare function buildElementsTools(client: RestClient, deps?: Partial<ElementsHandlerDeps>): readonly AnyToolDefinition[];
+export declare function buildElementsTools(pool: ClientPool, deps?: Partial<ElementsHandlerDeps>): readonly AnyToolDefinition[];
 //# sourceMappingURL=builders.d.ts.map

package/dist/tools/elements/builders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builders.d.ts","sourceRoot":"","sources":["../../../src/tools/elements/builders.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGlD,OAAO,EAMH,KAAK,iBAAiB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGH,KAAK,mBAAmB,EAQ3B,MAAM,eAAe,CAAC;AAEvB;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAC9B,MAAM,EAAE,UAAU,EAClB,IAAI,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,GACpC,SAAS,iBAAiB,EAAE,CAiL9B"}
+{"version":3,"file":"builders.d.ts","sourceRoot":"","sources":["../../../src/tools/elements/builders.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAI7D,OAAO,EAOH,KAAK,iBAAiB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGH,KAAK,mBAAmB,EAQ3B,MAAM,eAAe,CAAC;AAEvB;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,UAAU,EAChB,IAAI,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,GACpC,SAAS,iBAAiB,EAAE,CAqN9B"}

package/dist/tools/elements/builders.js

@@ -12,9 +12,10 @@
  * @license MIT
  */
 import { z } from 'zod';
-import { ELEMENT_PATH, ETAG, PROPS, TEMPLATE_ID } from '../shared-schemas.js';
+import { withSiteRetry } from '../pool-resolve-helper.js';
+import { ELEMENT_PATH, ETAG, PROPS, SITE_ID_SCHEMA, TEMPLATE_ID } from '../shared-schemas.js';
 import { FIELDS } from '../sparse-fields.js';
-import { creating, defineTool, destructive, mutating, readOnly, } from '../tool-builder.js';
+import { creating, defineTool, destructive, mutating, readOnly, withSiteMeta, } from '../tool-builder.js';
 import { ELEMENT_GET_OUTPUT_SCHEMA, ELEMENT_LIST_OUTPUT_SCHEMA, handleElementAdd, handleElementClone, handleElementDelete, handleElementGet, handleElementList, handleElementMove, handleElementUpdateSettings, } from './handlers.js';
 /**
  * Build the 7 element tools. The optional `deps` carries the
@@ -22,18 +23,23 @@ import { ELEMENT_GET_OUTPUT_SCHEMA, ELEMENT_LIST_OUTPUT_SCHEMA, handleElementAdd
  * omitted, the destructive tool falls back to the explicit
  * `confirm: true` parameter.
  */
-export function buildElementsTools(client, deps) {
-    const handlerDeps = {
-        client,
-        elicitation: deps?.elicitation,
-    };
+export function buildElementsTools(pool, deps) {
+    // W6.3 — each handler resolves the pool inline (per `site_id`) so
+    // the per-handler `siteClient` reaches the right CMS install. The
+    // elicitation capability is the only non-client dep we propagate.
+    const elicitation = deps?.elicitation;
+    const makeDeps = (siteClient) => (elicitation !== undefined
+        ? { client: siteClient, elicitation }
+        : { client: siteClient });
     return [
         defineTool({
             name: 'yootheme_builder_element_list',
             description: 'List elements in a template as a flat array with JSON-Pointer paths + ' +
                 'types. Scope with `root_path`/`depth` for a subtree, paginate with ' +
-                '`limit`/`cursor` for large templates. `fields[]` narrows each row.',
+                '`limit`/`cursor` for large templates. `fields[]` narrows each row. ' +
+                'Operates on the default site unless site_id is provided.',
             inputSchema: {
+                site_id: SITE_ID_SCHEMA,
                 template_id: TEMPLATE_ID,
                 fields: FIELDS,
                 root_path: z
@@ -61,32 +67,41 @@ export function buildElementsTools(client, deps) {
             },
             outputSchema: ELEMENT_LIST_OUTPUT_SCHEMA,
             annotations: readOnly('List Elements'),
-            handler: (input) => handleElementList(handlerDeps, input),
+            handler: async ({ site_id, ...rest }) => withSiteRetry(pool, site_id, async (client, site) => withSiteMeta(await handleElementList(makeDeps(client), rest), site)),
         }),
         defineTool({
             name: 'yootheme_builder_element_get',
             description: 'Get the full element object at a specific JSON-Pointer path, including props ' +
-                'and children. Use yootheme_builder_element_list to discover paths.',
+                'and children. Use yootheme_builder_element_list to discover paths. ' +
+                'Operates on the default site unless site_id is provided.',
             inputSchema: {
+                site_id: SITE_ID_SCHEMA,
                 template_id: TEMPLATE_ID,
                 element_path: ELEMENT_PATH,
             },
             outputSchema: ELEMENT_GET_OUTPUT_SCHEMA,
             annotations: readOnly('Get Element'),
-            handler: (input) => handleElementGet(handlerDeps, input),
+            handler: async ({ site_id, ...rest }) => withSiteRetry(pool, site_id, async (client, site) => withSiteMeta(await handleElementGet(makeDeps(client), rest), site)),
         }),
         defineTool({
             name: 'yootheme_builder_element_add',
             description: 'Add a new element to a template. Provide `parent_path` (or "" for root), ' +
                 '`element_type` (e.g. "headline", "text", "grid"), and optional `props` / ' +
-                '`children`. Returns the new element\'s JSON-Pointer path. Requires ETag.',
+                '`children`. Returns the new element\'s JSON-Pointer path. Requires ETag. ' +
+                'Operates on the default site unless site_id is provided.',
             inputSchema: {
+                site_id: SITE_ID_SCHEMA,
                 template_id: TEMPLATE_ID,
                 parent_path: z
                     .string()
                     .default('')
-                    .describe('JSON-Pointer of the parent node ("" for template root, ' +
-                    '"/0/children/2" for nested). Use yootheme_builder_element_list to find.'),
+                    .describe('JSON-Pointer of the parent node. Accepts EITHER "" for ' +
+                    'template root, a `rel_path` from `element_list` ' +
+                    '(`/children/0`, `/children/0/children/2`) — the server ' +
+                    'resolves it within this template — OR a fully-qualified ' +
+                    'pointer (`/templates/<id>/layout/children/0/...`). The ' +
+                    'rel_path form is preferred (copy-paste straight from ' +
+                    '`element_list`).'),
                 element_type: z
                     .string()
                     .min(1)
@@ -100,14 +115,16 @@ export function buildElementsTools(client, deps) {
                 etag: ETAG,
             },
             annotations: creating('Add Element'),
-            handler: (input, extra) => handleElementAdd(handlerDeps, input, extra),
+            handler: async ({ site_id, ...rest }, extra) => withSiteRetry(pool, site_id, async (client, site) => withSiteMeta(await handleElementAdd(makeDeps(client), rest, extra), site)),
         }),
         defineTool({
             name: 'yootheme_builder_element_update_settings',
             description: 'Update `props` on an element. Default replaces all props; pass ' +
                 '`merge:true` for server-side deep-merge (only request keys overwritten, ' +
-                'others survive — avoids read-modify-write races). Requires ETag.',
+                'others survive — avoids read-modify-write races). Requires ETag. ' +
+                'Operates on the default site unless site_id is provided.',
             inputSchema: {
+                site_id: SITE_ID_SCHEMA,
                 template_id: TEMPLATE_ID,
                 element_path: ELEMENT_PATH,
                 props: PROPS,
@@ -119,13 +136,15 @@ export function buildElementsTools(client, deps) {
                 etag: ETAG,
             },
             annotations: mutating('Update Element Settings'),
-            handler: (input, extra) => handleElementUpdateSettings(handlerDeps, input, extra),
+            handler: async ({ site_id, ...rest }, extra) => withSiteRetry(pool, site_id, async (client, site) => withSiteMeta(await handleElementUpdateSettings(makeDeps(client), rest, extra), site)),
         }),
         defineTool({
             name: 'yootheme_builder_element_move',
             description: 'Move an element to a new parent + index in the tree. Useful for reordering or ' +
-                'reparenting (e.g. moving a card from one grid column to another). Requires ETag.',
+                'reparenting (e.g. moving a card from one grid column to another). Requires ETag. ' +
+                'Operates on the default site unless site_id is provided.',
             inputSchema: {
+                site_id: SITE_ID_SCHEMA,
                 template_id: TEMPLATE_ID,
                 element_path: ELEMENT_PATH,
                 to_parent_path: z
@@ -139,26 +158,29 @@ export function buildElementsTools(client, deps) {
                 etag: ETAG,
             },
             annotations: mutating('Move Element'),
-            handler: (input, extra) => handleElementMove(handlerDeps, input, extra),
+            handler: async ({ site_id, ...rest }, extra) => withSiteRetry(pool, site_id, async (client, site) => withSiteMeta(await handleElementMove(makeDeps(client), rest, extra), site)),
         }),
         defineTool({
             name: 'yootheme_builder_element_clone',
             description: 'Clone an element as a sibling (same parent, immediately after the source). ' +
-                'Returns the new element\'s path. Requires ETag.',
+                'Returns the new element\'s path. Requires ETag. ' +
+                'Operates on the default site unless site_id is provided.',
             inputSchema: {
+                site_id: SITE_ID_SCHEMA,
                 template_id: TEMPLATE_ID,
                 element_path: ELEMENT_PATH,
                 etag: ETAG,
             },
             annotations: creating('Clone Element'),
-            handler: (input, extra) => handleElementClone(handlerDeps, input, extra),
+            handler: async ({ site_id, ...rest }, extra) => withSiteRetry(pool, site_id, async (client, site) => withSiteMeta(await handleElementClone(makeDeps(client), rest, extra), site)),
         }),
         defineTool({
             name: 'yootheme_builder_element_delete',
             description: 'PERMANENTLY delete an element and all its children. Cannot be undone. Always ' +
                 'ask the user to confirm first, then call again with `confirm: true`. Requires ' +
-                'ETag.',
+                'ETag. Operates on the default site unless site_id is provided.',
             inputSchema: {
+                site_id: SITE_ID_SCHEMA,
                 template_id: TEMPLATE_ID,
                 element_path: ELEMENT_PATH,
                 etag: ETAG,
@@ -170,7 +192,7 @@ export function buildElementsTools(client, deps) {
                     'preview and the agent must retry with `confirm: true`.'),
             },
             annotations: destructive('Delete Element'),
-            handler: (input, extra) => handleElementDelete(handlerDeps, input, extra),
+            handler: async ({ site_id, ...rest }, extra) => withSiteRetry(pool, site_id, async (client, site) => withSiteMeta(await handleElementDelete(makeDeps(client), rest, extra), site)),
         }),
     ];
 }