fix(agents): cap direct text fallback and fix lint in repro script

wings1029 · wings1029 · commit e461100cd15a · 2026-06-13T17:23:52.000+08:00
Address ClawSweeper review feedback on PR #92643: 1. [P2] Cap direct text completion delivery at 4000 chars with truncation note to avoid hitting channel limits and re-amplifying transcript writes in the locked-session fallback path. 2. [P1] Fix four no-unnecessary-boolean-literal-compare lint errors in the repro script. 3. Add regression test for long-output capping behavior. Ref: #92076
diff --git a/scripts/repro-92076.mjs b/scripts/repro-92076.mjs
@@ -52,22 +52,22 @@ const staleError = new SessionWriteLockStaleError(
 const unrelatedError = new Error("unrelated error");
 
 assert(
-  isSessionWriteLockAcquireError(lockError) === true,
+  isSessionWriteLockAcquireError(lockError),
   "SessionWriteLockTimeoutError detected as lock error"
 );
 assert(
-  isSessionWriteLockAcquireError(staleError) === true,
+  isSessionWriteLockAcquireError(staleError),
   "SessionWriteLockStaleError detected as lock error"
 );
 assert(
-  isSessionWriteLockAcquireError(unrelatedError) === false,
+  !isSessionWriteLockAcquireError(unrelatedError),
   "Unrelated error NOT detected as lock error"
 );
 
 // 3. Requester session classification
 console.log("\n3. Session key classification:");
 assert(
-  isInternalAnnounceRequesterSession(undefined) === false,
+  !isInternalAnnounceRequesterSession(undefined),
   "undefined sessionKey → false"
 );
 assert(
diff --git a/src/agents/subagent-announce-delivery.test.ts b/src/agents/subagent-announce-delivery.test.ts
@@ -4089,6 +4089,73 @@ describe("deliverSubagentAnnouncement completion delivery", () => {
     );
   });
 
+  it("caps direct text completion delivery at 4000 characters", async () => {
+    const callGateway = createGatewayMock({
+      result: { payloads: [] },
+    });
+    const sendMessage = createSendMessageMock();
+    const queueEmbeddedAgentMessageWithOutcome = createQueueOutcomeSequenceMock([
+      "transcript_commit_wait_unsupported",
+      "no_active_run",
+    ]);
+    const longResult = "x".repeat(5_000);
+    const origin = {
+      channel: "discord",
+      to: "dm:U123",
+      accountId: "acct-1",
+    };
+    testing.setDepsForTest({
+      callGateway,
+      getRequesterSessionActivity: () => ({
+        sessionId: "requester-session-dm-cap",
+        isActive: true,
+      }),
+      getRuntimeConfig: () => ({}) as never,
+      sendMessage,
+      queueEmbeddedAgentMessageWithOutcome,
+    });
+    const result = await deliverSubagentAnnouncement({
+      requesterSessionKey: "agent:main:discord:dm:U123",
+      targetRequesterSessionKey: "agent:main:discord:dm:U123",
+      triggerMessage: "child done",
+      steerMessage: "child done",
+      requesterOrigin: origin,
+      requesterSessionOrigin: origin,
+      completionDirectOrigin: origin,
+      directOrigin: origin,
+      requesterIsSubagent: false,
+      expectsCompletionMessage: true,
+      bestEffortDeliver: true,
+      directIdempotencyKey: "announce-dm-cap-text",
+      internalEvents: [
+        {
+          type: "task_completion",
+          source: "subagent",
+          childSessionKey: "agent:worker:subagent:child",
+          childSessionId: "child-session-id",
+          announceType: "subagent task",
+          taskLabel: "dm cap test",
+          status: "ok",
+          statusLabel: "completed successfully",
+          result: longResult,
+          replyInstruction: "Summarize the result.",
+        },
+      ],
+    });
+
+    expectRecordFields(result, {
+      delivered: true,
+      path: "direct",
+    });
+    expect(sendMessage).toHaveBeenCalledTimes(1);
+    const sentContent = (sendMessage as ReturnType<typeof vi.fn>).mock.calls[0][0]
+      .content as string;
+    expect(sentContent.length).toBeLessThan(longResult.length);
+    expect(sentContent).toContain("…(truncated");
+    // First 4000 chars preserved
+    expect(sentContent.startsWith("x".repeat(4_000))).toBe(true);
+  });
+
   it("directly delivers stale isolated cron run media completions", async () => {
     const callGateway = createGatewayMock();
     const sendMessage = createSendMessageMock();
diff --git a/src/agents/subagent-announce-delivery.ts b/src/agents/subagent-announce-delivery.ts
@@ -911,6 +911,16 @@ function resolveTextCompletionDirectFallback(events: readonly AgentInternalEvent
   return undefined;
 }
 
+/** Maximum character length for direct text completion delivery. */
+const DIRECT_TEXT_COMPLETION_MAX_LENGTH = 4_000;
+
+function capDirectTextContent(content: string): string {
+  if (content.length <= DIRECT_TEXT_COMPLETION_MAX_LENGTH) {
+    return content;
+  }
+  return `${content.slice(0, DIRECT_TEXT_COMPLETION_MAX_LENGTH)}\n\n…(truncated ${content.length - DIRECT_TEXT_COMPLETION_MAX_LENGTH} chars)`;
+}
+
 function hasFailedSubagentNoOutputCompletion(events: readonly AgentInternalEvent[] | undefined) {
   return (
     events?.some(
@@ -936,16 +946,17 @@ async function deliverTextCompletionDirect(params: {
   };
   internalEvents?: readonly AgentInternalEvent[];
 }): Promise<SubagentAnnounceDeliveryResult | undefined> {
-  const content = resolveTextCompletionDirectFallback(params.internalEvents);
+  const rawContent = resolveTextCompletionDirectFallback(params.internalEvents);
   if (
-    !content ||
+    !rawContent ||
     !params.deliveryTarget.deliver ||
     !params.deliveryTarget.channel ||
     !params.deliveryTarget.to ||
     !isDirectMessageDeliveryTarget(params.deliveryTarget, params.requesterSessionKey)
   ) {
     return undefined;
   }
+  const content = capDirectTextContent(rawContent);
   const agentId = resolveAgentIdFromSessionKey(params.requesterSessionKey);
   const idempotencyKey = `${params.directIdempotencyKey}:text-direct`;
   try {
