This commit is contained in:
oogway authored and GitHub committed 2026-01-30 15:53:34 +00:00
commit fda6e3f9e0
11 files changed
+34 -18

No files matched your search

@@ -302,7 +302,7 @@ export async function processDiscordMessage(ctx: DiscordMessagePreflightContext)
ctx: ctxPayload,
updateLastRoute: isDirectMessage
? {
sessionKey: route.mainSessionKey,
sessionKey: route.sessionKey,
channel: "discord",
to: `user:${author.id}`,
accountId: route.accountId,
@@ -664,12 +664,25 @@ export function attachGatewayWsMessageHandler(params: {
requestId: pairing.request.requestId,
reason,
});
const helpMessage =
`Device pairing required. ` +
`On the OpenClaw server machine, run: ` +
`'openclaw devices list' to see pending requests, then ` +
`'openclaw devices approve ${pairing.request.requestId}' to approve this device. ` +
`Alternatively, access the Control UI from the server's localhost to approve.`;
send({
type: "res",
id: frame.id,
ok: false,
error: errorShape(ErrorCodes.NOT_PAIRED, "pairing required", {
details: { requestId: pairing.request.requestId },
error: errorShape(ErrorCodes.NOT_PAIRED, helpMessage, {
details: {
requestId: pairing.request.requestId,
deviceId: device.id,
instructions: {
list: "openclaw devices list",
approve: `openclaw devices approve ${pairing.request.requestId}`,
}
},
}),
});
close(1008, "pairing required");
+1 -1
View File
@@ -510,7 +510,7 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
updateLastRoute:
!isGroup && updateTarget
? {
sessionKey: route.mainSessionKey,
sessionKey: route.sessionKey,
channel: "imessage",
to: updateTarget,
accountId: route.accountId,
+2 -2
View File
@@ -282,7 +282,7 @@ export async function buildLineMessageContext(params: BuildLineMessageContextPar
if (!isGroup) {
await updateLastRoute({
storePath,
sessionKey: route.mainSessionKey,
sessionKey: route.sessionKey,
deliveryContext: {
channel: "line",
to: userId ?? peerId,
@@ -432,7 +432,7 @@ export async function buildLinePostbackContext(params: {
if (!isGroup) {
await updateLastRoute({
storePath,
sessionKey: route.mainSessionKey,
sessionKey: route.sessionKey,
deliveryContext: {
channel: "line",
to: userId ?? peerId,
+1 -1
View File
@@ -156,7 +156,7 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
ctx: ctxPayload,
updateLastRoute: !entry.isGroup
? {
sessionKey: route.mainSessionKey,
sessionKey: route.sessionKey,
channel: "signal",
to: entry.senderRecipient,
accountId: route.accountId,
@@ -27,7 +27,7 @@ export async function dispatchPreparedSlackMessage(prepared: PreparedSlackMessag
});
await updateLastRoute({
storePath,
sessionKey: route.mainSessionKey,
sessionKey: route.sessionKey,
deliveryContext: {
channel: "slack",
to: `user:${message.user}`,
+1 -1
View File
@@ -533,7 +533,7 @@ export async function prepareSlackMessage(params: {
ctx: ctxPayload,
updateLastRoute: isDirectMessage
? {
sessionKey: route.mainSessionKey,
sessionKey: route.sessionKey,
channel: "slack",
to: `user:${message.user}`,
accountId: route.accountId,
+1 -1
View File
@@ -617,7 +617,7 @@ export const buildTelegramMessageContext = async ({
ctx: ctxPayload,
updateLastRoute: !isGroup
? {
sessionKey: route.mainSessionKey,
sessionKey: route.sessionKey,
channel: "telegram",
to: String(chatId),
accountId: route.accountId,
+6 -5
View File
@@ -6,21 +6,22 @@
* Returns true if the provider requires reasoning to be wrapped in tags
* (e.g. <think> and <final>) in the text stream, rather than using native
* API fields for reasoning/thinking.
*
* NOTE: Only include providers that NATIVELY use <think> and <final> tags.
* Standard Gemini 2.0 (google-gemini-cli, google-generative-ai) does NOT use
* these tags natively, but Google Antigravity (Gemini 3.0) does.
*/
export function isReasoningTagProvider(provider: string | undefined | null): boolean {
if (!provider) return false;
const normalized = provider.trim().toLowerCase();
// Check for exact matches or known prefixes/substrings for reasoning providers
if (
normalized === "ollama" ||
normalized === "google-gemini-cli" ||
normalized === "google-generative-ai"
) {
if (normalized === "ollama") {
return true;
}
// Handle google-antigravity and its model variations (e.g. google-antigravity/gemini-3)
// This is Gemini 3.0 which DOES use reasoning tags natively.
if (normalized.includes("google-antigravity")) {
return true;
}
@@ -295,7 +295,7 @@ export async function processMessage(params: {
cfg: params.cfg,
backgroundTasks: params.backgroundTasks,
storeAgentId: params.route.agentId,
sessionKey: params.route.mainSessionKey,
sessionKey: params.route.sessionKey,
channel: "whatsapp",
to: dmRouteTarget,
accountId: params.route.accountId,