tbenandClaude Opus 5.5
0e59559ea9
A hook call used to record only how it was taken; its run's answer went to the chat alone and was lost to the call once the job was pruned. Now `bot_hook_events` keeps `response`, `response_message_id` and `responded_at`, written on every call a run took in when that run ends (completed, failed, lost, stopped or cancelled) by `recordHookCallResponse` in the job helpers, and calls turn done or failed. The Calls view searches what calls sent and what runs answered, filters by status and pages; Show all loads one call whole. Bots get `search_hook_calls` and `read_hook_call` for their own hooks (never in a hook call's own run), with payloads always marked as outside data. Calls are kept for the app setting `hook_events_keep_days` (Settings > General, default now 30 days). The caller still only gets 202 Queued. Co-Authored-By: Claude Opus 5.5 <[email protected]>
45 lines
1.6 KiB
TypeScript
45 lines
1.6 KiB
TypeScript
import BunSQLite from "@moduletrace/bun-sqlite";
|
|
import type { BUN_SQLITE_COBBLE_BOTS_QUEUE } from "@/db/types/db";
|
|
import { BotJobCancelledError } from "@/src/dict/bot-queue-dict";
|
|
import AppError from "@/src/utils/app-error";
|
|
import recordHookCallResponse from "../bot-hooks/record-hook-call-response";
|
|
|
|
type Params = {
|
|
user_id: number | string;
|
|
job_id: number | string;
|
|
};
|
|
|
|
/**
|
|
* Cancels a pending or running job in one of the user's conversations. It's marked failed
|
|
* with `BotJobCancelledError`; a running handler finds out on its next
|
|
* `updateBotJob` (which returns false) and stops. Its task is closed.
|
|
*/
|
|
export default async function cancelBotJob({ user_id, job_id }: Params) {
|
|
const now = Date.now();
|
|
|
|
const res = await BunSQLite.sql<BUN_SQLITE_COBBLE_BOTS_QUEUE>({
|
|
sql: `UPDATE bots_queue SET status = 'failed', last_error = ?, locked_at = NULL, locked_by = NULL, finished_at = ?, updated_at = ?
|
|
WHERE id = ? AND status IN ('pending', 'processing')
|
|
AND session_id IN (SELECT id FROM bot_sessions WHERE user_id = ?)
|
|
RETURNING *`,
|
|
values: [BotJobCancelledError, now, now, job_id, user_id],
|
|
});
|
|
|
|
const job = res.payload?.[0];
|
|
|
|
if (!job?.id) {
|
|
throw new AppError(`No pending or running job to cancel.`);
|
|
}
|
|
|
|
if (job.task_id) {
|
|
await BunSQLite.sql({
|
|
sql: `UPDATE bot_tasks SET status = 'done', updated_at = ? WHERE id = ?`,
|
|
values: [now, job.task_id],
|
|
});
|
|
}
|
|
|
|
await recordHookCallResponse({ job, status: "failed", response: BotJobCancelledError, now });
|
|
|
|
return job;
|
|
}
|