Route Codex approvals to Telegram
Force app-server turns to use the user approval reviewer so command approvals surface in the bot on Codex 0.134. Add focused protocol logs for approval requests and guardian review events to diagnose silent approval stalls.
This commit is contained in:
@@ -1266,6 +1266,15 @@ func parseCodexThreadItem(raw json.RawMessage) (codexThreadItemView, error) {
|
||||
return item, nil
|
||||
}
|
||||
|
||||
func renderGuardianReviewHTML(title string, raw json.RawMessage) string {
|
||||
var params map[string]any
|
||||
if err := json.Unmarshal(raw, ¶ms); err != nil {
|
||||
return SummaryDetailsHTML(title, string(raw))
|
||||
}
|
||||
sections := renderSelectedArgumentDetailsHTML(params, []string{"action", "review", "decisionSource", "targetItemId", "reviewId"})
|
||||
return SummaryRawHTMLSectionsLimited(title, sections, TelegramHTMLMessageLimit)
|
||||
}
|
||||
|
||||
func renderCodexItemStarted(item codexThreadItemView) string {
|
||||
switch item.Type {
|
||||
case "commandExecution":
|
||||
@@ -1702,6 +1711,40 @@ func (b *Bot) handleCodexNotification(ctx context.Context, event codexapp.Event)
|
||||
return err
|
||||
}
|
||||
return b.sendImageOutput(ctx, params.ThreadID, item)
|
||||
case "item/guardianApprovalReview/started", "item/guardianApprovalReview/completed":
|
||||
var params struct {
|
||||
ThreadID string `json:"threadId"`
|
||||
TurnID string `json:"turnId"`
|
||||
ReviewID string `json:"reviewId"`
|
||||
TargetItemID *string `json:"targetItemId"`
|
||||
}
|
||||
if err := json.Unmarshal(event.Params, ¶ms); err != nil {
|
||||
return err
|
||||
}
|
||||
targetItemID := ""
|
||||
if params.TargetItemID != nil {
|
||||
targetItemID = *params.TargetItemID
|
||||
}
|
||||
b.logger.Printf("codex guardian approval review: method=%s thread=%s turn=%s review=%s target=%s", event.Method, params.ThreadID, params.TurnID, params.ReviewID, targetItemID)
|
||||
if params.ThreadID != "" && b.shouldHandleOutputEvent(params.ThreadID, params.TurnID) {
|
||||
title := "Codex approval auto-review started"
|
||||
if event.Method == "item/guardianApprovalReview/completed" {
|
||||
title = "Codex approval auto-review completed"
|
||||
}
|
||||
return b.sendOutputHTMLBlock(ctx, params.ThreadID, renderGuardianReviewHTML(title, event.Params))
|
||||
}
|
||||
case "guardianWarning":
|
||||
var params struct {
|
||||
ThreadID string `json:"threadId"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
if err := json.Unmarshal(event.Params, ¶ms); err != nil {
|
||||
return err
|
||||
}
|
||||
b.logger.Printf("codex guardian warning: thread=%s message=%q", params.ThreadID, truncateForStatus(params.Message))
|
||||
if params.ThreadID != "" && b.hasOutputThread(params.ThreadID) {
|
||||
return b.sendOutputBlock(ctx, params.ThreadID, "Codex warning: "+params.Message)
|
||||
}
|
||||
case "turn/diff/updated":
|
||||
var params struct {
|
||||
ThreadID string `json:"threadId"`
|
||||
@@ -1830,6 +1873,7 @@ func (b *Bot) handleCodexServerRequest(ctx context.Context, event codexapp.Event
|
||||
return errors.New("approval request missing threadId")
|
||||
}
|
||||
itemID := firstNonEmpty(params.ApprovalID, params.ItemID, params.CallID)
|
||||
b.logger.Printf("codex approval request: method=%s request=%s thread=%s turn=%s item=%s approval=%s call=%s", event.Method, event.ID.Key(), threadID, params.TurnID, params.ItemID, params.ApprovalID, params.CallID)
|
||||
thread, err := b.store.GetThreadByCodexID(ctx, threadID)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -1911,6 +1955,12 @@ func (b *Bot) setOutputTurnID(threadID, turnID string) {
|
||||
}
|
||||
}
|
||||
|
||||
func (b *Bot) hasOutputThread(threadID string) bool {
|
||||
b.mu.Lock()
|
||||
defer b.mu.Unlock()
|
||||
return b.outputs[threadID] != nil
|
||||
}
|
||||
|
||||
func (b *Bot) hasOutputTurn(threadID, turnID string) bool {
|
||||
b.mu.Lock()
|
||||
defer b.mu.Unlock()
|
||||
|
||||
Reference in New Issue
Block a user