Skip to content

Commit ead5008

Browse files
tyulyukovtyulyukov
committed
Merge remote-tracking branch 'origin/main' into marcode/port-t3-model-picker
# Conflicts: # apps/web/src/localApi.test.ts
2 parents 41ddce8 + adf4747 commit ead5008

34 files changed

Lines changed: 674 additions & 244 deletions

‎apps/desktop/src/clientPersistence.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ const clientSettings: ClientSettings = {
5656
sidebarProjectSortOrder: "manual",
5757
sidebarThreadSortOrder: "created_at",
5858
timestampFormat: "24-hour",
59-
showTodosInComposer: true,
6059
turnNotificationMode: "off",
6160
turnNotificationSoundId: "default",
6261
turnNotificationCustomSounds: [],

‎apps/server/src/orchestration/Layers/CheckpointReactor.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ describe("CheckpointReactor", () => {
387387
runtimeMode: "approval-required",
388388
activeTurnId: null,
389389
lastError: null,
390+
compacting: false,
390391
updatedAt: createdAt,
391392
},
392393
createdAt,
@@ -485,6 +486,7 @@ describe("CheckpointReactor", () => {
485486
runtimeMode: "approval-required",
486487
activeTurnId: asTurnId("turn-main"),
487488
lastError: null,
489+
compacting: false,
488490
updatedAt: createdAt,
489491
},
490492
createdAt,
@@ -560,6 +562,7 @@ describe("CheckpointReactor", () => {
560562
runtimeMode: "approval-required",
561563
activeTurnId: null,
562564
lastError: null,
565+
compacting: false,
563566
updatedAt: createdAt,
564567
},
565568
createdAt,
@@ -618,6 +621,7 @@ describe("CheckpointReactor", () => {
618621
runtimeMode: "approval-required",
619622
activeTurnId: null,
620623
lastError: null,
624+
compacting: false,
621625
updatedAt: createdAt,
622626
},
623627
createdAt,
@@ -706,6 +710,7 @@ describe("CheckpointReactor", () => {
706710
runtimeMode: "approval-required",
707711
activeTurnId: asTurnId("turn-missing-cwd"),
708712
lastError: null,
713+
compacting: false,
709714
updatedAt: createdAt,
710715
},
711716
createdAt,
@@ -753,6 +758,7 @@ describe("CheckpointReactor", () => {
753758
runtimeMode: "approval-required",
754759
activeTurnId: null,
755760
lastError: null,
761+
compacting: false,
756762
updatedAt: createdAt,
757763
},
758764
createdAt,
@@ -803,6 +809,7 @@ describe("CheckpointReactor", () => {
803809
runtimeMode: "approval-required",
804810
activeTurnId: null,
805811
lastError: null,
812+
compacting: false,
806813
updatedAt: createdAt,
807814
},
808815
createdAt,
@@ -855,6 +862,7 @@ describe("CheckpointReactor", () => {
855862
runtimeMode: "approval-required",
856863
activeTurnId: null,
857864
lastError: null,
865+
compacting: false,
858866
updatedAt: createdAt,
859867
},
860868
createdAt,
@@ -933,6 +941,7 @@ describe("CheckpointReactor", () => {
933941
runtimeMode: "approval-required",
934942
activeTurnId: null,
935943
lastError: null,
944+
compacting: false,
936945
updatedAt: createdAt,
937946
},
938947
createdAt,
@@ -1002,6 +1011,7 @@ describe("CheckpointReactor", () => {
10021011
runtimeMode: "approval-required",
10031012
activeTurnId: null,
10041013
lastError: null,
1014+
compacting: false,
10051015
updatedAt: createdAt,
10061016
},
10071017
createdAt,

‎apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,6 +1780,7 @@ it.effect("restores pending turn-start metadata across projection pipeline resta
17801780
runtimeMode: "approval-required",
17811781
activeTurnId: turnId,
17821782
lastError: null,
1783+
compacting: false,
17831784
updatedAt: sessionSetAt,
17841785
},
17851786
},

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
339339
runtimeMode: "approval-required",
340340
activeTurnId: asTurnId("turn-1"),
341341
lastError: null,
342+
compacting: false,
342343
updatedAt: "2026-02-24T00:00:07.000Z",
343344
},
344345
},

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
820820
runtimeMode: row.runtimeMode,
821821
activeTurnId: row.activeTurnId,
822822
lastError: row.lastError,
823+
compacting: false,
823824
updatedAt: row.updatedAt,
824825
});
825826
}
@@ -1120,6 +1121,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
11201121
runtimeMode: row.runtimeMode,
11211122
activeTurnId: row.activeTurnId,
11221123
lastError: row.lastError,
1124+
compacting: false,
11231125
updatedAt: row.updatedAt,
11241126
});
11251127
}
@@ -1312,6 +1314,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
13121314
runtimeMode: sessionRowOpt.value.runtimeMode,
13131315
activeTurnId: sessionRowOpt.value.activeTurnId,
13141316
lastError: sessionRowOpt.value.lastError,
1317+
compacting: false,
13151318
updatedAt: sessionRowOpt.value.updatedAt,
13161319
}
13171320
: null;

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,6 +1039,7 @@ describe("ProviderCommandReactor", () => {
10391039
runtimeMode: "full-access",
10401040
activeTurnId: null,
10411041
lastError: null,
1042+
compacting: false,
10421043
updatedAt: now,
10431044
},
10441045
createdAt: now,
@@ -1219,6 +1220,7 @@ describe("ProviderCommandReactor", () => {
12191220
runtimeMode: "approval-required",
12201221
activeTurnId: asTurnId("turn-1"),
12211222
lastError: null,
1223+
compacting: false,
12221224
updatedAt: now,
12231225
},
12241226
createdAt: now,
@@ -1257,6 +1259,7 @@ describe("ProviderCommandReactor", () => {
12571259
runtimeMode: "approval-required",
12581260
activeTurnId: null,
12591261
lastError: null,
1262+
compacting: false,
12601263
updatedAt: now,
12611264
},
12621265
createdAt: now,
@@ -1298,6 +1301,7 @@ describe("ProviderCommandReactor", () => {
12981301
runtimeMode: "approval-required",
12991302
activeTurnId: null,
13001303
lastError: null,
1304+
compacting: false,
13011305
updatedAt: now,
13021306
},
13031307
createdAt: now,
@@ -1352,6 +1356,7 @@ describe("ProviderCommandReactor", () => {
13521356
runtimeMode: "approval-required",
13531357
activeTurnId: null,
13541358
lastError: null,
1359+
compacting: false,
13551360
updatedAt: now,
13561361
},
13571362
createdAt: now,
@@ -1447,6 +1452,7 @@ describe("ProviderCommandReactor", () => {
14471452
runtimeMode: "approval-required",
14481453
activeTurnId: null,
14491454
lastError: null,
1455+
compacting: false,
14501456
updatedAt: now,
14511457
},
14521458
createdAt: now,
@@ -1547,6 +1553,7 @@ describe("ProviderCommandReactor", () => {
15471553
runtimeMode: "approval-required",
15481554
activeTurnId: null,
15491555
lastError: null,
1556+
compacting: false,
15501557
updatedAt: now,
15511558
},
15521559
createdAt: now,

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ const make = Effect.gen(function* () {
313313
// Provider turn ids are not orchestration turn ids.
314314
activeTurnId: null,
315315
lastError: session.lastError ?? null,
316+
compacting: thread.session?.compacting ?? false,
316317
updatedAt: session.updatedAt,
317318
},
318319
createdAt,
@@ -766,6 +767,7 @@ const make = Effect.gen(function* () {
766767
runtimeMode: thread.session?.runtimeMode ?? DEFAULT_RUNTIME_MODE,
767768
activeTurnId: null,
768769
lastError: thread.session?.lastError ?? null,
770+
compacting: false,
769771
updatedAt: now,
770772
},
771773
createdAt: now,

0 commit comments

Comments
 (0)