@cursor/july 0.1.17 → 0.1.19

package/dist/internal/cursor-event-relay.d.ts

@@ -11,6 +11,28 @@
  */
 import { RelayOffsetStore } from "./cursor-relay-core.js";
 export { RelayOffsetStore };
+/**
+ * Comment snapshot from scm-events compact metadata. Carries what the GitHub
+ * channel's `issue_comment` / `pull_request_review_comment` Zod schemas
+ * require so relayed comment wakes parse without re-fetching the comment.
+ */
+export type CursorScmCommentMeta = {
+    id: number;
+    body: string;
+    htmlUrl: string;
+    authorLogin?: string;
+    /**
+     * GitHub `user.type` ("User", "Bot", …). Carried onto the stubbed
+     * `comment.user` / `sender` so `isGitHubAppBotAuthor` keeps recognizing
+     * the agent's own comments on the relay path (self/bot-loop gate).
+     */
+    authorType?: string;
+    /** Review comments only. */
+    path?: string;
+    line?: number;
+    pullRequestReviewId?: number;
+    inReplyToId?: number;
+};
 /** PR snapshot from scm-events compact metadata (Sand-style; no raw body). */
 export type CursorScmPullRequestMeta = {
     number: number;
@@ -45,6 +67,11 @@ export interface CursorScmEvent {
      * stub a Zod-valid GitHub `pull_request` webhook body.
      */
     pullRequest?: CursorScmPullRequestMeta;
+    /**
+     * Comment snapshot when the backend saw `body.comment`. Enough to stub a
+     * Zod-valid `issue_comment` / `pull_request_review_comment` webhook body.
+     */
+    comment?: CursorScmCommentMeta;
     /** GitHub-side event time from the payload, when present. */
     occurredAtMs?: number;
 }
@@ -80,6 +107,8 @@ export declare function formatCursorScmEventLog(event: {
  * Minimal GitHub webhook body from an SCM-events metadata envelope.
  * When `pullRequest` has title + head/base refs+shas, emits a Zod-valid
  * `pull_request` object for `onPullRequest`; otherwise identity-only stubs.
+ * When `comment` is present, emits a Zod-valid `comment` object so relayed
+ * `issue_comment` / `pull_request_review_comment` deliveries dispatch.
  */
 export declare function scmMetadataToGitHubPayload(event: {
     repo: string;
@@ -87,6 +116,7 @@ export declare function scmMetadataToGitHubPayload(event: {
     prNumber?: number;
     prUrl?: string;
     pullRequest?: CursorScmPullRequestMeta;
+    comment?: CursorScmCommentMeta;
 }): Record<string, unknown>;
 /**
  * GitHub SCM-events relay: a thin {@link CursorRelayCore} adapter. Consumers

package/dist/internal/cursor-event-relay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor-event-relay.d.ts","sourceRoot":"","sources":["../../src/internal/cursor-event-relay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAGL,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAE5B,8EAA8E;AAC9E,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,mEAAmE;AACnE,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,WAAW,CAAC,EAAE,wBAAwB,CAAC;IACvC,6DAA6D;IAC7D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AASD,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,2CAA2C;IAC3C,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,kFAAkF;AAClF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAgBT;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,wBAAwB,CAAC;CACxC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuE1B;AAED;;;GAGG;AACH,qBAAa,gBAAgB;IAUf,OAAO,CAAC,QAAQ,CAAC,OAAO;IATpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkC;IACvD;;;;OAIG;IACH,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAExD,YAA6B,OAAO,EAAE,uBAAuB,EAwD5D;IAED;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAatB,KAAK,IAAI,IAAI,CAEZ;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1B;CACF"}
+{"version":3,"file":"cursor-event-relay.d.ts","sourceRoot":"","sources":["../../src/internal/cursor-event-relay.ts"],"names":[],"mappings":"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"}

package/dist/internal/cursor-event-relay.js

@@ -40,6 +40,8 @@ export function formatCursorScmEventLog(event) {
  * Minimal GitHub webhook body from an SCM-events metadata envelope.
  * When `pullRequest` has title + head/base refs+shas, emits a Zod-valid
  * `pull_request` object for `onPullRequest`; otherwise identity-only stubs.
+ * When `comment` is present, emits a Zod-valid `comment` object so relayed
+ * `issue_comment` / `pull_request_review_comment` deliveries dispatch.
  */
 export function scmMetadataToGitHubPayload(event) {
     var _a, _b, _c;
@@ -59,6 +61,41 @@ export function scmMetadataToGitHubPayload(event) {
         },
     };
     payload.action = event.action;
+    const commentMeta = event.comment;
+    if (commentMeta !== undefined) {
+        const comment = {
+            id: commentMeta.id,
+            body: commentMeta.body,
+            html_url: commentMeta.htmlUrl,
+        };
+        if (commentMeta.authorLogin !== undefined) {
+            const author = {
+                login: commentMeta.authorLogin,
+            };
+            if (commentMeta.authorType !== undefined) {
+                // Without user.type the isGitHubAppBotAuthor gate fails open and the
+                // agent's own relayed comments could wake it again (bot loop).
+                author.type = commentMeta.authorType;
+            }
+            comment.user = author;
+            // The comment author is the closest thing the envelope has to the
+            // webhook sender; channels use it for self/bot-loop gates.
+            payload.sender = Object.assign({}, author);
+        }
+        if (commentMeta.path !== undefined) {
+            comment.path = commentMeta.path;
+        }
+        if (commentMeta.line !== undefined) {
+            comment.line = commentMeta.line;
+        }
+        if (commentMeta.pullRequestReviewId !== undefined) {
+            comment.pull_request_review_id = commentMeta.pullRequestReviewId;
+        }
+        if (commentMeta.inReplyToId !== undefined) {
+            comment.in_reply_to_id = commentMeta.inReplyToId;
+        }
+        payload.comment = comment;
+    }
     const title = prMeta === null || prMeta === void 0 ? void 0 : prMeta.title;
     const headRef = prMeta === null || prMeta === void 0 ? void 0 : prMeta.headRef;
     const headSha = prMeta === null || prMeta === void 0 ? void 0 : prMeta.headSha;

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;AAgBH,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAMrB,KAAK,UAAU,EAqBhB,MAAM,aAAa,CAAC;AAqBrB,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,CAoBzD;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,CA8DvB;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE;AA8nBD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiB3E;AAgmBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CAoInE"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/internal/discovery.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgBH,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAQrB,KAAK,UAAU,EAqBhB,MAAM,aAAa,CAAC;AAsBrB,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,CAoBzD;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,CA8DvB;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE;AAuoBD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiB3E;AAwoBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CAoInE"}

package/dist/internal/discovery.js

@@ -34,6 +34,7 @@ import { cursorAccountServersHasMixedWildcard, DEFAULT_MODEL, MAX_RUNNING_TURNS_
 import { registerAuthoredModuleLoaders } from "./authored-loaders.js";
 import { normalizePositiveInt } from "./bounded-int.js";
 import { getDefinitionKind } from "./brand.js";
+import { builtinTools } from "./builtin-tools/index.js";
 import { isValidCron } from "./cron.js";
 import { parseFrontmatter } from "./frontmatter.js";
 import { isReservedSecretName, MAX_EGRESS_DOMAINS, validateEgressDomain, validateSecretName, } from "./hosting.js";
@@ -253,6 +254,13 @@ function loadAgent(ctx, agentDir, options) {
         // warn that they exist.
         if (!options.isRoot) {
             yield warnUnsupportedSubagentSlots(ctx, agentDir);
+            if ((config === null || config === void 0 ? void 0 : config.builtinTools) !== undefined) {
+                ctx.diagnostics.push({
+                    severity: "warning",
+                    path: displayPath(ctx, join(agentDir, "agent.ts")),
+                    message: "builtinTools is not supported on subagents; ignoring.",
+                });
+            }
             return Object.assign(Object.assign(Object.assign(Object.assign({ name }, ((config === null || config === void 0 ? void 0 : config.description) === undefined
                 ? {}
                 : { description: config.description })), ((config === null || config === void 0 ? void 0 : config.model) === undefined ? {} : { model: config.model })), (instructions === undefined ? {} : { instructions })), { runtime: "local", tools: [], skills: [], connections: [], subagents: [], seedFiles: [] });
@@ -294,6 +302,7 @@ function loadAgent(ctx, agentDir, options) {
                 hasCloudOptions: cloud !== undefined,
             });
         }
+        appendBuiltinTools(ctx, agentDir, tools, config === null || config === void 0 ? void 0 : config.builtinTools, runtime);
         return {
             name,
             description: config === null || config === void 0 ? void 0 : config.description,
@@ -939,6 +948,38 @@ function warnUnsupportedSubagentSlots(ctx, subagentDir) {
         }
     });
 }
+/**
+ * Append enabled built-in tools after authored tools. Authored tools with
+ * the same name win; built-ins are server tools, so cloud runtimes get a
+ * warning instead of tools.
+ */
+function appendBuiltinTools(ctx, agentDir, tools, config, runtime) {
+    const builtin = builtinTools(config);
+    if (builtin.length === 0) {
+        return;
+    }
+    const agentPath = displayPath(ctx, join(agentDir, "agent.ts"));
+    if (runtime === "cloud") {
+        ctx.diagnostics.push({
+            severity: "warning",
+            path: agentPath,
+            message: "builtinTools are in-process server tools and are not available on cloud agents; they are skipped.",
+        });
+        return;
+    }
+    const authored = new Set(tools.map((tool) => tool.name));
+    for (const tool of builtin) {
+        if (authored.has(tool.name)) {
+            ctx.diagnostics.push({
+                severity: "warning",
+                path: agentPath,
+                message: `Authored tool "${tool.name}" shadows the built-in tool of the same name; the authored tool wins.`,
+            });
+            continue;
+        }
+        tools.push(tool);
+    }
+}
 function warnCloudRuntimeLimitations(ctx, agentDir, counts) {
     const agentPath = displayPath(ctx, join(agentDir, "agent.ts"));
     if (!counts.hasCloudOptions) {

package/dist/internal/install-cursor-skills.d.ts

@@ -8,6 +8,8 @@
  */
 /** Category folder under ~/.cursor/skills (Cursor discovers nested skills). */
 export declare const CURSOR_SKILLS_NAMESPACE = "agentkit";
+/** How long the `init` offer waits for an answer before skipping the install. */
+export declare const SKILL_PROMPT_TIMEOUT_MS = 45000;
 export interface PackageSkill {
     /** Frontmatter `name` (e.g. agentkit-create-agent). */
     name: string;
@@ -35,30 +37,70 @@ export declare function findMissingCursorSkills(options?: {
     packageRoot?: string;
     skillsHome?: string;
 }): Promise<PackageSkill[]>;
+export interface SkillInstallResult {
+    /** Leaf dirs written. */
+    installed: string[];
+    /** Leaf dirs deleted because the package no longer ships them. */
+    removed: string[];
+}
 /**
  * Copy each skill directory into `skillsHome/agentkit/<leafDir>/`.
  * Always overwrites so a package upgrade refreshes local Cursor skills.
  * Strips monorepo-only frontmatter and removes leaf dirs no longer shipped.
  */
-export declare function installCursorSkills(skills: readonly PackageSkill[], skillsHome?: string): Promise<string[]>;
+export declare function installCursorSkills(skills: readonly PackageSkill[], skillsHome?: string): Promise<SkillInstallResult>;
 /** Drop monorepo `paths` globs and fix package doc links for ~/.cursor installs. */
 export declare function prepareSkillMarkdownForCursorInstall(content: string): string;
+export interface SkillInstallPlan {
+    shipped: PackageSkill[];
+    /** Resolved `~/.cursor/skills`, to install into. */
+    skillsHome: string;
+    /** Install target: `<skillsHome>/agentkit`. */
+    directory: string;
+    /** Leaf dirs the package ships. */
+    leaves: string[];
+    /** Nothing installed yet, so this is a fresh install rather than a refresh. */
+    firstInstall: boolean;
+    /** Installed leaf dirs the package dropped; installing deletes them. */
+    orphans: string[];
+}
+/** What an install would do, for the offer and for `install-skills`. */
+export declare function planSkillInstall(options?: {
+    packageRoot?: string;
+    skillsHome?: string;
+}): Promise<SkillInstallPlan>;
+/** `Installed 9 agentkit skills`, what it dropped, and where it went. */
+export declare function formatSkillInstall(plan: SkillInstallPlan, result: SkillInstallResult): string;
 export interface OfferInstallCursorSkillsOptions {
     /** Skip when false (non-TTY / `--json`). */
     interactive?: boolean;
     packageRoot?: string;
     skillsHome?: string;
-    /** Injected yes/no for tests. */
-    confirm?: (question: string) => Promise<boolean>;
+    /** Injected yes/no for tests. `undefined` means the prompt went unanswered. */
+    confirm?: (question: string) => Promise<boolean | undefined>;
     out?: (text: string) => void;
 }
 /**
  * On a TTY, offer to install/update every shipped package skill into
  * ~/.cursor/skills/agentkit (always overwriting). No-op when non-interactive
- * or the package ships no skills.
+ * or the package ships no skills. An unanswered prompt skips the install
+ * rather than blocking the caller — see `SKILL_PROMPT_TIMEOUT_MS`.
  */
 export declare function offerInstallCursorSkills(options?: OfferInstallCursorSkillsOptions): Promise<{
     installed: string[];
     skipped: boolean;
 }>;
+export interface PromptYesNoOptions {
+    defaultYes: boolean;
+    out: (text: string) => void;
+    /** Give up after this long; `0` (or omitted) waits forever. */
+    timeoutMs?: number;
+    /** Answer source; defaults to `process.stdin`. */
+    input?: NodeJS.ReadableStream;
+}
+/**
+ * Ask a yes/no question. Resolves `undefined` when the answer never comes —
+ * the prompt timed out, or stdin closed on an empty line.
+ */
+export declare function promptYesNo(question: string, options: PromptYesNoOptions): Promise<boolean | undefined>;
 //# sourceMappingURL=install-cursor-skills.d.ts.map

package/dist/internal/install-cursor-skills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install-cursor-skills.d.ts","sourceRoot":"","sources":["../../src/internal/install-cursor-skills.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAmBH,+EAA+E;AAC/E,eAAO,MAAM,uBAAuB,aAAa,CAAC;AAElD,MAAM,WAAW,YAAY;IAC3B,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,GAAE,MAAsC,GAC3C,MAAM,CAGR;AAED,wEAAwE;AACxE,wBAAgB,uBAAuB,CACrC,UAAU,GAAE,MAA2B,GACtC,MAAM,CAER;AAED,mEAAmE;AACnE,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,EACpC,UAAU,GAAE,MAA2B,GACtC,MAAM,CAER;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,WAAW,GAAE,MAAyB,GACrC,OAAO,CAAC,YAAY,EAAE,CAAC,CA2BzB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,CAAC,EAAE;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAY1B;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,UAAU,GAAE,MAA2B,GACtC,OAAO,CAAC,MAAM,EAAE,CAAC,CAiCnB;AAED,oFAAoF;AACpF,wBAAgB,oCAAoC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAY5E;AAoBD,MAAM,WAAW,+BAA+B;IAC9C,4CAA4C;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iCAAiC;IACjC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,GAAE,+BAAoC,GAC5C,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA+CpD"}
+{"version":3,"file":"install-cursor-skills.d.ts","sourceRoot":"","sources":["../../src/internal/install-cursor-skills.ts"],"names":[],"mappings":"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"}

package/dist/internal/install-cursor-skills.js

@@ -18,12 +18,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { access, cp, mkdir, readdir, readFile, rm, writeFile, } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { packageRootDir } from "./distribution.js";
+import { CLI_COMMAND_NAME, packageRootDir } from "./distribution.js";
 import { stdoutPalette } from "./terminal-style.js";
 /** Monorepo-only skill; excluded from the published package. */
 const SKIP_SKILL_DIRS = new Set(["operate"]);
 /** Category folder under ~/.cursor/skills (Cursor discovers nested skills). */
 export const CURSOR_SKILLS_NAMESPACE = "agentkit";
+/** How long the `init` offer waits for an answer before skipping the install. */
+export const SKILL_PROMPT_TIMEOUT_MS = 45000;
 export function cursorSkillsHome(home) {
     var _a;
     if (home === void 0) { home = (_a = process.env.HOME) !== null && _a !== void 0 ? _a : homedir(); }
@@ -105,21 +107,9 @@ export function installCursorSkills(skills_1) {
     return __awaiter(this, arguments, void 0, function* (skills, skillsHome = cursorSkillsHome()) {
         const namespaceDir = agentkitCursorSkillsDir(skillsHome);
         yield mkdir(namespaceDir, { recursive: true });
-        const shippedLeaves = new Set(skills.map((skill) => skill.leafDir));
-        let existingLeaves = [];
-        try {
-            const entries = yield readdir(namespaceDir, { withFileTypes: true });
-            existingLeaves = entries
-                .filter((entry) => entry.isDirectory())
-                .map((entry) => entry.name);
-        }
-        catch (_a) {
-            existingLeaves = [];
-        }
-        for (const leaf of existingLeaves) {
-            if (!shippedLeaves.has(leaf)) {
-                yield rm(join(namespaceDir, leaf), { recursive: true, force: true });
-            }
+        const removed = yield orphanLeaves(namespaceDir, skills);
+        for (const leaf of removed) {
+            yield rm(join(namespaceDir, leaf), { recursive: true, force: true });
         }
         const installed = [];
         for (const skill of skills) {
@@ -133,7 +123,23 @@ export function installCursorSkills(skills_1) {
             }
             installed.push(skill.leafDir);
         }
-        return installed;
+        return { installed, removed };
+    });
+}
+/** Installed leaf dirs the package no longer ships. Installing deletes these. */
+function orphanLeaves(namespaceDir, skills) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const shipped = new Set(skills.map((skill) => skill.leafDir));
+        let entries;
+        try {
+            entries = yield readdir(namespaceDir, { withFileTypes: true });
+        }
+        catch (_a) {
+            return [];
+        }
+        return entries
+            .filter((entry) => entry.isDirectory() && !shipped.has(entry.name))
+            .map((entry) => entry.name);
     });
 }
 /** Drop monorepo `paths` globs and fix package doc links for ~/.cursor installs. */
@@ -166,48 +172,88 @@ function stripPathsFromFrontmatter(frontmatter) {
     }
     return out.join("\n");
 }
+/** What an install would do, for the offer and for `install-skills`. */
+export function planSkillInstall(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const skillsHome = (_a = options === null || options === void 0 ? void 0 : options.skillsHome) !== null && _a !== void 0 ? _a : cursorSkillsHome();
+        const directory = agentkitCursorSkillsDir(skillsHome);
+        const shipped = yield listShippedPackageSkills(options === null || options === void 0 ? void 0 : options.packageRoot);
+        const missing = yield findMissingCursorSkills({
+            packageRoot: options === null || options === void 0 ? void 0 : options.packageRoot,
+            skillsHome,
+        });
+        return {
+            shipped,
+            skillsHome,
+            directory,
+            leaves: shipped.map((skill) => skill.leafDir),
+            firstInstall: missing.length === shipped.length,
+            orphans: yield orphanLeaves(directory, shipped),
+        };
+    });
+}
+/** `Installed 9 agentkit skills`, what it dropped, and where it went. */
+export function formatSkillInstall(plan, result) {
+    const noun = result.installed.length === 1 ? "skill" : "skills";
+    const verb = plan.firstInstall ? "Installed" : "Updated";
+    const lines = [`${verb} ${result.installed.length} agentkit ${noun}`];
+    if (result.removed.length > 0) {
+        lines.push(`  removed:  ${result.removed.join(", ")}`);
+    }
+    lines.push(`  location: ${plan.directory}`);
+    return `${lines.join("\n")}\n`;
+}
 /**
  * On a TTY, offer to install/update every shipped package skill into
  * ~/.cursor/skills/agentkit (always overwriting). No-op when non-interactive
- * or the package ships no skills.
+ * or the package ships no skills. An unanswered prompt skips the install
+ * rather than blocking the caller — see `SKILL_PROMPT_TIMEOUT_MS`.
  */
 export function offerInstallCursorSkills() {
     return __awaiter(this, arguments, void 0, function* (options = {}) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const out = (_a = options.out) !== null && _a !== void 0 ? _a : ((text) => process.stdout.write(text));
         const interactive = (_b = options.interactive) !== null && _b !== void 0 ? _b : (process.stdin.isTTY === true && process.stdout.isTTY === true);
-        const shipped = yield listShippedPackageSkills(options.packageRoot);
-        if (shipped.length === 0) {
+        if (!interactive) {
             return { installed: [], skipped: true };
         }
-        const home = (_c = options.skillsHome) !== null && _c !== void 0 ? _c : cursorSkillsHome();
-        const targetDir = agentkitCursorSkillsDir(home);
-        const missing = yield findMissingCursorSkills({
+        const plan = yield planSkillInstall({
             packageRoot: options.packageRoot,
-            skillsHome: home,
+            skillsHome: options.skillsHome,
         });
-        const names = shipped.map((skill) => skill.leafDir).join(", ");
-        const noun = shipped.length === 1 ? "skill" : "skills";
-        const verb = missing.length === shipped.length ? "Install" : "Update";
-        const question = `${verb} ${shipped.length} agentkit ${noun} in ${targetDir}?`;
-        if (!interactive) {
+        if (plan.shipped.length === 0) {
             return { installed: [], skipped: true };
         }
+        const noun = plan.shipped.length === 1 ? "skill" : "skills";
+        const verb = plan.firstInstall ? "Install" : "Update";
         const c = stdoutPalette();
-        out(`${question}\n`);
-        out(c.dim(`  ${names}\n`));
-        if (missing.length < shipped.length) {
+        out(`${verb} ${plan.shipped.length} agentkit ${noun} in ${plan.directory}?\n`);
+        out(c.dim(`  ${plan.leaves.join(", ")}\n`));
+        if (!plan.firstInstall) {
             out(c.dim("  (overwrites existing copies with the package version)\n"));
         }
-        const confirm = (_d = options.confirm) !== null && _d !== void 0 ? _d : ((q) => promptYesNo(q, { defaultYes: true, out }));
-        const accepted = yield confirm(missing.length === shipped.length ? "Install now?" : "Update now?");
-        if (!accepted) {
-            out(c.dim("Skipped skill install.\n\n"));
+        if (plan.orphans.length > 0) {
+            out(c.dim(`  (deletes ${plan.orphans.join(", ")})\n`));
+        }
+        const confirm = (_c = options.confirm) !== null && _c !== void 0 ? _c : ((q) => promptYesNo(q, {
+            defaultYes: true,
+            out,
+            timeoutMs: SKILL_PROMPT_TIMEOUT_MS,
+        }));
+        const accepted = yield confirm(`${verb} now?`);
+        if (accepted !== true) {
+            // `undefined` is the prompt timing out or stdin closing; both mean nobody
+            // said yes, so do not claim a duration neither case is guaranteed to have.
+            const why = accepted === undefined
+                ? "No answer — skipped the skill install."
+                : "Skipped skill install.";
+            out(c.dim(`${why}\nInstall later: ${CLI_COMMAND_NAME} install-skills (${plan.directory})\n\n`));
             return { installed: [], skipped: true };
         }
-        const installed = yield installCursorSkills(shipped, home);
-        out(`${verb === "Install" ? "Installed" : "Updated"} ${installed.length} ${noun} in ${targetDir}\n\n`);
-        return { installed, skipped: false };
+        const result = yield installCursorSkills(plan.shipped, plan.skillsHome);
+        out(`${formatSkillInstall(plan, result)}\n`);
+        return { installed: result.installed, skipped: false };
     });
 }
 function parseSkillName(skillMd) {
@@ -228,14 +274,24 @@ function parseSkillName(skillMd) {
     // Strip optional quotes around the YAML scalar.
     return raw.replace(/^["']|["']$/g, "");
 }
-function promptYesNo(question, options) {
+/**
+ * Ask a yes/no question. Resolves `undefined` when the answer never comes —
+ * the prompt timed out, or stdin closed on an empty line.
+ */
+export function promptYesNo(question, options) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const hint = options.defaultYes ? "Y/n" : "y/N";
+        const input = (_a = options.input) !== null && _a !== void 0 ? _a : process.stdin;
         options.out(`${question} [${hint}] `);
-        process.stdin.resume();
-        const line = yield readOneLine(process.stdin);
-        process.stdin.pause();
-        if (line === undefined || line.trim() === "") {
+        input.resume();
+        const line = yield readOneLine(input, options.timeoutMs);
+        input.pause();
+        if (line === undefined) {
+            options.out("\n");
+            return undefined;
+        }
+        if (line.trim() === "") {
             return options.defaultYes;
         }
         const answer = line.trim().toLowerCase();
@@ -248,9 +304,11 @@ function promptYesNo(question, options) {
         return options.defaultYes;
     });
 }
-function readOneLine(stream) {
+/** The line, or `undefined` when the stream ends or the clock runs out first. */
+function readOneLine(stream, timeoutMs) {
     return new Promise((resolve) => {
         let buffer = "";
+        let timer;
         const onData = (chunk) => {
             buffer += typeof chunk === "string" ? chunk : chunk.toString("utf8");
             const newline = buffer.indexOf("\n");
@@ -260,15 +318,25 @@ function readOneLine(stream) {
             cleanup();
             resolve(buffer.slice(0, newline).replace(/\r$/, ""));
         };
-        const onEnd = () => {
+        // EOF and the timeout both land here. A tty holds a half-typed line until
+        // Enter, so a non-empty buffer only ever happens on piped input.
+        const giveUp = () => {
             cleanup();
             resolve(buffer === "" ? undefined : buffer.replace(/\r$/, ""));
         };
         const cleanup = () => {
+            if (timer !== undefined) {
+                clearTimeout(timer);
+            }
             stream.off("data", onData);
-            stream.off("end", onEnd);
+            stream.off("end", giveUp);
         };
         stream.on("data", onData);
-        stream.on("end", onEnd);
+        stream.on("end", giveUp);
+        if (timeoutMs !== undefined && timeoutMs > 0) {
+            timer = setTimeout(giveUp, timeoutMs);
+            // Never keep the process alive purely to wait for an answer.
+            timer.unref();
+        }
     });
 }

package/dist/internal/reminder-runner.d.ts

@@ -42,6 +42,13 @@ export declare class ReminderRunner {
     cancel(id: string, reason?: string): Promise<ReminderInfo | undefined>;
     /** Cancel all armed reminders matching a continuation token (e.g. PR closed). */
     cancelForContinuation(continuationToken: string, reason: string): Promise<number>;
+    /**
+     * Re-key armed reminders when a channel rotates a session's continuation
+     * token (the built-in HTTP channel rotates after every follow-up). Without
+     * this, a reminder armed before the rotation misses its session at fire
+     * time and disarms as `session_gone`.
+     */
+    rekeyContinuation(channelId: string, oldToken: string, newToken: string): Promise<number>;
     /** Fire one reminder immediately (dev / hillclimb). */
     dispatch(reminderId: string): Promise<{
         reminderId: string;

package/dist/internal/reminder-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reminder-runner.d.ts","sourceRoot":"","sources":["../../src/internal/reminder-runner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAEV,mBAAmB,EAGnB,YAAY,EAEb,MAAM,aAAa,CAAC;AASrB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,qBAAa,oBAAqB,SAAQ,KAAK;IAG3C,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE;IAFzC,YACE,UAAU,EAAE,MAAM,EACT,oBAAoB,EAAE,MAAM,EAAE,EAIxC;CACF;AAyDD,qBAAa,cAAc;IAUvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,uEAAuE;IACvE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,OAAO,CAAC,OAAO,CAAS;IAExB,YACmB,MAAM,EAAE,aAAa,EACrB,MAAM,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAe,EAG3D;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,sEAAsE;IAChE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CA+B3B;IAED;;;OAGG;YACW,kBAAkB;IA6BhC,8EAA8E;YAChE,OAAO;IAKrB,IAAI,IAAI,IAAI,CAOX;IAEK,MAAM,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC,CA8D9D;IAEK,IAAI,CAAC,MAAM,CAAC,EAAE;QAClB,MAAM,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CA4B1B;IAEK,MAAM,CACV,EAAE,EAAE,MAAM,EACV,MAAM,SAAoB,GACzB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAkBnC;IAED,iFAAiF;IAC3E,qBAAqB,CACzB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAUjB;IAED,uDAAuD;IACjD,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAC1C,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC;QAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAQD;IAED,OAAO,CAAC,QAAQ;IA4ChB,OAAO,CAAC,UAAU;YAQJ,IAAI;YA6GJ,aAAa;IAY3B,OAAO,CAAC,eAAe;IAsBvB;;;OAGG;YACW,mBAAmB;YAcnB,aAAa;YAcb,YAAY;IA0C1B,OAAO,CAAC,gBAAgB;IAyDxB,OAAO,CAAC,iBAAiB;YAeX,MAAM;YAYN,SAAS;CAoFxB;AAGD,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"reminder-runner.d.ts","sourceRoot":"","sources":["../../src/internal/reminder-runner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAEV,mBAAmB,EAGnB,YAAY,EAEb,MAAM,aAAa,CAAC;AASrB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,qBAAa,oBAAqB,SAAQ,KAAK;IAG3C,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE;IAFzC,YACE,UAAU,EAAE,MAAM,EACT,oBAAoB,EAAE,MAAM,EAAE,EAIxC;CACF;AAyDD,qBAAa,cAAc;IAUvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,uEAAuE;IACvE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,OAAO,CAAC,OAAO,CAAS;IAExB,YACmB,MAAM,EAAE,aAAa,EACrB,MAAM,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAe,EAG3D;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,sEAAsE;IAChE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CA+B3B;IAED;;;OAGG;YACW,kBAAkB;IA6BhC,8EAA8E;YAChE,OAAO;IAKrB,IAAI,IAAI,IAAI,CAOX;IAEK,MAAM,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC,CA8D9D;IAEK,IAAI,CAAC,MAAM,CAAC,EAAE;QAClB,MAAM,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CA4B1B;IAEK,MAAM,CACV,EAAE,EAAE,MAAM,EACV,MAAM,SAAoB,GACzB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAkBnC;IAED,iFAAiF;IAC3E,qBAAqB,CACzB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAUjB;IAED;;;;;OAKG;IACG,iBAAiB,CACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAkBjB;IAED,uDAAuD;IACjD,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAC1C,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC;QAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAQD;IAED,OAAO,CAAC,QAAQ;IA4ChB,OAAO,CAAC,UAAU;YAQJ,IAAI;YA6GJ,aAAa;IAY3B,OAAO,CAAC,eAAe;IAsBvB;;;OAGG;YACW,mBAAmB;YAcnB,aAAa;YAcb,YAAY;IA0C1B,OAAO,CAAC,gBAAgB;IAyDxB,OAAO,CAAC,iBAAiB;YAeX,MAAM;YAYN,SAAS;CAoFxB;AAGD,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/internal/reminder-runner.js

@@ -279,6 +279,27 @@ export class ReminderRunner {
             return n;
         });
     }
+    /**
+     * Re-key armed reminders when a channel rotates a session's continuation
+     * token (the built-in HTTP channel rotates after every follow-up). Without
+     * this, a reminder armed before the rotation misses its session at fire
+     * time and disarms as `session_gone`.
+     */
+    rekeyContinuation(channelId, oldToken, newToken) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const armed = yield this.store.listArmed();
+            let n = 0;
+            for (const record of armed) {
+                if (record.channelId !== channelId ||
+                    record.continuationToken !== oldToken) {
+                    continue;
+                }
+                yield this.persist(Object.assign(Object.assign({}, record), { continuationToken: newToken, updatedAt: new Date().toISOString() }));
+                n += 1;
+            }
+            return n;
+        });
+    }
     /** Fire one reminder immediately (dev / hillclimb). */
     dispatch(reminderId) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/internal/sdk-runner.d.ts

@@ -44,6 +44,13 @@ export interface CursorSdkRunnerOptions {
     /** Diagnostics for degraded paths (resume-miss fallback). */
     logger?: (line: string) => void;
 }
+/**
+ * The backend's `NotLoggedIn` copy ("Authentication error" title, "try
+ * logging out and back in." detail) as it surfaces through SDK RunResults.
+ * Deliberately narrow: this gates a one-shot in-place retry, and matching
+ * broader error text would retry turns that a fresh transport cannot fix.
+ */
+export declare function isAuthErrorMessage(message: string | undefined): boolean;
 export declare class CursorSdkRunner implements AgentRunner {
     private readonly options;
     private readonly agents;
@@ -51,6 +58,7 @@ export declare class CursorSdkRunner implements AgentRunner {
     private readonly prewarmReleases;
     constructor(options?: CursorSdkRunnerOptions);
     runTurn(request: RunnerTurnRequest): Promise<TurnOutcome>;
+    private runTurnAttempt;
     /**
      * Build the local executor for a workspace before any session asks for it.
      * The warmed executor is reference counted, so the lease is held until
@@ -59,6 +67,13 @@ export declare class CursorSdkRunner implements AgentRunner {
     prewarm(request: RunnerPrewarmRequest): Promise<PrewarmOutcome>;
     dispose(): Promise<void>;
     private getAgent;
+    /**
+     * Drop a cached handle and close it best-effort to release its transport
+     * and executor lease. Identity-checked so a turn that lost a race with a
+     * newer open cannot evict the replacement handle.
+     */
+    private evictAgent;
+    private log;
     private requireApiKey;
     private buildSharedOptions;
     /**

package/dist/internal/sdk-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-runner.d.ts","sourceRoot":"","sources":["../../src/internal/sdk-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAOL,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,SAAS,EAEf,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AAErB,2EAA2E;AAC3E,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1D;;;;;OAKG;IACH,OAAO,CAAC,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACjE,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,iBAAiB,EACf,cAAc,GACd,gBAAgB,GAChB,SAAS,GACT,YAAY,GACZ,WAAW,GACX,OAAO,CACV,CAAC;AAEF,6EAA6E;AAC7E,MAAM,MAAM,cAAc,GACtB;IAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAcxD,MAAM,WAAW,sBAAsB;IACrC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,6DAA6D;IAC7D,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,qBAAa,eAAgB,YAAW,WAAW;IAKrC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+C;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkC;IAElE,YAA6B,OAAO,GAAE,sBAA2B,EAAI;IAE/D,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CA0D9D;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,CAepE;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAU7B;IAED,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,kBAAkB;IAc1B;;;OAGG;YACW,iBAAiB;YAkBjB,SAAS;YAOT,cAAc;YA6Bd,cAAc;IAqC5B,OAAO,CAAC,QAAQ;CAUjB;AAED,4EAA4E;AAC5E,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAMT;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,GAAG,cAAc,CAQpE;AAmED,wBAAgB,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,CAExE"}
+{"version":3,"file":"sdk-runner.d.ts","sourceRoot":"","sources":["../../src/internal/sdk-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAOL,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,SAAS,EAEf,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AAErB,2EAA2E;AAC3E,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1D;;;;;OAKG;IACH,OAAO,CAAC,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACjE,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,iBAAiB,EACf,cAAc,GACd,gBAAgB,GAChB,SAAS,GACT,YAAY,GACZ,WAAW,GACX,OAAO,CACV,CAAC;AAEF,6EAA6E;AAC7E,MAAM,MAAM,cAAc,GACtB;IAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAcxD,MAAM,WAAW,sBAAsB;IACrC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,6DAA6D;IAC7D,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAwBD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAKvE;AAED,qBAAa,eAAgB,YAAW,WAAW;IAKrC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+C;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkC;IAElE,YAA6B,OAAO,GAAE,sBAA2B,EAAI;IAE/D,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAkC9D;YAEa,cAAc;IAyE5B;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,CAepE;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAY7B;IAED,OAAO,CAAC,QAAQ;IA0BhB;;;;OAIG;IACH,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,kBAAkB;IAc1B;;;OAGG;YACW,iBAAiB;YAkBjB,SAAS;YAOT,cAAc;YA6Bd,cAAc;IAqC5B,OAAO,CAAC,QAAQ;CAUjB;AAED,4EAA4E;AAC5E,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAMT;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,GAAG,cAAc,CAQpE;AAmED,wBAAgB,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,CAExE"}