fix(work): return approval state cards directly from callbacks

This commit is contained in:
ex_tianzy
2026-11-18 10:00:55 +08:00
parent 7d2a15eaba
commit 61db139c72
11 changed files with 165 additions and 25 deletions
+11 -2
View File
@@ -244,14 +244,15 @@ class ApprovalStore:
self._sweep_after=candidate['approval_id']
return closed
def closed_card_receipt(self,approval_id):
def closed_card_receipt(self,approval_id,refresh=False):
"""Internal renderer only. Never return action/nonce or imply execution success."""
if type(refresh)is not bool:raise ApprovalError('invalid_card_refresh')
with self.db:
row=self._row(approval_id);self.state._owner_lock(row['owner']);row=self._expire(self._row(approval_id))
if row['state']not in {'rejected','expired','cancelled','consumed'}or not row['card_message_id']:
return None
sent=self.db.execute('SELECT state FROM work_approval_card_outbox_v1 WHERE approval_id=?',(approval_id,)).fetchone()
if sent and sent['state']=='closed':return None
if sent and sent['state']=='closed'and not refresh:return None
self.db.execute('UPDATE work_approval_card_outbox_v1 SET updated_at=? WHERE approval_id=?',
(self.clock(),approval_id))
return {'message_id':row['card_message_id'],'state':row['state']}
@@ -279,6 +280,14 @@ class ApprovalStore:
(self.state.environment,self.state.app_id)).fetchall()
return [row['approval_id']for row in rows]
def closed_for_task(self,task_id):
if not isinstance(task_id,str)or not re.fullmatch(r'msg_[a-f0-9]{64}',task_id):
raise ApprovalError('invalid_task_reference')
rows=self.db.execute('''SELECT approval_id FROM work_approvals_v3 WHERE environment=? AND app_id=?
AND task_id=? AND state IN ('rejected','expired','cancelled','consumed') AND card_message_id<>'' LIMIT 10''',
(self.state.environment,self.state.app_id,task_id)).fetchall()
return [row['approval_id']for row in rows]
def decide(self,decision):
if not isinstance(decision,VerifiedDecision):raise ApprovalError('verified_callback_required')
if decision.choice not in {'allow','deny'}:raise ApprovalError('invalid_approval_choice')