github-issue-tower-defence-management 1.116.6 → 1.116.8

package/src/adapter/repositories/FileSystemInteractiveLiveSessionTranscriptResolver.test.ts

@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { FileSystemInteractiveLiveSessionTranscriptResolver } from './FileSystemInteractiveLiveSessionTranscriptResolver';
+import { TranscriptOwnerCallStatusProvider } from './TranscriptOwnerCallStatusProvider';
 
 describe('FileSystemInteractiveLiveSessionTranscriptResolver', () => {
   let configRoot: string;
@@ -41,6 +42,35 @@ describe('FileSystemInteractiveLiveSessionTranscriptResolver', () => {
     return filePath;
   };
 
+  const writeSubagentTranscript = (params: {
+    projectsDirectory: string;
+    cwdSlug: string;
+    parentSessionId: string;
+    agentId: string;
+    mtimeEpochSeconds?: number;
+  }): string => {
+    const subagentDirectory = path.join(
+      params.projectsDirectory,
+      params.cwdSlug,
+      params.parentSessionId,
+      'subagents',
+    );
+    fs.mkdirSync(subagentDirectory, { recursive: true });
+    const filePath = path.join(
+      subagentDirectory,
+      `agent-${params.agentId}.jsonl`,
+    );
+    fs.writeFileSync(filePath, '{"type":"custom-title"}', 'utf8');
+    if (params.mtimeEpochSeconds !== undefined) {
+      fs.utimesSync(
+        filePath,
+        params.mtimeEpochSeconds,
+        params.mtimeEpochSeconds,
+      );
+    }
+    return filePath;
+  };
+
   it('resolves a resume-case transcript by config dir and session id', () => {
     const configDir = path.join(configRoot, 'workbench');
     const filePath = writeTranscript({
@@ -186,6 +216,123 @@ describe('FileSystemInteractiveLiveSessionTranscriptResolver', () => {
     expect(result.get('workbench')).toBe(newerPath);
   });
 
+  it('selects the parent transcript over a newer descendant id transcript', () => {
+    const configDir = path.join(configRoot, 'with-subagent');
+    const parentPath = writeTranscript({
+      projectsDirectory: path.join(configDir, 'projects'),
+      cwdSlug: '-home-user',
+      sessionId: 'parent-id',
+      mtimeEpochSeconds: 1700000000,
+    });
+    writeTranscript({
+      projectsDirectory: path.join(configDir, 'projects'),
+      cwdSlug: '-home-user',
+      sessionId: 'subagent-id',
+      mtimeEpochSeconds: 1700000500,
+    });
+    const resolver = new FileSystemInteractiveLiveSessionTranscriptResolver(
+      sharedProjectsDirectory,
+    );
+
+    const result = resolver.resolveTranscriptPaths([
+      {
+        sessionName: 'with-subagent',
+        sessionId: 'parent-id',
+        candidateSessionIds: ['parent-id', 'subagent-id'],
+        configDir,
+      },
+    ]);
+
+    expect(result.get('with-subagent')).toBe(parentPath);
+  });
+
+  it('selects the rotated parent transcript over a newer descendant id transcript', () => {
+    const configDir = path.join(configRoot, 'rotated-with-subagent');
+    const rotatedParentPath = writeTranscript({
+      projectsDirectory: path.join(configDir, 'projects'),
+      cwdSlug: '-home-user',
+      sessionId: 'rotated-id',
+      mtimeEpochSeconds: 1700000000,
+    });
+    writeTranscript({
+      projectsDirectory: path.join(configDir, 'projects'),
+      cwdSlug: '-home-user',
+      sessionId: 'subagent-id',
+      mtimeEpochSeconds: 1700000500,
+    });
+    const resolver = new FileSystemInteractiveLiveSessionTranscriptResolver(
+      sharedProjectsDirectory,
+    );
+
+    const result = resolver.resolveTranscriptPaths([
+      {
+        sessionName: 'rotated-with-subagent',
+        sessionId: 'launch-id',
+        candidateSessionIds: ['rotated-id', 'launch-id', 'subagent-id'],
+        configDir,
+      },
+    ]);
+
+    expect(result.get('rotated-with-subagent')).toBe(rotatedParentPath);
+  });
+
+  it('selects the parent transcript and never a newer subagent transcript nested under subagents', () => {
+    const configDir = path.join(configRoot, 'subagent-nested');
+    const parentPath = writeTranscript({
+      projectsDirectory: path.join(configDir, 'projects'),
+      cwdSlug: '-home-user',
+      sessionId: 'parent-id',
+      mtimeEpochSeconds: 1700000000,
+    });
+    const subagentPath = writeSubagentTranscript({
+      projectsDirectory: path.join(configDir, 'projects'),
+      cwdSlug: '-home-user',
+      parentSessionId: 'parent-id',
+      agentId: 'worker',
+      mtimeEpochSeconds: 1700000500,
+    });
+    const resolver = new FileSystemInteractiveLiveSessionTranscriptResolver(
+      sharedProjectsDirectory,
+    );
+
+    const result = resolver.resolveTranscriptPaths([
+      {
+        sessionName: 'subagent-nested',
+        sessionId: 'parent-id',
+        candidateSessionIds: ['parent-id', 'subagent-id'],
+        configDir,
+      },
+    ]);
+
+    expect(result.get('subagent-nested')).toBe(parentPath);
+    expect(result.get('subagent-nested')).not.toBe(subagentPath);
+  });
+
+  it('omits a session whose only transcript is nested under a subagents directory', () => {
+    const configDir = path.join(configRoot, 'subagent-only');
+    writeSubagentTranscript({
+      projectsDirectory: path.join(configDir, 'projects'),
+      cwdSlug: '-home-user',
+      parentSessionId: 'parent-id',
+      agentId: 'worker',
+      mtimeEpochSeconds: 1700000500,
+    });
+    const resolver = new FileSystemInteractiveLiveSessionTranscriptResolver(
+      sharedProjectsDirectory,
+    );
+
+    const result = resolver.resolveTranscriptPaths([
+      {
+        sessionName: 'subagent-only',
+        sessionId: 'parent-id',
+        candidateSessionIds: ['parent-id', 'subagent-id'],
+        configDir,
+      },
+    ]);
+
+    expect(result.has('subagent-only')).toBe(false);
+  });
+
   it('resolves several sessions in one call', () => {
     const workbenchConfig = path.join(configRoot, 'workbench');
     const controlRoomConfig = path.join(configRoot, 'control-room');
@@ -272,3 +419,96 @@ describe('FileSystemInteractiveLiveSessionTranscriptResolver', () => {
     expect(result.size).toBe(0);
   });
 });
+
+describe('parent transcript resolution feeding owner-call detection', () => {
+  let configRoot: string;
+  let sharedProjectsDirectory: string;
+
+  beforeEach(() => {
+    configRoot = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'interactive-transcript-ownercall-'),
+    );
+    sharedProjectsDirectory = path.join(configRoot, 'shared', 'projects');
+  });
+
+  afterEach(() => {
+    fs.rmSync(configRoot, { force: true, recursive: true });
+  });
+
+  const ownerCallMarker = '<<OWNER_CALL>>';
+
+  const writeJsonlTranscript = (
+    filePath: string,
+    lines: object[],
+    mtimeEpochSeconds: number,
+  ): void => {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(
+      filePath,
+      lines.map((line) => JSON.stringify(line)).join('\n'),
+      'utf8',
+    );
+    fs.utimesSync(filePath, mtimeEpochSeconds, mtimeEpochSeconds);
+  };
+
+  it('identifies a session running a subagent as waiting on the owner', () => {
+    const configDir = path.join(configRoot, 'waiting');
+    const projectDirectory = path.join(configDir, 'projects', '-home-user');
+    writeJsonlTranscript(
+      path.join(projectDirectory, 'parent-id.jsonl'),
+      [
+        {
+          type: 'assistant',
+          timestamp: '2026-01-01T00:00:00.000Z',
+          message: {
+            role: 'assistant',
+            content: [
+              { type: 'text', text: `${ownerCallMarker} please decide` },
+            ],
+          },
+        },
+      ],
+      1700000000,
+    );
+    writeJsonlTranscript(
+      path.join(
+        projectDirectory,
+        'parent-id',
+        'subagents',
+        'agent-worker.jsonl',
+      ),
+      [
+        {
+          type: 'assistant',
+          timestamp: '2026-01-01T00:05:00.000Z',
+          message: {
+            role: 'assistant',
+            content: [{ type: 'text', text: 'subagent progress' }],
+          },
+        },
+      ],
+      1700000500,
+    );
+    const resolver = new FileSystemInteractiveLiveSessionTranscriptResolver(
+      sharedProjectsDirectory,
+    );
+    const ownerCallStatusProvider = new TranscriptOwnerCallStatusProvider(
+      ownerCallMarker,
+    );
+
+    const transcriptPaths = resolver.resolveTranscriptPaths([
+      {
+        sessionName: 'waiting',
+        sessionId: 'parent-id',
+        candidateSessionIds: ['parent-id', 'subagent-id'],
+        configDir,
+      },
+    ]);
+
+    return ownerCallStatusProvider
+      .listSessionNamesWithUnansweredOwnerCall(transcriptPaths)
+      .then((waiting) => {
+        expect(waiting.has('waiting')).toBe(true);
+      });
+  });
+});

package/src/adapter/repositories/FileSystemInteractiveLiveSessionTranscriptResolver.ts

@@ -38,23 +38,37 @@ export class FileSystemInteractiveLiveSessionTranscriptResolver implements Inter
     session: InteractiveLiveSession,
   ): string | null => {
     const projectsDirectories = this.listProjectsDirectories(session.configDir);
+    for (const candidateSessionId of session.candidateSessionIds) {
+      const transcriptPath = this.resolveCandidateTranscriptPath(
+        candidateSessionId,
+        projectsDirectories,
+      );
+      if (transcriptPath !== null) {
+        return transcriptPath;
+      }
+    }
+    return null;
+  };
+
+  private resolveCandidateTranscriptPath = (
+    candidateSessionId: string,
+    projectsDirectories: string[],
+  ): string | null => {
+    const fileName = `${candidateSessionId}.jsonl`;
     let latestPath: string | null = null;
     let latestEpochMs = -Infinity;
-    for (const candidateSessionId of session.candidateSessionIds) {
-      const fileName = `${candidateSessionId}.jsonl`;
-      for (const projectsDirectory of projectsDirectories) {
-        for (const candidate of this.listCandidatePaths(
-          projectsDirectory,
-          fileName,
-        )) {
-          const epochMs = modifiedEpochMs(candidate);
-          if (epochMs === null) {
-            continue;
-          }
-          if (epochMs > latestEpochMs) {
-            latestEpochMs = epochMs;
-            latestPath = candidate;
-          }
+    for (const projectsDirectory of projectsDirectories) {
+      for (const candidate of this.listCandidatePaths(
+        projectsDirectory,
+        fileName,
+      )) {
+        const epochMs = modifiedEpochMs(candidate);
+        if (epochMs === null) {
+          continue;
+        }
+        if (epochMs > latestEpochMs) {
+          latestEpochMs = epochMs;
+          latestPath = candidate;
         }
       }
     }

package/types/adapter/entry-points/console/consoleOperationApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consoleOperationApi.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/console/consoleOperationApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEhB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAI3D,eAAO,MAAM,8BAA8B,uBAAuB,CAAC;AACnE,eAAO,MAAM,4BAA4B,qBAAqB,CAAC;AAE/D,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CACnC,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAC;AAE3C,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,sBAAsB,CAAC;IACvC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AA+GF,eAAO,MAAM,YAAY,GACvB,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CAwElC,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CA4FlC,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CA2BlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CAiClC,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CAiClC,CAAC"}
+{"version":3,"file":"consoleOperationApi.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/console/consoleOperationApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEhB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAI3D,eAAO,MAAM,8BAA8B,uBAAuB,CAAC;AACnE,eAAO,MAAM,4BAA4B,qBAAqB,CAAC;AAE/D,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CACnC,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAC;AAE3C,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,sBAAsB,CAAC;IACvC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAkHF,eAAO,MAAM,YAAY,GACvB,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CAwElC,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CAgGlC,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CA2BlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CAiClC,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,SAAS,uBAAuB,EAChC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,wBAAwB,CAiClC,CAAC"}

package/types/adapter/repositories/FileSystemInteractiveLiveSessionTranscriptResolver.d.ts

@@ -5,6 +5,7 @@ export declare class FileSystemInteractiveLiveSessionTranscriptResolver implemen
     constructor(sharedProjectsDirectory?: string);
     resolveTranscriptPaths: (sessions: InteractiveLiveSession[]) => Map<string, string>;
     private resolveTranscriptPath;
+    private resolveCandidateTranscriptPath;
     private listProjectsDirectories;
     private listCandidatePaths;
 }

package/types/adapter/repositories/FileSystemInteractiveLiveSessionTranscriptResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileSystemInteractiveLiveSessionTranscriptResolver.d.ts","sourceRoot":"","sources":["../../../src/adapter/repositories/FileSystemInteractiveLiveSessionTranscriptResolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,wCAAwC,EAAE,MAAM,mFAAmF,CAAC;AAc7I,qBAAa,kDAAmD,YAAW,wCAAwC;IAE/G,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAAvB,uBAAuB,GAAE,MAAyC;IAGrF,sBAAsB,GACpB,UAAU,sBAAsB,EAAE,KACjC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CASpB;IAEF,OAAO,CAAC,qBAAqB,CAyB3B;IAEF,OAAO,CAAC,uBAAuB,CAM7B;IAEF,OAAO,CAAC,kBAAkB,CAsBxB;CACH"}
+{"version":3,"file":"FileSystemInteractiveLiveSessionTranscriptResolver.d.ts","sourceRoot":"","sources":["../../../src/adapter/repositories/FileSystemInteractiveLiveSessionTranscriptResolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,wCAAwC,EAAE,MAAM,mFAAmF,CAAC;AAc7I,qBAAa,kDAAmD,YAAW,wCAAwC;IAE/G,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAAvB,uBAAuB,GAAE,MAAyC;IAGrF,sBAAsB,GACpB,UAAU,sBAAsB,EAAE,KACjC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CASpB;IAEF,OAAO,CAAC,qBAAqB,CAc3B;IAEF,OAAO,CAAC,8BAA8B,CAuBpC;IAEF,OAAO,CAAC,uBAAuB,CAM7B;IAEF,OAAO,CAAC,kBAAkB,CAsBxB;CACH"}