Let a bot answer its sessions side by side, and show a due reply in each
Replies were locked per bot, so a long reply in one session held up every other session's reply with nothing shown. The lock is now per session. A chat shows the thinking row whenever the user has the last word, rather than from the bot's face (one per user, shared by every session), so it shows even while the bot works elsewhere. A task waiting for its busy computer says so, and a job finishing while another still runs puts back the running one's face. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
@@ -8,6 +8,7 @@ import grabLockedBotJob from "./grab-locked-bot-job";
|
||||
import relayJobToRequester from "./relay-job-to-requester";
|
||||
import jobSessionId from "./job-session-id";
|
||||
import grabJobUserId from "./grab-job-user-id";
|
||||
import grabRunningBotJobFace from "./grab-running-bot-job-face";
|
||||
|
||||
type Params = {
|
||||
job_id: number | string;
|
||||
@@ -31,7 +32,9 @@ type Params = {
|
||||
* Marks a job done, closes its task and sends the completion message back
|
||||
* to the user in the bot's conversation. Unless it has other jobs open
|
||||
* for that user, the bot shows that user needs-you if asked, else done
|
||||
* after a task and idle after a reply; nobody else's face changes. A handed-over job's result also goes to the bot that handed
|
||||
* after a task and idle after a reply; with others open, it shows the one
|
||||
* still running (a reply in another session mustn't hide a task's row).
|
||||
* Nobody else's face changes. A handed-over job's result also goes to the bot that handed
|
||||
* it over (`relay`). Throws if this handler no longer holds the job.
|
||||
*/
|
||||
export default async function completeBotJob({
|
||||
@@ -92,7 +95,7 @@ export default async function completeBotJob({
|
||||
status_line: BotNeedsYouStatusLine,
|
||||
})
|
||||
: (await countOpenBotJobs({ bot_id: job.bot_id, user_id }))
|
||||
? null
|
||||
? await restoreRunningFace({ bot_id: job.bot_id, user_id })
|
||||
: await setBotFace({
|
||||
bot_id: job.bot_id,
|
||||
user_id,
|
||||
@@ -103,3 +106,12 @@ export default async function completeBotJob({
|
||||
|
||||
return { message, bot, relay };
|
||||
}
|
||||
|
||||
/**
|
||||
* Puts back the face of a job still running for the user, if any.
|
||||
*/
|
||||
async function restoreRunningFace({ bot_id, user_id }: { bot_id: number; user_id: number }) {
|
||||
const running = await grabRunningBotJobFace({ bot_id, user_id });
|
||||
|
||||
return running ? await setBotFace({ bot_id, user_id, ...running }) : null;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
import BunSQLite from "@moduletrace/bun-sqlite";
|
||||
import type { BotFace } from "@/src/dict/bot-dict";
|
||||
import { BotReplyJobTitle, BotTaskStatusLine } from "@/src/dict/bot-queue-dict";
|
||||
|
||||
type Params = {
|
||||
bot_id: number | string;
|
||||
/**
|
||||
* Only jobs in this user's conversations.
|
||||
*/
|
||||
user_id: number | string;
|
||||
};
|
||||
|
||||
/**
|
||||
* The face a bot should show one user while other jobs for them are
|
||||
* still running: thinking while a reply runs (it's short, and its chat
|
||||
* needs the row), else working on a task. Null when none is running.
|
||||
*/
|
||||
export default async function grabRunningBotJobFace({
|
||||
bot_id,
|
||||
user_id,
|
||||
}: Params): Promise<{ face: BotFace; status_line: string } | null> {
|
||||
const kinds = (
|
||||
await BunSQLite.sql<{ kind: string }>({
|
||||
sql: `SELECT DISTINCT kind FROM bots_queue WHERE bot_id = ? AND status = 'processing'
|
||||
AND session_id IN (SELECT id FROM bot_sessions WHERE user_id = ?)`,
|
||||
values: [bot_id, user_id],
|
||||
})
|
||||
).payload?.map((row) => row.kind) || [];
|
||||
|
||||
if (kinds.includes("reply")) return { face: "working", status_line: BotReplyJobTitle };
|
||||
if (kinds.includes("task")) return { face: "working", status_line: BotTaskStatusLine };
|
||||
|
||||
return null;
|
||||
}
|
||||
Reference in New Issue
Block a user