Skip to content
TypeScript

fix(server): import valid conversations within each transcript record limit (#23192)

Julius Marminge3e1e776af3f6
diff --git a/apps/server/src/project/AgentSessionScanner.test.ts b/apps/server/src/project/AgentSessionScanner.test.ts
index 88408c69c7b..ce1830b8c57 100644
--- a/apps/server/src/project/AgentSessionScanner.test.ts
+++ b/apps/server/src/project/AgentSessionScanner.test.ts
@@ -1450,9 +1450,11 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
const claudeHomePath = yield* makeTempDir("t3code-record-budget-claude-");
const codexHomePath = yield* makeTempDir("t3code-record-budget-codex-");
const workspace = yield* makeTempDir("t3code-record-budget-workspace-");
- for (const [sessionId, padding, mtimeMs] of [
- ["excessive", "\n".repeat(100_001), nowMs],
- ["older", "", nowMs - 1_000],
+ const exactLimit = makeRecordLimitTranscript(workspace, false);
+ // The newer transcript has 100,001 records; the older one has exactly 100,000.
+ for (const [sessionId, contents, mtimeMs] of [
+ ["excessive", exactLimit.replace("record-limit-session", "excessive") + "{}\n", nowMs],
+ ["older", exactLimit, nowMs - 1_000],
] as const) {
yield* writeTranscript({
filePath: path.join(
@@ -1463,18 +1465,56 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
"24",
`rollout-${sessionId}.jsonl`,
),
+ contents,
+ mtimeMs,
+ });
+ }
+ const outcomes = yield* runRecentThreadOutcomes({
+ claudeHomePath,
+ codexHomePath,
+ workspaceRoot: workspace,
+ });
+ expect(outcomes.map((outcome) => outcome._tag)).toEqual(["Skipped", "Importable"]);
+ expect(outcomes[1]).toMatchObject({
+ thread: { providerSessionId: "record-limit-session" },
+ });
+ }),
+ );
+
+ it.effect("imports every transcript that fits the per-file record limit", () =>
+ Effect.gen(function* () {
+ const path = yield* Path.Path;
+ const nowMs = Date.parse("2026-08-24T12:00:00.000Z");
+ yield* TestClock.setTime(nowMs);
+ const claudeHomePath = yield* makeTempDir("t3code-shared-records-claude-");
+ const codexHomePath = yield* makeTempDir("t3code-shared-records-codex-");
+ const workspace = yield* makeTempDir("t3code-shared-records-workspace-");
+ // Together these exceed 100,000 records, but each one is individually valid.
+ const recordCounts = [20_000, 20_000, 20_000, 58_000];
+ for (const [index, recordCount] of recordCounts.entries()) {
+ yield* writeTranscript({
+ filePath: path.join(
+ codexHomePath,
+ "sessions",
+ "2026",
+ "08",
+ "24",
+ `rollout-${index}.jsonl`,
+ ),
contents:
[
encodeTranscriptRecord({
type: "session_meta",
- payload: { id: sessionId, cwd: workspace },
+ payload: { id: `session-${index}`, cwd: workspace },
}),
encodeTranscriptRecord({
type: "event_msg",
payload: { type: "user_message", message: "Imported prompt" },
}),
- ].join("\n") + padding,
- mtimeMs,
+ ].join("\n") +
+ "\n" +
+ "{}\n".repeat(recordCount - 2),
+ mtimeMs: nowMs - index * 1_000,
});
}
const outcomes = yield* runRecentThreadOutcomes({
@@ -1482,8 +1522,11 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
codexHomePath,
workspaceRoot: workspace,
});
- expect(outcomes.map((outcome) => outcome._tag)).toEqual(["Skipped", "Importable"]);
- expect(outcomes[1]).toMatchObject({ thread: { providerSessionId: "older" } });
+ expect(
+ outcomes.map((outcome) =>
+ outcome._tag === "Importable" ? outcome.thread.providerSessionId : outcome._tag,
+ ),
+ ).toEqual(["session-0", "session-1", "session-2", "session-3"]);
}),
);
diff --git a/apps/server/src/project/AgentSessionScanner.ts b/apps/server/src/project/AgentSessionScanner.ts
index 6b75ca91e3b..3ed97f8a7d8 100644
--- a/apps/server/src/project/AgentSessionScanner.ts
+++ b/apps/server/src/project/AgentSessionScanner.ts
@@ -996,7 +996,6 @@ export const make = Effect.gen(function* () {
const readTranscript = Effect.fn("AgentSessionScanner.readTranscript")(function* (
filePath: string,
expected: ReturnType<typeof transcriptIdentity>,
- recordLimit: number,
source: AgentSessionSource,
) {
if (expected.size > MAX_IMPORTED_TRANSCRIPT_BYTES) return null;
@@ -1030,7 +1029,7 @@ export const make = Effect.gen(function* () {
const finishRecord = () => {
reader.write(decoder.decode());
recordCount += 1;
- if (recordCount > recordLimit) return false;
+ if (recordCount > MAX_IMPORT_RECORDS) return false;
const value = reader.finish();
const decoded = decodeTranscriptValue(value);
if (Option.isNone(decoded) && source === "pi") {
@@ -1090,7 +1089,7 @@ export const make = Effect.gen(function* () {
if (recordStarted && !(yield* Effect.try(finishRecord))) return null;
return sameTranscriptIdentity(expected, transcriptIdentity(filePath, yield* file.stat))
- ? { records, recordCount, cwd, claudeFields }
+ ? { records, cwd, claudeFields }
: null;
}),
),
@@ -1668,17 +1667,13 @@ export const make = Effect.gen(function* () {
const codexThreadNamesByHome = new Map<string, ReadonlyMap<string, string>>();
let bytesRemaining = MAX_IMPORT_BYTES;
let transcriptsRemaining = MAX_IMPORT_TRANSCRIPTS;
- let recordsRemaining = MAX_IMPORT_RECORDS;
return Stream.fromIteratorSucceed(eligibleTranscripts.values(), 1).pipe(
Stream.mapEffect(({ candidate, transcript }) =>
Effect.gen(function* () {
const completed = completedByFile.get(
`${candidate.providerInstanceId}\0${transcript.filePath}`,
);
- if (
- completed === undefined &&
- (transcriptsRemaining === 0 || bytesRemaining === 0 || recordsRemaining === 0)
- ) {
+ if (completed === undefined && (transcriptsRemaining === 0 || bytesRemaining === 0)) {
return Option.some<AgentSessionRecentThread>({ _tag: "Skipped" });
}
const stats = yield* statOption(transcript.filePath);
@@ -1701,7 +1696,6 @@ export const make = Effect.gen(function* () {
}
if (
transcriptsRemaining === 0 ||
- recordsRemaining === 0 ||
identity.size > MAX_IMPORTED_TRANSCRIPT_BYTES ||
identity.size > bytesRemaining
) {
@@ -1709,16 +1703,10 @@ export const make = Effect.gen(function* () {
}
transcriptsRemaining -= 1;
bytesRemaining -= identity.size;
- const snapshot = yield* readTranscript(
- transcript.filePath,
- identity,
- recordsRemaining,
- candidate.source,
- );
+ const snapshot = yield* readTranscript(transcript.filePath, identity, candidate.source);
if (snapshot === null) {
return Option.some<AgentSessionRecentThread>({ _tag: "Skipped" });
}
- recordsRemaining -= snapshot.recordCount;
if (Option.isNone(snapshot.cwd)) {
return Option.some<AgentSessionRecentThread>({ _tag: "Skipped" });