mirror of
https://github.com/qwibitai/nanoclaw.git
synced 2026-07-06 18:52:03 +08:00
gavrielc
c97548db60
Delete the just-created pending row when the sender/channel approval card can't be delivered (adapter missing or delivery throws), matching each file's header contract, and give module approvals a ~7-day expiry that a new host-sweep finalizer turns into a "request timed out" notice so an unanswered card never strands the requesting agent. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
88 lines
3.4 KiB
TypeScript
88 lines
3.4 KiB
TypeScript
/**
|
|
* Shared "finalize a resolved approval" path.
|
|
*
|
|
* Four entry points land here so they relay one message and clean up
|
|
* identically:
|
|
* 1. The instant Reject button (response-handler.ts)
|
|
* 2. A captured Reject-with-reason reply (reason-capture.ts)
|
|
* 3. The host-sweep ghost finalizer (reason-capture.ts, via host-sweep)
|
|
* 4. The host-sweep timeout finalizer (timeout-sweep.ts, via host-sweep)
|
|
*
|
|
* Kept in its own leaf file so both response-handler.ts and reason-capture.ts
|
|
* can import it without an import cycle (finalize → primitive only).
|
|
*/
|
|
import { wakeContainer } from '../../container-runner.js';
|
|
import { deletePendingApproval } from '../../db/sessions.js';
|
|
import { log } from '../../log.js';
|
|
import { writeSessionMessage } from '../../session-manager.js';
|
|
import type { PendingApproval, Session } from '../../types.js';
|
|
import { notifyApprovalResolved } from './primitive.js';
|
|
|
|
/**
|
|
* Notify the requesting agent that its action was rejected, drop the pending
|
|
* row, fire approval-resolved callbacks, and wake the container.
|
|
*
|
|
* When `reason` is provided it's appended to the agent-facing note with generic
|
|
* attribution — the why, not the who (the rejecting admin may belong to a
|
|
* different owner than the requesting agent). Callers are responsible for
|
|
* clamping the reason length before passing it in.
|
|
*/
|
|
export async function finalizeReject(
|
|
approval: PendingApproval,
|
|
session: Session,
|
|
userId: string,
|
|
reason?: string,
|
|
): Promise<void> {
|
|
const text = reason
|
|
? `Your ${approval.action} request was rejected by admin: "${reason}"`
|
|
: `Your ${approval.action} request was rejected by admin.`;
|
|
|
|
writeAgentNote(session, text);
|
|
|
|
log.info('Approval rejected', {
|
|
approvalId: approval.approval_id,
|
|
action: approval.action,
|
|
userId,
|
|
withReason: reason !== undefined,
|
|
});
|
|
|
|
await finalizeResolution(approval, session, userId);
|
|
}
|
|
|
|
/**
|
|
* Finalize a module approval that no admin ever answered — its expiry elapsed.
|
|
* Same cleanup as a plain reject (drop the row, fire resolved callbacks, wake
|
|
* the container) but tells the agent the request timed out rather than that an
|
|
* admin rejected it, since no admin acted.
|
|
*/
|
|
export async function finalizeTimeout(approval: PendingApproval, session: Session): Promise<void> {
|
|
writeAgentNote(session, `Your ${approval.action} request timed out waiting for admin approval.`);
|
|
|
|
log.info('Approval timed out', {
|
|
approvalId: approval.approval_id,
|
|
action: approval.action,
|
|
});
|
|
|
|
await finalizeResolution(approval, session, '');
|
|
}
|
|
|
|
/** Relay a one-line system note to the requesting agent's session. */
|
|
function writeAgentNote(session: Session, text: string): void {
|
|
writeSessionMessage(session.agent_group_id, session.id, {
|
|
id: `appr-note-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
|
|
kind: 'chat',
|
|
timestamp: new Date().toISOString(),
|
|
platformId: session.agent_group_id,
|
|
channelType: 'agent',
|
|
threadId: null,
|
|
content: JSON.stringify({ text, sender: 'system', senderId: 'system' }),
|
|
});
|
|
}
|
|
|
|
/** Drop the pending row, fire approval-resolved callbacks, and wake the container. */
|
|
async function finalizeResolution(approval: PendingApproval, session: Session, userId: string): Promise<void> {
|
|
deletePendingApproval(approval.approval_id);
|
|
await notifyApprovalResolved({ approval, session, outcome: 'reject', userId });
|
|
await wakeContainer(session);
|
|
}
|