Skip to content

fix(tasks): avoid redundant terminal history fetches #3744

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
trunk-io merged 1 commit into from
Jul 23, 2026
Merged

fix(tasks): avoid redundant terminal history fetches #3744

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
122 changes: 74 additions & 48 deletions packages/core/src/sessions/sessionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5959,55 +5959,81 @@ export class SessionService {
return;
}
if (resumeFromRunId) {
const [ancestorResult, currentRunResult] = await Promise.all([
authStatus.auth.client.getTaskRunSessionLogsResult(
taskId,
resumeFromRunId,
{ limit: 100000 },
),
authStatus.auth.client.getTaskRunSessionLogsResult(
taskId,
taskRunId,
{ limit: 100000 },
),
]);
if (!ancestorResult.complete || !currentRunResult.complete) {
this.d.log.warn("Resume session log hydration was incomplete", {
taskId,
taskRunId,
resumeFromRunId,
ancestorComplete: ancestorResult.complete,
currentRunComplete: currentRunResult.complete,
});
return;
if (isTerminalStatus(runStatus)) {
const result =
await authStatus.auth.client.getTaskRunSessionLogsResult(
taskId,
taskRunId,
{ limit: 100000 },
);
if (!result.complete) {
this.d.log.warn("Resume session log hydration was incomplete", {
taskId,
taskRunId,
resumeFromRunId,
});
return;
}
rawEntries = result.entries;
const markedLeafStart = rawEntries.findIndex(
(entry) => getEntryTaskRunMarker(entry) === taskRunId,
);
resumeLeafEntryStartIndex =
markedLeafStart >= 0 ? markedLeafStart : undefined;
liveStreamLineCount =
markedLeafStart >= 0
? rawEntries.length - markedLeafStart
: rawEntries.length;
} else {
const [ancestorResult, currentRunResult] = await Promise.all([
authStatus.auth.client.getTaskRunSessionLogsResult(
taskId,
resumeFromRunId,
{ limit: 100000 },
),
authStatus.auth.client.getTaskRunSessionLogsResult(
taskId,
taskRunId,
{ limit: 100000 },
),
]);
if (!ancestorResult.complete || !currentRunResult.complete) {
this.d.log.warn("Resume session log hydration was incomplete", {
taskId,
taskRunId,
resumeFromRunId,
ancestorComplete: ancestorResult.complete,
currentRunComplete: currentRunResult.complete,
});
return;
}
const ancestorEntries: StoredLogEntry[] = ancestorResult.entries;
const currentRunEntries: StoredLogEntry[] = currentRunResult.entries;
const ancestorKeys = ancestorEntries.map((entry) =>
JSON.stringify(entry),
);
const currentKeys = currentRunEntries.map((entry) =>
JSON.stringify(entry),
);
const overlap = suffixPrefixOverlap(ancestorKeys, currentKeys);
const persistedLeafEntries = currentRunEntries.slice(overlap);
const leafLogs = await this.fetchSessionLogs(logUrl, taskRunId);
const leafKeys = new Set(
persistedLeafEntries.map((entry) => JSON.stringify(entry)),
);
rawEntries = [
...ancestorEntries,
...persistedLeafEntries,
...leafLogs.rawEntries.filter(
(entry) => !leafKeys.has(JSON.stringify(entry)),
),
];
resumeLeafEntryStartIndex = ancestorEntries.length;
liveStreamLineCount = Math.max(
leafLogs.totalLineCount,
persistedLeafEntries.length,
);
}
const ancestorEntries: StoredLogEntry[] = ancestorResult.entries;
const currentRunEntries: StoredLogEntry[] = currentRunResult.entries;

const ancestorKeys = ancestorEntries.map((entry) =>
JSON.stringify(entry),
);
const currentKeys = currentRunEntries.map((entry) =>
JSON.stringify(entry),
);
const overlap = suffixPrefixOverlap(ancestorKeys, currentKeys);
const persistedLeafEntries = currentRunEntries.slice(overlap);
const leafLogs = await this.fetchSessionLogs(logUrl, taskRunId);
const leafKeys = new Set(
persistedLeafEntries.map((entry) => JSON.stringify(entry)),
);
rawEntries = [
...ancestorEntries,
...persistedLeafEntries,
...leafLogs.rawEntries.filter(
(entry) => !leafKeys.has(JSON.stringify(entry)),
),
];
resumeLeafEntryStartIndex = ancestorEntries.length;
liveStreamLineCount = Math.max(
leafLogs.totalLineCount,
persistedLeafEntries.length,
);
} else {
const result = await authStatus.auth.client.getTaskRunSessionLogsResult(
taskId,
Expand Down
Loading