@junghanacs/entwurf 0.12.9 → 0.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS.md +135 -248
- package/BASELINE.md +46 -7
- package/CHANGELOG.md +35 -0
- package/CONTRIBUTING.md +4 -2
- package/DELIVERY.md +5 -4
- package/README.md +46 -18
- package/VERIFY.md +10 -6
- package/demo/demo.sh +7 -1
- package/docs/setup-clean-host.md +10 -4
- package/mcp/entwurf-bridge/dist/mcp/entwurf-bridge/src/index.js +159 -66
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/acp/backend-adapter.js +148 -5
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/acp/config.js +16 -4
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/acp/models.js +66 -7
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/acp/overlay.js +190 -3
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/acp/tool-surface.js +12 -4
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-core.js +26 -9
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-deliverability.js +10 -6
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-fact-provider.js +15 -17
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-facts.js +13 -13
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-resume-args.js +31 -41
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-self-address.js +8 -9
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-v2-contract.js +32 -25
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-v2-decider.js +4 -4
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-v2-lock.js +5 -4
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-v2-production.js +9 -11
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/entwurf-v2-spawn-production.js +3 -1
- package/mcp/entwurf-bridge/dist/pi-extensions/lib/meta-session.js +17 -20
- package/mcp/entwurf-bridge/src/index.ts +190 -82
- package/package.json +7 -3
- package/pi/settings.reference.json +1 -1
- package/pi-extensions/acp-provider.ts +20 -10
- package/pi-extensions/entwurf-control.ts +69 -27
- package/pi-extensions/lib/acp/augment.ts +60 -2
- package/pi-extensions/lib/acp/backend-adapter.ts +183 -8
- package/pi-extensions/lib/acp/backend.ts +5 -1
- package/pi-extensions/lib/acp/config.ts +19 -5
- package/pi-extensions/lib/acp/engraving.ts +3 -1
- package/pi-extensions/lib/acp/event-mapper.ts +10 -3
- package/pi-extensions/lib/acp/models.ts +69 -7
- package/pi-extensions/lib/acp/overlay.ts +234 -3
- package/pi-extensions/lib/acp/tool-surface.ts +12 -4
- package/pi-extensions/lib/entwurf-core.ts +26 -9
- package/pi-extensions/lib/entwurf-deliverability.ts +10 -6
- package/pi-extensions/lib/entwurf-fact-provider.ts +15 -17
- package/pi-extensions/lib/entwurf-facts.ts +13 -13
- package/pi-extensions/lib/entwurf-resume-args.ts +40 -46
- package/pi-extensions/lib/entwurf-self-address.ts +8 -9
- package/pi-extensions/lib/entwurf-v2-contract-schema.ts +7 -2
- package/pi-extensions/lib/entwurf-v2-contract.ts +32 -25
- package/pi-extensions/lib/entwurf-v2-decider.ts +8 -8
- package/pi-extensions/lib/entwurf-v2-lock.ts +5 -4
- package/pi-extensions/lib/entwurf-v2-production.ts +14 -11
- package/pi-extensions/lib/entwurf-v2-spawn-production.ts +3 -1
- package/pi-extensions/lib/meta-session.ts +17 -20
- package/run.sh +200 -62
- package/scripts/agy-bridge-config.py +249 -49
- package/scripts/agy-bridge.sh +59 -14
- package/scripts/check-acp-carrier-augment.ts +34 -2
- package/scripts/check-acp-cortex.ts +668 -0
- package/scripts/check-acp-provider-surface.ts +50 -6
- package/scripts/check-acp-sdk-surface.ts +22 -11
- package/scripts/check-acp-session-reuse.ts +64 -1
- package/scripts/check-agy-permission-matrix.py +655 -0
- package/scripts/check-entwurf-deliverability.ts +9 -6
- package/scripts/check-entwurf-fact-provider.ts +7 -7
- package/scripts/check-entwurf-facts.ts +12 -12
- package/scripts/check-entwurf-resume-args.ts +22 -60
- package/scripts/check-entwurf-self-address.ts +187 -4
- package/scripts/check-entwurf-v2-contract.ts +2 -2
- package/scripts/check-entwurf-v2-production.ts +5 -5
- package/scripts/check-entwurf-v2-spawn-production.ts +6 -2
- package/scripts/check-entwurf-v2-surface.ts +327 -14
- package/scripts/check-gate-qualification.ts +787 -0
- package/scripts/check-meta-identity-consumers.ts +1 -1
- package/scripts/check-probe-cli-shim.ts +879 -0
- package/scripts/check-probe-ordering.ts +2450 -0
- package/scripts/check-shell-quote.ts +5 -4
- package/scripts/fixtures/probe-cli-shim +20 -0
- package/scripts/fixtures/probe-mcp-server.ts +168 -12
- package/scripts/lib/mutation-qualify.ts +794 -0
- package/scripts/lib/probe-acp-turn.ts +207 -0
- package/scripts/lib/probe-cli-shim.ts +464 -0
- package/scripts/lib/probe-cli-target.ts +165 -0
- package/scripts/lib/probe-event-log.ts +383 -0
- package/scripts/lib/probe-verdict.ts +1213 -0
- package/scripts/mutants/acp-augment.json +30 -0
- package/scripts/mutants/acp-cortex.json +196 -0
- package/scripts/mutants/agy-permission.json +144 -0
- package/scripts/mutants/meta-identity.json +17 -0
- package/scripts/mutants/probe-ordering.json +1032 -0
- package/scripts/mutants/self-address.json +59 -0
- package/scripts/mutants/v2-surface.json +87 -0
- package/scripts/smoke-acp-cortex-live.ts +392 -0
- package/scripts/smoke-acp-ordering-probe-live.ts +848 -0
- package/scripts/smoke-acp-raw-turn-live.ts +1 -1
- package/scripts/smoke-acp-v2-send-live.ts +33 -18
- package/scripts/smoke-agy-install-state.sh +205 -20
- package/scripts/smoke-entwurf-v2-matrix-live.ts +3 -2
- package/pi-extensions/lib/entwurf-mailbox-guard.ts +0 -100
- package/scripts/check-entwurf-mailbox-guard.ts +0 -266
|
@@ -1,59 +1,49 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* entwurf-resume-args — the SINGLE source of truth for the `pi` argv a resume spawn is
|
|
3
|
-
* launched with (0.11 Stage 0 step 5c-3b).
|
|
4
|
-
*
|
|
5
|
-
* shape — the one place the `--no-extensions` / `--entwurf-control` decision lives.
|
|
3
|
+
* launched with (0.11 Stage 0 step 5c-3b). One place owns the
|
|
4
|
+
* `--no-extensions` / `--entwurf-control` decision so the launch shape cannot drift.
|
|
6
5
|
*
|
|
7
|
-
* The
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
* is the early-exit/failure observation. `plan.launchArgs` (`--approve` or empty, from
|
|
19
|
-
* the decider's preflight) rides along as pi flags before the prompt.
|
|
6
|
+
* The shipped posture (A1): a RESIDENT, addressable garden citizen. The resume turn runs via
|
|
7
|
+
* `-p <prompt>` (the prompt-as-turn authority), and the child is launched WITH
|
|
8
|
+
* `--entwurf-control` and WITHOUT `--no-extensions` — the keep-alive is the GOAL here: the
|
|
9
|
+
* resumed session stands its control socket up and stays addressable. The 5c-3a watcher's
|
|
10
|
+
* `socket-alive` is exactly that "resumed citizen is up" observation (→ release the per-gid
|
|
11
|
+
* lock, child lives on); `child-exited` is the early-exit/failure observation.
|
|
12
|
+
* `plan.launchArgs` (`--approve` or empty, from the decider's preflight) rides along as pi
|
|
13
|
+
* flags before the prompt.
|
|
14
|
+
*
|
|
15
|
+
* A second `legacy` one-shot posture (`--no-extensions`, no control socket, so `pi -p` could
|
|
16
|
+
* exit) lived here until 2026-07-27 and was removed with its launcher and the v1 verbs.
|
|
20
17
|
*
|
|
21
18
|
* Provider/model identity is the caller's existing authority (readSessionIdentity /
|
|
22
19
|
* getEntwurfExplicitExtensions) — this builder only LAYS OUT argv, it never resolves
|
|
23
|
-
* identity. `explicitExtensionArgs` is preserved verbatim
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
20
|
+
* identity. `explicitExtensionArgs` is preserved verbatim: a recorded `provider=entwurf`
|
|
21
|
+
* resume needs the bridge re-injected to resolve the provider, and dropping it would
|
|
22
|
+
* re-introduce the "Unknown provider" footgun (#29). (A future slice may dedup against
|
|
23
|
+
* settings-loaded extensions; not here.)
|
|
27
24
|
*
|
|
28
|
-
* This module is import-free on purpose: the
|
|
29
|
-
*
|
|
30
|
-
* the gate import the same source — a self-contained string builder keeps both configs happy.
|
|
25
|
+
* This module is import-free on purpose: the v2 adapter and the gate import the same source,
|
|
26
|
+
* and a self-contained string builder keeps both tsconfigs happy.
|
|
31
27
|
*/
|
|
32
28
|
/**
|
|
33
|
-
* Build the `pi` argv for a resume spawn. The
|
|
34
|
-
*
|
|
35
|
-
*
|
|
29
|
+
* Build the `pi` argv for a resume spawn. The prefix is `--mode json -p` (headless JSON
|
|
30
|
+
* child, prompt-as-turn); then the resident posture; then
|
|
31
|
+
* `[…ext args] --session <file> [--provider <p>] --model <m> <prompt>`.
|
|
36
32
|
*
|
|
37
33
|
* Invariants the gate pins:
|
|
38
|
-
* - legacy carries `--no-extensions` and NO `--entwurf-control`.
|
|
39
34
|
* - v2-control carries `--entwurf-control` and NO `--no-extensions`, plus `-p` + prompt.
|
|
40
|
-
* - `explicitExtensionArgs` appears exactly once
|
|
41
|
-
* - `launchArgs` is included
|
|
42
|
-
* - provider/model/prompt identity is
|
|
35
|
+
* - `explicitExtensionArgs` appears exactly once.
|
|
36
|
+
* - `launchArgs` is included before the suffix.
|
|
37
|
+
* - provider/model/prompt identity layout is fixed.
|
|
43
38
|
*/
|
|
44
39
|
export function buildResumePiArgs(input) {
|
|
45
40
|
const args = ["--mode", "json", "-p"];
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
// The keep-alive legacy avoided is the goal here. `--approve`/launchArgs ride along.
|
|
53
|
-
args.push("--entwurf-control");
|
|
54
|
-
args.push(...(input.launchArgs ?? []));
|
|
55
|
-
}
|
|
56
|
-
// Shared suffix — identical identity layout in both variants.
|
|
41
|
+
// Resident citizen: stand the control socket up (A1) and keep extensions loaded. The
|
|
42
|
+
// keep-alive the removed one-shot launcher had to avoid is precisely the goal here —
|
|
43
|
+
// the resumed session must stay addressable. `--approve`/launchArgs ride along.
|
|
44
|
+
args.push("--entwurf-control");
|
|
45
|
+
args.push(...(input.launchArgs ?? []));
|
|
46
|
+
// Suffix — the fixed identity layout.
|
|
57
47
|
args.push(...input.explicitExtensionArgs);
|
|
58
48
|
args.push("--session", input.sessionFile);
|
|
59
49
|
if (input.provider)
|
|
@@ -3,14 +3,13 @@
|
|
|
3
3
|
*
|
|
4
4
|
* "Can a reply to THIS session actually land where its model will see it?"
|
|
5
5
|
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* with every fact INJECTED (no IO) so the gate can pin each row.
|
|
6
|
+
* This module closed the former split where the MCP and native pi surfaces inferred
|
|
7
|
+
* `replyable: true` from identity-carrier presence alone. Identity and reachability
|
|
8
|
+
* are separate: pi's env carries the garden id established by record birth, while
|
|
9
|
+
* replyability requires its control socket; a native marker must be record-backed,
|
|
10
|
+
* while replyability additionally requires its own rail's live facts. This is the
|
|
11
|
+
* single truth-table both surfaces compute from, with every fact INJECTED (no IO) so
|
|
12
|
+
* the gate can pin each row.
|
|
14
13
|
*
|
|
15
14
|
* Axes by origin:
|
|
16
15
|
* - pi-session: replyable ⟺ a live control socket exists at the canonical path.
|
|
@@ -33,7 +32,7 @@
|
|
|
33
32
|
* — which never arms a watch — would report replyable:false forever.
|
|
34
33
|
* - external-mcp: never replyable — no authoritative reply address.
|
|
35
34
|
*
|
|
36
|
-
* `origin` stays
|
|
35
|
+
* `origin` stays sender-carrier PROVENANCE, never the citizen identity authority and never a rail.
|
|
37
36
|
* Which rail a meta citizen's reply rides is a SECOND axis — `metaDeliveryDomain`, derived
|
|
38
37
|
* by the caller from `nativePushSupported(backend)`, not from `wakeMode` (direct-inject also
|
|
39
38
|
* covers codex/pi, which have no native-push adapter). Fail-closed: an unsupplied domain is
|
|
@@ -7,25 +7,28 @@
|
|
|
7
7
|
* `entwurf-v2-contract-schema.ts` (0.12.1 B-1) so this module — which the
|
|
8
8
|
* harness-neutral MCP bridge reaches at boot — carries no pi dependency.
|
|
9
9
|
*
|
|
10
|
-
* Why a frozen contract BEFORE the fact-provider (step 4):
|
|
11
|
-
*
|
|
12
|
-
* discovery first
|
|
13
|
-
*
|
|
14
|
-
* it; dispatch computes from facts at call
|
|
15
|
-
*
|
|
10
|
+
* Why a frozen contract BEFORE the fact-provider (step 4): the legacy 3-verb
|
|
11
|
+
* surface (`entwurf`/`entwurf_resume`/`entwurf_send`) was still live when this
|
|
12
|
+
* was written, and building discovery first would have baked verb-routing into
|
|
13
|
+
* the fact layer, taking `entwurf_peers` wrong (동결결정 10 순서 근거). So the
|
|
14
|
+
* SHAPE is locked here; the facts read it; dispatch computes from facts at call
|
|
15
|
+
* time (step 5). Those v1 verbs were REMOVED in the 0.12 cutover — the ordering
|
|
16
|
+
* argument is history, but the layering it produced is the live design.
|
|
16
17
|
*
|
|
17
18
|
* Source-verified invariants folded in (Opus 실측 + GPT 보정 + Fable R1-R5, 2026-06-11):
|
|
18
19
|
* - F1: caller intent is DECLARED in the input, so the contract a caller
|
|
19
20
|
* receives is deterministic — never computed from liveness at call time.
|
|
20
21
|
* `owned-outcome` (caller owns completion) ≠ `fire-and-forget` (ack only).
|
|
21
|
-
* - R1:
|
|
22
|
-
*
|
|
23
|
-
* so its liveness is `unsupported`, NOT folded into dead/indeterminate
|
|
24
|
-
*
|
|
25
|
-
*
|
|
22
|
+
* - R1: liveness is defined PER CAPABILITY DOMAIN. The control-socket domain
|
|
23
|
+
* currently contains backend `pi`; claude-code is self-fetch with no socket,
|
|
24
|
+
* so its socket liveness is `unsupported`, NOT folded into dead/indeterminate.
|
|
25
|
+
* This is transport capability, not identity rank: every target is first a
|
|
26
|
+
* record citizen. `unsupported` is a 4th FACT value, not a 4th table column.
|
|
26
27
|
* - R2: `target` is the garden-id of an EXISTING citizen. spawn-new is out of
|
|
27
|
-
* v2 scope
|
|
28
|
-
*
|
|
28
|
+
* v2 scope — it was the legacy `entwurf` verb's, and since that verb's removal
|
|
29
|
+
* fresh creation is a deferred capability with NO surface, not a fallback that
|
|
30
|
+
* still exists elsewhere. Absent/typo gid = `bad-target` (so F6 "오타 gid가
|
|
31
|
+
* 신규 spawn 사고 막기" holds automatically).
|
|
29
32
|
* - N1/F3: an `indeterminate` target never spawns. N2: `fire-and-forget` to a
|
|
30
33
|
* `dormant` target is "reject for now" (mailbox-wake lacks a reply-correlation
|
|
31
34
|
* id in the substrate; an additive extension later, not a permanent no).
|
|
@@ -58,16 +61,16 @@ export const FACT_LIVENESSES = ["alive", "dead", "indeterminate", "unsupported"]
|
|
|
58
61
|
// handled by the domain guard before the table is consulted.
|
|
59
62
|
export const DISPATCH_LIVENESSES = ["live", "dormant", "indeterminate"];
|
|
60
63
|
// ── Backend liveness domain (R1 + F4) ──────────────────────────────────────
|
|
61
|
-
// Backends whose SOCKET liveness predicate is DEFINED
|
|
62
|
-
// domain
|
|
64
|
+
// Backends whose SOCKET liveness predicate is DEFINED. The control-socket
|
|
65
|
+
// capability domain currently contains `pi` (connect + RPC `get_info`).
|
|
63
66
|
// claude-code (self-fetch, no socket) has no liveness predicate at all → `unsupported`.
|
|
64
67
|
// codex/antigravity are direct-inject; antigravity's liveness IS measured, but by the
|
|
65
68
|
// SEPARATE native-push adapter rail (a live app-server conversation probe), NOT this
|
|
66
69
|
// pi-socket domain — so it must NEVER be added here. Adding it would pull agy into the
|
|
67
|
-
//
|
|
68
|
-
// reporting agy `unsupported` = "outside the
|
|
70
|
+
// control-socket table (inspectSocket/probeSocket are socket-only); the fact layer keeps
|
|
71
|
+
// reporting agy `unsupported` = "outside the control-socket liveness domain", NOT
|
|
69
72
|
// unreachable (the native-push rail measures it — entwurf-v2-decider.ts). Widening
|
|
70
|
-
// THIS set is a deliberate future decision
|
|
73
|
+
// THIS set is a deliberate future decision, gated by a real compatible
|
|
71
74
|
// control-socket predicate — never by silently mapping sessions to dead/indeterminate
|
|
72
75
|
// (R1 핵심). check-entwurf-facts pins this == ["pi"] and asserts the native-push
|
|
73
76
|
// domain is disjoint from it.
|
|
@@ -77,12 +80,12 @@ export function isLivenessSupported(backend) {
|
|
|
77
80
|
}
|
|
78
81
|
// ── Native-push backend domain (봉인 2/4) ───────────────────────────────────
|
|
79
82
|
// A backend whose liveness is measured by the SEPARATE native-push adapter rail (a
|
|
80
|
-
// live app-server conversation probe — antigravity's LS gRPC), NOT
|
|
81
|
-
// socket. This domain is DISJOINT from LIVENESS_DOMAIN_BACKENDS
|
|
82
|
-
//
|
|
83
|
+
// live app-server conversation probe — antigravity's LS gRPC), NOT a control
|
|
84
|
+
// socket. This domain is DISJOINT from LIVENESS_DOMAIN_BACKENDS: an agy session
|
|
85
|
+
// is `unsupported` on the socket FACT axis (entwurf_peers) yet fully
|
|
83
86
|
// measured + deliverable on the native-push axis. The two are separate rails on
|
|
84
87
|
// purpose — check-entwurf-facts pins both sets and asserts their intersection is ∅
|
|
85
|
-
// (a backend can never be in both
|
|
88
|
+
// (a backend can never be in both domains).
|
|
86
89
|
export const NATIVE_PUSH_BACKENDS = ["antigravity"];
|
|
87
90
|
export function nativePushSupported(backend) {
|
|
88
91
|
return NATIVE_PUSH_BACKENDS.includes(backend);
|
|
@@ -202,14 +205,18 @@ export const ENTWURF_V2_ACTIONS = ["send", "resume"];
|
|
|
202
205
|
export const ENTWURF_V2_OWNERSHIPS = ["ack-only", "owned"];
|
|
203
206
|
// Delivery mode of the message to the target (how it is injected) — steer =
|
|
204
207
|
// interrupt the current turn, follow_up = queue after it. A SEPARATE axis from
|
|
205
|
-
// both the intent/ownership axis (F1) and the liveness-routing axis
|
|
206
|
-
// entwurf_send
|
|
208
|
+
// both the intent/ownership axis (F1) and the liveness-routing axis. The removed
|
|
209
|
+
// v1 `entwurf_send` carried the same steer|follow_up surface, so this axis is
|
|
210
|
+
// inherited vocabulary, not a second live delivery verb.
|
|
207
211
|
export const ENTWURF_V2_MODES = ["steer", "follow_up"];
|
|
208
212
|
// ── The FROZEN decision table ──────────────────────────────────────────────
|
|
209
213
|
// intent × dispatch-liveness → exactly one verdict (Q2). v2-initial ALLOWS
|
|
210
214
|
// exactly two cells (fire-and-forget+live = send; owned-outcome+dormant =
|
|
211
215
|
// resume); the other four reject. The reject cells are honest "지금은 없음"
|
|
212
|
-
// locks (N2)
|
|
216
|
+
// locks (N2). They were written while the legacy 3-verb surface still covered
|
|
217
|
+
// those flows; that surface is GONE, so a reject cell is now a real absence with
|
|
218
|
+
// no fallback verb behind it — reopening one takes a new contract, never a
|
|
219
|
+
// quiet re-admission.
|
|
213
220
|
export const DISPATCH_TABLE = {
|
|
214
221
|
"fire-and-forget": {
|
|
215
222
|
live: { action: "send", transport: "control-socket", ownership: "ack-only" },
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
* MCP-schema bypass for pi-native/internal callers).
|
|
27
27
|
* 2. resolveTarget — no citizen → bad-target; a record-less control socket →
|
|
28
28
|
* record-less-socket (#50 C4: the record is the sole address authority);
|
|
29
|
-
* quarantined (
|
|
29
|
+
* quarantined (out-of-socket-domain record sharing a socket/symlink) → target-address-conflict.
|
|
30
30
|
* PROBE-FREE.
|
|
31
31
|
* 3. backend → isLivenessSupported.
|
|
32
32
|
* 4. acquireLock — IN-DOMAIN ONLY (?7), BEFORE lstat/connect, so the probe
|
|
@@ -45,14 +45,14 @@
|
|
|
45
45
|
* never hand-assembles a `{ok:false, …}` literal, so the pre-probe-null rule cannot
|
|
46
46
|
* be bypassed.
|
|
47
47
|
*/
|
|
48
|
-
import {
|
|
48
|
+
import { isOutOfSocketDomainGardenIdConflict } from "./entwurf-facts.js";
|
|
49
49
|
import { isLivenessSupported, makeRejectReceipt, nativePushSupported, resolveDispatch, resolveNativePushDispatch, } from "./entwurf-v2-contract.js";
|
|
50
50
|
import { defaultMetaMailboxDir, defaultMetaSessionsDir, metaCapabilityFor, } from "./meta-session.js";
|
|
51
51
|
import { isValidSessionId } from "./session-id.js";
|
|
52
52
|
import { controlSocketPath, mapInspectionToLiveness } from "./socket-discovery.js";
|
|
53
53
|
// Re-export the shared conflict predicate so producers of a TargetResolution have a
|
|
54
54
|
// single import site for it (it is the SAME fn the fact-provider listing uses).
|
|
55
|
-
export {
|
|
55
|
+
export { isOutOfSocketDomainGardenIdConflict };
|
|
56
56
|
// ── observe timeout (?3) ───────────────────────────────────────────────────
|
|
57
57
|
// The bounded wait 5c's release-watcher gives a spawned child to surface its
|
|
58
58
|
// control socket / exit. Planted into the resume plan so the hand does not invent
|
|
@@ -178,7 +178,7 @@ export async function decideDispatch(input, deps) {
|
|
|
178
178
|
};
|
|
179
179
|
return { kind: "execute", receipt, plan, lock: null };
|
|
180
180
|
}
|
|
181
|
-
// 4-5.
|
|
181
|
+
// 4-5. control-socket domain (currently backend pi): lock → inspect → route.
|
|
182
182
|
return decideInDomain(gardenId, input, deps, ctx, identity.cwd);
|
|
183
183
|
}
|
|
184
184
|
async function decideInDomain(gardenId, input, deps, ctx, cwd) {
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
* entwurf-v2-lock — the per-gid dispatch lock primitive (0.11 Stage 0 step 5a,
|
|
3
3
|
* 버킷 B F2). LOAD-BEARING: the guard against a double-spawn of the same dormant
|
|
4
4
|
* target by two V2 dispatchers that share the substrate through different entry
|
|
5
|
-
* points. SCOPE (honest): this protects v2/v2 only.
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
5
|
+
* points. SCOPE (honest): this protects v2/v2 only. It was written while the legacy
|
|
6
|
+
* `entwurf_resume` still ran unchanged (동결결정 10 scope A) without taking this
|
|
7
|
+
* lock, which left a v2/legacy concurrent-resume gap. That verb was REMOVED in the
|
|
8
|
+
* 0.12 cutover, so the gap is closed by subtraction — not by this lock growing to
|
|
9
|
+
* cover it. Any NEW resume entry point must take this lock or the gap reopens.
|
|
9
10
|
*
|
|
10
11
|
* ENVIRONMENT ASSUMPTION (stale reclaim): `hostname` equality is used as the
|
|
11
12
|
* proxy for "same machine", so a holder pid is reclaim-probed with kill(0) only
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
*/
|
|
31
31
|
import { formatSenderInfoBlock, sendRpcCommand as realSendRpc, } from "./entwurf-control-rpc.js";
|
|
32
32
|
import { mailboxConversationalDeliverable, receiverMarkerMatchesIdentity, } from "./entwurf-deliverability.js";
|
|
33
|
-
import {
|
|
33
|
+
import { isOutOfSocketDomainGardenIdConflict } from "./entwurf-facts.js";
|
|
34
34
|
import { isLivenessSupported } from "./entwurf-v2-contract.js";
|
|
35
35
|
import { decideDispatch, } from "./entwurf-v2-decider.js";
|
|
36
36
|
import { ENTWURF_V2_LOCK_DIR, acquireLock as realAcquireLock, releaseLock as realReleaseLock, } from "./entwurf-v2-lock.js";
|
|
@@ -68,7 +68,7 @@ async function lazyProductionPreflight(input) {
|
|
|
68
68
|
return preflight(input);
|
|
69
69
|
}
|
|
70
70
|
/** Map a record-side socket inspection to the singleton (socketGids, symlinkedGids) the
|
|
71
|
-
* `
|
|
71
|
+
* `isOutOfSocketDomainGardenIdConflict` predicate consumes. `indeterminate` fails LOUD (QB2): an
|
|
72
72
|
* unprovable conflict must NOT be folded to "no conflict" — that would silently allow an
|
|
73
73
|
* unsupported-backend mailbox send onto a quarantined address. */
|
|
74
74
|
function conflictSetsFor(gid, inspection) {
|
|
@@ -162,20 +162,18 @@ export function makeProductionEntwurfV2Deps(opts) {
|
|
|
162
162
|
};
|
|
163
163
|
}
|
|
164
164
|
const identity = io.readIdentity(gid, sessionsDir);
|
|
165
|
-
//
|
|
166
|
-
//
|
|
167
|
-
//
|
|
168
|
-
//
|
|
169
|
-
// and (b) turn a pi target's `indeterminate` lstat into a top-level throw, stealing it
|
|
170
|
-
// from the under-lock `inspectSocket → indeterminate → indeterminate-no-spawn` path.
|
|
165
|
+
// This pre-probe conflict applies only OUTSIDE the control-socket capability domain.
|
|
166
|
+
// An in-domain target's lstat/connect MUST run under the later per-target lock, so it
|
|
167
|
+
// short-circuits here with no pre-lock IO. Otherwise an indeterminate lstat would be
|
|
168
|
+
// stolen from the under-lock `inspectSocket → indeterminate-no-spawn` path.
|
|
171
169
|
if (isLivenessSupported(identity.backend)) {
|
|
172
170
|
return { identity, preProbeAddressConflict: false };
|
|
173
171
|
}
|
|
174
|
-
// Only
|
|
175
|
-
//
|
|
172
|
+
// Only a citizen outside the control-socket domain reaches this record-side lstat;
|
|
173
|
+
// `indeterminate` fails loud (QB2 — never silently "no conflict").
|
|
176
174
|
const inspection = await io.inspectPath(controlSocketPath(gid, controlSocketDir));
|
|
177
175
|
const { socketGids, symlinkedGids } = conflictSetsFor(gid, inspection);
|
|
178
|
-
const preProbeAddressConflict =
|
|
176
|
+
const preProbeAddressConflict = isOutOfSocketDomainGardenIdConflict(identity.backend, gid, socketGids, symlinkedGids);
|
|
179
177
|
return { identity, preProbeAddressConflict };
|
|
180
178
|
};
|
|
181
179
|
const inspectSocket = (gid) => io.inspectSocket(gid, controlSocketDir);
|
|
@@ -90,7 +90,9 @@ function requireProductionChild(child) {
|
|
|
90
90
|
export function resolveResumeLaunchIdentity(plan) {
|
|
91
91
|
const record = readAddressableMetaIdentity(plan.sessionId);
|
|
92
92
|
if (record.backend !== "pi") {
|
|
93
|
-
throw new Error(`entwurf-v2-spawn-production: ${plan.sessionId} is a ${record.backend} citizen —
|
|
93
|
+
throw new Error(`entwurf-v2-spawn-production: ${plan.sessionId} is a ${record.backend} citizen — ` +
|
|
94
|
+
`spawn-bg resume is a host-adapter capability, and its domain currently contains backend pi only. ` +
|
|
95
|
+
`This is a relaunch capability, not the control-socket rail and not citizen rank.`);
|
|
94
96
|
}
|
|
95
97
|
const sessionFile = record.transcriptPath;
|
|
96
98
|
if (!sessionFile) {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* meta-session —
|
|
2
|
+
* meta-session — the shared V3 garden-citizen RECORD AUTHORITY.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
4
|
+
* This module entered through the native meta-bridge (#30), then became the one
|
|
5
|
+
* identity store for every addressable citizen, including `backend:"pi"` (#50).
|
|
6
|
+
* A record is a backend-owned-session bib card: it binds the backend's native id
|
|
7
|
+
* and transcript pointer to a garden id without taking over that backend's runtime,
|
|
8
|
+
* auth, or transcript. The module name is history; the live identity schema is not
|
|
9
|
+
* a native-only or pi-exception axis.
|
|
10
10
|
*
|
|
11
11
|
* Two layers, clearly sectioned:
|
|
12
12
|
* 1. RECORD functions + types (mint / serialize / parse / certifyActiveStore /
|
|
@@ -58,7 +58,7 @@ import { generateSessionId, SESSION_ID_RE } from "./session-id.js";
|
|
|
58
58
|
// ---------------------------------------------------------------------------
|
|
59
59
|
// Errors
|
|
60
60
|
// ---------------------------------------------------------------------------
|
|
61
|
-
/** A
|
|
61
|
+
/** A garden-citizen record is malformed, or an input violates the record contract. */
|
|
62
62
|
export class MetaRecordError extends Error {
|
|
63
63
|
constructor(message) {
|
|
64
64
|
super(message);
|
|
@@ -106,8 +106,9 @@ export function requireNonEmptyString(value, field) {
|
|
|
106
106
|
}
|
|
107
107
|
/** Validate the 3-backend NATIVE bridge axis (sender/receiver markers, capability
|
|
108
108
|
* drift guard). Not a record-schema validator: identity records take
|
|
109
|
-
* `requireCitizenBackend` (which admits `pi`)
|
|
110
|
-
*
|
|
109
|
+
* `requireCitizenBackend` (which admits `pi`). Markers stay native-3 because the
|
|
110
|
+
* pi adapter carries its record-established garden id into children via env rather
|
|
111
|
+
* than using the native-hook pid marker rail. */
|
|
111
112
|
export function requireBackend(value) {
|
|
112
113
|
if (typeof value !== "string" || !META_BACKENDS.includes(value)) {
|
|
113
114
|
throw new MetaRecordError(`meta-record "backend" must be one of ${META_BACKENDS.join(" | ")} (got ${describe(value)}).`);
|
|
@@ -164,7 +165,7 @@ function isoNow(now) {
|
|
|
164
165
|
// ---------------------------------------------------------------------------
|
|
165
166
|
/** The one live identity schema number. */
|
|
166
167
|
export const META_SCHEMA_VERSION_V3 = 3;
|
|
167
|
-
/**
|
|
168
|
+
/** Every backend admitted by the one V3 record-citizen schema. */
|
|
168
169
|
export const META_CITIZEN_BACKENDS = ["claude-code", "antigravity", "codex", "pi"];
|
|
169
170
|
export function requireCitizenBackend(value) {
|
|
170
171
|
if (typeof value !== "string" || !META_CITIZEN_BACKENDS.includes(value)) {
|
|
@@ -407,15 +408,11 @@ export function parseMetaIdentity(json) {
|
|
|
407
408
|
// const for the three existing backends (the drift guard) and COVERS exactly
|
|
408
409
|
// META_CITIZEN_BACKENDS (pi included).
|
|
409
410
|
//
|
|
410
|
-
//
|
|
411
|
-
//
|
|
412
|
-
//
|
|
413
|
-
//
|
|
414
|
-
//
|
|
415
|
-
// pi's dormant→resume→mailbox path is self-fetch-shaped, so pi is really
|
|
416
|
-
// BIMODAL; a single wakeMode field cannot express both. Splitting it
|
|
417
|
-
// (mailboxWakeMode vs controlSocketWakeMode) is out of 3C scope — for now the
|
|
418
|
-
// single field reports pi's primary live capability (direct-inject) honestly.
|
|
411
|
+
// `wakeMode` describes the last centimetre, not citizen rank. The control-socket
|
|
412
|
+
// adapter injects the body into a pi turn, so backend `pi` is `direct-inject`;
|
|
413
|
+
// Claude's mailbox is `self-fetch`; native-push adapters are direct injection.
|
|
414
|
+
// Dormant spawn-bg resume is a separate transport/ownership decision and does not
|
|
415
|
+
// turn the pi record into a mailbox citizen.
|
|
419
416
|
// ---------------------------------------------------------------------------
|
|
420
417
|
/** Bump only on a breaking capability-registry shape change; the parser refuses other versions. */
|
|
421
418
|
export const CAPABILITY_SCHEMA_VERSION = 1;
|