@euqns/nudge-mcp 1.35.0 → 1.37.0

package/dist/runner-t3.js

@@ -0,0 +1,327 @@
+// Optional local T3 view. Only public HTTP commands and terminal RPCs are used:
+// never write T3's database or start a second provider turn for a runner job.
+import { execFile } from "node:child_process";
+import { createHash, randomUUID } from "node:crypto";
+import { access, appendFile, mkdir, readFile, realpath, writeFile } from "node:fs/promises";
+import os from "node:os";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { promisify } from "node:util";
+import WebSocket from "ws";
+const exec = promisify(execFile);
+const TIMEOUT = 3_000;
+const MAX_LOG_BYTES = 8 * 1024 * 1024;
+export function localT3Origin(runtime) {
+    if (runtime.version !== 1 || !Number.isInteger(runtime.port) || runtime.port < 1 || runtime.port > 65535) {
+        throw new Error("Unsupported T3 runtime descriptor");
+    }
+    const url = new URL(runtime.origin);
+    if (url.protocol !== "http:" || !["127.0.0.1", "localhost", "[::1]", "0.0.0.0", "[::]"].includes(url.hostname)
+        || url.username || url.password || url.search || url.hash || url.pathname !== "/"
+        || Number(url.port || 80) !== runtime.port) {
+        throw new Error("T3 runner integration requires a loopback server");
+    }
+    // Wildcard listeners are reachable through loopback; never follow a remote origin.
+    return `http://${url.hostname.includes(":") ? "[::1]" : "127.0.0.1"}:${runtime.port}`;
+}
+export function t3JobThreadId(deployment, jobId) {
+    return `nudge-${createHash("sha256").update(`${deployment}\0${jobId}`).digest("hex").slice(0, 32)}`;
+}
+export function t3JobTitle(job, status) {
+    return `Nudge · ${status.replaceAll("_", " ")} · ${job.boardTitle} · ${job.kind} ${job.id.slice(-6)}`.slice(0, 220);
+}
+// T3's terminals use the machine's shell. This integration currently opens log
+// viewers only on POSIX hosts; Windows still gets a thread and status updates.
+export function shellQuote(value) {
+    return `'${value.replaceAll("'", "'\\''")}'`;
+}
+async function findCli() {
+    const env = { ...process.env };
+    // An explicit executable supports nonstandard installs and wrapper scripts.
+    if (env.NUDGE_T3_CLI)
+        return { command: env.NUDGE_T3_CLI, args: [], env };
+    if (process.platform === "darwin") {
+        for (const root of ["/Applications", path.join(os.homedir(), "Applications")]) {
+            for (const name of ["T3 Code (Nightly)", "T3 Code"]) {
+                const app = path.join(root, `${name}.app`, "Contents");
+                const command = path.join(app, "MacOS", name);
+                const entry = path.join(app, "Resources/app.asar/apps/server/dist/bin.mjs");
+                try {
+                    await access(command);
+                    return { command, args: [entry], env: { ...env, ELECTRON_RUN_AS_NODE: "1" } };
+                }
+                catch { /* Try the next installation. */ }
+            }
+        }
+    }
+    for (const dir of (env.PATH ?? "").split(path.delimiter)) {
+        const command = path.join(dir, process.platform === "win32" ? "t3.exe" : "t3");
+        try {
+            await access(command);
+            return { command, args: [], env };
+        }
+        catch { /* Not installed here. */ }
+    }
+    return null;
+}
+export class T3Client {
+    origin;
+    token;
+    constructor(origin, token) {
+        this.origin = origin;
+        this.token = token;
+    }
+    async request(route, body) {
+        const response = await fetch(`${this.origin}${route}`, {
+            method: body ? "POST" : "GET",
+            headers: { authorization: `Bearer ${this.token}`, "content-type": "application/json" },
+            ...(body ? { body: JSON.stringify(body) } : {}),
+            redirect: "error",
+            signal: AbortSignal.timeout(TIMEOUT),
+        });
+        // Error bodies can contain prompts or credentials: do not include them in logs.
+        if (!response.ok)
+            throw new Error(`T3 ${route} returned HTTP ${response.status}`);
+        return await response.json();
+    }
+    dispatch(command) {
+        return this.request("/api/orchestration/dispatch", { commandId: randomUUID(), ...command });
+    }
+    async terminalLog(threadId, cwd, logPath) {
+        if (process.platform === "win32")
+            return;
+        const socket = new WebSocket(`${this.origin.replace("http:", "ws:")}/ws`, {
+            headers: { authorization: `Bearer ${this.token}` },
+            handshakeTimeout: TIMEOUT,
+            maxPayload: 1024 * 1024,
+        });
+        // Keep an error handler installed even during teardown.
+        socket.on("error", () => undefined);
+        try {
+            await new Promise((resolve, reject) => {
+                const timer = setTimeout(() => reject(new Error("T3 socket timed out")), TIMEOUT);
+                socket.once("open", () => { clearTimeout(timer); resolve(); });
+                socket.once("error", () => { clearTimeout(timer); reject(new Error("T3 socket failed")); });
+            });
+            await t3Rpc(socket, "terminal.open", { threadId, terminalId: "term-1", cwd, cols: 120, rows: 32 });
+            let viewer = fileURLToPath(new URL("./runner-t3-log-viewer.js", import.meta.url));
+            const nodeArgs = [];
+            try {
+                await access(viewer);
+            }
+            catch {
+                viewer = fileURLToPath(new URL("./runner-t3-log-viewer.ts", import.meta.url));
+                nodeArgs.push("--import", createRequire(import.meta.url).resolve("tsx"));
+            }
+            // Never send task text to a shell. The viewer only prints a local data file.
+            await t3Rpc(socket, "terminal.write", {
+                threadId, terminalId: "term-1",
+                data: `${[process.execPath, ...nodeArgs, viewer, logPath].map(shellQuote).join(" ")}\r`,
+            });
+        }
+        finally {
+            socket.terminate();
+        }
+    }
+}
+export function t3Rpc(socket, tag, payload) {
+    return new Promise((resolve, reject) => {
+        const id = randomUUID();
+        const cleanup = () => {
+            clearTimeout(timer);
+            socket.off("message", onMessage);
+            socket.off("close", onClose);
+            socket.off("error", onClose);
+        };
+        const onClose = () => { cleanup(); reject(new Error("T3 socket closed")); };
+        const onMessage = (raw) => {
+            try {
+                const parsed = JSON.parse(raw.toString());
+                for (const message of Array.isArray(parsed) ? parsed : [parsed]) {
+                    if (message._tag !== "Exit" || message.requestId !== id)
+                        continue;
+                    cleanup();
+                    if (message.exit?._tag === "Success")
+                        resolve(message.exit.value);
+                    else
+                        reject(new Error(`T3 ${tag} failed`));
+                }
+            }
+            catch {
+                cleanup();
+                reject(new Error("Invalid T3 RPC response"));
+            }
+        };
+        const timer = setTimeout(() => { cleanup(); reject(new Error(`T3 ${tag} timed out`)); }, TIMEOUT);
+        socket.on("message", onMessage);
+        socket.once("close", onClose);
+        socket.once("error", onClose);
+        try {
+            socket.send(JSON.stringify({ _tag: "Request", id, tag, payload, headers: [] }));
+        }
+        catch {
+            cleanup();
+            reject(new Error("T3 socket send failed"));
+        }
+    });
+}
+async function discover() {
+    if (process.env.NUDGE_T3 === "0")
+        return null;
+    const home = path.resolve(process.env.T3CODE_HOME ?? path.join(os.homedir(), ".t3"));
+    for (const variant of ["userdata", "dev"]) {
+        let runtime;
+        try {
+            runtime = JSON.parse(await readFile(path.join(home, variant, "server-runtime.json"), "utf8"));
+        }
+        catch (error) {
+            if (error.code === "ENOENT")
+                continue;
+            throw new Error("Cannot read T3 runtime descriptor");
+        }
+        const origin = localT3Origin(runtime);
+        if (!Number.isInteger(runtime.pid) || runtime.pid < 1)
+            continue;
+        try {
+            process.kill(runtime.pid, 0);
+        }
+        catch {
+            continue;
+        }
+        const probe = await fetch(`${origin}/.well-known/t3/environment`, { signal: AbortSignal.timeout(TIMEOUT), redirect: "error" });
+        if (!probe.ok)
+            throw new Error("Local T3 server is unavailable");
+        const descriptor = await probe.json();
+        if (typeof descriptor.environmentId !== "string" || typeof descriptor.serverVersion !== "string")
+            throw new Error("Unsupported T3 environment descriptor");
+        const cli = await findCli();
+        if (!cli)
+            throw new Error("T3 CLI not found; set NUDGE_T3_CLI to its executable");
+        return { origin, cli, home, dev: variant === "dev" };
+    }
+    return null;
+}
+async function withClient(connection, use) {
+    const { cli, home, dev } = connection;
+    const location = ["--base-dir", home, ...(dev ? ["--dev-url", "http://localhost"] : [])];
+    const run = async (args) => {
+        try {
+            return await exec(cli.command, [...cli.args, "auth", "session", ...args, ...location], {
+                env: cli.env, timeout: 10_000, maxBuffer: 64 * 1024, windowsHide: true,
+            });
+        }
+        catch {
+            throw new Error("T3 local session command failed");
+        }
+    };
+    const { stdout } = await run(["issue", "--ttl", "5m", "--label", "Nudge runner view", "--json"]);
+    let session;
+    try {
+        session = JSON.parse(stdout);
+    }
+    catch {
+        throw new Error("Invalid T3 session response");
+    }
+    if (typeof session.token !== "string" || typeof session.sessionId !== "string")
+        throw new Error("Invalid T3 session response");
+    try {
+        return await use(new T3Client(connection.origin, session.token));
+    }
+    finally {
+        await run(["revoke", session.sessionId]).catch(() => undefined);
+    }
+}
+export async function ensureT3JobThread(client, job) {
+    const snapshot = await client.request("/api/orchestration/snapshot");
+    const cwd = await realpath(job.cwd);
+    let project = snapshot.projects.find((p) => path.resolve(p.workspaceRoot) === cwd && !p.deletedAt);
+    if (!project) {
+        const projectId = `nudge-project-${createHash("sha256").update(cwd).digest("hex").slice(0, 24)}`;
+        try {
+            await client.dispatch({ type: "project.create", projectId, title: path.basename(cwd), workspaceRoot: cwd, createdAt: new Date().toISOString() });
+        }
+        catch (error) {
+            // Concurrent jobs may have created the same project first.
+            const latest = await client.request("/api/orchestration/snapshot");
+            if (!latest.projects.some((p) => p.id === projectId && !p.deletedAt))
+                throw error;
+        }
+        project = { id: projectId };
+    }
+    const threadId = t3JobThreadId(job.deployment, job.id);
+    const title = t3JobTitle(job, "running");
+    const existing = snapshot.threads.find((t) => t.id === threadId && !t.deletedAt);
+    if (!existing) {
+        await client.dispatch({
+            type: "thread.create", threadId, projectId: project.id, title,
+            modelSelection: project.defaultModelSelection ?? { instanceId: job.engine === "claude" ? "claudeAgent" : job.engine, model: job.model },
+            runtimeMode: "approval-required", interactionMode: "default",
+            branch: null, worktreePath: null, createdAt: new Date().toISOString(),
+        });
+    }
+    else {
+        if (existing.archivedAt)
+            await client.dispatch({ type: "thread.unarchive", threadId });
+        if (existing.settledAt || existing.settledOverride === "settled") {
+            await client.dispatch({ type: "thread.unsettle", threadId, reason: "user" });
+        }
+        await client.dispatch({ type: "thread.meta.update", threadId, title });
+    }
+    return threadId;
+}
+export async function startT3JobView(job, warn) {
+    try {
+        const connection = await discover();
+        if (!connection)
+            return null;
+        const threadId = t3JobThreadId(job.deployment, job.id);
+        const directory = path.join(os.homedir(), ".nudge", "t3-logs");
+        await mkdir(directory, { recursive: true, mode: 0o700 });
+        // Separate files for resumes prevent an old viewer consuming the new run.
+        const logPath = path.join(directory, `${threadId}-${randomUUID()}.jsonl`);
+        const encode = (text, done = false) => `${JSON.stringify({ text, done })}\n`;
+        const heading = `Nudge runner · ${job.boardTitle}\nJob: ${job.id} · attempt ${job.attempt}\nAgent: ${job.engine} · ${job.model}\n\nThis terminal displays the external runner. Reply or steer in Nudge.\n\n${job.prompt}\n\n`;
+        await writeFile(logPath, encode(heading), { mode: 0o600 });
+        await withClient(connection, async (client) => {
+            await ensureT3JobThread(client, job);
+            // A terminal failure must not discard a successfully created thread.
+            await client.terminalLog(threadId, job.cwd, logPath).catch(() => warn(`T3 thread created; its log viewer could not open. Log: ${logPath}`));
+        });
+        let queued = Promise.resolve();
+        let bytes = Buffer.byteLength(heading);
+        let truncated = false;
+        let finished = false;
+        const append = (text, done = false) => {
+            queued = queued.then(() => appendFile(logPath, encode(text, done))).catch(() => undefined);
+        };
+        return {
+            threadId, logPath,
+            log(stream, text) {
+                if (finished || truncated)
+                    return;
+                bytes += Buffer.byteLength(text);
+                if (bytes > MAX_LOG_BYTES) {
+                    truncated = true;
+                    append("\n[Live log limit reached. Final result will follow.]\n");
+                    return;
+                }
+                append(`[${stream}] ${text}\n`);
+            },
+            async finish(status, summary, error) {
+                if (finished)
+                    return;
+                finished = true;
+                append(`\nNudge job: ${status}\n${summary ?? ""}\n${error ?? ""}\n`, true);
+                await queued;
+                await withClient(connection, (client) => client.dispatch({ type: "thread.meta.update", threadId, title: t3JobTitle(job, status) }))
+                    .catch(() => warn("T3 thread status could not be updated; the job result is recorded in Nudge."));
+            },
+        };
+    }
+    catch (error) {
+        warn(`T3 view unavailable: ${error instanceof Error ? error.message : "local integration failed"}. The runner will continue.`);
+        return null;
+    }
+}
+//# sourceMappingURL=runner-t3.js.map

package/dist/runner-t3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner-t3.js","sourceRoot":"","sources":["../src/runner-t3.ts"],"names":[],"mappings":"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"}

package/dist/runner-t3.test.js

@@ -0,0 +1,154 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { createServer } from "node:http";
+import { once } from "node:events";
+import { appendFile, mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { createRequire } from "node:module";
+import WebSocket, { WebSocketServer } from "ws";
+import { ensureT3JobThread, localT3Origin, shellQuote, startT3JobView, T3Client, t3JobThreadId, t3Rpc } from "./runner-t3.js";
+import { safeTerminalText } from "./runner-t3-log-viewer.js";
+test("discovery accepts local wildcard listeners and rejects credential-bearing or remote origins", () => {
+    assert.equal(localT3Origin({ version: 1, port: 3773, origin: "http://0.0.0.0:3773" }), "http://127.0.0.1:3773");
+    assert.equal(localT3Origin({ version: 1, port: 3773, origin: "http://[::]:3773" }), "http://[::1]:3773");
+    for (const origin of ["https://example.com:3773", "http://example.com:3773", "http://user:secret@localhost:3773", "http://localhost:3773/redirect", "http://localhost:3773?token=secret", "http://localhost:80"]) {
+        assert.throws(() => localT3Origin({ version: 1, port: 3773, origin }));
+    }
+    assert.throws(() => localT3Origin({ version: 2, port: 3773, origin: "http://localhost:3773" }));
+});
+test("job identity survives attempts but is scoped to the Nudge deployment", () => {
+    assert.equal(t3JobThreadId("a", "job"), t3JobThreadId("a", "job"));
+    assert.notEqual(t3JobThreadId("a", "job"), t3JobThreadId("b", "job"));
+    assert.match(t3JobThreadId("a", "../../job"), /^nudge-[a-f0-9]{32}$/);
+});
+test("POSIX arguments cannot execute task-controlled shell syntax", { skip: process.platform === "win32" }, async () => {
+    const input = "space ' quote `echo BAD` $(echo BAD) ; \n end";
+    const { stdout } = await promisify(execFile)("/bin/sh", ["-c", `printf %s ${shellQuote(input)}`]);
+    assert.equal(stdout, input);
+});
+test("missing or malformed T3 does not prevent a runner job", async (t) => {
+    const directory = await mkdtemp(path.join(os.tmpdir(), "nudge-t3-missing-"));
+    t.after(() => rm(directory, { recursive: true, force: true }));
+    const previous = process.env.T3CODE_HOME;
+    process.env.T3CODE_HOME = directory;
+    const warnings = [];
+    try {
+        assert.equal(await startT3JobView({}, (message) => warnings.push(message)), null);
+        assert.equal(warnings.length, 0);
+        await mkdir(path.join(directory, "userdata"));
+        await writeFile(path.join(directory, "userdata/server-runtime.json"), "invalid descriptor");
+        assert.equal(await startT3JobView({}, (message) => warnings.push(message)), null);
+        assert.equal(warnings.length, 1);
+        assert.match(warnings[0], /runner will continue/);
+    }
+    finally {
+        if (previous === undefined)
+            delete process.env.T3CODE_HOME;
+        else
+            process.env.T3CODE_HOME = previous;
+    }
+});
+test("disabled integration performs no T3 work", async () => {
+    const previous = process.env.NUDGE_T3;
+    process.env.NUDGE_T3 = "0";
+    try {
+        assert.equal(await startT3JobView({}, () => assert.fail("must stay quiet")), null);
+    }
+    finally {
+        if (previous === undefined)
+            delete process.env.NUDGE_T3;
+        else
+            process.env.NUDGE_T3 = previous;
+    }
+});
+test("public API creates one thread, then resumes it without starting another agent", async (t) => {
+    const cwd = await mkdtemp(path.join(os.tmpdir(), "nudge-t3-"));
+    t.after(() => rm(cwd, { recursive: true, force: true }));
+    const commands = [];
+    const projects = [];
+    const threads = [];
+    const server = createServer(async (req, res) => {
+        assert.equal(req.headers.authorization, "Bearer test-local-token");
+        res.setHeader("content-type", "application/json");
+        if (req.url === "/api/orchestration/snapshot")
+            return res.end(JSON.stringify({ projects, threads }));
+        assert.equal(req.url, "/api/orchestration/dispatch");
+        let body = "";
+        for await (const part of req)
+            body += part;
+        const command = JSON.parse(body);
+        commands.push(command);
+        if (command.type === "project.create")
+            projects.push({ id: command.projectId, workspaceRoot: command.workspaceRoot });
+        if (command.type === "thread.create")
+            threads.push({ id: command.threadId, projectId: command.projectId });
+        res.end(JSON.stringify({ sequence: commands.length }));
+    });
+    server.listen(0, "127.0.0.1");
+    await once(server, "listening");
+    t.after(() => { server.closeAllConnections(); server.close(); });
+    const client = new T3Client(`http://127.0.0.1:${server.address().port}`, "test-local-token");
+    const job = { id: "job1", deployment: "local", cwd, boardTitle: "Board", kind: "task", prompt: "Do work", engine: "codex", model: "gpt-6-astra", attempt: 1 };
+    const id = await ensureT3JobThread(client, job);
+    threads[0].archivedAt = new Date().toISOString();
+    threads[0].settledAt = new Date().toISOString();
+    assert.equal(await ensureT3JobThread(client, { ...job, attempt: 2 }), id);
+    assert.deepEqual(commands.map((c) => c.type), ["project.create", "thread.create", "thread.unarchive", "thread.unsettle", "thread.meta.update"]);
+    assert.equal(commands[1].runtimeMode, "approval-required");
+    assert.match(commands[4].title, /running/);
+});
+test("T3 errors and redirects never expose response bodies or send a token to another origin", async (t) => {
+    let followed = false;
+    const server = createServer((req, res) => {
+        if (req.url === "/redirect") {
+            res.writeHead(302, { location: "/destination" });
+            return res.end();
+        }
+        if (req.url === "/destination")
+            followed = true;
+        res.writeHead(500);
+        res.end("secret-response-body");
+    });
+    server.listen(0, "127.0.0.1");
+    await once(server, "listening");
+    t.after(() => { server.closeAllConnections(); server.close(); });
+    const client = new T3Client(`http://127.0.0.1:${server.address().port}`, "secret-token");
+    await assert.rejects(client.request("/test"), (error) => error.message.includes("HTTP 500") && !error.message.includes("secret"));
+    await assert.rejects(client.request("/redirect"));
+    assert.equal(followed, false);
+});
+test("terminal RPC handles batched replies and disconnected servers", async (t) => {
+    const server = new WebSocketServer({ port: 0, host: "127.0.0.1" });
+    await once(server, "listening");
+    t.after(() => server.close());
+    server.on("connection", (socket) => socket.on("message", (raw) => {
+        const message = JSON.parse(raw.toString());
+        if (message.tag === "disconnect")
+            return socket.close();
+        assert.equal(message._tag, "Request");
+        socket.send(JSON.stringify([{ _tag: "Pong" }, { _tag: "Exit", requestId: message.id, exit: { _tag: "Success", value: { ready: true } } }]));
+    }));
+    const socket = new WebSocket(`ws://127.0.0.1:${server.address().port}`);
+    socket.on("error", () => undefined);
+    await once(socket, "open");
+    t.after(() => socket.terminate());
+    assert.deepEqual(await t3Rpc(socket, "terminal.open", {}), { ready: true });
+    await assert.rejects(t3Rpc(socket, "disconnect", {}), /closed/);
+});
+test("log viewer handles split UTF-8 and exits on the final record", async (t) => {
+    const directory = await mkdtemp(path.join(os.tmpdir(), "nudge-t3-viewer-"));
+    t.after(() => rm(directory, { recursive: true, force: true }));
+    const file = path.join(directory, "log.jsonl");
+    const text = "İstanbul ✓ ".repeat(20_000);
+    await writeFile(file, `${JSON.stringify({ text, done: false })}\n`);
+    const result = promisify(execFile)(process.execPath, ["--import", createRequire(import.meta.url).resolve("tsx"), new URL("./runner-t3-log-viewer.ts", import.meta.url).pathname, file], { maxBuffer: 1024 * 1024, timeout: 10_000 });
+    await once(result.child.stdout, "data");
+    await appendFile(file, `${JSON.stringify({ text: "Finished", done: true })}\n`);
+    const { stdout } = await result;
+    assert.equal(stdout, text + "Finished");
+    assert.equal(safeTerminalText("hello\x1b]52;c;clipboard\x07\n\tworld\x9b"), "hello]52;c;clipboard\n\tworld");
+});
+//# sourceMappingURL=runner-t3.test.js.map

package/dist/runner-t3.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner-t3.test.js","sourceRoot":"","sources":["../src/runner-t3.test.ts"],"names":[],"mappings":"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"}

package/dist/runner-update.js

@@ -14,7 +14,10 @@
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { fileURLToPath } from "node:url";
+import fs from "node:fs/promises";
+import path from "node:path";
 import { installedGlobalPrefix } from "./install-context.js";
+import { acquireInstallationLock, globalPackageDirectory, installedPackageVersion, verifyInstalledPackage, } from "./runner-installation.js";
 const execFileAsync = promisify(execFile);
 export const NUDGE_MCP_PACKAGE = "@euqns/nudge-mcp";
 /** A version string npm will accept as a spec — bare semver or a dist-tag. */
@@ -105,27 +108,69 @@ export async function performSelfUpdate(plan, deps = {}) {
     }
     const run = deps.run ?? defaultRun;
     let output = "";
+    let release;
+    let staging;
     try {
-        const installed = await run("npm", plan.args);
+        const prefix = plan.prefix ?? (await run("npm", ["prefix", "--global"])).stdout.trim();
+        if (!path.isAbsolute(prefix))
+            throw new Error("Could not resolve npm's absolute global prefix.");
+        const packageDir = globalPackageDirectory(prefix);
+        release = await acquireInstallationLock(packageDir);
+        const previous = path.join(path.dirname(packageDir), ".nudge-mcp-previous");
+        // Recover the short rename window if the previous updater was killed.
+        if (!(await fs.stat(packageDir).catch(() => null)) && await fs.stat(previous).catch(() => null)) {
+            await fs.rename(previous, packageDir);
+        }
+        const target = normalizeTargetVersion(plan.spec.slice(`${NUDGE_MCP_PACKAGE}@`.length));
+        const current = await installedPackageVersion(packageDir).catch(() => null);
+        const exactTarget = /^\d+\.\d+\.\d+(?:[-+][\w.-]+)?$/.test(target);
+        if (current && exactTarget && (current === target || newerStableVersion(target, current))) {
+            try {
+                await verifyInstalledPackage(packageDir);
+                return { ok: true, installedVersion: current, output: `Already installed ${current}; reused the verified build.` };
+            }
+            catch {
+                // A broken install of the requested version still needs repairing.
+            }
+        }
+        // npm never writes into the running package. Keep staging on the same
+        // filesystem so activation uses renames, with the previous build retained.
+        staging = await fs.mkdtemp(path.join(path.dirname(packageDir), ".nudge-mcp-stage-"));
+        const installed = await run("npm", ["install", "-g", "--prefix", staging, plan.spec]);
         output = tailOutput(`${installed.stdout}\n${installed.stderr}`);
+        const candidate = globalPackageDirectory(staging);
+        const version = await verifyInstalledPackage(candidate);
+        if (exactTarget && version !== target)
+            throw new Error(`Expected Nudge ${target}, but npm installed ${version}.`);
+        if (current && newerStableVersion(version, current))
+            throw new Error(`Refusing to downgrade Nudge ${current} to ${version}.`);
+        await fs.rm(previous, { recursive: true, force: true });
+        const hadPrevious = !!(await fs.stat(packageDir).catch(() => null));
+        if (hadPrevious)
+            await fs.rename(packageDir, previous);
+        try {
+            await fs.rename(candidate, packageDir);
+            await verifyInstalledPackage(packageDir);
+        }
+        catch (error) {
+            await fs.rm(packageDir, { recursive: true, force: true });
+            if (hadPrevious)
+                await fs.rename(previous, packageDir);
+            throw error;
+        }
+        return { ok: true, installedVersion: version, output };
     }
     catch (err) {
         const e = err;
         const detail = tailOutput(`${e.stdout ?? ""}\n${e.stderr ?? ""}`) || e.message;
-        return { ok: false, error: `npm ${plan.args.join(" ")} failed: ${detail}`, output: detail };
-    }
-    let installedVersion = null;
-    try {
-        const ls = await run("npm", ["ls", "-g", ...(plan.prefix ? ["--prefix", plan.prefix] : []), NUDGE_MCP_PACKAGE, "--json", "--depth=0"]);
-        installedVersion = parseInstalledVersion(ls.stdout);
+        return { ok: false, error: `Nudge update failed: ${detail}`, output: detail };
     }
-    catch (err) {
-        // `npm ls` exits non-zero for peer warnings while still printing the tree;
-        // the JSON on stdout is what matters.
-        const e = err;
-        installedVersion = e.stdout ? parseInstalledVersion(e.stdout) : null;
+    finally {
+        // Cleanup must not mask the install result or strand the shared lock.
+        if (staging)
+            await fs.rm(staging, { recursive: true, force: true }).catch(() => undefined);
+        await release?.().catch(() => undefined);
     }
-    return { ok: true, installedVersion, output };
 }
 /** Only adopt newer stable releases; never downgrade a locally newer build. */
 export function newerStableVersion(current, candidate) {