@prestyj/cli 5.31.0 → 5.32.1

package/dist/core/goal-run-marker.d.ts

@@ -0,0 +1,32 @@
+/** How often a held marker is re-stamped. */
+export declare const GOAL_RUN_HEARTBEAT_MS = 15000;
+/** A marker not re-stamped for this long belongs to a run that is gone. */
+export declare const GOAL_RUN_STALE_MS = 60000;
+/** What the file holds. */
+export interface GoalRunMarker {
+    version: 1;
+    pid: number;
+    /** Distinguishes two holds by the same pid across a restart of the process. */
+    token: string;
+    startedAt: string;
+    heartbeatAt: string;
+}
+export declare function goalRunMarkerPath(dir: string): string;
+/** Whether a marker stands for a run still going. Pure, so it can be tested. */
+export declare function goalRunMarkerLive(marker: GoalRunMarker, now: number, isAlive?: (pid: number) => boolean): boolean;
+/** The marker in a goal folder, or null when there is none or it can't be read. */
+export declare function readGoalRunMarker(dir: string): GoalRunMarker | null;
+/** Some process (this one included) is running the goal right now. */
+export declare function goalRunLive(dir: string, now?: number): boolean;
+/**
+ * Another process is running the goal right now. What the resume checks ask:
+ * this process's own run is already known to them, and must not stop it
+ * resuming a goal it was itself cut off from.
+ */
+export declare function goalRunningElsewhere(dir: string, now?: number): boolean;
+/**
+ * Mark a goal as being worked on by this process until the returned release
+ * is called. Holds nest: two sessions on one goal (two windows) keep the
+ * marker until both let go. Releasing twice is harmless.
+ */
+export declare function holdGoalRun(goalDir: string, now?: () => Date): () => void;

package/dist/core/goal-run-marker.js

@@ -0,0 +1,178 @@
+/**
+ * Whether a goal is being worked on right now, by any process on this machine.
+ *
+ * A goal can be run by the desktop app's sidecar, by `ezcoder acp` (pew2 on
+ * the phone spawns that), or by both over a day. Each knows only its own
+ * sessions, so a goal another process was in the middle of read as cut off
+ * mid-work: its session file ends on a tool call. The goal list said
+ * "Interrupted" for a goal that was running, and opening it offered to resume
+ * it, which would start a second coordinator on the same goal.
+ *
+ * So the process running a goal says so, in a small file in the goal's
+ * `.gg` folder: its pid and a heartbeat. A reader counts it only while that
+ * pid is alive *and* the heartbeat is fresh. A crash leaves the file behind,
+ * and the heartbeat going stale (or the pid being gone) is what lets the goal
+ * read as interrupted again; the freshness check also stops a recycled pid
+ * from passing as the old run.
+ */
+import fs from "node:fs";
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+/** How often a held marker is re-stamped. */
+export const GOAL_RUN_HEARTBEAT_MS = 15_000;
+/** A marker not re-stamped for this long belongs to a run that is gone. */
+export const GOAL_RUN_STALE_MS = 60_000;
+export function goalRunMarkerPath(dir) {
+    return path.join(dir, ".ezcoder", "goal-running.json");
+}
+/** True when a process with this pid exists (EPERM: it exists, it's just not ours). */
+function processAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (err) {
+        return err.code === "EPERM";
+    }
+}
+/** Whether a marker stands for a run still going. Pure, so it can be tested. */
+export function goalRunMarkerLive(marker, now, isAlive = processAlive) {
+    const beat = Date.parse(marker.heartbeatAt);
+    if (!Number.isFinite(beat) || now - beat > GOAL_RUN_STALE_MS)
+        return false;
+    return isAlive(marker.pid);
+}
+/** The marker in a goal folder, or null when there is none or it can't be read. */
+export function readGoalRunMarker(dir) {
+    let raw;
+    try {
+        raw = fs.readFileSync(goalRunMarkerPath(dir), "utf-8");
+    }
+    catch {
+        return null;
+    }
+    try {
+        const value = JSON.parse(raw);
+        if (value.version !== 1 ||
+            typeof value.pid !== "number" ||
+            !Number.isInteger(value.pid) ||
+            value.pid <= 0 ||
+            typeof value.token !== "string" ||
+            typeof value.startedAt !== "string" ||
+            typeof value.heartbeatAt !== "string") {
+            return null;
+        }
+        return value;
+    }
+    catch {
+        return null;
+    }
+}
+/** Some process (this one included) is running the goal right now. */
+export function goalRunLive(dir, now = Date.now()) {
+    const marker = readGoalRunMarker(dir);
+    return marker !== null && goalRunMarkerLive(marker, now);
+}
+/**
+ * Another process is running the goal right now. What the resume checks ask:
+ * this process's own run is already known to them, and must not stop it
+ * resuming a goal it was itself cut off from.
+ */
+export function goalRunningElsewhere(dir, now = Date.now()) {
+    const marker = readGoalRunMarker(dir);
+    return marker !== null && marker.pid !== process.pid && goalRunMarkerLive(marker, now);
+}
+/** Live holds in this process, by resolved goal folder. */
+const holds = new Map();
+let exitHookInstalled = false;
+/** Written beside the target and renamed, so a reader never sees half a file. */
+function writeMarker(dir, marker) {
+    const file = goalRunMarkerPath(dir);
+    try {
+        fs.mkdirSync(path.dirname(file), { recursive: true });
+        const tmp = `${file}.${process.pid}.tmp`;
+        fs.writeFileSync(tmp, JSON.stringify(marker));
+        fs.renameSync(tmp, file);
+    }
+    catch {
+        // Best effort: without the file the goal just isn't shown as running
+        // elsewhere, exactly as before the marker existed. Never fail a run on it.
+    }
+}
+/** Removes the file only while it is still this hold's: another process may have taken over. */
+function removeMarker(dir, marker) {
+    const current = readGoalRunMarker(dir);
+    if (!current || current.pid !== marker.pid || current.token !== marker.token)
+        return;
+    try {
+        fs.unlinkSync(goalRunMarkerPath(dir));
+    }
+    catch {
+        // Already gone.
+    }
+}
+function installExitHook() {
+    if (exitHookInstalled)
+        return;
+    exitHookInstalled = true;
+    // A clean exit (quit, a supervisor restart) clears its markers at once
+    // instead of leaving the goal "running" until the heartbeat goes stale.
+    process.once("exit", () => {
+        for (const [dir, hold] of holds) {
+            clearInterval(hold.timer);
+            removeMarker(dir, hold.marker);
+        }
+        holds.clear();
+    });
+}
+/**
+ * Mark a goal as being worked on by this process until the returned release
+ * is called. Holds nest: two sessions on one goal (two windows) keep the
+ * marker until both let go. Releasing twice is harmless.
+ */
+export function holdGoalRun(goalDir, now = () => new Date()) {
+    const dir = path.resolve(goalDir);
+    let hold = holds.get(dir);
+    if (hold) {
+        hold.count++;
+    }
+    else {
+        const at = now().toISOString();
+        const marker = {
+            version: 1,
+            pid: process.pid,
+            token: randomUUID(),
+            startedAt: at,
+            heartbeatAt: at,
+        };
+        writeMarker(dir, marker);
+        const timer = setInterval(() => {
+            const current = holds.get(dir);
+            if (!current)
+                return;
+            current.marker = { ...current.marker, heartbeatAt: now().toISOString() };
+            writeMarker(dir, current.marker);
+        }, GOAL_RUN_HEARTBEAT_MS);
+        // Never what keeps a process alive.
+        timer.unref?.();
+        hold = { count: 1, marker, timer };
+        holds.set(dir, hold);
+        installExitHook();
+    }
+    let released = false;
+    return () => {
+        if (released)
+            return;
+        released = true;
+        const current = holds.get(dir);
+        if (!current)
+            return;
+        current.count--;
+        if (current.count > 0)
+            return;
+        clearInterval(current.timer);
+        holds.delete(dir);
+        removeMarker(dir, current.marker);
+    };
+}
+//# sourceMappingURL=goal-run-marker.js.map

package/dist/core/goal-run-marker.js.map

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

package/dist/core/goal-summary.js

@@ -5,6 +5,7 @@
  */
 import { promises as fs } from "node:fs";
 import { goalWasInterrupted } from "./goals-store.js";
+import { goalRunLive } from "./goal-run-marker.js";
 import { formatRelativeTime } from "./project-discovery.js";
 /** The kickoff/resume instruction is runtime-authored and never shown as a user bubble. */
 export const GOAL_RUNTIME_PROVENANCE = {
@@ -81,6 +82,11 @@ export async function summarizeGoal(sessions, dir, record, busy = false) {
         if (ms > lastActiveMs)
             lastActiveMs = ms;
     }
+    // `busy` only knows this process's sessions. A goal another process is
+    // running (the phone through `ezcoder acp`, or the desktop app while the
+    // phone asks) says so through its run marker; without it, a session file
+    // ending on a tool call read as "Interrupted" while the goal was working.
+    const live = busy || goalRunLive(dir);
     return {
         id: record.id,
         name: record.name,
@@ -92,10 +98,10 @@ export async function summarizeGoal(sessions, dir, record, busy = false) {
         lastActiveDisplay: formatRelativeTime(lastActiveMs),
         latestSessionPath,
         latestSessionId,
-        status: goalListStatus(record, busy, 
+        status: goalListStatus(record, live, 
         // Not working, but its last turn never finished: the app closed, or it
         // was stopped, mid-work. Workers aren't known here, only the session.
-        !busy &&
+        !live &&
             Boolean(record.startedAt) &&
             latestSessionPath !== null &&
             goalWasInterrupted(record, await lastMessages(latestSessionPath), [])),

package/dist/core/goal-summary.js.map

@@ -1 +1 @@
-{"version":3,"file":"goal-summary.js","sourceRoot":"","sources":["../../src/core/goal-summary.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAmB,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,2FAA2F;AAC3F,MAAM,CAAC,MAAM,uBAAuB,GAAsB;IACxD,MAAM,EAAE,SAAS;IACjB,IAAI,EAAE,YAAY;IAClB,UAAU,EAAE,QAAQ;CACrB,CAAC;AAyBF,yEAAyE;AACzE,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC;AAE7B;;;;GAIG;AACH,KAAK,UAAU,YAAY,CAAC,IAAY;IACtC,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,UAAU,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;YACvC,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC7C,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,GAAG,GAA+C,EAAE,CAAC;IAC3D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QACpC,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAG5B,CAAC;YACF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;gBACpD,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,8CAA8C;QAChD,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,cAAc,CAC5B,MAAkB,EAClB,IAAa,EACb,MAAM,GAAG,KAAK;IAEd,IAAI,MAAM,CAAC,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACrC,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IAC3B,IAAI,MAAM;QAAE,OAAO,aAAa,CAAC;IACjC,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC;AAChD,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAwB,EACxB,GAAW,EACX,MAAkB,EAClB,IAAI,GAAG,KAAK;IAEZ,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IAC5D,IAAI,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,iBAAiB,GAAkB,IAAI,CAAC;IAC5C,IAAI,eAAe,GAAkB,IAAI,CAAC;IAC1C,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC;IAClB,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;QAC7B,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,EAAE,GAAG,QAAQ,EAAE,CAAC;YAClB,QAAQ,GAAG,EAAE,CAAC;YACd,iBAAiB,GAAG,CAAC,CAAC,IAAI,CAAC;YAC3B,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC;QACzB,CAAC;QACD,IAAI,EAAE,GAAG,YAAY;YAAE,YAAY,GAAG,EAAE,CAAC;IAC3C,CAAC;IACD,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI,EAAE,GAAG;QACT,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,YAAY;QACZ,iBAAiB,EAAE,kBAAkB,CAAC,YAAY,CAAC;QACnD,iBAAiB;QACjB,eAAe;QACf,MAAM,EAAE,cAAc,CACpB,MAAM,EACN,IAAI;QACJ,uEAAuE;QACvE,sEAAsE;QACtE,CAAC,IAAI;YACH,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;YACzB,iBAAiB,KAAK,IAAI;YAC1B,kBAAkB,CAAC,MAAM,EAAE,MAAM,YAAY,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CACxE;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"goal-summary.js","sourceRoot":"","sources":["../../src/core/goal-summary.ts"],"names":[],"mappings":"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"}

package/dist/core/idle-wake.d.ts

@@ -0,0 +1,62 @@
+/**
+ * Wake an idle session when its own background work needs attention.
+ *
+ * Background alerts — a build or CI watcher that failed, a task that exited
+ * non-zero, a child agent that finished — ride the steering path, which only
+ * exists while a run is live. Once the agent has ended its turn, an alert sat
+ * in the queue until the user happened to send another message (measured: 8 of
+ * 483 runs began with a status update that had been waiting for exactly that).
+ *
+ * This starts a run for the alert instead, inside hard limits:
+ *
+ * - Never while anything else could deliver it: a live run, a run being
+ *   claimed, an autopilot cycle. The alert waits for that run's next steering
+ *   boundary instead, and is retried here if the run ends without draining it.
+ * - Never while the user is deciding something (a plan awaiting review).
+ * - Never after the user pressed Stop, until they send another message. Stop
+ *   means "stop acting on your own", and a background exit is not a reason to
+ *   override it.
+ * - At most {@link DEFAULT_MAX_WAKES_PER_PROMPT} wakes per user message, so a
+ *   flapping task cannot keep the agent (and the bill) running unattended.
+ *
+ * Pure policy over injected callbacks; the host owns the run itself.
+ */
+/** Batch alerts that land together (a failure line, then the exit) into one run. */
+export declare const DEFAULT_IDLE_WAKE_DEBOUNCE_MS = 2000;
+/** Unattended wakes allowed per human prompt. */
+export declare const DEFAULT_MAX_WAKES_PER_PROMPT = 2;
+export type IdleWakeSkip = "stopped" | "budget" | "blocked" | "nothing-pending";
+export interface IdleWakeDeps {
+    /** A run, a run claim, or an autopilot cycle is live and will deliver it. */
+    isBusy: () => boolean;
+    /** The user is deciding something (a plan awaiting review). */
+    isBlocked: () => boolean;
+    /** An urgent alert is still waiting to be delivered. */
+    hasPendingAlert: () => boolean;
+    /** Monotonic count of human prompts; budgets and Stop reset when it moves. */
+    humanPromptSeq: () => number;
+    /** Start the wake run; resolves when it has settled. */
+    start: () => Promise<void>;
+    /** Observability hook for skipped wakes. */
+    onSkip?: (reason: IdleWakeSkip) => void;
+    debounceMs?: number;
+    maxWakesPerPrompt?: number;
+}
+export declare class IdleWakeController {
+    private readonly deps;
+    private timer;
+    private budgetSeq;
+    private wakesUsed;
+    private stoppedAtSeq;
+    private starting;
+    private disposed;
+    constructor(deps: IdleWakeDeps);
+    /** An urgent alert was queued. Debounced; safe to call often. */
+    trigger(): void;
+    /** The user pressed Stop: no unattended wakes until their next message. */
+    noteStop(): void;
+    dispose(): void;
+    private cancelTimer;
+    private fire;
+    private skip;
+}

package/dist/core/idle-wake.js

@@ -0,0 +1,103 @@
+/**
+ * Wake an idle session when its own background work needs attention.
+ *
+ * Background alerts — a build or CI watcher that failed, a task that exited
+ * non-zero, a child agent that finished — ride the steering path, which only
+ * exists while a run is live. Once the agent has ended its turn, an alert sat
+ * in the queue until the user happened to send another message (measured: 8 of
+ * 483 runs began with a status update that had been waiting for exactly that).
+ *
+ * This starts a run for the alert instead, inside hard limits:
+ *
+ * - Never while anything else could deliver it: a live run, a run being
+ *   claimed, an autopilot cycle. The alert waits for that run's next steering
+ *   boundary instead, and is retried here if the run ends without draining it.
+ * - Never while the user is deciding something (a plan awaiting review).
+ * - Never after the user pressed Stop, until they send another message. Stop
+ *   means "stop acting on your own", and a background exit is not a reason to
+ *   override it.
+ * - At most {@link DEFAULT_MAX_WAKES_PER_PROMPT} wakes per user message, so a
+ *   flapping task cannot keep the agent (and the bill) running unattended.
+ *
+ * Pure policy over injected callbacks; the host owns the run itself.
+ */
+/** Batch alerts that land together (a failure line, then the exit) into one run. */
+export const DEFAULT_IDLE_WAKE_DEBOUNCE_MS = 2_000;
+/** Unattended wakes allowed per human prompt. */
+export const DEFAULT_MAX_WAKES_PER_PROMPT = 2;
+export class IdleWakeController {
+    deps;
+    timer = null;
+    budgetSeq = -1;
+    wakesUsed = 0;
+    stoppedAtSeq = null;
+    starting = false;
+    disposed = false;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    /** An urgent alert was queued. Debounced; safe to call often. */
+    trigger() {
+        if (this.disposed || this.timer !== null)
+            return;
+        this.timer = setTimeout(() => {
+            this.timer = null;
+            void this.fire();
+        }, this.deps.debounceMs ?? DEFAULT_IDLE_WAKE_DEBOUNCE_MS);
+        this.timer.unref?.();
+    }
+    /** The user pressed Stop: no unattended wakes until their next message. */
+    noteStop() {
+        this.stoppedAtSeq = this.deps.humanPromptSeq();
+        this.cancelTimer();
+    }
+    dispose() {
+        this.disposed = true;
+        this.cancelTimer();
+    }
+    cancelTimer() {
+        if (this.timer !== null)
+            clearTimeout(this.timer);
+        this.timer = null;
+    }
+    async fire() {
+        if (this.disposed || this.starting)
+            return;
+        if (!this.deps.hasPendingAlert())
+            return this.skip("nothing-pending");
+        const seq = this.deps.humanPromptSeq();
+        if (this.stoppedAtSeq === seq)
+            return this.skip("stopped");
+        if (seq !== this.budgetSeq) {
+            this.budgetSeq = seq;
+            this.wakesUsed = 0;
+        }
+        if (this.wakesUsed >= (this.deps.maxWakesPerPrompt ?? DEFAULT_MAX_WAKES_PER_PROMPT)) {
+            return this.skip("budget");
+        }
+        if (this.deps.isBusy()) {
+            // The live run should drain it at its next steering boundary. If that
+            // run is already past its last boundary, the alert would strand — so
+            // look again shortly rather than trusting the run to have taken it.
+            this.trigger();
+            return;
+        }
+        if (this.deps.isBlocked())
+            return this.skip("blocked");
+        this.wakesUsed += 1;
+        this.starting = true;
+        try {
+            await this.deps.start();
+        }
+        finally {
+            this.starting = false;
+        }
+        // An alert that landed after the wake run's last steering boundary.
+        if (this.deps.hasPendingAlert())
+            this.trigger();
+    }
+    skip(reason) {
+        this.deps.onSkip?.(reason);
+    }
+}
+//# sourceMappingURL=idle-wake.js.map

package/dist/core/idle-wake.js.map

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

package/dist/core/injection-detect.d.ts

@@ -27,7 +27,7 @@ export declare function normalizeForDetection(text: string): string;
 /** Scan untrusted text; `null` when nothing instruction-like was found. */
 export declare function detectInjection(text: string): InjectionHit | null;
 /** Tools whose output is attacker-controllable content from outside the repo. */
-export declare function isUntrustedTool(name: string): boolean;
+export declare function isUntrustedTool(name: string, args?: Record<string, unknown>): boolean;
 export declare function injectionWarning(kind: string): string;
 /**
  * `transformToolResult` hook body: for untrusted tools, append the warning
@@ -35,4 +35,5 @@ export declare function injectionWarning(kind: string): string;
  */
 export declare function flagUntrustedToolResult(call: {
     name: string;
+    args?: Record<string, unknown>;
 }, content: ToolResultContent): ToolResultContent;

package/dist/core/injection-detect.js

@@ -15,7 +15,7 @@
  * attacker would use. Mere mentions of the topic ("prompt injection",
  * "system prompt") do not hit.
  */
-const SCAN_WINDOW = 200_000;
+const SCAN_WINDOW = 100_000;
 const MAX_BLOBS = 64;
 const MAX_BLOB_CHARS = 16_384;
 /** Zero-width, joiners, bidi controls/isolates, soft hyphen, BOM, tag chars. */
@@ -146,7 +146,7 @@ const RULES = [
         kind: "fake role/tool marker",
         re: new RegExp(String.raw `<\|im_start\|>\s*(?:system|assistant)|<\|(?:start_header_id|eot_id|endoftext|system)\|>` +
             String.raw `|</?(?:tool_result|function_results|function_calls|system-reminder|system_prompt)>` +
-            String.raw `|(?:^|\n)[ \t]*\[(?:system|/?inst)\][ \t]*(?:\n|$|[a-z])`),
+            String.raw `|(?:^|\n)[ \t]*\[(?:system|/?inst)\][ \t]*\r?(?:\n|$|[a-z])`),
     },
 ];
 /** Encoded blobs: long base64 or hex runs. */
@@ -205,8 +205,17 @@ export function detectInjection(text) {
     }
     return scanBlobs(window.replace(INVISIBLE, ""));
 }
+/**
+ * Bash commands whose output is third-party text: issue/PR bodies and
+ * comments (`gh`, `glab`) and fetched web pages (`curl`/`wget`).
+ */
+const UNTRUSTED_BASH = /(?:^|[\s;&|(])(?:gh\s+(?:issue\s+(?:view|list)|pr\s+(?:view|diff|list)|api|release\s+view|search)\b|glab\s|curl\s|wget\s)/;
 /** Tools whose output is attacker-controllable content from outside the repo. */
-export function isUntrustedTool(name) {
+export function isUntrustedTool(name, args) {
+    if (name === "bash") {
+        const command = args?.command;
+        return typeof command === "string" && UNTRUSTED_BASH.test(command);
+    }
     return name === "web_fetch" || name === "web_search" || name.startsWith("mcp__");
 }
 export function injectionWarning(kind) {
@@ -217,7 +226,7 @@ export function injectionWarning(kind) {
  * line on a hit. Content is never altered otherwise.
  */
 export function flagUntrustedToolResult(call, content) {
-    if (!isUntrustedTool(call.name))
+    if (!isUntrustedTool(call.name, call.args))
         return content;
     if (typeof content === "string") {
         const hit = detectInjection(content);

package/dist/core/injection-detect.js.map

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

package/dist/core/installed-threats.d.ts

@@ -0,0 +1,23 @@
+import type { BlockedPackage } from "./shell-threats.js";
+import { type PackageCheckOptions } from "./package-threats.js";
+export interface InstalledThreat {
+    /** Stable id: lockfile path + flagged items (a fix or new hit is a new key). */
+    key: string;
+    /** Absolute lockfile path. */
+    file: string;
+    /** Flagged `name@version (IDs)` items. */
+    packages: string[];
+    /** The same, structured, for the project's "don't install" list. */
+    blocked: BlockedPackage[];
+    /** One plain line for the user. */
+    message: string;
+    /** What the agent is told to do. */
+    agentText: string;
+}
+/** Lockfile path → mtime, for "did a run change a lockfile?" checks. */
+export type LockfileStamp = Map<string, number>;
+/** Which known lockfiles exist in `dir`, with their mtimes. Missing ones are skipped. */
+export declare function stampProjectLockfiles(dir: string): Promise<LockfileStamp>;
+export declare function sameStamp(a: LockfileStamp, b: LockfileStamp): boolean;
+/** Check every known lockfile in `dir`. Clean or nothing to check → []. */
+export declare function scanProjectLockfiles(dir: string, options?: PackageCheckOptions): Promise<InstalledThreat[]>;

package/dist/core/installed-threats.js

@@ -0,0 +1,71 @@
+/**
+ * Already-installed packages: check a project's existing lockfiles against the
+ * malware data (local daily feed + one batched OSV lookup per lockfile), so a
+ * package flagged AFTER it was installed is still found. Runs in the
+ * background (session start, after each daily feed update, after a run that
+ * changed a lockfile); never on a command's critical path, never a prompt.
+ *
+ * Cost: one `stat` per known lockfile name; a lockfile is only read when it
+ * exists, and its verdict is cached by content hash and re-asked of OSV at most
+ * once a day (core/package-threats.ts).
+ */
+import fsp from "node:fs/promises";
+import path from "node:path";
+import { checkLockfileMalware, PROJECT_LOCKFILES, } from "./package-threats.js";
+/** Which known lockfiles exist in `dir`, with their mtimes. Missing ones are skipped. */
+export async function stampProjectLockfiles(dir) {
+    const stamp = new Map();
+    await Promise.all(PROJECT_LOCKFILES.map(async (lock) => {
+        const file = path.join(dir, lock.file);
+        try {
+            const st = await fsp.stat(file);
+            if (st.isFile())
+                stamp.set(file, st.mtimeMs);
+        }
+        catch {
+            // Not there: nothing to check.
+        }
+    }));
+    return stamp;
+}
+export function sameStamp(a, b) {
+    if (a.size !== b.size)
+        return false;
+    for (const [file, mtime] of a)
+        if (b.get(file) !== mtime)
+            return false;
+    return true;
+}
+function describe(file, dir, packages, blocked) {
+    const rel = path.relative(dir, file) || path.basename(file);
+    const list = packages.slice(0, 5).join(", ") +
+        (packages.length > 5 ? ` and ${packages.length - 5} more` : "");
+    return {
+        key: `${file}\0${[...packages].sort().join("\0")}`,
+        file,
+        packages,
+        blocked,
+        message: `This project uses a package now known to be infected: ${list} (in ${rel}). ` +
+            `The agent has been told to replace it.`,
+        agentText: `Security notice: ${rel} in this project pins a package that is now known to be malware: ${list}. ` +
+            `Before running any of the project's code, replace it: update the dependency to a clean version ` +
+            `(the release before the flagged one, or a newer fixed one), regenerate the lockfile and reinstall. ` +
+            `Then tell the user in one plain sentence what you changed. Do not run the flagged version.`,
+    };
+}
+/** Check every known lockfile in `dir`. Clean or nothing to check → []. */
+export async function scanProjectLockfiles(dir, options = {}) {
+    const stamp = await stampProjectLockfiles(dir);
+    if (stamp.size === 0)
+        return [];
+    const found = await Promise.all(PROJECT_LOCKFILES.filter((lock) => stamp.has(path.join(dir, lock.file))).map(async (lock) => {
+        const threats = await checkLockfileMalware(lock, dir, options);
+        const packages = threats.flatMap((t) => t.packages ?? []);
+        const blocked = threats.flatMap((t) => t.blocked ?? []);
+        return packages.length > 0
+            ? describe(path.join(dir, lock.file), dir, packages, blocked)
+            : null;
+    }));
+    return found.filter((t) => t !== null);
+}
+//# sourceMappingURL=installed-threats.js.map

package/dist/core/installed-threats.js.map

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