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
+7 -2
View File
@@ -5,7 +5,7 @@ from fastapi.responses import JSONResponse
from pydantic import Field
from .approval_callback import ApprovalCallbackVerifier,decision_toast
from .approval_cards import ApprovalCardSender
from .approval_cards import ApprovalCardSender,decision_response_card
from .approval_policy import describe_action
from .approval_store import ApprovalError
from .common import no_cache,require_secret
@@ -95,7 +95,12 @@ class ApprovalAPI:
return no_cache(JSONResponse({'toast':{'type':'warning',
'content':'确认未完成或结果待核对,请查看原任务状态,勿重复发起操作。'}}))
self._schedule('close',decision.approval_id)
return no_cache(JSONResponse(decision_toast(result)))
# The callback response updates the clicked private card immediately;
# background PATCH remains only for other views/list state convergence.
response=decision_toast(result)
if result.get('state')in {'approved','rejected','expired','cancelled','consumed'}:
response['card']={'type':'raw','data':decision_response_card(result['state'])}
return no_cache(JSONResponse(response))
async def maintain(self):
await self.worker.call('close_unavailable')
+13 -4
View File
@@ -24,7 +24,7 @@ def approval_card(material, clock=time.time):
buttons.append({'tag': 'button', 'text': {'tag': 'plain_text', 'content': label},
'type': style, 'value': {'kind': 'hainuo.approval.v1', 'approval_id': reference,
'nonce': nonce, 'choice': choice}})
return {'config': {'wide_screen_mode': True, 'enable_forward': False},
return {'config': {'wide_screen_mode': True, 'enable_forward': False, 'update_multi': True},
'header': {'template': 'orange', 'title': {'tag': 'plain_text', 'content': '海诺操作确认'}},
'elements': [
{'tag': 'div', 'text': {'tag': 'plain_text', 'content': '准备做什么:' + summary}},
@@ -57,8 +57,8 @@ class ApprovalCardSender:
raise
return {'state': 'sent'}
async def update_closed(self,approval_id):
receipt=await self.approvals.call('closed_card_receipt',approval_id)
async def update_closed(self,approval_id,refresh=False):
receipt=await self.approvals.call('closed_card_receipt',approval_id,refresh)
if not receipt:return {'state':'no_closed_card'}
card=closed_approval_card(receipt['state'])
token=await self.platform.tenant_token()
@@ -76,6 +76,15 @@ def closed_approval_card(state):
'cancelled':'本次确认已取消,不能再通过这张卡片批准。',
'consumed':'本次许可已交给客户端;是否执行及执行结果请查看任务进度。'}
if state not in messages:raise ApprovalError('approval_not_closed')
return {'config':{'wide_screen_mode':True,'enable_forward':False},
return {'config':{'wide_screen_mode':True,'enable_forward':False,'update_multi':True},
'header':{'template':'grey','title':{'tag':'plain_text','content':'海诺操作确认已结束'}},
'elements':[{'tag':'div','text':{'tag':'plain_text','content':messages[state]}}]}
def decision_response_card(state):
if state=='approved':
return {'config':{'wide_screen_mode':True,'enable_forward':False,'update_multi':True},
'header':{'template':'blue','title':{'tag':'plain_text','content':'海诺操作已允许'}},
'elements':[{'tag':'div','text':{'tag':'plain_text',
'content':'你已允许本次操作,等待客户端继续。执行结果请查看任务进度。'}}]}
return closed_approval_card(state)
+42
View File
@@ -0,0 +1,42 @@
"""Docker-console repair of known CLOSED cards only. No public route or send."""
import argparse
import asyncio
import json
import re
from .config import Settings
from .credential_store import CredentialKeyring
from .approval_worker import ApprovalWorker
from .approval_cards import ApprovalCardSender
from .platform import Feishu
async def repair(task,apply=False):
s=Settings(role='connector')
if not s.work_remote_approvals_enabled:raise ValueError('approvals_disabled')
worker=ApprovalWorker(s,CredentialKeyring.from_file(s.credential_keyring_file))
await worker.start();platform=Feishu(s)
try:
# Dedicated worker serializes SQL. This lookup is constrained to a known
# task plus fixed app/environment; no user SQL or arbitrary message ID.
ids=await worker.call('closed_for_task',task)
if not apply:return {'state':'preview','closed_cards':len(ids)}
sender=ApprovalCardSender(worker,platform);updated=0
for approval_id in ids:
result=await sender.update_closed(approval_id,refresh=True)
updated+=result['state']=='updated'
return {'state':'updated','closed_cards':len(ids),'updated':updated,'new_cards_sent':0}
finally:
await platform.close();await worker.close()
def main():
parser=argparse.ArgumentParser();parser.add_argument('--task',required=True);parser.add_argument('--apply',action='store_true')
args=parser.parse_args()
if not re.fullmatch(r'msg_[a-f0-9]{64}',args.task):raise SystemExit('invalid task reference')
try:print(json.dumps(asyncio.run(repair(args.task,args.apply))))
except Exception as error:
print(json.dumps({'state':'repair_unconfirmed','error_class':type(error).__name__}))
raise SystemExit(1)from None
if __name__=='__main__':main()
+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')
+1 -1
View File
@@ -45,7 +45,7 @@ class ApprovalWorker:
async def call(self,method,*args):
allowed={'create','status','consume','cancel','decide','card_material','claim_card',
'bind_card','card_send_unknown','close_unavailable','closed_card_receipt',
'mark_card_closed','cards_to_send','cards_to_close','maintain_retention'}
'mark_card_closed','cards_to_send','cards_to_close','maintain_retention','closed_for_task'}
if method not in allowed:raise ApprovalError('unsupported_approval_operation')
try:await asyncio.wait_for(self.slots.acquire(),timeout=.05)
except asyncio.TimeoutError:raise ApprovalError('approval_temporarily_unavailable')from None
+19 -5
View File
@@ -11,6 +11,24 @@ import redis
from .config import Settings
def safe_card_callback_response(payload):
"""Forward only code-owned terminal cards returned after verified decisions."""
from .approval_cards import decision_response_card
fallback={'toast':{'type':'warning','content':'确认结果待核对,请查看任务状态。'}}
if not isinstance(payload,dict):return fallback
toast=payload.get('toast')
if (not isinstance(toast,dict)or toast.get('type')not in {'info','success','warning','error'}
or not isinstance(toast.get('content'),str)or len(toast['content'])>200):return fallback
response={'toast':{'type':toast['type'],'content':toast['content']}}
card=payload.get('card')
if card is not None:
allowed=[{'type':'raw','data':decision_response_card(state)}for state in
('approved','rejected','expired','cancelled','consumed')]
if card not in allowed:return fallback
response['card']=card
return response
def disable_proxy_environment():
"""This dedicated SDK worker must connect directly, including discovery and WS."""
for key in ("HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "http_proxy", "https_proxy", "all_proxy"):
@@ -90,11 +108,7 @@ def main():
future.add_done_callback(settled)
try:payload=future.result(timeout=2.3)
except FutureTimeout:return P2CardActionTriggerResponse(fallback)
toast=payload.get('toast')if isinstance(payload,dict)else None
if (not isinstance(toast,dict)or toast.get('type')not in {'info','success','warning','error'}
or not isinstance(toast.get('content'),str)or len(toast['content'])>200):
return P2CardActionTriggerResponse(fallback)
return P2CardActionTriggerResponse({'toast':toast})
return P2CardActionTriggerResponse(safe_card_callback_response(payload))
except Exception:return P2CardActionTriggerResponse(fallback)
builder=builder.register_p2_card_action_trigger(decision)
handler=builder.build()
+1
View File
@@ -13,6 +13,7 @@ DELIVERY={None:'尚未接收结果','ready':'已接收结果,等待投递','se
def card_content(task_id,execution,delivery,files=None,connection_lost=False,remote_approvals=False):
execution=execution if execution in EXECUTION else 'unknown'
color='green' if execution=='completed' else 'red' if execution in {'failed','interrupted'} else 'orange' if execution in {'waiting_for_approval','unknown'} else 'blue'
if execution=='cancelled':color='grey'
label=EXECUTION[execution]
if connection_lost and execution not in {'completed','failed','cancelled','interrupted'}:
color='red';label='客户端失联,任务结果待核对'