ccpoke 1.6.2 → 1.6.3
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/README.en.md +8 -0
- package/README.md +8 -0
- package/dist/agent/agent-handler.d.ts +11 -0
- package/dist/agent/agent-handler.js +36 -0
- package/dist/agent/agent-handler.js.map +1 -1
- package/dist/agent/chat-session-resolver.d.ts +1 -0
- package/dist/agent/claude-code/claude-code-installer.d.ts +2 -0
- package/dist/agent/claude-code/claude-code-installer.js +55 -2
- package/dist/agent/claude-code/claude-code-installer.js.map +1 -1
- package/dist/channel/telegram/prompt-handler.d.ts +22 -0
- package/dist/channel/telegram/prompt-handler.js +131 -0
- package/dist/channel/telegram/prompt-handler.js.map +1 -0
- package/dist/channel/telegram/session-list.d.ts +6 -0
- package/dist/channel/telegram/session-list.js +45 -0
- package/dist/channel/telegram/session-list.js.map +1 -0
- package/dist/channel/telegram/telegram-channel.d.ts +7 -1
- package/dist/channel/telegram/telegram-channel.js +52 -1
- package/dist/channel/telegram/telegram-channel.js.map +1 -1
- package/dist/i18n/locales/en.js +19 -0
- package/dist/i18n/locales/en.js.map +1 -1
- package/dist/i18n/locales/vi.js +19 -0
- package/dist/i18n/locales/vi.js.map +1 -1
- package/dist/i18n/locales/zh.js +19 -0
- package/dist/i18n/locales/zh.js.map +1 -1
- package/dist/i18n/types.d.ts +19 -0
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/server/api-server.js +13 -0
- package/dist/server/api-server.js.map +1 -1
- package/dist/tmux/session-map.d.ts +1 -0
- package/dist/tmux/session-map.js +1 -0
- package/dist/tmux/session-map.js.map +1 -1
- package/dist/tmux/session-state.d.ts +1 -0
- package/dist/tmux/session-state.js +4 -0
- package/dist/tmux/session-state.js.map +1 -1
- package/dist/tmux/tmux-session-resolver.d.ts +1 -0
- package/dist/tmux/tmux-session-resolver.js +3 -0
- package/dist/tmux/tmux-session-resolver.js.map +1 -1
- package/dist/utils/constants.d.ts +1 -0
- package/dist/utils/constants.js +1 -0
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/paths.d.ts +1 -0
- package/dist/utils/paths.js +1 -0
- package/dist/utils/paths.js.map +1 -1
- package/package.json +18 -16
package/README.en.md
CHANGED
|
@@ -187,3 +187,11 @@ ccpoke uninstall
|
|
|
187
187
|
## License
|
|
188
188
|
|
|
189
189
|
MIT
|
|
190
|
+
|
|
191
|
+
## Contributors
|
|
192
|
+
<a href="https://github.com/lethai2597">
|
|
193
|
+
<img src="https://github.com/lethai2597.png" width="50" />
|
|
194
|
+
</a>
|
|
195
|
+
<a href="https://github.com/palooza-kaida">
|
|
196
|
+
<img src="https://github.com/palooza-kaida.png" width="50" />
|
|
197
|
+
</a>
|
package/README.md
CHANGED
|
@@ -187,3 +187,11 @@ ccpoke uninstall
|
|
|
187
187
|
## License
|
|
188
188
|
|
|
189
189
|
MIT
|
|
190
|
+
|
|
191
|
+
## Contributors
|
|
192
|
+
<a href="https://github.com/lethai2597">
|
|
193
|
+
<img src="https://github.com/lethai2597.png" width="50" />
|
|
194
|
+
</a>
|
|
195
|
+
<a href="https://github.com/palooza-kaida">
|
|
196
|
+
<img src="https://github.com/palooza-kaida.png" width="50" />
|
|
197
|
+
</a>
|
|
@@ -2,6 +2,14 @@ import type { NotificationChannel } from "../channel/types.js";
|
|
|
2
2
|
import type { TunnelManager } from "../utils/tunnel.js";
|
|
3
3
|
import type { AgentRegistry } from "./agent-registry.js";
|
|
4
4
|
import type { ChatSessionResolver } from "./chat-session-resolver.js";
|
|
5
|
+
export interface NotificationEvent {
|
|
6
|
+
sessionId: string;
|
|
7
|
+
tmuxTarget?: string;
|
|
8
|
+
notificationType: string;
|
|
9
|
+
message: string;
|
|
10
|
+
title?: string;
|
|
11
|
+
cwd?: string;
|
|
12
|
+
}
|
|
5
13
|
export declare class AgentHandler {
|
|
6
14
|
private registry;
|
|
7
15
|
private channel;
|
|
@@ -12,5 +20,8 @@ export declare class AgentHandler {
|
|
|
12
20
|
handleStopEvent(agentName: string, rawEvent: unknown): Promise<void>;
|
|
13
21
|
handleSessionStart(rawEvent: unknown): Promise<void>;
|
|
14
22
|
onSessionStart?: (rawEvent: unknown) => void;
|
|
23
|
+
onNotification?: (event: NotificationEvent) => void;
|
|
24
|
+
handleNotification(rawEvent: unknown): Promise<void>;
|
|
15
25
|
private buildResponseUrl;
|
|
26
|
+
private parseNotificationEvent;
|
|
16
27
|
}
|
|
@@ -47,6 +47,24 @@ export class AgentHandler {
|
|
|
47
47
|
this.onSessionStart?.(rawEvent);
|
|
48
48
|
}
|
|
49
49
|
onSessionStart;
|
|
50
|
+
onNotification;
|
|
51
|
+
async handleNotification(rawEvent) {
|
|
52
|
+
const event = this.parseNotificationEvent(rawEvent);
|
|
53
|
+
if (!event)
|
|
54
|
+
return;
|
|
55
|
+
let sessionId;
|
|
56
|
+
if (this.chatResolver) {
|
|
57
|
+
sessionId = this.chatResolver.resolveSessionId(event.sessionId, "", event.cwd, event.tmuxTarget);
|
|
58
|
+
}
|
|
59
|
+
if (!sessionId) {
|
|
60
|
+
sessionId = event.sessionId;
|
|
61
|
+
}
|
|
62
|
+
// Only elicitation_dialog blocks the session (needs user input)
|
|
63
|
+
if (event.notificationType === "elicitation_dialog") {
|
|
64
|
+
this.chatResolver?.onNotificationBlock?.(sessionId);
|
|
65
|
+
}
|
|
66
|
+
this.onNotification?.({ ...event, sessionId });
|
|
67
|
+
}
|
|
50
68
|
buildResponseUrl(data) {
|
|
51
69
|
const id = responseStore.save(data);
|
|
52
70
|
const apiBase = this.tunnelManager.getPublicUrl() || `http://localhost:${this.hookPort}`;
|
|
@@ -59,5 +77,23 @@ export class AgentHandler {
|
|
|
59
77
|
});
|
|
60
78
|
return `${MINI_APP_BASE_URL}/response/?${params.toString()}`;
|
|
61
79
|
}
|
|
80
|
+
parseNotificationEvent(raw) {
|
|
81
|
+
if (!raw || typeof raw !== "object")
|
|
82
|
+
return null;
|
|
83
|
+
const obj = raw;
|
|
84
|
+
const sessionId = typeof obj.session_id === "string" ? obj.session_id : "";
|
|
85
|
+
const notificationType = typeof obj.notification_type === "string" ? obj.notification_type : "";
|
|
86
|
+
const message = typeof obj.message === "string" ? obj.message : "";
|
|
87
|
+
if (!sessionId || !notificationType)
|
|
88
|
+
return null;
|
|
89
|
+
return {
|
|
90
|
+
sessionId,
|
|
91
|
+
notificationType,
|
|
92
|
+
message,
|
|
93
|
+
title: typeof obj.title === "string" ? obj.title : undefined,
|
|
94
|
+
cwd: typeof obj.cwd === "string" ? obj.cwd : undefined,
|
|
95
|
+
tmuxTarget: typeof obj.tmux_target === "string" ? obj.tmux_target : undefined,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
62
98
|
}
|
|
63
99
|
//# sourceMappingURL=agent-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-handler.js","sourceRoot":"","sources":["../../src/agent/agent-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-handler.js","sourceRoot":"","sources":["../../src/agent/agent-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,10 @@ export declare class ClaudeCodeInstaller {
|
|
|
8
8
|
static uninstall(): void;
|
|
9
9
|
private static writeStopScript;
|
|
10
10
|
private static writeSessionStartScript;
|
|
11
|
+
private static writeNotificationScript;
|
|
11
12
|
private static removeStopScript;
|
|
12
13
|
private static removeSessionStartScript;
|
|
14
|
+
private static removeNotificationScript;
|
|
13
15
|
private static removeFromSettings;
|
|
14
16
|
private static readSettings;
|
|
15
17
|
}
|
|
@@ -10,7 +10,8 @@ export class ClaudeCodeInstaller {
|
|
|
10
10
|
try {
|
|
11
11
|
const settings = ClaudeCodeInstaller.readSettings();
|
|
12
12
|
return (hasCcpokeHook(settings.hooks?.Stop ?? []) &&
|
|
13
|
-
hasCcpokeHook(settings.hooks?.SessionStart ?? [])
|
|
13
|
+
hasCcpokeHook(settings.hooks?.SessionStart ?? []) &&
|
|
14
|
+
hasCcpokeHook(settings.hooks?.Notification ?? []));
|
|
14
15
|
}
|
|
15
16
|
catch {
|
|
16
17
|
return false;
|
|
@@ -24,6 +25,8 @@ export class ClaudeCodeInstaller {
|
|
|
24
25
|
missing.push("Stop hook in settings");
|
|
25
26
|
if (!hasCcpokeHook(settings.hooks?.SessionStart ?? []))
|
|
26
27
|
missing.push("SessionStart hook in settings");
|
|
28
|
+
if (!hasCcpokeHook(settings.hooks?.Notification ?? []))
|
|
29
|
+
missing.push("Notification hook in settings");
|
|
27
30
|
}
|
|
28
31
|
catch {
|
|
29
32
|
missing.push("settings.json");
|
|
@@ -32,6 +35,8 @@ export class ClaudeCodeInstaller {
|
|
|
32
35
|
missing.push("stop script file");
|
|
33
36
|
if (!existsSync(paths.claudeCodeSessionStartScript))
|
|
34
37
|
missing.push("session-start script file");
|
|
38
|
+
if (!existsSync(paths.claudeCodeNotificationScript))
|
|
39
|
+
missing.push("notification script file");
|
|
35
40
|
return { complete: missing.length === 0, missing };
|
|
36
41
|
}
|
|
37
42
|
static install(hookPort, hookSecret) {
|
|
@@ -48,6 +53,10 @@ export class ClaudeCodeInstaller {
|
|
|
48
53
|
...(settings.hooks.SessionStart ?? []),
|
|
49
54
|
{ hooks: [{ type: "command", command: paths.claudeCodeSessionStartScript, timeout: 5 }] },
|
|
50
55
|
];
|
|
56
|
+
settings.hooks.Notification = [
|
|
57
|
+
...(settings.hooks.Notification ?? []),
|
|
58
|
+
{ hooks: [{ type: "command", command: paths.claudeCodeNotificationScript, timeout: 10 }] },
|
|
59
|
+
];
|
|
51
60
|
}
|
|
52
61
|
mkdirSync(paths.claudeDir, { recursive: true });
|
|
53
62
|
const tmpSettings = `${paths.claudeSettings}.tmp`;
|
|
@@ -55,11 +64,13 @@ export class ClaudeCodeInstaller {
|
|
|
55
64
|
renameSync(tmpSettings, paths.claudeSettings);
|
|
56
65
|
ClaudeCodeInstaller.writeStopScript(hookPort, hookSecret);
|
|
57
66
|
ClaudeCodeInstaller.writeSessionStartScript(hookPort, hookSecret);
|
|
67
|
+
ClaudeCodeInstaller.writeNotificationScript(hookPort, hookSecret);
|
|
58
68
|
}
|
|
59
69
|
static uninstall() {
|
|
60
70
|
ClaudeCodeInstaller.removeFromSettings();
|
|
61
71
|
ClaudeCodeInstaller.removeStopScript();
|
|
62
72
|
ClaudeCodeInstaller.removeSessionStartScript();
|
|
73
|
+
ClaudeCodeInstaller.removeNotificationScript();
|
|
63
74
|
}
|
|
64
75
|
static writeStopScript(hookPort, hookSecret) {
|
|
65
76
|
mkdirSync(paths.hooksDir, { recursive: true });
|
|
@@ -112,6 +123,40 @@ curl -s -X POST "http://127.0.0.1:${hookPort}${ApiRoute.HookSessionStart}" \\
|
|
|
112
123
|
`;
|
|
113
124
|
writeFileSync(paths.claudeCodeSessionStartScript, script, { mode: 0o700 });
|
|
114
125
|
}
|
|
126
|
+
static writeNotificationScript(hookPort, hookSecret) {
|
|
127
|
+
mkdirSync(paths.hooksDir, { recursive: true });
|
|
128
|
+
if (process.platform === "win32")
|
|
129
|
+
return;
|
|
130
|
+
const script = `#!/bin/bash
|
|
131
|
+
INPUT=$(cat)
|
|
132
|
+
SESSION_ID=$(echo "$INPUT" | grep -o '"session_id":"[^"]*"' | head -1 | cut -d'"' -f4)
|
|
133
|
+
NOTIFICATION_TYPE=$(echo "$INPUT" | grep -o '"notification_type":"[^"]*"' | head -1 | cut -d'"' -f4)
|
|
134
|
+
MESSAGE=$(echo "$INPUT" | grep -o '"message":"[^"]*"' | head -1 | cut -d'"' -f4)
|
|
135
|
+
TITLE=$(echo "$INPUT" | grep -o '"title":"[^"]*"' | head -1 | cut -d'"' -f4)
|
|
136
|
+
CWD=$(echo "$INPUT" | grep -o '"cwd":"[^"]*"' | head -1 | cut -d'"' -f4)
|
|
137
|
+
|
|
138
|
+
[ -z "$SESSION_ID" ] && exit 0
|
|
139
|
+
[ -z "$NOTIFICATION_TYPE" ] && exit 0
|
|
140
|
+
|
|
141
|
+
TMUX_TARGET=""
|
|
142
|
+
[ -n "$TMUX" ] && TMUX_TARGET=$(tmux display-message -p '#{session_name}:#{window_index}.#{pane_index}' 2>/dev/null || echo "")
|
|
143
|
+
|
|
144
|
+
json_escape() {
|
|
145
|
+
printf '%s' "$1" | sed 's/\\\\/\\\\\\\\/g; s/"/\\\\"/g; s/\\t/\\\\t/g' | tr -d '\\n\\r'
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
PAYLOAD=$(printf '{"session_id":"%s","notification_type":"%s","message":"%s","title":"%s","cwd":"%s","tmux_target":"%s"}' \\
|
|
149
|
+
"$(json_escape "$SESSION_ID")" "$(json_escape "$NOTIFICATION_TYPE")" "$(json_escape "$MESSAGE")" \\
|
|
150
|
+
"$(json_escape "$TITLE")" "$(json_escape "$CWD")" "$(json_escape "$TMUX_TARGET")")
|
|
151
|
+
|
|
152
|
+
curl -s -X POST "http://127.0.0.1:${hookPort}${ApiRoute.HookNotification}" \\
|
|
153
|
+
-H "Content-Type: application/json" \\
|
|
154
|
+
-H "X-CCPoke-Secret: ${hookSecret}" \\
|
|
155
|
+
-d "$PAYLOAD" \\
|
|
156
|
+
--max-time 5 > /dev/null 2>&1 || true
|
|
157
|
+
`;
|
|
158
|
+
writeFileSync(paths.claudeCodeNotificationScript, script, { mode: 0o700 });
|
|
159
|
+
}
|
|
115
160
|
static removeStopScript() {
|
|
116
161
|
try {
|
|
117
162
|
unlinkSync(paths.claudeCodeHookScript);
|
|
@@ -128,11 +173,19 @@ curl -s -X POST "http://127.0.0.1:${hookPort}${ApiRoute.HookSessionStart}" \\
|
|
|
128
173
|
/* may not exist */
|
|
129
174
|
}
|
|
130
175
|
}
|
|
176
|
+
static removeNotificationScript() {
|
|
177
|
+
try {
|
|
178
|
+
unlinkSync(paths.claudeCodeNotificationScript);
|
|
179
|
+
}
|
|
180
|
+
catch {
|
|
181
|
+
/* may not exist */
|
|
182
|
+
}
|
|
183
|
+
}
|
|
131
184
|
static removeFromSettings() {
|
|
132
185
|
const settings = ClaudeCodeInstaller.readSettings();
|
|
133
186
|
if (!settings.hooks)
|
|
134
187
|
return;
|
|
135
|
-
for (const hookType of ["Stop", "SessionStart"]) {
|
|
188
|
+
for (const hookType of ["Stop", "SessionStart", "Notification"]) {
|
|
136
189
|
const entries = settings.hooks[hookType];
|
|
137
190
|
if (!entries)
|
|
138
191
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code-installer.js","sourceRoot":"","sources":["../../../src/agent/claude-code/claude-code-installer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,GACd,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-code-installer.js","sourceRoot":"","sources":["../../../src/agent/claude-code/claude-code-installer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type TelegramBot from "node-telegram-bot-api";
|
|
2
|
+
import type { NotificationEvent } from "../../agent/agent-handler.js";
|
|
3
|
+
import { type SessionMap } from "../../tmux/session-map.js";
|
|
4
|
+
import type { TmuxBridge } from "../../tmux/tmux-bridge.js";
|
|
5
|
+
export declare class PromptHandler {
|
|
6
|
+
private bot;
|
|
7
|
+
private chatId;
|
|
8
|
+
private sessionMap;
|
|
9
|
+
private tmuxBridge;
|
|
10
|
+
private pending;
|
|
11
|
+
private timers;
|
|
12
|
+
constructor(bot: TelegramBot, chatId: () => number | null, sessionMap: SessionMap, tmuxBridge: TmuxBridge);
|
|
13
|
+
forwardPrompt(event: NotificationEvent): Promise<void>;
|
|
14
|
+
injectElicitationResponse(sessionId: string, text: string): boolean;
|
|
15
|
+
destroy(): void;
|
|
16
|
+
onElicitationSent?: (chatId: number, messageId: number, sessionId: string, project: string) => void;
|
|
17
|
+
private sendElicitationPrompt;
|
|
18
|
+
private sendIdleNotification;
|
|
19
|
+
private resolveProjectName;
|
|
20
|
+
private setPending;
|
|
21
|
+
private clearPending;
|
|
22
|
+
}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
import { t } from "../../i18n/index.js";
|
|
2
|
+
import { SessionState } from "../../tmux/session-map.js";
|
|
3
|
+
const PROMPT_EXPIRE_MS = 10 * 60 * 1000;
|
|
4
|
+
const MAX_PENDING = 100;
|
|
5
|
+
const MAX_RESPONSE_LENGTH = 10_000;
|
|
6
|
+
export class PromptHandler {
|
|
7
|
+
bot;
|
|
8
|
+
chatId;
|
|
9
|
+
sessionMap;
|
|
10
|
+
tmuxBridge;
|
|
11
|
+
pending = new Map();
|
|
12
|
+
timers = new Map();
|
|
13
|
+
constructor(bot, chatId, sessionMap, tmuxBridge) {
|
|
14
|
+
this.bot = bot;
|
|
15
|
+
this.chatId = chatId;
|
|
16
|
+
this.sessionMap = sessionMap;
|
|
17
|
+
this.tmuxBridge = tmuxBridge;
|
|
18
|
+
}
|
|
19
|
+
async forwardPrompt(event) {
|
|
20
|
+
const chat = this.chatId();
|
|
21
|
+
if (!chat)
|
|
22
|
+
return;
|
|
23
|
+
switch (event.notificationType) {
|
|
24
|
+
case "elicitation_dialog":
|
|
25
|
+
await this.sendElicitationPrompt(chat, event);
|
|
26
|
+
break;
|
|
27
|
+
case "idle_prompt":
|
|
28
|
+
await this.sendIdleNotification(chat, event);
|
|
29
|
+
break;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
injectElicitationResponse(sessionId, text) {
|
|
33
|
+
const session = this.sessionMap.getBySessionId(sessionId);
|
|
34
|
+
if (!session)
|
|
35
|
+
return false;
|
|
36
|
+
if (!this.pending.has(sessionId))
|
|
37
|
+
return false;
|
|
38
|
+
const trimmed = text.trim();
|
|
39
|
+
if (trimmed.length === 0)
|
|
40
|
+
return false;
|
|
41
|
+
const safeText = trimmed.length > MAX_RESPONSE_LENGTH ? trimmed.slice(0, MAX_RESPONSE_LENGTH) : trimmed;
|
|
42
|
+
try {
|
|
43
|
+
this.tmuxBridge.sendKeys(session.tmuxTarget, safeText);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
this.sessionMap.updateState(sessionId, SessionState.Busy);
|
|
49
|
+
this.sessionMap.touch(sessionId);
|
|
50
|
+
this.clearPending(sessionId);
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
destroy() {
|
|
54
|
+
for (const timer of this.timers.values())
|
|
55
|
+
clearTimeout(timer);
|
|
56
|
+
this.timers.clear();
|
|
57
|
+
this.pending.clear();
|
|
58
|
+
}
|
|
59
|
+
onElicitationSent;
|
|
60
|
+
// --- Private ---
|
|
61
|
+
async sendElicitationPrompt(chatId, event) {
|
|
62
|
+
const title = event.title
|
|
63
|
+
? `\u2753 *${escapeMarkdownV2(event.title)}*`
|
|
64
|
+
: `\u2753 *${escapeMarkdownV2(t("prompt.elicitationTitle"))}*`;
|
|
65
|
+
const body = escapeMarkdownV2(event.message);
|
|
66
|
+
const project = this.resolveProjectName(event.sessionId);
|
|
67
|
+
const projectLine = project ? `\n_${escapeMarkdownV2(project)}_` : "";
|
|
68
|
+
const text = `${title}${projectLine}\n\n${body}\n\n${escapeMarkdownV2(t("prompt.elicitationReplyHint"))}`;
|
|
69
|
+
const sent = await this.bot
|
|
70
|
+
.sendMessage(chatId, text, {
|
|
71
|
+
parse_mode: "MarkdownV2",
|
|
72
|
+
reply_markup: {
|
|
73
|
+
force_reply: true,
|
|
74
|
+
input_field_placeholder: t("chat.placeholder"),
|
|
75
|
+
},
|
|
76
|
+
})
|
|
77
|
+
.catch(() => null);
|
|
78
|
+
if (sent) {
|
|
79
|
+
this.setPending(event.sessionId);
|
|
80
|
+
this.onElicitationSent?.(chatId, sent.message_id, event.sessionId, project ?? "");
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
async sendIdleNotification(chatId, event) {
|
|
84
|
+
const project = this.resolveProjectName(event.sessionId);
|
|
85
|
+
const title = `\u{1F4AD} *${escapeMarkdownV2(t("prompt.idleTitle"))}*`;
|
|
86
|
+
const body = project
|
|
87
|
+
? escapeMarkdownV2(t("prompt.idleBody", { project }))
|
|
88
|
+
: escapeMarkdownV2(event.message);
|
|
89
|
+
const text = `${title}\n\n${body}`;
|
|
90
|
+
const buttons = [];
|
|
91
|
+
if (event.sessionId) {
|
|
92
|
+
buttons.push([
|
|
93
|
+
{ text: `\u{1F4AC} ${t("sessions.chatButton")}`, callback_data: `chat:${event.sessionId}` },
|
|
94
|
+
]);
|
|
95
|
+
}
|
|
96
|
+
await this.bot
|
|
97
|
+
.sendMessage(chatId, text, {
|
|
98
|
+
parse_mode: "MarkdownV2",
|
|
99
|
+
reply_markup: buttons.length > 0 ? { inline_keyboard: buttons } : undefined,
|
|
100
|
+
})
|
|
101
|
+
.catch(() => { });
|
|
102
|
+
}
|
|
103
|
+
resolveProjectName(sessionId) {
|
|
104
|
+
return this.sessionMap.getBySessionId(sessionId)?.project;
|
|
105
|
+
}
|
|
106
|
+
setPending(sessionId) {
|
|
107
|
+
if (this.pending.size >= MAX_PENDING && !this.pending.has(sessionId)) {
|
|
108
|
+
const oldest = [...this.pending.entries()].sort((a, b) => a[1].createdAt - b[1].createdAt)[0];
|
|
109
|
+
if (oldest)
|
|
110
|
+
this.clearPending(oldest[0]);
|
|
111
|
+
}
|
|
112
|
+
this.clearPending(sessionId);
|
|
113
|
+
this.pending.set(sessionId, { sessionId, createdAt: Date.now() });
|
|
114
|
+
const timer = setTimeout(() => {
|
|
115
|
+
this.pending.delete(sessionId);
|
|
116
|
+
this.timers.delete(sessionId);
|
|
117
|
+
}, PROMPT_EXPIRE_MS);
|
|
118
|
+
this.timers.set(sessionId, timer);
|
|
119
|
+
}
|
|
120
|
+
clearPending(sessionId) {
|
|
121
|
+
this.pending.delete(sessionId);
|
|
122
|
+
const timer = this.timers.get(sessionId);
|
|
123
|
+
if (timer)
|
|
124
|
+
clearTimeout(timer);
|
|
125
|
+
this.timers.delete(sessionId);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
function escapeMarkdownV2(text) {
|
|
129
|
+
return text.replace(/[_*[\]()~`>#+\-=|{}.!\\]/g, (m) => `\\${m}`);
|
|
130
|
+
}
|
|
131
|
+
//# sourceMappingURL=prompt-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompt-handler.js","sourceRoot":"","sources":["../../../src/channel/telegram/prompt-handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAmB,MAAM,2BAA2B,CAAC;AAQ1E,MAAM,gBAAgB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACxC,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAEnC,MAAM,OAAO,aAAa;IAKd;IACA;IACA;IACA;IAPF,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC3C,MAAM,GAAG,IAAI,GAAG,EAAyC,CAAC;IAElE,YACU,GAAgB,EAChB,MAA2B,EAC3B,UAAsB,EACtB,UAAsB;QAHtB,QAAG,GAAH,GAAG,CAAa;QAChB,WAAM,GAAN,MAAM,CAAqB;QAC3B,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;IAC7B,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,KAAwB;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,QAAQ,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC/B,KAAK,oBAAoB;gBACvB,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC9C,MAAM;YACR,KAAK,aAAa;gBAChB,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC7C,MAAM;QACV,CAAC;IACH,CAAC;IAED,yBAAyB,CAAC,SAAiB,EAAE,IAAY;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,OAAO,KAAK,CAAC;QAE/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAEvC,MAAM,QAAQ,GACZ,OAAO,CAAC,MAAM,GAAG,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAEzF,IAAI,CAAC;YACH,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,iBAAiB,CAKP;IAEV,kBAAkB;IAEV,KAAK,CAAC,qBAAqB,CAAC,MAAc,EAAE,KAAwB;QAC1E,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK;YACvB,CAAC,CAAC,WAAW,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG;YAC7C,CAAC,CAAC,WAAW,gBAAgB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC;QAEjE,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAEtE,MAAM,IAAI,GAAG,GAAG,KAAK,GAAG,WAAW,OAAO,IAAI,OAAO,gBAAgB,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,EAAE,CAAC;QAE1G,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG;aACxB,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE;YACzB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE;gBACZ,WAAW,EAAE,IAAI;gBACjB,uBAAuB,EAAE,CAAC,CAAC,kBAAkB,CAAC;aAC/C;SACF,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAErB,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACjC,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,MAAc,EAAE,KAAwB;QACzE,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,KAAK,GAAG,cAAc,gBAAgB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC;QACvE,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YACrD,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,IAAI,GAAG,GAAG,KAAK,OAAO,IAAI,EAAE,CAAC;QAEnC,MAAM,OAAO,GAAyC,EAAE,CAAC;QACzD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC;gBACX,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,qBAAqB,CAAC,EAAE,EAAE,aAAa,EAAE,QAAQ,KAAK,CAAC,SAAS,EAAE,EAAE;aAC5F,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,CAAC,GAAG;aACX,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE;YACzB,UAAU,EAAE,YAAY;YACxB,YAAY,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS;SAC5E,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACrB,CAAC;IAEO,kBAAkB,CAAC,SAAiB;QAC1C,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC5D,CAAC;IAEO,UAAU,CAAC,SAAiB;QAClC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACrE,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9F,IAAI,MAAM;gBAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAElE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;IAEO,YAAY,CAAC,SAAiB;QACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;CACF;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type TelegramBot from "node-telegram-bot-api";
|
|
2
|
+
import { type TmuxSession } from "../../tmux/session-map.js";
|
|
3
|
+
export declare function formatSessionList(sessions: TmuxSession[]): {
|
|
4
|
+
text: string;
|
|
5
|
+
replyMarkup: TelegramBot.InlineKeyboardMarkup | undefined;
|
|
6
|
+
};
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { t } from "../../i18n/index.js";
|
|
2
|
+
import { SessionState } from "../../tmux/session-map.js";
|
|
3
|
+
const STATE_EMOJI = {
|
|
4
|
+
[SessionState.Idle]: "\u{1F7E2}",
|
|
5
|
+
[SessionState.Busy]: "\u{1F7E1}",
|
|
6
|
+
[SessionState.Blocked]: "\u{1F534}",
|
|
7
|
+
[SessionState.Unknown]: "\u26AA",
|
|
8
|
+
};
|
|
9
|
+
const MAX_KEYBOARD_ROWS = 50;
|
|
10
|
+
export function formatSessionList(sessions) {
|
|
11
|
+
if (sessions.length === 0) {
|
|
12
|
+
return { text: t("sessions.empty"), replyMarkup: undefined };
|
|
13
|
+
}
|
|
14
|
+
const sorted = [...sessions].sort((a, b) => b.lastActivity.getTime() - a.lastActivity.getTime());
|
|
15
|
+
const rows = [];
|
|
16
|
+
for (const session of sorted.slice(0, MAX_KEYBOARD_ROWS)) {
|
|
17
|
+
const emoji = STATE_EMOJI[session.state] ?? "\u26AA";
|
|
18
|
+
const label = `${emoji} ${session.project}`;
|
|
19
|
+
const stateLabel = stateText(session.state);
|
|
20
|
+
rows.push([
|
|
21
|
+
{ text: `${label} (${stateLabel})`, callback_data: `noop:${session.sessionId}` },
|
|
22
|
+
{ text: t("sessions.chatButton"), callback_data: `chat:${session.sessionId}` },
|
|
23
|
+
]);
|
|
24
|
+
}
|
|
25
|
+
return {
|
|
26
|
+
text: `*${escapeMarkdownV2(t("sessions.title"))}*`,
|
|
27
|
+
replyMarkup: { inline_keyboard: rows },
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
function stateText(state) {
|
|
31
|
+
switch (state) {
|
|
32
|
+
case SessionState.Idle:
|
|
33
|
+
return t("sessions.stateIdle");
|
|
34
|
+
case SessionState.Busy:
|
|
35
|
+
return t("sessions.stateBusy");
|
|
36
|
+
case SessionState.Blocked:
|
|
37
|
+
return t("sessions.stateBlocked");
|
|
38
|
+
default:
|
|
39
|
+
return "?";
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
function escapeMarkdownV2(text) {
|
|
43
|
+
return text.replace(/[_*[\]()~`>#+\-=|{}.!\\]/g, (m) => `\\${m}`);
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=session-list.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-list.js","sourceRoot":"","sources":["../../../src/channel/telegram/session-list.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAoB,MAAM,2BAA2B,CAAC;AAE3E,MAAM,WAAW,GAA2B;IAC1C,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,WAAW;IAChC,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,WAAW;IAChC,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,WAAW;IACnC,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,QAAQ;CACjC,CAAC;AAEF,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAE7B,MAAM,UAAU,iBAAiB,CAAC,QAAuB;IAIvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;IAC/D,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;IAEjG,MAAM,IAAI,GAAyC,EAAE,CAAC;IAEtD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACzD,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC;QACrD,MAAM,KAAK,GAAG,GAAG,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC;YACR,EAAE,IAAI,EAAE,GAAG,KAAK,KAAK,UAAU,GAAG,EAAE,aAAa,EAAE,QAAQ,OAAO,CAAC,SAAS,EAAE,EAAE;YAChF,EAAE,IAAI,EAAE,CAAC,CAAC,qBAAqB,CAAC,EAAE,aAAa,EAAE,QAAQ,OAAO,CAAC,SAAS,EAAE,EAAE;SAC/E,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,GAAG;QAClD,WAAW,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE;KACvC,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,KAAmB;IACpC,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,YAAY,CAAC,IAAI;YACpB,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC;QACjC,KAAK,YAAY,CAAC,IAAI;YACpB,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC;QACjC,KAAK,YAAY,CAAC,OAAO;YACvB,OAAO,CAAC,CAAC,uBAAuB,CAAC,CAAC;QACpC;YACE,OAAO,GAAG,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import type { NotificationEvent } from "../../agent/agent-handler.js";
|
|
1
2
|
import { type Config } from "../../config-manager.js";
|
|
2
3
|
import type { SessionMap } from "../../tmux/session-map.js";
|
|
3
4
|
import type { SessionStateManager } from "../../tmux/session-state.js";
|
|
5
|
+
import type { TmuxBridge } from "../../tmux/tmux-bridge.js";
|
|
4
6
|
import type { NotificationChannel, NotificationData } from "../types.js";
|
|
5
7
|
export declare class TelegramChannel implements NotificationChannel {
|
|
6
8
|
private bot;
|
|
@@ -10,14 +12,18 @@ export declare class TelegramChannel implements NotificationChannel {
|
|
|
10
12
|
private pendingReplyStore;
|
|
11
13
|
private sessionMap;
|
|
12
14
|
private stateManager;
|
|
13
|
-
|
|
15
|
+
private tmuxBridge;
|
|
16
|
+
private promptHandler;
|
|
17
|
+
constructor(cfg: Config, sessionMap?: SessionMap, stateManager?: SessionStateManager, tmuxBridge?: TmuxBridge);
|
|
14
18
|
initialize(): Promise<void>;
|
|
15
19
|
shutdown(): Promise<void>;
|
|
20
|
+
handleNotificationEvent(event: NotificationEvent): void;
|
|
16
21
|
sendNotification(data: NotificationData, responseUrl?: string): Promise<void>;
|
|
17
22
|
private formatNotification;
|
|
18
23
|
private registerCommands;
|
|
19
24
|
private registerMenuButton;
|
|
20
25
|
private registerHandlers;
|
|
21
26
|
private registerChatHandlers;
|
|
27
|
+
private registerSessionsHandlers;
|
|
22
28
|
private registerPollingErrorHandler;
|
|
23
29
|
}
|
|
@@ -6,6 +6,8 @@ import { log, logError, logWarn } from "../../utils/log.js";
|
|
|
6
6
|
import { extractProseSnippet } from "../../utils/markdown.js";
|
|
7
7
|
import { formatDuration, formatModelName, formatTokenCount } from "../../utils/stats-format.js";
|
|
8
8
|
import { PendingReplyStore } from "./pending-reply-store.js";
|
|
9
|
+
import { PromptHandler } from "./prompt-handler.js";
|
|
10
|
+
import { formatSessionList } from "./session-list.js";
|
|
9
11
|
import { sendTelegramMessage } from "./telegram-sender.js";
|
|
10
12
|
export class TelegramChannel {
|
|
11
13
|
bot;
|
|
@@ -15,15 +17,25 @@ export class TelegramChannel {
|
|
|
15
17
|
pendingReplyStore = new PendingReplyStore();
|
|
16
18
|
sessionMap;
|
|
17
19
|
stateManager;
|
|
18
|
-
|
|
20
|
+
tmuxBridge;
|
|
21
|
+
promptHandler = null;
|
|
22
|
+
constructor(cfg, sessionMap, stateManager, tmuxBridge) {
|
|
19
23
|
this.cfg = cfg;
|
|
20
24
|
this.sessionMap = sessionMap ?? null;
|
|
21
25
|
this.stateManager = stateManager ?? null;
|
|
26
|
+
this.tmuxBridge = tmuxBridge ?? null;
|
|
22
27
|
this.bot = new TelegramBot(cfg.telegram_bot_token, { polling: false });
|
|
23
28
|
this.chatId = ConfigManager.loadChatState().chat_id;
|
|
24
29
|
this.registerHandlers();
|
|
25
30
|
this.registerChatHandlers();
|
|
31
|
+
this.registerSessionsHandlers();
|
|
26
32
|
this.registerPollingErrorHandler();
|
|
33
|
+
if (this.sessionMap && this.tmuxBridge) {
|
|
34
|
+
this.promptHandler = new PromptHandler(this.bot, () => this.chatId, this.sessionMap, this.tmuxBridge);
|
|
35
|
+
this.promptHandler.onElicitationSent = (chatId, messageId, sessionId, project) => {
|
|
36
|
+
this.pendingReplyStore.set(chatId, messageId, sessionId, project);
|
|
37
|
+
};
|
|
38
|
+
}
|
|
27
39
|
}
|
|
28
40
|
async initialize() {
|
|
29
41
|
this.bot.startPolling();
|
|
@@ -32,9 +44,13 @@ export class TelegramChannel {
|
|
|
32
44
|
log(t("bot.telegramStarted"));
|
|
33
45
|
}
|
|
34
46
|
async shutdown() {
|
|
47
|
+
this.promptHandler?.destroy();
|
|
35
48
|
this.pendingReplyStore.destroy();
|
|
36
49
|
this.bot.stopPolling();
|
|
37
50
|
}
|
|
51
|
+
handleNotificationEvent(event) {
|
|
52
|
+
this.promptHandler?.forwardPrompt(event).catch(() => { });
|
|
53
|
+
}
|
|
38
54
|
async sendNotification(data, responseUrl) {
|
|
39
55
|
if (!this.chatId) {
|
|
40
56
|
log(t("bot.noChatId"));
|
|
@@ -79,6 +95,7 @@ export class TelegramChannel {
|
|
|
79
95
|
const translations = getTranslations();
|
|
80
96
|
const commands = [
|
|
81
97
|
{ command: "start", description: translations.bot.commands.start },
|
|
98
|
+
{ command: "sessions", description: translations.bot.commands.sessions },
|
|
82
99
|
];
|
|
83
100
|
try {
|
|
84
101
|
await this.bot.setMyCommands(commands);
|
|
@@ -165,6 +182,14 @@ export class TelegramChannel {
|
|
|
165
182
|
if (!pending)
|
|
166
183
|
return;
|
|
167
184
|
this.pendingReplyStore.delete(msg.chat.id, msg.reply_to_message.message_id);
|
|
185
|
+
// Try elicitation response first (prompt forwarding)
|
|
186
|
+
if (this.promptHandler) {
|
|
187
|
+
const injected = this.promptHandler.injectElicitationResponse(pending.sessionId, msg.text);
|
|
188
|
+
if (injected) {
|
|
189
|
+
await this.bot.sendMessage(msg.chat.id, t("prompt.responded", { project: pending.project }));
|
|
190
|
+
return;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
168
193
|
if (!this.stateManager) {
|
|
169
194
|
await this.bot.sendMessage(msg.chat.id, t("chat.sessionNotFound"));
|
|
170
195
|
return;
|
|
@@ -190,6 +215,32 @@ export class TelegramChannel {
|
|
|
190
215
|
}
|
|
191
216
|
});
|
|
192
217
|
}
|
|
218
|
+
registerSessionsHandlers() {
|
|
219
|
+
this.bot.onText(/\/sessions(?:\s|$)/, (msg) => {
|
|
220
|
+
if (!ConfigManager.isOwner(this.cfg, msg.from?.id ?? 0))
|
|
221
|
+
return;
|
|
222
|
+
if (!this.sessionMap) {
|
|
223
|
+
this.bot.sendMessage(msg.chat.id, t("sessions.empty")).catch(() => { });
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
if (this.tmuxBridge) {
|
|
227
|
+
this.sessionMap.refreshFromTmux(this.tmuxBridge);
|
|
228
|
+
}
|
|
229
|
+
const sessions = this.sessionMap.getAllActive();
|
|
230
|
+
const { text, replyMarkup } = formatSessionList(sessions);
|
|
231
|
+
const opts = { parse_mode: "MarkdownV2" };
|
|
232
|
+
if (replyMarkup)
|
|
233
|
+
opts.reply_markup = replyMarkup;
|
|
234
|
+
this.bot.sendMessage(msg.chat.id, text, opts).catch(() => { });
|
|
235
|
+
});
|
|
236
|
+
this.bot.on("callback_query", async (query) => {
|
|
237
|
+
if (!query.data?.startsWith("noop:"))
|
|
238
|
+
return;
|
|
239
|
+
if (!ConfigManager.isOwner(this.cfg, query.from.id))
|
|
240
|
+
return;
|
|
241
|
+
await this.bot.answerCallbackQuery(query.id);
|
|
242
|
+
});
|
|
243
|
+
}
|
|
193
244
|
registerPollingErrorHandler() {
|
|
194
245
|
this.bot.on("polling_error", () => {
|
|
195
246
|
if (!this.isDisconnected) {
|