let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: format + fix telegram thread ids

Browse Source
This commit is contained in:
Peter Steinberger
2026-01-15 09:13:13 +00:00
parent 5599603bdb
commit 4291d56e0b
8 changed files with 90 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/agents/pi-embedded-helpers.formatrawassistanterrorforui.test.ts
View File

@@ -18,4 +18,3 @@ describe("formatRawAssistantErrorForUi", () => {
expect(formatRawAssistantErrorForUi("")).toContain("unknown error");
});
});

6
src/auto-reply/command-auth.ts
View File

@@ -155,11 +155,7 @@ export function resolveCommandAuthorization(params: {
const senderId = matchedSender ?? senderCandidates[0];
const enforceOwner = Boolean(dock?.commands?.enforceOwnerForCommands);
const isOwner =
!enforceOwner ||
allowAll ||
ownerList.length === 0 ||
Boolean(matchedSender);
const isOwner = !enforceOwner || allowAll || ownerList.length === 0 || Boolean(matchedSender);
const isAuthorizedSender = commandAuthorized && isOwner;
return {

17
src/channels/plugins/outbound/telegram.ts
View File

@@ -8,6 +8,17 @@ function parseReplyToMessageId(replyToId?: string | null) {
return Number.isFinite(parsed) ? parsed : undefined;
}
function parseThreadId(threadId?: string | number | null) {
if (threadId == null) return undefined;
if (typeof threadId === "number") {
return Number.isFinite(threadId) ? Math.trunc(threadId) : undefined;
}
const trimmed = threadId.trim();
if (!trimmed) return undefined;
const parsed = Number.parseInt(trimmed, 10);
return Number.isFinite(parsed) ? parsed : undefined;
}
export const telegramOutbound: ChannelOutboundAdapter = {
deliveryMode: "direct",
chunker: markdownToTelegramHtmlChunks,
@@ -25,10 +36,11 @@ export const telegramOutbound: ChannelOutboundAdapter = {
sendText: async ({ to, text, accountId, deps, replyToId, threadId }) => {
const send = deps?.sendTelegram ?? sendMessageTelegram;
const replyToMessageId = parseReplyToMessageId(replyToId);
const messageThreadId = parseThreadId(threadId);
const result = await send(to, text, {
verbose: false,
textMode: "html",
messageThreadId: threadId ?? undefined,
messageThreadId,
replyToMessageId,
accountId: accountId ?? undefined,
});
@@ -37,11 +49,12 @@ export const telegramOutbound: ChannelOutboundAdapter = {
sendMedia: async ({ to, text, mediaUrl, accountId, deps, replyToId, threadId }) => {
const send = deps?.sendTelegram ?? sendMessageTelegram;
const replyToMessageId = parseReplyToMessageId(replyToId);
const messageThreadId = parseThreadId(threadId);
const result = await send(to, text, {
verbose: false,
mediaUrl,
textMode: "html",
messageThreadId: threadId ?? undefined,
messageThreadId,
replyToMessageId,
accountId: accountId ?? undefined,
});

37
src/channels/plugins/telegram.ts
View File

@@ -36,6 +36,23 @@ import type { ChannelPlugin } from "./types.js";
const meta = getChatChannelMeta("telegram");
function parseReplyToMessageId(replyToId?: string | null) {
if (!replyToId) return undefined;
const parsed = Number.parseInt(replyToId, 10);
return Number.isFinite(parsed) ? parsed : undefined;
}
function parseThreadId(threadId?: string | number | null) {
if (threadId == null) return undefined;
if (typeof threadId === "number") {
return Number.isFinite(threadId) ? Math.trunc(threadId) : undefined;
}
const trimmed = threadId.trim();
if (!trimmed) return undefined;
const parsed = Number.parseInt(trimmed, 10);
return Number.isFinite(parsed) ? parsed : undefined;
}
export const telegramPlugin: ChannelPlugin<ResolvedTelegramAccount> = {
id: "telegram",
meta: {
@@ -231,29 +248,25 @@ export const telegramPlugin: ChannelPlugin<ResolvedTelegramAccount> = {
},
sendText: async ({ to, text, accountId, deps, replyToId, threadId }) => {
const send = deps?.sendTelegram ?? sendMessageTelegram;
const replyToMessageId = replyToId ? Number.parseInt(replyToId, 10) : undefined;
const resolvedReplyToMessageId = Number.isFinite(replyToMessageId)
? replyToMessageId
: undefined;
const replyToMessageId = parseReplyToMessageId(replyToId);
const messageThreadId = parseThreadId(threadId);
const result = await send(to, text, {
verbose: false,
messageThreadId: threadId ?? undefined,
replyToMessageId: resolvedReplyToMessageId,
messageThreadId,
replyToMessageId,
accountId: accountId ?? undefined,
});
return { channel: "telegram", ...result };
},
sendMedia: async ({ to, text, mediaUrl, accountId, deps, replyToId, threadId }) => {
const send = deps?.sendTelegram ?? sendMessageTelegram;
const replyToMessageId = replyToId ? Number.parseInt(replyToId, 10) : undefined;
const resolvedReplyToMessageId = Number.isFinite(replyToMessageId)
? replyToMessageId
: undefined;
const replyToMessageId = parseReplyToMessageId(replyToId);
const messageThreadId = parseThreadId(threadId);
const result = await send(to, text, {
verbose: false,
mediaUrl,
messageThreadId: threadId ?? undefined,
replyToMessageId: resolvedReplyToMessageId,
messageThreadId,
replyToMessageId,
accountId: accountId ?? undefined,
});
return { channel: "telegram", ...result };

6
src/commands/channels/add.ts
View File

@@ -94,9 +94,9 @@ export async function channelsAddCommand(
}
await writeConfigFile(nextConfig);
await prompter.outro("Channels updated.");
return;
}
await prompter.outro("Channels updated.");
return;
}
const channel = normalizeChannelId(opts.channel);
if (!channel) {

7
src/slack/monitor/context.ts
View File

@@ -29,7 +29,12 @@ export function normalizeSlackChannelType(
channelId?: string | null,
): SlackMessageEvent["channel_type"] {
const normalized = channelType?.trim().toLowerCase();
if (normalized === "im" || normalized === "mpim" || normalized === "channel" || normalized === "group") {
if (
normalized === "im" ||
normalized === "mpim" ||
normalized === "channel" ||
normalized === "group"
) {
return normalized;
}
return inferSlackChannelType(channelId) ?? "channel";

1
src/tui/tui-formatters.test.ts
View File

@@ -28,4 +28,3 @@ describe("extractTextFromMessage", () => {
expect(text).toContain("unknown error");
});
});

80
src/wizard/onboarding.finalize.ts
View File

@@ -141,11 +141,11 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
"Gateway daemon",
{ doneMessage: "Gateway daemon restarted." },
async (progress) => {
progress.update("Restarting Gateway daemon…");
await service.restart({
profile: process.env.CLAWDBOT_PROFILE,
stdout: process.stdout,
});
progress.update("Restarting Gateway daemon…");
await service.restart({
profile: process.env.CLAWDBOT_PROFILE,
stdout: process.stdout,
});
},
);
} else if (action === "reinstall") {
@@ -153,8 +153,8 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
"Gateway daemon",
{ doneMessage: "Gateway daemon uninstalled." },
async (progress) => {
progress.update("Uninstalling Gateway daemon…");
await service.uninstall({ env: process.env, stdout: process.stdout });
progress.update("Uninstalling Gateway daemon…");
await service.uninstall({ env: process.env, stdout: process.stdout });
},
);
}
@@ -170,40 +170,40 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
"Gateway daemon",
{ doneMessage: "Gateway daemon installed." },
async (progress) => {
progress.update("Preparing Gateway daemon…");
const nodePath = await resolvePreferredNodePath({
env: process.env,
runtime: daemonRuntime,
});
const { programArguments, workingDirectory } = await resolveGatewayProgramArguments({
port: settings.port,
dev: devMode,
runtime: daemonRuntime,
nodePath,
});
if (daemonRuntime === "node") {
const systemNode = await resolveSystemNodeInfo({ env: process.env });
const warning = renderSystemNodeWarning(systemNode, programArguments[0]);
if (warning) await prompter.note(warning, "Gateway runtime");
}
const environment = buildServiceEnvironment({
env: process.env,
port: settings.port,
token: settings.gatewayToken,
launchdLabel:
process.platform === "darwin"
? resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE)
: undefined,
});
progress.update("Preparing Gateway daemon…");
const nodePath = await resolvePreferredNodePath({
env: process.env,
runtime: daemonRuntime,
});
const { programArguments, workingDirectory } = await resolveGatewayProgramArguments({
port: settings.port,
dev: devMode,
runtime: daemonRuntime,
nodePath,
});
if (daemonRuntime === "node") {
const systemNode = await resolveSystemNodeInfo({ env: process.env });
const warning = renderSystemNodeWarning(systemNode, programArguments[0]);
if (warning) await prompter.note(warning, "Gateway runtime");
}
const environment = buildServiceEnvironment({
env: process.env,
port: settings.port,
token: settings.gatewayToken,
launchdLabel:
process.platform === "darwin"
? resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE)
: undefined,
});
progress.update("Installing Gateway daemon…");
await service.install({
env: process.env,
stdout: process.stdout,
programArguments,
workingDirectory,
environment,
});
progress.update("Installing Gateway daemon…");
await service.install({
env: process.env,
stdout: process.stdout,
programArguments,
workingDirectory,
environment,
});
},
);
}