* feat: Add support for Telegram quote (partial message replies) - Enhanced describeReplyTarget() to detect and extract quoted text from msg.quote - Updated reply formatting to distinguish between full message replies and quotes - Added isQuote flag to replyTarget object for proper identification - Quote replies show as [Quoting user] "quoted text" [/Quoting] - Regular replies unchanged: [Replying to user] full message [/Replying] Resolves need for partial message reply support in Telegram Bot API. Backward compatible with existing reply functionality. * updating references * Mac: finish Moltbot rename * Mac: finish Moltbot rename (paths) * fix(macOS): rename Clawdbot directories to Moltbot for naming consistency Directory renames: - apps/macos/Sources/Clawdbot → Moltbot - apps/macos/Sources/ClawdbotDiscovery → MoltbotDiscovery - apps/macos/Sources/ClawdbotIPC → MoltbotIPC - apps/macos/Sources/ClawdbotMacCLI → MoltbotMacCLI - apps/macos/Sources/ClawdbotProtocol → MoltbotProtocol - apps/macos/Tests/ClawdbotIPCTests → MoltbotIPCTests - apps/shared/ClawdbotKit → MoltbotKit - apps/shared/MoltbotKit/Sources/Clawdbot* → Moltbot* - apps/shared/MoltbotKit/Tests/ClawdbotKitTests → MoltbotKitTests Resource renames: - Clawdbot.icns → Moltbot.icns Code fixes: - Update Package.swift paths to reference Moltbot* directories - Fix clawdbot* → moltbot* symbol references in Swift code: - clawdbotManagedPaths → moltbotManagedPaths - clawdbotExecutable → moltbotExecutable - clawdbotCommand → moltbotCommand - clawdbotNodeCommand → moltbotNodeCommand - clawdbotOAuthDirEnv → moltbotOAuthDirEnv - clawdbotSelectSettingsTab → moltbotSelectSettingsTab * fix: update remaining ClawdbotKit path references to MoltbotKit - scripts/bundle-a2ui.sh: A2UI_APP_DIR path - package.json: format:swift and protocol:check paths - scripts/protocol-gen-swift.ts: output paths - .github/dependabot.yml: directory path and comment - .gitignore: build cache paths - .swiftformat: exclusion paths - .swiftlint.yml: exclusion path - apps/android/app/build.gradle.kts: assets.srcDir path - apps/ios/project.yml: package path - apps/ios/README.md: documentation reference - docs/concepts/typebox.md: documentation reference - apps/shared/MoltbotKit/Package.swift: fix argument order * chore: update Package.resolved after dependency resolution * fix: add MACOS_APP_SOURCES_DIR constant and update test to use new path The cron-protocol-conformance test was using LEGACY_MACOS_APP_SOURCES_DIR which points to the old Clawdbot path. Added a new MACOS_APP_SOURCES_DIR constant for the current Moltbot path and updated the test to use it. * fix: finish Moltbot macOS rename (#2844) (thanks @fal3) * Extensions: use workspace moltbot in memory-core * fix(security): recognize Venice-style claude-opus-45 as top-tier model The security audit was incorrectly flagging venice/claude-opus-45 as 'Below Claude 4.5' because the regex expected -4-5 (with dash) but Venice uses -45 (without dash between 4 and 5). Updated isClaude45OrHigher() regex to match both formats. Added test case to prevent regression. * Branding: update bot.molt bundle IDs + launchd labels * Branding: remove legacy android packages * fix: wire telegram quote support (#2900) Co-authored-by: aduk059 <aduk059@users.noreply.github.com> * fix: support Telegram quote replies (#2900) (thanks @aduk059) --------- Co-authored-by: Gustavo Madeira Santana <gumadeiras@users.noreply.github.com> Co-authored-by: Shadow <shadow@clawd.bot> Co-authored-by: Alex Fallah <alexfallah7@gmail.com> Co-authored-by: Josh Palmer <joshp123@users.noreply.github.com> Co-authored-by: jonisjongithub <jonisjongithub@users.noreply.github.com> Co-authored-by: Gustavo Madeira Santana <gumadeiras@gmail.com> Co-authored-by: aduk059 <aduk059@users.noreply.github.com>
175 lines
5.5 KiB
TypeScript
175 lines
5.5 KiB
TypeScript
import type { ChannelId } from "../channels/plugins/types.js";
|
|
import type { StickerMetadata } from "../telegram/bot/types.js";
|
|
import type { InternalMessageChannel } from "../utils/message-channel.js";
|
|
import type { CommandArgs } from "./commands-registry.types.js";
|
|
import type {
|
|
MediaUnderstandingDecision,
|
|
MediaUnderstandingOutput,
|
|
} from "../media-understanding/types.js";
|
|
|
|
/** Valid message channels for routing. */
|
|
export type OriginatingChannelType = ChannelId | InternalMessageChannel;
|
|
|
|
export type MsgContext = {
|
|
Body?: string;
|
|
/**
|
|
* Agent prompt body (may include envelope/history/context). Prefer this for prompt shaping.
|
|
* Should use real newlines (`\n`), not escaped `\\n`.
|
|
*/
|
|
BodyForAgent?: string;
|
|
/**
|
|
* Raw message body without structural context (history, sender labels).
|
|
* Legacy alias for CommandBody. Falls back to Body if not set.
|
|
*/
|
|
RawBody?: string;
|
|
/**
|
|
* Prefer for command detection; RawBody is treated as legacy alias.
|
|
*/
|
|
CommandBody?: string;
|
|
/**
|
|
* Command parsing body. Prefer this over CommandBody/RawBody when set.
|
|
* Should be the "clean" text (no history/sender context).
|
|
*/
|
|
BodyForCommands?: string;
|
|
CommandArgs?: CommandArgs;
|
|
From?: string;
|
|
To?: string;
|
|
SessionKey?: string;
|
|
/** Provider account id (multi-account). */
|
|
AccountId?: string;
|
|
ParentSessionKey?: string;
|
|
MessageSid?: string;
|
|
/** Provider-specific full message id when MessageSid is a shortened alias. */
|
|
MessageSidFull?: string;
|
|
MessageSids?: string[];
|
|
MessageSidFirst?: string;
|
|
MessageSidLast?: string;
|
|
ReplyToId?: string;
|
|
/** Provider-specific full reply-to id when ReplyToId is a shortened alias. */
|
|
ReplyToIdFull?: string;
|
|
ReplyToBody?: string;
|
|
ReplyToSender?: string;
|
|
ReplyToIsQuote?: boolean;
|
|
ForwardedFrom?: string;
|
|
ForwardedFromType?: string;
|
|
ForwardedFromId?: string;
|
|
ForwardedFromUsername?: string;
|
|
ForwardedFromTitle?: string;
|
|
ForwardedFromSignature?: string;
|
|
ForwardedDate?: number;
|
|
ThreadStarterBody?: string;
|
|
ThreadLabel?: string;
|
|
MediaPath?: string;
|
|
MediaUrl?: string;
|
|
MediaType?: string;
|
|
MediaDir?: string;
|
|
MediaPaths?: string[];
|
|
MediaUrls?: string[];
|
|
MediaTypes?: string[];
|
|
/** Telegram sticker metadata (emoji, set name, file IDs, cached description). */
|
|
Sticker?: StickerMetadata;
|
|
OutputDir?: string;
|
|
OutputBase?: string;
|
|
/** Remote host for SCP when media lives on a different machine (e.g., moltbot@192.168.64.3). */
|
|
MediaRemoteHost?: string;
|
|
Transcript?: string;
|
|
MediaUnderstanding?: MediaUnderstandingOutput[];
|
|
MediaUnderstandingDecisions?: MediaUnderstandingDecision[];
|
|
LinkUnderstanding?: string[];
|
|
Prompt?: string;
|
|
MaxChars?: number;
|
|
ChatType?: string;
|
|
/** Human label for envelope headers (conversation label, not sender). */
|
|
ConversationLabel?: string;
|
|
GroupSubject?: string;
|
|
/** Human label for channel-like group conversations (e.g. #general, #support). */
|
|
GroupChannel?: string;
|
|
GroupSpace?: string;
|
|
GroupMembers?: string;
|
|
GroupSystemPrompt?: string;
|
|
SenderName?: string;
|
|
SenderId?: string;
|
|
SenderUsername?: string;
|
|
SenderTag?: string;
|
|
SenderE164?: string;
|
|
Timestamp?: number;
|
|
/** Provider label (e.g. whatsapp, telegram). */
|
|
Provider?: string;
|
|
/** Provider surface label (e.g. discord, slack). Prefer this over `Provider` when available. */
|
|
Surface?: string;
|
|
WasMentioned?: boolean;
|
|
CommandAuthorized?: boolean;
|
|
CommandSource?: "text" | "native";
|
|
CommandTargetSessionKey?: string;
|
|
/** Thread identifier (Telegram topic id or Matrix thread event id). */
|
|
MessageThreadId?: string | number;
|
|
/** Telegram forum supergroup marker. */
|
|
IsForum?: boolean;
|
|
/**
|
|
* Originating channel for reply routing.
|
|
* When set, replies should be routed back to this provider
|
|
* instead of using lastChannel from the session.
|
|
*/
|
|
OriginatingChannel?: OriginatingChannelType;
|
|
/**
|
|
* Originating destination for reply routing.
|
|
* The chat/channel/user ID where the reply should be sent.
|
|
*/
|
|
OriginatingTo?: string;
|
|
/**
|
|
* Messages from hooks to be included in the response.
|
|
* Used for hook confirmation messages like "Session context saved to memory".
|
|
*/
|
|
HookMessages?: string[];
|
|
};
|
|
|
|
export type FinalizedMsgContext = Omit<MsgContext, "CommandAuthorized"> & {
|
|
/**
|
|
* Always set by finalizeInboundContext().
|
|
* Default-deny: missing/undefined becomes false.
|
|
*/
|
|
CommandAuthorized: boolean;
|
|
};
|
|
|
|
export type TemplateContext = MsgContext & {
|
|
BodyStripped?: string;
|
|
SessionId?: string;
|
|
IsNewSession?: string;
|
|
};
|
|
|
|
function formatTemplateValue(value: unknown): string {
|
|
if (value == null) return "";
|
|
if (typeof value === "string") return value;
|
|
if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
|
|
return String(value);
|
|
}
|
|
if (typeof value === "symbol" || typeof value === "function") {
|
|
return value.toString();
|
|
}
|
|
if (Array.isArray(value)) {
|
|
return value
|
|
.flatMap((entry) => {
|
|
if (entry == null) return [];
|
|
if (typeof entry === "string") return [entry];
|
|
if (typeof entry === "number" || typeof entry === "boolean" || typeof entry === "bigint") {
|
|
return [String(entry)];
|
|
}
|
|
return [];
|
|
})
|
|
.join(",");
|
|
}
|
|
if (typeof value === "object") {
|
|
return "";
|
|
}
|
|
return "";
|
|
}
|
|
|
|
// Simple {{Placeholder}} interpolation using inbound message context.
|
|
export function applyTemplate(str: string | undefined, ctx: TemplateContext) {
|
|
if (!str) return "";
|
|
return str.replace(/{{\s*(\w+)\s*}}/g, (_, key) => {
|
|
const value = ctx[key as keyof TemplateContext];
|
|
return formatTemplateValue(value);
|
|
});
|
|
}
|