@cursor/july 0.1.100 → 0.1.102

package/dist/internal/discovery/tools.js

@@ -0,0 +1,159 @@
+/**
+ * `agent/tools/*.ts`: typed tools and the built-in tools appended after them.
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { join } from "node:path";
+import { builtinTools } from "../builtin-tools/index.js";
+import { toolInputJsonSchema, toolOutputJsonSchema } from "../json-schema.js";
+import { displayPath, errorMessage, isBlank, } from "./context.js";
+import { importDefault, moduleEntries } from "./modules.js";
+export function loadTools(ctx, toolsDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tools = [];
+        for (const { name, path } of yield moduleEntries(ctx, toolsDir, "tool")) {
+            const definition = yield importDefault(ctx, path, "tool");
+            if (definition === undefined) {
+                continue;
+            }
+            const tool = compileTool(ctx, path, name, definition);
+            if (tool !== undefined) {
+                tools.push(tool);
+            }
+        }
+        return tools;
+    });
+}
+/**
+ * Validate one tool definition against the tool contract and convert its
+ * schemas. Diagnostics point at `entryPath` (the authored file, or the
+ * extension mount that contributed the tool).
+ */
+export function compileTool(ctx, entryPath, name, tool) {
+    if (isBlank(tool.description)) {
+        ctx.diagnostics.push({
+            severity: "error",
+            path: displayPath(ctx, entryPath),
+            message: "Tools require a non-empty description.",
+        });
+        return undefined;
+    }
+    const execution = tool.execution === "agent" ? "agent" : "server";
+    const needsApprovalConfigured = tool.needsApproval === true || typeof tool.needsApproval === "function";
+    const effect = declaredEffect(tool);
+    if (execution === "agent") {
+        if (isBlank(tool.script)) {
+            ctx.diagnostics.push({
+                severity: "error",
+                path: displayPath(ctx, entryPath),
+                message: 'Tools with execution: "agent" require a non-empty `script` (shell body; JSON on stdin, result on stdout).',
+            });
+            return undefined;
+        }
+        if (typeof tool.execute === "function") {
+            ctx.diagnostics.push({
+                severity: "warning",
+                path: displayPath(ctx, entryPath),
+                message: '`execute` is ignored when execution is "agent"; the Cursor agent runs `script` instead.',
+            });
+        }
+        if (needsApprovalConfigured) {
+            ctx.diagnostics.push({
+                severity: "error",
+                path: displayPath(ctx, entryPath),
+                message: '`needsApproval` is only supported for execution: "server" tools (in-process).',
+            });
+            return undefined;
+        }
+    }
+    else if (typeof tool.execute !== "function") {
+        ctx.diagnostics.push({
+            severity: "error",
+            path: displayPath(ctx, entryPath),
+            message: 'Tools require an execute(input, ctx) function (or set execution: "agent" with a script).',
+        });
+        return undefined;
+    }
+    let inputSchema;
+    try {
+        inputSchema = toolInputJsonSchema(tool.inputSchema);
+    }
+    catch (error) {
+        ctx.diagnostics.push({
+            severity: "error",
+            path: displayPath(ctx, entryPath),
+            message: `Failed to convert inputSchema to JSON Schema: ${errorMessage(error)}`,
+        });
+        return undefined;
+    }
+    let outputSchema;
+    try {
+        outputSchema = toolOutputJsonSchema(tool.outputSchema);
+    }
+    catch (error) {
+        ctx.diagnostics.push({
+            severity: "error",
+            path: displayPath(ctx, entryPath),
+            message: `Failed to convert outputSchema to JSON Schema: ${errorMessage(error)}`,
+        });
+        return undefined;
+    }
+    return {
+        name,
+        description: tool.description,
+        inputSchema,
+        outputSchema,
+        execution,
+        needsApproval: needsApprovalConfigured,
+        effect,
+        script: execution === "agent" ? tool.script : undefined,
+        definition: tool,
+    };
+}
+/**
+ * Static view of a tool's `effect` for the manifest: the literal when it is
+ * one, `"dynamic"` for a per-call predicate, `undefined` when undeclared. A
+ * malformed value is left undeclared rather than guessed — undeclared is the
+ * safe state (a dry run stubs it), where a guess could be the unsafe one.
+ */
+function declaredEffect(tool) {
+    if (typeof tool.effect === "function") {
+        return "dynamic";
+    }
+    return tool.effect === "read" || tool.effect === "write"
+        ? tool.effect
+        : undefined;
+}
+/**
+ * Append enabled built-in tools after authored tools. Authored tools with
+ * the same name win.
+ */
+export function appendBuiltinTools(ctx, agentDir, tools, config) {
+    const builtin = builtinTools(config);
+    if (builtin.length === 0) {
+        return;
+    }
+    const agentPath = displayPath(ctx, join(agentDir, "agent.ts"));
+    for (const tool of builtin) {
+        const existing = tools.find((t) => t.name === tool.name);
+        if (existing !== undefined) {
+            const owner = existing.extension === undefined
+                ? "Authored"
+                : `Extension "${existing.extension}"`;
+            ctx.diagnostics.push({
+                severity: "warning",
+                path: agentPath,
+                message: `${owner} tool "${tool.name}" shadows the built-in tool of the same name; the built-in is skipped.`,
+            });
+            continue;
+        }
+        tools.push(tool);
+    }
+}

package/dist/internal/discovery.d.ts

@@ -4,67 +4,13 @@
  * manifest. Identity comes from the path — a tool at `agent/tools/foo.ts`
  * is named `foo`, a subagent at `agent/subagents/researcher/` is named
  * `researcher` — so no definition carries a `name` field.
+ *
+ * The loaders live under `./discovery/`, one module per authored slot;
+ * this module is the public surface the CLI, server, and tests import.
  */
-import { type AgentArchitecture, type AgentProject, type AgentProjectInfo, type AgentRuntime, type Diagnostic } from "../types.js";
-export interface LoadAgentProjectOptions {
-    /** Override the module loader (embedders / tests). */
-    importModule?: (absolutePath: string) => Promise<Record<string, unknown>>;
-}
-/**
- * True when `dir` looks like an agent project root: it has a nested `agent/`
- * directory, or flat-layout markers (`agent.ts` / `instructions.md`) directly
- * inside it.
- */
-export declare function isAgentProjectDir(dir: string): Promise<boolean>;
-/** One immediate child agent directory under a multi-agent parent. */
-export interface ChildAgentDir {
-    slug: string;
-    dir: string;
-}
-/**
- * List agent projects directly under `rootDir` (one level deep) without
- * loading them. Empty when the path is missing or has no child agents.
- * Slug rules match {@link loadAgentProjects} / multi-agent serve.
- */
-export declare function listChildAgentDirs(rootDir: string): Promise<ChildAgentDir[]>;
-/**
- * Discover the agent projects directly under `rootDir` (one level deep):
- * each immediate child directory that is itself an agent project becomes a
- * mounted agent, keyed by a slug derived from its directory name. Used for
- * multi-agent serving, where one server hosts many agents under
- * `/<slug>/...`. Throws when no child projects are found.
- */
-export declare function loadAgentProjects(rootDir: string, options?: LoadAgentProjectOptions): Promise<Array<{
-    slug: string;
-    project: AgentProject;
-}>>;
-/**
- * Resolve mounts for `serve` / CLI. Defaults to multi-agent layout:
- * - `mode: "single"` — one agent at `/v1/*` (empty slug).
- * - otherwise, if `rootDir` is itself an agent project — one agent under
- *   `/<dirname>/...`.
- * - otherwise, every immediate child agent project under `/<slug>/...`.
- */
-export declare function resolveAgentMounts(rootDir: string, options?: LoadAgentProjectOptions & {
-    mode?: "single" | "multi";
-}): Promise<Array<{
-    slug: string;
-    project: AgentProject;
-}>>;
-/** URL path segments reserved by the server; agents cannot use them as slugs. */
-export declare const RESERVED_SLUGS: Set<string>;
-export declare function loadAgentProject(dir: string, options?: LoadAgentProjectOptions): Promise<AgentProject>;
-/** True when the project has diagnostics that must block serving. */
-export declare function hasErrorDiagnostics(project: AgentProject): boolean;
-export declare function formatDiagnostics(diagnostics: Diagnostic[]): string;
-export declare function runtimeArchitectureCompatibilityError(agent: {
-    runtime: AgentRuntime;
-    architecture?: AgentArchitecture;
-}): string | undefined;
-/**
- * Advertise the first non-empty, non-code-fence line of the body, with any
- * leading `#`, `>`, `*`, or `-` markers stripped.
- */
-export declare function deriveSkillDescription(markdown: string): string | undefined;
-export declare function projectInfo(project: AgentProject): AgentProjectInfo;
+export { runtimeArchitectureCompatibilityError } from "./discovery/agent-config.js";
+export type { LoadAgentProjectOptions } from "./discovery/context.js";
+export { projectInfo } from "./discovery/info.js";
+export { type ChildAgentDir, formatDiagnostics, hasErrorDiagnostics, isAgentProjectDir, listChildAgentDirs, loadAgentProject, loadAgentProjects, RESERVED_SLUGS, resolveAgentMounts, } from "./discovery/project.js";
+export { deriveSkillDescription } from "./discovery/skills.js";
 //# sourceMappingURL=discovery.d.ts.map

package/dist/internal/discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/internal/discovery.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAkBH,OAAO,EACL,KAAK,iBAAiB,EAItB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,YAAY,EAQjB,KAAK,UAAU,EA0BhB,MAAM,aAAa,CAAC;AAgCrB,MAAM,WAAW,uBAAuB;IACtC,sDAAsD;IACtD,YAAY,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC3E;AAmBD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASrE;AAED,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,EAAE,CAAC,CA2B1B;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CA6BzD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAAuB,GAAG;IACjC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CACtB,GACL,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CAgBzD;AAWD,iFAAiF;AACjF,eAAO,MAAM,cAAc,EAAE,GAAG,CAAC,MAAM,CAIrC,CAAC;AAEH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,YAAY,CAAC,CA0EvB;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE;AAyOD,wBAAgB,qCAAqC,CAAC,KAAK,EAAE;IAC3D,OAAO,EAAE,YAAY,CAAC;IACtB,YAAY,CAAC,EAAE,iBAAiB,CAAC;CAClC,GAAG,MAAM,GAAG,SAAS,CAIrB;AA6nBD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiB3E;AA6iCD,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CAgKnE"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/internal/discovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,qCAAqC,EAAE,MAAM,6BAA6B,CAAC;AACpF,YAAY,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,KAAK,aAAa,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC"}