@cursor/bdk 0.2.6 → 0.2.8

package/dist/bin/agent-serve.js

@@ -57,10 +57,9 @@ Usage:
   ${CLI} resume      [sessionId] [--url <baseUrl> | --prod] [--message <text>]
                           [--json] [--text] [--continuation-token <t>]
                           [--slug <slug>] [--team <id>]
-  ${CLI} logs        [--url <baseUrl> | --prod] [--once] [--json]
-                          [--slug <slug>] [--team <id>] [--dir <path>]
-                          v2: --prod unsupported; use deployment <slug> and
-                          session <ses_> --prod.
+  ${CLI} logs        [<ses_>] [--url <baseUrl> | --prod] [--session <ses_>]
+                          [--once] [--json] [--slug <slug>] [--team <id>]
+                          [--dir <path>]
   ${CLI} sessions    [--url <baseUrl> | --prod] [--json]
                           [--slug <slug>] [--team <id>] [--dir <path>]
                           v2: unsupported. ${v2HostedVerifyHint()}
@@ -98,14 +97,10 @@ Usage:
                           [--junit <path>] [--artifacts <dir>|--no-artifacts]
                           [--out <file.json>]
                           [--skip-report] [--no-stream] [--no-wait]
-                          [--prod | --url <baseUrl>] [--slug <slug>]
-                          [--team <id>]
-  ${CLI} eval status [runId] --prod|--url <baseUrl> [--dir <path>] [--json]
-                          [--out <file.json>] [--slug <slug>] [--team <id>]
-  ${CLI} eval cancel <runId> --prod|--url <baseUrl> [--dir <path>] [--json]
-                          [--slug <slug>] [--team <id>]
-                          v2: --prod unsupported for eval, status, and cancel;
-                          run eval locally or pass --url.
+                          [--url <baseUrl>] [--slug <slug>]
+  ${CLI} eval status [runId] --url <baseUrl> [--dir <path>] [--json]
+                          [--out <file.json>]
+  ${CLI} eval cancel <runId> --url <baseUrl> [--dir <path>] [--json]
   ${CLI} info        [--dir <path>] [--json]
   ${CLI} validate    [--dir <path>]
   ${CLI} login       [--api-key <key>] [--key-name <name>]
@@ -157,10 +152,12 @@ Commands:
               --continuation-token is omitted, then replays the transcript.
               Pass --prod for a hosted deployment.
   logs        Tail agent logs. Default follows (Ctrl-C to stop); --once dumps
-              the current buffer. --prod (v1 deployments) shows deploy progress
-              until the deployment is running, then tails runtime logs. Without
-              --prod, tails the local server (or --url). On architecture v2,
-              use \`${CLI} deployment <slug>\` and \`${CLI} session <ses_> --prod\`.
+              the current buffer. Without --prod, tails the local server (or
+              --url). On a v1 deployment, --prod shows deploy progress until
+              the deployment is running, then tails runtime logs. On
+              architecture v2, --prod tails the output of the deployment's
+              most recent sessions, each under a ==> ses_… <== header; pass a
+              session id (positional or --session) to tail only that session.
   sessions    List sessions on a running agent or a v1 --prod deployment.
               Unsupported on architecture v2. ${v2HostedVerifyHint()}
   session     Show one session. On v2: \`${CLI} session <ses_> --prod --slug <slug>\`.
@@ -230,18 +227,17 @@ Commands:
               MCP_OAUTH_<NAME>_* secrets on the hosted deployment.
   eval        Run filesystem evals under evals/**/*.eval.ts (streams on a TTY).
               Default: ephemeral local harness against evals on disk. Pass
-              --prod to kick off the batch on the team's v1 hosted deployment
-              (slug from --slug or the directory name) via /v1/dev/evals/runs
-              so results appear in the playground and persist when the agent
-              declares an evals storage table; or --url for a running server
-              (same server-side path). Hosted evals are unsupported on
-              architecture v2. With --prod/--url, prints an Eval ID as soon
-              as the batch is accepted (also with --no-wait). Check later with
-              \`${CLI} eval status <evalId> --prod\` (omit id to list recent
-              runs; exit 3 while still running) or cancel with
-              \`${CLI} eval cancel <evalId> --prod\`. The status/cancel
-              subcommands only bind when --prod/--url is set, so an eval id
-              named status/cancel still runs locally. Pass evalId args to
+              --url to kick off the batch on a running server via
+              /v1/dev/evals/runs so results appear in the playground and
+              persist when the agent declares an evals storage table. With
+              --url, prints an Eval ID as soon as the batch is accepted (also
+              with --no-wait). Check later with
+              \`${CLI} eval status <evalId> --url <baseUrl>\` (omit id to list
+              recent runs; exit 3 while still running) or cancel with
+              \`${CLI} eval cancel <evalId> --url <baseUrl>\`. The
+              status/cancel subcommands only bind when --url is set, so an
+              eval id named status/cancel still runs locally. eval does not
+              accept --prod. Pass evalId args to
               select: one datapoint (weather/nyc), a whole file (weather → all
               cases in that file), several of either, or omit to run all.
   info        Print the discovered agent surface (tools, skills, channels, ...).
@@ -362,17 +358,19 @@ Options:
   --no-control-plane serve: do not start the bundled control plane (schedule
                      and reminder clocks). Cursor hosting passes this so the
                      kit uses the Cursor backend instead.
+  --cloud-tools-url  serve: Cursor hosting passes the deployment's server-tools
+                     MCP URL here. Hosted install probes this help text for the
+                     flag before trusting a checkout build; keep it listed.
   --team             deploy/deployments/deployment/stop/rotate-token and
-                     chat/resume/run/call/eval/logs/sessions/session/playground
+                     chat/resume/run/call/logs/sessions/session/playground
                      --prod: Cursor team id. Defaults to the account's team when
                      it has one.
-  --prod             chat/resume/run/call/eval/logs/sessions/session/playground:
+  --prod             chat/resume/run/call/logs/sessions/session/playground:
                      use the team's hosted deployment. Slug from --slug or the
                      --dir basename. Mutually exclusive with --url. Requires
-                     \`${CLI} login\`. For eval, this is how you opt into the
-                     persisted server-side batch (default is local).
-                     v2: only run, session, and playground support --prod.
-                     ${v2HostedVerifyHint()}
+                     \`${CLI} login\`. eval does not accept --prod.
+                     v2: only run, session, logs, and playground support
+                     --prod. ${v2HostedVerifyHint()}
   --dry-run          run/session --prod: mark the hosted v2 turn non-mutating.
                      ${v2HostedVerifyHint()}
   --component        run/session --prod: wake this v2 component key,
@@ -386,7 +384,7 @@ Options:
                      path without writing them.
   --no-wait          deploy/stop/eval: return right after the request is
                      accepted instead of polling until a terminal status.
-                     For eval, prints the runId (deployment / --url only).
+                     For eval, prints the runId (--url only).
   --cancel-runs      stop: also cancel this install's active Agent SDK v2
                      session runs and reminder clocks, and mark factory
                      creating/active sessions failed (not every tenant).
@@ -402,7 +400,7 @@ Options:
   --messages-file   JSON array of strings (run).
   --session          Existing session id (run/call follow-up, or chat reattach).
                      Prefer \`${CLI} resume [sessionId]\` for interactive
-                     reattach.
+                     reattach. logs --prod (v2): tail only this session.
   --resume           chat: reattach the previous followable session (most
                      recently updated in /v1/sessions). Same as
                      \`${CLI} resume\` with no session id. Ignored when
@@ -431,7 +429,8 @@ Options:
   --json             JSON output (init/convert-automation/install-skills/
                      info/chat/eval/logs/version/
                      sessions/session/github; run defaults to JSON). logs:
-                     NDJSON progress/log events. session: trajectory JSON
+                     NDJSON progress/log events (v2: {sessionId, line}).
+                     session: trajectory JSON
                      (not raw events).
   --no-color         chat: force plain output.
   --cursor-events    serve: pull SCM webhook events from /v0/scm-events. The
@@ -493,7 +492,7 @@ function writeStdout(text) {
 function main(argv) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        var _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+        var _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
         const [command, ...restIn] = argv;
         if (command === undefined || command === "help" || command === "--help" || command === "-h") {
             // Await the write: HELP is larger than a pipe buffer, and process.exit
@@ -798,7 +797,8 @@ function main(argv) {
                 // `--repo` is repeatable for `serve --cursor-events`; deploy targets a
                 // single source repo, so the last one wins.
                 const repo = (_e = values.repo) === null || _e === void 0 ? void 0 : _e.at(-1);
-                return cmdDeploy(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, deployOptionsFromValues(values)), { dir }), (values.slug === undefined ? {} : { slug: values.slug })), { all: values.all === true }), (repo === undefined ? {} : { repo })), (values.ref === undefined ? {} : { ref: values.ref })), (values.path === undefined ? {} : { path: values.path })), (values["cursor-events-repo"] === undefined
+                const dirFlagPassed = rest.includes("--dir") || rest.some(arg => arg.startsWith("--dir="));
+                return cmdDeploy(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, deployOptionsFromValues(values)), { dir: dirFlagPassed ? dir : undefined }), (values.slug === undefined ? {} : { slug: values.slug })), { all: values.all === true }), (repo === undefined ? {} : { repo })), (values.ref === undefined ? {} : { ref: values.ref })), (values.path === undefined ? {} : { path: values.path })), (values["cursor-events-repo"] === undefined
                     ? {}
                     : { cursorEventsRepos: values["cursor-events-repo"] })), (values["allow-domain"] === undefined ? {} : { allowDomains: values["allow-domain"] })), { multiTenant: values["multi-tenant"] === true }));
             }
@@ -935,29 +935,25 @@ function main(argv) {
                 }));
             }
             case "eval": {
-                // Remote status subcommand only when targeting --prod/--url. Otherwise
-                // the bare token "status" is a normal eval id (evals/status.eval.ts).
-                if (positionals[0] === "status" && (values.prod === true || values.url !== undefined)) {
+                // Remote status subcommand only when targeting --url. Otherwise the
+                // bare token "status" is a normal eval id (evals/status.eval.ts).
+                if (positionals[0] === "status" && values.url !== undefined) {
                     return cmdEvalStatus(positionals[1], axFromOptions({
                         dir,
                         json: values.json,
                         url: values.url,
                         prod: values.prod,
-                        team: values.team,
-                        apiKey: values["api-key"],
                         slug: values.slug,
                         bearerToken: values["bearer-token"],
                         out: values.out,
                     }));
                 }
-                if (positionals[0] === "cancel" && (values.prod === true || values.url !== undefined)) {
+                if (positionals[0] === "cancel" && values.url !== undefined) {
                     return cmdEvalCancel(positionals[1], axFromOptions({
                         dir,
                         json: values.json,
                         url: values.url,
                         prod: values.prod,
-                        team: values.team,
-                        apiKey: values["api-key"],
                         slug: values.slug,
                         bearerToken: values["bearer-token"],
                     }));
@@ -972,8 +968,6 @@ function main(argv) {
                     url: values.url,
                     prod: values.prod,
                     noWait: values["no-wait"],
-                    team: values.team,
-                    apiKey: values["api-key"],
                     slug: values.slug,
                     bearerToken: values["bearer-token"],
                     stateRoot: values["state-root"],
@@ -1033,6 +1027,7 @@ function main(argv) {
                     apiKey: values["api-key"],
                     slug: values.slug,
                     bearerToken: values["bearer-token"],
+                    sessionId: (_u = (_t = positionals[0]) !== null && _t !== void 0 ? _t : values["session-id"]) !== null && _u !== void 0 ? _u : values.session,
                     json: values.json,
                     once: values.once,
                 }));
@@ -1064,14 +1059,14 @@ function main(argv) {
                     rawEvents: values["raw-events"],
                     out: values.out,
                     messages,
-                    sessionId: (_t = values["session-id"]) !== null && _t !== void 0 ? _t : values.session,
+                    sessionId: (_v = values["session-id"]) !== null && _v !== void 0 ? _v : values.session,
                     dryRun: values["dry-run"],
                     asOf: values["as-of"],
                     componentKey: values.component,
                 }));
             }
             case "cost": {
-                return cmdCost((_v = (_u = positionals[0]) !== null && _u !== void 0 ? _u : values["session-id"]) !== null && _v !== void 0 ? _v : values.session, axFromOptions({
+                return cmdCost((_x = (_w = positionals[0]) !== null && _w !== void 0 ? _w : values["session-id"]) !== null && _x !== void 0 ? _x : values.session, axFromOptions({
                     dir,
                     url: values.url,
                     prod: values.prod,
@@ -1091,7 +1086,7 @@ function main(argv) {
                     apiKey: values["api-key"],
                     slug: values.slug,
                     bearerToken: values["bearer-token"],
-                    sessionId: (_w = values["session-id"]) !== null && _w !== void 0 ? _w : values.session,
+                    sessionId: (_y = values["session-id"]) !== null && _y !== void 0 ? _y : values.session,
                     print: values.print,
                 }));
             }
@@ -1167,8 +1162,8 @@ function main(argv) {
                 lines.push(section("channels", info.channels.map(c => `${c.id}: ${c.routes.map(r => `${r.method} ${r.url}`).join(", ") || "(events only)"}`)));
                 lines.push(section("schedules", info.schedules.map(s => `${s.name} (${s.cron}, ${s.kind})`)));
                 lines.push(section("hooks", info.hooks));
-                lines.push(section("hosting egress domains", (_x = (_j = info.hosting) === null || _j === void 0 ? void 0 : _j.egressDomains) !== null && _x !== void 0 ? _x : []));
-                lines.push(section("hosting secret names", (_y = (_k = info.hosting) === null || _k === void 0 ? void 0 : _k.secretNames) !== null && _y !== void 0 ? _y : []));
+                lines.push(section("hosting egress domains", (_z = (_j = info.hosting) === null || _j === void 0 ? void 0 : _j.egressDomains) !== null && _z !== void 0 ? _z : []));
+                lines.push(section("hosting secret names", (_0 = (_k = info.hosting) === null || _k === void 0 ? void 0 : _k.secretNames) !== null && _0 !== void 0 ? _0 : []));
                 if (info.diagnostics.length > 0) {
                     lines.push(`\ndiagnostics:\n${formatDiagnostics(info.diagnostics)}`);
                 }
@@ -1231,7 +1226,7 @@ function main(argv) {
                     docs: values["no-docs"] === true ? false : undefined,
                     publicUrl: values["public-url"],
                     cloudToolsUrl: values["cloud-tools-url"],
-                    cursorEvents: values["cursor-events"] === true ? { repos: (_z = values.repo) !== null && _z !== void 0 ? _z : [] } : undefined,
+                    cursorEvents: values["cursor-events"] === true ? { repos: (_1 = values.repo) !== null && _1 !== void 0 ? _1 : [] } : undefined,
                     // Soft boot logs stay secondary to the banner. `dim` is a no-op on
                     // already-styled lines (the MCP warning box).
                     logger: (line) => {
@@ -1572,7 +1567,7 @@ function installTransportErrorGuards() {
     };
     const log = (label, reason) => {
         const text = reason instanceof Error ? reason.message : String(reason);
-        process.stderr.write(`[agent-sdk] ${label} (server stays up): ${text.slice(0, 400)}\n`);
+        process.stderr.write(`[bdk] ${label} (server stays up): ${text.slice(0, 400)}\n`);
     };
     process.on("unhandledRejection", reason => {
         if (isTransportNoise(reason)) {
@@ -1587,7 +1582,7 @@ function installTransportErrorGuards() {
             log("swallowed uncaughtException", error);
             return;
         }
-        process.stderr.write(`[agent-sdk] uncaughtException: ${(_a = error.stack) !== null && _a !== void 0 ? _a : error.message}\n`);
+        process.stderr.write(`[bdk] uncaughtException: ${(_a = error.stack) !== null && _a !== void 0 ? _a : error.message}\n`);
         void flushSessionRunFatal(error).finally(() => {
             process.exit(1);
         });

package/dist/channels/github/github-channel.d.ts.map

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

package/dist/channels/github/github-channel.js

@@ -14,6 +14,8 @@ import { acknowledgeTask, acknowledgeTurn, isTaskDispatch, scheduleAfterAck, ski
 import { continuationSource, normalizeIdentity } from "../../internal/continuation-identity.js";
 import { isDevMode } from "../../internal/dev-mode.js";
 import { attachHostedAdmissionAdapter } from "../../internal/hosted-admission-adapter.js";
+import { CATCH_DELIVERY_ID_HEADER, replayCatchRequest } from "../../internal/hosted-catch.js";
+import { AGENT_SDK_CATCH_EVENT_TYPE } from "../../internal/hosted-catch-protocol.js";
 import { bindLocalIngressSend } from "../../internal/local-ingress.js";
 import { resolveCredentialValue } from "./auth.js";
 import { buildGitHubBinding, } from "./binding.js";
@@ -371,7 +373,13 @@ export function handleGitHubWebhookRequest(input) {
         var _b, _c;
         const bodyText = yield input.request.text();
         const webhookSecret = (_b = (_a = input.options.credentials) === null || _a === void 0 ? void 0 : _a.webhookSecret) !== null && _b !== void 0 ? _b : envWebhookSecret();
-        if (webhookSecret !== undefined && input.skipSignatureVerification !== true) {
+        // A hosted public catch is reachable without an alias token. Require a
+        // verified Hub signature there even when no secret is configured, so a
+        // missing secret is a rejection rather than an unsigned accept. Local
+        // routes keep the existing rule: verify only when a secret is set.
+        const requireSignature = input.skipSignatureVerification !== true &&
+            (webhookSecret !== undefined || input.request.headers.has(CATCH_DELIVERY_ID_HEADER));
+        if (requireSignature) {
             const signatureResult = yield verifyGitHubWebhookSignature({
                 body: bodyText,
                 signatureHeader: input.request.headers.get("x-hub-signature-256"),
@@ -530,13 +538,29 @@ export function githubChannel(options = {}) {
     attachHostedAdmissionAdapter(definition, {
         kind: GITHUB_CHANNEL_KIND,
         prepareArgs: withPropagatingBackgroundErrors,
-        dispatch: ({ eventType, payload, deliveryId, args }) => dispatchGitHubWebhook({
-            options: channelOptions,
-            eventName: eventType,
-            payload,
-            deliveryId,
-            args,
-        }),
+        dispatch: ({ channelId, eventType, payload, deliveryId, args }) => {
+            var _a;
+            // A publicEndpoint() catch is an http.request envelope. Replay it
+            // into the route handler, which verifies X-Hub-Signature-256.
+            // Forge deliveries carry a GitHub event name and stay on
+            // dispatchGitHubWebhook.
+            if (eventType === AGENT_SDK_CATCH_EVENT_TYPE) {
+                return replayCatchRequest({
+                    channelId: channelId !== null && channelId !== void 0 ? channelId : "github",
+                    deliveryId,
+                    routes: (_a = definition.routes) !== null && _a !== void 0 ? _a : [],
+                    payload,
+                    args,
+                });
+            }
+            return dispatchGitHubWebhook({
+                options: channelOptions,
+                eventName: eventType,
+                payload,
+                deliveryId,
+                args,
+            });
+        },
     });
     if (cursorCredentials !== undefined) {
         registerGithubCursorAccountRuntime(definition, {

package/dist/channels/slack/dispatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/dispatch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/dispatch.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,KAAK,oBAAoB,EAI1B,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4CAA4C,CAAC;AAKjG,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAa,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAQ1F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAY1D,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAiB1D,OAAO,KAAK,EAEV,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAEhB,YAAY,EAEZ,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAwDpB,uCAAuC;AACvC,wBAAgB,sBAAsB,CAAC,KAAK,GAAE,OAAO,CAAC,iBAAiB,CAAM,GAAG,iBAAiB,CA0BhG;AAED,uEAAuE;AACvE,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,YAAY,CAAC,EAAE,IAAI,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,GAAG,cAAc,CAYjB;AAED,MAAM,WAAW,wBAAyB,SAAQ,uBAAuB;IACvE,IAAI,EAAE,aAAa,CAAC;IACpB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAC/C,YAAY,EAAE,mBAAmB,CAAC;IAClC,eAAe,EAAE,mBAAmB,CAAC;IACrC,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,QAAQ,EAAE,aAAa,CAAC;IACxB,IAAI,EAAE,WAAW,CAAC;IAClB,6EAA6E;IAC7E,SAAS,EAAE,YAAY,CAAC;IACxB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,qDAAqD;IACrD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uDAAuD;IACvD,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gEAAgE;IAChE,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC;;;OAGG;IACH,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC;;;;;OAKG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,eAAe,CAAC,EAAE,8BAA8B,CAAC;IACjD;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;;;;OAMG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AA2GD,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,IAAI,EAAE,aAAa,GAAG,gBAAgB,GAAG,cAAc,GAAG,gBAAgB,GAAG,cAAc,CAAC;IAC5F,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE,YAAY,CAAC;IACxB,sBAAsB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE,+BAA+B,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7F,qBAAqB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACxE,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,+EAA+E;IAC/E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,gDAAgD;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,eAAe,CAAC,EAAE,8BAA8B,CAAC;IACjD,mEAAmE;IACnE,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,IAAI,CAAC,CAigBhB;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,wBAAwB,GAC7B,OAAO,CAwKT"}

package/dist/channels/slack/dispatch.js

@@ -25,6 +25,8 @@ import { describeSlackEventShape, formatSlackContextBlock, parseAppHomeOpened, p
 import { defaultSlackLog } from "./log.js";
 import { paintTurnStart, retractTurnStart } from "./paint-start.js";
 import { adoptPlaceholder, retractPlaceholderMessage, retractPlaceholderSlot, startPlaceholder, } from "./placeholder.js";
+import { resolveSlackSelfIdentity } from "./self-identity.js";
+import { resolveSlackSenderName } from "./sender-name.js";
 import { isWholeMessageStop } from "./stop.js";
 import { EMPTY_SLACK_THREAD_CONTEXT, loadSlackThreadContext, loadSlackThreadDelta, } from "./thread-context.js";
 const FOLLOWUP_TYPING = "Saw your follow-up…";
@@ -126,10 +128,10 @@ function slackSessionContinuation(identity, channelId, threadTs) {
 }
 export function dispatchInboundMessage(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
-        var _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
+        var _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20;
         const { message, kind } = args;
-        const log = (_3 = args.log) !== null && _3 !== void 0 ? _3 : defaultSlackLog;
+        const log = (_6 = args.log) !== null && _6 !== void 0 ? _6 : defaultSlackLog;
         const binding = buildSlackBinding({
             botToken: (_a = args.credentials) === null || _a === void 0 ? void 0 : _a.botToken,
             channelId: message.channelId,
@@ -210,7 +212,7 @@ export function dispatchInboundMessage(args) {
                 log,
             });
         });
-        const userId = (_4 = (_d = message.author) === null || _d === void 0 ? void 0 : _d.userId) !== null && _4 !== void 0 ? _4 : "";
+        const userId = (_7 = (_d = message.author) === null || _d === void 0 ? void 0 : _d.userId) !== null && _7 !== void 0 ? _7 : "";
         const teamId = message.teamId;
         let membership;
         if (args.blockExternals !== false && ((_e = message.author) === null || _e === void 0 ? void 0 : _e.isBot) !== true) {
@@ -268,7 +270,7 @@ export function dispatchInboundMessage(args) {
             try {
                 yield binding.thread.startTyping(interrupted ? "Stopped." : "Nothing to stop.");
             }
-            catch (_18) {
+            catch (_21) {
                 // best-effort status
             }
             yield retractUnadoptedHandoff();
@@ -279,7 +281,7 @@ export function dispatchInboundMessage(args) {
         // whatever it says, and may open with `eval` while talking to someone else.
         const evalCommandsEnabled = args.evalCommandsEnabled !== false && (kind === "app_mention" || kind === "direct_message");
         const evalDirective = evalCommandsEnabled && args.host.evals !== undefined
-            ? ((_5 = parseSlackEvalDirective(message.text)) !== null && _5 !== void 0 ? _5 : parseSlackEvalDirective(message.markdown))
+            ? ((_8 = parseSlackEvalDirective(message.text)) !== null && _8 !== void 0 ? _8 : parseSlackEvalDirective(message.markdown))
             : null;
         if (evalDirective !== null && args.host.evals !== undefined) {
             if (membership !== undefined && (yield membership)) {
@@ -370,7 +372,7 @@ export function dispatchInboundMessage(args) {
         const excludeThreadTimestamps = [
             message.ts,
             ...(handoffInThread === undefined ? [] : [handoffInThread.messageTs]),
-            ...((_6 = decision.excludeThreadTimestamps) !== null && _6 !== void 0 ? _6 : []),
+            ...((_9 = decision.excludeThreadTimestamps) !== null && _9 !== void 0 ? _9 : []),
         ];
         const mergeMessages = [triggeringMergeMessage(message)];
         const continuationExists = existsP === undefined ? false : yield existsP;
@@ -378,14 +380,19 @@ export function dispatchInboundMessage(args) {
         const afterTs = loadThread && hasSession && args.getContinuationLastBotMessageTs !== undefined
             ? yield args.getContinuationLastBotMessageTs(continuation)
             : undefined;
+        const selfIdentity = resolveSlackSelfIdentity((_m = args.credentials) === null || _m === void 0 ? void 0 : _m.botToken);
+        const senderName = resolveSlackSenderName({
+            botToken: (_o = args.credentials) === null || _o === void 0 ? void 0 : _o.botToken,
+            author: message.author,
+        });
         // Channel mentions: cold <slack_thread>, warm <slack_thread_delta>.
         const threadTask = !loadThread
             ? Promise.resolve(EMPTY_SLACK_THREAD_CONTEXT)
             : hasSession
-                ? loadSlackThreadDelta(Object.assign(Object.assign({ botToken: (_m = args.credentials) === null || _m === void 0 ? void 0 : _m.botToken, channelId: message.channelId, threadTs: message.threadTs }, (afterTs === undefined ? {} : { afterTs })), { excludeTs: excludeThreadTimestamps, mergeMessages,
+                ? loadSlackThreadDelta(Object.assign(Object.assign({ botToken: (_p = args.credentials) === null || _p === void 0 ? void 0 : _p.botToken, channelId: message.channelId, threadTs: message.threadTs }, (afterTs === undefined ? {} : { afterTs })), { excludeTs: excludeThreadTimestamps, mergeMessages,
                     log }))
                 : loadSlackThreadContext({
-                    botToken: (_o = args.credentials) === null || _o === void 0 ? void 0 : _o.botToken,
+                    botToken: (_q = args.credentials) === null || _q === void 0 ? void 0 : _q.botToken,
                     channelId: message.channelId,
                     threadTs: message.threadTs,
                     excludeTs: excludeThreadTimestamps,
@@ -398,14 +405,14 @@ export function dispatchInboundMessage(args) {
             if (painted !== undefined) {
                 yield painted;
                 yield retractTurnStart({
-                    botToken: (_p = args.credentials) === null || _p === void 0 ? void 0 : _p.botToken,
+                    botToken: (_r = args.credentials) === null || _r === void 0 ? void 0 : _r.botToken,
                     channelId: message.channelId,
                     threadTs: message.threadTs,
-                    ack: (_7 = args.ack) !== null && _7 !== void 0 ? _7 : "",
+                    ack: (_10 = args.ack) !== null && _10 !== void 0 ? _10 : "",
                     log,
                 });
             }
-            yield (_q = args.host.slackNudges) === null || _q === void 0 ? void 0 : _q.releaseAsk(message.channelId, message.ts);
+            yield (_s = args.host.slackNudges) === null || _s === void 0 ? void 0 : _s.releaseAsk(message.channelId, message.ts);
             yield retractAdoptedPlaceholder();
             return;
         }
@@ -415,7 +422,7 @@ export function dispatchInboundMessage(args) {
             message,
             threadFiles: thread.files,
             decision,
-            botToken: (_r = args.credentials) === null || _r === void 0 ? void 0 : _r.botToken,
+            botToken: (_t = args.credentials) === null || _t === void 0 ? void 0 : _t.botToken,
             log,
         });
         if ((message.files !== undefined && message.files.length > 0) || threadFileCount > 0) {
@@ -424,18 +431,19 @@ export function dispatchInboundMessage(args) {
                 channel: message.channelId,
                 thread_ts: message.threadTs,
                 thread_files: threadFileCount,
-                images: (_8 = (_s = media.images) === null || _s === void 0 ? void 0 : _s.length) !== null && _8 !== void 0 ? _8 : 0,
-                workspace_files: Object.keys((_9 = media.workspaceFiles) !== null && _9 !== void 0 ? _9 : {}).length,
+                images: (_11 = (_u = media.images) === null || _u === void 0 ? void 0 : _u.length) !== null && _11 !== void 0 ? _11 : 0,
+                workspace_files: Object.keys((_12 = media.workspaceFiles) !== null && _12 !== void 0 ? _12 : {}).length,
                 event_id: args.eventId,
             });
         }
         if (threadContext !== undefined) {
             log.info(hasSession ? "thread delta loaded" : "thread context loaded", Object.assign({ kind, channel: message.channelId, thread_ts: message.threadTs, chars: threadContext.length, event_id: args.eventId }, (afterTs === undefined ? {} : { after_ts: afterTs })));
         }
+        const [self, userName] = yield Promise.all([selfIdentity, senderName]);
         const prompt = [
-            formatSlackContextBlock(Object.assign(Object.assign({ userId: (_10 = (_t = message.author) === null || _t === void 0 ? void 0 : _t.userId) !== null && _10 !== void 0 ? _10 : "", channelId: message.channelId, threadTs: message.threadTs }, (((_u = message.author) === null || _u === void 0 ? void 0 : _u.userName) === undefined ? {} : { userName: message.author.userName })), (message.teamId === undefined ? {} : { teamId: message.teamId }))),
+            formatSlackContextBlock(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ userId: (_13 = (_v = message.author) === null || _v === void 0 ? void 0 : _v.userId) !== null && _13 !== void 0 ? _13 : "", channelId: message.channelId, threadTs: message.threadTs }, (userName === undefined ? {} : { userName })), (((_w = message.author) === null || _w === void 0 ? void 0 : _w.isBot) === true ? { userIsBot: true } : {})), (((_x = message.author) === null || _x === void 0 ? void 0 : _x.botId) === undefined ? {} : { userBotId: message.author.botId })), (message.teamId === undefined ? {} : { teamId: message.teamId })), (self === undefined ? {} : { selfUserId: self.userId })), ((self === null || self === void 0 ? void 0 : self.name) === undefined ? {} : { selfName: self.name }))),
             ...(threadContext === undefined ? [] : [threadContext]),
-            ...((_11 = decision.context) !== null && _11 !== void 0 ? _11 : []),
+            ...((_14 = decision.context) !== null && _14 !== void 0 ? _14 : []),
             "",
             media.userText,
         ]
@@ -450,11 +458,11 @@ export function dispatchInboundMessage(args) {
         const placeholder = !adoptedPlaceholder && hasPlaceholder && (!hosted || hostedFollowup)
             ? startPlaceholder({
                 line: placeholderLine,
-                botToken: (_v = args.credentials) === null || _v === void 0 ? void 0 : _v.botToken,
+                botToken: (_y = args.credentials) === null || _y === void 0 ? void 0 : _y.botToken,
                 channelId: message.channelId,
                 threadTs: message.threadTs,
                 log,
-                recipientUserId: (_w = message.author) === null || _w === void 0 ? void 0 : _w.userId,
+                recipientUserId: (_z = message.author) === null || _z === void 0 ? void 0 : _z.userId,
                 recipientTeamId: message.teamId,
             })
             : undefined;
@@ -462,19 +470,19 @@ export function dispatchInboundMessage(args) {
         const state = emptySlackChannelState({
             channelId: message.channelId,
             threadTs: message.threadTs,
-            teamId: (_12 = message.teamId) !== null && _12 !== void 0 ? _12 : null,
-            triggeringUserId: (_13 = (_x = message.author) === null || _x === void 0 ? void 0 : _x.userId) !== null && _13 !== void 0 ? _13 : null,
+            teamId: (_15 = message.teamId) !== null && _15 !== void 0 ? _15 : null,
+            triggeringUserId: (_16 = (_0 = message.author) === null || _0 === void 0 ? void 0 : _0.userId) !== null && _16 !== void 0 ? _16 : null,
             startPainted: paintedStart,
             placeholderPosted: posted,
         });
         const sendOptions = Object.assign(Object.assign({ auth: decision.auth }, sendPatch), { admission: "coalesce", coalesceSourceTs: message.ts, state: state, refreshState: slackWakeChannelState({
                 channelId: message.channelId,
                 threadTs: message.threadTs,
-                teamId: (_14 = message.teamId) !== null && _14 !== void 0 ? _14 : null,
-                triggeringUserId: (_15 = (_y = message.author) === null || _y === void 0 ? void 0 : _y.userId) !== null && _15 !== void 0 ? _15 : null,
+                teamId: (_17 = message.teamId) !== null && _17 !== void 0 ? _17 : null,
+                triggeringUserId: (_18 = (_1 = message.author) === null || _1 === void 0 ? void 0 : _1.userId) !== null && _18 !== void 0 ? _18 : null,
                 startPainted: paintedStart,
                 placeholderPosted: posted,
-            }), title: (_16 = decision.title) !== null && _16 !== void 0 ? _16 : `slack:${message.channelId}:${message.threadTs}`, workspaceDir: decision.workspaceDir, workspaceFiles: media.workspaceFiles, images: media.images, cloud: decision.cloud, sdkAgentId: decision.sdkAgentId });
+            }), title: (_19 = decision.title) !== null && _19 !== void 0 ? _19 : `slack:${message.channelId}:${message.threadTs}`, workspaceDir: decision.workspaceDir, workspaceFiles: media.workspaceFiles, images: media.images, cloud: decision.cloud, sdkAgentId: decision.sdkAgentId });
         try {
             const session = yield args.send(prompt, sendOptions);
             if (isDeferredChannelSession(session)) {
@@ -511,11 +519,11 @@ export function dispatchInboundMessage(args) {
                 });
                 if (!steeringEnabled()) {
                     try {
-                        yield (_z = args.host.slackNudges) === null || _z === void 0 ? void 0 : _z.append({
+                        yield (_2 = args.host.slackNudges) === null || _2 === void 0 ? void 0 : _2.append({
                             continuationKey: continuation,
                             sourceTs: message.ts,
                             text: media.userText,
-                            author: (_0 = message.author) === null || _0 === void 0 ? void 0 : _0.userName,
+                            author: (_3 = message.author) === null || _3 === void 0 ? void 0 : _3.userName,
                         });
                     }
                     catch (nudgeError) {
@@ -541,7 +549,7 @@ export function dispatchInboundMessage(args) {
             }
         }
         catch (error) {
-            yield (_1 = args.host.slackNudges) === null || _1 === void 0 ? void 0 : _1.releaseAsk(message.channelId, message.ts);
+            yield (_4 = args.host.slackNudges) === null || _4 === void 0 ? void 0 : _4.releaseAsk(message.channelId, message.ts);
             if (placeholder !== undefined) {
                 yield placeholder.retract();
             }
@@ -549,10 +557,10 @@ export function dispatchInboundMessage(args) {
             if (painted !== undefined) {
                 yield painted;
                 yield retractTurnStart({
-                    botToken: (_2 = args.credentials) === null || _2 === void 0 ? void 0 : _2.botToken,
+                    botToken: (_5 = args.credentials) === null || _5 === void 0 ? void 0 : _5.botToken,
                     channelId: message.channelId,
                     threadTs: message.threadTs,
-                    ack: (_17 = args.ack) !== null && _17 !== void 0 ? _17 : "",
+                    ack: (_20 = args.ack) !== null && _20 !== void 0 ? _20 : "",
                     log,
                 });
             }

package/dist/channels/slack/external-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external-policy.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/external-policy.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,KAAK,aAAa,GAAG;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CACxC,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,aAAa,CAAC;CACrB,GAAG,OAAO,CAcV;AAID,wBAAgB,wBAAwB,IAAI,IAAI,CAE/C;AAED,4EAA4E;AAC5E,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,OAAO,CAAC,CA2BnB"}
+{"version":3,"file":"external-policy.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/external-policy.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhD,KAAK,aAAa,GAAG;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CACxC,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,aAAa,CAAC;CACrB,GAAG,OAAO,CAcV;AAID,wBAAgB,wBAAwB,IAAI,IAAI,CAG/C;AAED,4EAA4E;AAC5E,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,OAAO,CAAC,CA0BnB"}

package/dist/channels/slack/external-policy.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { callSlackApi } from "./api.js";
+import { fetchSlackUserInfo, resetSlackUserInfoCache } from "./user-info.js";
 /** Pure classifier over a `users.info` user object. Fails open to external. */
 export function classifySlackUserExternality(args) {
     var _a;
@@ -29,6 +29,7 @@ export function classifySlackUserExternality(args) {
 const classified = new Map();
 export function resetExternalSenderCache() {
     classified.clear();
+    resetSlackUserInfoCache();
 }
 /** Lookup + classify. Empty userId / API failure → external. Hits cache. */
 export function isExternalSlackSender(args) {
@@ -42,17 +43,16 @@ export function isExternalSlackSender(args) {
             return cached;
         }
         try {
-            const result = yield callSlackApi({
+            const user = yield fetchSlackUserInfo({
                 botToken: args.botToken,
-                operation: "users.info",
-                body: { user: args.userId },
+                userId: args.userId,
             });
-            if (result.ok !== true || result.user === undefined) {
+            if (user === undefined) {
                 return true;
             }
             const external = classifySlackUserExternality({
                 slackTeamId: args.slackTeamId,
-                user: result.user,
+                user: user,
             });
             classified.set(key, external);
             return external;