Merge remote-tracking branch 'github/master' into feat/agent-event-payload

packages/subagent/subagent/src/continuation.ts

@@ -47,6 +47,8 @@ import type SubagentActivationSetupRegistry from './activation-setup-registry.ts
 /** Attribution for a model coordinator's follow-up to one of its children. */
 export interface CoordinatorMessageSource {
   readonly kind: 'coordinator'
+  /** A message another agent addressed to this one (`relay` context form). */
+  readonly form: 'relay'
   /** Session id of the agent whose tool call produced the follow-up. */
   readonly senderSessionId: SessionId
 }
@@ -54,6 +56,8 @@ export interface CoordinatorMessageSource {
 /** Durable attribution for a continuable child's explicit parent report. */
 export interface SubagentReportMessageSource {
   readonly kind: 'subagent-report'
+  /** A message another agent addressed to this one (`relay` context form). */
+  readonly form: 'relay'
   /** Session id of the reporting child. */
   readonly senderSessionId: SessionId
 }
@@ -481,6 +485,7 @@ export class SubagentContinuationManager {
       ],
       source: {
         kind: 'subagent-report' as const,
+        form: 'relay' as const,
         senderSessionId: activation.childId,
       },
     })

packages/subagent/tool-subagent-control/src/index.ts

@@ -66,7 +66,7 @@ export function apply(ctx: Context): void {
         SessionId(args.subagent_id),
         message,
         {
-          source: { kind: 'coordinator', senderSessionId: parent.id },
+          source: { kind: 'coordinator', form: 'relay', senderSessionId: parent.id },
           signal: exec.signal,
         },
       )

packages/subagent/tool-subagent-control/tests/tool-subagent-control.spec.ts

@@ -102,6 +102,7 @@ describe('dsh-tool-subagent-control', () => {
     // Durable provenance records the calling agent without granting authority.
     expect(followUp?.type === 'user/message' && followUp.data.source).toEqual({
       kind: 'coordinator',
+      form: 'relay',
       senderSessionId: parent.id,
     })
   })