github-issue-tower-defence-management 1.112.1 → 1.112.3

package/src/adapter/entry-points/handlers/HandleScheduledEventUseCaseHandler.ts

@@ -128,7 +128,6 @@ export class HandleScheduledEventUseCaseHandler {
       silentNotificationCooldownSeconds?: number;
       silentNotificationStaggerSeconds?: number;
       silentMainStalledMessage?: string;
-      silentOwnerReNotificationMessage?: string;
       silentSubAgentMessageHeader?: string;
       silentSubAgentMessageFooter?: string;
       credentials: {
@@ -634,10 +633,6 @@ export class HandleScheduledEventUseCaseHandler {
               mergedInput.silentMainStalledMessage ??
               process.env.TDPM_SILENT_MAIN_STALLED_MESSAGE ??
               null,
-            ownerReNotificationMessage:
-              mergedInput.silentOwnerReNotificationMessage ??
-              process.env.TDPM_SILENT_OWNER_RE_NOTIFICATION_MESSAGE ??
-              null,
             subAgentMessageHeader:
               mergedInput.silentSubAgentMessageHeader ??
               process.env.TDPM_SILENT_SUBAGENT_MESSAGE_HEADER ??

package/src/adapter/entry-points/handlers/notifySilentTmuxSessions.test.ts

@@ -21,7 +21,6 @@ const CLAUDE_PID = 201;
 
 const EMPTY_TEMPLATES: SilentSessionMessageTemplates = {
   mainStalledMessage: null,
-  ownerReNotificationMessage: null,
   subAgentMessageHeader: null,
   subAgentMessageFooter: null,
 };
@@ -169,7 +168,6 @@ describe('notifySilentTmuxSessions', () => {
       ...baseParams(runner),
       messageTemplates: {
         mainStalledMessage: 'CUSTOM_MAIN_TEMPLATE',
-        ownerReNotificationMessage: null,
         subAgentMessageHeader: null,
         subAgentMessageFooter: null,
       },
@@ -183,42 +181,7 @@ describe('notifySilentTmuxSessions', () => {
     );
   });
 
-  it('sends no notification while an owner call is unanswered and the wait is within the threshold', async () => {
-    const recentOwnerCall = new Date(
-      (NOW_EPOCH_SECONDS - 5 * 60) * 1000,
-    ).toISOString();
-    writeTranscript([
-      {
-        type: 'user',
-        timestamp: '2026-06-25T23:00:00.000Z',
-        message: { role: 'user', content: 'go ahead' },
-      },
-      {
-        type: 'assistant',
-        timestamp: recentOwnerCall,
-        message: {
-          role: 'assistant',
-          stop_reason: 'end_turn',
-          content: [
-            { type: 'text', text: 'waiting <<OWNER_CALL>> please decide' },
-          ],
-        },
-      },
-    ]);
-    const runner = liveSessionRunner();
-
-    await notifySilentTmuxSessions({
-      ...baseParams(runner),
-      ownerCallMarker: '<<OWNER_CALL>>',
-    });
-
-    const sendCall = runner.runCommand.mock.calls.find(
-      (call) => call[0] === 'tmux' && call[1][0] === 'send-keys',
-    );
-    expect(sendCall).toBeUndefined();
-  });
-
-  it('re-notifies the owner when an owner call has been unanswered past the threshold', async () => {
+  it('suppresses the notification whenever an owner call is unanswered, regardless of how long the session has been silent', async () => {
     const stalePendingOwnerCall = new Date(
       (NOW_EPOCH_SECONDS - 11 * 60) * 1000,
     ).toISOString();
@@ -250,10 +213,7 @@ describe('notifySilentTmuxSessions', () => {
     const sendCall = runner.runCommand.mock.calls.find(
       (call) => call[0] === 'tmux' && call[1][0] === 'send-keys',
     );
-    expect(sendCall?.[1][2]).toBe(SESSION_NAME);
-    expect(sendCall?.[1][4]).toContain(SILENT_SESSION_REMINDER_SENTINEL);
-    expect(sendCall?.[1][4]).toContain('Re-raise your pending call-to-user');
-    expect(sendCall?.[1][4]).not.toContain('You have produced no output for');
+    expect(sendCall).toBeUndefined();
   });
 
   it('does not re-notify the same silent session on the next cycle within cooldown', async () => {

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

@@ -6,9 +6,6 @@ type Mocked<T> = jest.Mocked<T> & jest.MockedObject<T>;
 
 const createFallback = (): Mocked<SilentSessionMessageComposer> => ({
   composeMainStalledSection: jest.fn().mockReturnValue('FALLBACK_MAIN'),
-  composeOwnerReNotificationSection: jest
-    .fn()
-    .mockReturnValue('FALLBACK_OWNER'),
   composeSubAgentSection: jest.fn().mockReturnValue('FALLBACK_SUB'),
 });
 
@@ -18,7 +15,6 @@ describe('ConfigurableSilentSessionMessageComposer', () => {
     const composer = new ConfigurableSilentSessionMessageComposer(
       {
         mainStalledMessage: null,
-        ownerReNotificationMessage: null,
         subAgentMessageHeader: null,
         subAgentMessageFooter: null,
       },
@@ -33,7 +29,6 @@ describe('ConfigurableSilentSessionMessageComposer', () => {
     const composer = new ConfigurableSilentSessionMessageComposer(
       {
         mainStalledMessage: 'CUSTOM_MAIN',
-        ownerReNotificationMessage: null,
         subAgentMessageHeader: null,
         subAgentMessageFooter: null,
       },
@@ -50,7 +45,6 @@ describe('ConfigurableSilentSessionMessageComposer', () => {
     const composer = new ConfigurableSilentSessionMessageComposer(
       {
         mainStalledMessage: null,
-        ownerReNotificationMessage: null,
         subAgentMessageHeader: null,
         subAgentMessageFooter: null,
       },
@@ -68,7 +62,6 @@ describe('ConfigurableSilentSessionMessageComposer', () => {
     const composer = new ConfigurableSilentSessionMessageComposer(
       {
         mainStalledMessage: null,
-        ownerReNotificationMessage: null,
         subAgentMessageHeader: 'HEADER',
         subAgentMessageFooter: 'FOOTER',
       },
@@ -86,48 +79,11 @@ describe('ConfigurableSilentSessionMessageComposer', () => {
     expect(fallback.composeSubAgentSection).not.toHaveBeenCalled();
   });
 
-  it('uses the fallback owner-re-notification section when no template is configured', () => {
-    const fallback = createFallback();
-    const composer = new ConfigurableSilentSessionMessageComposer(
-      {
-        mainStalledMessage: null,
-        ownerReNotificationMessage: null,
-        subAgentMessageHeader: null,
-        subAgentMessageFooter: null,
-      },
-      fallback,
-    );
-    expect(composer.composeOwnerReNotificationSection(600)).toBe(
-      'FALLBACK_OWNER',
-    );
-    expect(fallback.composeOwnerReNotificationSection).toHaveBeenCalledWith(
-      600,
-    );
-  });
-
-  it('uses the configured owner-re-notification template when provided', () => {
-    const fallback = createFallback();
-    const composer = new ConfigurableSilentSessionMessageComposer(
-      {
-        mainStalledMessage: null,
-        ownerReNotificationMessage: 'CUSTOM_OWNER',
-        subAgentMessageHeader: null,
-        subAgentMessageFooter: null,
-      },
-      fallback,
-    );
-    const section = composer.composeOwnerReNotificationSection(600);
-    expect(section).toContain('CUSTOM_OWNER');
-    expect(section).toContain(SILENT_SESSION_REMINDER_SENTINEL);
-    expect(fallback.composeOwnerReNotificationSection).not.toHaveBeenCalled();
-  });
-
   it('does not double-prepend the sentinel when the template already carries it', () => {
     const fallback = createFallback();
     const composer = new ConfigurableSilentSessionMessageComposer(
       {
         mainStalledMessage: `${SILENT_SESSION_REMINDER_SENTINEL} CUSTOM_MAIN`,
-        ownerReNotificationMessage: null,
         subAgentMessageHeader: null,
         subAgentMessageFooter: null,
       },

package/src/adapter/repositories/ConfigurableSilentSessionMessageComposer.ts

@@ -9,7 +9,6 @@ const withReminderSentinel = (message: string): string =>
 
 export type SilentSessionMessageTemplates = {
   mainStalledMessage: string | null;
-  ownerReNotificationMessage: string | null;
   subAgentMessageHeader: string | null;
   subAgentMessageFooter: string | null;
 };
@@ -32,13 +31,6 @@ export class ConfigurableSilentSessionMessageComposer implements SilentSessionMe
     return withReminderSentinel(this.templates.mainStalledMessage);
   };
 
-  composeOwnerReNotificationSection = (waitingSeconds: number): string => {
-    if (this.templates.ownerReNotificationMessage === null) {
-      return this.fallback.composeOwnerReNotificationSection(waitingSeconds);
-    }
-    return withReminderSentinel(this.templates.ownerReNotificationMessage);
-  };
-
   composeSubAgentSection = (subAgents: SubAgentActivity[]): string => {
     if (
       this.templates.subAgentMessageHeader === null &&

package/src/adapter/repositories/GoogleSpreadsheetRepository.integration.test.ts

@@ -6,11 +6,11 @@ dotenv.config();
 
 const GOOGLE_SERVICE_ACCOUNT_KEY = process.env.GOOGLE_SERVICE_ACCOUNT_KEY;
 
-if (!GOOGLE_SERVICE_ACCOUNT_KEY) {
-  throw new Error('GOOGLE_SERVICE_ACCOUNT_KEY is required');
-}
+const describeWhenCredentials = GOOGLE_SERVICE_ACCOUNT_KEY
+  ? describe
+  : describe.skip;
 
-describe('GoogleSpreadsheetRepository integration tests', () => {
+describeWhenCredentials('GoogleSpreadsheetRepository integration tests', () => {
   jest.setTimeout(60 * 1000);
   jest.retryTimes(3, { logErrorsBeforeRetry: true });
 

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

@@ -28,10 +28,12 @@ describe('convertToFieldOptionColor', () => {
   });
 });
 
-describe('GraphqlProjectRepository', () => {
+const token = process.env.GH_TOKEN;
+const describeWhenCredentials = token ? describe : describe.skip;
+
+describeWhenCredentials('GraphqlProjectRepository', () => {
   const localStorageRepository = new LocalStorageRepository();
   let repository: GraphqlProjectRepository;
-  const token = process.env.GH_TOKEN;
   const login = 'HiromiShikata';
   const projectUrl = `https://github.com/users/HiromiShikata/projects/49`;
   const projectNumber = 49;

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

@@ -12,16 +12,17 @@ const TEST_USER_NAME = 'shikata.hiromi_test2';
 const TEST_IMAGE_URL = 'https://i.imgur.com/Zi3qToQ.jpeg';
 const TEST_IMAGE_PATH = './tmp/test/fixtures/test-image.png';
 
-if (!SLACK_USER_TOKEN) {
-  throw new Error('SLACK_USER_TOKEN is required');
-}
+const describeWhenCredentials = SLACK_USER_TOKEN ? describe : describe.skip;
 
-describe('KySlackRepository Integration Tests', () => {
+describeWhenCredentials('KySlackRepository Integration Tests', () => {
   jest.setTimeout(60 * 1000);
   jest.retryTimes(3, { logErrorsBeforeRetry: true });
   let slackRepository: KySlackRepository;
 
   beforeAll(() => {
+    if (!SLACK_USER_TOKEN) {
+      return;
+    }
     slackRepository = new KySlackRepository(SLACK_USER_TOKEN);
   });
   beforeEach(async () => {

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

@@ -52,9 +52,42 @@ describe('TranscriptOwnerCallStatusProvider', () => {
   const ownerReply = (timestamp: string): object => ({
     type: 'user',
     timestamp,
+    origin: { kind: 'human' },
+    promptSource: 'typed',
     message: { role: 'user', content: 'go ahead' },
   });
 
+  const ownerReplyQueuedNoOrigin = (timestamp: string): object => ({
+    type: 'user',
+    timestamp,
+    promptSource: 'queued',
+    message: { role: 'user', content: 'go ahead' },
+  });
+
+  const taskNotification = (timestamp: string): object => ({
+    type: 'user',
+    timestamp,
+    origin: { kind: 'task-notification' },
+    promptSource: 'system',
+    message: {
+      role: 'user',
+      content:
+        '<task-notification>\n<task-id>abc123</task-id>\nA sub-agent finished.\n</task-notification>',
+    },
+  });
+
+  const peerAgentMessage = (timestamp: string): object => ({
+    type: 'user',
+    timestamp,
+    origin: { kind: 'peer' },
+    promptSource: 'system',
+    isMeta: true,
+    message: {
+      role: 'user',
+      content: 'Another Claude session sent a message: please continue.',
+    },
+  });
+
   const toolResult = (timestamp: string): object => ({
     type: 'user',
     timestamp,
@@ -188,6 +221,63 @@ describe('TranscriptOwnerCallStatusProvider', () => {
     expect(result.has(sessionName)).toBe(false);
   });
 
+  it('does not count a system-injected task-notification user entry as an owner reply', async () => {
+    const transcriptPath = writeTranscript('workbench.jsonl', [
+      assistantWithMarker('2026-06-27T10:00:00.000Z'),
+      taskNotification('2026-06-27T10:10:00.000Z'),
+    ]);
+    const provider = new TranscriptOwnerCallStatusProvider('<<OWNER_CALL>>');
+
+    const result = await provider.listSessionNamesWithUnansweredOwnerCall(
+      new Map([[sessionName, transcriptPath]]),
+    );
+
+    expect(result.has(sessionName)).toBe(true);
+  });
+
+  it('does not count a cross-session peer agent message as an owner reply', async () => {
+    const transcriptPath = writeTranscript('workbench.jsonl', [
+      assistantWithMarker('2026-06-27T10:00:00.000Z'),
+      peerAgentMessage('2026-06-27T10:10:00.000Z'),
+    ]);
+    const provider = new TranscriptOwnerCallStatusProvider('<<OWNER_CALL>>');
+
+    const result = await provider.listSessionNamesWithUnansweredOwnerCall(
+      new Map([[sessionName, transcriptPath]]),
+    );
+
+    expect(result.has(sessionName)).toBe(true);
+  });
+
+  it('counts a genuine human reply that has promptSource queued but no origin field', async () => {
+    const transcriptPath = writeTranscript('workbench.jsonl', [
+      assistantWithMarker('2026-06-27T10:00:00.000Z'),
+      ownerReplyQueuedNoOrigin('2026-06-27T10:10:00.000Z'),
+    ]);
+    const provider = new TranscriptOwnerCallStatusProvider('<<OWNER_CALL>>');
+
+    const result = await provider.listSessionNamesWithUnansweredOwnerCall(
+      new Map([[sessionName, transcriptPath]]),
+    );
+
+    expect(result.has(sessionName)).toBe(false);
+  });
+
+  it('counts a genuine human-origin reply that arrives after a task-notification', async () => {
+    const transcriptPath = writeTranscript('workbench.jsonl', [
+      assistantWithMarker('2026-06-27T10:00:00.000Z'),
+      taskNotification('2026-06-27T10:10:00.000Z'),
+      ownerReply('2026-06-27T10:20:00.000Z'),
+    ]);
+    const provider = new TranscriptOwnerCallStatusProvider('<<OWNER_CALL>>');
+
+    const result = await provider.listSessionNamesWithUnansweredOwnerCall(
+      new Map([[sessionName, transcriptPath]]),
+    );
+
+    expect(result.has(sessionName)).toBe(false);
+  });
+
   it('does not report a session that never raised an owner call', async () => {
     const transcriptPath = writeTranscript('workbench.jsonl', [
       assistantPlain('2026-06-27T10:00:00.000Z'),

package/src/adapter/repositories/TranscriptOwnerCallStatusProvider.ts

@@ -40,6 +40,30 @@ const extractText = (content: unknown): string => {
   return texts.join('\n');
 };
 
+// A transcript user entry is only a genuine owner reply when it was actually
+// typed (or queued) by the human owner. Claude Code records the provenance of
+// each user entry on the top-level `origin` and `promptSource` fields. A
+// genuine human prompt is identified by EITHER `origin.kind === 'human'` OR a
+// `promptSource` of `typed`/`queued`; the second condition is required because
+// older-format transcripts record genuine human replies with a `promptSource`
+// of `queued`/`typed` but no `origin` field, and dropping those would leave a
+// real owner reply uncounted and the session waiting forever. Every
+// system-injected user entry, by contrast, uses a `promptSource` of `system`
+// (sub-agent `task-notification` notices, cross-session `peer` messages) or
+// `sdk` (spawn prompts), or has neither field (tool results, skill/meta
+// entries) — none of which match. Only a genuine human entry may clear an
+// outstanding call-to-user; otherwise a system-injected entry would be
+// miscounted as the owner answering and a genuinely waiting session would stop
+// being suppressed.
+const isGenuineHumanEntry = (parsed: Record<string, unknown>): boolean => {
+  const origin = parsed.origin;
+  if (isRecord(origin) && readString(origin, 'kind') === 'human') {
+    return true;
+  }
+  const promptSource = readString(parsed, 'promptSource');
+  return promptSource === 'typed' || promptSource === 'queued';
+};
+
 const hasOwnerTextReply = (content: unknown): boolean => {
   if (typeof content === 'string') {
     if (content.length === 0) {
@@ -122,7 +146,11 @@ export class TranscriptOwnerCallStatusProvider implements OwnerCallStatusProvide
       ) {
         lastOwnerCallEpochMs = epochMs;
       }
-      if (type === 'user' && hasOwnerTextReply(messageContent)) {
+      if (
+        type === 'user' &&
+        isGenuineHumanEntry(parsed) &&
+        hasOwnerTextReply(messageContent)
+      ) {
         lastOwnerReplyEpochMs = epochMs;
       }
     }

package/src/adapter/repositories/issue/ApiV3IssueRepository.test.ts

@@ -3,11 +3,15 @@ import { LocalStorageRepository } from '../LocalStorageRepository';
 import dotenv from 'dotenv';
 
 dotenv.config();
-describe('ApiV3IssueRepository', () => {
+
+const githubToken = process.env.GH_TOKEN;
+const describeWhenCredentials = githubToken ? describe : describe.skip;
+
+describeWhenCredentials('ApiV3IssueRepository', () => {
   const localStorageRepository = new LocalStorageRepository();
   const repository = new ApiV3IssueRepository(
     localStorageRepository,
-    process.env.GH_TOKEN || 'dummy',
+    githubToken,
   );
   test('searchIssue', async () => {
     const result = await repository.searchIssue({

package/src/domain/usecases/DefaultSilentSessionMessageComposer.test.ts

@@ -9,20 +9,6 @@ describe('DefaultSilentSessionMessageComposer', () => {
     expect(section).toContain(SILENT_SESSION_REMINDER_SENTINEL);
   });
 
-  it('embeds the reminder sentinel in the owner-re-notification section', () => {
-    const section = composer.composeOwnerReNotificationSection(1800);
-    expect(section).toContain(SILENT_SESSION_REMINDER_SENTINEL);
-  });
-
-  it('instructs the agent to re-raise its pending call-to-user without treating the reminder as an owner reply', () => {
-    const section = composer.composeOwnerReNotificationSection(1800);
-    expect(section).toContain('waiting on the owner for 30 minutes');
-    expect(section).toContain('NOT the owner replying');
-    expect(section).toContain('Re-raise your pending call-to-user');
-    expect(section).toContain('you are not stalled or idle');
-    expect(section.toLowerCase()).not.toContain('no output for');
-  });
-
   it('embeds the reminder sentinel in the sub-agent section', () => {
     const section = composer.composeSubAgentSection([
       { label: 'sub-process-1', silentSeconds: 360, runningSeconds: 1200 },
@@ -67,12 +53,10 @@ describe('DefaultSilentSessionMessageComposer', () => {
 
   it('does not contain any host-specific or internal identifiers', () => {
     const mainSection = composer.composeMainStalledSection(600);
-    const ownerSection = composer.composeOwnerReNotificationSection(1800);
     const subSection = composer.composeSubAgentSection([
       { label: 'sub-process-1', silentSeconds: 360, runningSeconds: 1200 },
     ]);
-    const combined =
-      `${mainSection}\n${ownerSection}\n${subSection}`.toLowerCase();
+    const combined = `${mainSection}\n${subSection}`.toLowerCase();
     expect(combined).not.toContain('claude');
     expect(combined).not.toContain('take ownership');
     expect(combined).not.toContain('/home/');

package/src/domain/usecases/DefaultSilentSessionMessageComposer.ts

@@ -19,22 +19,11 @@ const composeMainStalledMessage = (mainSilentSeconds: number): string => {
   ].join('\n');
 };
 
-const composeOwnerReNotificationMessage = (waitingSeconds: number): string => {
-  const minutes = Math.floor(waitingSeconds / 60);
-  return [
-    `${SILENT_SESSION_REMINDER_SENTINEL} This is an automated monitor reminder, NOT the owner replying. Do NOT treat this message as an owner answer to your outstanding call-to-user; your pending question is still unanswered. You have been waiting on the owner for ${minutes} minutes and the owner has not yet replied. The owner is only notified when a fresh call-to-user is raised, so a single past call-to-user that has gone quiet will never reach them. Re-raise your pending call-to-user to the owner now: re-emit it so a new call-to-user marker fires and the owner is notified again. Keep your question and proposed options unchanged unless you have new information. You are correctly waiting on the owner — you are not stalled or idle — so do not abandon the wait and do not invent an owner decision yourself; simply re-surface the same request so the owner sees it.`,
-  ].join('\n');
-};
-
 export class DefaultSilentSessionMessageComposer implements SilentSessionMessageComposer {
   composeMainStalledSection = (mainSilentSeconds: number): string => {
     return composeMainStalledMessage(mainSilentSeconds);
   };
 
-  composeOwnerReNotificationSection = (waitingSeconds: number): string => {
-    return composeOwnerReNotificationMessage(waitingSeconds);
-  };
-
   composeSubAgentSection = (subAgents: SubAgentActivity[]): string => {
     const lines = subAgents.map(
       (subAgent) =>

package/src/domain/usecases/NotifySilentLiveSessionsUseCase.test.ts

@@ -21,7 +21,6 @@ import { InteractiveLiveSession } from '../entities/InteractiveLiveSession';
 type Mocked<T> = jest.Mocked<T> & jest.MockedObject<T>;
 
 const MAIN_STALLED_SECTION = 'MAIN_STALLED_SECTION';
-const OWNER_RENOTIFICATION_SECTION = 'OWNER_RENOTIFICATION_SECTION';
 const SUBAGENT_SECTION = 'SUBAGENT_SECTION';
 
 describe('NotifySilentLiveSessionsUseCase', () => {
@@ -125,9 +124,6 @@ describe('NotifySilentLiveSessionsUseCase', () => {
       composeMainStalledSection: jest
         .fn()
         .mockReturnValue(MAIN_STALLED_SECTION),
-      composeOwnerReNotificationSection: jest
-        .fn()
-        .mockReturnValue(OWNER_RENOTIFICATION_SECTION),
       composeSubAgentSection: jest.fn().mockReturnValue(SUBAGENT_SECTION),
     };
     mockSleeper = {
@@ -201,7 +197,7 @@ describe('NotifySilentLiveSessionsUseCase', () => {
     ).toHaveBeenCalledWith(['workbench']);
   });
 
-  it('sends the owner-re-notification section instead of the stalled section when an owner call is pending past the threshold', async () => {
+  it('suppresses the stalled section and sends nothing when an owner call is pending past the threshold', async () => {
     setupLiveInteractiveSession('workbench');
     mockSessionOutputActivityRepository.listSessionOutputActivities.mockResolvedValue(
       [
@@ -221,65 +217,12 @@ describe('NotifySilentLiveSessionsUseCase', () => {
     expect(
       mockMessageComposer.composeMainStalledSection,
     ).not.toHaveBeenCalled();
-    expect(
-      mockMessageComposer.composeOwnerReNotificationSection,
-    ).toHaveBeenCalledWith(DEFAULT_MAIN_SILENT_THRESHOLD_SECONDS);
-    expect(
-      mockNotificationRepository.sendSelfCheckNotification,
-    ).toHaveBeenCalledWith('workbench', OWNER_RENOTIFICATION_SECTION);
-  });
-
-  it('does not send the owner-re-notification section when the owner-call wait is within the threshold', async () => {
-    setupLiveInteractiveSession('workbench');
-    mockSessionOutputActivityRepository.listSessionOutputActivities.mockResolvedValue(
-      [
-        {
-          sessionName: 'workbench',
-          lastOutputEpochSeconds:
-            nowEpochSeconds - DEFAULT_MAIN_SILENT_THRESHOLD_SECONDS + 1,
-        },
-      ],
-    );
-    mockOwnerCallStatusProvider.listSessionNamesWithUnansweredOwnerCall.mockResolvedValue(
-      new Set(['workbench']),
-    );
-
-    await useCase.run(runParams());
-
-    expect(
-      mockMessageComposer.composeOwnerReNotificationSection,
-    ).not.toHaveBeenCalled();
-    expect(
-      mockNotificationRepository.sendSelfCheckNotification,
-    ).not.toHaveBeenCalled();
-  });
-
-  it('does not re-notify the owner within the cooldown window while still waiting on the owner', async () => {
-    setupLiveInteractiveSession('workbench');
-    mockSessionOutputActivityRepository.listSessionOutputActivities.mockResolvedValue(
-      [
-        {
-          sessionName: 'workbench',
-          lastOutputEpochSeconds:
-            nowEpochSeconds - DEFAULT_MAIN_SILENT_THRESHOLD_SECONDS,
-        },
-      ],
-    );
-    mockOwnerCallStatusProvider.listSessionNamesWithUnansweredOwnerCall.mockResolvedValue(
-      new Set(['workbench']),
-    );
-    mockNotificationRepository.getLastNotifiedEpochSeconds.mockResolvedValue(
-      nowEpochSeconds - DEFAULT_NOTIFICATION_COOLDOWN_SECONDS + 1,
-    );
-
-    await useCase.run(runParams());
-
     expect(
       mockNotificationRepository.sendSelfCheckNotification,
     ).not.toHaveBeenCalled();
   });
 
-  it('stops re-notifying the owner once a genuine owner reply clears the unanswered call', async () => {
+  it('sends the main stalled section when the session is silent past the threshold and not waiting on the owner', async () => {
     setupLiveInteractiveSession('workbench');
     mockSessionOutputActivityRepository.listSessionOutputActivities.mockResolvedValue(
       [
@@ -296,9 +239,6 @@ describe('NotifySilentLiveSessionsUseCase', () => {
 
     await useCase.run(runParams());
 
-    expect(
-      mockMessageComposer.composeOwnerReNotificationSection,
-    ).not.toHaveBeenCalled();
     expect(mockMessageComposer.composeMainStalledSection).toHaveBeenCalledWith(
       DEFAULT_MAIN_SILENT_THRESHOLD_SECONDS,
     );

package/src/domain/usecases/NotifySilentLiveSessionsUseCase.ts

@@ -172,27 +172,14 @@ export class NotifySilentLiveSessionsUseCase {
 
     if (
       snapshot.mainSilentSeconds !== null &&
-      snapshot.mainSilentSeconds >= thresholds.mainSilentThresholdSeconds
+      snapshot.mainSilentSeconds >= thresholds.mainSilentThresholdSeconds &&
+      !snapshot.hasUnansweredOwnerCall
     ) {
-      if (snapshot.hasUnansweredOwnerCall) {
-        // The session is correctly waiting on the owner, but it has been silent
-        // long enough that the owner has effectively not been re-notified. Rather
-        // than suppress, instruct the agent to re-raise its pending call-to-user
-        // so the owner's marker re-fires. The per-session cooldown applied in
-        // run() limits this to roughly once per cooldown window, and it stops
-        // automatically once the owner replies (hasUnansweredOwnerCall clears).
-        sections.push(
-          this.messageComposer.composeOwnerReNotificationSection(
-            snapshot.mainSilentSeconds,
-          ),
-        );
-      } else {
-        sections.push(
-          this.messageComposer.composeMainStalledSection(
-            snapshot.mainSilentSeconds,
-          ),
-        );
-      }
+      sections.push(
+        this.messageComposer.composeMainStalledSection(
+          snapshot.mainSilentSeconds,
+        ),
+      );
     }
 
     const stalledSubAgents = snapshot.subAgents.filter(

package/src/domain/usecases/adapter-interfaces/SilentSessionMessageComposer.ts

@@ -2,6 +2,5 @@ import { SubAgentActivity } from '../../entities/LiveSessionActivitySnapshot';
 
 export interface SilentSessionMessageComposer {
   composeMainStalledSection: (mainSilentSeconds: number) => string;
-  composeOwnerReNotificationSection: (waitingSeconds: number) => string;
   composeSubAgentSection: (subAgents: SubAgentActivity[]) => string;
 }

package/types/adapter/entry-points/handlers/HandleScheduledEventUseCaseHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HandleScheduledEventUseCaseHandler.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/HandleScheduledEventUseCaseHandler.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AA0D3D,qBAAa,kCAAkC;IAC7C,MAAM,GACJ,gBAAgB,MAAM,EACtB,UAAU,OAAO,KAChB,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,KAAK,EAAE,CAAC;QAChB,SAAS,EAAE,OAAO,CAAC;QACnB,eAAe,EAAE,IAAI,EAAE,CAAC;KACzB,GAAG,IAAI,CAAC,CA8iBP;CACH"}
+{"version":3,"file":"HandleScheduledEventUseCaseHandler.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/HandleScheduledEventUseCaseHandler.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AA0D3D,qBAAa,kCAAkC;IAC7C,MAAM,GACJ,gBAAgB,MAAM,EACtB,UAAU,OAAO,KAChB,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,KAAK,EAAE,CAAC;QAChB,SAAS,EAAE,OAAO,CAAC;QACnB,eAAe,EAAE,IAAI,EAAE,CAAC;KACzB,GAAG,IAAI,CAAC,CAyiBP;CACH"}

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

@@ -2,7 +2,6 @@ import { SubAgentActivity } from '../../domain/entities/LiveSessionActivitySnaps
 import { SilentSessionMessageComposer } from '../../domain/usecases/adapter-interfaces/SilentSessionMessageComposer';
 export type SilentSessionMessageTemplates = {
     mainStalledMessage: string | null;
-    ownerReNotificationMessage: string | null;
     subAgentMessageHeader: string | null;
     subAgentMessageFooter: string | null;
 };
@@ -11,7 +10,6 @@ export declare class ConfigurableSilentSessionMessageComposer implements SilentS
     private readonly fallback;
     constructor(templates: SilentSessionMessageTemplates, fallback: SilentSessionMessageComposer);
     composeMainStalledSection: (mainSilentSeconds: number) => string;
-    composeOwnerReNotificationSection: (waitingSeconds: number) => string;
     composeSubAgentSection: (subAgents: SubAgentActivity[]) => string;
 }
 //# sourceMappingURL=ConfigurableSilentSessionMessageComposer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConfigurableSilentSessionMessageComposer.d.ts","sourceRoot":"","sources":["../../../src/adapter/repositories/ConfigurableSilentSessionMessageComposer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAAE,4BAA4B,EAAE,MAAM,uEAAuE,CAAC;AAQrH,MAAM,MAAM,6BAA6B,GAAG;IAC1C,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,0BAA0B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC,CAAC;AAOF,qBAAa,wCAAyC,YAAW,4BAA4B;IAEzF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBADR,SAAS,EAAE,6BAA6B,EACxC,QAAQ,EAAE,4BAA4B;IAGzD,yBAAyB,GAAI,mBAAmB,MAAM,KAAG,MAAM,CAK7D;IAEF,iCAAiC,GAAI,gBAAgB,MAAM,KAAG,MAAM,CAKlE;IAEF,sBAAsB,GAAI,WAAW,gBAAgB,EAAE,KAAG,MAAM,CAsB9D;CACH"}
+{"version":3,"file":"ConfigurableSilentSessionMessageComposer.d.ts","sourceRoot":"","sources":["../../../src/adapter/repositories/ConfigurableSilentSessionMessageComposer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAAE,4BAA4B,EAAE,MAAM,uEAAuE,CAAC;AAQrH,MAAM,MAAM,6BAA6B,GAAG;IAC1C,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC,CAAC;AAOF,qBAAa,wCAAyC,YAAW,4BAA4B;IAEzF,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBADR,SAAS,EAAE,6BAA6B,EACxC,QAAQ,EAAE,4BAA4B;IAGzD,yBAAyB,GAAI,mBAAmB,MAAM,KAAG,MAAM,CAK7D;IAEF,sBAAsB,GAAI,WAAW,gBAAgB,EAAE,KAAG,MAAM,CAsB9D;CACH"}