Skip to content

Integration: #308 answer routing + #309 dismissed-approval silence #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
halindrome wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Integration: #308 answer routing + #309 dismissed-approval silence #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f20530
fix(panel): route answers to the card's session, not the queue head
shanemccarron-maker Aug 12, 2026
eb5ef93
fix: address QA round 1
shanemccarron-maker Aug 12, 2026
c65b9d9
fix: address QA round 2
shanemccarron-maker Aug 12, 2026
f40cee5
test: strengthen the two assertions QA round 3 found weak
shanemccarron-maker Aug 12, 2026
e984ad6
fix(panel): don't let a dismissed approval silence later requests
shanemccarron-maker Aug 12, 2026
29e1456
fix: address QA round 1 — gate on the surface, not the queue
shanemccarron-maker Aug 12, 2026
f3642dd
fix: address QA round 2 — the card gate needs both halves
shanemccarron-maker Aug 12, 2026
c86fe89
docs(test): correct a comment that overstated what its assertion pins
shanemccarron-maker Aug 12, 2026
3436d7c
Merge branch 'fix/dismiss-silences-requests' into local/integration
shanemccarron-maker Aug 12, 2026
e03edca
fix: address QA findings on the merged #308 + #309 pair
shanemccarron-maker Aug 12, 2026
1cb2acc
fix: address QA round 2 on the merged pair
shanemccarron-maker Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Sources/CodeIsland/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,16 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}
}
// Shortcuts act on the card currently on screen, so they target that
// card's session rather than the head of the queue. (#308)
case .approve:
appState.approvePermission()
appState.approvePermission(expectedSessionId: appState.surface.approvalSessionId)
case .approveAlways:
appState.approvePermission(always: true)
appState.approvePermission(always: true, expectedSessionId: appState.surface.approvalSessionId)
case .deny:
appState.denyPermission()
appState.denyPermission(expectedSessionId: appState.surface.approvalSessionId)
case .skipQuestion:
appState.skipQuestion()
appState.skipQuestion(expectedSessionId: appState.surface.questionSessionId)
case .jumpToTerminal:
if let id = appState.activeSessionId, let session = appState.sessions[id] {
TerminalActivator.activate(session: session, sessionId: id)
Expand Down
227 changes: 193 additions & 34 deletions Sources/CodeIsland/AppState.swift
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions Sources/CodeIsland/IslandSurface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,17 @@ enum IslandSurface: Equatable {
case .approvalCard(let id), .questionCard(let id), .completionCard(let id): return id
}
}

/// Session of the surface only when it is the matching card kind. A
/// permission shortcut fired while a question card is up must not address
/// that session's (non-existent) approval and discard the live card. (#308)
var approvalSessionId: String? {
if case .approvalCard(let id) = self { return id }
return nil
}

var questionSessionId: String? {
if case .questionCard(let id) = self { return id }
return nil
}
}
30 changes: 16 additions & 14 deletions Sources/CodeIsland/NotchPanelView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,38 +204,40 @@ struct NotchPanelView: View {

switch appState.surface {
case .approvalCard(let sid):
if let pending = appState.pendingPermission {
// Card is addressed by session — render that session's
// request, not whatever is at the head of the queue. (#308)
if let pending = appState.pendingPermission(forSession: sid) {
let session = appState.sessions[sid]
ApprovalBar(
tool: pending.event.toolName ?? "Unknown",
toolInput: pending.event.toolInput,
queuePosition: 1,
queuePosition: appState.permissionQueuePosition(forSession: sid),
queueTotal: appState.permissionQueue.count,
session: session,
sessionId: sid,
appState: appState,
onAllow: { appState.approvePermission(always: false) },
onAlwaysAllow: { appState.approvePermission(always: true) },
onDeny: { appState.denyPermission() },
onDismiss: { appState.dismissPermissionPrompt() }
onAllow: { appState.approvePermission(always: false, expectedSessionId: sid) },
onAlwaysAllow: { appState.approvePermission(always: true, expectedSessionId: sid) },
onDeny: { appState.denyPermission(expectedSessionId: sid) },
onDismiss: { appState.dismissPermissionPrompt(expectedSessionId: sid) }
)
.transition(.blurFade.combined(with: .scale(scale: 0.96, anchor: .top)))
}
case .questionCard(let sid):
let session = appState.sessions[sid]
if let q = appState.pendingQuestion {
if let q = appState.pendingQuestion(forSession: sid) {
QuestionBar(
question: q.question.question,
options: q.question.options,
descriptions: q.question.descriptions,
allQuestions: q.askUserQuestionState?.items ?? [],
sessionSource: session?.source,
sessionContext: session?.cwd,
queuePosition: 1,
queuePosition: appState.questionQueuePosition(forSession: sid),
queueTotal: appState.questionQueue.count,
onAnswer: { appState.answerQuestion($0) },
onAnswerMulti: { appState.answerQuestionMulti($0) },
onSkip: { appState.skipQuestion() }
onAnswer: { appState.answerQuestion($0, expectedSessionId: sid) },
onAnswerMulti: { appState.answerQuestionMulti($0, expectedSessionId: sid) },
onSkip: { appState.skipQuestion(expectedSessionId: sid) }
)
.transition(.blurFade.combined(with: .scale(scale: 0.96, anchor: .top)))
} else if let preview = appState.previewQuestionPayload {
Expand Down Expand Up @@ -2279,21 +2281,21 @@ private struct SessionCard: View {
fg: .white,
bg: Color(red: 0.25, green: 0.65, blue: 0.35),
enabled: isActiveApproval,
action: { appState.approvePermission(always: false) }
action: { appState.approvePermission(always: false, expectedSessionId: sessionId) }
)
inlineActionButton(
L10n.shared["always"],
fg: .white,
bg: Color(red: 0.25, green: 0.55, blue: 0.85),
enabled: isActiveApproval,
action: { appState.approvePermission(always: true) }
action: { appState.approvePermission(always: true, expectedSessionId: sessionId) }
)
inlineActionButton(
L10n.shared["deny"],
fg: .white,
bg: Color(red: 0.85, green: 0.3, blue: 0.3),
enabled: isActiveApproval,
action: { appState.denyPermission() }
action: { appState.denyPermission(expectedSessionId: sessionId) }
)
}

Expand Down
Loading