A desktop coding agent with free access to frontier models.
TypeScript
fix: number continued turns on from the earlier ones
ogsamratf80fbefc5779
diff --git a/apps/server/src/context/PARITY.sha256 b/apps/server/src/context/PARITY.sha256index 272b0c22..0b4e9e2e 100644--- a/apps/server/src/context/PARITY.sha256+++ b/apps/server/src/context/PARITY.sha256@@ -3,7 +3,7 @@67b853751c5a32e0fc62d626837fa4be571362b26e11a6d23544db8bf8cce76c commands.tse13f86577014b52affc4c2336630eedcac277b974939c6741119a62b7fda439b ephemeral.ts5f89ff17f225ac47700d31f34c358591c8fbde794a45c156d607e5a675a2ba73 exec.ts-456c950dd6729a80ac6f82f8156d065959e913d4c817f51645884f0fb943a4f1 index.ts+618fd145c9a3d0cb76dd0f5cb539e4e4472010cf060ace2bede81f121dd60119 index.tsbc092dc9e89e430ee3290dd838ee9f82a0ec9931cf430e4a5436a41233f43a0b install-log-assets.ts6722fd167dfd4db7f398617e7193fa06286704fd51fc6119930078e48eaee69f install-log.tsa9474cc5087b39e56f79bcd7e4cdfa9fcb748f26505bf6ad0f891c17393407ac network.tsdiff --git a/apps/server/src/context/index.ts b/apps/server/src/context/index.tsindex 353d0ee9..74eb7cfe 100644--- a/apps/server/src/context/index.ts+++ b/apps/server/src/context/index.ts@@ -245,15 +245,17 @@ export class ContextCapture {/*** A session started. `after`: the uploader's start snapshot; the* machine-wide collection waits for it (bounded) so it never competes- * with the snapshot for the disk and the event loop.+ * with the snapshot for the disk and the event loop. `turnsBefore`: the+ * turns a continued or resumed session already had, so its turn numbers+ * (context.install, context.env_turn, ...) carry on from them.*/- sessionStarted(sessionId: string, root: string, after?: Promise<unknown>): void {+ sessionStarted(sessionId: string, root: string, after?: Promise<unknown>, turnsBefore = 0): void {if (!this.enabled || this.sessions.has(sessionId)) return;const state: SessionContext = {id: sessionId,root,startedAt: Date.now(),- turn: 0,+ turn: Number.isSafeInteger(turnsBefore) && turnsBefore > 0 ? turnsBefore : 0,outside: new OutsideTracker({root,sessionStartMs: Date.now(),diff --git a/apps/server/src/install-log.test.ts b/apps/server/src/install-log.test.tsindex f899edcc..295d259d 100644--- a/apps/server/src/install-log.test.ts+++ b/apps/server/src/install-log.test.ts@@ -89,6 +89,38 @@ test("the wrapper is transparent and a broken log never breaks the tool", { skip}});+test("a continued session numbers its turns on from the turns it had", { skip: !posix }, async () => {+ const root = tmpdir("omnirush-pkglog-cont-");+ try {+ const paths = await il.prepareInstallLog({ stateDir: path.join(root, "state") });+ const events = [];+ const cap = new context.ContextCapture({+ client: "gui",+ scrub: SCRUB,+ record: (sessionId, type, data) => events.push({ sessionId, type, data }),+ sections: { system_packages: false, services: false, setup: false, pm_config: false, shell_aliases: false, processes: false },+ network: false,+ installLog: { raw: paths.raw, bin: paths.bin, gate: async () => ({ enabled: true, samplePercent: 100 }) },+ });+ cap.sessionStarted("ses_gui_new1", root);+ cap.sessionStarted("ses_gui_cont1", root, undefined, 3);+ await new Promise((resolve) => setTimeout(resolve, 300));+ const envTurns = () => events.filter((e) => e.type === "context.env_turn");+ for (const id of ["ses_gui_new1", "ses_gui_cont1", "ses_gui_cont1"]) {+ const before = envTurns().length;+ cap.turnStarted(id);+ cap.turnEnded(id);+ cap.turnMessages(id, [], true);+ for (let i = 0; i < 200 && envTurns().length === before; i++) await new Promise((resolve) => setTimeout(resolve, 100));+ }+ assert.deepEqual(envTurns().map((e) => [e.sessionId, e.data.turn]), [["ses_gui_new1", 1], ["ses_gui_cont1", 4], ["ses_gui_cont1", 5]]);+ cap.sessionEnded("ses_gui_new1");+ cap.sessionEnded("ses_gui_cont1");+ } finally {+ fs.rmSync(root, { recursive: true, force: true });+ }+});+test("integration: an npm install the engine's shell runs becomes one context.install line with exact versions", { skip: !posix || !online, timeout: 180_000 }, async () => {const root = tmpdir("omnirush-pkglog-npm-");try {