@junghanacs/entwurf 0.25.1 → 0.30.0

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

@@ -29,9 +29,16 @@ import { randomBytes } from "node:crypto";
  * missing HERE is not an unwired convenience, it is a release blocker. */
 export const FRESH_CALL_BACKENDS = ["pi", "claude-code", "copilot", "omp", "codex"];
 /**
- * The callback tool NAME differs per backend and that is not cosmetic: native pi exposes the
- * capability directly (`entwurf_v2`), while an MCP-hosted session reaches it under whatever
- * name that harness composes. Naming the wrong one costs the whole first turn.
+ * The callback tool NAME differs per backend and that is not cosmetic: every session reaches the
+ * capability under whatever name its harness composes for the `entwurf-bridge` MCP server, and
+ * naming the wrong one costs the whole first turn.
+ *
+ * `[측정 2026-10-01, pi 0.99.2]` pi reaches the verbs through its BUILT-IN MCP (#125 — the native
+ * `registerTool` copies are gone), and Pi composes `mcp__<server>__<tool>` replacing everything
+ * outside `[A-Za-z0-9_]` with `_` (`extensions/mcp/tools.ts:82-90`, tag v0.99.2): the server key
+ * stays `entwurf-bridge`, but the model-facing names are `mcp__entwurf_bridge__entwurf_*` — the
+ * same spelling Codex composes, and NOT Claude Code's. 0.99.1 kept the hyphen; the floor moved to
+ * 0.99.2 as a hard cut — one literal pi dialect, chosen over an alias or a version router.
  *
  * `[측정]` Copilot CLI 1.0.80 composes `<mcpServerName>-<mcpToolName>` — NOT Claude Code's
  * `mcp__<server>__<tool>`. Read from two independent sessions' own event logs
@@ -50,7 +57,7 @@ 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",
+    pi: "mcp__entwurf_bridge__entwurf_callback",
     "claude-code": "mcp__entwurf-bridge__entwurf_callback",
     copilot: "entwurf-bridge-entwurf_callback",
     omp: "mcp__entwurf_bridge_entwurf_callback",
@@ -60,7 +67,7 @@ export const FRESH_CALL_CALLBACK_TOOL = {
 };
 /** Where a sibling SENDS the task result. Always the delivery verb, never the birth callback. */
 export const FRESH_CALL_DELIVERY_TOOL = {
-    pi: "entwurf_v2",
+    pi: "mcp__entwurf_bridge__entwurf_v2",
     "claude-code": "mcp__entwurf-bridge__entwurf_v2",
     copilot: "entwurf-bridge-entwurf_v2",
     omp: "mcp__entwurf_bridge_entwurf_v",
@@ -81,7 +88,7 @@ export const FRESH_CALL_DELIVERY_TOOL = {
  * SAME rule produces the whole word here.
  */
 export const FRESH_CALL_PEERS_TOOL = {
-    pi: "entwurf_peers",
+    pi: "mcp__entwurf_bridge__entwurf_peers",
     "claude-code": "mcp__entwurf-bridge__entwurf_peers",
     copilot: "entwurf-bridge-entwurf_peers",
     omp: "mcp__entwurf_bridge_entwurf_peers",

package/mcp/entwurf-bridge/dist/pi-extensions/lib/meta-mailbox-body.js

@@ -3,7 +3,7 @@
  * meta-bridge mailbox body. Every transport that can deliver to a garden citizen
  * with no live control socket uses this:
  *   - the MCP bridge entwurf_v2 (mcp/entwurf-bridge) — external/Claude-host sends
- *   - the pi-native entwurf_v2 (pi-extensions/entwurf-control.ts) — pi-session sends
+ *     (pi-session sends included since #125 — a pi session reaches that same verb)
  *   - the native-push rail (pi-extensions/lib/entwurf-v2-native-push.ts) — direct
  *     injection into an Antigravity conversation or a loaded Codex thread. Its
  *     THIRD consumer, added after the #95 A LIVE run measured what an envelope-less

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

@@ -474,9 +474,9 @@ const REJECT_HINT = {
     "runtime-not-executable": "the resolved runtime path is not executable",
 };
 /**
- * ONE renderer for both surfaces. Not a convenience: the two registrations are separate literals
- * (that is this repo's shape), so a shared renderer is what keeps the operator-visible answer
- * from drifting apart between native pi and the MCP bridge.
+ * ONE renderer, outside the registration. Not a convenience: it keeps the operator-visible answer
+ * out of a registration literal. (Since #125 the MCP bridge is the only registration; the native
+ * pi copy it once had to agree with is retired.)
  *
  * The success text states the boundary out loud. A caller that reads "launched" and assumes
  * "delivered" is the exact confusion the two-receipt split exists to prevent, so the text refuses

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

@@ -100,6 +100,7 @@ import {
 	defaultMetaSessionsDir,
 	makeStoreRecordReader,
 	readActiveStoreEntries,
+	readMetaIdentityByGardenId,
 	readMetaInbox,
 	readMetaReceiverMarker,
 	readMetaSenderMarker,
@@ -358,10 +359,36 @@ async function resolveAuthoritativeSender(
 	if (marker && marker.identity.gardenId === selected.id) {
 		return buildMetaSenderEnvelope(marker.identity, marker.marker.cwd || cwd, marker);
 	}
-	if (pi && pi.sessionId === selected.id) return { envelope: pi };
+	if (pi && pi.sessionId === selected.id) return { envelope: requirePiSenderRecord(pi) };
 	throw new Error(`entwurf-bridge: reconciled sender ${selected.id} has no matching identity source`);
 }
 
+/**
+ * PI_SESSION_ID CARRIES a record-established identity; it does not establish one (Hard Rule 2).
+ * Since #125 the pi session reaches every Entwurf verb through this bridge, so the pi rail is the
+ * main road rather than a side door, and the carrier is checked where the sender is SELECTED:
+ * after the claims reconcile (so a complete conflicting Codex claim still earns its own
+ * diagnostic) and before any caller builds on the answer.
+ *
+ * The per-entry targeted read the sender/self policy already uses — no store scan, no second
+ * nativeSessionId carrier. An absent, unreadable or irregular record throws from the reader with
+ * its own cause; a record of another backend throws here. None of it falls back to another rail
+ * or to anonymous. Socket presence stays what it was: replyability, never admission.
+ *
+ * What it does NOT prove: that a trusted host which deliberately exports ANOTHER real pi
+ * citizen's id is that citizen. Carrier integrity below the record is the host's.
+ */
+function requirePiSenderRecord(envelope: SenderEnvelope): SenderEnvelope {
+	const identity = readMetaIdentityByGardenId(envelope.sessionId);
+	if (identity.backend !== "pi") {
+		throw new Error(
+			`entwurf-bridge: PI_SESSION_ID ${envelope.sessionId} names a ${identity.backend} record, not a pi citizen — ` +
+				"the pi-session carrier must name the record this pi session was born with",
+		);
+	}
+	return envelope;
+}
+
 // Async only when the selected sender rides native-push: replyability is the adapter's live fact.
 async function buildAuthoritativeSelfEnvelope(context: SenderRequestContext = {}): Promise<AuthoritativeSelf> {
 	const resolved = await resolveAuthoritativeSender(context);
@@ -418,7 +445,7 @@ function abbreviateHomeMcp(cwd: string): string {
 // reports one outcome. The per-target lock is NOT taken by every rail: the decider
 // locks only a control-socket-domain dispatch; the mailbox and native-push branches
 // carry `lock: null` (entwurf-v2-decider.ts). It runs
-// IN-PROCESS here (the same production runner pi-native uses) — NOT a delegating
+// IN-PROCESS here (the one production runner; pi reaches it through this bridge since #125) — NOT a delegating
 // RPC — so control, mailbox and native-push all flow through
 // `runEntwurfV2`. The sender envelope is
 // `buildSendSenderEnvelope()` verbatim (origin/replyable as resolved) — v2 does
@@ -488,7 +515,7 @@ server.tool(
 				{ target, intent, message, mode, wants_reply },
 				// No trust-preflight inputs are passed, and none exist to pass: the preflight on this
 				// path guarded the resume verdict and left with `owned-outcome`. `senderProvider` is
-				// the whole options surface now (see the pi-native surface for the same note).
+				// the whole options surface now.
 				{ senderProvider: () => sender },
 			);
 			return rendered.isError ? textErr(rendered.text) : textOk(rendered.text);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@junghanacs/entwurf",
-	"version": "0.25.1",
+	"version": "0.30.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": {
@@ -92,17 +92,17 @@
 		"zod": "^3.25.0 || ^4.0.0"
 	},
 	"peerDependencies": {
-		"@earendil-works/pi-ai": ">=0.87.1 <0.88",
-		"@earendil-works/pi-coding-agent": ">=0.87.1 <0.88",
-		"@earendil-works/pi-tui": ">=0.87.1 <0.88",
+		"@earendil-works/pi-ai": ">=1.0.0 <1.1",
+		"@earendil-works/pi-coding-agent": ">=1.0.0 <1.1",
+		"@earendil-works/pi-tui": ">=1.0.0 <1.1",
 		"typebox": "*"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^2.4.13",
-		"@earendil-works/pi-agent-core": "0.87.1",
-		"@earendil-works/pi-ai": "0.87.1",
-		"@earendil-works/pi-coding-agent": "0.87.1",
-		"@earendil-works/pi-tui": "0.87.1",
+		"@earendil-works/pi-agent-core": "1.0.0",
+		"@earendil-works/pi-ai": "1.0.0",
+		"@earendil-works/pi-coding-agent": "1.0.0",
+		"@earendil-works/pi-tui": "1.0.0",
 		"@types/node": "^24.3.0",
 		"husky": "^9.1.7",
 		"rregex": "1.13.1",
@@ -177,9 +177,9 @@
 		"check:core": "pnpm run check:toolchain && pnpm run check:vitest && pnpm run check:contracts",
 		"check:toolchain": "pnpm lint && pnpm typecheck",
 		"check:vitest": "./run.sh check-mux-fresh-call && ./run.sh check-acp-sdk-surface && ./run.sh check-pi-queue-oracle && ./run.sh check-tests-beside-behavior",
-		"check:contracts": "./run.sh check-shell-quote && ./run.sh check-entwurf-session-identity && ./run.sh check-meta-session && ./run.sh check-meta-v3-record && ./run.sh check-mailbox-receipt-state && ./run.sh check-entwurf-capabilities && ./run.sh check-harness-admission-parity && ./run.sh check-capability-bundle-reach && ./run.sh check-meta-mailbox-state-write && ./run.sh check-meta-receiver-marker && ./run.sh check-meta-capability-source && ./run.sh check-model-lock && ./run.sh check-dep-versions && ./run.sh check-node-floor-coherence && ./run.sh check-claude-floor-coherence && ./run.sh check-copilot-statusline && ./run.sh check-pi-import-surface && ./run.sh check-env-namespace && ./run.sh check-pi-runtime-version && ./run.sh check-pi-preflight && ./run.sh check-project-trust-handler && ./run.sh check-entwurf-v2-contract && ./run.sh check-entwurf-v2-send && ./run.sh check-entwurf-v2-runner && ./run.sh check-control-send-receipt && ./run.sh check-compaction-send-guard && ./run.sh check-entwurf-resume-args && ./run.sh check-entwurf-v2-native-push && ./run.sh check-entwurf-v2-production && ./run.sh check-entwurf-v2-surface && ./run.sh check-entwurf-bridge-pi-free && ./run.sh check-resume-launch-identity && ./run.sh check-mux-placement && ./run.sh check-mux-launch && ./run.sh check-mux-resume-call && ./run.sh check-mux-parent-artifact && ./run.sh check-mux-launcher-fence && ./run.sh check-entwurf-v2-visible-resume && ./run.sh check-control-socket-path && ./run.sh check-meta-listing && ./run.sh check-entwurf-fact-provider && ./run.sh check-herdr-placement && ./run.sh check-herdr-fresh-call && ./run.sh check-herdr-supply && ./run.sh check-fresh-call-dispatch && ./run.sh check-entwurf-peers-surface && ./run.sh check-entwurf-self-address && ./run.sh check-entwurf-deliverability && ./run.sh check-native-push-adapter && ./run.sh check-native-push-register && ./run.sh check-auth-boundary && ./run.sh check-acp-overlay && ./run.sh check-acp-tool-surface && ./run.sh check-acp-event-mapper && ./run.sh check-acp-prompt-builder && ./run.sh check-acp-config && ./run.sh check-acp-session-store && ./run.sh check-acp-carrier-augment && ./run.sh check-codex-sender-identity && ./run.sh check-codex-native-push",
-		"check:hermetic": "./run.sh check-bridge-delivery && ./run.sh smoke-pi-attach && ./run.sh check-fresh-cut-gate && ./run.sh check-hook-launch-topology && ./run.sh check-meta-hook-session-switch && ./run.sh check-copilot-birth-hook && ./run.sh check-copilot-receive-arm && ./run.sh check-copilot-launch && ./run.sh check-pi-launch && ./run.sh check-codex-app-server-launch && ./run.sh check-meta-identity-consumers && ./run.sh check-socket-probe && ./run.sh smoke-meta-honesty && ./run.sh check-meta-doctor-oracle && ./run.sh check-agy-permission-matrix && ./run.sh smoke-agy-statusline-state && ./run.sh smoke-copilot-statusline-state && ./run.sh smoke-copilot-mcp-state && ./run.sh smoke-omp-bridge-state && ./run.sh smoke-omp-mcp-state && ./run.sh smoke-omp-receive-state && ./run.sh check-omp-birth-hook && ./run.sh check-omp-receive-arm && ./run.sh check-omp-fresh-preflight && ./run.sh smoke-agy-hooks-state && ./run.sh smoke-pi-provider-state && ./run.sh smoke-user-scope-citizen && ./run.sh smoke-meta-prune && ./run.sh smoke-meta-keyset-guard && ./run.sh check-meta-manifest-schema && ./run.sh check-entwurf-control-rpc && ./run.sh check-entwurf-bridge-boot && ./run.sh check-probe-bridge-command && ./run.sh check-meta-facts && ./run.sh check-peer-facts && ./run.sh check-herdr-plugin && ./run.sh check-herdr-plugin-profile && ./run.sh check-herdr-plugin-build && ./run.sh check-herdr-runtime-bootstrap && ./run.sh check-herdr-activation && ./run.sh check-agy-sender-identity && ./run.sh check-acp-provider-surface && ./run.sh check-acp-stop-reason && ./run.sh check-acp-prompt-lifecycle && ./run.sh check-acp-usage-accounting && ./run.sh check-acp-launch-namespace && ./run.sh check-acp-stream-hooks && ./run.sh check-acp-backend-preflight && ./run.sh check-acp-session-reuse && ./run.sh check-typing-call-fence && ./run.sh check-gate-manifests && ./run.sh check-release-gate-outcomes && ./run.sh check-probe-ordering && ./run.sh check-probe-cli-shim && ./run.sh check-acp-cortex && ./run.sh check-codex-bridge-identity && ./run.sh check-codex-birth-hook && ./run.sh smoke-codex-config-state && ./run.sh smoke-codex-birth && ./run.sh check-herdr-sandbox",
-		"check:package": "./run.sh check-install-surface && ./run.sh smoke-meta-install-state && ./run.sh smoke-agy-install-state && ./run.sh smoke-setup-verdict && ./run.sh check-pack-pin-matcher && ./run.sh check-package-source-routing && ./run.sh check-install-preflight && ./run.sh check-pack"
+		"check:contracts": "./run.sh check-shell-quote && ./run.sh check-entwurf-session-identity && ./run.sh check-meta-session && ./run.sh check-meta-v3-record && ./run.sh check-mailbox-receipt-state && ./run.sh check-entwurf-capabilities && ./run.sh check-harness-admission-parity && ./run.sh check-capability-bundle-reach && ./run.sh check-meta-mailbox-state-write && ./run.sh check-meta-receiver-marker && ./run.sh check-meta-capability-source && ./run.sh check-model-lock && ./run.sh check-dep-versions && ./run.sh check-node-floor-coherence && ./run.sh check-claude-floor-coherence && ./run.sh check-copilot-statusline && ./run.sh check-pi-import-surface && ./run.sh check-env-namespace && ./run.sh check-pi-runtime-version && ./run.sh check-pi-preflight && ./run.sh check-project-trust-handler && ./run.sh check-entwurf-v2-contract && ./run.sh check-entwurf-v2-send && ./run.sh check-entwurf-v2-runner && ./run.sh check-control-send-receipt && ./run.sh check-compaction-send-guard && ./run.sh check-entwurf-resume-args && ./run.sh check-entwurf-v2-native-push && ./run.sh check-entwurf-v2-production && ./run.sh check-entwurf-v2-surface && ./run.sh check-entwurf-bridge-pi-free && ./run.sh check-resume-launch-identity && ./run.sh check-mux-placement && ./run.sh check-mux-launch && ./run.sh check-mux-resume-call && ./run.sh check-mux-parent-artifact && ./run.sh check-mux-launcher-fence && ./run.sh check-entwurf-v2-visible-resume && ./run.sh check-control-socket-path && ./run.sh check-meta-listing && ./run.sh check-entwurf-fact-provider && ./run.sh check-herdr-placement && ./run.sh check-herdr-fresh-call && ./run.sh check-herdr-supply && ./run.sh check-fresh-call-dispatch && ./run.sh check-entwurf-peers-surface && ./run.sh check-entwurf-self-address && ./run.sh check-entwurf-deliverability && ./run.sh check-native-push-adapter && ./run.sh check-native-push-register && ./run.sh check-auth-boundary && ./run.sh check-acp-overlay && ./run.sh check-acp-tool-surface && ./run.sh check-acp-event-mapper && ./run.sh check-acp-prompt-builder && ./run.sh check-acp-config && ./run.sh check-acp-session-store && ./run.sh check-acp-carrier-augment && ./run.sh check-acp-foreground-only && ./run.sh check-codex-sender-identity && ./run.sh check-codex-native-push",
+		"check:hermetic": "./run.sh check-bridge-delivery && ./run.sh smoke-pi-attach && ./run.sh check-fresh-cut-gate && ./run.sh check-hook-launch-topology && ./run.sh check-meta-hook-session-switch && ./run.sh check-copilot-birth-hook && ./run.sh check-copilot-receive-arm && ./run.sh check-copilot-launch && ./run.sh check-pi-launch && ./run.sh check-codex-app-server-launch && ./run.sh check-meta-identity-consumers && ./run.sh check-socket-probe && ./run.sh smoke-meta-honesty && ./run.sh check-meta-doctor-oracle && ./run.sh check-agy-permission-matrix && ./run.sh smoke-agy-statusline-state && ./run.sh smoke-copilot-statusline-state && ./run.sh smoke-copilot-mcp-state && ./run.sh smoke-omp-bridge-state && ./run.sh smoke-omp-mcp-state && ./run.sh smoke-omp-receive-state && ./run.sh check-omp-birth-hook && ./run.sh check-omp-receive-arm && ./run.sh check-omp-fresh-preflight && ./run.sh smoke-agy-hooks-state && ./run.sh smoke-pi-provider-state && ./run.sh smoke-user-scope-citizen && ./run.sh smoke-meta-prune && ./run.sh smoke-meta-keyset-guard && ./run.sh check-meta-manifest-schema && ./run.sh check-entwurf-control-rpc && ./run.sh check-entwurf-bridge-boot && ./run.sh check-probe-bridge-command && ./run.sh check-meta-facts && ./run.sh check-peer-facts && ./run.sh check-herdr-plugin && ./run.sh check-herdr-plugin-profile && ./run.sh check-herdr-plugin-build && ./run.sh check-herdr-runtime-bootstrap && ./run.sh check-herdr-activation && ./run.sh check-agy-sender-identity && ./run.sh check-acp-provider-surface && ./run.sh check-acp-stop-reason && ./run.sh check-acp-prompt-lifecycle && ./run.sh check-acp-usage-accounting && ./run.sh check-acp-launch-namespace && ./run.sh check-acp-stream-hooks && ./run.sh check-acp-backend-preflight && ./run.sh check-acp-session-reuse && ./run.sh check-typing-call-fence && ./run.sh check-gate-manifests && ./run.sh check-release-gate-outcomes && ./run.sh check-probe-ordering && ./run.sh check-probe-cli-shim && ./run.sh check-acp-cortex && ./run.sh check-codex-bridge-identity && ./run.sh check-pi-bridge-sender && ./run.sh check-pi-mcp-register && ./run.sh check-pi-mcp-bridge && ./run.sh check-codex-birth-hook && ./run.sh smoke-codex-config-state && ./run.sh smoke-codex-birth && ./run.sh check-herdr-sandbox",
+		"check:package": "./run.sh check-install-surface && ./run.sh smoke-meta-install-state && ./run.sh smoke-agy-install-state && ./run.sh smoke-setup-verdict && ./run.sh check-pack-pin-matcher && ./run.sh check-pack-consumer-roots && ./run.sh check-package-source-routing && ./run.sh check-install-preflight && ./run.sh check-pack"
 	},
 	"pi": {
 		"extensions": [