@cursor/july 0.1.96 → 0.1.99

package/src/channels/origin/origin-channel.ts

@@ -10,7 +10,9 @@ import {
   continuationSource,
   normalizeIdentity,
 } from "../../internal/continuation-identity.js";
+import { isDeferredChannelSession } from "../../internal/deferred-channel-session.js";
 import { isDevMode } from "../../internal/dev-mode.js";
+import { attachHostedAdmissionAdapter } from "../../internal/hosted-admission-adapter.js";
 import { bindLocalIngressSend } from "../../internal/local-ingress.js";
 import type {
   AgentCloudOptions,
@@ -306,6 +308,7 @@ export function parseOriginPullRequestEvent(input: {
       repository,
       pullRequestNumber: number,
       pullRequestUrl: url,
+      pullRequestAuthor: author,
       payload,
       sender: originSender(input.envelope, payload),
     },
@@ -432,16 +435,43 @@ function enrichEventContext(input: {
     origin: buildOriginBinding({
       repository: input.ctx.repository,
       installationId: input.ctx.installationId,
+      cursorAccount:
+        input.options.cursorAccount !== undefined &&
+        input.options.cursorAccount !== false,
       app: input.options.app,
     }),
   };
 }
 
+export type OriginDispatchOutcome = "skip" | "send" | "task";
+
+const dispatchOutcomeByResponse = new WeakMap<
+  Response,
+  OriginDispatchOutcome
+>();
+
+function withDispatchOutcome(
+  response: Response,
+  outcome: OriginDispatchOutcome
+): Response {
+  dispatchOutcomeByResponse.set(response, outcome);
+  return response;
+}
+
+export function getOriginDispatchOutcome(
+  response: Response
+): OriginDispatchOutcome | undefined {
+  return dispatchOutcomeByResponse.get(response);
+}
+
 function skipped(
   reason: string,
   extra: Record<string, unknown> = {}
 ): Response {
-  return Response.json({ ok: true, skipped: true, reason, ...extra });
+  return withDispatchOutcome(
+    Response.json({ ok: true, skipped: true, reason, ...extra }),
+    "skip"
+  );
 }
 
 function acknowledgeTask(
@@ -458,9 +488,12 @@ function acknowledgeTask(
       });
     })
   );
-  return Response.json(
-    { ok: true, dispatched: true, mode: "task", ...extra },
-    { status: 202 }
+  return withDispatchOutcome(
+    Response.json(
+      { ok: true, dispatched: true, mode: "task", ...extra },
+      { status: 202 }
+    ),
+    "task"
   );
 }
 
@@ -481,12 +514,26 @@ async function startTurn(input: {
     title: input.dispatch.title ?? defaultOriginTitle(input.ctx),
     ...(input.cloud === undefined ? {} : { cloud: input.cloud }),
   });
-  return Response.json({
-    ok: true,
-    sessionId: session.id,
-    isNew: session.isNew,
-    continuationToken: session.continuationToken,
-  });
+  if (isDeferredChannelSession(session)) {
+    // Hosted admission captured the send; the control plane allocates the
+    // session after acknowledgement, so there is nothing to report yet.
+    return withDispatchOutcome(
+      Response.json(
+        { ok: true, dispatched: true, mode: "turn" },
+        { status: 202 }
+      ),
+      "send"
+    );
+  }
+  return withDispatchOutcome(
+    Response.json({
+      ok: true,
+      sessionId: session.id,
+      isNew: session.isNew,
+      continuationToken: session.continuationToken,
+    }),
+    "send"
+  );
 }
 
 async function resolveCloudOptions(
@@ -808,6 +855,27 @@ export function originChannel(
     ],
   });
   originChannelOptionsByDefinition.set(definition, channelOptions);
+  attachHostedAdmissionAdapter(definition, {
+    kind: ORIGIN_CHANNEL_KIND,
+    dispatch: async ({ payload, args }) => {
+      const envelope = parseOriginWebhookEnvelope(payload);
+      if (envelope === null) {
+        return Response.json(
+          { ok: false, error: "invalid_origin_payload" },
+          { status: 400 }
+        );
+      }
+      return dispatchOriginWebhook({
+        options: channelOptions,
+        envelope,
+        args,
+      });
+    },
+    getOutcome: (response) => {
+      const outcome = getOriginDispatchOutcome(response);
+      return outcome === "skip" || outcome === "task" ? outcome : undefined;
+    },
+  });
   if (usesCursorAccount) {
     registerOriginCursorAccountRuntime(definition, {
       options: channelOptions,

package/src/channels/origin/reactions.ts

@@ -0,0 +1,82 @@
+/**
+ * Origin PR comment reactions — the Origin analogue of the GitHub channel's
+ * `thread.react("eyes")`.
+ *
+ * Unlike checks and comments, reactions have no `/v1/origin/...` REST
+ * binding. The only write is Connect unary JSON against Origin's first-party
+ * service (`origin.v1.OriginService/SetCommentReaction`), which lives on a
+ * different host than the public REST API — {@link originRpcBaseUrl}, not
+ * {@link originPublicApiBaseUrl}. `ctx.origin.reactToComment` already points
+ * at the right one; a hand-built client must too.
+ *
+ * Writing needs `repository:pull_requests:reviews:write`: an `oit_…`
+ * installation token for app channels, or a deployment service-account
+ * session (hosted v2 forks). Origin rejects reactions on comments that
+ * belong to an unsubmitted review. API failures throw `OriginApiError`.
+ */
+
+import type { OriginApiMethod } from "./api.js";
+
+/** Any client that can call Origin's ConnectRPC host. */
+export interface OriginReactionClient {
+  request<T = unknown>(input: {
+    method: OriginApiMethod;
+    path: string;
+    body?: unknown;
+  }): Promise<T>;
+}
+
+/** Connect unary route backing {@link setOriginCommentReaction}. */
+export const SET_ORIGIN_COMMENT_REACTION_PATH =
+  "/origin.v1.OriginService/SetCommentReaction";
+
+/**
+ * The eight reactions Origin accepts. Anything else is rejected with
+ * `invalid_argument`, so channels get a compile error instead of a 400.
+ */
+export const ORIGIN_COMMENT_REACTIONS = [
+  "👍",
+  "👎",
+  "😄",
+  "🎉",
+  "😕",
+  "❤️",
+  "🚀",
+  "👀",
+] as const;
+
+export type OriginCommentReaction = (typeof ORIGIN_COMMENT_REACTIONS)[number];
+
+export interface OriginCommentReactionInput {
+  /** Origin comment TypeID (`cmt_…`), i.e. `comment.id` on a comment hook. */
+  commentId: string;
+  emoji: OriginCommentReaction;
+  /** `false` removes the reaction. Removing one that is absent is a no-op. */
+  active?: boolean;
+}
+
+/**
+ * Add (or, with `active: false`, remove) one reaction on an Origin PR
+ * comment as the client's own principal.
+ *
+ * ```ts
+ * await setOriginCommentReaction({
+ *   origin: createOriginClient({ apiBaseUrl: originRpcBaseUrl() }),
+ *   commentId: comment.id,
+ *   emoji: "👀",
+ * });
+ * ```
+ */
+export async function setOriginCommentReaction(
+  input: OriginCommentReactionInput & { origin: OriginReactionClient }
+): Promise<void> {
+  await input.origin.request({
+    method: "POST",
+    path: SET_ORIGIN_COMMENT_REACTION_PATH,
+    body: {
+      commentId: input.commentId,
+      emoji: input.emoji,
+      active: input.active ?? true,
+    },
+  });
+}

package/src/channels/origin/types.ts

@@ -58,6 +58,11 @@ export interface OriginEventContext {
   repository: OriginRepositoryRef;
   pullRequestNumber: number;
   pullRequestUrl: string;
+  /**
+   * Who opened the pull request, when the payload carries it. Distinct from
+   * {@link sender} — on a comment event the sender is the commenter.
+   */
+  pullRequestAuthor?: OriginActor;
   /**
    * Raw parsed `event.payload` record (`{}` when absent), for consumers
    * whose normalization needs more than the typed event — the GitHub
@@ -152,6 +157,12 @@ export interface OriginAppOptions {
   token?: string | OriginTokenProvider;
   /** Public Origin REST base, e.g. `https://api.cursor.com`. */
   apiBaseUrl?: string;
+  /**
+   * Origin ConnectRPC base for operations without a REST binding (comment
+   * reactions), e.g. `https://api.origin.cursor.com`. Falls back to
+   * `ORIGIN_RPC_BASE_URL`.
+   */
+  rpcBaseUrl?: string;
 }
 
 export interface OriginChannelOptions {

package/src/channels/slack/approvals.ts

@@ -6,6 +6,8 @@ import type { ApprovalDecision } from "../../types.js";
 
 export const SLACK_APPROVE_ACTION_ID = "agent_serve_approve";
 export const SLACK_DENY_ACTION_ID = "agent_serve_deny";
+export const SLACK_AUTH_CONNECTED_ACTION_ID = "agent_serve_auth_connected";
+export const SLACK_AUTH_CANCEL_ACTION_ID = "agent_serve_auth_cancel";
 
 export interface SlackApprovalActionValue {
   sessionId: string;
@@ -54,6 +56,29 @@ export function decisionFromActionId(
   return null;
 }
 
+export function decisionFromAuthActionId(
+  actionId: string
+): ApprovalDecision | null {
+  if (actionId === SLACK_AUTH_CONNECTED_ACTION_ID) {
+    return "approve";
+  }
+  if (actionId === SLACK_AUTH_CANCEL_ACTION_ID) {
+    return "deny";
+  }
+  return null;
+}
+
+export function authThreadStatus(connection: string): string {
+  const prefix = "Waiting for ";
+  const suffix = " auth…";
+  const budget = 50 - prefix.length - suffix.length;
+  const name =
+    connection.length <= budget
+      ? connection
+      : `${connection.slice(0, Math.max(0, budget - 1))}…`;
+  return `${prefix}${name}${suffix}`;
+}
+
 const REDACTED = "[REDACTED]";
 const SENSITIVE_KEY =
   /(?:pass(?:word|wd)?|secret|token|api[_-]?key|authorization|credential|private[_-]?key|access[_-]?key)/i;
@@ -176,6 +201,86 @@ export function buildApprovalBlocks(args: {
   ];
 }
 
+export function buildAuthBlocks(args: {
+  sessionId: string;
+  callId: string;
+  toolName: string;
+  connection: string;
+  authUrl: string;
+}): unknown[] {
+  const value = encodeApprovalActionValue({
+    sessionId: args.sessionId,
+    callId: args.callId,
+  });
+  const label =
+    args.connection.length > 20
+      ? `Authorize ${args.connection.slice(0, 17)}…`
+      : `Authorize ${args.connection}`;
+  return [
+    {
+      type: "header",
+      text: {
+        type: "plain_text",
+        text: "MCP authorization needed",
+        emoji: true,
+      },
+    },
+    {
+      type: "section",
+      text: {
+        type: "mrkdwn",
+        text: `Connect \`${args.connection}\` so \`${args.toolName}\` can continue.`,
+      },
+    },
+    {
+      type: "actions",
+      block_id: `auth_${args.callId}`.slice(0, 255),
+      elements: [
+        {
+          type: "button",
+          text: { type: "plain_text", text: label, emoji: true },
+          url: args.authUrl,
+        },
+        {
+          type: "button",
+          action_id: SLACK_AUTH_CONNECTED_ACTION_ID,
+          text: { type: "plain_text", text: "Connected", emoji: true },
+          style: "primary",
+          value,
+        },
+        {
+          type: "button",
+          action_id: SLACK_AUTH_CANCEL_ACTION_ID,
+          text: { type: "plain_text", text: "Cancel", emoji: true },
+          style: "danger",
+          value,
+        },
+      ],
+    },
+  ];
+}
+
+export function buildResolvedAuthBlocks(args: {
+  connection: string;
+  decision: ApprovalDecision;
+  byUserId?: string;
+}): unknown[] {
+  const verb = args.decision === "approve" ? "Connected" : "Cancelled";
+  const by =
+    args.byUserId === undefined || args.byUserId === ""
+      ? ""
+      : ` by <@${args.byUserId}>`;
+  return [
+    {
+      type: "section",
+      text: {
+        type: "mrkdwn",
+        text: `*${verb}*${by} — \`${args.connection}\``,
+      },
+    },
+  ];
+}
+
 export function buildResolvedApprovalBlocks(args: {
   toolName: string;
   decision: ApprovalDecision;

package/src/channels/slack/cli-project.ts

@@ -0,0 +1,267 @@
+/**
+ * Official Slack CLI project files for `slack init --manual`.
+ *
+ * `.slack/` is the committed Slack CLI project: hook, manifests, hooks.json.
+ * Agent SDK serve owns the socket; do not `slack deploy` / `slack run`.
+ */
+
+import { randomUUID } from "node:crypto";
+import { existsSync } from "node:fs";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+export const SLACK_CLI_HOME_BIN = ".slack/bin/slack";
+
+export const SLACK_CLI_GET_MANIFEST = "node .slack/get-manifest.mjs";
+
+export type SlackCliEnvironment = "local" | "deployed";
+
+const TEAM_ID_RE = /\(Team ID: ([TE][A-Z0-9]+)\)/g;
+
+const GET_MANIFEST_JS = `import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = dirname(fileURLToPath(import.meta.url));
+
+function target() {
+  const env = process.env.SLACK_ENV ?? process.env.SLACK_APP_ENVIRONMENT;
+  if (env === "deployed" || env === "prod") return "manifest.prod.json";
+  if (env === "local" || env === "dev") return "manifest.dev.json";
+  try {
+    const raw = readFileSync(join(here, "cli-environment"), "utf8").trim();
+    if (raw === "deployed" || raw === "prod") return "manifest.prod.json";
+  } catch {
+    // default local
+  }
+  return "manifest.dev.json";
+}
+
+process.stdout.write(readFileSync(join(here, target()), "utf8"));
+`;
+
+function isEnoent(error: unknown): boolean {
+  return (
+    error instanceof Error &&
+    "code" in error &&
+    (error as NodeJS.ErrnoException).code === "ENOENT"
+  );
+}
+
+/** Official Slack CLI, if present. `SLACK_CLI` overrides. */
+export function detectSlackCli(
+  env: NodeJS.ProcessEnv = process.env
+): string | undefined {
+  const override = env.SLACK_CLI;
+  if (override !== undefined && override !== "") {
+    return override;
+  }
+  const home = env.HOME ?? env.USERPROFILE ?? homedir();
+  const homeBin = join(home, SLACK_CLI_HOME_BIN);
+  return existsSync(homeBin) ? homeBin : undefined;
+}
+
+/** Hook + manifests under `.slack/`. Merge hooks.json; keep existing config. */
+export async function writeSlackCliProject(
+  rootDir: string,
+  manifests: ReadonlyArray<{ name: string; contents: string }>
+): Promise<string[]> {
+  const slackDir = join(rootDir, ".slack");
+  await mkdir(slackDir, { recursive: true });
+  const created: string[] = [];
+
+  await writeFile(join(slackDir, "get-manifest.mjs"), GET_MANIFEST_JS);
+  created.push(".slack/get-manifest.mjs");
+
+  for (const file of manifests) {
+    await writeFile(join(slackDir, file.name), file.contents);
+    created.push(`.slack/${file.name}`);
+  }
+
+  if (await upsertGetManifestHook(slackDir)) {
+    created.push(".slack/hooks.json");
+  }
+  if (
+    await writeIfMissing(
+      join(slackDir, "config.json"),
+      `${JSON.stringify(
+        {
+          manifest: { source: "local" },
+          project_id: randomUUID(),
+        },
+        null,
+        2
+      )}\n`
+    )
+  ) {
+    created.push(".slack/config.json");
+  }
+  if (await mergeGitignore(join(slackDir, ".gitignore"))) {
+    created.push(".slack/.gitignore");
+  }
+  return created;
+}
+
+async function upsertGetManifestHook(slackDir: string): Promise<boolean> {
+  const path = join(slackDir, "hooks.json");
+  let existing: { hooks?: Record<string, string> };
+  try {
+    const parsed: unknown = JSON.parse(await readFile(path, "utf8"));
+    if (
+      parsed === null ||
+      typeof parsed !== "object" ||
+      Array.isArray(parsed)
+    ) {
+      throw new Error(".slack/hooks.json is not a JSON object");
+    }
+    existing = parsed as { hooks?: Record<string, string> };
+  } catch (error) {
+    if (!isEnoent(error)) {
+      throw error;
+    }
+    await writeFile(
+      path,
+      `${JSON.stringify({ hooks: { "get-manifest": SLACK_CLI_GET_MANIFEST } }, null, 2)}\n`
+    );
+    return true;
+  }
+  const hooks = existing.hooks ?? {};
+  if (hooks["get-manifest"] === SLACK_CLI_GET_MANIFEST) {
+    return false;
+  }
+  hooks["get-manifest"] = SLACK_CLI_GET_MANIFEST;
+  existing.hooks = hooks;
+  await writeFile(path, `${JSON.stringify(existing, null, 2)}\n`);
+  return true;
+}
+
+async function writeIfMissing(
+  path: string,
+  contents: string
+): Promise<boolean> {
+  try {
+    await writeFile(path, contents, { flag: "wx" });
+    return true;
+  } catch (error) {
+    if (
+      error instanceof Error &&
+      "code" in error &&
+      (error as NodeJS.ErrnoException).code === "EEXIST"
+    ) {
+      return false;
+    }
+    throw error;
+  }
+}
+
+async function mergeGitignore(path: string): Promise<boolean> {
+  const lines = ["apps.dev.json", "cache/", "cli-environment"];
+  let existing = "";
+  try {
+    existing = await readFile(path, "utf8");
+  } catch (error) {
+    if (!isEnoent(error)) {
+      throw error;
+    }
+    await writeFile(path, `${lines.join("\n")}\n`);
+    return true;
+  }
+  const have = new Set(
+    existing
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter((line) => line !== "")
+  );
+  const missing = lines.filter((line) => !have.has(line));
+  if (missing.length === 0) {
+    return false;
+  }
+  const prefix =
+    existing === "" || existing.endsWith("\n") ? existing : `${existing}\n`;
+  await writeFile(path, `${prefix}${missing.join("\n")}\n`);
+  return true;
+}
+
+export function parseSlackAuthTeams(text: string): string[] {
+  const ids: string[] = [];
+  for (const match of text.matchAll(TEAM_ID_RE)) {
+    const id = match[1];
+    if (id !== undefined && !ids.includes(id)) {
+      ids.push(id);
+    }
+  }
+  return ids;
+}
+
+export async function readSlackCliAppId(
+  dir: string,
+  environment: SlackCliEnvironment,
+  team?: string
+): Promise<string | undefined> {
+  const apps = await loadAppMap(dir, environment);
+  if (apps === undefined) {
+    return undefined;
+  }
+  if (team !== undefined) {
+    return appIdOf(apps[team]);
+  }
+  return firstAppId(apps);
+}
+
+async function loadAppMap(
+  dir: string,
+  environment: SlackCliEnvironment
+): Promise<Record<string, unknown> | undefined> {
+  if (environment === "local") {
+    return readJson(join(dir, ".slack/apps.dev.json"));
+  }
+  const deployed = await readJson(join(dir, ".slack/apps.json"));
+  if (deployed === undefined) {
+    return undefined;
+  }
+  const apps = deployed.apps;
+  if (apps !== undefined && typeof apps === "object" && apps !== null) {
+    return apps as Record<string, unknown>;
+  }
+  return deployed;
+}
+
+function firstAppId(value: Record<string, unknown>): string | undefined {
+  for (const entry of Object.values(value)) {
+    const id = appIdOf(entry);
+    if (id !== undefined) {
+      return id;
+    }
+  }
+  return undefined;
+}
+
+function appIdOf(entry: unknown): string | undefined {
+  if (entry === undefined || entry === null || typeof entry !== "object") {
+    return undefined;
+  }
+  const appId = (entry as { app_id?: unknown }).app_id;
+  if (typeof appId === "string" && appId.startsWith("A")) {
+    return appId;
+  }
+  return undefined;
+}
+
+async function readJson(
+  path: string
+): Promise<Record<string, unknown> | undefined> {
+  try {
+    const parsed: unknown = JSON.parse(await readFile(path, "utf8"));
+    if (
+      parsed === null ||
+      typeof parsed !== "object" ||
+      Array.isArray(parsed)
+    ) {
+      return undefined;
+    }
+    return parsed as Record<string, unknown>;
+  } catch {
+    return undefined;
+  }
+}