@cursor/july 0.1.35 → 0.1.36

package/src/files-backends/agent-store-presigned-url.ts

@@ -5,6 +5,7 @@
  * root is a barrel over the whole library, and bundling through it inlines
  * every module the barrel can reach (sync engine, local sqlite index, secure
  * open) into the published tarball. This module has no imports of its own, so
- * the bundle stays limited to the validator.
+ * the bundle stays limited to the validator. The bundler resolves that entry
+ * via the `anysphere-source` export so it does not need a prebuilt `dist/`.
  */
 export { createAgentStorePresignedUrlValidatorForBackend } from "@anysphere/agent-store-sync/presigned-url";

package/src/internal/cli-github.ts

@@ -42,6 +42,7 @@ import {
   synthesizeGitHubEvent,
 } from "../channels/github/replay.js";
 import { resolveAgentMounts } from "./discovery.js";
+import { CLI_COMMAND_NAME as CLI } from "./distribution.js";
 import { startFanoutServer } from "./github-fanout.js";
 
 const execFileAsync = promisify(execFile);
@@ -88,21 +89,21 @@ export interface GithubCliOptions {
   out?: string;
 }
 
-const GITHUB_HELP = `agent-serve github — forward live GitHub webhooks to a local agent
+const GITHUB_HELP = `${CLI} github — forward live GitHub webhooks to a local agent
 
 Usage:
-  agent-serve github forward  [--dir .] [--slug S] [--channel C]
+  ${CLI} github forward  [--dir .] [--slug S] [--channel C]
                               [--repo owner/repo | --org ORG]
                               [--events a,b,c] [--url URL]
                               [--host 127.0.0.1] [--port 3000]
                               [--secret S] [--install]
-  agent-serve github replay   <pr_url|owner/repo#N> [--events a,b,c | *]
+  ${CLI} github replay   <pr_url|owner/repo#N> [--events a,b,c | *]
                               [--action A] [--conclusion C] [--comment "…"]
                               [--context CTX] [--dir .] [--slug S] [--channel C]
                               [--host H] [--port N] [--url URL] [--secret S]
                               [--dry-run] [--out DIR] [--json]
-  agent-serve github events   [--dir .] [--host H] [--port N] [--json]
-  agent-serve github doctor   [--install] [--json]
+  ${CLI} github events   [--dir .] [--host H] [--port N] [--json]
+  ${CLI} github doctor   [--install] [--json]
 
 Commands:
   forward   Run \`gh webhook forward\` for the discovered githubChannel()s.
@@ -122,8 +123,8 @@ Commands:
 
 Prerequisites:
   - gh CLI logged in (\`gh auth login\`).
-  - ${GITHUB_WEBHOOK_EXTENSION} extension (\`agent-serve github doctor --install\`).
-  - The agent already serving (\`agent-serve serve --dir . --dev\`).
+  - ${GITHUB_WEBHOOK_EXTENSION} extension (\`${CLI} github doctor --install\`).
+  - The agent already serving (\`${CLI} serve --dir . --dev\`).
 
 Notes:
   - Set GITHUB_WEBHOOK_SECRET (or pass --secret) so the forwarded deliveries

package/src/internal/cli-slack.ts

@@ -71,22 +71,22 @@ export interface SlackCliOptions {
   err?: (text: string) => void;
 }
 
-const SLACK_HELP = `agent-serve slack — Slack channel pack helpers (Socket Mode)
+const SLACK_HELP = `${CLI} slack — Slack channel pack helpers (Socket Mode)
 
 Usage:
-  agent-serve slack setup
-  agent-serve slack create    [--dir .] [--name NAME] [--slack-team T0123ABCD]
+  ${CLI} slack setup
+  ${CLI} slack create    [--dir .] [--name NAME] [--slack-team T0123ABCD]
                                 [--prod] [--team <id>] [--icon URL-or-FILE]
                                 [--force] [--prefix PREFIX | --no-prefix] [--json]
-  agent-serve slack destroy   [--dir .] [--slack-team T0123ABCD] [--prod]
+  ${CLI} slack destroy   [--dir .] [--slack-team T0123ABCD] [--prod]
                                 [--team <id>] [--json]
-  agent-serve slack icon      <URL-or-FILE> [--dir .] [--slack-team T0123ABCD]
+  ${CLI} slack icon      <URL-or-FILE> [--dir .] [--slack-team T0123ABCD]
                                 [--prod] [--team <id>] [--json]
-  agent-serve slack init      [--dir .] [--name NAME] [--prefix PREFIX | --no-prefix]
+  ${CLI} slack init      [--dir .] [--name NAME] [--prefix PREFIX | --no-prefix]
                                 [--channel-posts]
-  agent-serve slack manifest --env dev|prod|both [--dir .] [--name NAME]
+  ${CLI} slack manifest --env dev|prod|both [--dir .] [--name NAME]
                                 [--print]
-  agent-serve slack doctor [--dir .] [--prefix PREFIX | --no-prefix] [--json]
+  ${CLI} slack doctor [--dir .] [--prefix PREFIX | --no-prefix] [--json]
 
 create/destroy/icon — Cursor "Add to Slack" managed provisioning:
   create   One-command Path B setup: connects the Slack workspace (browser
@@ -94,7 +94,7 @@ create/destroy/icon — Cursor "Add to Slack" managed provisioning:
            Socket Mode app from the generated manifest, writes the token
            pair into <dir>/.env.local, then runs doctor (prose mode; --json
            reports without the doctor pass). Requires
-           \`agent-serve login\` (or CURSOR_API_KEY) and the feature gate.
+           \`${CLI} login\` (or CURSOR_API_KEY) and the feature gate.
            --prod provisions the prod app (default dev); --slack-team picks
            the workspace when several are connected. --icon sets the app's
            icon (best-effort: a bad icon warns, never fails the create).

package/src/internal/event-mapper.ts

@@ -11,6 +11,8 @@ import type {
 import type { SessionEventPayload, TurnUsage } from "../types.js";
 
 const CUSTOM_TOOLS_PROVIDER = "custom-user-tools";
+/** Authored server tools on cloud turns; keep in sync with `SERVER_TOOLS_MCP_SERVER_NAME`. */
+const SERVER_TOOLS_PROVIDER = "agentsdk-tools";
 
 /**
  * Nested interaction updates from a task/subagent tool-call-delta.
@@ -354,16 +356,19 @@ export class TurnEventMapper {
 }
 
 /**
- * Human-meaningful tool identity for stream events. In-process tools calls
- * arrive as MCP calls against the synthetic `custom-user-tools` server; they
- * surface under the customer's bare tool name.
+ * Human-meaningful tool identity for stream events. Authored server tools
+ * arrive as MCP calls against `custom-user-tools` (local) or `agentsdk-tools`
+ * (cloud); both surface under the customer's bare tool name.
  */
 export function describeToolCall(toolCall: ToolCall): ToolCallDescription {
   switch (toolCall.type) {
     case "mcp": {
       const providerIdentifier = toolCall.args.providerIdentifier;
       const toolName = toolCall.args.toolName;
-      if (providerIdentifier === CUSTOM_TOOLS_PROVIDER) {
+      if (
+        providerIdentifier === CUSTOM_TOOLS_PROVIDER ||
+        providerIdentifier === SERVER_TOOLS_PROVIDER
+      ) {
         return {
           toolName: toolName ?? "custom-tool",
           args: toolCall.args.args,

package/src/internal/session-engine.ts

@@ -1467,9 +1467,9 @@ export class SessionEngine {
         // including agent tool script bodies. On hosted deployments the
         // shared memory journal is on the store mount — say where. When the
         // turn carries the session-bound server-tool MCP endpoint, the
-        // preamble also catalogs server tools under that MCP server name;
-        // without it a model told to "use <server tool>" finds no script
-        // and improvises a local substitute instead of calling the host.
+        // preamble catalogs server tools under that MCP server name *before*
+        // the agent-tool "write the script if missing" recipe, so a model
+        // told to "use <server tool>" calls MCP instead of inventing a .sh.
         const preamble = buildAgentsMdContent(agent, {
           includeScripts: true,
           serverToolsMcpName:

package/src/internal/workspace.ts

@@ -129,6 +129,7 @@ export function buildAgentToolsCatalog(
     "",
     "These tools run in the agent environment (not on the agent-serve host).",
     "Pass a JSON object on stdin matching the input schema; read the result from stdout.",
+    "Only the tools in this section are scripts. Do not create, edit, or run a script for any other tool name.",
     "",
   ];
 
@@ -170,10 +171,10 @@ export function buildAgentToolsCatalog(
  *
  * Server tools execute on the serve host and reach cloud turns only as MCP
  * tools on {@link SERVER_TOOLS_MCP_SERVER_NAME}. Instructions reference them
- * by bare name, and the agent-tool catalog teaches a "recreate the script if
- * missing" pattern — without this section a cloud model that cannot find a
- * script for a server tool improvises a local substitute instead of calling
- * the real tool, so its host-side effects silently never happen.
+ * by bare name. The agent-tool catalog still teaches "write the script if
+ * missing" for *agent* tools; this section must come first on cloud and
+ * say that server tools are MCP-only, or the model copies that recipe onto
+ * a host tool and the host-side marker never appears.
  */
 export function buildServerToolsCatalog(
   tools: DiscoveredTool[],
@@ -187,8 +188,9 @@ export function buildServerToolsCatalog(
   const parts: string[] = [
     "## Server tools",
     "",
-    `These tools execute on the agent-serve host, not in this environment. They are available ONLY as MCP tools on the \`${options.mcpServerName}\` MCP server — list that server's tools and call them by name through your MCP tooling.`,
-    "There are no local scripts for these tools. NEVER create, edit, or run a local script or other substitute for them: a local re-implementation cannot produce their real effects on the host.",
+    `These tools execute on the agent-serve host, not in this environment. They are available ONLY as MCP tools on the \`${options.mcpServerName}\` MCP server.`,
+    "Call them through your MCP tooling: list that server's tools, then invoke the tool by its exact name (GetMcpTools / CallMcpTool, or the equivalent). There is no `.agent-serve/tools/<name>.sh` for any tool in this section.",
+    `If the \`${options.mcpServerName}\` server is not in your MCP server list, stop and report that. Do not write, edit, or run a local script or other substitute. A local re-implementation cannot produce the host-side marker, logs, or session events.`,
     "",
   ];
 
@@ -217,8 +219,10 @@ export function buildServerToolsCatalog(
  *
  * `serverToolsMcpName` is cloud-only: when the turn's MCP config carries the
  * session-bound server-tool endpoint, the catalog names that server so the
- * model calls the real tools instead of inventing local stand-ins. Local
- * runtimes omit it — there the harness exposes server tools natively.
+ * model calls the real tools instead of inventing local stand-ins. It is
+ * emitted *before* the agent-tool catalog so "write the script if missing"
+ * cannot be read as applying to server-tool names. Local runtimes omit it —
+ * there the harness exposes server tools natively.
  */
 export function buildAgentsMdContent(
   agent: ResolvedAgent,
@@ -227,14 +231,14 @@ export function buildAgentsMdContent(
   return [
     agent.instructions?.trim() ?? "",
     buildIdentitySection(agent),
-    buildAgentToolsCatalog(agent.tools, {
-      includeScripts: options.includeScripts,
-    }),
     options.serverToolsMcpName === undefined
       ? ""
       : buildServerToolsCatalog(agent.tools, {
           mcpServerName: options.serverToolsMcpName,
         }),
+    buildAgentToolsCatalog(agent.tools, {
+      includeScripts: options.includeScripts,
+    }),
   ]
     .filter((part) => part !== "")
     .join("\n\n");