pim-agent 0.12.1 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pim-agent",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "description": "A batteries-included distro of Pi, accessible in your terminal, browser and Telegram.",
   "license": "MIT",
   "type": "module",
@@ -66,6 +66,7 @@
     "@types/bun": "latest",
     "happy-dom": "^20.14.0",
     "highlight.js": "^11.12.0",
+    "mermaid": "^12.0.0",
     "oxfmt": "0.67.0",
     "oxlint": "^1.82.0",
     "solid-js": "^2.0.0-rc.7",
@@ -75,8 +76,8 @@
     "vite": "^8.2.2"
   },
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "0.87.1",
-    "@earendil-works/pi-server": "0.87.1",
+    "@earendil-works/pi-coding-agent": "1.0.0",
+    "@earendil-works/pi-server": "1.0.0",
     "diff": "^9.0.0",
     "fzf": "^0.5.2",
     "grammy": "^1.46.0",

package/packages/core/src/attachments/AttachmentStore.ts

@@ -3,36 +3,32 @@ import { basename, extname } from "node:path";
 
 import { SafePath } from "../shared/SafePath";
 
-/** A file the store has taken a copy of, under a name it chose. */
 export type StoredFile = {
-  /** Names the file within its scope; what a client sends back on a prompt. */
+  /** Unique within its scope. */
   readonly id: string;
-  /** Absolute path on the server. The only path the agent is ever told. */
+  /** Absolute path on the server. */
   readonly path: string;
   readonly mimeType: string;
 };
 
-/** A file that now lives on the machine the agent runs on. */
 export type StoredAttachment = StoredFile & {
-  /** Present only for images small enough to inline into the prompt. */
+  /** Set only for images up to IMAGE_BYTES_LIMIT. */
   readonly imageBase64: string | undefined;
 };
 
 export type AttachmentInput = {
   readonly bytes: ArrayBuffer;
   readonly mimeType: string;
-  /** Client-supplied filename. Only its basename is ever used. */
+  /** Client-supplied filename; only its extension is used. */
   readonly name?: string;
-  /** Stem of the stored filename; a random one when omitted. */
+  /** Defaults to a random UUID. */
   readonly stem?: string;
-  /** Extension to fall back on when `name` carries none. */
+  /** Used when `name` has no extension. */
   readonly ext?: string;
 };
 
-/** Above this, an image is referenced by path instead of inlined. */
 const IMAGE_BYTES_LIMIT = 4 * 1024 * 1024;
 
-/** Materialises client bytes onto the server's filesystem; the agent is only ever told a server path. */
 export class AttachmentStore {
   public constructor(private readonly root: string) {}
 
@@ -59,12 +55,11 @@ export class AttachmentStore {
     };
   }
 
-  /** Copies a file already on the agent's disk into the store so it can be served. */
   public async storeFile(scope: string, source: string): Promise<StoredFile> {
     const file = Bun.file(source);
     const name = basename(source);
     const ext = extname(name);
-    // Keep `basename(name, ext)`: a regex strip leaves a dotfile like `.bashrc` with no name.
+    // `basename(name, ext)` keeps dotfiles like `.bashrc` named.
     const { id, path } = await this.place(scope, basename(name, ext), ext);
     await Bun.write(path, file);
     return { id, path, mimeType: file.type || "application/octet-stream" };
@@ -87,7 +82,7 @@ export class AttachmentStore {
     return SafePath.contain(this.root, SafePath.safeName(scope));
   }
 
-  /** Where `store` put this id; the id is re-sanitised, so it can never name a file outside its scope. */
+  /** The id is re-sanitised, so it cannot escape its scope. */
   public locate(scope: string, id: string): string {
     return SafePath.contain(this.scopeDir(scope), SafePath.safeName(id));
   }

package/packages/core/src/attachments/Attachments.ts

@@ -4,24 +4,22 @@ import { basename, extname } from "node:path";
 import type { StoredAttachment } from "./AttachmentStore";
 
 export type AttachmentPrompt = {
-  /** One line per file, appended to the prompt text. */
   readonly lines: readonly string[];
   readonly images: NonNullable<PromptOptions["images"]>;
 };
 
-/** One file a prompt carried, read back out of the text that carried it. */
 export type PromptAttachment = {
   readonly path: string;
   readonly isImage: boolean;
 };
 
 export type ParsedPrompt = {
-  /** The prompt with the marker lines removed: what a person actually said. */
+  /** The prompt with the marker lines removed. */
   readonly text: string;
   readonly files: readonly PromptAttachment[];
 };
 
-// Must keep matching every spelling `render` has ever produced: old session files still carry them.
+// Old session files carry older spellings; keep matching them.
 const MARKER = /^\[(image )?attachment:\s*(.+)]$/i;
 
 const STAMP = /-\d{10,}$/;

package/packages/core/src/extensions/CoreExtensions.ts

@@ -26,7 +26,7 @@ export type PimInlineExtension = {
   readonly factory: ExtensionFactory;
 };
 
-// Enumerated, never globbed: the published tarball must not depend on a directory scan.
+// Listed explicitly so the published package needs no directory scan.
 function list(surface?: Surface): readonly PimInlineExtension[] {
   return [
     { name: "apply-patch", factory: applyPatch },

package/packages/core/src/extensions/apply-patch/coordinator.ts

@@ -1,7 +1,7 @@
 const EDIT_TOOL = "edit";
 const APPLY_PATCH_TOOL = "apply_patch";
 
-/** Reconcile the single `edit`/`apply_patch` slot; returns `active` by reference when nothing changes. */
+/** Keeps at most one of `edit`/`apply_patch` active. Returns `active` itself when nothing changes. */
 export function computeActiveTools(
   available: readonly string[],
   active: readonly string[],

package/packages/core/src/extensions/apply-patch/executor.ts

@@ -164,11 +164,7 @@ async function planUpdate(
 ): Promise<PlannedAction> {
   const absoluteSource = Paths.resolve(hunk.path, cwd);
   const metadata = await statPatchTarget(absoluteSource, hunk.path, "update");
-  const canonicalSource = await realpathPatchTarget(
-    absoluteSource,
-    hunk.path,
-    "update"
-  );
+  const canonicalSource = await realpathUpdateTarget(absoluteSource, hunk.path);
   if (metadata.size > MAX_UPDATE_BYTES) {
     throw new Error(
       `Cannot update ${hunk.path}: file is too large (${metadata.size} bytes, max ${MAX_UPDATE_BYTES}). Use bash or another purpose-built tool for large-file edits.`
@@ -257,15 +253,14 @@ async function statPatchTarget(
   return metadata;
 }
 
-async function realpathPatchTarget(
+async function realpathUpdateTarget(
   absolutePath: string,
-  displayPath: string,
-  operation: "delete" | "update"
+  displayPath: string
 ): Promise<string> {
   try {
     return await realpath(absolutePath);
   } catch (error) {
-    throw new Error(formatStatFailure(displayPath, operation, error));
+    throw new Error(formatStatFailure(displayPath, "update", error));
   }
 }
 
@@ -275,23 +270,21 @@ function formatStatFailure(
   error: unknown
 ): string {
   const code = FsErrors.code(error);
-  if (operation === "delete") {
-    if (code === "ENOENT") {
-      return `Failed to delete file ${displayPath}: file does not exist. Use glob to locate the file, or omit this delete hunk.`;
-    }
-    if (code === "EACCES" || code === "EPERM") {
-      return `Failed to delete file ${displayPath}: permission denied.`;
-    }
-    return `Failed to delete file ${displayPath}: ${errorDetail(error)}.`;
-  }
-
+  const prefix =
+    operation === "delete"
+      ? `Failed to delete file ${displayPath}`
+      : `Failed to read file to update ${displayPath}`;
   if (code === "ENOENT") {
-    return `Failed to read file to update ${displayPath}: file does not exist. Use *** Add File to create a new file, or use glob to locate the existing file.`;
+    const hint =
+      operation === "delete"
+        ? "Use glob to locate the file, or omit this delete hunk."
+        : "Use *** Add File to create a new file, or use glob to locate the existing file.";
+    return `${prefix}: file does not exist. ${hint}`;
   }
   if (code === "EACCES" || code === "EPERM") {
-    return `Failed to read file to update ${displayPath}: permission denied.`;
+    return `${prefix}: permission denied.`;
   }
-  return `Failed to read file to update ${displayPath}: ${errorDetail(error)}.`;
+  return `${prefix}: ${errorDetail(error)}.`;
 }
 
 function errorDetail(error: unknown): string {
@@ -352,6 +345,7 @@ function applyChunks(
     readonly start: number;
     readonly oldLen: number;
     readonly newLines: readonly string[];
+    readonly order: number;
   }> = [];
   let lineIndex = 0;
 
@@ -373,11 +367,12 @@ function applyChunks(
     }
 
     if (chunk.oldLines.length === 0) {
-      const insertionIdx = originalLines.length;
       replacements.push({
-        start: insertionIdx,
+        start:
+          chunk.changeContext === undefined ? originalLines.length : lineIndex,
         oldLen: 0,
         newLines: chunk.newLines,
+        order: replacements.length,
       });
       continue;
     }
@@ -416,11 +411,12 @@ function applyChunks(
       start: found[0]!,
       oldLen: pattern.length,
       newLines: newSlice,
+      order: replacements.length,
     });
     lineIndex = found[0]! + pattern.length;
   }
 
-  replacements.sort((a, b) => a.start - b.start);
+  replacements.sort((a, b) => a.start - b.start || a.order - b.order);
 
   const lines = [...originalLines];
   for (const { start, oldLen, newLines } of replacements.reverse()) {

package/packages/core/src/extensions/apply-patch/matcher.ts

@@ -4,7 +4,7 @@ const MATCHERS: ReadonlyArray<(a: string, b: string) => boolean> = [
   (a, b) => a.trim() === b.trim(),
 ];
 
-/** Locate `pattern` in `lines` at or after `start`, relaxing whitespace over three passes; `eof` searches flush against the end. */
+/** Match starts of `pattern` at or after `start`, relaxing whitespace each pass. `eof` only tries the last possible position. */
 export function seekSequenceMatches(
   lines: readonly string[],
   pattern: readonly string[],

package/packages/core/src/extensions/apply-patch/model.ts

@@ -4,8 +4,8 @@ type ModelLike = {
   readonly id?: string;
 };
 
-// Never match a GPT-named non-OpenAI model (`eleutherai/gpt-neo`): a false positive hands it a tool it was not trained on.
-function isGptModel(model: ModelLike | undefined): boolean {
+// Must not match GPT-named non-OpenAI models such as `eleutherai/gpt-neo`.
+export function prefersApplyPatch(model: ModelLike | undefined): boolean {
   const provider = (model?.provider ?? "").toLowerCase();
   const api = (model?.api ?? "").toLowerCase();
   const id = (model?.id ?? "").toLowerCase();
@@ -22,7 +22,3 @@ function isGptModel(model: ModelLike | undefined): boolean {
       id.includes("gpt"))
   );
 }
-
-export function prefersApplyPatch(model: ModelLike | undefined): boolean {
-  return isGptModel(model);
-}

package/packages/core/src/extensions/apply-patch/parser.ts

@@ -12,25 +12,18 @@ const END_PATCH_MARKER = "*** End Patch";
 const EOF_MARKER = "*** End of File";
 const CHANGE_CONTEXT_MARKER = "@@ ";
 const EMPTY_CHANGE_CONTEXT_MARKER = "@@";
+const EMPTY_CHUNK =
+  "Update hunk does not contain any context, added, or removed lines. Include at least one line starting with ' ', '+', or '-'.";
 const MOVE_DESTINATION_REQUIRED =
   "Invalid *** Move to directive: destination path is required.";
 
-type ParseErrorDetails =
-  | { readonly type: "patch"; readonly message: string }
-  | {
-      readonly type: "hunk";
-      readonly message: string;
-      readonly lineNumber: number;
-    };
+// Matches Codex's ParseError text byte for byte; GPT models recover from it.
+function patchError(message: string): Error {
+  return new Error(`invalid patch: ${message}`);
+}
 
-// Keep these formats byte-identical to Codex's ParseError Display; GPT models recover from them.
-function formatParseError(error: ParseErrorDetails): string {
-  switch (error.type) {
-    case "patch":
-      return `invalid patch: ${error.message}`;
-    case "hunk":
-      return `invalid hunk at line ${error.lineNumber}, ${error.message}`;
-  }
+function hunkError(lineNumber: number, message: string): Error {
+  return new Error(`invalid hunk at line ${lineNumber}, ${message}`);
 }
 
 export function parsePatch(text: string): Patch {
@@ -53,26 +46,15 @@ export function parsePatch(text: string): Patch {
 }
 
 function checkBoundaries(lines: readonly string[]): void {
-  const first = lines[0]?.trim();
-  const last = lines.at(-1)?.trim();
-
-  if (first === undefined || !lines[0]!.trim().startsWith(BEGIN_PATCH_MARKER)) {
-    throw new Error(
-      formatParseError({
-        type: "patch",
-        message:
-          "The first line of the patch must be '*** Begin Patch'. Do not include Markdown fences, prose, or shell heredoc text before it.",
-      })
+  if (!lines[0]!.trim().startsWith(BEGIN_PATCH_MARKER)) {
+    throw patchError(
+      "The first line of the patch must be '*** Begin Patch'. Do not include Markdown fences, prose, or shell heredoc text before it."
     );
   }
 
-  if (last !== END_PATCH_MARKER) {
-    throw new Error(
-      formatParseError({
-        type: "patch",
-        message:
-          "The last line of the patch must be '*** End Patch'. Do not include Markdown fences or trailing prose after it.",
-      })
+  if (lines.at(-1)!.trim() !== END_PATCH_MARKER) {
+    throw patchError(
+      "The last line of the patch must be '*** End Patch'. Do not include Markdown fences or trailing prose after it."
     );
   }
 }
@@ -98,15 +80,11 @@ function parseOneHunk(
     return parseUpdateHunk(lines, lineNumber, updatePath);
   }
 
-  throw new Error(
-    formatParseError({
-      type: "hunk",
-      lineNumber,
-      message:
-        `'${firstLine}' is not a valid hunk header. ` +
-        "Valid hunk headers: '*** Add File: {path}', '*** Delete File: {path}', '*** Update File: {path}'. " +
-        "Do not use unified-diff file headers like '---' or '+++' as hunk headers.",
-    })
+  throw hunkError(
+    lineNumber,
+    `'${firstLine}' is not a valid hunk header. ` +
+      "Valid hunk headers: '*** Add File: {path}', '*** Delete File: {path}', '*** Update File: {path}'. " +
+      "Do not use unified-diff file headers like '---' or '+++' as hunk headers."
   );
 }
 
@@ -126,17 +104,10 @@ function parseAddHunk(
     }
   }
   const nextLine = lines[consumed];
-  if (
-    nextLine !== undefined &&
-    !isHunkHeader(nextLine) &&
-    !nextLine.trim().startsWith("*")
-  ) {
-    throw new Error(
-      formatParseError({
-        type: "hunk",
-        lineNumber: lineNumber + consumed,
-        message: `Invalid Add File body: '${nextLine}' must start with '+'. Added file content lines must start with '+'.`,
-      })
+  if (nextLine !== undefined && !nextLine.trim().startsWith("*")) {
+    throw hunkError(
+      lineNumber + consumed,
+      `Invalid Add File body: '${nextLine}' must start with '+'. Added file content lines must start with '+'.`
     );
   }
   return {
@@ -151,17 +122,10 @@ function parseDeleteHunk(
   deletePath: string
 ): { readonly hunk: Hunk; readonly consumed: number } {
   const nextLine = lines[1];
-  if (
-    nextLine !== undefined &&
-    !isHunkHeader(nextLine) &&
-    !nextLine.trim().startsWith("*")
-  ) {
-    throw new Error(
-      formatParseError({
-        type: "hunk",
-        lineNumber: lineNumber + 1,
-        message: `Delete File hunks must not contain content lines, got: '${nextLine}'.`,
-      })
+  if (nextLine !== undefined && !nextLine.trim().startsWith("*")) {
+    throw hunkError(
+      lineNumber + 1,
+      `Delete File hunks must not contain content lines, got: '${nextLine}'.`
     );
   }
   return {
@@ -182,46 +146,23 @@ function parseUpdateHunk(
   const moveLine = remaining[0]?.trim();
   if (moveLine?.startsWith(MOVE_TO_MARKER)) {
     const rawMovePath = moveLine.slice(MOVE_TO_MARKER.length);
-    if (rawMovePath.length === 0) {
-      throw new Error(
-        formatParseError({
-          type: "hunk",
-          lineNumber: lineNumber + consumed,
-          message: MOVE_DESTINATION_REQUIRED,
-        })
-      );
-    }
-    if (!rawMovePath.startsWith(" ")) {
-      throw new Error(
-        formatParseError({
-          type: "hunk",
-          lineNumber: lineNumber + consumed,
-          message: `Invalid *** Move to directive: use '*** Move to: {path}'.`,
-        })
+    if (rawMovePath.length > 0 && !rawMovePath.startsWith(" ")) {
+      throw hunkError(
+        lineNumber + consumed,
+        "Invalid *** Move to directive: use '*** Move to: {path}'."
       );
     }
     if (cleanPath(rawMovePath).length === 0) {
-      throw new Error(
-        formatParseError({
-          type: "hunk",
-          lineNumber: lineNumber + consumed,
-          message: MOVE_DESTINATION_REQUIRED,
-        })
-      );
+      throw hunkError(lineNumber + consumed, MOVE_DESTINATION_REQUIRED);
     }
-    movePath = rawMovePath;
-  } else if (moveLine?.startsWith("*** Move")) {
-    throw new Error(
-      formatParseError({
-        type: "hunk",
-        lineNumber: lineNumber + consumed,
-        message: `Invalid move directive '${moveLine}'. Use '*** Move to: {path}'.`,
-      })
-    );
-  }
-  if (movePath !== undefined) {
+    movePath = cleanPath(rawMovePath);
     remaining = remaining.slice(1);
     consumed += 1;
+  } else if (moveLine?.startsWith("*** Move")) {
+    throw hunkError(
+      lineNumber + consumed,
+      `Invalid move directive '${moveLine}'. Use '*** Move to: {path}'.`
+    );
   }
 
   const chunks: UpdateChunk[] = [];
@@ -246,12 +187,9 @@ function parseUpdateHunk(
   }
 
   if (chunks.length === 0 && movePath === undefined) {
-    throw new Error(
-      formatParseError({
-        type: "hunk",
-        lineNumber,
-        message: `Update file hunk for path '${cleanPath(updatePath)}' is empty. Include @@ plus at least one context, added, or removed line, or add *** Move to for a pure rename.`,
-      })
+    throw hunkError(
+      lineNumber,
+      `Update file hunk for path '${cleanPath(updatePath)}' is empty. Include @@ plus at least one context, added, or removed line, or add *** Move to for a pure rename.`
     );
   }
 
@@ -259,7 +197,7 @@ function parseUpdateHunk(
     hunk: {
       kind: "update",
       path: cleanPath(updatePath),
-      movePath: movePath === undefined ? undefined : cleanPath(movePath),
+      movePath,
       chunks,
     },
     consumed,
@@ -271,41 +209,21 @@ function parseUpdateChunk(
   lineNumber: number,
   allowMissingContext: boolean
 ): { readonly chunk: UpdateChunk; readonly consumed: number } {
-  let changeContext: string | undefined;
-  let startIndex: number;
-
-  if (lines[0] === EMPTY_CHANGE_CONTEXT_MARKER) {
-    changeContext = undefined;
-    startIndex = 1;
-  } else {
-    const ctx = stripPrefix(lines[0]!, CHANGE_CONTEXT_MARKER);
-    if (ctx !== undefined) {
-      changeContext = ctx;
-      startIndex = 1;
-    } else {
-      if (!allowMissingContext) {
-        throw new Error(
-          formatParseError({
-            type: "hunk",
-            lineNumber,
-            message: `Expected update hunk to start with a @@ context marker, got: '${lines[0]}'. Start each additional edit chunk with @@ or @@ followed by nearby context.`,
-          })
-        );
-      }
-      changeContext = undefined;
-      startIndex = 0;
-    }
+  const first = lines[0]!;
+  const hasMarker =
+    first === EMPTY_CHANGE_CONTEXT_MARKER ||
+    first.startsWith(CHANGE_CONTEXT_MARKER);
+  if (!hasMarker && !allowMissingContext) {
+    throw hunkError(
+      lineNumber,
+      `Expected update hunk to start with a @@ context marker, got: '${first}'. Start each additional edit chunk with @@ or @@ followed by nearby context.`
+    );
   }
+  const changeContext = stripPrefix(first, CHANGE_CONTEXT_MARKER);
+  const startIndex = hasMarker ? 1 : 0;
 
   if (startIndex >= lines.length) {
-    throw new Error(
-      formatParseError({
-        type: "hunk",
-        lineNumber,
-        message:
-          "Update hunk does not contain any context, added, or removed lines. Include at least one line starting with ' ', '+', or '-'.",
-      })
-    );
+    throw hunkError(lineNumber, EMPTY_CHUNK);
   }
 
   const oldLines: string[] = [];
@@ -316,14 +234,7 @@ function parseUpdateChunk(
   for (const line of lines.slice(startIndex)) {
     if (line === EOF_MARKER) {
       if (parsed === 0) {
-        throw new Error(
-          formatParseError({
-            type: "hunk",
-            lineNumber,
-            message:
-              "Update hunk does not contain any context, added, or removed lines. Include at least one line starting with ' ', '+', or '-'.",
-          })
-        );
+        throw hunkError(lineNumber, EMPTY_CHUNK);
       }
       isEndOfFile = true;
       parsed += 1;
@@ -343,15 +254,11 @@ function parseUpdateChunk(
       oldLines.push(line.slice(1));
     } else {
       if (parsed === 0) {
-        throw new Error(
-          formatParseError({
-            type: "hunk",
-            lineNumber,
-            message:
-              `Unexpected line found in update hunk: '${line}'. ` +
-              "Every line should start with ' ' (context line), '+' (added line), or '-' (removed line). " +
-              "Unchanged context lines must be prefixed with a single space.",
-          })
+        throw hunkError(
+          lineNumber,
+          `Unexpected line found in update hunk: '${line}'. ` +
+            "Every line should start with ' ' (context line), '+' (added line), or '-' (removed line). " +
+            "Unchanged context lines must be prefixed with a single space."
         );
       }
       break;
@@ -368,12 +275,3 @@ function parseUpdateChunk(
 function stripPrefix(value: string, prefix: string): string | undefined {
   return value.startsWith(prefix) ? value.slice(prefix.length) : undefined;
 }
-
-function isHunkHeader(line: string): boolean {
-  const trimmed = line.trim();
-  return (
-    trimmed.startsWith(ADD_FILE_MARKER) ||
-    trimmed.startsWith(DELETE_FILE_MARKER) ||
-    trimmed.startsWith(UPDATE_FILE_MARKER)
-  );
-}

package/packages/core/src/extensions/apply-patch/schema.ts

@@ -10,7 +10,6 @@ export type ApplyPatchInput = Static<typeof applyPatchSchema>;
 
 const ALIAS_KEYS = ["patch", "patchText", "patch_text"] as const;
 
-/** Normalize a bare string or a `patch`/`patchText`/`patch_text` key to `{input}`, dropping the alias. */
 export function prepareApplyPatchArguments(rawArgs: unknown): ApplyPatchInput {
   if (typeof rawArgs === "string") {
     return { input: rawArgs };

package/packages/core/src/extensions/bash/MemoryCap.ts

@@ -33,7 +33,7 @@ function limitBytes(): number | null {
   return Math.floor(Number(match[1]) * UNITS[unit]);
 }
 
-/** Whether a scope's MemoryMax is really enforced: without the memory controller delegated, systemd accepts it and ignores it. */
+/** Whether MemoryMax is enforced; without memory controller delegation systemd silently ignores it. */
 async function probe(): Promise<boolean> {
   if (process.platform !== "linux") {
     return false;
@@ -65,7 +65,7 @@ async function probe(): Promise<boolean> {
   }
 }
 
-/** The user-manager service this process runs in, so a command's scope stops with it. */
+/** The user service pim runs in, so command scopes stop with it. */
 async function findOwner(): Promise<string | null> {
   try {
     const cgroup = await readFile("/proc/self/cgroup", "utf8");
@@ -82,7 +82,7 @@ async function findOwner(): Promise<string | null> {
   }
 }
 
-/** The systemd-run prefix that puts one command in its own memory-capped scope, or null when it cannot be capped. */
+/** systemd-run argv prefix for a memory-capped scope; null when capping is off or unsupported. */
 async function scope(): Promise<MemoryScope | null> {
   const limit = limitBytes();
   if (limit === null || !(await (supported ??= probe()))) {
@@ -104,6 +104,8 @@ async function scope(): Promise<MemoryScope | null> {
       `--property=MemoryMax=${limit}`,
       "--property=MemorySwapMax=0",
       "--property=OOMPolicy=kill",
+      // The kernel's group kill races systemd's OOM stop; both must SIGKILL so run.ts can tell.
+      "--property=KillSignal=SIGKILL",
       ...(bindTo
         ? [`--property=BindsTo=${bindTo}`, `--property=After=${bindTo}`]
         : []),
@@ -120,7 +122,6 @@ async function systemctl(args: readonly string[]): Promise<void> {
   }).exited;
 }
 
-/** Ends whatever of a killed command is still in its scope, including a scope systemd never saw empty. */
 async function stop(unit: string): Promise<void> {
   await systemctl(["--no-block", "stop", unit]);
 }