@junghanacs/entwurf 0.23.1 → 0.24.0

package/mcp/entwurf-bridge/dist/pi-extensions/lib/fresh-call-composition.js

@@ -50,6 +50,16 @@ export const FRESH_CALL_BACKENDS = ["pi", "claude-code", "copilot", "omp", "code
  * permission dialect: omp's approval layer consults the same minted string (`source-audit.md`).
  */
 export const FRESH_CALL_CALLBACK_TOOL = {
+    pi: "entwurf_callback",
+    "claude-code": "mcp__entwurf-bridge__entwurf_callback",
+    copilot: "entwurf-bridge-entwurf_callback",
+    omp: "mcp__entwurf_bridge_entwurf_callback",
+    // Codex's tool process is the operator app-server, not the pane: the no-arg
+    // verb refuses there by name. First action stays the delivery verb with args.
+    codex: "mcp__entwurf_bridge__entwurf_v2",
+};
+/** Where a sibling SENDS the task result. Always the delivery verb, never the birth callback. */
+export const FRESH_CALL_DELIVERY_TOOL = {
     pi: "entwurf_v2",
     "claude-code": "mcp__entwurf-bridge__entwurf_v2",
     copilot: "entwurf-bridge-entwurf_v2",
@@ -95,8 +105,11 @@ export const FRESH_CALL_PEERS_TOOL = {
  * `[측정, n=3, same model]` adding the sentence below produced 3/3 callbacks. It is a FACT about the
  * runtime, in the register the rest of this framing uses since the prohibitions came out: it grants
  * nothing, forbids nothing, and names the one call that turns a listed name into a callable tool.
- * Both tools ride ONE `ToolSearch` select, so the corroboration the framing offers stays reachable
- * for a child that takes the offer.
+ * ALL THREE tools ride ONE `ToolSearch` select — the birth callback, the DELIVERY verb the last
+ * line of the framing names, and the peers listing the corroboration sentence offers. The delivery
+ * verb has to be in the same select or the deferral simply moves from the first action to the last:
+ * a sibling that finishes its task and cannot call `entwurf_v2` is the same production silence,
+ * spent instead of saved.
  *
  * Every other backend gets an EMPTY array, deliberately: pi has no deferred-tool surface, and the
  * other three were never measured to need it. A hint invented for a runtime nobody probed would be
@@ -106,7 +119,7 @@ export const FRESH_CALL_TOOL_LOAD_HINT = {
     pi: [],
     "claude-code": [
         "If ${callbackTool} is not callable yet, the entwurf-bridge server is still connecting or its",
-        'tools are deferred: load them first with ToolSearch("select:${callbackTool},${peersTool}") —',
+        'tools are deferred: load them first with ToolSearch("select:${callbackTool},${deliveryTool},${peersTool}") —',
         "it waits for the server — then call ${callbackTool}.",
     ],
     copilot: [],
@@ -125,21 +138,21 @@ export const FRESH_CALL_TOOL_LOAD_HINT = {
 export const OMP_BOOTSTRAP_FLAG = "entwurf-bootstrap";
 /** Payload grammar version, matched exactly by the decoder. A bump means a stale installed
  * unit, which is the one thing `doctor-omp-bridge` exists to say out loud. */
-export const OMP_BOOTSTRAP_VERSION = 1;
+export const OMP_BOOTSTRAP_VERSION = 2;
 /**
  * The whole of what a fresh omp sibling is launched with.
  *
- * THREE FIELDS, CLOSED. The decoder refuses an unknown key, so this object is the entire
- * contract: who to call back, the nonce that proves it is this call, and the task that is
- * released only after that callback succeeds. There is no command here, no path, no env name
- * and no model — the model is already an explicit argv token, and a second copy of it inside
- * a payload would be a second place for it to disagree with the launch.
+ * TWO FIELDS, CLOSED. Address (target + nonce) rides process env, not this payload — a second
+ * copy here would be a second address axis. The decoder refuses an unknown key, so this object
+ * is the entire remaining contract: the task released after the no-arg callback succeeds.
+ * `callerGardenId` / `nonce` stay on the function so launcher call sites do not grow a second
+ * shape; they are not serialised.
  */
 export function buildOmpBootstrapPayload(params) {
+    void params.callerGardenId;
+    void params.nonce;
     return JSON.stringify({
         v: OMP_BOOTSTRAP_VERSION,
-        target: params.callerGardenId,
-        nonce: params.nonce,
         task: params.task,
     });
 }
@@ -271,7 +284,11 @@ export function composeBackendArgs(backend, composition, model, resolveCodexSock
         case "pi":
             return [composition.prompt, "--entwurf-control", "--model", model];
         case "claude-code":
-            return [composition.prompt, `--allowedTools=${FRESH_CALL_CALLBACK_TOOL["claude-code"]}`, `--model=${model}`];
+            return [
+                composition.prompt,
+                `--allowedTools=${FRESH_CALL_CALLBACK_TOOL["claude-code"]},${FRESH_CALL_DELIVERY_TOOL["claude-code"]}`,
+                `--model=${model}`,
+            ];
         case "copilot":
             return ["copilot", "--interactive", composition.prompt, "--model", model, "--yolo"];
         case "omp":
@@ -319,26 +336,41 @@ export function composeBackendArgs(backend, composition, model, resolveCodexSock
  * corroborate the caller instead of an instruction not to look.
  */
 export function composeFreshCallFraming(params) {
-    const tool = FRESH_CALL_CALLBACK_TOOL[params.backend];
+    const birthTool = FRESH_CALL_CALLBACK_TOOL[params.backend];
+    const deliveryTool = FRESH_CALL_DELIVERY_TOOL[params.backend];
     const peersTool = FRESH_CALL_PEERS_TOOL[params.backend];
     // The hint is a per-backend TEMPLATE so the two tool dialects stay the single source of their
     // own spelling here too — a hint that hard-coded Claude's name would go stale the day a dialect
     // moves, and it would go stale silently, in the one sentence a stuck child depends on.
-    const loadHint = FRESH_CALL_TOOL_LOAD_HINT[params.backend].map((line) => line.replaceAll("${callbackTool}", tool).replaceAll("${peersTool}", peersTool));
+    const loadHint = FRESH_CALL_TOOL_LOAD_HINT[params.backend].map((line) => line
+        .replaceAll("${callbackTool}", birthTool)
+        .replaceAll("${deliveryTool}", deliveryTool)
+        .replaceAll("${peersTool}", peersTool));
     const hintBlock = loadHint.length === 0 ? [] : ["", ...loadHint];
     if (params.openingLine.length === 0) {
         throw new Error("fresh-call composition: openingLine is empty — the rail must state where it placed the sibling");
     }
+    const firstAction = params.backend === "codex"
+        ? [
+            `FIRST ACTION, before reading files or anything else: call ${birthTool} with ` +
+                `target=${params.callerGardenId}, intent=fire-and-forget, wants_reply=false, and ` +
+                `message set to exactly ${params.nonce} — that string alone, nothing added.`,
+            `${params.nonce} is a correlation tag this caller minted for this one launch: it names no`,
+            "secret and grants no access. Sending it is how the caller learns the garden id you were born",
+            "with, which it has no other way to know. Your own record does not carry the caller's address,",
+            "so reporting your identity here does not reach it — that tool call does.",
+            "entwurf_callback is refused on this rail: the tool process is the operator app-server, not this pane.",
+        ]
+        : [
+            `FIRST ACTION, before reading files or anything else: call ${birthTool} with no arguments.`,
+            "That call is how the caller learns the garden id you were born with. There are no",
+            "parameters: a target or message you type would be a second address axis.",
+            "Your own record does not carry the caller's address, so reporting your identity here does not reach it — that tool call does.",
+        ];
     return [
         params.openingLine,
         "",
-        `FIRST ACTION, before reading files or anything else: call ${tool} with ` +
-            `target=${params.callerGardenId}, intent=fire-and-forget, wants_reply=false, and ` +
-            `message set to exactly ${params.nonce} — that string alone, nothing added.`,
-        `${params.nonce} is a correlation tag this caller minted for this one launch: it names no`,
-        "secret and grants no access. Sending it is how the caller learns the garden id you were born",
-        "with, which it has no other way to know. Your own record does not carry the caller's address,",
-        "so reporting your identity here does not reach it — that tool call does.",
+        ...firstAction,
         "",
         `You can corroborate the caller first if you want to: ${peersTool} is a read-only listing of`,
         `this garden's citizens and ${params.callerGardenId} is one of them. That listing is capped, so`,
@@ -356,7 +388,7 @@ export function composeFreshCallFraming(params) {
         // its window is not the delivery. Nothing here watches for completion or sends on the
         // sibling's behalf — this rail launches and lets go (Hard Rule 16, and the reason there is no
         // supervisor anywhere in it).
-        `When the task reaches its requested final result, send that result to the same target with ${tool}.`,
+        `When the task reaches its requested final result, send that result to the same target with ${deliveryTool}.`,
         "Output in this sibling window is not delivered to the caller.",
     ];
 }

package/mcp/entwurf-bridge/dist/pi-extensions/lib/herdr-fresh-call.js

@@ -43,6 +43,7 @@
 import { createHash } from "node:crypto";
 import { statSync } from "node:fs";
 import path from "node:path";
+import { callbackEnvAssignments } from "./callback-env.js";
 import { buildOmpBootstrapPayload, composeBackendArgs, composeFreshCallFraming, normalizeFreshCallInputs, TASK_MAX_CHARS, } from "./fresh-call-composition.js";
 /** The pilot set, closed. `[#116 decision]` herdr's own `--kind` enum is much larger, and that is
  * NOT evidence of support: every other backend is a pre-mutation named reject here, and there is
@@ -235,6 +236,7 @@ export function buildHerdrTabCreateArgs(params) {
         "PI_SESSION_ID=",
         "--env",
         "PI_AGENT_ID=",
+        ...callbackEnvAssignments(params.callback).flatMap((assignment) => ["--env", assignment]),
     ];
 }
 /** `agent start <name> --kind <kind> --pane <id> -- <backend argv>`. Everything after `--` is the
@@ -565,6 +567,7 @@ export async function herdrFreshCall(params, run, env, nonce, clock = HERDR_REAL
     const tabRun = await run(buildHerdrTabCreateArgs({
         workspaceId: callerPane.workspaceId,
         ...(cwd === undefined ? {} : { cwd }),
+        callback: { target: callerGardenId, nonce },
     }));
     if (tabRun.status !== 0) {
         // WHETHER ANYTHING EXISTS depends on WHO failed, and the stderr says which. herdr's own
@@ -881,9 +884,10 @@ export function renderHerdrFreshCall(result) {
             `mean the sibling is running, that its first turn ran, or that the task was delivered. The tab and pane ` +
             `coordinates are a view and can change under the sibling — they are not an address and nothing may be ` +
             `dispatched to them.\n` +
-            `The sibling's garden id arrives separately — it calls entwurf_v2 back with the nonce above as its first ` +
-            `action, and the sender envelope of THAT message is the address. Nothing is polling for it; if it never ` +
-            `comes, the pane is visible and can be read directly.`,
+            `The sibling's garden id arrives separately — its first action is the zero-argument callback verb, and ` +
+            `the sender envelope of THAT message is the address. The nonce above is the correlation tag it carries; ` +
+            `the sibling reads it from its own launch env, never from this receipt. Nothing is polling for it; if it ` +
+            `never comes, the pane is visible and can be read directly.`,
         isError: false,
     };
 }

package/mcp/entwurf-bridge/dist/pi-extensions/lib/herdr-placement.js

@@ -21,7 +21,7 @@
  * THE TWO AXES ARE NOT EQUALLY EXACT, AND THE DIFFERENCE IS NAMED. On the claude axis
  * the reported value IS the key, byte for byte. On the pi axis it is a session FILE
  * PATH, and the key is recovered from that filename by a strict conversion measured on
- * pi 0.85.1 — a VENDOR FLOOR, not a key equality. Calling both "a unique-key join"
+ * pi 0.86.0 — a VENDOR FLOOR, not a key equality. Calling both "a unique-key join"
  * would hide which one can drift when a vendor renames a file. The conversion is
  * deliberately strict at both ends so that drift lands as a missed join, never a wrong
  * one, and a listing that declined to read anything says so (see `declinedReports`).
@@ -65,14 +65,23 @@ const OFFICIAL_REPORTS = {
     "herdr:pi": { agent: "pi", kind: "path", backend: "pi" },
 };
 /**
- * A pi session filename, measured 2026-09-14 on pi 0.85.1:
+ * A pi session filename, measured 2026-09-20 on pi 0.86.0:
  *
- *   2026-09-14T05-17-03-979Z_01a09e58-f06a-70e8-b14a-1f0f0c7f7c7d.jsonl
+ *   2026-09-20T00-35-44-197Z_01a0bc3d-87c4-738e-b391-265c8ba5a1b0.jsonl
  *   └────────── start stamp ─────────┘ └──────── nativeSessionId ────────┘
  *
+ * `[측정 2026-09-20]` that is a REAL file a sandboxed pi 0.86.0 wrote, and its own
+ * `{"type":"session"}` header carries `id: 01a0bc3d-87c4-738e-b391-265c8ba5a1b0` —
+ * the exact string `piNativeSessionIdFromPath` recovers from the name. The layout was
+ * re-measured rather than carried: pi 0.86.0 rewrote session-manager.ts (+269 −141
+ * over v0.85.1), but every line that BUILDS a name is byte-unchanged
+ * (`${fileTimestamp}_${this.sessionId}.jsonl`, session-manager.ts:991/1527/1703); the
+ * only diff in that file's `.jsonl` lines is a lambda parameter rename on the READER
+ * side. A source read alone would not have settled it, so the real file is the receipt.
+ *
  * WHY THIS IS PINNED HERE AND NOT INFERRED. The uuid is the join key and it lives in
  * a VENDOR filename, so this rule depends on pi's naming and would break silently if
- * pi changed it. **Vendor floor: pi 0.85.1, measured 2026-09-14** — whether that layout
+ * pi changed it. **Vendor floor: pi 0.86.0, measured 2026-09-20** — whether that layout
  * is a vendor contract or a convention is NOT measured, so this is the one place in the
  * axis that can drift under us. It is therefore strict on both ends — the name must end
  * in `.jsonl` and the tail after the last `_` must be a well-formed uuid — and a name

package/mcp/entwurf-bridge/dist/pi-extensions/lib/mux-fresh-call.js

@@ -85,11 +85,12 @@
  *     the session the window is actually in. It still reports no `pane_current_path`, and
  *     there is no "session created" field because nothing here creates one.
  */
+import { callbackEnvAssignments } from "./callback-env.js";
 import { classifyTmuxCwd } from "./classify-tmux-cwd.js";
 import { CODEX_CALLER_SEAT_HINT, resolveCodexCallerSeat, } from "./codex-caller-seat.js";
 import { CODEX_CALLER_PREFLIGHT_HINT, CODEX_LAUNCH_CWD_PREFLIGHT_HINT, CODEX_PREFLIGHT_HINT, codexLaunchCwdFreshPreflight, } from "./codex-fresh-preflight.js";
 import { COPILOT_PREFLIGHT_HINT, copilotFreshPreflight, } from "./copilot-fresh-preflight.js";
-import { buildOmpBootstrapPayload, composeBackendArgs, composeFreshCallPrompt, FRESH_CALL_BACKENDS, FRESH_CALL_CALLBACK_TOOL, isSafeFreshCallModel, MODEL_MAX_CHARS, mintNonce, normalizeFreshCallInputs, OMP_BOOTSTRAP_FLAG, OMP_BOOTSTRAP_VERSION, TASK_MAX_CHARS, } from "./fresh-call-composition.js";
+import { buildOmpBootstrapPayload, composeBackendArgs, composeFreshCallPrompt, FRESH_CALL_BACKENDS, FRESH_CALL_CALLBACK_TOOL, FRESH_CALL_DELIVERY_TOOL, isSafeFreshCallModel, MODEL_MAX_CHARS, mintNonce, normalizeFreshCallInputs, OMP_BOOTSTRAP_FLAG, OMP_BOOTSTRAP_VERSION, TASK_MAX_CHARS, } from "./fresh-call-composition.js";
 import { assertLaunchTarget, LaunchPreconditionError, resolveRuntimeOnPath, } from "./mux-launch.js";
 import { APPEND_FORMAT, assertSelector, assertTmuxOk, inspectPlacement, parseWindowFields, requireSameContext, runTmux, } from "./mux-placement.js";
 import { resolveCodexDefaultSocketPath } from "./native-push/codex-ws-client.js";
@@ -106,7 +107,7 @@ import { classifyTmuxSessionName, resolveTmuxSessionId } from "./resolve-tmux-se
  * says a sibling was opened in the operator's tmux session, and the Codex socket path. Both are
  * arguments to the leaf rather than knowledge inside it.
  */
-export { buildOmpBootstrapPayload, FRESH_CALL_BACKENDS, FRESH_CALL_CALLBACK_TOOL, isSafeFreshCallModel, MODEL_MAX_CHARS, mintNonce, OMP_BOOTSTRAP_FLAG, OMP_BOOTSTRAP_VERSION, TASK_MAX_CHARS, };
+export { buildOmpBootstrapPayload, FRESH_CALL_BACKENDS, FRESH_CALL_CALLBACK_TOOL, FRESH_CALL_DELIVERY_TOOL, isSafeFreshCallModel, MODEL_MAX_CHARS, mintNonce, OMP_BOOTSTRAP_FLAG, OMP_BOOTSTRAP_VERSION, TASK_MAX_CHARS, };
 /** What the tmux rail tells a sibling about where it woke up. The resume verb has no equivalent
  * because it composes no first turn at all; a herdr rail will pass its own sentence here. */
 export const TMUX_FRESH_CALL_OPENING_LINE = "You are a fresh visible citizen that entwurf opened in the operator's tmux session.";
@@ -200,9 +201,11 @@ export function selectFreshCallSeat(placement) {
  * scrub only on the backend whose measurement surfaced it would encode the claim that the other
  * four are immune, which is false. It costs the legitimate case nothing: a carrier is only ever
  * authoritative when the process that owns it exported it ITSELF, and a fresh `pi` sibling does
- * exactly that after this argv has run. This is a fixed two-variable seam and deliberately NOT a
- * general env carrier — an arbitrary `-e` passthrough would hand callers the environment-shaping
- * power this rail exists to refuse.
+ * exactly that after this argv has run. This is a fixed seam and deliberately NOT a general env
+ * carrier — an arbitrary `-e` passthrough would hand callers the environment-shaping power this
+ * rail exists to refuse. Two more `-e` assignments ride beside the scrub: the callback pair
+ * (`callback-env.ts`), launcher-computed, so the sibling's first action does not retype an
+ * address out of prose.
  */
 const SCRUBBED_INHERITED_ENV = ["PI_SESSION_ID=", "PI_AGENT_ID="];
 /** Launch argv: the leaf's detached-append shape, the identity scrub, optionally `-c` at the
@@ -215,7 +218,7 @@ const SCRUBBED_INHERITED_ENV = ["PI_SESSION_ID=", "PI_AGENT_ID="];
  * name never reaches this function — the seat is resolved to a native `$id` before it is
  * called, and `assertSelector` refuses anything that is not one. `-d` is not optional: without
  * it a window opened into another session steals that session's focus (measured). */
-export function buildFreshCallArgs(targetSessionId, runtimePath, backendArgs, cwd) {
+export function buildFreshCallArgs(targetSessionId, runtimePath, backendArgs, cwd, callback) {
     assertSelector("session", targetSessionId);
     assertLaunchTarget(runtimePath);
     if (cwd !== undefined) {
@@ -228,6 +231,7 @@ export function buildFreshCallArgs(targetSessionId, runtimePath, backendArgs, cw
         "-d",
         "-a",
         ...SCRUBBED_INHERITED_ENV.flatMap((assignment) => ["-e", assignment]),
+        ...callbackEnvAssignments(callback).flatMap((assignment) => ["-e", assignment]),
         "-t",
         `${targetSessionId}:{end}`,
         ...(cwd === undefined ? [] : ["-c", cwd]),
@@ -403,7 +407,10 @@ export function freshCall(params, env = process.env, nonce = mintNonce()) {
             console.error(`[fresh-call] ${unanswered}: ${launchCwd}\n` + `            ${CODEX_LAUNCH_CWD_PREFLIGHT_HINT[unanswered]}`);
         }
     }
-    const run = runTmux(buildFreshCallArgs(targetSessionId, runtimePath, backendArgs, cwd), env);
+    const run = runTmux(buildFreshCallArgs(targetSessionId, runtimePath, backendArgs, cwd, {
+        target: callerGardenId,
+        nonce,
+    }), env);
     assertTmuxOk("new-window", run);
     let fields;
     try {
@@ -503,9 +510,11 @@ export function renderFreshCall(result) {
             `\n` +
             `This is a LAUNCH receipt: tmux created that window and was asked to start the runtime with the model above. It does ` +
             `NOT mean the sibling is running, that its first turn ran, or that the task was delivered.\n` +
-            `The sibling's garden id arrives separately — it calls entwurf_v2 back with the nonce above as its ` +
-            `first action, and the sender envelope of THAT message is the address. Nothing is polling for it; ` +
-            `if it never comes, the window is visible and can be read directly.`,
+            `The sibling's garden id arrives separately — its first action is the zero-argument callback verb ` +
+            `(codex is the one arm that still sends the nonce as arguments), and the sender envelope of THAT ` +
+            `message is the address. The nonce above is the correlation tag it carries; the sibling reads it ` +
+            `from its own launch env, never from this receipt. Nothing is polling for it; if it never comes, ` +
+            `the window is visible and can be read directly.`,
         isError: false,
     };
 }

package/mcp/entwurf-bridge/dist/pi-extensions/meta-bridge-omp.js

@@ -77,7 +77,7 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { isPlausibleOwnerPid, ompMetaRootBase, ompMetaRoots, requireGardenId, upsertMetaSession, writeMetaSenderMarker, } from "./lib/meta-session.js";
+import { isPlausibleOwnerPid, ompMetaRootBase, ompMetaRoots, upsertMetaSession, writeMetaSenderMarker, } from "./lib/meta-session.js";
 /**
  * The §3.5 host discriminator. THE one new predicate this whole lane is allowed to
  * introduce, and it is the vendor's own top-level mode — not a heuristic over cwd,
@@ -147,7 +147,7 @@ export const OMP_BOOTSTRAP_FLAG = "entwurf-bootstrap";
 /** Payload grammar version. A payload that does not say exactly this is refused rather than
  * best-guessed: the launcher and this unit ship in the same package, so a mismatch means a
  * STALE installed unit — the one condition `doctor-omp-bridge` exists to name out loud. */
-export const OMP_BOOTSTRAP_VERSION = 1;
+export const OMP_BOOTSTRAP_VERSION = 2;
 /**
  * The model-facing callback tool, spelled for omp. `[측정]` the vendor's minter sanitises to
  * `[a-z_]` and EATS the digit in `entwurf_v2` (`mcp/tool-bridge.ts:384-396`;
@@ -161,7 +161,7 @@ export const OMP_BOOTSTRAP_VERSION = 1;
  * spellings are held equal by `test/omp-fresh-bootstrap.contract.test.ts`, the same shape
  * `check-omp-fresh-preflight` already uses for the preflight's reproduced oracles.
  */
-export const OMP_BOOTSTRAP_CALLBACK_TOOL = "mcp__entwurf_bridge_entwurf_v";
+export const OMP_BOOTSTRAP_CALLBACK_TOOL = "mcp__entwurf_bridge_entwurf_callback";
 /** Task ceiling, held equal to the launcher's `TASK_MAX_CHARS` by the same contract test. */
 export const OMP_BOOTSTRAP_TASK_MAX_CHARS = 16000;
 /** How long readiness may take before this bootstrap FAILS and the task is never sent.
@@ -175,12 +175,10 @@ export const OMP_BOOTSTRAP_READY_TIMEOUT_MS = 60_000;
  * MCP ones (`runner.ts:907-978`). Polling the two public snapshots is the smallest honest
  * primitive; a FIXED DELAY is forbidden because the gap is a race, not a constant. */
 export const OMP_BOOTSTRAP_POLL_MS = 100;
-/** The nonce the launcher mints (`mintNonce`: `mux-fresh-call-` + 12 random bytes as hex). */
-const BOOTSTRAP_NONCE_RE = /^mux-fresh-call-[0-9a-f]{24}$/;
 /** The wire keys, closed. An unknown key is a REFUSAL rather than an ignored extra: this
  * flag is the one thing a caller can put arbitrary bytes into, so the decoder's job is to
  * make "what the launcher meant" and "what this unit will act on" the same set. */
-const BOOTSTRAP_KEYS = new Set(["v", "target", "nonce", "task"]);
+const BOOTSTRAP_KEYS = new Set(["v", "task"]);
 /**
  * Read the flag value into a payload, or name why not.
  *
@@ -212,22 +210,12 @@ export function decodeOmpBootstrapPayload(raw) {
         if (!BOOTSTRAP_KEYS.has(key))
             return { ok: false, reason: "payload-unknown-key" };
     }
-    let target;
-    try {
-        target = requireGardenId(obj.target);
-    }
-    catch {
-        return { ok: false, reason: "target-invalid" };
-    }
-    const nonce = obj.nonce;
-    if (typeof nonce !== "string" || !BOOTSTRAP_NONCE_RE.test(nonce))
-        return { ok: false, reason: "nonce-invalid" };
     const task = obj.task;
     if (typeof task !== "string" || task.trim().length === 0)
         return { ok: false, reason: "task-empty" };
     if (task.length > OMP_BOOTSTRAP_TASK_MAX_CHARS)
         return { ok: false, reason: "task-too-long" };
-    return { ok: true, value: { target, nonce, task } };
+    return { ok: true, value: { task } };
 }
 /**
  * Stage one's whole message: call back, and nothing else.
@@ -238,18 +226,13 @@ export function decodeOmpBootstrapPayload(raw) {
  * no competing goal at all. Stage two exists so this message never has to compete with the
  * work; adding "then do X" back into it would rebuild exactly the prompt that failed.
  */
-export function buildOmpCallbackOnlyPrompt(params) {
+export function buildOmpCallbackOnlyPrompt() {
     return [
         "You are a fresh visible citizen that entwurf opened in the operator's tmux session.",
         "",
-        `FIRST AND ONLY ACTION RIGHT NOW: call ${OMP_BOOTSTRAP_CALLBACK_TOOL} with ` +
-            `target=${params.target}, intent=fire-and-forget, wants_reply=false, and ` +
-            `message set to exactly ${params.nonce} — that string alone, nothing added.`,
+        `FIRST AND ONLY ACTION RIGHT NOW: call ${OMP_BOOTSTRAP_CALLBACK_TOOL} with no arguments.`,
         "That call is how the agent that opened you learns your address. Make the call before",
-        "reading files, before planning, and before answering in prose. Do not reword the message.",
-        "",
-        "Do not inspect environment variables, do not call entwurf_self, and do not start an MCP",
-        "server yourself. Your own report of your identity is not the address anyone needs.",
+        "reading files, before planning, and before answering in prose. There are no parameters.",
         "",
         "Your actual task arrives as the NEXT user message, immediately after that call succeeds.",
         "Do not ask for it and do not guess at it.",
@@ -521,22 +504,32 @@ export function ompCallbackToolReady(pi) {
     return registered && active.includes(OMP_BOOTSTRAP_CALLBACK_TOOL);
 }
 /**
- * Does this tool event name OUR callback, with OUR target and OUR nonce?
+ * Does this tool event name OUR callback?
  *
  * The event carries no server name, no session id and no original MCP tool name
- * (`extensions/types.ts:916-1017`), so the match is built from what IS there: the canonical
- * minted tool name plus the two argument values this rail already owns as contract. Exact
- * string equality on both — a prefix or `includes` here would let a sibling's nonce release
- * this session's task.
+ * (`extensions/types.ts:916-1017`), so the match is built from what IS there: exact string
+ * equality on the canonical minted tool name — a prefix or `includes` here would let a
+ * neighbouring tool release this session's task.
+ *
+ * The target/nonce half of this predicate is GONE, and that is the point of the out-of-band
+ * callback: the address rides the sibling's process env, so the verb takes no arguments and
+ * there are no argument values left to compare. What replaces the comparison is the ABSENCE
+ * of arguments — a call carrying a target or a message is a model supplying an address, which
+ * is the second address axis Hard Rule 2 refuses, and it must not release the task. Correlation
+ * to THIS bootstrap is not weakened by the removal: it is carried by the stored `toolCallId`
+ * (one session, one live tool call) plus the fact that only this session's env named the caller.
  */
-function matchesCallback(event, payload) {
+function matchesCallback(event, _payload) {
     if (event?.toolName !== OMP_BOOTSTRAP_CALLBACK_TOOL)
         return false;
     const input = event?.input;
-    if (typeof input !== "object" || input === null || Array.isArray(input))
+    if (input === undefined || input === null)
+        return true;
+    if (typeof input !== "object" || Array.isArray(input))
         return false;
     const args = input;
-    return args.target === payload.target && args.message === payload.nonce;
+    // No-arg verb: a supplied target/message is a second address axis — not our callback.
+    return args.target === undefined && args.message === undefined;
 }
 /**
  * Create one bootstrap for one minted session.
@@ -580,7 +573,7 @@ export function createOmpBootstrap(opts) {
         if (isFinal())
             return;
         phase = "failed";
-        log("WARN", `bootstrap-failed nonce=${payload.nonce}: ${why}; the task was NOT sent`);
+        log("WARN", `bootstrap-failed: ${why}; the task was NOT sent`);
     }
     /**
      * Both stages send the SAME way: `pi.sendUserMessage(content)` with NO delivery option.
@@ -616,8 +609,8 @@ export function createOmpBootstrap(opts) {
             // two callback prompts for one bootstrap.
             phase = "callback-sent";
             stopTimer();
-            log("INFO", `bootstrap-ready nonce=${payload.nonce}: callback tool live, sending callback-only prompt`);
-            send(buildOmpCallbackOnlyPrompt({ target: payload.target, nonce: payload.nonce }));
+            log("INFO", "bootstrap-ready: callback tool live, sending callback-only prompt");
+            send(buildOmpCallbackOnlyPrompt());
             return;
         }
         if (timers.now() >= deadline) {
@@ -654,7 +647,7 @@ export function createOmpBootstrap(opts) {
             if (typeof id !== "string" || id.length === 0)
                 return;
             callId = id;
-            log("INFO", `bootstrap-callback-observed nonce=${payload.nonce} toolCallId=${id}`);
+            log("INFO", `bootstrap-callback-observed toolCallId=${id}`);
         },
         onToolResult(event) {
             if (phase !== "callback-sent" || callId === null)
@@ -664,7 +657,7 @@ export function createOmpBootstrap(opts) {
             if (!matchesCallback(event, payload))
                 return;
             if (event?.isError !== false) {
-                log("WARN", `bootstrap-callback-errored nonce=${payload.nonce} toolCallId=${callId}; the task was NOT sent`);
+                log("WARN", `bootstrap-callback-errored toolCallId=${callId}; the task was NOT sent`);
                 return;
             }
             // RELEASED, AND THE TASK IS NOT SENT HERE. This handler runs inside the callback
@@ -673,7 +666,7 @@ export function createOmpBootstrap(opts) {
             // record that the callback provably succeeded; `onTurnEnd` owns the send.
             phase = "released";
             stopTimer();
-            log("INFO", `bootstrap-released nonce=${payload.nonce} toolCallId=${callId}: task armed for the next turn_end`);
+            log("INFO", `bootstrap-released toolCallId=${callId}: task armed for the next turn_end`);
         },
         /**
          * The stage-two boundary: the callback turn is over, so the session is at the edge
@@ -695,7 +688,7 @@ export function createOmpBootstrap(opts) {
             if (phase !== "released")
                 return;
             phase = "task-sent";
-            log("INFO", `bootstrap-task-sent nonce=${payload.nonce}: delivering the task at the turn_end boundary`);
+            log("INFO", "bootstrap-task-sent: delivering the task at the turn_end boundary");
             send(payload.task);
         },
         invalidate(why) {
@@ -706,7 +699,7 @@ export function createOmpBootstrap(opts) {
             if (isFinal())
                 return;
             phase = "failed";
-            log("INFO", `bootstrap-invalidated nonce=${payload.nonce}: ${why}; the task was NOT sent`);
+            log("INFO", `bootstrap-invalidated: ${why}; the task was NOT sent`);
         },
     };
 }
@@ -869,7 +862,7 @@ export function startOmpBootstrap(opts) {
     const handle = createOmpBootstrap({ payload: decoded.value, pi, timers, log });
     activeBootstrap = { sessionId: envelope.nativeSessionId, handle };
     bootstrapConsumed = true;
-    log("INFO", `bootstrap-armed nonce=${decoded.value.nonce} target=${decoded.value.target}`);
+    log("INFO", "bootstrap-armed: payload admitted, waiting for callback tool");
     handle.start();
 }
 /**

package/mcp/entwurf-bridge/dist/scripts/probe-bridge-command.js

@@ -42,6 +42,7 @@ export const EXPECTED_TOOLS = [
     "entwurf_register_native",
     "entwurf_fresh_call",
     "entwurf_resume_call",
+    "entwurf_callback",
 ];
 const DEFAULT_TIMEOUT_MS = 10_000;
 /** How long a probed child gets to die politely before it is killed outright. */

package/mcp/entwurf-bridge/src/index.ts

@@ -34,8 +34,13 @@
  *   - entwurf_resume_call — reopen ONE DORMANT pi citizen under its OWN garden id in a visible
  *                       window; target-only, runs no turn, LAUNCH and OBSERVATION receipts stay
  *                       apart.
+ *   - entwurf_callback — ZERO-ARGUMENT fresh-sibling callback. Reads ENTWURF_CALLBACK_TARGET +
+ *                       ENTWURF_CALLBACK_NONCE from this process env (launcher-injected), validates
+ *                       grammar, and dispatches through the existing v2 runner. Refuses by name
+ *                       when env is absent/malformed or this process is a Codex-provenance bridge.
+ *                       No model-supplied target fallback.
  *
- * That list is the WHOLE public surface — seven verbs — and `check-entwurf-bridge-boot`
+ * That list is the WHOLE public surface — eight verbs — and `check-entwurf-bridge-boot`
  * (G1f) holds it as an exact set on the runtime tools/list, so a verb added or dropped
  * here without a decision is red rather than merely undocumented.
  *
@@ -65,6 +70,7 @@ import * as process from "node:process";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
+import { readCallbackEnv } from "../../../pi-extensions/lib/callback-env.ts";
 import { controlSocketPathIn, defaultControlSocketDir } from "../../../pi-extensions/lib/control-socket-path.js";
 import { resolveMailboxReceiverFacts } from "../../../pi-extensions/lib/entwurf-deliverability.ts";
 import { listEntwurfFacts } from "../../../pi-extensions/lib/entwurf-fact-provider.ts";
@@ -877,6 +883,40 @@ server.tool(
 	},
 );
 
+server.tool(
+	"entwurf_callback",
+	"ZERO-ARGUMENT callback for a fresh sibling this process was launched as. Reads " +
+		"ENTWURF_CALLBACK_TARGET and ENTWURF_CALLBACK_NONCE from this process environment " +
+		"(injected by the launcher next to the identity scrub), validates garden-id and nonce " +
+		"grammar, and dispatches through the existing v2 runner with intent fire-and-forget, " +
+		"message=nonce, wants_reply=false. The target is re-resolved by record/decider — env " +
+		"names the id, it does not skip dispatch. REFUSES BY NAME when the pair is absent, " +
+		"malformed, or this process is a Codex-provenance bridge (window env never reaches that " +
+		"MCP child). No arguments, no fallback to a model-supplied target.",
+	{},
+	async (_args, extra) => {
+		const read = readCallbackEnv(process.env);
+		if (!read.ok) {
+			return textErr(`entwurf_callback: ${read.reason}`);
+		}
+		try {
+			const sender = await buildSendSenderEnvelope({ requestMeta: extra._meta });
+			const rendered = await runAndRenderEntwurfV2FromSurface(
+				{
+					target: read.target,
+					intent: "fire-and-forget",
+					message: read.nonce,
+					wants_reply: false,
+				},
+				{ senderProvider: () => sender },
+			);
+			return rendered.isError ? textErr(rendered.text) : textOk(rendered.text);
+		} catch (err) {
+			return textErr(`entwurf_callback error: ${err instanceof Error ? err.message : String(err)}`);
+		}
+	},
+);
+
 // ============================================================================
 // Main
 // ============================================================================

package/mcp/entwurf-bridge/test.sh

@@ -55,7 +55,7 @@ names=set(raw)
 # was an artifact-surface hole: a bundle missing entwurf_fresh_call / entwurf_resume_call
 # answered tools/list and passed. Equality also refuses an undecided extra verb; the
 # duplicate arm catches a name registered twice, which set membership cannot see.
-expected={'entwurf_v2','entwurf_self','entwurf_peers','entwurf_inbox_read','entwurf_register_native','entwurf_fresh_call','entwurf_resume_call'}
+expected={'entwurf_v2','entwurf_self','entwurf_peers','entwurf_inbox_read','entwurf_register_native','entwurf_fresh_call','entwurf_resume_call','entwurf_callback'}
 legacy={'entwurf','entwurf_resume','entwurf_send'} & names
 if len(raw)!=len(names):
     raise SystemExit(f"duplicate tool registrations: {sorted(raw)}")
@@ -66,7 +66,7 @@ if legacy:
 if names!=expected:
     raise SystemExit(f"tool set MISMATCH — missing {sorted(expected-names)}, unexpected {sorted(names-expected)}")
 PY
-ok "public tool surface is EXACTLY the seven garden verbs (no v1 verb, no undecided extra, no duplicate)"
+ok "public tool surface is EXACTLY the eight garden verbs (no v1 verb, no undecided extra, no duplicate)"
 
 SELF_JSON="$(printf '%s\n' "$OUT" | grep '"id":3' | tail -1)"
 [[ "$SELF_JSON" == *"isError"* ]] || fail "entwurf_self without identity should be an error: $SELF_JSON"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@junghanacs/entwurf",
-	"version": "0.23.1",
+	"version": "0.24.0",
 	"description": "Garden-citizen dispatch substrate and meta-bridge for pi, Claude Code, Copilot CLI, OMP, Antigravity, and Codex CLI; Claude and Snowflake Cortex Code ACP backends.",
 	"license": "MIT",
 	"author": {
@@ -67,6 +67,7 @@
 		"pi/skill-plugin-example/",
 		"run.sh",
 		"AGENTS.md",
+		"FAQ.md",
 		"BASELINE.md",
 		"VERIFY.md",
 		"DELIVERY.md",
@@ -91,16 +92,16 @@
 		"zod": "^3.25.0 || ^4.0.0"
 	},
 	"peerDependencies": {
-		"@earendil-works/pi-ai": ">=0.85.1 <0.86",
-		"@earendil-works/pi-coding-agent": ">=0.85.1 <0.86",
-		"@earendil-works/pi-tui": ">=0.85.1 <0.86",
+		"@earendil-works/pi-ai": ">=0.86.0 <0.87",
+		"@earendil-works/pi-coding-agent": ">=0.86.0 <0.87",
+		"@earendil-works/pi-tui": ">=0.86.0 <0.87",
 		"typebox": "*"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^2.4.13",
-		"@earendil-works/pi-ai": "0.85.1",
-		"@earendil-works/pi-coding-agent": "0.85.1",
-		"@earendil-works/pi-tui": "0.85.1",
+		"@earendil-works/pi-ai": "0.86.0",
+		"@earendil-works/pi-coding-agent": "0.86.0",
+		"@earendil-works/pi-tui": "0.86.0",
 		"@types/node": "^24.3.0",
 		"husky": "^9.1.7",
 		"rregex": "1.13.1",