Skip to content

feat: clean up session reloadin #1481

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
k11kirky wants to merge 1 commit into
base: 04-03-feat_update_codex_adapter_and_migrate_to_base_acp_prxy_for_agent
Choose a base branch
from
Open

feat: clean up session reloadin #1481

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
40 changes: 19 additions & 21 deletions apps/code/src/main/services/agent/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,36 +637,34 @@ When creating pull requests, add the following footer at the end of the PR descr
let configOptions: SessionConfigOption[] | undefined;
let agentSessionId: string;

if (isReconnect && adapter === "codex" && config.sessionId) {
const existingSessionId = config.sessionId;
const loadResponse = await connection.loadSession({
sessionId: existingSessionId,
cwd: repoPath,
mcpServers,
});
configOptions = loadResponse.configOptions ?? undefined;
agentSessionId = existingSessionId;
} else if (isReconnect && adapter === "claude" && config.sessionId) {
if (isReconnect && config.sessionId) {
const existingSessionId = config.sessionId;

const posthogAPI = agent.getPosthogAPI();
if (posthogAPI) {
await hydrateSessionJsonl({
sessionId: existingSessionId,
cwd: repoPath,
taskId,
runId: taskRunId,
permissionMode: config.permissionMode,
posthogAPI,
log,
});
// Claude-specific: hydrate session JSONL from PostHog before resuming
if (adapter !== "codex") {
const posthogAPI = agent.getPosthogAPI();
if (posthogAPI) {
await hydrateSessionJsonl({
sessionId: existingSessionId,
cwd: repoPath,
taskId,
runId: taskRunId,
permissionMode: config.permissionMode,
posthogAPI,
log,
});
}
}

const systemPrompt = this.buildSystemPrompt(
credentials,
taskId,
customInstructions,
);

// Both adapters implement unstable_resumeSession:
// - Claude: delegates to SDK's resumeSession with JSONL hydration
// - Codex: delegates to codex-acp's loadSession internally
const resumeResponse = await connection.unstable_resumeSession({
sessionId: existingSessionId,
cwd: repoPath,
Expand Down
Loading