Merge pull request #20 from datadog-labs/release/v0.7.21

Release v0.7.21

Author: kitfre

README.md

@@ -51,6 +51,8 @@ The agent has three tools:
 - `ddconfig` reports saved connection state; its `check` action probes the server without starting interactive sign-in, and its `switch` action moves the session to another saved connection, so the agent can compare orgs in one prompt.
 - `ddtoolsets` manages toolsets for the selected connection.
 
+Prompts also carry the Datadog MCP Server's instructions for the selected organization, such as skill and access guidance. Pi connects at the start of a prompt to read them and leaves them out if the server can't be reached within a few seconds.
+
 `/datadog setup` and `/datadog configure` without arguments open the same connection screen for compatibility. Their old site/scope arguments and the separate `ddsetup` tool have been removed. Sign-in and adding organizations are user-controlled through `/datadog`; the agent can only switch between connections you've already saved.
 
 ## Visualization panel (macOS preview)

datadog.ts

@@ -12,12 +12,15 @@ import { createDatadogProxy } from './tools/proxy.js';
 import { initVizRuntime } from './viz/index.js';
 import { makeConnectionBuilder } from '#shared/url';
 
-const PLUGIN_VERSION = '0.7.20';
+const PLUGIN_VERSION = '0.7.21';
 const PLUGIN_ID = 'pi-plugin';
 const MCP_FILE = 'datadog.json';
 const MCP_ENABLED_TOOLSETS = 'core,visualizations';
 const SELECTION_ENTRY = 'datadog-selection';
 const ORGANIZATION_SECTION = 'datadog_organization';
+const SERVER_INSTRUCTIONS_SECTION = 'datadog_server_instructions';
+// Bounds how long a prompt waits on the first connection; a later prompt retries.
+const SERVER_INSTRUCTIONS_TIMEOUT_MS = 5_000;
 
 const organizationNotice = async (connections: Connections): Promise<string | undefined> => {
   try {
@@ -29,6 +32,17 @@ const organizationNotice = async (connections: Connections): Promise<string | un
   }
 };
 
+// The server returns caller-specific guidance (skills, access notes) only during the MCP handshake.
+const serverInstructions = async (connections: Connections): Promise<string | undefined> => {
+  try {
+    const { client } = await connections.connection(AbortSignal.timeout(SERVER_INSTRUCTIONS_TIMEOUT_MS));
+    const instructions = await client.instructions();
+    return instructions && `Instructions from the Datadog MCP Server, for the datadog tool:\n${instructions}`;
+  } catch {
+    return undefined;
+  }
+};
+
 export default function activate(pi: ExtensionAPI): void {
   const connections = new Connections({
     cwd: process.cwd(),
@@ -65,8 +79,12 @@ export default function activate(pi: ExtensionAPI): void {
   });
   // A prompt section, unlike a returned message, is only re-sent to the model when its text changes.
   pi.on('before_agent_start', async ({ systemPromptOptions: { sections } }) => {
-    const notice = await organizationNotice(connections);
+    const [notice, instructions] = await Promise.all([
+      organizationNotice(connections),
+      serverInstructions(connections),
+    ]);
     if (notice) sections[ORGANIZATION_SECTION] = notice;
+    if (instructions) sections[SERVER_INSTRUCTIONS_SECTION] = instructions;
   });
   pi.registerTool(createDatadogProxy(deps, viz.subtools));
   pi.registerTool(createDdconfig(deps));

mcp-client.ts

@@ -20,6 +20,8 @@ export type ConnectionClient = {
   readonly authMode: 'oauth' | 'apiKey';
   identity(signal?: AbortSignal): Promise<OrgIdentity>;
   listTools(signal?: AbortSignal): Promise<Tool[]>;
+  // Caller-specific guidance the server returns during the MCP handshake.
+  instructions(signal?: AbortSignal): Promise<string | undefined>;
   readResource(uri: string, signal?: AbortSignal): Promise<ReadResourceResult>;
   callTool(name: string, args: Record<string, unknown> | undefined, signal?: AbortSignal): Promise<CallToolResult>;
   close(): Promise<void>;
@@ -67,6 +69,9 @@ export const createConnectionClient = (
     assertOpen();
     const next = new Client({ name: 'datadog-pi-plugin', version });
     let wire = transport();
+    // The SDK sends notifications/initialized without the caller's signal; closing the transport cancels it.
+    const abort = () => void wire.close().catch(() => undefined);
+    signal?.addEventListener('abort', abort, { once: true });
     try {
       try {
         await next.connect(wire, { signal });
@@ -92,6 +97,8 @@ export const createConnectionClient = (
       await next.close().catch(() => undefined);
       await wire.close().catch(() => undefined);
       throw error;
+    } finally {
+      signal?.removeEventListener('abort', abort);
     }
   };
   const ensure = async (signal?: AbortSignal): Promise<Client> => {
@@ -113,6 +120,7 @@ export const createConnectionClient = (
     authMode: auth.kind === 'oauth' ? 'oauth' : 'apiKey',
     identity: (signal) => run(async () => identity!, signal),
     listTools: (signal) => run(async (current) => (await current.listTools({}, { signal })).tools, signal),
+    instructions: (signal) => run(async (current) => current.getInstructions(), signal),
     readResource: (uri, signal) => run((current) => current.readResource({ uri }, { signal }), signal),
     callTool: (name, args, signal) =>
       run(
@@ -132,4 +140,4 @@ export const createConnectionClient = (
 
 export type AuthMode = 'oauth' | 'apiKey';
 export type McpCallToolArgs = Record<string, unknown> | undefined;
-export type McpClient = Omit<ConnectionClient, 'identity'>;
+export type McpClient = Omit<ConnectionClient, 'identity' | 'instructions'>;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/pi-plugin",
-  "version": "0.7.20",
+  "version": "0.7.21",
   "description": "Use Datadog directly in the Pi coding agent through a preconfigured Datadog MCP server. Query logs, metrics, traces, dashboards, and more through natural conversation.",
   "main": "datadog.ts",
   "type": "module",

viz/ddviz.swift

@@ -27,7 +27,7 @@ import WebKit
 struct Config {
 
   static let appName = "ddviz"
-  static let appVersion = "0.7.20"
+  static let appVersion = "0.7.21"
   static let pluginId = "pi-plugin"
   static let defaultWindowWidth = 610.0
   static let defaultWindowHeight = 400.0