experimental-ash 0.2.0-alpha.17 → 0.2.0-alpha.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/channel/slack-channel.d.ts +30 -0
- package/dist/src/channel/slack-channel.d.ts.map +1 -1
- package/dist/src/channel/slack-channel.js +34 -2
- package/dist/src/channel/slack-channel.js.map +1 -1
- package/dist/src/context/keys.d.ts +1 -7
- package/dist/src/context/keys.d.ts.map +1 -1
- package/dist/src/context/keys.js +2 -9
- package/dist/src/context/keys.js.map +1 -1
- package/dist/src/context/seed-keys.d.ts +21 -0
- package/dist/src/context/seed-keys.d.ts.map +1 -0
- package/dist/src/context/seed-keys.js +19 -0
- package/dist/src/context/seed-keys.js.map +1 -0
- package/dist/src/internal/application/package.js +1 -1
- package/dist/src/public/channels/slack/index.d.ts +12 -2
- package/dist/src/public/channels/slack/index.d.ts.map +1 -1
- package/dist/src/public/channels/slack/index.js +15 -1
- package/dist/src/public/channels/slack/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,6 +3,24 @@ import type { StepInput } from "../harness/types.js";
|
|
|
3
3
|
import type { HandleMessageStreamEvent } from "../protocol/message.js";
|
|
4
4
|
import type { InputRequest } from "../runtime/input/types.js";
|
|
5
5
|
import { Channel, type ContextAccessor, type DeliverPayload } from "./types.js";
|
|
6
|
+
/**
|
|
7
|
+
* User context for the Slack message sender, stored in channel state so
|
|
8
|
+
* agents can understand who they are interacting with.
|
|
9
|
+
*/
|
|
10
|
+
export interface SlackUserContext {
|
|
11
|
+
/** Slack user id, e.g. `U0123ABC`. */
|
|
12
|
+
readonly userId: string;
|
|
13
|
+
/** Slack handle, e.g. `jane.smith`. */
|
|
14
|
+
readonly userName: string;
|
|
15
|
+
/** Display name, e.g. `Jane Smith`. */
|
|
16
|
+
readonly fullName: string;
|
|
17
|
+
/** Slack workspace (team) id, e.g. `T0123ABC`. */
|
|
18
|
+
readonly teamId?: string;
|
|
19
|
+
/** Slack channel id where the conversation is happening, e.g. `C0123ABC`. */
|
|
20
|
+
readonly channelId: string;
|
|
21
|
+
/** Thread root timestamp identifying the conversation. */
|
|
22
|
+
readonly threadTs: string;
|
|
23
|
+
}
|
|
6
24
|
/**
|
|
7
25
|
* Minimal serializable state for the Slack channel.
|
|
8
26
|
*/
|
|
@@ -15,6 +33,12 @@ export interface SlackChannelState {
|
|
|
15
33
|
* request options.
|
|
16
34
|
*/
|
|
17
35
|
readonly pendingRequests?: readonly InputRequest[];
|
|
36
|
+
/**
|
|
37
|
+
* Context about the current Slack user and thread. Included in every
|
|
38
|
+
* message so the agent knows who it is interacting with and can use
|
|
39
|
+
* the thread id for tool calls.
|
|
40
|
+
*/
|
|
41
|
+
readonly userContext?: SlackUserContext;
|
|
18
42
|
}
|
|
19
43
|
interface RehydratedThread {
|
|
20
44
|
post(message: string | {
|
|
@@ -71,6 +95,12 @@ export declare class SlackChannel<TState extends SlackChannelState = SlackChanne
|
|
|
71
95
|
get serializedThread(): SerializedThread;
|
|
72
96
|
serialize(): Record<string, unknown>;
|
|
73
97
|
onDeliver(_ctx: ContextAccessor, payload: DeliverPayload): Promise<StepInput>;
|
|
98
|
+
/**
|
|
99
|
+
* Prepends the Slack user context XML block to a message if user context
|
|
100
|
+
* is available. This provides the agent with information about who sent
|
|
101
|
+
* the message and the thread context for potential use in tool calls.
|
|
102
|
+
*/
|
|
103
|
+
private prependUserContext;
|
|
74
104
|
onEvent(event: HandleMessageStreamEvent): Promise<HandleMessageStreamEvent>;
|
|
75
105
|
private consumePendingToolCallMessage;
|
|
76
106
|
private consumePendingToolCallStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack-channel.d.ts","sourceRoot":"","sources":["../../../src/channel/slack-channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAEvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"slack-channel.d.ts","sourceRoot":"","sources":["../../../src/channel/slack-channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,24 @@ function truncateTypingStatus(status) {
|
|
|
28
28
|
}
|
|
29
29
|
return `${normalized.slice(0, SLACK_MAX_TYPING_STATUS_LENGTH - 3).trimEnd()}...`;
|
|
30
30
|
}
|
|
31
|
+
/**
|
|
32
|
+
* Formats user context as an XML block to prepend to messages.
|
|
33
|
+
*/
|
|
34
|
+
function formatUserContextBlock(ctx) {
|
|
35
|
+
const lines = [
|
|
36
|
+
"<slack_context>",
|
|
37
|
+
`user_id: ${ctx.userId}`,
|
|
38
|
+
`user_name: ${ctx.userName}`,
|
|
39
|
+
`full_name: ${ctx.fullName}`,
|
|
40
|
+
`channel_id: ${ctx.channelId}`,
|
|
41
|
+
`thread_ts: ${ctx.threadTs}`,
|
|
42
|
+
];
|
|
43
|
+
if (ctx.teamId !== undefined) {
|
|
44
|
+
lines.push(`team_id: ${ctx.teamId}`);
|
|
45
|
+
}
|
|
46
|
+
lines.push("</slack_context>");
|
|
47
|
+
return lines.join("\n");
|
|
48
|
+
}
|
|
31
49
|
// ---------------------------------------------------------------------------
|
|
32
50
|
// Channel
|
|
33
51
|
// ---------------------------------------------------------------------------
|
|
@@ -93,7 +111,7 @@ export class SlackChannel extends Channel {
|
|
|
93
111
|
}
|
|
94
112
|
// No pending requests — this is a normal conversation message.
|
|
95
113
|
if (this._state.pendingRequests === undefined || this._state.pendingRequests.length === 0) {
|
|
96
|
-
return { message: payload.message };
|
|
114
|
+
return { message: this.prependUserContext(payload.message) };
|
|
97
115
|
}
|
|
98
116
|
// Text with pending requests — resolve against stored options.
|
|
99
117
|
if (payload.message !== undefined) {
|
|
@@ -102,7 +120,21 @@ export class SlackChannel extends Channel {
|
|
|
102
120
|
return { inputResponses: responses };
|
|
103
121
|
}
|
|
104
122
|
}
|
|
105
|
-
return { message: payload.message };
|
|
123
|
+
return { message: this.prependUserContext(payload.message) };
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Prepends the Slack user context XML block to a message if user context
|
|
127
|
+
* is available. This provides the agent with information about who sent
|
|
128
|
+
* the message and the thread context for potential use in tool calls.
|
|
129
|
+
*/
|
|
130
|
+
prependUserContext(message) {
|
|
131
|
+
if (message === undefined) {
|
|
132
|
+
return undefined;
|
|
133
|
+
}
|
|
134
|
+
if (this._state.userContext === undefined) {
|
|
135
|
+
return message;
|
|
136
|
+
}
|
|
137
|
+
return `${formatUserContextBlock(this._state.userContext)}\n\n${message}`;
|
|
106
138
|
}
|
|
107
139
|
// ── Outbound: render events to Slack ───────────────────
|
|
108
140
|
async onEvent(event) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack-channel.js","sourceRoot":"","sources":["../../../src/channel/slack-channel.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAA6C,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"slack-channel.js","sourceRoot":"","sources":["../../../src/channel/slack-channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { type Channel, type SessionAuthContext, type SessionParent, type SessionTurn } from "../channel/types.js";
|
|
2
2
|
import type { SandboxAccess } from "../execution/sandboxes/types.js";
|
|
3
3
|
import type { SkillAccess } from "../execution/skills/types.js";
|
|
4
|
-
import type { RunMode } from "../run-mode.js";
|
|
5
4
|
import { getCompiledRuntimeAgentBundle } from "../runtime/sessions/compiled-agent-cache.js";
|
|
6
5
|
import { ContextKey } from "./key.js";
|
|
7
6
|
export type { SessionAuthContext, SessionParent, SessionTurn } from "../channel/types.js";
|
|
7
|
+
export { AuthKey, ContinuationTokenKey, InitiatorAuthKey, ModeKey, ParentSessionKey, SessionIdKey, } from "./seed-keys.js";
|
|
8
8
|
/**
|
|
9
9
|
* Auth metadata on the active session.
|
|
10
10
|
*
|
|
@@ -25,12 +25,6 @@ export interface Session {
|
|
|
25
25
|
readonly sessionId: string;
|
|
26
26
|
readonly turn: SessionTurn;
|
|
27
27
|
}
|
|
28
|
-
export declare const AuthKey: ContextKey<SessionAuthContext | null>;
|
|
29
|
-
export declare const InitiatorAuthKey: ContextKey<SessionAuthContext | null>;
|
|
30
|
-
export declare const SessionIdKey: ContextKey<string>;
|
|
31
|
-
export declare const ContinuationTokenKey: ContextKey<string>;
|
|
32
|
-
export declare const ModeKey: ContextKey<RunMode>;
|
|
33
|
-
export declare const ParentSessionKey: ContextKey<SessionParent>;
|
|
34
28
|
export declare const ChannelKey: ContextKey<Channel>;
|
|
35
29
|
/**
|
|
36
30
|
* Bundle returned by the compiled-agent cache. Carries the resolved agent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/context/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAGZ,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,WAAW,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/context/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAGZ,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,WAAW,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,YAAY,EAAE,kBAAkB,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE1F,OAAO,EACL,OAAO,EACP,oBAAoB,EACpB,gBAAgB,EAChB,OAAO,EACP,gBAAgB,EAChB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAMxB;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;CAC/C;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;CAC5B;AAWD,eAAO,MAAM,UAAU,qBAoBrB,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC,CAAC;AAOvF,eAAO,MAAM,SAAS,8FAcpB,CAAC;AAMH,eAAO,MAAM,UAAU,qBAAyC,CAAC;AACjE,eAAO,MAAM,UAAU,2BAA+C,CAAC;AACvE,eAAO,MAAM,QAAQ,yBAA2C,CAAC"}
|
package/dist/src/context/keys.js
CHANGED
|
@@ -2,15 +2,8 @@ import { getChannelClassKind, } from "../channel/types.js";
|
|
|
2
2
|
import { deserializeRuntimeChannel } from "../runtime/channels/registry.js";
|
|
3
3
|
import { getCompiledRuntimeAgentBundle } from "../runtime/sessions/compiled-agent-cache.js";
|
|
4
4
|
import { ContextKey } from "./key.js";
|
|
5
|
-
//
|
|
6
|
-
|
|
7
|
-
// ---------------------------------------------------------------------------
|
|
8
|
-
export const AuthKey = new ContextKey("ash.auth");
|
|
9
|
-
export const InitiatorAuthKey = new ContextKey("ash.initiatorAuth");
|
|
10
|
-
export const SessionIdKey = new ContextKey("ash.sessionId");
|
|
11
|
-
export const ContinuationTokenKey = new ContextKey("ash.continuationToken");
|
|
12
|
-
export const ModeKey = new ContextKey("ash.mode");
|
|
13
|
-
export const ParentSessionKey = new ContextKey("ash.parentSession");
|
|
5
|
+
// Re-export seed keys so existing consumers of `context/keys` keep working.
|
|
6
|
+
export { AuthKey, ContinuationTokenKey, InitiatorAuthKey, ModeKey, ParentSessionKey, SessionIdKey, } from "./seed-keys.js";
|
|
14
7
|
export const ChannelKey = new ContextKey("ash.channel", {
|
|
15
8
|
codec: {
|
|
16
9
|
serialize(channel) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/context/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mBAAmB,GAIpB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/context/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mBAAmB,GAIpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAItC,4EAA4E;AAC5E,OAAO,EACL,OAAO,EACP,oBAAoB,EACpB,gBAAgB,EAChB,OAAO,EACP,gBAAgB,EAChB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAqCxB,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAU,aAAa,EAAE;IAC/D,KAAK,EAAE;QACL,SAAS,CAAC,OAAO;YACf,OAAO;gBACL,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,WAA2B,CAAC;gBAC9D,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE;aAC3B,CAAC;QACJ,CAAC;QACD,WAAW,CAAC,IAAI,EAAE,GAAG;YACnB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAErC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CACb,sGAAsG,CACvG,CAAC;YACJ,CAAC;YAED,OAAO,yBAAyB,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACjE,CAAC;KACF;CACF,CAAC,CAAC;AAaH,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,UAAU,CAAiB,YAAY,EAAE;IACpE,KAAK,EAAE;QACL,SAAS,EAAE,CAAC,MAAM,EAAoB,EAAE,CAAC,CAAC;YACxC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,MAAM,EAAE,MAAM,CAAC,uBAAuB;SACvC,CAAC;QACF,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;YACpB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAwB,CAAC;YAC1D,OAAO,6BAA6B,CAAC;gBACnC,uBAAuB,EAAE,MAAM;gBAC/B,YAAY;aACb,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC,CAAC;AAEH,8EAA8E;AAC9E,wEAAwE;AACxE,8EAA8E;AAE9E,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAU,aAAa,CAAC,CAAC;AACjE,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAgB,aAAa,CAAC,CAAC;AACvE,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAc,WAAW,CAAC,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Simple seed keys — serializable values carried across workflow step
|
|
3
|
+
* boundaries. These keys have no codec and no heavyweight imports, so
|
|
4
|
+
* they can be safely imported from channel code without triggering
|
|
5
|
+
* circular module dependencies.
|
|
6
|
+
*
|
|
7
|
+
* Complex codec keys ({@link import("./keys.js").ChannelKey ChannelKey},
|
|
8
|
+
* {@link import("./keys.js").BundleKey BundleKey}) and derived keys
|
|
9
|
+
* ({@link import("./keys.js").SessionKey SessionKey}, etc.) live in
|
|
10
|
+
* `context/keys.ts` which re-exports everything from this module.
|
|
11
|
+
*/
|
|
12
|
+
import type { SessionAuthContext, SessionParent } from "../channel/types.js";
|
|
13
|
+
import type { RunMode } from "../run-mode.js";
|
|
14
|
+
import { ContextKey } from "./key.js";
|
|
15
|
+
export declare const AuthKey: ContextKey<SessionAuthContext | null>;
|
|
16
|
+
export declare const InitiatorAuthKey: ContextKey<SessionAuthContext | null>;
|
|
17
|
+
export declare const SessionIdKey: ContextKey<string>;
|
|
18
|
+
export declare const ContinuationTokenKey: ContextKey<string>;
|
|
19
|
+
export declare const ModeKey: ContextKey<RunMode>;
|
|
20
|
+
export declare const ParentSessionKey: ContextKey<SessionParent>;
|
|
21
|
+
//# sourceMappingURL=seed-keys.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seed-keys.d.ts","sourceRoot":"","sources":["../../../src/context/seed-keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,eAAO,MAAM,OAAO,uCAAwD,CAAC;AAC7E,eAAO,MAAM,gBAAgB,uCAAiE,CAAC;AAC/F,eAAO,MAAM,YAAY,oBAA0C,CAAC;AACpE,eAAO,MAAM,oBAAoB,oBAAkD,CAAC;AACpF,eAAO,MAAM,OAAO,qBAAsC,CAAC;AAC3D,eAAO,MAAM,gBAAgB,2BAAqD,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Simple seed keys — serializable values carried across workflow step
|
|
3
|
+
* boundaries. These keys have no codec and no heavyweight imports, so
|
|
4
|
+
* they can be safely imported from channel code without triggering
|
|
5
|
+
* circular module dependencies.
|
|
6
|
+
*
|
|
7
|
+
* Complex codec keys ({@link import("./keys.js").ChannelKey ChannelKey},
|
|
8
|
+
* {@link import("./keys.js").BundleKey BundleKey}) and derived keys
|
|
9
|
+
* ({@link import("./keys.js").SessionKey SessionKey}, etc.) live in
|
|
10
|
+
* `context/keys.ts` which re-exports everything from this module.
|
|
11
|
+
*/
|
|
12
|
+
import { ContextKey } from "./key.js";
|
|
13
|
+
export const AuthKey = new ContextKey("ash.auth");
|
|
14
|
+
export const InitiatorAuthKey = new ContextKey("ash.initiatorAuth");
|
|
15
|
+
export const SessionIdKey = new ContextKey("ash.sessionId");
|
|
16
|
+
export const ContinuationTokenKey = new ContextKey("ash.continuationToken");
|
|
17
|
+
export const ModeKey = new ContextKey("ash.mode");
|
|
18
|
+
export const ParentSessionKey = new ContextKey("ash.parentSession");
|
|
19
|
+
//# sourceMappingURL=seed-keys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seed-keys.js","sourceRoot":"","sources":["../../../src/context/seed-keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,UAAU,CAA4B,UAAU,CAAC,CAAC;AAC7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,UAAU,CAA4B,mBAAmB,CAAC,CAAC;AAC/F,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,UAAU,CAAS,eAAe,CAAC,CAAC;AACpE,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,UAAU,CAAS,uBAAuB,CAAC,CAAC;AACpF,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,UAAU,CAAU,UAAU,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,UAAU,CAAgB,mBAAmB,CAAC,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { ASH_PACKAGE_NAME } from "../../package-name.js";
|
|
|
6
6
|
let cachedPackageInfo;
|
|
7
7
|
// The package build stamps the published version into `dist` so bundled
|
|
8
8
|
// deployments can still report package metadata without resolving package.json.
|
|
9
|
-
const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.2.0-alpha.
|
|
9
|
+
const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.2.0-alpha.18";
|
|
10
10
|
const BUNDLED_FALLBACK_PACKAGE_VERSION_PLACEHOLDER = "__ASH_PACKAGE_VERSION_PLACEHOLDER__";
|
|
11
11
|
function resolveFallbackPackageVersion() {
|
|
12
12
|
return BUNDLED_FALLBACK_PACKAGE_VERSION === BUNDLED_FALLBACK_PACKAGE_VERSION_PLACEHOLDER
|
|
@@ -34,11 +34,11 @@
|
|
|
34
34
|
* request to `chat.webhooks.slack(request)` which performs signature
|
|
35
35
|
* verification, event parsing, and dispatch.
|
|
36
36
|
*/
|
|
37
|
-
import { SlackChannel, type SlackChannelState } from "../../../channel/slack-channel.js";
|
|
37
|
+
import { SlackChannel, type SlackChannelState, type SlackUserContext } from "../../../channel/slack-channel.js";
|
|
38
38
|
import type { Channel, ChannelClass } from "../../../channel/types.js";
|
|
39
39
|
import { type Route } from "../../definitions/channel.js";
|
|
40
40
|
import type { AuthFn } from "../auth.js";
|
|
41
|
-
export type { SlackChannelState };
|
|
41
|
+
export type { SlackChannelState, SlackUserContext };
|
|
42
42
|
export { SlackChannel };
|
|
43
43
|
/**
|
|
44
44
|
* Slack credentials and signing secret consumed by the underlying chat
|
|
@@ -90,6 +90,16 @@ export interface SlackEventContext {
|
|
|
90
90
|
* `B0123ABC` for bot-authored messages.
|
|
91
91
|
*/
|
|
92
92
|
readonly userId: string;
|
|
93
|
+
/**
|
|
94
|
+
* Slack handle of the message author, e.g. `jane.smith`. Populated
|
|
95
|
+
* by the chat SDK from the Slack `users.info` API response.
|
|
96
|
+
*/
|
|
97
|
+
readonly userName: string;
|
|
98
|
+
/**
|
|
99
|
+
* Display name of the message author, e.g. `Jane Smith`. Populated
|
|
100
|
+
* by the chat SDK from the Slack `users.info` API response.
|
|
101
|
+
*/
|
|
102
|
+
readonly fullName: string;
|
|
93
103
|
/** Slack channel id where the mention happened, e.g. `C0123ABC`. */
|
|
94
104
|
readonly channelId: string;
|
|
95
105
|
/** Thread root timestamp identifying the conversation. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/public/channels/slack/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAIH,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/public/channels/slack/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAIH,OAAO,EACL,YAAY,EACZ,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACtB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAsB,MAAM,2BAA2B,CAAC;AAE3F,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,CAAC;AAExB;;;;;;;;;;GAUG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,KAAK,CAAC;AAE7C;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,iEAAiE;IACjE,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC;IACrC;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,oEAAoE;IACpE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,0DAA0D;IAC1D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,sDAAsD;IACtD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;CAClC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,sBAAsB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;IAC1F,KAAK,KAAK,EAAE,iBAAiB,GAAG,CAAC,CAAC;CACnC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC;IAC/C;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IAC1C;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;CAC3C;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAAC,iBAAiB,CAAC,CA+BrD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,KAAK,GAAE,eAAoB,GAAG,KAAK,CA2J7D"}
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
* request to `chat.webhooks.slack(request)` which performs signature
|
|
35
35
|
* verification, event parsing, and dispatch.
|
|
36
36
|
*/
|
|
37
|
-
import { SlackChannel } from "../../../channel/slack-channel.js";
|
|
37
|
+
import { SlackChannel, } from "../../../channel/slack-channel.js";
|
|
38
38
|
import { defineRoute } from "../../definitions/channel.js";
|
|
39
39
|
export { SlackChannel };
|
|
40
40
|
/**
|
|
@@ -60,8 +60,10 @@ export function slackUser() {
|
|
|
60
60
|
const attributes = {
|
|
61
61
|
author_type: event.authorType,
|
|
62
62
|
channel_id: event.channelId,
|
|
63
|
+
full_name: event.fullName,
|
|
63
64
|
thread_ts: event.threadTs,
|
|
64
65
|
user_id: event.userId,
|
|
66
|
+
user_name: event.userName,
|
|
65
67
|
};
|
|
66
68
|
if (event.teamId !== undefined) {
|
|
67
69
|
attributes.team_id = event.teamId;
|
|
@@ -188,16 +190,26 @@ export function slackRoute(input = {}) {
|
|
|
188
190
|
});
|
|
189
191
|
return;
|
|
190
192
|
}
|
|
193
|
+
const userContext = {
|
|
194
|
+
channelId: event.channelId,
|
|
195
|
+
fullName: event.fullName,
|
|
196
|
+
teamId: event.teamId,
|
|
197
|
+
threadTs: event.threadTs,
|
|
198
|
+
userId: event.userId,
|
|
199
|
+
userName: event.userName,
|
|
200
|
+
};
|
|
191
201
|
const handle = await ctx.agent.run({
|
|
192
202
|
auth: sessionAuth,
|
|
193
203
|
channel: input.channel !== undefined
|
|
194
204
|
? new input.channel({
|
|
195
205
|
botToken: input.credentials?.botToken,
|
|
196
206
|
serializedThread: thread.toJSON(),
|
|
207
|
+
userContext,
|
|
197
208
|
})
|
|
198
209
|
: new SlackChannel({
|
|
199
210
|
botToken: input.credentials?.botToken,
|
|
200
211
|
serializedThread: thread.toJSON(),
|
|
212
|
+
userContext,
|
|
201
213
|
}),
|
|
202
214
|
continuationToken,
|
|
203
215
|
input: { message: event.text },
|
|
@@ -266,9 +278,11 @@ function projectSlackMention(input) {
|
|
|
266
278
|
authorType,
|
|
267
279
|
channelId: input.channel,
|
|
268
280
|
eventTs,
|
|
281
|
+
fullName: message.author.fullName,
|
|
269
282
|
text: message.text,
|
|
270
283
|
threadTs: input.threadTs,
|
|
271
284
|
userId,
|
|
285
|
+
userName: message.author.userName,
|
|
272
286
|
};
|
|
273
287
|
if (teamId !== undefined) {
|
|
274
288
|
event.teamId = teamId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/public/channels/slack/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAIH,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/public/channels/slack/index.ts"],"names":[],"mappings":"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"}
|