Skip to content

refactor(database): dry session entry data #68

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
omarluq merged 2 commits into from
May 31, 2026
Merged

refactor(database): dry session entry data #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cbacdd
refactor(database): dry session entry data
omarluq May 31, 2026
596fa10
refactor(database): simplify entry data helper
omarluq May 31, 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
180 changes: 40 additions & 140 deletions internal/database/session_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,11 @@ func newEntryEntity(sessionID string, parentID *string, entryType EntryType, mes
}
}

func newEntryData() EntryDataEntity {
var data EntryDataEntity
return data
}

// AppendMessage appends a message as a child of the current leaf or provided parent.
func (repository *SessionRepository) AppendMessage(
ctx context.Context,
Expand Down Expand Up @@ -243,26 +248,11 @@ func (repository *SessionRepository) AppendCustomMessage(
display bool,
details map[string]any,
) (*EntryEntity, error) {
dataJSON, err := dataJSONFromEntity(&EntryDataEntity{
Details: details,
Display: &display,
FromHook: false,
FirstKeptEntryID: "",
FromID: "",
Label: nil,
Name: "",
TargetID: "",
ThinkingLevel: "",
ToolName: "",
ToolStatus: "",
ToolArgsJSON: "",
TokenEstimate: 0,
ModelFacing: nil,
CompactionFirstKeptEntryID: "",
CompactionTokensBefore: 0,
BranchFromEntryID: "",
TokensBefore: 0,
})
data := newEntryData()
data.Details = details
data.Display = &display

dataJSON, err := dataJSONFromEntity(&data)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -316,26 +306,10 @@ func (repository *SessionRepository) AppendThinkingLevelChange(
parentID *string,
thinkingLevel string,
) (*EntryEntity, error) {
dataJSON, err := dataJSONFromEntity(&EntryDataEntity{
Details: nil,
Display: nil,
FromHook: false,
FirstKeptEntryID: "",
FromID: "",
Label: nil,
Name: "",
TargetID: "",
ThinkingLevel: thinkingLevel,
ToolName: "",
ToolStatus: "",
ToolArgsJSON: "",
TokenEstimate: 0,
ModelFacing: nil,
CompactionFirstKeptEntryID: "",
CompactionTokensBefore: 0,
BranchFromEntryID: "",
TokensBefore: 0,
})
data := newEntryData()
data.ThinkingLevel = thinkingLevel

dataJSON, err := dataJSONFromEntity(&data)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -368,26 +342,15 @@ func (repository *SessionRepository) AppendCompaction(
details map[string]any,
fromHook bool,
) (*EntryEntity, error) {
dataJSON, err := dataJSONFromEntity(&EntryDataEntity{
Details: details,
Display: nil,
FromHook: fromHook,
FirstKeptEntryID: firstKeptEntryID,
FromID: "",
Label: nil,
Name: "",
TargetID: "",
ThinkingLevel: "",
ToolName: "",
ToolStatus: "",
ToolArgsJSON: "",
TokenEstimate: 0,
ModelFacing: nil,
CompactionFirstKeptEntryID: firstKeptEntryID,
CompactionTokensBefore: tokensBefore,
BranchFromEntryID: "",
TokensBefore: tokensBefore,
})
data := newEntryData()
data.Details = details
data.FromHook = fromHook
data.FirstKeptEntryID = firstKeptEntryID
data.CompactionFirstKeptEntryID = firstKeptEntryID
data.CompactionTokensBefore = tokensBefore
data.TokensBefore = tokensBefore

dataJSON, err := dataJSONFromEntity(&data)
if err != nil {
return nil, err
}
Expand All @@ -405,26 +368,13 @@ func (repository *SessionRepository) AppendBranchSummary(
details map[string]any,
fromHook bool,
) (*EntryEntity, error) {
dataJSON, err := dataJSONFromEntity(&EntryDataEntity{
Details: details,
Display: nil,
FromHook: fromHook,
FirstKeptEntryID: "",
FromID: fromID,
Label: nil,
Name: "",
TargetID: "",
ThinkingLevel: "",
ToolName: "",
ToolStatus: "",
ToolArgsJSON: "",
TokenEstimate: 0,
ModelFacing: nil,
CompactionFirstKeptEntryID: "",
CompactionTokensBefore: 0,
BranchFromEntryID: fromID,
TokensBefore: 0,
})
data := newEntryData()
data.Details = details
data.FromHook = fromHook
data.FromID = fromID
data.BranchFromEntryID = fromID

dataJSON, err := dataJSONFromEntity(&data)
if err != nil {
return nil, err
}
Expand All @@ -440,26 +390,11 @@ func (repository *SessionRepository) AppendLabelChange(
targetID string,
label *string,
) (*EntryEntity, error) {
dataJSON, err := dataJSONFromEntity(&EntryDataEntity{
Details: nil,
Display: nil,
FromHook: false,
FirstKeptEntryID: "",
FromID: "",
Label: label,
Name: "",
TargetID: targetID,
ThinkingLevel: "",
ToolName: "",
ToolStatus: "",
ToolArgsJSON: "",
TokenEstimate: 0,
ModelFacing: nil,
CompactionFirstKeptEntryID: "",
CompactionTokensBefore: 0,
BranchFromEntryID: "",
TokensBefore: 0,
})
data := newEntryData()
data.Label = label
data.TargetID = targetID

dataJSON, err := dataJSONFromEntity(&data)
if err != nil {
return nil, err
}
Expand All @@ -474,26 +409,10 @@ func (repository *SessionRepository) AppendSessionInfo(
parentID *string,
name string,
) (*EntryEntity, error) {
dataJSON, err := dataJSONFromEntity(&EntryDataEntity{
Details: nil,
Display: nil,
FromHook: false,
FirstKeptEntryID: "",
FromID: "",
Label: nil,
Name: name,
TargetID: "",
ThinkingLevel: "",
ToolName: "",
ToolStatus: "",
ToolArgsJSON: "",
TokenEstimate: 0,
ModelFacing: nil,
CompactionFirstKeptEntryID: "",
CompactionTokensBefore: 0,
BranchFromEntryID: "",
TokensBefore: 0,
})
data := newEntryData()
data.Name = name

dataJSON, err := dataJSONFromEntity(&data)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -547,26 +466,7 @@ func dataJSONFromEntity(data *EntryDataEntity) (string, error) {
}

func dataFromEntry(entry *EntryEntity) (EntryDataEntity, error) {
data := EntryDataEntity{
Details: nil,
Display: nil,
FromHook: false,
FirstKeptEntryID: "",
FromID: "",
Label: nil,
Name: "",
TargetID: "",
ThinkingLevel: "",
ToolName: "",
ToolStatus: "",
ToolArgsJSON: "",
TokenEstimate: 0,
ModelFacing: nil,
CompactionFirstKeptEntryID: "",
CompactionTokensBefore: 0,
BranchFromEntryID: "",
TokensBefore: 0,
}
data := newEntryData()
if normalizeDataJSON(entry.DataJSON) == "{}" {
return data, nil
}
Expand Down
Loading