Skip to content

refactor(adapters): extract shared session_state_is_current helper #105

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
samzong merged 1 commit into from
Jul 8, 2026
Merged

refactor(adapters): extract shared session_state_is_current helper #105

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
27 changes: 4 additions & 23 deletions src/adapters/cursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::adapters::{
RawMessage, RawSession, ResumeCommand, SourceAdapter, SyncScanResult, SyncScanStats,
first_timestamp, last_timestamp,
};
use crate::db::store::{EventSessionStateMeta, Store, UsageSessionStateMeta};
use crate::db::store::Store;
use crate::types::{RawSessionEvent, RawUsageEvent, Role};

pub(crate) struct CursorAdapter;
Expand Down Expand Up @@ -105,7 +105,9 @@ impl SourceAdapter for CursorAdapter {
let source_updated_at = updated_at.or(global_mtime);
if let Some((old_updated_at, _)) = existing.get(&composer_id)
&& *old_updated_at == source_updated_at
&& session_state_is_current(
&& crate::adapters::sync_state::session_state_is_current(
USAGE_PARSER_VERSION,
EVENT_PARSER_VERSION,
usage_state.get(&composer_id).copied(),
event_state.get(&composer_id).copied(),
source_updated_at,
Expand Down Expand Up @@ -1035,27 +1037,6 @@ fn global_db_mtime() -> Option<i64> {
resolve_global_state_db_path().and_then(|path| stat_mtime_ms(&path))
}

fn session_state_is_current(
usage_state: Option<UsageSessionStateMeta>,
event_state: Option<EventSessionStateMeta>,
source_updated_at: Option<i64>,
include_events: bool,
) -> bool {
if !crate::adapters::sync_state::usage_state_is_current(
USAGE_PARSER_VERSION,
usage_state,
source_updated_at,
) {
return false;
}
!include_events
|| crate::adapters::sync_state::event_state_is_current(
EVENT_PARSER_VERSION,
event_state,
source_updated_at,
)
}

fn build_agent_cwd_map(db_path: Option<&Path>) -> HashMap<String, String> {
let Some(db_path) = db_path else {
return HashMap::new();
Expand Down
11 changes: 4 additions & 7 deletions src/adapters/opencode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,17 +647,14 @@ fn scan_for_sync_conn(
let current_message_count = current_counts.get(&session.id).copied().unwrap_or(0);
if session.time_updated == old_updated_at
&& current_message_count == old_message_count
&& crate::adapters::sync_state::usage_state_is_current(
&& crate::adapters::sync_state::session_state_is_current(
USAGE_PARSER_VERSION,
EVENT_PARSER_VERSION,
usage_state.get(&session.id).copied(),
event_state.get(&session.id).copied(),
session.time_updated,
include_events,
)
&& (!include_events
|| crate::adapters::sync_state::event_state_is_current(
EVENT_PARSER_VERSION,
event_state.get(&session.id).copied(),
session.time_updated,
))
{
stats.skipped_sessions += 1;
continue;
Expand Down
13 changes: 13 additions & 0 deletions src/adapters/sync_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ pub(crate) fn event_state_is_current(
})
}

pub(crate) fn session_state_is_current(
usage_parser_version: u32,
event_parser_version: u32,
usage_state: Option<UsageSessionStateMeta>,
event_state: Option<EventSessionStateMeta>,
source_updated_at: Option<i64>,
include_events: bool,
) -> bool {
usage_state_is_current(usage_parser_version, usage_state, source_updated_at)
&& (!include_events
|| event_state_is_current(event_parser_version, event_state, source_updated_at))
}

pub(crate) fn usage_state_is_current_for_mtime(
required_parser_version: Option<u32>,
state: Option<UsageSessionStateMeta>,
Expand Down