@rudderhq/cli 0.4.3-canary.7 → 0.4.3-canary.9

package/dist/index.js

@@ -9,110 +9,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/config/hostnames.ts
-function normalizeHostnameInput(raw) {
-  const input = raw.trim();
-  if (!input) {
-    throw new Error("Hostname is required");
-  }
-  try {
-    const url = input.includes("://") ? new URL(input) : new URL(`http://${input}`);
-    const hostname = url.hostname.trim().toLowerCase();
-    if (!hostname) throw new Error("Hostname is required");
-    return hostname;
-  } catch {
-    throw new Error(`Invalid hostname: ${raw}`);
-  }
-}
-function parseHostnameCsv(raw) {
-  if (!raw.trim()) return [];
-  const unique2 = /* @__PURE__ */ new Set();
-  for (const part of raw.split(",")) {
-    const hostname = normalizeHostnameInput(part);
-    unique2.add(hostname);
-  }
-  return Array.from(unique2);
-}
-var init_hostnames = __esm({
-  "src/config/hostnames.ts"() {
-    "use strict";
-  }
-});
-
-// src/config/home.ts
-import os2 from "node:os";
-import path2 from "node:path";
-function resolveRudderHomeDir() {
-  const envHome = process.env.RUDDER_HOME?.trim();
-  if (envHome) return path2.resolve(expandHomePrefix(envHome));
-  return path2.resolve(os2.homedir(), ".rudder");
-}
-function resolveRudderInstanceId(override) {
-  const raw = override?.trim() || process.env.RUDDER_INSTANCE_ID?.trim() || DEFAULT_INSTANCE_ID;
-  if (!INSTANCE_ID_RE.test(raw)) {
-    throw new Error(
-      `Invalid instance id '${raw}'. Allowed characters: letters, numbers, '_' and '-'.`
-    );
-  }
-  return raw;
-}
-function resolveRudderInstanceRoot(instanceId) {
-  const id = resolveRudderInstanceId(instanceId);
-  return path2.resolve(resolveRudderHomeDir(), "instances", id);
-}
-function resolveDefaultConfigPath(instanceId) {
-  return path2.resolve(resolveRudderInstanceRoot(instanceId), "config.json");
-}
-function resolveDefaultContextPath() {
-  return path2.resolve(resolveRudderHomeDir(), "context.json");
-}
-function resolveDefaultCliAuthPath() {
-  return path2.resolve(resolveRudderHomeDir(), "auth.json");
-}
-function resolveDefaultEmbeddedPostgresDir(instanceId) {
-  return path2.resolve(resolveRudderInstanceRoot(instanceId), "db");
-}
-function resolveDefaultLogsDir(instanceId) {
-  return path2.resolve(resolveRudderInstanceRoot(instanceId), "logs");
-}
-function resolveDefaultSecretsKeyFilePath(instanceId) {
-  return path2.resolve(resolveRudderInstanceRoot(instanceId), "secrets", "master.key");
-}
-function resolveDefaultStorageDir(instanceId) {
-  return path2.resolve(resolveRudderInstanceRoot(instanceId), "data", "storage");
-}
-function resolveDefaultBackupDir(instanceId) {
-  return path2.resolve(resolveRudderInstanceRoot(instanceId), "data", "backups");
-}
-function expandHomePrefix(value) {
-  if (value === "~") return os2.homedir();
-  if (value.startsWith("~/")) return path2.resolve(os2.homedir(), value.slice(2));
-  return value;
-}
-function describeLocalInstancePaths(instanceId) {
-  const resolvedInstanceId = resolveRudderInstanceId(instanceId);
-  const instanceRoot = resolveRudderInstanceRoot(resolvedInstanceId);
-  return {
-    homeDir: resolveRudderHomeDir(),
-    instanceId: resolvedInstanceId,
-    instanceRoot,
-    configPath: resolveDefaultConfigPath(resolvedInstanceId),
-    embeddedPostgresDataDir: resolveDefaultEmbeddedPostgresDir(resolvedInstanceId),
-    backupDir: resolveDefaultBackupDir(resolvedInstanceId),
-    logDir: resolveDefaultLogsDir(resolvedInstanceId),
-    secretsKeyFilePath: resolveDefaultSecretsKeyFilePath(resolvedInstanceId),
-    storageDir: resolveDefaultStorageDir(resolvedInstanceId)
-  };
-}
-var DEFAULT_INSTANCE_ID, INSTANCE_ID_RE;
-var init_home = __esm({
-  "src/config/home.ts"() {
-    "use strict";
-    DEFAULT_INSTANCE_ID = "default";
-    INSTANCE_ID_RE = /^[a-zA-Z0-9_-]+$/;
-  }
-});
-
 // ../packages/shared/dist/constants.js
 var ORGANIZATION_STATUSES, ORGANIZATION_INTELLIGENCE_PROFILE_PURPOSES, ORGANIZATION_INTELLIGENCE_PROFILE_STATUSES, DEPLOYMENT_MODES, DEPLOYMENT_EXPOSURES, AUTH_BASE_URL_MODES, AGENT_STATUSES, AGENT_RUNTIME_TYPES, AGENT_ROLES, AGENT_ICON_NAMES, AGENT_DICEBEAR_NOTIONISTS_ICON_PREFIX, AGENT_AVATAR_BACKGROUND_PRESET_IDS, ISSUE_STATUSES, ISSUE_PRIORITIES, AGENT_INTEGRATION_PROVIDERS, AGENT_INTEGRATION_STATUSES, AGENT_INTEGRATION_TRANSPORTS, AGENT_INTEGRATION_PROVIDER_REGIONS, AGENT_INTEGRATION_CHAT_TYPES, AGENT_INTEGRATION_DROP_REASONS, AGENT_INTEGRATION_OUTBOUND_STATUSES, CUSTOM_INTEGRATION_KINDS, CUSTOM_INTEGRATION_SCOPES, CUSTOM_INTEGRATION_STATUSES, CUSTOM_INTEGRATION_TOOL_STATUSES, CUSTOM_INTEGRATION_BINDING_STATUSES, CUSTOM_INTEGRATION_TOOL_CALL_STATUSES, CALENDAR_SOURCE_TYPES, CALENDAR_OWNER_TYPES, CALENDAR_VISIBILITIES, CALENDAR_SOURCE_STATUSES, CALENDAR_EVENT_KINDS, CALENDAR_EVENT_STATUSES, CALENDAR_SOURCE_MODES, CHAT_CONVERSATION_STATUSES, CHAT_ISSUE_CREATION_MODES, CHAT_MESSAGE_ROLES, CHAT_MESSAGE_KINDS, CHAT_MESSAGE_STATUSES, CHAT_CONTEXT_ENTITY_TYPES, GOAL_LEVELS, GOAL_STATUSES, PROJECT_STATUSES, ORGANIZATION_RESOURCE_KINDS, ORGANIZATION_RESOURCE_SOURCE_TYPES, PROJECT_RESOURCE_ATTACHMENT_ROLES, AUTOMATION_STATUSES, AUTOMATION_CONCURRENCY_POLICIES, AUTOMATION_CATCH_UP_POLICIES, AUTOMATION_OUTPUT_MODES, AUTOMATION_TRIGGER_SIGNING_MODES, PROJECT_COLORS, PROJECT_ICONS, APPROVAL_TYPES, SECRET_PROVIDERS, STORAGE_PROVIDERS, BILLING_TYPES, FINANCE_EVENT_KINDS, FINANCE_DIRECTIONS, FINANCE_UNITS, BUDGET_SCOPE_TYPES, BUDGET_METRICS, BUDGET_WINDOW_KINDS, BUDGET_INCIDENT_RESOLUTION_ACTIONS, INVITE_JOIN_TYPES, JOIN_REQUEST_TYPES, JOIN_REQUEST_STATUSES, PERMISSION_KEYS, PLUGIN_STATUSES, PLUGIN_CATEGORIES, PLUGIN_CAPABILITIES, PLUGIN_UI_SLOT_TYPES, PLUGIN_RESERVED_COMPANY_ROUTE_SEGMENTS, PLUGIN_LAUNCHER_PLACEMENT_ZONES, PLUGIN_LAUNCHER_ACTIONS, PLUGIN_LAUNCHER_BOUNDS, PLUGIN_LAUNCHER_RENDER_ENVIRONMENTS, PLUGIN_UI_SLOT_ENTITY_TYPES, PLUGIN_STATE_SCOPE_KINDS;
 var init_constants = __esm({
@@ -1130,7 +1026,7 @@ var init_secret = __esm({
 
 // ../packages/shared/dist/validators/model-fallbacks.js
 import { z as z7 } from "zod";
-function isRecord2(value) {
+function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function validateModelFallbacksConfig(value, ctx, pathPrefix) {
@@ -1156,7 +1052,7 @@ function validateModelFallbacksConfig(value, ctx, pathPrefix) {
       }
       return;
     }
-    if (!isRecord2(fallback)) {
+    if (!isRecord(fallback)) {
       ctx.addIssue({
         code: z7.ZodIssueCode.custom,
         message: "modelFallbacks entries must be strings or runtime/model objects",
@@ -1184,13 +1080,13 @@ function validateModelFallbacksConfig(value, ctx, pathPrefix) {
         path: [...pathPrefix, "modelFallbacks", index, "model"]
       });
     }
-    if (fallback.config !== void 0 && !isRecord2(fallback.config)) {
+    if (fallback.config !== void 0 && !isRecord(fallback.config)) {
       ctx.addIssue({
         code: z7.ZodIssueCode.custom,
         message: "modelFallbacks entry config must be an object",
         path: [...pathPrefix, "modelFallbacks", index, "config"]
       });
-    } else if (isRecord2(fallback.config) && fallback.config.env !== void 0) {
+    } else if (isRecord(fallback.config) && fallback.config.env !== void 0) {
       const parsed = envConfigSchema.safeParse(fallback.config.env);
       if (!parsed.success) {
         ctx.addIssue({
@@ -3380,6 +3276,110 @@ var init_dist = __esm({
   }
 });
 
+// src/config/hostnames.ts
+function normalizeHostnameInput(raw) {
+  const input = raw.trim();
+  if (!input) {
+    throw new Error("Hostname is required");
+  }
+  try {
+    const url = input.includes("://") ? new URL(input) : new URL(`http://${input}`);
+    const hostname = url.hostname.trim().toLowerCase();
+    if (!hostname) throw new Error("Hostname is required");
+    return hostname;
+  } catch {
+    throw new Error(`Invalid hostname: ${raw}`);
+  }
+}
+function parseHostnameCsv(raw) {
+  if (!raw.trim()) return [];
+  const unique2 = /* @__PURE__ */ new Set();
+  for (const part of raw.split(",")) {
+    const hostname = normalizeHostnameInput(part);
+    unique2.add(hostname);
+  }
+  return Array.from(unique2);
+}
+var init_hostnames = __esm({
+  "src/config/hostnames.ts"() {
+    "use strict";
+  }
+});
+
+// src/config/home.ts
+import os2 from "node:os";
+import path2 from "node:path";
+function resolveRudderHomeDir() {
+  const envHome = process.env.RUDDER_HOME?.trim();
+  if (envHome) return path2.resolve(expandHomePrefix(envHome));
+  return path2.resolve(os2.homedir(), ".rudder");
+}
+function resolveRudderInstanceId(override) {
+  const raw = override?.trim() || process.env.RUDDER_INSTANCE_ID?.trim() || DEFAULT_INSTANCE_ID;
+  if (!INSTANCE_ID_RE.test(raw)) {
+    throw new Error(
+      `Invalid instance id '${raw}'. Allowed characters: letters, numbers, '_' and '-'.`
+    );
+  }
+  return raw;
+}
+function resolveRudderInstanceRoot(instanceId) {
+  const id = resolveRudderInstanceId(instanceId);
+  return path2.resolve(resolveRudderHomeDir(), "instances", id);
+}
+function resolveDefaultConfigPath(instanceId) {
+  return path2.resolve(resolveRudderInstanceRoot(instanceId), "config.json");
+}
+function resolveDefaultContextPath() {
+  return path2.resolve(resolveRudderHomeDir(), "context.json");
+}
+function resolveDefaultCliAuthPath() {
+  return path2.resolve(resolveRudderHomeDir(), "auth.json");
+}
+function resolveDefaultEmbeddedPostgresDir(instanceId) {
+  return path2.resolve(resolveRudderInstanceRoot(instanceId), "db");
+}
+function resolveDefaultLogsDir(instanceId) {
+  return path2.resolve(resolveRudderInstanceRoot(instanceId), "logs");
+}
+function resolveDefaultSecretsKeyFilePath(instanceId) {
+  return path2.resolve(resolveRudderInstanceRoot(instanceId), "secrets", "master.key");
+}
+function resolveDefaultStorageDir(instanceId) {
+  return path2.resolve(resolveRudderInstanceRoot(instanceId), "data", "storage");
+}
+function resolveDefaultBackupDir(instanceId) {
+  return path2.resolve(resolveRudderInstanceRoot(instanceId), "data", "backups");
+}
+function expandHomePrefix(value) {
+  if (value === "~") return os2.homedir();
+  if (value.startsWith("~/")) return path2.resolve(os2.homedir(), value.slice(2));
+  return value;
+}
+function describeLocalInstancePaths(instanceId) {
+  const resolvedInstanceId = resolveRudderInstanceId(instanceId);
+  const instanceRoot = resolveRudderInstanceRoot(resolvedInstanceId);
+  return {
+    homeDir: resolveRudderHomeDir(),
+    instanceId: resolvedInstanceId,
+    instanceRoot,
+    configPath: resolveDefaultConfigPath(resolvedInstanceId),
+    embeddedPostgresDataDir: resolveDefaultEmbeddedPostgresDir(resolvedInstanceId),
+    backupDir: resolveDefaultBackupDir(resolvedInstanceId),
+    logDir: resolveDefaultLogsDir(resolvedInstanceId),
+    secretsKeyFilePath: resolveDefaultSecretsKeyFilePath(resolvedInstanceId),
+    storageDir: resolveDefaultStorageDir(resolvedInstanceId)
+  };
+}
+var DEFAULT_INSTANCE_ID, INSTANCE_ID_RE;
+var init_home = __esm({
+  "src/config/home.ts"() {
+    "use strict";
+    DEFAULT_INSTANCE_ID = "default";
+    INSTANCE_ID_RE = /^[a-zA-Z0-9_-]+$/;
+  }
+});
+
 // src/config/schema.ts
 var init_schema = __esm({
   "src/config/schema.ts"() {
@@ -6819,6 +6819,7 @@ var init_onboard = __esm({
 import { Command, CommanderError } from "commander";
 
 // src/agent-v1-mcp-server.ts
+init_dist();
 import { spawn, spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
@@ -8042,52 +8043,214 @@ function formatAgentCliCapabilitiesHumanReadable(capabilities = getAgentCliCapab
   return lines.join("\n").trimEnd();
 }
 
-// src/agent-v1-mcp-server.ts
-var RUDDER_MCP_SERVER_NAME = "rudder-control-plane";
-var RESERVED_MODEL_ARGUMENTS = /* @__PURE__ */ new Set([
-  "orgId",
-  "org_id",
-  "companyId",
-  "company_id",
-  "agentId",
-  "agent_id",
-  "runId",
-  "run_id",
-  "apiBase",
-  "api_base",
-  "apiKey",
-  "api_key",
-  "authorization"
-]);
-var NORMALIZED_RESERVED_MODEL_ARGUMENTS = /* @__PURE__ */ new Set([
-  "orgid",
-  "companyid",
-  "agentid",
-  "runid",
-  "apibase",
-  "apikey",
-  "authorization"
-]);
-function buildMcpServerEnv(env = process.env) {
-  return {
-    ...process.env,
-    ...env,
-    RUDDER_API_URL: env.RUDDER_API_URL,
-    RUDDER_API_KEY: env.RUDDER_API_KEY,
-    RUDDER_ORG_ID: env.RUDDER_ORG_ID,
-    RUDDER_AGENT_ID: env.RUDDER_AGENT_ID,
-    RUDDER_RUN_ID: env.RUDDER_RUN_ID,
-    RUDDER_PROJECT_LIBRARY_PATH: env.RUDDER_PROJECT_LIBRARY_PATH,
-    RUDDER_MCP_RUDDER_BIN: env.RUDDER_MCP_RUDDER_BIN
-  };
-}
-function buildAgentV1ToolCallPlan(toolName, rawArgs, env = buildMcpServerEnv()) {
-  const input = isRecord(rawArgs) ? rawArgs : {};
-  const capabilityId = toolNameToCapabilityId(toolName);
-  if (!capabilityId) {
-    throw new Error(`Unknown Rudder MCP tool: ${toolName}`);
-  }
-  const capability = getAgentCliCapabilityById(capabilityId);
+// src/client/http.ts
+import { URL as URL2 } from "node:url";
+var ApiRequestError = class extends Error {
+  status;
+  code;
+  details;
+  body;
+  constructor(status, message, details, body, code) {
+    super(message);
+    this.status = status;
+    this.code = code ?? null;
+    this.details = details;
+    this.body = body;
+  }
+};
+var RudderApiClient = class {
+  apiBase;
+  apiKey;
+  agentId;
+  runId;
+  recoverAuth;
+  constructor(opts) {
+    this.apiBase = opts.apiBase.replace(/\/+$/, "");
+    this.apiKey = opts.apiKey?.trim() || void 0;
+    this.agentId = opts.agentId?.trim() || void 0;
+    this.runId = opts.runId?.trim() || void 0;
+    this.recoverAuth = opts.recoverAuth;
+  }
+  get(path24, opts) {
+    return this.request(path24, { method: "GET" }, opts);
+  }
+  post(path24, body, opts) {
+    return this.request(path24, {
+      method: "POST",
+      body: body === void 0 ? void 0 : JSON.stringify(body)
+    }, opts);
+  }
+  postForm(path24, form, opts) {
+    return this.request(path24, {
+      method: "POST",
+      body: form
+    }, opts);
+  }
+  patch(path24, body, opts) {
+    return this.request(path24, {
+      method: "PATCH",
+      body: body === void 0 ? void 0 : JSON.stringify(body)
+    }, opts);
+  }
+  put(path24, body, opts) {
+    return this.request(path24, {
+      method: "PUT",
+      body: body === void 0 ? void 0 : JSON.stringify(body)
+    }, opts);
+  }
+  delete(path24, opts) {
+    return this.request(path24, { method: "DELETE" }, opts);
+  }
+  setApiKey(apiKey) {
+    this.apiKey = apiKey?.trim() || void 0;
+  }
+  async request(path24, init, opts, hasRetriedAuth = false) {
+    const url = buildUrl(this.apiBase, path24);
+    const headers = {
+      accept: "application/json",
+      ...toStringRecord(init.headers)
+    };
+    if (typeof init.body === "string") {
+      headers["content-type"] = headers["content-type"] ?? "application/json";
+    }
+    if (this.apiKey) {
+      headers.authorization = `Bearer ${this.apiKey}`;
+    }
+    if (shouldAttachAgentContext(init.method)) {
+      if (this.agentId) {
+        headers["x-rudder-agent-id"] = this.agentId;
+      }
+      if (this.runId) {
+        headers["x-rudder-run-id"] = this.runId;
+      }
+    }
+    const response = await fetch(url, {
+      ...init,
+      headers
+    });
+    if (opts?.ignoreNotFound && response.status === 404) {
+      return null;
+    }
+    if (!response.ok) {
+      const apiError = await toApiError(response);
+      if (!hasRetriedAuth && this.recoverAuth) {
+        const recoveredToken = await this.recoverAuth({
+          path: path24,
+          method: String(init.method ?? "GET").toUpperCase(),
+          error: apiError
+        });
+        if (recoveredToken) {
+          this.setApiKey(recoveredToken);
+          return this.request(path24, init, opts, true);
+        }
+      }
+      throw apiError;
+    }
+    if (response.status === 204) {
+      return null;
+    }
+    const text6 = await response.text();
+    if (!text6.trim()) {
+      return null;
+    }
+    return safeParseJson(text6);
+  }
+};
+function shouldAttachAgentContext(method) {
+  const normalized = String(method ?? "GET").toUpperCase();
+  return normalized !== "GET" && normalized !== "HEAD";
+}
+function buildUrl(apiBase, path24) {
+  const normalizedPath = path24.startsWith("/") ? path24 : `/${path24}`;
+  const [pathname, query] = normalizedPath.split("?");
+  const url = new URL2(apiBase);
+  url.pathname = `${url.pathname.replace(/\/+$/, "")}${pathname}`;
+  if (query) url.search = query;
+  return url.toString();
+}
+function safeParseJson(text6) {
+  try {
+    return JSON.parse(text6);
+  } catch {
+    return text6;
+  }
+}
+async function toApiError(response) {
+  const text6 = await response.text();
+  const parsed = safeParseJson(text6);
+  if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+    const body = parsed;
+    const message = typeof body.error === "string" && body.error.trim() || typeof body.message === "string" && body.message.trim() || `Request failed with status ${response.status}`;
+    const code = typeof body.code === "string" && body.code.trim().length > 0 ? body.code.trim() : null;
+    return new ApiRequestError(response.status, message, body.details, parsed, code);
+  }
+  return new ApiRequestError(
+    response.status,
+    `Request failed with status ${response.status}`,
+    void 0,
+    parsed,
+    null
+  );
+}
+function toStringRecord(headers) {
+  if (!headers) return {};
+  if (Array.isArray(headers)) {
+    return Object.fromEntries(headers.map(([key, value]) => [key, String(value)]));
+  }
+  if (headers instanceof Headers) {
+    return Object.fromEntries(headers.entries());
+  }
+  return Object.fromEntries(
+    Object.entries(headers).map(([key, value]) => [key, String(value)])
+  );
+}
+
+// src/agent-v1-mcp-server.ts
+var RUDDER_MCP_SERVER_NAME = "rudder-control-plane";
+var RESERVED_MODEL_ARGUMENTS = /* @__PURE__ */ new Set([
+  "orgId",
+  "org_id",
+  "companyId",
+  "company_id",
+  "agentId",
+  "agent_id",
+  "runId",
+  "run_id",
+  "apiBase",
+  "api_base",
+  "apiKey",
+  "api_key",
+  "authorization"
+]);
+var NORMALIZED_RESERVED_MODEL_ARGUMENTS = /* @__PURE__ */ new Set([
+  "orgid",
+  "companyid",
+  "agentid",
+  "runid",
+  "apibase",
+  "apikey",
+  "authorization"
+]);
+function buildMcpServerEnv(env = process.env) {
+  return {
+    ...process.env,
+    ...env,
+    RUDDER_API_URL: env.RUDDER_API_URL,
+    RUDDER_API_KEY: env.RUDDER_API_KEY,
+    RUDDER_ORG_ID: env.RUDDER_ORG_ID,
+    RUDDER_AGENT_ID: env.RUDDER_AGENT_ID,
+    RUDDER_RUN_ID: env.RUDDER_RUN_ID,
+    RUDDER_PROJECT_LIBRARY_PATH: env.RUDDER_PROJECT_LIBRARY_PATH,
+    RUDDER_MCP_RUDDER_BIN: env.RUDDER_MCP_RUDDER_BIN
+  };
+}
+function buildAgentV1ToolCallPlan(toolName, rawArgs, env = buildMcpServerEnv()) {
+  const input = isRecord2(rawArgs) ? rawArgs : {};
+  const capabilityId = toolNameToCapabilityId(toolName);
+  if (!capabilityId) {
+    throw new Error(`Unknown Rudder MCP tool: ${toolName}`);
+  }
+  const capability = getAgentCliCapabilityById(capabilityId);
   rejectModelProvidedRuntimeIdentity(input);
   assertRuntimeMcpContext(capability, env);
   const tempFiles = [];
@@ -8204,7 +8367,7 @@ async function callToolSafely(params, env) {
     const details = errorDetails(err);
     const payload = {
       status: "error",
-      code: isRecord(details) && typeof details.code === "string" ? details.code : "rudder_mcp_tool_error",
+      code: isRecord2(details) && typeof details.code === "string" ? details.code : "rudder_mcp_tool_error",
       message: errorMessage(err),
       details: details ?? null
     };
@@ -8219,10 +8382,12 @@ async function callToolSafely(params, env) {
   }
 }
 async function callTool(params, env) {
-  const record = isRecord(params) ? params : {};
+  const record = isRecord2(params) ? params : {};
   const toolName = typeof record.name === "string" ? record.name : "";
   const args = record.arguments;
   const plan = buildAgentV1ToolCallPlan(toolName, args, env);
+  const directResult = await callToolDirectlyIfSupported(toolName, args, env);
+  if (directResult) return directResult;
   const tempDir = plan.tempFiles.length > 0 ? await fs.mkdtemp(path.join(os.tmpdir(), "rudder-mcp-")) : null;
   const materializedArgs = [...plan.args];
   try {
@@ -8261,6 +8426,85 @@ async function callTool(params, env) {
     if (tempDir) await fs.rm(tempDir, { recursive: true, force: true });
   }
 }
+async function callToolDirectlyIfSupported(toolName, rawArgs, env) {
+  const capabilityId = toolNameToCapabilityId(toolName);
+  if (!capabilityId) return null;
+  const input = isRecord2(rawArgs) ? rawArgs : {};
+  const api = mcpApiClient(env);
+  switch (capabilityId) {
+    case "agent.me":
+      return mcpSuccess(await api.get("/api/agents/me"));
+    case "agent.inbox":
+      return mcpSuccess(await api.get("/api/agents/me/inbox-lite"));
+    case "issue.get":
+      return mcpSuccess(await api.get(`/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}`));
+    case "issue.context": {
+      const params = new URLSearchParams();
+      const wakeCommentId = optionalString(input.wakeCommentId);
+      if (wakeCommentId) params.set("wakeCommentId", wakeCommentId);
+      const query = params.toString();
+      return mcpSuccess(await api.get(
+        `/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}/heartbeat-context${query ? `?${query}` : ""}`
+      ));
+    }
+    case "issue.checkout": {
+      const expectedStatuses = parseCsvInput(input.expectedStatuses, "todo,backlog,blocked");
+      const payload = checkoutIssueSchema.parse({
+        agentId: optionalString(env.RUDDER_AGENT_ID),
+        expectedStatuses
+      });
+      return mcpSuccess(await api.post(
+        `/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}/checkout`,
+        payload
+      ));
+    }
+    case "issue.comment": {
+      const payload = addIssueCommentSchema.parse({
+        body: requiredAnyString(input, ["body", "comment"]),
+        reopen: input.reopen === true ? true : void 0
+      });
+      return mcpSuccess(await api.post(
+        `/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}/comments`,
+        payload
+      ));
+    }
+    case "issue.done": {
+      const comment = requiredAnyString(input, ["comment", "body"]);
+      return mcpSuccess(await api.patch(
+        `/api/issues/${encodeURIComponent(requiredAnyString(input, ["issue", "issueId"]))}`,
+        { status: "done", comment }
+      ));
+    }
+    default:
+      return null;
+  }
+}
+function mcpApiClient(env) {
+  const apiBase = optionalString(env.RUDDER_API_URL);
+  if (!apiBase) {
+    const err = new Error("Rudder MCP runtime context is incomplete. Missing RUDDER_API_URL.");
+    err.code = "rudder_mcp_missing_runtime_context";
+    throw err;
+  }
+  return new RudderApiClient({
+    apiBase,
+    apiKey: optionalString(env.RUDDER_API_KEY) ?? void 0,
+    agentId: optionalString(env.RUDDER_AGENT_ID) ?? void 0,
+    runId: optionalString(env.RUDDER_RUN_ID) ?? void 0
+  });
+}
+function mcpSuccess(data) {
+  const text6 = JSON.stringify(data ?? {});
+  return {
+    content: [{ type: "text", text: text6 }],
+    ...structuredContentFromJsonText(text6),
+    isError: false
+  };
+}
+function parseCsvInput(value, fallback) {
+  const source = Array.isArray(value) ? value.map((entry) => optionalString(entry)).filter(Boolean).join(",") : optionalString(value) || fallback;
+  return source.split(",").map((entry) => entry.trim()).filter(Boolean);
+}
 function cliArgsForCapability(capabilityId, input, tempFiles, env) {
   getAgentCliCapabilityById(capabilityId);
   switch (capabilityId) {
@@ -8688,7 +8932,7 @@ function toMcpToolListEntry(tool) {
   };
 }
 function requestedProtocolVersion(params) {
-  if (!isRecord(params)) return null;
+  if (!isRecord2(params)) return null;
   return typeof params.protocolVersion === "string" && params.protocolVersion.trim().length > 0 ? params.protocolVersion.trim() : null;
 }
 function toolNameToCapabilityId(toolName) {
@@ -8733,7 +8977,7 @@ function pushJson(args, flag, value) {
     args.push(flag, value.trim());
     return;
   }
-  if (isRecord(value) || Array.isArray(value)) {
+  if (isRecord2(value) || Array.isArray(value)) {
     args.push(flag, JSON.stringify(value));
   }
 }
@@ -8786,7 +9030,7 @@ function assertRuntimeMcpContext(capability, env) {
 function structuredContentFromJsonText(text6) {
   try {
     const parsed = JSON.parse(text6);
-    if (isRecord(parsed)) return { structuredContent: parsed };
+    if (isRecord2(parsed)) return { structuredContent: parsed };
     return { structuredContent: { result: parsed } };
   } catch {
     return {};
@@ -8850,7 +9094,7 @@ function errorDetails(err) {
   const code = err.code;
   return code ? { code } : void 0;
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -9233,168 +9477,6 @@ function resolveProfile(context, profileName) {
   return { name, profile };
 }
 
-// src/client/http.ts
-import { URL as URL2 } from "node:url";
-var ApiRequestError = class extends Error {
-  status;
-  code;
-  details;
-  body;
-  constructor(status, message, details, body, code) {
-    super(message);
-    this.status = status;
-    this.code = code ?? null;
-    this.details = details;
-    this.body = body;
-  }
-};
-var RudderApiClient = class {
-  apiBase;
-  apiKey;
-  agentId;
-  runId;
-  recoverAuth;
-  constructor(opts) {
-    this.apiBase = opts.apiBase.replace(/\/+$/, "");
-    this.apiKey = opts.apiKey?.trim() || void 0;
-    this.agentId = opts.agentId?.trim() || void 0;
-    this.runId = opts.runId?.trim() || void 0;
-    this.recoverAuth = opts.recoverAuth;
-  }
-  get(path24, opts) {
-    return this.request(path24, { method: "GET" }, opts);
-  }
-  post(path24, body, opts) {
-    return this.request(path24, {
-      method: "POST",
-      body: body === void 0 ? void 0 : JSON.stringify(body)
-    }, opts);
-  }
-  postForm(path24, form, opts) {
-    return this.request(path24, {
-      method: "POST",
-      body: form
-    }, opts);
-  }
-  patch(path24, body, opts) {
-    return this.request(path24, {
-      method: "PATCH",
-      body: body === void 0 ? void 0 : JSON.stringify(body)
-    }, opts);
-  }
-  put(path24, body, opts) {
-    return this.request(path24, {
-      method: "PUT",
-      body: body === void 0 ? void 0 : JSON.stringify(body)
-    }, opts);
-  }
-  delete(path24, opts) {
-    return this.request(path24, { method: "DELETE" }, opts);
-  }
-  setApiKey(apiKey) {
-    this.apiKey = apiKey?.trim() || void 0;
-  }
-  async request(path24, init, opts, hasRetriedAuth = false) {
-    const url = buildUrl(this.apiBase, path24);
-    const headers = {
-      accept: "application/json",
-      ...toStringRecord(init.headers)
-    };
-    if (typeof init.body === "string") {
-      headers["content-type"] = headers["content-type"] ?? "application/json";
-    }
-    if (this.apiKey) {
-      headers.authorization = `Bearer ${this.apiKey}`;
-    }
-    if (shouldAttachAgentContext(init.method)) {
-      if (this.agentId) {
-        headers["x-rudder-agent-id"] = this.agentId;
-      }
-      if (this.runId) {
-        headers["x-rudder-run-id"] = this.runId;
-      }
-    }
-    const response = await fetch(url, {
-      ...init,
-      headers
-    });
-    if (opts?.ignoreNotFound && response.status === 404) {
-      return null;
-    }
-    if (!response.ok) {
-      const apiError = await toApiError(response);
-      if (!hasRetriedAuth && this.recoverAuth) {
-        const recoveredToken = await this.recoverAuth({
-          path: path24,
-          method: String(init.method ?? "GET").toUpperCase(),
-          error: apiError
-        });
-        if (recoveredToken) {
-          this.setApiKey(recoveredToken);
-          return this.request(path24, init, opts, true);
-        }
-      }
-      throw apiError;
-    }
-    if (response.status === 204) {
-      return null;
-    }
-    const text6 = await response.text();
-    if (!text6.trim()) {
-      return null;
-    }
-    return safeParseJson(text6);
-  }
-};
-function shouldAttachAgentContext(method) {
-  const normalized = String(method ?? "GET").toUpperCase();
-  return normalized !== "GET" && normalized !== "HEAD";
-}
-function buildUrl(apiBase, path24) {
-  const normalizedPath = path24.startsWith("/") ? path24 : `/${path24}`;
-  const [pathname, query] = normalizedPath.split("?");
-  const url = new URL2(apiBase);
-  url.pathname = `${url.pathname.replace(/\/+$/, "")}${pathname}`;
-  if (query) url.search = query;
-  return url.toString();
-}
-function safeParseJson(text6) {
-  try {
-    return JSON.parse(text6);
-  } catch {
-    return text6;
-  }
-}
-async function toApiError(response) {
-  const text6 = await response.text();
-  const parsed = safeParseJson(text6);
-  if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-    const body = parsed;
-    const message = typeof body.error === "string" && body.error.trim() || typeof body.message === "string" && body.message.trim() || `Request failed with status ${response.status}`;
-    const code = typeof body.code === "string" && body.code.trim().length > 0 ? body.code.trim() : null;
-    return new ApiRequestError(response.status, message, body.details, parsed, code);
-  }
-  return new ApiRequestError(
-    response.status,
-    `Request failed with status ${response.status}`,
-    void 0,
-    parsed,
-    null
-  );
-}
-function toStringRecord(headers) {
-  if (!headers) return {};
-  if (Array.isArray(headers)) {
-    return Object.fromEntries(headers.map(([key, value]) => [key, String(value)]));
-  }
-  if (headers instanceof Headers) {
-    return Object.fromEntries(headers.entries());
-  }
-  return Object.fromEntries(
-    Object.entries(headers).map(([key, value]) => [key, String(value)])
-  );
-}
-
 // src/commands/client/common.ts
 init_store();
 var currentCommandFullIds = false;
@@ -9746,11 +9828,12 @@ function asString(value, fallback) {
 var RUDDER_AGENT_OPERATING_CONTRACT = [
   "# Rudder Agent Operating Contract",
   "",
-  "Your home directory is `$AGENT_HOME`. Everything personal to you -- life, memory, knowledge -- lives there. Other agents may have their own folders and you may update them when necessary.",
+  "You are a helpful assistant. Your home directory is `$AGENT_HOME`. Everything personal to you -- life, memory, knowledge -- lives there. Other agents may have their own folders and you may update them when necessary.",
   "",
+  "Read Rudder mcp tools to firstly.",
   "Use these paths consistently:",
   "",
-  "- Personal instructions live under `$AGENT_HOME/instructions`.",
+  "- Your personal instructions live under `$AGENT_HOME/instructions`.",
   "- Personal memory lives under `$AGENT_HOME/memory`.",
   "- Tacit memory instruction lives at `$AGENT_HOME/instructions/MEMORY.md` and is automatically loaded when present.",
   "- Personal skills live under `$AGENT_HOME/skills`.",
@@ -9799,11 +9882,6 @@ var RUDDER_AGENT_OPERATING_CONTRACT = [
   "",
   "Invoke it whenever you need to remember, retrieve, or organize anything.",
   "",
-  "## Safety Considerations",
-  "",
-  "- Never exfiltrate secrets or private data.",
-  "- Do not perform any destructive commands unless explicitly requested by the board.",
-  "",
   "## Other",
   "- You can use `rudder` skill to see Agent best practise in Rudder. eg: update Agent profile, crud automation, manage library, project, org, curd agent run, chat, issue.",
   "- Before taking action, deeply analyze and research the existing information to ensure you have comprehensive context information before proceeding with the next action. You have your own goal, memory, skills, automation, library, project, org, use these resources to make better decisions.",