Skip to content

fix: preserve prompt-submit and stop lifecycle events #179

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

Merged
Yeachan-Heo merged 1 commit into from
Apr 8, 2026
Merged

fix: preserve prompt-submit and stop lifecycle events #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 32 additions & 3 deletions src/event/compat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ fn body_for(kind: &str, payload: &Value) -> Result<EventBody> {
"session.test-finished" => Ok(EventBody::AgentTestFinished(agent_event(payload)?)),
"session.test-failed" => Ok(EventBody::AgentTestFailed(agent_event(payload)?)),
"session.handoff-needed" => Ok(EventBody::AgentHandoffNeeded(agent_event(payload)?)),
"session.prompt-submitted" => Ok(EventBody::AgentPromptSubmitted(agent_event(payload)?)),
"session.prompt-delivered" => Ok(EventBody::AgentPromptDelivered(agent_event(payload)?)),
"session.prompt-delivery-failed" => {
Ok(EventBody::AgentPromptDeliveryFailed(agent_event(payload)?))
}
"session.stopped" => Ok(EventBody::AgentStopped(agent_event(payload)?)),
"workspace.session.started" | "workspace.session.ended" => Ok(
EventBody::WorkspaceSessionStarted(workspace_event(payload)?),
),
Expand Down Expand Up @@ -368,13 +374,16 @@ fn workspace_event(payload: &Value) -> Result<WorkspaceEvent> {

fn priority_for(kind: &str, payload: &Value) -> EventPriority {
match kind {
"agent.failed" | "session.failed" | "session.test-failed" | "github.ci-failed" => {
EventPriority::Critical
}
"agent.failed"
| "session.failed"
| "session.test-failed"
| "session.prompt-delivery-failed"
| "github.ci-failed" => EventPriority::Critical,
"agent.blocked"
| "session.blocked"
| "session.retry-needed"
| "session.handoff-needed"
| "session.stopped"
| "tmux.stale"
| "workspace.session.blocked" => EventPriority::High,
"github.release-published" | "github.release-prereleased" => EventPriority::High,
Expand Down Expand Up @@ -613,6 +622,22 @@ mod tests {
"session.handoff-needed",
EventBody::AgentHandoffNeeded(sample_agent_event("handoff-needed")),
),
(
"session.prompt-submitted",
EventBody::AgentPromptSubmitted(sample_agent_event("prompt-submitted")),
),
(
"session.prompt-delivered",
EventBody::AgentPromptDelivered(sample_agent_event("prompt-delivered")),
),
(
"session.prompt-delivery-failed",
EventBody::AgentPromptDeliveryFailed(sample_agent_event("prompt-delivery-failed")),
),
(
"session.stopped",
EventBody::AgentStopped(sample_agent_event("stopped")),
),
];

for (kind, expected) in cases {
Expand Down Expand Up @@ -713,6 +738,10 @@ mod tests {
EventBody::AgentTestFinished(_) => "test-finished",
EventBody::AgentTestFailed(_) => "test-failed",
EventBody::AgentHandoffNeeded(_) => "handoff-needed",
EventBody::AgentPromptSubmitted(_) => "prompt-submitted",
EventBody::AgentPromptDelivered(_) => "prompt-delivered",
EventBody::AgentPromptDeliveryFailed(_) => "prompt-delivery-failed",
EventBody::AgentStopped(_) => "stopped",
_ => unreachable!(),
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/event/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ pub enum EventBody {
AgentTestFinished(AgentEvent),
AgentTestFailed(AgentEvent),
AgentHandoffNeeded(AgentEvent),
AgentPromptSubmitted(AgentEvent),
AgentPromptDelivered(AgentEvent),
AgentPromptDeliveryFailed(AgentEvent),
AgentStopped(AgentEvent),
WorkspaceSessionStarted(WorkspaceEvent),
WorkspaceTurnComplete(WorkspaceEvent),
WorkspaceSkillActivated(WorkspaceEvent),
Expand Down
89 changes: 88 additions & 1 deletion src/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,10 @@ impl IncomingEvent {
"test-finished" => "session.test-finished",
"test-failed" => "session.test-failed",
"handoff-needed" => "session.handoff-needed",
"prompt-submitted" => "session.prompt-submitted",
"prompt-delivered" => "session.prompt-delivered",
"prompt-delivery-failed" => "session.prompt-delivery-failed",
"stopped" => "session.stopped",
other => other,
}
}
Expand Down Expand Up @@ -819,6 +823,19 @@ fn map_native_signal(raw: &str) -> Option<&'static str> {
}
"test-failed" | "session.test-failed" | "test.failed" => Some("session.test-failed"),
"handoff-needed" | "session.handoff-needed" => Some("session.handoff-needed"),
"stop" | "stopped" | "session.stopped" => Some("session.stopped"),
"userpromptsubmit"
| "user-prompt-submit"
| "user-prompt-submitted"
| "prompt-submitted"
| "prompt.submitted"
| "session.prompt-submitted" => Some("session.prompt-submitted"),
"prompt-delivered" | "session.prompt-delivered" | "first-prompt-delivered" => {
Some("session.prompt-delivered")
}
"prompt-delivery-failed"
| "session.prompt-delivery-failed"
| "first-prompt-delivery-failed" => Some("session.prompt-delivery-failed"),
_ => None,
}
}
Expand Down Expand Up @@ -1036,7 +1053,8 @@ fn normalize_native_metadata(payload: &mut Value, raw_kind: &str, canonical_kind
insert_string_if_missing(object, "tool_name", tool_name);
insert_string_if_missing(object, "test_runner", test_runner);
insert_u64_if_missing(object, "elapsed_secs", elapsed_secs);
insert_string_if_missing(object, "status", status);
insert_string_if_missing(object, "status", status.clone());
insert_string_if_missing(object, "normalized_event", status);
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Avoid deriving normalized_event from status globally

Setting normalized_event from status here causes unrelated events to be reclassified on the second normalization pass in from_incoming_event (src/event/compat.rs, line 22). For example, an event with kind github.ci-failed and payload status: "failed" will gain normalized_event: "failed", and then native_contract_kind remaps it to session.failed, changing routing/rendering semantics. This regression affects any non-native event payload that includes status values like started/finished/failed.

Useful? React with 👍 / 👎.

insert_string_if_missing(object, "summary", summary);
insert_string_if_missing(object, "error_message", error_message);
insert_string_if_missing(object, "event_timestamp", event_timestamp);
Expand Down Expand Up @@ -1111,6 +1129,10 @@ fn event_status_from_kind(kind: &str) -> Option<&'static str> {
"session.test-finished" => Some("test-finished"),
"session.test-failed" => Some("test-failed"),
"session.handoff-needed" => Some("handoff-needed"),
"session.prompt-submitted" => Some("prompt-submitted"),
"session.prompt-delivered" => Some("prompt-delivered"),
"session.prompt-delivery-failed" => Some("prompt-delivery-failed"),
"session.stopped" => Some("stopped"),
_ => None,
}
}
Expand Down Expand Up @@ -1968,4 +1990,69 @@ mod tests {
"[tmux:issue-24] 'error': build failed · 'complete': job complete"
);
}

#[test]
fn canonical_kind_maps_prompt_lifecycle_aliases() {
let cases = [
("prompt-submitted", "session.prompt-submitted"),
("prompt-delivered", "session.prompt-delivered"),
("prompt-delivery-failed", "session.prompt-delivery-failed"),
("stopped", "session.stopped"),
];

for (kind, expected) in cases {
let event = IncomingEvent {
kind: kind.into(),
channel: None,
mention: None,
format: None,
template: None,
payload: json!({}),
};
assert_eq!(
event.canonical_kind(),
expected,
"unexpected canonical kind for {kind}"
);
}
}

#[test]
fn normalize_event_maps_native_prompt_and_stop_signals() {
let cases = [
(
"user-prompt-submit",
json!({}),
"session.prompt-submitted",
"prompt-submitted",
),
(
"notify",
json!({"normalized_event": "prompt-delivered"}),
"session.prompt-delivered",
"prompt-delivered",
),
(
"notify",
json!({"route_key": "first-prompt-delivery-failed"}),
"session.prompt-delivery-failed",
"prompt-delivery-failed",
),
("stop", json!({}), "session.stopped", "stopped"),
];

for (kind, payload, expected_kind, expected_status) in cases {
let event = normalize_event(IncomingEvent {
kind: kind.into(),
channel: None,
mention: None,
format: None,
template: None,
payload,
});
assert_eq!(event.kind, expected_kind);
assert_eq!(event.payload["status"], json!(expected_status));
assert_eq!(event.payload["normalized_event"], json!(expected_status));
}
}
}
13 changes: 10 additions & 3 deletions src/native_hooks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,10 @@ fn map_shared_event(value: &str) -> Option<&'static str> {
"sessionstart" | "session-start" | "session.started" | "started" => Some("session.started"),
"pretooluse" | "pre-tool-use" => Some("tool.pre"),
"posttooluse" | "post-tool-use" => Some("tool.post"),
"userpromptsubmit" | "user-prompt-submit" => Some("prompt.submitted"),
"userpromptsubmit"
| "user-prompt-submit"
| "prompt-submitted"
| "session.prompt-submitted" => Some("session.prompt-submitted"),
"stop" | "sessionstop" | "session-stopped" => Some("session.stopped"),
_ => None,
}
Expand All @@ -407,7 +410,7 @@ fn normalized_event_label(kind: &str) -> &str {
"session.started" => "started",
"tool.pre" => "pre-tool-use",
"tool.post" => "post-tool-use",
"prompt.submitted" => "user-prompt-submit",
"session.prompt-submitted" => "prompt-submitted",
"session.stopped" => "stop",
_ => kind,
}
Expand Down Expand Up @@ -552,7 +555,11 @@ mod tests {
("SessionStart", "codex", "session.started"),
("PreToolUse", "codex", "tool.pre"),
("PostToolUse", "claude-code", "tool.post"),
("UserPromptSubmit", "claude-code", "prompt.submitted"),
(
"UserPromptSubmit",
"claude-code",
"session.prompt-submitted",
),
("Stop", "codex", "session.stopped"),
];

Expand Down
19 changes: 12 additions & 7 deletions src/render/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,13 +414,18 @@ fn session_subject(payload: &Value) -> String {

fn session_status_label(kind: &str, payload: &Value) -> String {
match kind {
"session.started" | "session.blocked" | "session.finished" | "session.failed" => {
optional_string_field(payload, "status").unwrap_or_else(|| {
kind.strip_prefix("session.")
.unwrap_or(kind)
.replace('-', " ")
})
}
"session.started"
| "session.blocked"
| "session.finished"
| "session.failed"
| "session.prompt-submitted"
| "session.prompt-delivered"
| "session.prompt-delivery-failed"
| "session.stopped" => optional_string_field(payload, "status").unwrap_or_else(|| {
kind.strip_prefix("session.")
.unwrap_or(kind)
.replace('-', " ")
}),
_ => kind.strip_prefix("session.").unwrap_or(kind).to_string(),
}
}
Expand Down
Loading