Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue

# Conflicts:
#	docs/event-producer-consumer.md

docs/core-data-structures/core.md

@@ -342,6 +342,11 @@ interface Agent {
    * `options.envelope: 'raw'` preserves caller-owned framing. Does not run the
    * model.
    *
+   * In an open turn, inject appends at the current log position except while
+   * the current tool-call batch executes: accepted context waits FIFO until the
+   * batch settles, then appends after every recorded result and before turn
+   * close even when execution is interrupted.
+   *
    * Turn-enclosure (the turn-enclosure RFC): an inject while a turn is open joins that turn;
    * an inject while idle wraps its `context/message` in a one-shot `injection`
    * turn (`turn/start` → `context/message` → `turn/end`) and checkpoints it for

docs/core-data-structures/tools.md

@@ -160,11 +160,13 @@ interface ToolExecutionResult {
   error?: ToolErrorInfo
   /**
    * Extra model-facing contexts deferred by a composite tool or attached by
-   * `tools/post-execute` listeners for the NEXT request. They are NOT part of
-   * this call's `content`: the loop buffers every context and appends them only
-   * AFTER all `tool/result`s for the step, preserving tool-call/result
-   * adjacency. The array preserves each context's source, envelope, metadata,
-   * and production order instead of flattening mixed plugin provenance.
+   * `tools/post-execute` listeners for the NEXT request. They are not part of
+   * this call's `content`: the loop accepts them into the active-batch FIFO and
+   * appends them after every recorded `tool/result` when the batch settles, even
+   * when execution is interrupted. The array preserves each context's source,
+   * envelope, metadata, and production order. An accepted outer call keeps
+   * deferred contexts before decision contexts; a block retains only contexts
+   * supplied by the blocking decision.
    */
   additionalContexts?: HookContext[]
   /**