Skip to content

Commit 7c5b2a9

Browse files
harshitsinghbhandariclaude
andcommitted
refactor(adapters): use ports.MetadataKeyAgentSessionID in claudecode + codex
The native session id metadata key is defined in ports for cross-package consumption; drop the duplicated literals in each adapter so the constant has one home. Co-Authored-By: Claude Opus 4.7 <[email protected]>
1 parent fcb194f commit 7c5b2a9

4 files changed

Lines changed: 16 additions & 17 deletions

File tree

‎backend/internal/adapters/agent/claudecode/claudecode.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ const (
4141
// Normalized session-metadata keys the Claude Code hooks persist into the
4242
// AO session store and SessionInfo reads back. Shared vocabulary
4343
// with the Codex adapter so the dashboard treats every agent uniformly.
44-
// agentSessionId is also the preferred restore id.
45-
claudeAgentSessionIDMetadataKey = "agentSessionId"
46-
claudeTitleMetadataKey = "title"
47-
claudeSummaryMetadataKey = "summary"
44+
// The native session id key lives in ports as MetadataKeyAgentSessionID
45+
// because the Session Manager also reads it.
46+
claudeTitleMetadataKey = "title"
47+
claudeSummaryMetadataKey = "summary"
4848
)
4949

5050
// claudeSessionNamespace seeds the UUIDv5 derivation that maps an AO
@@ -187,7 +187,7 @@ func (p *Plugin) GetRestoreCommand(ctx context.Context, cfg ports.RestoreConfig)
187187
return nil, false, err
188188
}
189189

190-
sessionID := strings.TrimSpace(cfg.Session.Metadata[claudeAgentSessionIDMetadataKey])
190+
sessionID := strings.TrimSpace(cfg.Session.Metadata[ports.MetadataKeyAgentSessionID])
191191
if sessionID == "" && cfg.Session.ID != "" {
192192
// Explicit fallback for pre-hook sessions: the id AO
193193
// deterministically pinned via --session-id at launch.
@@ -219,7 +219,7 @@ func (p *Plugin) SessionInfo(ctx context.Context, session ports.SessionRef) (por
219219
return ports.SessionInfo{}, false, err
220220
}
221221
info := ports.SessionInfo{
222-
AgentSessionID: session.Metadata[claudeAgentSessionIDMetadataKey],
222+
AgentSessionID: session.Metadata[ports.MetadataKeyAgentSessionID],
223223
Title: session.Metadata[claudeTitleMetadataKey],
224224
Summary: session.Metadata[claudeSummaryMetadataKey],
225225
}

‎backend/internal/adapters/agent/claudecode/claudecode_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ func TestSessionInfoReadsHookMetadata(t *testing.T) {
294294
info, ok, err := (&Plugin{resolvedBinary: "claude"}).SessionInfo(context.Background(), ports.SessionRef{
295295
WorkspacePath: "/some/path",
296296
Metadata: map[string]string{
297-
claudeAgentSessionIDMetadataKey: "claude-native-1",
297+
ports.MetadataKeyAgentSessionID: "claude-native-1",
298298
claudeTitleMetadataKey: "Fix login redirect",
299299
claudeSummaryMetadataKey: "Updated the auth callback and tests.",
300300
"ignored": "not returned",
@@ -365,7 +365,7 @@ func TestGetRestoreCommandReadsAgentSessionID(t *testing.T) {
365365
Permissions: ports.PermissionModeBypassPermissions,
366366
Session: ports.SessionRef{
367367
ID: "sess-r",
368-
Metadata: map[string]string{claudeAgentSessionIDMetadataKey: "claude-native-1"},
368+
Metadata: map[string]string{ports.MetadataKeyAgentSessionID: "claude-native-1"},
369369
},
370370
})
371371
if err != nil || !ok {
@@ -400,7 +400,7 @@ func TestGetRestoreCommandFalseWithoutSessionID(t *testing.T) {
400400
ref ports.SessionRef
401401
}{
402402
{"empty ref", ports.SessionRef{}},
403-
{"blank agent session, no id", ports.SessionRef{Metadata: map[string]string{claudeAgentSessionIDMetadataKey: " "}}},
403+
{"blank agent session, no id", ports.SessionRef{Metadata: map[string]string{ports.MetadataKeyAgentSessionID: " "}}},
404404
{"workspace path only", ports.SessionRef{WorkspacePath: "/some/path"}},
405405
}
406406
for _, tc := range cases {

‎backend/internal/adapters/agent/codex/codex.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ import (
2020
)
2121

2222
const (
23-
codexAgentSessionIDMetadataKey = "agentSessionId"
24-
codexTitleMetadataKey = "title"
25-
codexSummaryMetadataKey = "summary"
23+
codexTitleMetadataKey = "title"
24+
codexSummaryMetadataKey = "summary"
2625
)
2726

2827
// Plugin is the Codex agent adapter. It is safe for concurrent use; the binary
@@ -104,7 +103,7 @@ func (p *Plugin) GetRestoreCommand(ctx context.Context, cfg ports.RestoreConfig)
104103
if err := ctx.Err(); err != nil {
105104
return nil, false, err
106105
}
107-
agentSessionID := strings.TrimSpace(cfg.Session.Metadata[codexAgentSessionIDMetadataKey])
106+
agentSessionID := strings.TrimSpace(cfg.Session.Metadata[ports.MetadataKeyAgentSessionID])
108107
if agentSessionID == "" {
109108
return nil, false, nil
110109
}
@@ -129,7 +128,7 @@ func (p *Plugin) SessionInfo(ctx context.Context, session ports.SessionRef) (por
129128
return ports.SessionInfo{}, false, err
130129
}
131130
info := ports.SessionInfo{
132-
AgentSessionID: session.Metadata[codexAgentSessionIDMetadataKey],
131+
AgentSessionID: session.Metadata[ports.MetadataKeyAgentSessionID],
133132
Title: session.Metadata[codexTitleMetadataKey],
134133
Summary: session.Metadata[codexSummaryMetadataKey],
135134
}

‎backend/internal/adapters/agent/codex/codex_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func TestGetRestoreCommandReadsAgentSessionID(t *testing.T) {
236236
cmd, ok, err := plugin.GetRestoreCommand(context.Background(), ports.RestoreConfig{
237237
Permissions: ports.PermissionModeAuto,
238238
Session: ports.SessionRef{
239-
Metadata: map[string]string{codexAgentSessionIDMetadataKey: "thread-123"},
239+
Metadata: map[string]string{ports.MetadataKeyAgentSessionID: "thread-123"},
240240
},
241241
})
242242
if err != nil {
@@ -267,7 +267,7 @@ func TestGetRestoreCommandFalseWithoutAgentSessionID(t *testing.T) {
267267
}{
268268
{"empty session ref", ports.SessionRef{}},
269269
{"empty metadata", ports.SessionRef{Metadata: map[string]string{}}},
270-
{"blank agent session metadata", ports.SessionRef{Metadata: map[string]string{codexAgentSessionIDMetadataKey: " "}}},
270+
{"blank agent session metadata", ports.SessionRef{Metadata: map[string]string{ports.MetadataKeyAgentSessionID: " "}}},
271271
{"workspace path only", ports.SessionRef{WorkspacePath: "/some/path"}},
272272
}
273273
for _, tc := range cases {
@@ -295,7 +295,7 @@ func TestSessionInfoReadsHookMetadata(t *testing.T) {
295295
info, ok, err := plugin.SessionInfo(context.Background(), ports.SessionRef{
296296
WorkspacePath: "/some/path",
297297
Metadata: map[string]string{
298-
codexAgentSessionIDMetadataKey: "thread-123",
298+
ports.MetadataKeyAgentSessionID: "thread-123",
299299
codexTitleMetadataKey: "Fix login redirect",
300300
codexSummaryMetadataKey: "Updated the auth callback and tests.",
301301
"ignored": "not returned",

0 commit comments

Comments
 (0)