Fix Code Mode workspace context propagation

packages/hooks/hooks-claude/src/index.ts

@@ -222,9 +222,9 @@ export function apply(ctx: Context, config: Config): void {
   }
 
   /**
-   * Concatenate this bridge's {@link HookContext} (`ours`, always present at the
-   * call sites) with a downstream listener's optional one, so folding our
-   * additionalContext onto a delegated decision drops neither. The merged block
+   * Concatenate this bridge's prompt {@link HookContext} with a downstream
+   * prompt listener's optional one, so folding additionalContext drops neither.
+   * The merged block
    * carries a single `source` — this bridge's — because a `HookContext` holds one
    * `MessageSource` and the seam cannot represent mixed provenance; the rendered
    * `context/message` only distinguishes by `source.kind` ('plugin'), so a
@@ -236,6 +236,11 @@ export function apply(ctx: Context, config: Config): void {
     return { content: [...ours.content, ...theirs.content], source: ours.source }
   }
 
+  /** Prepend one post-tool context without flattening downstream provenance. */
+  function prependContext(ours: HookContext, theirs: HookContext[] | undefined): HookContext[] {
+    return [ours, ...theirs ?? []]
+  }
+
   // --- SessionStart: emit (cannot block). Inject any additionalContext into the
   // agent. The matcher subject is the source.
   // TODO(session-start-gating): `agent/session-start` is a SYNCHRONOUS emit and
@@ -293,19 +298,19 @@ export function apply(ctx: Context, config: Config): void {
     const merged = await runPoint('PostToolUse', exec.name, postToolPayload(exec, result), { ...exec.agent ? { agent: exec.agent } : {}, turn, ...exec.signal ? { signal: exec.signal } : {} })
     const context = contextFrom(merged)
     if (merged.decision === 'deny') {
-      return { kind: 'block', feedback: [{ type: 'text', text: merged.reason ?? 'blocked by PostToolUse hook' }], ...context ? { additionalContext: context } : {} }
+      return { kind: 'block', feedback: [{ type: 'text', text: merged.reason ?? 'blocked by PostToolUse hook' }], ...context ? { additionalContexts: [context] } : {} }
     }
     // Our hooks did not block. DELEGATE so a later listener can still block/replace,
     // then fold our context onto its decision (a downstream block carries it too).
     const downstream = await next()
     if (!context) return downstream
     if (downstream.kind === 'block') {
-      return { ...downstream, additionalContext: concatContext(context, downstream.additionalContext) }
+      return { ...downstream, additionalContexts: prependContext(context, downstream.additionalContexts) }
     }
     return {
       kind: 'accept',
       ...downstream.content !== undefined ? { content: downstream.content } : {},
-      additionalContext: concatContext(context, downstream.additionalContext),
+      additionalContexts: prependContext(context, downstream.additionalContexts),
     }
   })