@squadbase/vite-server 0.1.17-dev.a9ddcfa → 0.1.17-dev.d4fff69

package/dist/connectors/hubspot-oauth.js

@@ -114,7 +114,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   /**
    * Create tools for connections that belong to this connector.
    * Filters connections by connectorKey internally.
-   * Returns tools keyed as `${connectorKey}_${toolName}`.
+   * Returns tools keyed as `connector_${connectorKey}_${toolName}`.
    */
   createTools(connections, config, opts) {
     const myConnections = connections.filter(
@@ -124,7 +124,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     for (const t of Object.values(this.tools)) {
       const tool = t.createTool(myConnections, config);
       const originalToModelOutput = tool.toModelOutput;
-      result[`${this.connectorKey}_${t.name}`] = {
+      result[`connector_${this.connectorKey}_${t.name}`] = {
         ...tool,
         toModelOutput: async (options) => {
           if (!originalToModelOutput) {
@@ -392,11 +392,11 @@ var hubspotOnboarding = new ConnectorOnboarding({
 - Write only 1 sentence between tool calls, then immediately call the next tool. Skip unnecessary explanations and proceed efficiently`
   },
   dataOverviewInstructions: {
-    en: `1. Call hubspot-oauth_request with GET /crm/v3/objects/contacts?limit=5 to explore contacts structure
-2. Call hubspot-oauth_request with GET /crm/v3/objects/deals?limit=5 to explore deals structure
+    en: `1. Call connector_hubspot-oauth_request with GET /crm/v3/objects/contacts?limit=5 to explore contacts structure
+2. Call connector_hubspot-oauth_request with GET /crm/v3/objects/deals?limit=5 to explore deals structure
 3. Explore other object types (companies, etc.) as needed to understand available data`,
-    ja: `1. hubspot-oauth_request \u3067 GET /crm/v3/objects/contacts?limit=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u69CB\u9020\u3092\u78BA\u8A8D
-2. hubspot-oauth_request \u3067 GET /crm/v3/objects/deals?limit=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u53D6\u5F15\u306E\u69CB\u9020\u3092\u78BA\u8A8D
+    ja: `1. connector_hubspot-oauth_request \u3067 GET /crm/v3/objects/contacts?limit=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u69CB\u9020\u3092\u78BA\u8A8D
+2. connector_hubspot-oauth_request \u3067 GET /crm/v3/objects/deals?limit=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u53D6\u5F15\u306E\u69CB\u9020\u3092\u78BA\u8A8D
 3. \u5FC5\u8981\u306B\u5FDC\u3058\u3066\u4ED6\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u30BF\u30A4\u30D7\uFF08\u4F01\u696D\u306A\u3069\uFF09\u3092\u63A2\u7D22\u3057\u3001\u5229\u7528\u53EF\u80FD\u306A\u30C7\u30FC\u30BF\u3092\u628A\u63E1`
   }
 });
@@ -434,6 +434,19 @@ async function listProperties(proxyFetch, objectType) {
   const data = await res.json();
   return data.results ?? [];
 }
+async function fetchObjectCount(proxyFetch, objectType) {
+  try {
+    const res = await apiFetch(
+      proxyFetch,
+      `/crm/v3/objects/${objectType}?limit=1`
+    );
+    if (!res.ok) return null;
+    const data = await res.json();
+    return typeof data.total === "number" ? data.total : null;
+  } catch {
+    return null;
+  }
+}
 var hubspotOauthSetupFlow = {
   initialState: () => ({}),
   steps: [
@@ -464,8 +477,27 @@ var hubspotOauthSetupFlow = {
       limit: HUBSPOT_SETUP_MAX_OBJECT_TYPES
     });
     const sections = ["## HubSpot", ""];
+    const countByType = /* @__PURE__ */ new Map();
+    for (const objectType of targetObjectTypes) {
+      countByType.set(
+        objectType,
+        await fetchObjectCount(rt.config.proxyFetch, objectType)
+      );
+    }
+    sections.push("### Record counts", "");
+    sections.push("| Object type | Record count |");
+    sections.push("|-------------|-------------|");
+    for (const objectType of targetObjectTypes) {
+      const count = countByType.get(objectType);
+      sections.push(
+        `| ${objectType} | ${count == null ? "-" : count.toLocaleString()} |`
+      );
+    }
+    sections.push("");
     for (const objectType of targetObjectTypes) {
-      sections.push(`### Object: ${objectType}`, "");
+      const count = countByType.get(objectType);
+      const countLabel = count == null ? "" : ` (${count.toLocaleString()} records)`;
+      sections.push(`### Object: ${objectType}${countLabel}`, "");
       const props = await listProperties(rt.config.proxyFetch, objectType);
       const limited = props.slice(0, HUBSPOT_SETUP_MAX_PROPERTIES);
       sections.push("| Property | Type | Label |");
@@ -515,7 +547,7 @@ var hubspotOauthConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`hubspot-oauth_request\`: The only way to call the HubSpot API. Use it to query contacts, deals, companies, and other CRM objects. Authentication is configured automatically via OAuth. HubSpot uses cursor-based pagination with the \`after\` parameter from \`paging.next.after\` in the response.
+- \`connector_hubspot-oauth_request\`: The only way to call the HubSpot API. Use it to query contacts, deals, companies, and other CRM objects. Authentication is configured automatically via OAuth. HubSpot uses cursor-based pagination with the \`after\` parameter from \`paging.next.after\` in the response.
 
 ### HubSpot API Reference
 
@@ -560,7 +592,7 @@ const data = await res.json();
 \`\`\``,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`hubspot-oauth_request\`: HubSpot API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30B3\u30F3\u30BF\u30AF\u30C8\u3001\u53D6\u5F15\u3001\u4F1A\u793E\u3001\u305D\u306E\u4ED6\u306ECRM\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AF\u30A8\u30EA\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002OAuth\u7D4C\u7531\u3067\u8A8D\u8A3C\u306F\u81EA\u52D5\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002HubSpot\u306F\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`paging.next.after\` \u304B\u3089\u306E \`after\` \u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3088\u308B\u30AB\u30FC\u30BD\u30EB\u30D9\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u30CD\u30FC\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+- \`connector_hubspot-oauth_request\`: HubSpot API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30B3\u30F3\u30BF\u30AF\u30C8\u3001\u53D6\u5F15\u3001\u4F1A\u793E\u3001\u305D\u306E\u4ED6\u306ECRM\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AF\u30A8\u30EA\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002OAuth\u7D4C\u7531\u3067\u8A8D\u8A3C\u306F\u81EA\u52D5\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002HubSpot\u306F\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`paging.next.after\` \u304B\u3089\u306E \`after\` \u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3088\u308B\u30AB\u30FC\u30BD\u30EB\u30D9\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u30CD\u30FC\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 ### HubSpot API \u30EA\u30D5\u30A1\u30EC\u30F3\u30B9
 

package/dist/connectors/hubspot.js

@@ -257,7 +257,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   /**
    * Create tools for connections that belong to this connector.
    * Filters connections by connectorKey internally.
-   * Returns tools keyed as `${connectorKey}_${toolName}`.
+   * Returns tools keyed as `connector_${connectorKey}_${toolName}`.
    */
   createTools(connections, config, opts) {
     const myConnections = connections.filter(
@@ -267,7 +267,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     for (const t of Object.values(this.tools)) {
       const tool = t.createTool(myConnections, config);
       const originalToModelOutput = tool.toModelOutput;
-      result[`${this.connectorKey}_${t.name}`] = {
+      result[`connector_${this.connectorKey}_${t.name}`] = {
         ...tool,
         toModelOutput: async (options) => {
           if (!originalToModelOutput) {
@@ -397,11 +397,11 @@ var AUTH_TYPES = {
 // ../connectors/src/connectors/hubspot/setup.ts
 var hubspotOnboarding = new ConnectorOnboarding({
   dataOverviewInstructions: {
-    en: `1. Call hubspot_request with GET /crm/v3/objects/contacts?limit=5 to explore contacts structure
-2. Call hubspot_request with GET /crm/v3/objects/deals?limit=5 to explore deals structure
+    en: `1. Call connector_hubspot_request with GET /crm/v3/objects/contacts?limit=5 to explore contacts structure
+2. Call connector_hubspot_request with GET /crm/v3/objects/deals?limit=5 to explore deals structure
 3. Explore other object types (companies, tickets, etc.) as needed to understand available data`,
-    ja: `1. hubspot_request \u3067 GET /crm/v3/objects/contacts?limit=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u69CB\u9020\u3092\u78BA\u8A8D
-2. hubspot_request \u3067 GET /crm/v3/objects/deals?limit=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u53D6\u5F15\u306E\u69CB\u9020\u3092\u78BA\u8A8D
+    ja: `1. connector_hubspot_request \u3067 GET /crm/v3/objects/contacts?limit=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u69CB\u9020\u3092\u78BA\u8A8D
+2. connector_hubspot_request \u3067 GET /crm/v3/objects/deals?limit=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u53D6\u5F15\u306E\u69CB\u9020\u3092\u78BA\u8A8D
 3. \u5FC5\u8981\u306B\u5FDC\u3058\u3066\u4ED6\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u30BF\u30A4\u30D7\uFF08\u4F01\u696D\u3001\u30C1\u30B1\u30C3\u30C8\u306A\u3069\uFF09\u3092\u63A2\u7D22\u3057\u3001\u5229\u7528\u53EF\u80FD\u306A\u30C7\u30FC\u30BF\u3092\u628A\u63E1`
   }
 });
@@ -435,6 +435,20 @@ var HUBSPOT_OBJECT_TYPES = [
   { value: "meetings", label: "Meetings" },
   { value: "tasks", label: "Tasks" }
 ];
+async function countObjects(params, objectType) {
+  try {
+    const res = await apiFetch(params, `/crm/v3/objects/${objectType}/search`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ limit: 1 })
+    });
+    if (!res.ok) return null;
+    const data = await res.json();
+    return typeof data.total === "number" ? data.total : null;
+  } catch {
+    return null;
+  }
+}
 async function listProperties(params, objectType) {
   const res = await apiFetch(params, `/crm/v3/properties/${objectType}`);
   if (!res.ok) {
@@ -479,7 +493,9 @@ var hubspotSetupFlow = {
     });
     const sections = ["## HubSpot", ""];
     for (const objectType of targetObjectTypes) {
-      sections.push(`### Object: ${objectType}`, "");
+      const count = await countObjects(rt.params, objectType);
+      const heading = count != null ? `### Object: ${objectType} (${count.toLocaleString()} records)` : `### Object: ${objectType}`;
+      sections.push(heading, "");
       const props = await listProperties(rt.params, objectType);
       const limited = props.slice(0, HUBSPOT_SETUP_MAX_PROPERTIES);
       sections.push("| Property | Type | Label |");
@@ -595,7 +611,7 @@ var hubspotConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`hubspot_request\`: The only way to call the HubSpot API. Use it to query contacts, deals, companies, tickets, and other CRM objects. Authentication (Bearer token) is configured automatically. HubSpot uses cursor-based pagination with the \`after\` parameter from \`paging.next.after\` in the response. Use the search endpoint for complex queries with filters.
+- \`connector_hubspot_request\`: The only way to call the HubSpot API. Use it to query contacts, deals, companies, tickets, and other CRM objects. Authentication (Bearer token) is configured automatically. HubSpot uses cursor-based pagination with the \`after\` parameter from \`paging.next.after\` in the response. Use the search endpoint for complex queries with filters.
 
 ### Business Logic
 
@@ -661,7 +677,7 @@ export default async function handler(c: Context) {
 - \`after\` \u2014 Pagination offset`,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`hubspot_request\`: HubSpot API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30B3\u30F3\u30BF\u30AF\u30C8\u3001\u53D6\u5F15\u3001\u4F1A\u793E\u3001\u30C1\u30B1\u30C3\u30C8\u3001\u305D\u306E\u4ED6\u306ECRM\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AF\u30A8\u30EA\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u8A8D\u8A3C\uFF08Bearer\u30C8\u30FC\u30AF\u30F3\uFF09\u306F\u81EA\u52D5\u7684\u306B\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002HubSpot\u306F\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`paging.next.after\` \u304B\u3089\u306E \`after\` \u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3088\u308B\u30AB\u30FC\u30BD\u30EB\u30D9\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u30CD\u30FC\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u8907\u96D1\u306A\u30AF\u30A8\u30EA\u306B\u306F\u30D5\u30A3\u30EB\u30BF\u4ED8\u304D\u306Esearch\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+- \`connector_hubspot_request\`: HubSpot API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30B3\u30F3\u30BF\u30AF\u30C8\u3001\u53D6\u5F15\u3001\u4F1A\u793E\u3001\u30C1\u30B1\u30C3\u30C8\u3001\u305D\u306E\u4ED6\u306ECRM\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AF\u30A8\u30EA\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u8A8D\u8A3C\uFF08Bearer\u30C8\u30FC\u30AF\u30F3\uFF09\u306F\u81EA\u52D5\u7684\u306B\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002HubSpot\u306F\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`paging.next.after\` \u304B\u3089\u306E \`after\` \u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3088\u308B\u30AB\u30FC\u30BD\u30EB\u30D9\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u30CD\u30FC\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u8907\u96D1\u306A\u30AF\u30A8\u30EA\u306B\u306F\u30D5\u30A3\u30EB\u30BF\u4ED8\u304D\u306Esearch\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 ### Business Logic
 

package/dist/connectors/influxdb.js

@@ -316,7 +316,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   /**
    * Create tools for connections that belong to this connector.
    * Filters connections by connectorKey internally.
-   * Returns tools keyed as `${connectorKey}_${toolName}`.
+   * Returns tools keyed as `connector_${connectorKey}_${toolName}`.
    */
   createTools(connections, config, opts) {
     const myConnections = connections.filter(
@@ -326,7 +326,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     for (const t of Object.values(this.tools)) {
       const tool = t.createTool(myConnections, config);
       const originalToModelOutput = tool.toModelOutput;
-      result[`${this.connectorKey}_${t.name}`] = {
+      result[`connector_${this.connectorKey}_${t.name}`] = {
         ...tool,
         toModelOutput: async (options) => {
           if (!originalToModelOutput) {
@@ -486,7 +486,7 @@ var influxdbOnboarding = new ConnectorOnboarding({
   dataOverviewInstructions: {
     en: `The instance may be either InfluxDB 3 (supports SQL) or InfluxDB 2 (Flux only; includes InfluxDB Cloud on '*.cloud2.influxdata.com'). Detect the variant first, then pick the matching endpoints.
 
-1. Probe for InfluxDB 3: call influxdb_request with POST /api/v3/query_sql, body { "db": "<database>", "q": "SELECT 1" }
+1. Probe for InfluxDB 3: call connector_influxdb_request with POST /api/v3/query_sql, body { "db": "<database>", "q": "SELECT 1" }
    - 200 with JSON rows \u2192 InfluxDB 3. Continue with SQL.
    - 405 Method Not Allowed, or an HTML body like "<html>...405 Not Allowed..." \u2192 InfluxDB 2. Fall back to Flux (step 3).
 2. InfluxDB 3 data overview:
@@ -498,7 +498,7 @@ var influxdbOnboarding = new ConnectorOnboarding({
    - If the Organization parameter was not provided but v3 probing failed, ask the user to set it using updateConnectionParameters before continuing.`,
     ja: `\u63A5\u7D9A\u5148\u306F InfluxDB 3\uFF08SQL \u5BFE\u5FDC\uFF09\u3068 InfluxDB 2\uFF08Flux \u306E\u307F\u3002\`*.cloud2.influxdata.com\` \u306E InfluxDB Cloud \u3092\u542B\u3080\uFF09\u306E\u3069\u3061\u3089\u306E\u53EF\u80FD\u6027\u3082\u3042\u308A\u307E\u3059\u3002\u307E\u305A\u30D0\u30EA\u30A2\u30F3\u30C8\u3092\u5224\u5225\u3057\u3001\u305D\u308C\u306B\u5408\u3046\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-1. InfluxDB 3 \u306E\u5224\u5225: influxdb_request \u3067 POST /api/v3/query_sql\u3001body { "db": "<database>", "q": "SELECT 1" } \u3092\u5B9F\u884C
+1. InfluxDB 3 \u306E\u5224\u5225: connector_influxdb_request \u3067 POST /api/v3/query_sql\u3001body { "db": "<database>", "q": "SELECT 1" } \u3092\u5B9F\u884C
    - 200 + JSON \u884C\u304C\u8FD4\u308B \u2192 InfluxDB 3\u3002\u305D\u306E\u307E\u307E SQL \u3067\u7D9A\u884C\u3002
    - 405 Method Not Allowed\u3001\u307E\u305F\u306F "<html>...405 Not Allowed..." \u306E\u3088\u3046\u306A HTML \u672C\u6587\u304C\u8FD4\u308B \u2192 InfluxDB 2\u3002Flux \u306B\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\uFF08\u624B\u9806 3\uFF09\u3002
 2. InfluxDB 3 \u306E\u5834\u5408\u306E\u30C7\u30FC\u30BF\u6982\u8981:
@@ -875,13 +875,13 @@ var influxdbConnector = new ConnectorPlugin({
 
 The configured instance may be **InfluxDB 3** (supports SQL via \`/api/v3/query_sql\`) or **InfluxDB 2** (Flux only; includes InfluxDB Cloud on \`*.cloud2.influxdata.com\`). Always probe first, then use the matching endpoints:
 
-1. Call \`influxdb_request\` POST \`/api/v3/query_sql\` with body \`{ "db": "<database>", "q": "SELECT 1" }\`
+1. Call \`connector_influxdb_request\` POST \`/api/v3/query_sql\` with body \`{ "db": "<database>", "q": "SELECT 1" }\`
 2. 200 + JSON rows \u2192 InfluxDB 3. Use SQL endpoints.
 3. 405 Method Not Allowed or HTML body (e.g. \`<html>...405 Not Allowed...</html>\`) \u2192 InfluxDB 2. Use Flux via \`/api/v2/query?org={org}\`. Require the \`org\` parameter; if missing, ask the user via \`updateConnectionParameters\`.
 
 ### Tools
 
-- \`influxdb_request\`: The only way to call the InfluxDB HTTP API. Use it to run SQL / InfluxQL / Flux queries, write line protocol, and inspect buckets / databases. Authentication (\`Authorization: Token {token}\`) and the instance URL are configured automatically. On InfluxDB 3 prefer SQL (\`POST /api/v3/query_sql\`) \u2014 it returns JSON rows that are directly usable. On InfluxDB 2 use Flux (\`POST /api/v2/query?org={org}\`) \u2014 the response is annotated CSV. Writes use \`POST /api/v3/write_lp?db={db}\` (v3) or \`POST /api/v2/write?org={org}&bucket={bucket}\` (v2) with a line-protocol body and \`contentType\` set to \`text/plain; charset=utf-8\`.
+- \`connector_influxdb_request\`: The only way to call the InfluxDB HTTP API. Use it to run SQL / InfluxQL / Flux queries, write line protocol, and inspect buckets / databases. Authentication (\`Authorization: Token {token}\`) and the instance URL are configured automatically. On InfluxDB 3 prefer SQL (\`POST /api/v3/query_sql\`) \u2014 it returns JSON rows that are directly usable. On InfluxDB 2 use Flux (\`POST /api/v2/query?org={org}\`) \u2014 the response is annotated CSV. Writes use \`POST /api/v3/write_lp?db={db}\` (v3) or \`POST /api/v2/write?org={org}&bucket={bucket}\` (v2) with a line-protocol body and \`contentType\` set to \`text/plain; charset=utf-8\`.
 
 ### Business Logic
 
@@ -946,13 +946,13 @@ export default async function handler(c: Context) {
 
 \u63A5\u7D9A\u5148\u306F **InfluxDB 3**\uFF08\`/api/v3/query_sql\` \u306E SQL \u5BFE\u5FDC\uFF09\u3068 **InfluxDB 2**\uFF08Flux \u306E\u307F\u3002\`*.cloud2.influxdata.com\` \u306E InfluxDB Cloud \u3092\u542B\u3080\uFF09\u306E\u3069\u3061\u3089\u306E\u53EF\u80FD\u6027\u3082\u3042\u308A\u307E\u3059\u3002\u5FC5\u305A\u6700\u521D\u306B\u30D7\u30ED\u30FC\u30D6\u3057\u3066\u304B\u3089\u3001\u5BFE\u5FDC\u3059\u308B\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044:
 
-1. \`influxdb_request\` \u3067 POST \`/api/v3/query_sql\`\u3001body \`{ "db": "<database>", "q": "SELECT 1" }\` \u3092\u547C\u3073\u51FA\u3059
+1. \`connector_influxdb_request\` \u3067 POST \`/api/v3/query_sql\`\u3001body \`{ "db": "<database>", "q": "SELECT 1" }\` \u3092\u547C\u3073\u51FA\u3059
 2. 200 + JSON \u884C \u2192 InfluxDB 3\u3002SQL \u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528\u3002
 3. 405 Method Not Allowed\u3001\u307E\u305F\u306F HTML \u672C\u6587\uFF08\u4F8B: \`<html>...405 Not Allowed...</html>\`\uFF09\u2192 InfluxDB 2\u3002\`/api/v2/query?org={org}\` \u304B\u3089 Flux \u3092\u4F7F\u7528\u3002\`org\` \u30D1\u30E9\u30E1\u30FC\u30BF\u5FC5\u9808\u3002\u672A\u8A2D\u5B9A\u306A\u3089 \`updateConnectionParameters\` \u3067\u30E6\u30FC\u30B6\u30FC\u306B\u8A2D\u5B9A\u3092\u4F9D\u983C\u3059\u308B\u3002
 
 ### \u30C4\u30FC\u30EB
 
-- \`influxdb_request\`: InfluxDB HTTP API \u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002SQL / InfluxQL / Flux \u30AF\u30A8\u30EA\u306E\u5B9F\u884C\u3001line protocol \u66F8\u304D\u8FBC\u307F\u3001bucket / database \u306E\u78BA\u8A8D\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u8A8D\u8A3C\uFF08\`Authorization: Token {token}\`\uFF09\u3068 instance URL \u306F\u81EA\u52D5\u3067\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002InfluxDB 3 \u3067\u306F SQL (\`POST /api/v3/query_sql\`) \u304C JSON \u884C\u3092\u8FD4\u3059\u305F\u3081\u6700\u3082\u6271\u3044\u3084\u3059\u3044\u3067\u3059\u3002InfluxDB 2 \u3067\u306F Flux (\`POST /api/v2/query?org={org}\`) \u3092\u4F7F\u7528\u3057\u3001\u30EC\u30B9\u30DD\u30F3\u30B9\u306F\u6CE8\u91C8\u4ED8\u304D CSV \u3067\u3059\u3002\u66F8\u304D\u8FBC\u307F\u306F \`POST /api/v3/write_lp?db={db}\` (v3) \u307E\u305F\u306F \`POST /api/v2/write?org={org}&bucket={bucket}\` (v2) \u306B line protocol \u3092\u9001\u308A\u307E\u3059\uFF08\`contentType\` \u306F \`text/plain; charset=utf-8\`\uFF09\u3002
+- \`connector_influxdb_request\`: InfluxDB HTTP API \u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002SQL / InfluxQL / Flux \u30AF\u30A8\u30EA\u306E\u5B9F\u884C\u3001line protocol \u66F8\u304D\u8FBC\u307F\u3001bucket / database \u306E\u78BA\u8A8D\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u8A8D\u8A3C\uFF08\`Authorization: Token {token}\`\uFF09\u3068 instance URL \u306F\u81EA\u52D5\u3067\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002InfluxDB 3 \u3067\u306F SQL (\`POST /api/v3/query_sql\`) \u304C JSON \u884C\u3092\u8FD4\u3059\u305F\u3081\u6700\u3082\u6271\u3044\u3084\u3059\u3044\u3067\u3059\u3002InfluxDB 2 \u3067\u306F Flux (\`POST /api/v2/query?org={org}\`) \u3092\u4F7F\u7528\u3057\u3001\u30EC\u30B9\u30DD\u30F3\u30B9\u306F\u6CE8\u91C8\u4ED8\u304D CSV \u3067\u3059\u3002\u66F8\u304D\u8FBC\u307F\u306F \`POST /api/v3/write_lp?db={db}\` (v3) \u307E\u305F\u306F \`POST /api/v2/write?org={org}&bucket={bucket}\` (v2) \u306B line protocol \u3092\u9001\u308A\u307E\u3059\uFF08\`contentType\` \u306F \`text/plain; charset=utf-8\`\uFF09\u3002
 
 ### Business Logic
 

package/dist/connectors/intercom-oauth.js

@@ -114,7 +114,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   /**
    * Create tools for connections that belong to this connector.
    * Filters connections by connectorKey internally.
-   * Returns tools keyed as `${connectorKey}_${toolName}`.
+   * Returns tools keyed as `connector_${connectorKey}_${toolName}`.
    */
   createTools(connections, config, opts) {
     const myConnections = connections.filter(
@@ -124,7 +124,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     for (const t of Object.values(this.tools)) {
       const tool = t.createTool(myConnections, config);
       const originalToModelOutput = tool.toModelOutput;
-      result[`${this.connectorKey}_${t.name}`] = {
+      result[`connector_${this.connectorKey}_${t.name}`] = {
         ...tool,
         toModelOutput: async (options) => {
           if (!originalToModelOutput) {
@@ -397,14 +397,14 @@ var intercomOauthOnboarding = new ConnectorOnboarding({
 - \u30C4\u30FC\u30EB\u9593\u306F1\u6587\u3060\u3051\u66F8\u3044\u3066\u5373\u6B21\u306E\u30C4\u30FC\u30EB\u547C\u3073\u51FA\u3057\u3002\u4E0D\u8981\u306A\u8AAC\u660E\u306F\u7701\u7565\u3057\u3001\u52B9\u7387\u7684\u306B\u9032\u3081\u308B`
   },
   dataOverviewInstructions: {
-    en: `1. Call intercom-oauth_request with GET /contacts?per_page=5 to explore contacts structure
-2. Call intercom-oauth_request with GET /conversations?per_page=5 to explore conversations structure
-3. Call intercom-oauth_request with GET /data_attributes?model=contact to list contact data attributes
-4. Call intercom-oauth_request with GET /companies?per_page=5 to explore company structure`,
-    ja: `1. intercom-oauth_request \u3067 GET /contacts?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u69CB\u9020\u3092\u78BA\u8A8D
-2. intercom-oauth_request \u3067 GET /conversations?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u4F1A\u8A71\u306E\u69CB\u9020\u3092\u78BA\u8A8D
-3. intercom-oauth_request \u3067 GET /data_attributes?model=contact \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u30C7\u30FC\u30BF\u5C5E\u6027\u3092\u78BA\u8A8D
-4. intercom-oauth_request \u3067 GET /companies?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u4F01\u696D\u306E\u69CB\u9020\u3092\u78BA\u8A8D`
+    en: `1. Call connector_intercom-oauth_request with GET /contacts?per_page=5 to explore contacts structure
+2. Call connector_intercom-oauth_request with GET /conversations?per_page=5 to explore conversations structure
+3. Call connector_intercom-oauth_request with GET /data_attributes?model=contact to list contact data attributes
+4. Call connector_intercom-oauth_request with GET /companies?per_page=5 to explore company structure`,
+    ja: `1. connector_intercom-oauth_request \u3067 GET /contacts?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u69CB\u9020\u3092\u78BA\u8A8D
+2. connector_intercom-oauth_request \u3067 GET /conversations?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u4F1A\u8A71\u306E\u69CB\u9020\u3092\u78BA\u8A8D
+3. connector_intercom-oauth_request \u3067 GET /data_attributes?model=contact \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u30C7\u30FC\u30BF\u5C5E\u6027\u3092\u78BA\u8A8D
+4. connector_intercom-oauth_request \u3067 GET /companies?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u4F01\u696D\u306E\u69CB\u9020\u3092\u78BA\u8A8D`
   }
 });
 
@@ -493,6 +493,66 @@ var intercomOauthSetupFlow = {
       );
     }
     sections.push("");
+    if (targetScopes.includes("conversations")) {
+      try {
+        const convRes = await apiFetch(
+          rt.config.proxyFetch,
+          "/conversations?per_page=5&order=desc&sort=updated_at"
+        );
+        if (convRes.ok) {
+          const convData = await convRes.json();
+          const conversations = convData.conversations ?? [];
+          if (conversations.length > 0) {
+            sections.push("### Recent conversations (sample)", "");
+            sections.push("| ID | State | Subject | Created |");
+            sections.push("|----|-------|---------|---------|");
+            for (const c of conversations.slice(0, 5)) {
+              const id = c.id ?? "-";
+              const state2 = c.state ?? (c.open ? "open" : "closed");
+              const subject = (c.source?.subject ?? "-").replace(/\|/g, "\\|").slice(0, 50);
+              const created = typeof c.created_at === "number" ? new Date(c.created_at * 1e3).toISOString().slice(0, 10) : "-";
+              sections.push(
+                `| ${id} | ${state2} | ${subject} | ${created} |`
+              );
+            }
+            sections.push("");
+          }
+        }
+      } catch {
+      }
+    }
+    if (targetScopes.includes("contacts")) {
+      try {
+        const contactRes = await apiFetch(
+          rt.config.proxyFetch,
+          "/contacts?per_page=50"
+        );
+        if (contactRes.ok) {
+          const contactData = await contactRes.json();
+          const contacts = contactData.data ?? [];
+          if (contacts.length > 0) {
+            const roleCounts = {};
+            for (const c of contacts) {
+              const role = c.role ?? "unknown";
+              roleCounts[role] = (roleCounts[role] ?? 0) + 1;
+            }
+            sections.push(
+              "### Contact type breakdown (from recent contacts)",
+              ""
+            );
+            sections.push("| Role | Count |");
+            sections.push("|------|-------|");
+            for (const [role, cnt] of Object.entries(roleCounts).sort(
+              (a, b) => b[1] - a[1]
+            )) {
+              sections.push(`| ${role} | ${cnt} |`);
+            }
+            sections.push("");
+          }
+        }
+      } catch {
+      }
+    }
     return sections.join("\n");
   }
 };
@@ -524,7 +584,7 @@ var intercomOauthConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`intercom-oauth_request\`: The only way to call the Intercom API. Use it to query contacts, conversations, companies, articles, tags, segments, and more. Authentication is configured automatically via OAuth. The Intercom-Version header is set automatically. Intercom uses cursor-based pagination with the \`starting_after\` parameter from \`pages.next.starting_after\` in the response.
+- \`connector_intercom-oauth_request\`: The only way to call the Intercom API. Use it to query contacts, conversations, companies, articles, tags, segments, and more. Authentication is configured automatically via OAuth. The Intercom-Version header is set automatically. Intercom uses cursor-based pagination with the \`starting_after\` parameter from \`pages.next.starting_after\` in the response.
 
 ### Intercom API Reference
 
@@ -582,7 +642,7 @@ const data = await res.json();
 \`\`\``,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`intercom-oauth_request\`: Intercom API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30B3\u30F3\u30BF\u30AF\u30C8\u3001\u4F1A\u8A71\u3001\u4F01\u696D\u3001\u8A18\u4E8B\u3001\u30BF\u30B0\u3001\u30BB\u30B0\u30E1\u30F3\u30C8\u306A\u3069\u306E\u30AF\u30A8\u30EA\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002OAuth\u7D4C\u7531\u3067\u8A8D\u8A3C\u306F\u81EA\u52D5\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002Intercom-Version\u30D8\u30C3\u30C0\u30FC\u3082\u81EA\u52D5\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002Intercom\u306F\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`pages.next.starting_after\` \u304B\u3089\u306E \`starting_after\` \u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3088\u308B\u30AB\u30FC\u30BD\u30EB\u30D9\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u30CD\u30FC\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+- \`connector_intercom-oauth_request\`: Intercom API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30B3\u30F3\u30BF\u30AF\u30C8\u3001\u4F1A\u8A71\u3001\u4F01\u696D\u3001\u8A18\u4E8B\u3001\u30BF\u30B0\u3001\u30BB\u30B0\u30E1\u30F3\u30C8\u306A\u3069\u306E\u30AF\u30A8\u30EA\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002OAuth\u7D4C\u7531\u3067\u8A8D\u8A3C\u306F\u81EA\u52D5\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002Intercom-Version\u30D8\u30C3\u30C0\u30FC\u3082\u81EA\u52D5\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002Intercom\u306F\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`pages.next.starting_after\` \u304B\u3089\u306E \`starting_after\` \u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3088\u308B\u30AB\u30FC\u30BD\u30EB\u30D9\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u30CD\u30FC\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 ### Intercom API \u30EA\u30D5\u30A1\u30EC\u30F3\u30B9
 

package/dist/connectors/intercom.js

@@ -275,7 +275,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   /**
    * Create tools for connections that belong to this connector.
    * Filters connections by connectorKey internally.
-   * Returns tools keyed as `${connectorKey}_${toolName}`.
+   * Returns tools keyed as `connector_${connectorKey}_${toolName}`.
    */
   createTools(connections, config, opts) {
     const myConnections = connections.filter(
@@ -285,7 +285,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     for (const t of Object.values(this.tools)) {
       const tool = t.createTool(myConnections, config);
       const originalToModelOutput = tool.toModelOutput;
-      result[`${this.connectorKey}_${t.name}`] = {
+      result[`connector_${this.connectorKey}_${t.name}`] = {
         ...tool,
         toModelOutput: async (options) => {
           if (!originalToModelOutput) {
@@ -415,14 +415,14 @@ var AUTH_TYPES = {
 // ../connectors/src/connectors/intercom/setup.ts
 var intercomOnboarding = new ConnectorOnboarding({
   dataOverviewInstructions: {
-    en: `1. Call intercom_request with GET /contacts?per_page=5 to explore contacts structure
-2. Call intercom_request with GET /conversations?per_page=5 to explore conversations structure
-3. Call intercom_request with GET /data_attributes?model=contact to list contact data attributes
-4. Call intercom_request with GET /companies?per_page=5 to explore company structure`,
-    ja: `1. intercom_request \u3067 GET /contacts?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u69CB\u9020\u3092\u78BA\u8A8D
-2. intercom_request \u3067 GET /conversations?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u4F1A\u8A71\u306E\u69CB\u9020\u3092\u78BA\u8A8D
-3. intercom_request \u3067 GET /data_attributes?model=contact \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u30C7\u30FC\u30BF\u5C5E\u6027\u3092\u78BA\u8A8D
-4. intercom_request \u3067 GET /companies?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u4F01\u696D\u306E\u69CB\u9020\u3092\u78BA\u8A8D`
+    en: `1. Call connector_intercom_request with GET /contacts?per_page=5 to explore contacts structure
+2. Call connector_intercom_request with GET /conversations?per_page=5 to explore conversations structure
+3. Call connector_intercom_request with GET /data_attributes?model=contact to list contact data attributes
+4. Call connector_intercom_request with GET /companies?per_page=5 to explore company structure`,
+    ja: `1. connector_intercom_request \u3067 GET /contacts?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u69CB\u9020\u3092\u78BA\u8A8D
+2. connector_intercom_request \u3067 GET /conversations?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u4F1A\u8A71\u306E\u69CB\u9020\u3092\u78BA\u8A8D
+3. connector_intercom_request \u3067 GET /data_attributes?model=contact \u3092\u547C\u3073\u51FA\u3057\u3001\u30B3\u30F3\u30BF\u30AF\u30C8\u306E\u30C7\u30FC\u30BF\u5C5E\u6027\u3092\u78BA\u8A8D
+4. connector_intercom_request \u3067 GET /companies?per_page=5 \u3092\u547C\u3073\u51FA\u3057\u3001\u4F01\u696D\u306E\u69CB\u9020\u3092\u78BA\u8A8D`
   }
 });
 
@@ -619,7 +619,7 @@ var intercomConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`intercom_request\`: The only way to call the Intercom API. Use it to query contacts, conversations, companies, articles, tags, segments, and more. Authentication (Bearer token) and API version header (Intercom-Version: 2.11) are configured automatically. Intercom uses cursor-based pagination with the \`starting_after\` parameter from \`pages.next.starting_after\` in the response. Use search endpoints (POST) for complex queries with filters.
+- \`connector_intercom_request\`: The only way to call the Intercom API. Use it to query contacts, conversations, companies, articles, tags, segments, and more. Authentication (Bearer token) and API version header (Intercom-Version: 2.11) are configured automatically. Intercom uses cursor-based pagination with the \`starting_after\` parameter from \`pages.next.starting_after\` in the response. Use search endpoints (POST) for complex queries with filters.
 
 ### Business Logic
 
@@ -715,7 +715,7 @@ export default async function handler(c: Context) {
 - Date fields use Unix timestamps`,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`intercom_request\`: Intercom API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30B3\u30F3\u30BF\u30AF\u30C8\u3001\u4F1A\u8A71\u3001\u4F01\u696D\u3001\u8A18\u4E8B\u3001\u30BF\u30B0\u3001\u30BB\u30B0\u30E1\u30F3\u30C8\u306A\u3069\u306E\u30AF\u30A8\u30EA\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u8A8D\u8A3C\uFF08Bearer\u30C8\u30FC\u30AF\u30F3\uFF09\u3068API\u30D0\u30FC\u30B8\u30E7\u30F3\u30D8\u30C3\u30C0\u30FC\uFF08Intercom-Version: 2.11\uFF09\u306F\u81EA\u52D5\u7684\u306B\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002Intercom\u306F\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`pages.next.starting_after\` \u304B\u3089\u306E \`starting_after\` \u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3088\u308B\u30AB\u30FC\u30BD\u30EB\u30D9\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u30CD\u30FC\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u8907\u96D1\u306A\u30AF\u30A8\u30EA\u306B\u306Fsearch\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\uFF08POST\uFF09\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+- \`connector_intercom_request\`: Intercom API\u3092\u547C\u3073\u51FA\u3059\u552F\u4E00\u306E\u624B\u6BB5\u3067\u3059\u3002\u30B3\u30F3\u30BF\u30AF\u30C8\u3001\u4F1A\u8A71\u3001\u4F01\u696D\u3001\u8A18\u4E8B\u3001\u30BF\u30B0\u3001\u30BB\u30B0\u30E1\u30F3\u30C8\u306A\u3069\u306E\u30AF\u30A8\u30EA\u306B\u4F7F\u7528\u3057\u307E\u3059\u3002\u8A8D\u8A3C\uFF08Bearer\u30C8\u30FC\u30AF\u30F3\uFF09\u3068API\u30D0\u30FC\u30B8\u30E7\u30F3\u30D8\u30C3\u30C0\u30FC\uFF08Intercom-Version: 2.11\uFF09\u306F\u81EA\u52D5\u7684\u306B\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002Intercom\u306F\u30EC\u30B9\u30DD\u30F3\u30B9\u306E \`pages.next.starting_after\` \u304B\u3089\u306E \`starting_after\` \u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3088\u308B\u30AB\u30FC\u30BD\u30EB\u30D9\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u30CD\u30FC\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u8907\u96D1\u306A\u30AF\u30A8\u30EA\u306B\u306Fsearch\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\uFF08POST\uFF09\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 ### Business Logic
 

package/dist/connectors/jdbc.js

@@ -341,7 +341,7 @@ async function runMssqlQuery(parsed, sql, options = {}) {
     try {
       const result = await pool.request().query(sql);
       const recordset = result.recordset ?? [];
-      return { rows: recordset };
+      return { rows: recordset, rowsAffected: result.rowsAffected ?? [] };
     } finally {
       await pool.close();
     }
@@ -526,10 +526,16 @@ async function runOracleQuery(parsed, sql, options = {}) {
           outFormat: oracledb.OUT_FORMAT_OBJECT,
           // Bound by the connector's own row cap, but keep the driver from
           // streaming arbitrarily large result sets.
-          maxRows: 5e3
+          maxRows: 5e3,
+          // oracledb defaults to autoCommit=false, which silently rolls back
+          // DML when the connection closes.
+          autoCommit: true
         }
       );
-      return { rows: result.rows ?? [] };
+      return {
+        rows: result.rows ?? [],
+        rowsAffected: result.rowsAffected
+      };
     } finally {
       try {
         await connection2.close();
@@ -1023,7 +1029,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
   /**
    * Create tools for connections that belong to this connector.
    * Filters connections by connectorKey internally.
-   * Returns tools keyed as `${connectorKey}_${toolName}`.
+   * Returns tools keyed as `connector_${connectorKey}_${toolName}`.
    */
   createTools(connections, config, opts) {
     const myConnections = connections.filter(
@@ -1033,7 +1039,7 @@ var ConnectorPlugin = class _ConnectorPlugin {
     for (const t of Object.values(this.tools)) {
       const tool = t.createTool(myConnections, config);
       const originalToModelOutput = tool.toModelOutput;
-      result[`${this.connectorKey}_${t.name}`] = {
+      result[`connector_${this.connectorKey}_${t.name}`] = {
         ...tool,
         toModelOutput: async (options) => {
           if (!originalToModelOutput) {
@@ -1160,6 +1166,12 @@ var AUTH_TYPES = {
   USER_PASSWORD: "user-password"
 };
 
+// ../connectors/src/lib/sql-dml.ts
+function isDmlStatement(sql) {
+  const stripped = sql.replace(/^(\s*(--[^\n]*\n|\/\*[\s\S]*?\*\/))+/, "").trimStart();
+  return /^(insert|update|delete|merge)\b/i.test(stripped);
+}
+
 // ../connectors/src/connectors/jdbc/index.ts
 init_pg_pool();
 init_ssh_tunnel();
@@ -1171,13 +1183,13 @@ init_utils2();
 // ../connectors/src/connectors/jdbc/setup.ts
 var jdbcOnboarding = new ConnectorOnboarding({
   dataOverviewInstructions: {
-    en: `1. Use \`jdbc_executeQuery\` to detect the database flavor: \`SELECT version()\` (works on PostgreSQL/MySQL/MariaDB)
+    en: `1. Use \`connector_jdbc_executeQuery\` to detect the database flavor: \`SELECT version()\` (works on PostgreSQL/MySQL/MariaDB)
 2. List tables:
    - PostgreSQL: \`SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'\`
    - MySQL/MariaDB: \`SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()\`
 3. For key tables, fetch column info from \`information_schema.columns\`
 4. Sample up to 3 tables with \`SELECT * FROM <table_name> LIMIT 5\` if column info alone is insufficient`,
-    ja: `1. \`jdbc_executeQuery\` \u3067DB\u30D5\u30EC\u30FC\u30D0\u30FC\u3092\u5224\u5B9A: \`SELECT version()\` (PostgreSQL/MySQL/MariaDB \u3067\u52D5\u4F5C)
+    ja: `1. \`connector_jdbc_executeQuery\` \u3067DB\u30D5\u30EC\u30FC\u30D0\u30FC\u3092\u5224\u5B9A: \`SELECT version()\` (PostgreSQL/MySQL/MariaDB \u3067\u52D5\u4F5C)
 2. \u30C6\u30FC\u30D6\u30EB\u4E00\u89A7\u3092\u53D6\u5F97:
    - PostgreSQL: \`SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'\`
    - MySQL/MariaDB: \`SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()\`
@@ -1522,6 +1534,9 @@ var outputSchema = z.discriminatedUnion("success", [
   z.object({
     success: z.literal(true),
     rowCount: z.number(),
+    rowsAffected: z.number().optional().describe(
+      "Affected rows for INSERT/UPDATE/DELETE; undefined for SELECT"
+    ),
     truncated: z.boolean(),
     rows: z.array(z.record(z.string(), z.unknown()))
   }),
@@ -1536,7 +1551,8 @@ var executeQueryTool = new ConnectorTool({
 Use for: schema exploration via \`information_schema\` (or USER_TABLES on Oracle), data sampling, analytical queries.
 The connector dispatches by JDBC URL prefix to the matching driver
 (PostgreSQL / Redshift / MySQL / MariaDB / SQL Server / Oracle), so use the dialect that matches the connection.
-Always bound results: LIMIT for PG/MySQL/Redshift, TOP for SQL Server, FETCH FIRST for Oracle.`,
+Always bound results: LIMIT for PG/MySQL/Redshift, TOP for SQL Server, FETCH FIRST for Oracle.
+For INSERT/UPDATE/DELETE, \`rowCount\` is 0 and \`rows\` is empty (rowCount counts returned rows, not affected rows) \u2014 this is normal, not a failure; check \`rowsAffected\` for the number of affected rows.`,
   inputSchema,
   outputSchema,
   async execute({ connectionId, sql }, connections) {
@@ -1574,6 +1590,9 @@ Always bound results: LIMIT for PG/MySQL/Redshift, TOP for SQL Server, FETCH FIR
         return {
           success: true,
           rowCount: Math.min(rows.length, MAX_ROWS),
+          // tedious counts SELECT result rows in rowsAffected too, so only
+          // report it for DML. Multi-statement batches are summed.
+          rowsAffected: isDmlStatement(sql) ? result.rowsAffected.reduce((sum, n) => sum + n, 0) : void 0,
           truncated: rows.length > MAX_ROWS,
           rows: rows.slice(0, MAX_ROWS)
         };
@@ -1591,6 +1610,8 @@ Always bound results: LIMIT for PG/MySQL/Redshift, TOP for SQL Server, FETCH FIR
         return {
           success: true,
           rowCount: Math.min(rows.length, MAX_ROWS),
+          // oracledb sets rowsAffected only for DML; undefined for SELECT.
+          rowsAffected: result.rowsAffected,
           truncated: rows.length > MAX_ROWS,
           rows: rows.slice(0, MAX_ROWS)
         };
@@ -1617,9 +1638,13 @@ Always bound results: LIMIT for PG/MySQL/Redshift, TOP for SQL Server, FETCH FIR
             );
             const rows = result.rows;
             const truncated = rows.length > MAX_ROWS;
+            const isDml = ["INSERT", "UPDATE", "DELETE", "MERGE"].includes(
+              result.command
+            );
             return {
               success: true,
               rowCount: Math.min(rows.length, MAX_ROWS),
+              rowsAffected: isDml ? result.rowCount ?? 0 : void 0,
               truncated,
               rows: rows.slice(0, MAX_ROWS)
             };
@@ -1643,9 +1668,11 @@ Always bound results: LIMIT for PG/MySQL/Redshift, TOP for SQL Server, FETCH FIR
           const [rows] = await Promise.race([queryPromise, timeoutPromise]);
           const resultRows = Array.isArray(rows) ? rows : [];
           const truncated = resultRows.length > MAX_ROWS;
+          const rowsAffected = !Array.isArray(rows) && rows !== null && typeof rows === "object" && "affectedRows" in rows && typeof rows.affectedRows === "number" ? rows.affectedRows : void 0;
           return {
             success: true,
             rowCount: Math.min(resultRows.length, MAX_ROWS),
+            rowsAffected,
             truncated,
             rows: resultRows.slice(0, MAX_ROWS)
           };
@@ -1697,7 +1724,7 @@ var jdbcConnector = new ConnectorPlugin({
   systemPrompt: {
     en: `### Tools
 
-- \`jdbc_executeQuery\`: Executes a SQL query through a JDBC URL and returns rows. The connector dispatches by URL prefix to the matching native driver, so use the dialect that matches the connection. Use this for schema exploration via \`information_schema\` (or vendor equivalent) and for sampling data. See the SQL Reference below.
+- \`connector_jdbc_executeQuery\`: Executes a SQL query through a JDBC URL and returns rows. The connector dispatches by URL prefix to the matching native driver, so use the dialect that matches the connection. Use this for schema exploration via \`information_schema\` (or vendor equivalent) and for sampling data. See the SQL Reference below.
 
 ### Business Logic
 
@@ -1729,7 +1756,7 @@ Explicitly **not** supported via this connector \u2014 use the dedicated connect
 The platform's server-logic schema inference may wrap your query as \`SELECT * FROM (<inner>) AS _sq LIMIT N\` (PostgreSQL/MySQL syntax). For PostgreSQL / Redshift / MySQL routes this executes natively. For \`jdbc:sqlserver://\` and \`jdbc:oracle:thin:\` routes, the connector detects this exact wrapper at \`query()\` time, executes \`<inner>\` directly via the dialect-specific driver, and slices the first N rows in JS. You do not need to handle this \u2014 but in queries **you author**, do not use \`LIMIT\` for the SQL Server / Oracle routes; use \`TOP\` / \`FETCH FIRST\` as listed above.`,
     ja: `### \u30C4\u30FC\u30EB
 
-- \`jdbc_executeQuery\`: JDBC URL \u7D4C\u7531\u3067 SQL \u30AF\u30A8\u30EA\u3092\u5B9F\u884C\u3057\u3001\u884C\u30C7\u30FC\u30BF\u3092\u8FD4\u3057\u307E\u3059\u3002\u30B3\u30CD\u30AF\u30BF\u306F URL \u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u304B\u3089\u5BFE\u5FDC\u3059\u308B\u30CD\u30A4\u30C6\u30A3\u30D6\u30C9\u30E9\u30A4\u30D0\u3078\u632F\u308A\u5206\u3051\u308B\u305F\u3081\u3001\u63A5\u7D9A\u5148\u306B\u5408\u3063\u305F\u65B9\u8A00\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\`information_schema\`\uFF08\u307E\u305F\u306F\u5404 DB \u306E\u540C\u7B49\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D3\u30E5\u30FC\uFF09\u3092\u4F7F\u3063\u305F\u30B9\u30AD\u30FC\u30DE\u63A2\u7D22\u3084\u30C7\u30FC\u30BF\u306E\u30B5\u30F3\u30D7\u30EA\u30F3\u30B0\u306B\u4F7F\u3044\u307E\u3059\u3002\u4E0B\u90E8\u306E\u300CSQL \u30EA\u30D5\u30A1\u30EC\u30F3\u30B9\u300D\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+- \`connector_jdbc_executeQuery\`: JDBC URL \u7D4C\u7531\u3067 SQL \u30AF\u30A8\u30EA\u3092\u5B9F\u884C\u3057\u3001\u884C\u30C7\u30FC\u30BF\u3092\u8FD4\u3057\u307E\u3059\u3002\u30B3\u30CD\u30AF\u30BF\u306F URL \u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u304B\u3089\u5BFE\u5FDC\u3059\u308B\u30CD\u30A4\u30C6\u30A3\u30D6\u30C9\u30E9\u30A4\u30D0\u3078\u632F\u308A\u5206\u3051\u308B\u305F\u3081\u3001\u63A5\u7D9A\u5148\u306B\u5408\u3063\u305F\u65B9\u8A00\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\`information_schema\`\uFF08\u307E\u305F\u306F\u5404 DB \u306E\u540C\u7B49\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30D3\u30E5\u30FC\uFF09\u3092\u4F7F\u3063\u305F\u30B9\u30AD\u30FC\u30DE\u63A2\u7D22\u3084\u30C7\u30FC\u30BF\u306E\u30B5\u30F3\u30D7\u30EA\u30F3\u30B0\u306B\u4F7F\u3044\u307E\u3059\u3002\u4E0B\u90E8\u306E\u300CSQL \u30EA\u30D5\u30A1\u30EC\u30F3\u30B9\u300D\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 ### Business Logic