@cursor/july 0.1.68 → 0.1.74

package/dist/internal/advertise-tools.js

@@ -16,9 +16,13 @@
  * auth-less connections go through the shared `host.mcp` registry, which
  * also covers serve-resolved transports (Cursor account bridges, peers).
  *
- * Everything here fails closed: a listing failure, an invalid tool name,
- * or a name collision throws, and the engine fails the turn rather than
- * running it with a silently shrunken toolset.
+ * Advertised names follow the Cursor-account MCP bridge
+ * (`packages/agent-serve/src/internal/cursor/account-mcp.ts`): slug
+ * `[^a-zA-Z0-9_-]` to `_`, collision suffixes `_2` / `_3`, and call the
+ * original advertised name. That is the same mapping `packages/agent`
+ * `normalizeMcpToolName` uses for IDE/Sand MCP tools. A listing failure
+ * still fails the turn rather than running it with a silently shrunken
+ * toolset.
  */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -30,12 +34,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { brandDefinition } from "./brand.js";
+import { sanitizeMcpToolName, suffixMcpToolName, } from "./sanitize-mcp-tool-name.js";
 /**
- * The rule advertised tool names must match — the same shape discovery
- * enforces for authored tool filenames (its `NAME_PATTERN`), since both
- * become the tool name the model sees.
+ * Model-facing advertised names after {@link sanitizeMcpToolName} — the
+ * same MCP-client shape the Cursor-account bridge documents
+ * (`^[a-zA-Z0-9_-]{1,128}$`). Authored `agent/tools/` filenames stay on
+ * discovery's stricter `NAME_PATTERN` (must start alphanumeric).
  */
-export const ADVERTISED_TOOL_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
+export const ADVERTISED_TOOL_NAME_PATTERN = /^[A-Za-z0-9_-]{1,128}$/;
 const ANY_OBJECT_SCHEMA = {
     type: "object",
     additionalProperties: true,
@@ -64,9 +70,10 @@ export function resolveAdvertisedTools(args) {
             catch (error) {
                 throw new Error(`Failed to list tools on advertised connection "${connection.name}": ${describeError(error)}`, { cause: error });
             }
-            for (const info of listed) {
-                resolved.push(toDiscoveredTool(connection, info, claimed, source));
-                claimed.add(info.name);
+            const exposed = exposeListedTools(listed, claimed);
+            for (const { info, exposedName } of exposed) {
+                resolved.push(toDiscoveredTool(connection, info, exposedName, source));
+                claimed.add(exposedName);
             }
         }
         return resolved;
@@ -99,33 +106,59 @@ export function sourceForConnection(connection, session, hostMcp) {
         return hostMcp.oneOff(Object.assign(Object.assign({}, connection), { transport: Object.assign(Object.assign({}, transport), { headers: Object.assign(Object.assign({}, transport.headers), evaluated.headers) }) }));
     });
 }
-function toDiscoveredTool(connection, info, claimed, source) {
-    var _a;
-    if (!ADVERTISED_TOOL_NAME_PATTERN.test(info.name)) {
-        throw new Error(`Advertised connection "${connection.name}" serves tool name "${info.name}", which must match ${ADVERTISED_TOOL_NAME_PATTERN} (it becomes the tool name the model sees).`);
+/**
+ * Same catalog rule as the Cursor-account bridge: slug illegal characters,
+ * then `_2` / `_3` … for colliders (including authored tools already in
+ * `claimed`). Suffix assignment is stable for a colliding group: sort by
+ * original advertised name, independent of `listTools` order.
+ */
+function exposeListedTools(listed, claimed) {
+    const byBase = new Map();
+    for (const info of listed) {
+        const base = sanitizeMcpToolName(info.name);
+        const group = byBase.get(base);
+        if (group === undefined) {
+            byBase.set(base, [info]);
+        }
+        else {
+            group.push(info);
+        }
     }
-    if (claimed.has(info.name)) {
-        throw new Error(`Advertised connection "${connection.name}" serves tool "${info.name}", which collides with an authored agent/tools/ tool or another advertised connection.`);
+    const taken = new Set(claimed);
+    const exposedNameByInfo = new Map();
+    const sortedBases = [...byBase.keys()].sort((left, right) => left < right ? -1 : left > right ? 1 : 0);
+    for (const base of sortedBases) {
+        const group = byBase.get(base);
+        group.sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0);
+        group.forEach((info, index) => {
+            let suffixIndex = index;
+            let exposedName = suffixMcpToolName(base, suffixIndex);
+            while (taken.has(exposedName)) {
+                suffixIndex++;
+                exposedName = suffixMcpToolName(base, suffixIndex);
+            }
+            taken.add(exposedName);
+            exposedNameByInfo.set(info, exposedName);
+        });
     }
+    return listed.map((info) => ({
+        info,
+        exposedName: exposedNameByInfo.get(info),
+    }));
+}
+function toDiscoveredTool(connection, info, exposedName, source) {
+    var _a;
     const description = info.description === undefined || info.description.trim() === ""
         ? `${info.name} — MCP tool on the "${connection.name}" connection, forwarded 1:1.`
         : info.description;
     const inputSchema = (_a = info.inputSchema) !== null && _a !== void 0 ? _a : ANY_OBJECT_SCHEMA;
-    const definition = brandDefinition("tool", {
-        description,
-        inputSchema,
-        execute: (input) => __awaiter(this, void 0, void 0, function* () {
+    const outputSchema = info.outputSchema;
+    const definition = brandDefinition("tool", Object.assign(Object.assign({ description,
+        inputSchema }, (outputSchema === undefined ? {} : { outputSchema })), { execute: (input) => __awaiter(this, void 0, void 0, function* () {
             return formatMcpToolResult(connection.name, info.name, yield source.callTool(info.name, input !== null && input !== void 0 ? input : {}));
-        }),
-    });
-    return {
-        name: info.name,
-        description,
-        inputSchema,
-        execution: "server",
-        needsApproval: false,
-        definition,
-    };
+        }) }));
+    return Object.assign(Object.assign({ name: exposedName, description,
+        inputSchema }, (outputSchema === undefined ? {} : { outputSchema })), { execution: "server", needsApproval: false, definition });
 }
 /**
  * Render an MCP call result for the model: text parts joined, non-text

package/dist/internal/cli-deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-deploy.d.ts","sourceRoot":"","sources":["../../src/internal/cli-deploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli-deploy.d.ts","sourceRoot":"","sources":["../../src/internal/cli-deploy.ts"],"names":[],"mappings":"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"}

package/dist/internal/cli-deploy.js

@@ -25,7 +25,6 @@ import { cursorExternalApiUrl, resolveApiKey, SIGN_IN_HINT, } from "./cursor/cre
 import { authorizeCursorAccountConnectors } from "./cursor-account-mcp-auth.js";
 import { readDeployTemplate } from "./cursor-agent-template.js";
 import { AgentServeDeployClient, DeployApiError, deploymentServiceAccountId, slugFromDirectoryName, TERMINAL_DEPLOY_STATUSES, validateDeploymentSlug, } from "./deploy-client.js";
-import { buildAgentDeployManifest, } from "./deploy-manifest.js";
 import { inferDeployGitSource } from "./deploy-source.js";
 import { isAgentProjectDir, listChildAgentDirs, loadAgentProject, } from "./discovery.js";
 import { CLI_COMMAND_NAME as CLI } from "./distribution.js";
@@ -433,10 +432,10 @@ function deployOne(ctx, options, target, extras) {
         }
         // Today's only source shape: the control plane builds from a git ref.
         // See DeploySource for the artifact seam.
-        const source = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kind: "git-ref", gitRepoUrl }, (gitRef === undefined ? {} : { gitRef })), (agentPath === undefined ? {} : { agentPath })), (options.cursorEventsRepos === undefined ||
+        const source = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kind: "git-ref", gitRepoUrl }, (gitRef === undefined ? {} : { gitRef })), (agentPath === undefined ? {} : { agentPath })), (options.cursorEventsRepos === undefined ||
             options.cursorEventsRepos.length === 0
             ? {}
-            : { cursorEventRepos: options.cursorEventsRepos })), (egressAllowedDomains.length === 0 ? {} : { egressAllowedDomains })), { publicRoutePaths: publicRoutePaths.length === 0 ? undefined : publicRoutePaths }), (manifest === undefined ? {} : { manifest: manifest.deployManifest }));
+            : { cursorEventRepos: options.cursorEventsRepos })), (egressAllowedDomains.length === 0 ? {} : { egressAllowedDomains })), { publicRoutePaths: publicRoutePaths.length === 0 ? undefined : publicRoutePaths });
         let accepted;
         try {
             accepted = yield ctx.client.deploy({
@@ -595,7 +594,6 @@ function readDeployManifest(dir) {
                 .filter((channel) => { var _a; return ((_a = channel.definition.auth) !== null && _a !== void 0 ? _a : []).some(isPublicEndpointPolicy); })
                 .map((channel) => channel.id),
             httpChannelPublicEndpoint: ((_a = project.httpChannel.auth) !== null && _a !== void 0 ? _a : []).some(isPublicEndpointPolicy),
-            deployManifest: buildAgentDeployManifest(project),
         };
     });
 }

package/dist/internal/cli-skills.d.ts

@@ -1,9 +1,11 @@
 /**
  * `install-skills` — install the package's coding-agent skills into
- * `~/.cursor/skills/agentkit/` without running `init`.
+ * `~/.cursor/skills/agentsdk/` without running `init`.
  *
  * Never prompts: running the command is the confirmation. The interactive
- * offer lives in `init`.
+ * offer lives in `init`. Consumer `npm install` / `npx` copies the same
+ * skills in postinstall (with `alwaysApply: true` so Cursor injects them);
+ * this command refreshes them without reinstalling.
  */
 export interface InstallSkillsCliOptions {
     json?: boolean;

package/dist/internal/cli-skills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-skills.d.ts","sourceRoot":"","sources":["../../src/internal/cli-skills.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,MAAM,WAAW,uBAAuB;IACtC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gCAAgC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAED,wBAAsB,gBAAgB,CACpC,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,MAAM,CAAC,CA4CjB"}
+{"version":3,"file":"cli-skills.d.ts","sourceRoot":"","sources":["../../src/internal/cli-skills.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAYH,MAAM,WAAW,uBAAuB;IACtC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gCAAgC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAED,wBAAsB,gBAAgB,CACpC,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,MAAM,CAAC,CA4CjB"}

package/dist/internal/cli-skills.js

@@ -1,9 +1,11 @@
 /**
  * `install-skills` — install the package's coding-agent skills into
- * `~/.cursor/skills/agentkit/` without running `init`.
+ * `~/.cursor/skills/agentsdk/` without running `init`.
  *
  * Never prompts: running the command is the confirmation. The interactive
- * offer lives in `init`.
+ * offer lives in `init`. Consumer `npm install` / `npx` copies the same
+ * skills in postinstall (with `alwaysApply: true` so Cursor injects them);
+ * this command refreshes them without reinstalling.
  */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -15,7 +17,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { CLI_COMMAND_NAME } from "./distribution.js";
-import { formatSkillInstall, installCursorSkills, planSkillInstall, } from "./install-cursor-skills.js";
+import { formatSkillInstall, installCursorSkills, LEGACY_CURSOR_SKILLS_NAMESPACE, planSkillInstall, } from "./install-cursor-skills.js";
 import { stdoutPalette } from "./terminal-style.js";
 export function cmdInstallSkills() {
     return __awaiter(this, arguments, void 0, function* (options = {}) {
@@ -67,6 +69,9 @@ function previewBlock(plan) {
     if (plan.orphans.length > 0) {
         lines.push(`  removes:  ${plan.orphans.join(", ")}`);
     }
+    if (plan.hasLegacyNamespace) {
+        lines.push(`  removes:  ${LEGACY_CURSOR_SKILLS_NAMESPACE}/ (legacy namespace)`);
+    }
     lines.push(`  location: ${plan.directory}`);
     return `${lines.join("\n")}\n`;
 }

package/dist/internal/convert-automation/convert-workflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-workflow.d.ts","sourceRoot":"","sources":["../../../src/internal/convert-automation/convert-workflow.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAKV,oBAAoB,EACpB,qBAAqB,EAQtB,MAAM,YAAY,CAAC;AAUpB,wBAAgB,eAAe,CAC7B,KAAK,EAAE,oBAAoB,GAC1B,qBAAqB,CA4GvB"}
+{"version":3,"file":"convert-workflow.d.ts","sourceRoot":"","sources":["../../../src/internal/convert-automation/convert-workflow.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAKV,oBAAoB,EACpB,qBAAqB,EAQtB,MAAM,YAAY,CAAC;AAUpB,wBAAgB,eAAe,CAC7B,KAAK,EAAE,oBAAoB,GAC1B,qBAAqB,CA4GvB"}

package/dist/internal/convert-automation/convert-workflow.js

@@ -6,6 +6,7 @@
  * clock — `exportedAt` comes from the caller.
  */
 import { CLI_COMMAND_NAME, PACKAGE_NAME } from "../distribution.js";
+import { MEMORY_TS } from "../init-scaffold.js";
 import { pascalCase, SlugRegistry, slugify } from "./slug.js";
 export function convertWorkflow(input) {
     var _a, _b;
@@ -80,7 +81,7 @@ export function convertWorkflow(input) {
     const hasSlackAction = ((_d = workflow.actions) !== null && _d !== void 0 ? _d : []).some((action) => action.slack !== undefined || action.readSlack !== undefined);
     const hasSlackConnection = hasSlackAction && emitSlackAccountConnection(automation, out);
     if (workflow.memoryEnabled === true) {
-        out.files.push({ path: "agent/hooks/memory.ts", contents: MEMORY_HOOK });
+        out.files.push({ path: "agent/hooks/memory.ts", contents: MEMORY_TS });
     }
     out.setupSteps.push(...behaviorSteps(workflow, out.warnings, {
         hasSlackChannel: slackTriggers.length > 0,
@@ -987,12 +988,3 @@ function jsonComment(value) {
 function dedupe(values) {
     return [...new Set(values)];
 }
-/** Memory hook contents — identical to the `initProject` scaffold. */
-const MEMORY_HOOK = `// Journals every turn (timestamp, session, user message, result) so
-// future sessions can recall past work. The journal is shared across every
-// session — and every user — of this agent. Pass your own MemoryBackend to
-// change where memories live, or delete this file to opt out.
-import { memoryHook } from "${PACKAGE_NAME}/memory";
-
-export default memoryHook();
-`;

package/dist/internal/cursor/account-mcp.d.ts

@@ -15,7 +15,12 @@
  */
 import type { AgentProject, AuthPolicy } from "../../types.js";
 import type { EngineResolvedConnection } from "../session-engine.js";
+import { type TerminalPalette } from "../terminal-style.js";
 import type { AccountMcpServer, CursorBackendClient } from "./backend-client.js";
+/** Dashboard Integrations & MCP — reconnect team / account connectors. */
+export declare const CURSOR_ACCOUNT_MCP_DASHBOARD_URL = "https://cursor.com/dashboard/integrations";
+/** Cursor app Settings → MCP (Connect / Authenticate on the named row). */
+export declare const CURSOR_ACCOUNT_MCP_SETTINGS_DEEPLINK = "cursor://anysphere.cursor-deeplink/customize?tab=mcp";
 export interface CursorAccountConnectionRef {
     /** Connection (MCP server) name — the filename under `agent/mcp-connections/`. */
     name: string;
@@ -52,12 +57,15 @@ export declare class CursorAccountMcpBridge {
     readonly secret: string;
     private readonly client;
     private readonly logger;
+    private readonly palette;
     private readonly secretPolicy;
     private readonly allowRemoteCallers;
     private readonly catalogs;
     constructor(args: {
         client: CursorBackendClient;
         logger?: (line: string) => void;
+        /** Defaults to stdout; tests pass `makePalette(false)` for a plain box. */
+        palette?: TerminalPalette;
         /**
          * Admit non-loopback callers presenting the secret. Only set when the
          * serve host configured a `publicUrl` (cloud turns reach the bridge
@@ -78,9 +86,9 @@ export declare class CursorAccountMcpBridge {
     handle(request: Request, ref: CursorAccountConnectionRef): Promise<Response>;
     /**
      * Startup DX: log the account's connector statuses for `refs` without
-     * blocking serve startup. Surfaces "needsAuth" / "error" connectors with
-     * remediation hints (and a backend probe detail for `error`), and filters
-     * that matched nothing (typo'd connector names).
+     * blocking serve startup. Healthy catalogs stay a one-line summary;
+     * `needsAuth` / `error` / empty catalogs render a yellow warning box with
+     * reconnect URLs.
      *
      * Returns a promise that settles when every ref's log lines are written —
      * callers may ignore it; tests can await it.
@@ -97,6 +105,24 @@ export declare class CursorAccountMcpBridge {
      */
     private getCatalog;
 }
+export interface CursorAccountMcpWarningServer {
+    serverIdentifier: string;
+    status: string;
+    toolCount: number;
+    errorDetail?: string;
+    /** Minted OAuth URL for a `needsAuth` connector, when the probe succeeded. */
+    authUrl?: string;
+}
+/**
+ * Yellow warning panel for unhealthy / missing Cursor-account connectors.
+ * One box replaces the old stacked `[agent-sdk]` log lines.
+ */
+export declare function formatCursorAccountMcpWarningBox(args: {
+    connectionName: string;
+    servers: readonly CursorAccountMcpWarningServer[];
+    palette?: TerminalPalette;
+    hyperlinks?: boolean;
+}): string;
 /** One-line status for the preflight summary (`name (12 tools)` / `name (error: …)`). */
 export declare function formatServerStatusSummary(server: AccountMcpServer, errorDetail?: string): string;
 /**

package/dist/internal/cursor/account-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account-mcp.d.ts","sourceRoot":"","sources":["../../../src/internal/cursor/account-mcp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI/D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAgB7B,MAAM,WAAW,0BAA0B;IACzC,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,GACrD,GAAG,CAAC,MAAM,EAAE,0BAA0B,EAAE,CAAC,CAoB3C;AAED,oFAAoF;AACpF,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,IAAI,EAAE,0BAA0B,EAAE,CAAC;IACnC,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,wBAAwB,EAAE,CAkB7B;AAiCD,qBAAa,sBAAsB;IACjC,yEAAyE;IACzE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAE5D,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,mBAAmB,CAAC;QAC5B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAChC;;;;WAIG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,EAKA;IAED;;;;OAIG;IACH,UAAU,IAAI,UAAU,CAgBvB;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,0BAA0B,GAAG,OAAO,CAAC,QAAQ,CAAC,CAO3E;IAED;;;;;;;;OAQG;IACH,YAAY,CAAC,IAAI,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9D;YAEa,YAAY;IAyE1B,OAAO,CAAC,WAAW;IA2EnB,0EAA0E;YAC5D,QAAQ;IAatB;;;;OAIG;IACH,OAAO,CAAC,UAAU;CAwCnB;AAwFD,yFAAyF;AACzF,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,gBAAgB,EACxB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAkBR;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,IAAI,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,EAC1D,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4B7B"}
+{"version":3,"file":"account-mcp.d.ts","sourceRoot":"","sources":["../../../src/internal/cursor/account-mcp.ts"],"names":[],"mappings":"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"}

package/dist/internal/cursor/account-mcp.js

@@ -27,8 +27,12 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { bearerAuth } from "../../channels.js";
 import { isCursorAccountTransport } from "../../types.js";
+import { probeConnectorAuthUrls } from "../cursor-account-mcp-auth.js";
+import { LOG_PREFIX } from "../distribution.js";
 import { handleStatelessMcpRequest } from "../mcp-endpoint.js";
 import { isLoopbackAddress } from "../net.js";
+import { sanitizeMcpToolName, suffixMcpToolName, } from "../sanitize-mcp-tool-name.js";
+import { colorEnabledFor, formatTerminalBox, stdoutPalette, terminalHyperlink, } from "../terminal-style.js";
 /** Catalog freshness window; a miss inside it re-uses the cached listing. */
 const CATALOG_TTL_MS = 60000;
 /**
@@ -36,8 +40,10 @@ const CATALOG_TTL_MS = 60000;
  * a model hallucinating tool names cannot turn into a backend hot loop.
  */
 const FORCE_REFRESH_MIN_INTERVAL_MS = 5000;
-/** MCP clients commonly enforce `^[a-zA-Z0-9_-]{1,128}$` for tool names. */
-const MAX_TOOL_NAME_LENGTH = 128;
+/** Dashboard Integrations & MCP — reconnect team / account connectors. */
+export const CURSOR_ACCOUNT_MCP_DASHBOARD_URL = "https://cursor.com/dashboard/integrations";
+/** Cursor app Settings → MCP (Connect / Authenticate on the named row). */
+export const CURSOR_ACCOUNT_MCP_SETTINGS_DEEPLINK = "cursor://anysphere.cursor-deeplink/customize?tab=mcp";
 /**
  * Collect `cursorAccount` connections across `mounts`, grouped by mount
  * slug. Purely structural — per-connector validation happens live against
@@ -85,12 +91,13 @@ export function resolveCursorAccountConnections(args) {
 }
 export class CursorAccountMcpBridge {
     constructor(args) {
-        var _a;
+        var _a, _b;
         /** Per-boot shared secret; resolved connections carry it as a bearer. */
         this.secret = randomBytes(32).toString("hex");
         this.catalogs = new Map();
         this.client = args.client;
         this.logger = (_a = args.logger) !== null && _a !== void 0 ? _a : (() => { });
+        this.palette = (_b = args.palette) !== null && _b !== void 0 ? _b : stdoutPalette();
         this.secretPolicy = bearerAuth(this.secret);
         this.allowRemoteCallers = args.allowRemoteCallers === true;
     }
@@ -129,9 +136,9 @@ export class CursorAccountMcpBridge {
     }
     /**
      * Startup DX: log the account's connector statuses for `refs` without
-     * blocking serve startup. Surfaces "needsAuth" / "error" connectors with
-     * remediation hints (and a backend probe detail for `error`), and filters
-     * that matched nothing (typo'd connector names).
+     * blocking serve startup. Healthy catalogs stay a one-line summary;
+     * `needsAuth` / `error` / empty catalogs render a yellow warning box with
+     * reconnect URLs.
      *
      * Returns a promise that settles when every ref's log lines are written —
      * callers may ignore it; tests can await it.
@@ -143,44 +150,46 @@ export class CursorAccountMcpBridge {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const catalog = yield this.getCatalog(ref);
-                if (catalog.servers.length === 0) {
-                    this.logger(`[agent-sdk] Cursor account MCP connection "${ref.name}": no matching connectors on this account — connect servers in Cursor (dashboard → MCP) or fix the \`servers\` filter`);
+                const errorDetails = new Map();
+                const needsAuthNames = catalog.servers
+                    .filter((server) => server.status === "needsAuth")
+                    .map((server) => server.serverIdentifier);
+                const [authUrls] = yield Promise.all([
+                    probeConnectorAuthUrls({
+                        client: this.client,
+                        identifiers: needsAuthNames,
+                    }),
+                    Promise.all(catalog.servers
+                        .filter((server) => server.status === "error")
+                        .map((server) => __awaiter(this, void 0, void 0, function* () {
+                        const detail = yield diagnoseConnectorError(this.client, server.serverIdentifier);
+                        if (detail !== undefined) {
+                            errorDetails.set(server.serverIdentifier, detail);
+                        }
+                    }))),
+                ]);
+                const unhealthy = catalog.servers.some((server) => server.status === "needsAuth" || server.status === "error");
+                if (catalog.servers.length === 0 || unhealthy) {
+                    this.logger(formatCursorAccountMcpWarningBox({
+                        connectionName: ref.name,
+                        servers: catalog.servers.map((server) => ({
+                            serverIdentifier: server.serverIdentifier,
+                            status: server.status,
+                            toolCount: server.tools.length,
+                            errorDetail: errorDetails.get(server.serverIdentifier),
+                            authUrl: authUrls.get(server.serverIdentifier),
+                        })),
+                        palette: this.palette,
+                    }));
                     return;
                 }
-                const errorDetails = new Map();
-                yield Promise.all(catalog.servers
-                    .filter((server) => server.status === "error")
-                    .map((server) => __awaiter(this, void 0, void 0, function* () {
-                    const detail = yield diagnoseConnectorError(this.client, server.serverIdentifier);
-                    if (detail !== undefined) {
-                        errorDetails.set(server.serverIdentifier, detail);
-                    }
-                })));
                 const summary = catalog.servers
                     .map((server) => formatServerStatusSummary(server, errorDetails.get(server.serverIdentifier)))
                     .join(", ");
-                this.logger(`[agent-sdk] Cursor account MCP connection "${ref.name}": ${summary}`);
-                const needsAuth = catalog.servers.filter((server) => server.status === "needsAuth");
-                if (needsAuth.length > 0) {
-                    this.logger(`[agent-sdk] Cursor account MCP connection "${ref.name}": ${needsAuth
-                        .map((server) => server.serverIdentifier)
-                        .join(", ")} need re-authorization in Cursor (dashboard → MCP / Settings → MCP) before their tools appear`);
-                }
-                const errored = catalog.servers.filter((server) => server.status === "error");
-                if (errored.length > 0) {
-                    const details = errored
-                        .map((server) => {
-                        const detail = errorDetails.get(server.serverIdentifier);
-                        return detail === undefined
-                            ? server.serverIdentifier
-                            : `${server.serverIdentifier} (${detail})`;
-                    })
-                        .join("; ");
-                    this.logger(`[agent-sdk] Cursor account MCP connection "${ref.name}": ${details} — Cursor backend could not use this connector (not a missing agent-sdk login). Re-check the server in Cursor dashboard → MCP, confirm the URL is healthy, and retry after the backend can reach it`);
-                }
+                this.logger(`${LOG_PREFIX} Cursor account MCP connection "${ref.name}": ${summary}`);
             }
             catch (error) {
-                this.logger(`[agent-sdk] Cursor account MCP connection "${ref.name}" preflight failed: ${describeError(error)}`);
+                this.logger(`${LOG_PREFIX} Cursor account MCP connection "${ref.name}" preflight failed: ${describeError(error)}`);
             }
         });
     }
@@ -192,11 +201,9 @@ export class CursorAccountMcpBridge {
         server.setRequestHandler(ListToolsRequestSchema, () => __awaiter(this, void 0, void 0, function* () {
             const catalog = yield this.getCatalog(ref);
             return {
-                tools: catalog.tools.map((tool) => ({
-                    name: tool.exposedName,
-                    description: tool.description,
-                    inputSchema: tool.inputSchema,
-                })),
+                tools: catalog.tools.map((tool) => (Object.assign({ name: tool.exposedName, description: tool.description, inputSchema: tool.inputSchema }, (tool.outputSchema === undefined
+                    ? {}
+                    : { outputSchema: tool.outputSchema })))),
             };
         }));
         server.setRequestHandler(CallToolRequestSchema, (request) => __awaiter(this, void 0, void 0, function* () {
@@ -308,7 +315,7 @@ function buildCatalog(servers) {
     const byBase = new Map();
     for (const server of servers) {
         for (const tool of server.tools) {
-            const base = sanitizeToolName(tool.name);
+            const base = sanitizeMcpToolName(tool.name);
             const group = byBase.get(base);
             const item = { serverIdentifier: server.serverIdentifier, tool };
             if (group === undefined) {
@@ -335,45 +342,118 @@ function buildCatalog(servers) {
         });
         group.forEach(({ serverIdentifier, tool }, index) => {
             let suffixIndex = index;
-            let exposedName = suffixToolName(base, suffixIndex);
+            let exposedName = suffixMcpToolName(base, suffixIndex);
             while (byExposedName.has(exposedName)) {
                 suffixIndex++;
-                exposedName = suffixToolName(base, suffixIndex);
+                exposedName = suffixMcpToolName(base, suffixIndex);
             }
-            const entry = {
-                exposedName,
-                backendName: tool.name,
-                serverIdentifier,
-                description: tool.description,
-                inputSchema: tool.inputSchema,
-            };
+            const entry = Object.assign({ exposedName, backendName: tool.name, serverIdentifier, description: tool.description, inputSchema: tool.inputSchema }, (tool.outputSchema === undefined
+                ? {}
+                : { outputSchema: tool.outputSchema }));
             tools.push(entry);
             byExposedName.set(entry.exposedName, entry);
         });
     }
     return { servers, tools, byExposedName };
 }
-/** Connector display names can contain anything (spaces, dots, emoji). */
-function sanitizeToolName(name) {
-    const cleaned = name
-        .replace(/[^a-zA-Z0-9_-]/g, "_")
-        .slice(0, MAX_TOOL_NAME_LENGTH);
-    return cleaned === "" ? "tool" : cleaned;
-}
-/** `base` for the first claimant, `base_2` / `base_3` … for colliders. */
-function suffixToolName(base, index) {
-    if (index === 0) {
-        return base;
-    }
-    const suffix = `_${index + 1}`;
-    return `${base.slice(0, MAX_TOOL_NAME_LENGTH - suffix.length)}${suffix}`;
-}
 function trimTrailingSlash(url) {
     return url.endsWith("/") ? url.slice(0, -1) : url;
 }
 function describeError(error) {
     return error instanceof Error ? error.message : String(error);
 }
+const MAX_ERROR_DETAIL_CHARS = 72;
+function truncateDetail(detail) {
+    const trimmed = detail.trim();
+    if (trimmed.length <= MAX_ERROR_DETAIL_CHARS) {
+        return trimmed;
+    }
+    return `${trimmed.slice(0, MAX_ERROR_DETAIL_CHARS - 1)}…`;
+}
+function formatWarningStatusRow(server, nameWidth, hyperlinks) {
+    const name = server.serverIdentifier.padEnd(nameWidth);
+    switch (server.status) {
+        case "needsAuth":
+            return `${name}  ${terminalHyperlink(connectUrl(server.authUrl), "Connect", hyperlinks)}`;
+        case "connected":
+            return `${name}  ${server.toolCount} tools`;
+        case "error": {
+            const detail = server.errorDetail === undefined || server.errorDetail.trim() === ""
+                ? "backend could not reach connector"
+                : truncateDetail(server.errorDetail);
+            return `${name}  error: ${detail}`;
+        }
+        default:
+            return `${name}  ${server.status}`;
+    }
+}
+function connectUrl(authUrl) {
+    var _a;
+    const minted = (_a = authUrl === null || authUrl === void 0 ? void 0 : authUrl.trim()) !== null && _a !== void 0 ? _a : "";
+    if (minted.startsWith("https://") &&
+        !minted.includes("\u001b") &&
+        !minted.includes("\u0007")) {
+        return minted;
+    }
+    return CURSOR_ACCOUNT_MCP_DASHBOARD_URL;
+}
+/**
+ * Yellow warning panel for unhealthy / missing Cursor-account connectors.
+ * One box replaces the old stacked `[agent-sdk]` log lines.
+ */
+export function formatCursorAccountMcpWarningBox(args) {
+    var _a, _b;
+    const palette = (_a = args.palette) !== null && _a !== void 0 ? _a : stdoutPalette();
+    const hyperlinks = (_b = args.hyperlinks) !== null && _b !== void 0 ? _b : colorEnabledFor();
+    const copy = warningCopy(Object.assign(Object.assign({}, args), { hyperlinks }));
+    return `\n${formatTerminalBox([copy.title, "", ...copy.intro, ...copy.actions], {
+        color: palette.yellow,
+        padding: 2,
+    })}`;
+}
+function warningCopy(args) {
+    const empty = args.servers.length === 0;
+    const hasAuth = args.servers.some((server) => server.status === "needsAuth");
+    const hasError = args.servers.some((server) => server.status === "error");
+    const nameWidth = Math.max(0, ...args.servers.map((server) => server.serverIdentifier.length));
+    const statusRows = args.servers.map((server) => formatWarningStatusRow(server, nameWidth, args.hyperlinks));
+    const links = [
+        `  ${CURSOR_ACCOUNT_MCP_SETTINGS_DEEPLINK}`,
+        `  ${CURSOR_ACCOUNT_MCP_DASHBOARD_URL}`,
+    ];
+    const restart = "Then press Enter to restart this serve.";
+    if (empty) {
+        return {
+            title: "No matching MCP connectors",
+            intro: [
+                `No matching connectors on this account ("${args.connectionName}").`,
+            ],
+            actions: [
+                "",
+                "Connect servers in Cursor, or fix the `servers` filter.",
+                ...links,
+            ],
+        };
+    }
+    if (hasAuth && !hasError) {
+        return {
+            title: "MCP authorization needed",
+            intro: statusRows,
+            actions: ["", restart, "", "Or reconnect at:", ...links],
+        };
+    }
+    return {
+        title: hasAuth ? "MCP authorization needed" : "MCP connector error",
+        intro: statusRows,
+        actions: [
+            "",
+            "Re-check the server URL is healthy, then reconnect at:",
+            ...links,
+            "",
+            restart,
+        ],
+    };
+}
 /** One-line status for the preflight summary (`name (12 tools)` / `name (error: …)`). */
 export function formatServerStatusSummary(server, errorDetail) {
     switch (server.status) {