pi-amq 0.1.1 → 0.1.2

package/README.md

@@ -32,7 +32,14 @@ version-matched excerpts covering `overview`, `tools`, `contracts`, `gate`,
 
 Design: [docs/design.md](docs/design.md) — the authoritative contract for
 implementation. Every debated decision carries a `(debate: ...)` provenance
-note.
+note. [docs/contracts/](docs/contracts) maps that contract to owners,
+implementation files, and fault-sensitive tests
+([transport](docs/contracts/transport.md),
+[worker runtime](docs/contracts/worker-runtime.md),
+[operations](docs/contracts/operations.md)); the maps add no rules, and any
+conflict resolves to `docs/design.md`. Findings that were investigated and
+deliberately not acted on, with their reopen conditions, are recorded in
+[docs/contracts/deferred-findings.md](docs/contracts/deferred-findings.md).
 
 ## Principle
 
@@ -85,8 +92,40 @@ from both the in-memory session and disk leaves the request pending with
 visible `/amq ingest` guidance instead; see
 [§17.1](docs/design.md#171-fresh-session-automation-compatibility-amendment).
 
-Run `npm test` for the fault-sensitive suite. The reproducible live AMQ flow is
-in [`scripts/demo-two-terminal.sh`](scripts/demo-two-terminal.sh), with a
+## Verification
+
+Two suites, one boundary.
+
+- `npm test` is the **repository suite**. It compiles `test/**/*.ts` and runs
+  `.test-dist/test/*.test.js` against the source tree in this checkout.
+- `npm run test:package` is the **consumer-artifact gate**. It packs the real
+  npm tarball, extracts it into a staged `node_modules/pi-amq` tree, and loads
+  that extracted copy through the stock pi `--extension` seam, asserting the
+  registered tool surface, that `guide` resolves `docs/operator-guide.md` from
+  the extracted package root, and that the packaged manifest ships the documents
+  it promises.
+
+The pi-amq extension under test is loaded only from the extracted tarball, so a
+path missing from `package.json#files` fails the gate. The repository still
+supplies the test-only probe extension and the already-resolved dependency tree
+the staged package links against. Staging extracts the tarball; it does not run
+npm's installer, so npm's own resolution, lifecycle scripts, and peer-dependency
+handling are out of scope. Every probe runs with `HOME` and
+`PI_CODING_AGENT_DIR` inside its staged workspace, so the gate never touches the
+caller's `~/.pi` runtime state.
+
+The gate is fail-closed: it needs a stock `pi` binary on `PATH` or at
+`PI_AMQ_TEST_PI_BINARY`, and without one it **fails** with a missing-binary
+diagnostic instead of reporting success on skipped cases. The manifest case does
+not need `pi` and stays independently runnable.
+
+Neither suite ships. `package.json#files` omits `test` and `tsconfig.test.json`
+on purpose: a consumer installs the runtime surface, not the harness that
+verifies it. `test:package` is the check that keeps that omission honest,
+because it only ever sees what a consumer receives.
+
+The reproducible live AMQ flow is in
+[`scripts/demo-two-terminal.sh`](scripts/demo-two-terminal.sh), with a
 normalized transcript in [`docs/demo-transcript.md`](docs/demo-transcript.md).
 The fault-sensitive zero-AMQ worker-team demonstration is case 37 in
 [`test/workflow-run-store.test.ts`](test/workflow-run-store.test.ts).

package/dist/extension/worker-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../extension/worker-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../extension/worker-runtime.ts"],"names":[],"mappings":"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"}

package/dist/extension/worker-runtime.js

@@ -2,7 +2,7 @@ import { spawn as spawnChild } from "node:child_process";
 import { createHash } from "node:crypto";
 import { access, readFile } from "node:fs/promises";
 import { constants } from "node:fs";
-import { delimiter, isAbsolute, join } from "node:path";
+import { delimiter, isAbsolute, join, normalize, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { openLaunchPreview, } from "../integration/launch-preview.js";
 import { WorkerCompletionNotifier, } from "../integration/worker-completion-notifier.js";
@@ -20,7 +20,7 @@ import { WorkerRolePresetCatalog, workerRoleContract, } from "../workflow/worker
 import { LaunchPreviewCoordinator, loadConfirmSpawnsPolicy, } from "../workflow/spawn-confirmation.js";
 import { projectWorkerLifecycle } from "../workflow/lifecycle-projection.js";
 import { NodePiProcessFactory, WorkerProcessSupervisor, } from "../workflow/worker-process-supervisor.js";
-import { WorkflowLeaseManager } from "../workflow/workflow-lease.js";
+import { WorkflowLeaseManager, } from "../workflow/workflow-lease.js";
 import { defaultPiStateDirectory, workflowNamespaceDirectory, workflowWorkspaceId, } from "../workflow/workspace-paths.js";
 const DRIVER_DOCTRINE = [
     "## Supervised Workers (pi-amq)",
@@ -34,6 +34,7 @@ const CAPABILITY_TOOLS = {
     shell: ["bash"],
     message_worker: ["message_worker"],
 };
+const WORKER_RUNTIME_REGISTRY_SYMBOL = Symbol.for("pi-amq.worker-runtime-registry.v1");
 export class PiWorkerRuntime {
     #publishFleet;
     #unlimitedDeclaration;
@@ -51,7 +52,7 @@ export class PiWorkerRuntime {
     #requestKey;
     #error;
     #guidance = DRIVER_DOCTRINE;
-    #runtimes = new Map();
+    #attachment;
     constructor(publishFleet = () => { }, unlimitedDeclaration = () => undefined, publishLifecycle = async () => { }, publishNotice = () => { }) {
         this.#publishFleet = publishFleet;
         this.#unlimitedDeclaration = unlimitedDeclaration;
@@ -59,35 +60,42 @@ export class PiWorkerRuntime {
         this.#publishNotice = publishNotice;
     }
     async start(ctx) {
+        this.#detach();
         await this.refreshGuidance(ctx);
-        const existing = this.#runtimes.get(ctx.cwd);
-        if (existing) {
-            this.#cwd = ctx.cwd;
-            this.#store = existing.store;
-            this.#supervisor = existing.supervisor;
-            this.#cleanup = existing.cleanup;
-            this.#doctor = existing.doctor;
-            this.#artifactDirectory = existing.artifactDirectory;
-            this.#requestKey = existing.requestKey;
-            existing.supervisor.updateLaunchAuthority(await launchAuthority(ctx));
-            this.#publish(await requiredRun(existing.store, existing.requestKey));
-            void this.#publishWithConversation(await requiredRun(existing.store, existing.requestKey));
-            return;
-        }
         try {
-            const runBudget = await confirmedRunBudget(ctx, this.#unlimitedDeclaration());
-            const authority = await launchAuthority(ctx);
-            const namespaceDirectory = workflowNamespaceDirectory(defaultPiStateDirectory(), ctx.cwd);
+            const workspacePath = canonicalWorkerWorkspace(ctx.cwd);
+            const workspaceId = workflowWorkspaceId(workspacePath);
+            const namespaceDirectory = workflowNamespaceDirectory(defaultPiStateDirectory(), workspacePath);
+            const key = workerRuntimeRegistryKey(namespaceDirectory, workspaceId);
+            const registry = processWorkerRuntimeRegistry();
             const inspector = new SystemProcessIdentityInspector();
             const leaseManager = new WorkflowLeaseManager({
                 namespaceDirectory,
-                workspaceId: workflowWorkspaceId(ctx.cwd),
+                workspaceId,
                 inspector,
             });
+            const registered = registry.entries.get(key);
+            if (registered !== undefined) {
+                const existing = parseWorkerRuntimeCore(registered, key);
+                await validateRuntimeAdoption(existing, {
+                    workspacePath,
+                    workspaceId,
+                    namespaceDirectory,
+                    inspector,
+                    leaseManager,
+                });
+                existing.supervisor.updateLaunchAuthority(await launchAuthority(ctx));
+                const current = await requiredRun(existing.store, existing.requestKey);
+                this.#attach(existing, current);
+                this.#error = undefined;
+                return;
+            }
+            const runBudget = await confirmedRunBudget(ctx, this.#unlimitedDeclaration());
+            const authority = await launchAuthority(ctx);
             const acquired = await leaseManager.acquireSupervisor();
             if (acquired.kind !== "acquired") {
                 throw new Error(acquired.kind === "held"
-                    ? `worker supervisor is held by PID ${acquired.owner.pid}`
+                    ? `worker supervisor is held by PID ${acquired.owner.pid}; fully restart Pi without deleting the supervisor lease`
                     : acquired.diagnostic);
             }
             const store = new WorkflowRunStore({
@@ -96,7 +104,7 @@ export class PiWorkerRuntime {
                 supervisorGeneration: acquired.owner.generation,
             });
             const sessionIdentity = ctx.sessionManager.getSessionFile() ?? `process:${process.pid}`;
-            const requestKey = `pi-session:${hash(`${ctx.cwd}\0${sessionIdentity}`)}`;
+            const requestKey = `pi-session:${hash(`${workspacePath}\0${sessionIdentity}`)}`;
             await store.startRun({
                 requestKey,
                 source: {
@@ -135,53 +143,37 @@ export class PiWorkerRuntime {
                 leases: leaseManager,
                 inspector,
             });
-            const initial = await requiredRun(store, requestKey);
-            this.#baselineLifecycle(initial);
-            const notifier = new WorkerCompletionNotifier({ publish: this.#publishNotice });
-            notifier.baseline(initial);
-            const unsubscribeStore = store.subscribe((projection) => {
-                this.#publish(projection);
-                void this.#publishWithConversation(projection);
-                void this.#publishLifecycleChanges(projection).catch(() => { });
-                notifier.observe(projection);
-            });
-            const unsubscribe = () => {
-                unsubscribeStore();
-                notifier.dispose();
-            };
             const reconciled = await supervisor.reconcileRun(requestKey);
-            this.#cwd = ctx.cwd;
-            this.#store = store;
-            this.#supervisor = supervisor;
-            this.#cleanup = cleanup;
-            this.#doctor = doctor;
-            this.#artifactDirectory = artifactDirectory;
-            this.#requestKey = requestKey;
-            this.#runtimes.set(ctx.cwd, {
+            const core = {
+                schema: 1,
+                key,
+                workspacePath,
+                workspaceId,
+                namespaceDirectory,
+                processIdentity: processIdentityFromOwner(acquired.owner),
+                supervisorGeneration: acquired.owner.generation,
+                leaseManager,
                 store,
                 supervisor,
                 cleanup,
                 doctor,
                 artifactDirectory,
                 requestKey,
-                unsubscribe,
-            });
+            };
+            registry.entries.set(key, core);
+            this.#attach(core, reconciled);
             this.#error = undefined;
-            this.#publish(reconciled);
         }
         catch (error) {
+            this.#detach();
             this.#error = toError(error).message;
-            this.#store = undefined;
-            this.#supervisor = undefined;
-            this.#cleanup = undefined;
-            this.#doctor = undefined;
-            this.#artifactDirectory = undefined;
-            this.#requestKey = undefined;
         }
     }
     async shutdown() {
         // Workers own a parent-liveness descriptor. Session changes do not imply cancellation,
-        // so the runtime intentionally retains the supervisor instead of inventing a stop policy.
+        // so only this extension instance's advisory subscribers are detached. The process-global
+        // core and its supervisor lease remain intact for a replacement extension instance.
+        this.#detach();
     }
     async refreshGuidance(ctx) {
         try {
@@ -198,7 +190,7 @@ export class PiWorkerRuntime {
                 projectTrusted: ctx.isProjectTrusted(),
             });
             this.#guidance = `${DRIVER_DOCTRINE}\n\n${guidance.text}${guidance.notices.length > 0 ? `\n${guidance.notices.join("\n")}` : ""}`;
-            if (this.#cwd === ctx.cwd) {
+            if (this.#cwd === canonicalWorkerWorkspace(ctx.cwd)) {
                 this.#supervisor?.updateLaunchAuthority(await launchAuthority(ctx));
             }
         }
@@ -563,10 +555,61 @@ export class PiWorkerRuntime {
             requestKey: this.#requestKey,
         };
     }
+    #attach(core, projection) {
+        this.#detach();
+        this.#cwd = core.workspacePath;
+        this.#store = core.store;
+        this.#supervisor = core.supervisor;
+        this.#cleanup = core.cleanup;
+        this.#doctor = core.doctor;
+        this.#artifactDirectory = core.artifactDirectory;
+        this.#requestKey = core.requestKey;
+        this.#lifecycleStates.clear();
+        this.#baselineLifecycle(projection);
+        const notifier = new WorkerCompletionNotifier({ publish: this.#publishNotice });
+        notifier.baseline(projection);
+        const attachment = {
+            core,
+            notifier,
+            active: true,
+            unsubscribe: () => { },
+        };
+        this.#attachment = attachment;
+        attachment.unsubscribe = core.store.subscribe((run) => {
+            if (!this.#isAttached(attachment))
+                return;
+            this.#publish(run);
+            void this.#publishWithConversation(run, attachment);
+            void this.#publishLifecycleChanges(run, attachment).catch(() => { });
+            notifier.observe(run);
+        });
+        this.#publish(projection);
+        void this.#publishWithConversation(projection, attachment);
+    }
+    #detach() {
+        const attachment = this.#attachment;
+        this.#attachment = undefined;
+        if (attachment) {
+            attachment.active = false;
+            attachment.unsubscribe();
+            attachment.notifier.dispose();
+        }
+        this.#lifecycleStates.clear();
+        this.#cwd = undefined;
+        this.#store = undefined;
+        this.#supervisor = undefined;
+        this.#cleanup = undefined;
+        this.#doctor = undefined;
+        this.#artifactDirectory = undefined;
+        this.#requestKey = undefined;
+    }
+    #isAttached(attachment) {
+        return attachment.active && this.#attachment === attachment;
+    }
     #publish(run) {
         this.#publishFleet(projectFleetRecords(run));
     }
-    async #publishWithConversation(run) {
+    async #publishWithConversation(run, attachment) {
         const records = await Promise.all(Object.values(run.workers).map(async (worker) => {
             const attempt = worker.attempts.at(-1);
             const contract = effectiveWorkerContract(worker);
@@ -597,24 +640,146 @@ export class PiWorkerRuntime {
                 ],
             };
         }));
-        if (this.#requestKey === run.requestKey)
+        if (this.#isAttached(attachment) && attachment.core.requestKey === run.requestKey) {
             this.#publishFleet(records);
+        }
     }
     #baselineLifecycle(run) {
         for (const worker of Object.values(run.workers)) {
             this.#lifecycleStates.set(`${run.requestKey}\0${worker.workerId}`, worker.state);
         }
     }
-    async #publishLifecycleChanges(run) {
+    async #publishLifecycleChanges(run, attachment) {
         for (const worker of Object.values(run.workers)) {
+            if (!this.#isAttached(attachment))
+                return;
             const key = `${run.requestKey}\0${worker.workerId}`;
             if (this.#lifecycleStates.get(key) === worker.state)
                 continue;
             this.#lifecycleStates.set(key, worker.state);
+            if (!this.#isAttached(attachment))
+                return;
             await this.#publishLifecycle(projectWorkerLifecycle(worker.workerId, worker.state)).catch(() => { });
         }
     }
 }
+function processWorkerRuntimeRegistry() {
+    const existing = Reflect.get(globalThis, WORKER_RUNTIME_REGISTRY_SYMBOL);
+    if (existing === undefined) {
+        const created = { schema: 1, entries: new Map() };
+        Reflect.set(globalThis, WORKER_RUNTIME_REGISTRY_SYMBOL, created);
+        return created;
+    }
+    try {
+        if (!isRecord(existing) || existing["schema"] !== 1 || !(existing["entries"] instanceof Map)) {
+            throw new Error("registry envelope is invalid");
+        }
+        const registry = existing;
+        for (const [key, value] of registry.entries) {
+            if (typeof key !== "string" || key.length === 0)
+                throw new Error("registry key is invalid");
+            parseWorkerRuntimeCore(value, key);
+        }
+        return registry;
+    }
+    catch (error) {
+        throw reloadAdoptionRefused(`process-global registry is corrupt: ${toError(error).message}`);
+    }
+}
+function parseWorkerRuntimeCore(value, expectedKey) {
+    if (!isRecord(value) || value["schema"] !== 1) {
+        throw reloadAdoptionRefused("process-global registry entry is corrupt");
+    }
+    const core = value;
+    if (core.key !== expectedKey
+        || !nonEmptyString(core.workspacePath)
+        || !nonEmptyString(core.workspaceId)
+        || !nonEmptyString(core.namespaceDirectory)
+        || !nonEmptyString(core.supervisorGeneration)
+        || !nonEmptyString(core.artifactDirectory)
+        || !nonEmptyString(core.requestKey)
+        || !runtimeProcessIdentity(core.processIdentity)
+        || !hasMethods(core.leaseManager, ["inspectSupervisor"])
+        || !hasMethods(core.store, ["readRun", "subscribe"])
+        || !hasMethods(core.supervisor, ["updateLaunchAuthority", "steerWorker", "cancelWorker"])
+        || !hasMethods(core.cleanup, ["plan", "execute"])
+        || !hasMethods(core.doctor, ["inspect"])) {
+        throw reloadAdoptionRefused("process-global registry entry is corrupt");
+    }
+    return core;
+}
+async function validateRuntimeAdoption(core, expected) {
+    if (core.workspacePath !== expected.workspacePath
+        || core.workspaceId !== expected.workspaceId
+        || core.namespaceDirectory !== expected.namespaceDirectory
+        || core.key !== workerRuntimeRegistryKey(expected.namespaceDirectory, expected.workspaceId)) {
+        throw reloadAdoptionRefused("workspace or namespace identity changed");
+    }
+    const current = await expected.inspector.current();
+    if (!sameProcessIdentity(core.processIdentity, current)) {
+        throw reloadAdoptionRefused("process-start identity changed");
+    }
+    const lease = await expected.leaseManager.inspectSupervisor();
+    if (lease.kind !== "owned") {
+        throw reloadAdoptionRefused(lease.kind === "corrupt" ? `supervisor lease is corrupt: ${lease.diagnostic}` : "supervisor lease is missing");
+    }
+    if (lease.owner.kind !== "supervisor"
+        || lease.owner.workspaceId !== expected.workspaceId
+        || lease.owner.generation !== core.supervisorGeneration) {
+        throw reloadAdoptionRefused("supervisor generation or workspace does not match the registry");
+    }
+    const leaseIdentity = processIdentityFromOwner(lease.owner);
+    if (!sameProcessIdentity(leaseIdentity, current)
+        || !sameProcessIdentity(leaseIdentity, core.processIdentity)) {
+        throw reloadAdoptionRefused("supervisor lease process identity does not match the registry");
+    }
+}
+function canonicalWorkerWorkspace(workspacePath) {
+    if (!isAbsolute(workspacePath))
+        throw new TypeError("Worker workspace must be absolute");
+    return normalize(resolve(workspacePath));
+}
+function workerRuntimeRegistryKey(namespaceDirectory, workspaceId) {
+    return `${normalize(resolve(namespaceDirectory))}\0${workspaceId}`;
+}
+function processIdentityFromOwner(owner) {
+    return {
+        pid: owner.pid,
+        processStartIdentity: owner.processStartIdentity,
+        bootIdentity: owner.bootIdentity,
+        executable: owner.executable,
+        hostname: owner.hostname,
+    };
+}
+function sameProcessIdentity(left, right) {
+    return left.pid === right.pid
+        && left.processStartIdentity === right.processStartIdentity
+        && left.bootIdentity === right.bootIdentity
+        && normalize(left.executable) === normalize(right.executable)
+        && left.hostname === right.hostname;
+}
+function runtimeProcessIdentity(value) {
+    return isRecord(value)
+        && Number.isSafeInteger(value["pid"])
+        && value["pid"] > 0
+        && nonEmptyString(value["processStartIdentity"])
+        && (value["bootIdentity"] === null || nonEmptyString(value["bootIdentity"]))
+        && nonEmptyString(value["executable"])
+        && isAbsolute(value["executable"])
+        && nonEmptyString(value["hostname"]);
+}
+function hasMethods(value, methods) {
+    return isRecord(value) && methods.every((method) => typeof value[method] === "function");
+}
+function nonEmptyString(value) {
+    return typeof value === "string" && value.length > 0;
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function reloadAdoptionRefused(reason) {
+    return new Error(`worker runtime reload adoption refused: ${reason}; fully restart Pi without deleting the supervisor lease`);
+}
 export function projectFleetRecords(run) {
     return Object.values(run.workers).map((worker) => {
         const attempt = worker.attempts.at(-1);