chore: reset the session in runner before running query

Author: wmalgadey

container/agent-runner/src/index.ts

@@ -517,6 +517,16 @@ async function main(): Promise<void> {
   let resumeAt: string | undefined;
   try {
     while (true) {
+      // Apply any pending session reset before starting the next query.
+      // This ensures /new-session takes effect even when the container is
+      // idle-waiting or was mid-query when the reset message arrived.
+      if (pendingReset) {
+        log('Applying pending reset: clearing sessionId and resumeAt for new session');
+        sessionId = undefined;
+        resumeAt = undefined;
+        pendingReset = false;
+      }
+
       log(`Starting query (session: ${sessionId || 'new'}, resumeAt: ${resumeAt || 'latest'})...`);
 
       const queryResult = await runQuery(prompt, sessionId, mcpServerPath, containerInput, sdkEnv, resumeAt);
@@ -547,16 +557,6 @@ async function main(): Promise<void> {
         break;
       }
 
-      // Apply any pending session reset before starting the next query.
-      // This ensures /new-session takes effect even when the container is
-      // idle-waiting or was mid-query when the reset message arrived.
-      if (pendingReset) {
-        log('Applying pending reset: clearing sessionId and resumeAt for new session');
-        sessionId = undefined;
-        resumeAt = undefined;
-        pendingReset = false;
-      }
-
       log(`Got new message (${nextMessage.length} chars), starting new query`);
       prompt = nextMessage;
     }

src/group-queue.ts

@@ -186,7 +186,11 @@ export class GroupQueue {
    */
   sendResetByFolder(groupFolder: string): boolean {
     for (const [, state] of this.groups) {
-      if (state.active && !state.isTaskContainer && state.groupFolder === groupFolder) {
+      if (
+        state.active &&
+        !state.isTaskContainer &&
+        state.groupFolder === groupFolder
+      ) {
         const inputDir = path.join(DATA_DIR, 'ipc', groupFolder, 'input');
         try {
           fs.mkdirSync(inputDir, { recursive: true });