@rubytech/create-maxy-code 0.1.373 → 0.1.374

package/dist/__tests__/cgroup-memory-controller-install-flow.test.js

@@ -0,0 +1,41 @@
+// Static-grep contract for configureCgroupMemoryController()'s placement in
+// the install flow — same precedent as watchdog-deferred-arming.test.ts for
+// an installer side-effecting step that shells out with sudo and can't be
+// safely executed in a unit test. The pure decision rule itself is covered
+// by cgroup-memory-controller.test.ts.
+import test from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, resolve } from "node:path";
+const here = dirname(fileURLToPath(import.meta.url));
+const INDEX_TS = resolve(here, "../../src/index.ts");
+const SRC = readFileSync(INDEX_TS, "utf-8");
+function fnBody(name) {
+    const start = SRC.indexOf(`function ${name}`);
+    assert.ok(start >= 0, `could not locate ${name} in index.ts`);
+    const nextFn = SRC.indexOf("\nfunction ", start + 1);
+    assert.ok(nextFn > start, `could not bound ${name} body`);
+    return SRC.slice(start, nextFn);
+}
+test("configureCgroupMemoryController is called inside installService()'s Linux branch", () => {
+    const installServiceStart = SRC.indexOf("function installService(");
+    assert.ok(installServiceStart >= 0, "installService() not found");
+    const darwinReturn = SRC.indexOf("installServiceDarwin();\n    return;", installServiceStart);
+    assert.ok(darwinReturn > installServiceStart, "expected the darwin early-return inside installService()");
+    const callSite = SRC.indexOf("configureCgroupMemoryController();", darwinReturn);
+    assert.ok(callSite > darwinReturn, "configureCgroupMemoryController() must be called after the darwin early-return (Linux-only)");
+});
+test("configureCgroupMemoryController never throws on a patch failure (non-fatal, matches the sysctl.d precedent)", () => {
+    const body = fnBody("configureCgroupMemoryController");
+    assert.ok(body.includes("try {"), "expected a try/catch around the sudo cp — a read-only /boot must not abort install");
+    assert.ok(body.includes("catch"), "expected a catch branch");
+});
+test("configureCgroupMemoryController always logs a resolved op=cgroup-memory-status line", () => {
+    const body = fnBody("configureCgroupMemoryController");
+    const occurrences = body.match(/op=cgroup-memory-status/g) ?? [];
+    assert.ok(occurrences.length >= 4, `expected at least 4 branches to log op=cgroup-memory-status, found ${occurrences.length}`);
+});
+test("configureCgroupMemoryController imports the pure decision rule from cgroup-memory-controller.js", () => {
+    assert.ok(SRC.includes('from "./cgroup-memory-controller.js"'), "index.ts must import memoryControllerMissing/cmdlineAlreadyPatched/patchCmdline rather than re-implementing the parsing");
+});

package/dist/__tests__/cgroup-memory-controller.test.js

@@ -0,0 +1,32 @@
+// Pure decision rule for Task 1297: does this host's kernel have the memory
+// cgroup controller enabled, and if not, does its boot cmdline already carry
+// the fix. The wrapper in index.ts owns the fs reads and the sudo cp; this
+// suite exercises only the pure functions — inputs in, decision out.
+import test from "node:test";
+import assert from "node:assert/strict";
+import { CGROUP_MEMORY_CMDLINE_FLAGS, memoryControllerMissing, cmdlineAlreadyPatched, patchCmdline, } from "../cgroup-memory-controller.js";
+test("memoryControllerMissing: false when memory is in the controller list", () => {
+    assert.equal(memoryControllerMissing("cpuset cpu io memory pids\n"), false);
+});
+test("memoryControllerMissing: true when memory is absent (the Pi default)", () => {
+    assert.equal(memoryControllerMissing("cpuset cpu io pids\n"), true);
+});
+test("memoryControllerMissing: true on an empty controller list", () => {
+    assert.equal(memoryControllerMissing(""), true);
+});
+test("cmdlineAlreadyPatched: true when the flags are present", () => {
+    const cmdline = "console=tty1 root=PARTUUID=abc rootwait cgroup_enable=memory cgroup_memory=1\n";
+    assert.equal(cmdlineAlreadyPatched(cmdline), true);
+});
+test("cmdlineAlreadyPatched: false on an unpatched line", () => {
+    const cmdline = "console=serial0,115200 console=tty1 root=PARTUUID=e9d78c4e-02 rootwait quiet splash\n";
+    assert.equal(cmdlineAlreadyPatched(cmdline), false);
+});
+test("patchCmdline: appends the flags with a single trailing newline", () => {
+    const cmdline = "console=tty1 root=PARTUUID=abc rootwait\n";
+    assert.equal(patchCmdline(cmdline), `console=tty1 root=PARTUUID=abc rootwait ${CGROUP_MEMORY_CMDLINE_FLAGS}\n`);
+});
+test("patchCmdline: works when the source has no trailing newline", () => {
+    const cmdline = "console=tty1 root=PARTUUID=abc rootwait";
+    assert.equal(patchCmdline(cmdline), `console=tty1 root=PARTUUID=abc rootwait ${CGROUP_MEMORY_CMDLINE_FLAGS}\n`);
+});

package/dist/cgroup-memory-controller.js

@@ -0,0 +1,33 @@
+// Pure logic for Task 1297: the Pi kernel ships with the memory cgroup
+// controller disabled by default (/sys/fs/cgroup/cgroup.controllers has no
+// `memory`), which makes every MemoryHigh=/MemoryMax= this platform
+// configures (Task 1176, Task 1222) a silent no-op — confirmed fleet-wide
+// across all 5 Pis via live inspection. The wrapper in index.ts owns the fs
+// reads, locating the boot cmdline file, and the sudo cp. This module owns
+// only the decision + the patched-content computation — inputs in, decision
+// out. No reboot logic here or in the wrapper; a boot-param change only takes
+// effect on the operator's next reboot.
+export const CGROUP_MEMORY_CMDLINE_FLAGS = "cgroup_enable=memory cgroup_memory=1";
+/** True when the cgroup-v2 root controller list (the raw content of
+ *  /sys/fs/cgroup/cgroup.controllers) lacks `memory`. Inline rather than
+ *  imported from platform/services/claude-session-manager because the
+ *  installer is its own npm package and doesn't bundle platform services.
+ *  Mirrors (negated) memoryControllerInList() in
+ *  platform/services/claude-session-manager/src/rc-daemon.ts; future
+ *  divergence between the two should be caught by the test suite. */
+export function memoryControllerMissing(controllers) {
+    return !controllers.split(/\s+/).filter(Boolean).includes("memory");
+}
+/** True when the boot cmdline file already carries the enable flags —
+ *  patching again would duplicate them. */
+export function cmdlineAlreadyPatched(cmdline) {
+    return cmdline.includes("cgroup_enable=memory");
+}
+/** Append the enable flags to the single-line boot cmdline file. Callers
+ *  must gate on cmdlineAlreadyPatched() first — this always appends, so
+ *  calling it twice on the same content would duplicate the flags. Trims
+ *  any trailing whitespace before appending, then restores exactly one
+ *  trailing newline (cmdline.txt convention: one line, trailing newline). */
+export function patchCmdline(cmdline) {
+    return `${cmdline.replace(/\s+$/, "")} ${CGROUP_MEMORY_CMDLINE_FLAGS}\n`;
+}

package/dist/index.js

@@ -19,6 +19,7 @@ import { installAllBrewPackages } from "./brew-install.js";
 import { parseSwVers, isSupportedMacosVersion } from "./macos-version.js";
 import { decideChromiumAction, isSnapConfinedPath } from "./snap-chromium.js";
 import { classifyPortHolder } from "./preflight-port-classifier.js";
+import { memoryControllerMissing, cmdlineAlreadyPatched, patchCmdline } from "./cgroup-memory-controller.js";
 import { parsePluginList, computeInstallActions, parseExternalPlugins, findUnregisteredResyncs, } from "./lib/plugin-install.js";
 import { findPremiumMcpDirs } from "./lib/premium-mcp-discover.js";
 import { pickBindDecision, mergeSmbConf, formatSambaMarker, SAMBA_ENABLE_UNITS, } from "./samba-provision.js";
@@ -3243,6 +3244,56 @@ function installServiceDarwin() {
         console.log(`  Server may still be starting. Check http://localhost:${PORT} in a moment.`);
     }
 }
+/** Task 1297 — the Pi kernel ships with the memory cgroup controller
+ *  disabled by default (/sys/fs/cgroup/cgroup.controllers has no `memory`),
+ *  which makes every MemoryHigh=/MemoryMax= this platform configures (Task
+ *  1176, Task 1222) a silent no-op — confirmed fleet-wide, not theorized.
+ *  Patches the boot cmdline so the NEXT reboot activates it; never triggers
+ *  the reboot itself. Non-fatal: a read-only /boot partition, an absent
+ *  cmdline file (x86 hosts don't have one and don't need this), or a host
+ *  where the controller is already enabled (laptop, hart) all resolve to a
+ *  logged status line and a clean return — matching the sysctl.d QUIC
+ *  drop-in step's failure handling immediately below this function's call
+ *  site. */
+function configureCgroupMemoryController() {
+    let controllers;
+    try {
+        controllers = readFileSync("/sys/fs/cgroup/cgroup.controllers", "utf-8");
+    }
+    catch {
+        logFile("[install] op=cgroup-memory-status enabled=unknown patched=unknown reason=no-cgroup-v2-root");
+        return;
+    }
+    if (!memoryControllerMissing(controllers)) {
+        logFile("[install] op=cgroup-memory-status enabled=true patched=false");
+        return;
+    }
+    const cmdlinePath = existsSync("/boot/firmware/cmdline.txt")
+        ? "/boot/firmware/cmdline.txt"
+        : existsSync("/boot/cmdline.txt")
+            ? "/boot/cmdline.txt"
+            : null;
+    if (!cmdlinePath) {
+        logFile("[install] op=cgroup-memory-status enabled=false patched=false reason=no-cmdline-file");
+        return;
+    }
+    const cmdline = readFileSync(cmdlinePath, "utf-8");
+    if (cmdlineAlreadyPatched(cmdline)) {
+        logFile("[install] op=cgroup-memory-status enabled=false patched=true");
+        return;
+    }
+    try {
+        const tmpPath = "/tmp/cmdline.txt.maxy-cgroup-patch";
+        writeFileSync(tmpPath, patchCmdline(cmdline));
+        console.log("  [privileged] cp");
+        shell("cp", [tmpPath, cmdlinePath], { sudo: true });
+        spawnSync("rm", ["-f", tmpPath]);
+        logFile("[install] op=cgroup-memory-status enabled=false patched=true");
+    }
+    catch {
+        logFile("[install] op=cgroup-memory-status enabled=false patched=false reason=patch-failed");
+    }
+}
 function installService() {
     log("11", TOTAL, `Starting ${BRAND.productName}...`);
     // Linux falls through to the systemd-user body below; darwin renders +
@@ -3265,6 +3316,9 @@ function installService() {
         spawnSync("sudo", ["sysctl", "--system"], { stdio: "ignore", timeout: 10_000 });
     }
     catch { /* non-critical — values applied on next reboot */ }
+    // Task 1297 — activate the fleet-wide memory ceiling (Task 1176/1222) by
+    // enabling the kernel controller it has silently depended on since it shipped.
+    configureCgroupMemoryController();
     const serviceDir = resolve(process.env.HOME ?? "/root", ".config/systemd/user");
     mkdirSync(serviceDir, { recursive: true });
     // Create systemd user service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/create-maxy-code",
-  "version": "0.1.373",
+  "version": "0.1.374",
   "description": "Install Maxy — AI for Productive People",
   "bin": {
     "create-maxy-code": "./dist/index.js"

package/payload/platform/scripts/rss-sampler.sh

@@ -56,14 +56,30 @@ while true; do
   # interface, not CLI prose); skip the line on any host where systemctl is
   # absent, the slice is unknown, or MemoryHigh is unset/infinity.
   if command -v systemctl >/dev/null 2>&1; then
-    slice_props=$(systemctl --user show claude-ptys.slice -p MemoryCurrent -p MemoryHigh 2>/dev/null || true)
+    slice_props=$(systemctl --user show claude-ptys.slice -p MemoryCurrent -p MemoryHigh -p ControlGroup 2>/dev/null || true)
     slice_current=$(printf '%s\n' "$slice_props" | sed -n 's/^MemoryCurrent=//p')
     slice_high=$(printf '%s\n' "$slice_props" | sed -n 's/^MemoryHigh=//p')
+    slice_cgroup=$(printf '%s\n' "$slice_props" | sed -n 's/^ControlGroup=//p')
     if [[ "$slice_current" =~ ^[0-9]+$ && "$slice_high" =~ ^[0-9]+$ && "$slice_high" -gt 0 ]]; then
       slice_current_mb=$(( slice_current / 1048576 ))
       slice_high_mb=$(( slice_high / 1048576 ))
       slice_ratio=$(( slice_current * 100 / slice_high ))
-      echo "[rss] op=slice-pressure slice=claude-ptys current=${slice_current_mb} high=${slice_high_mb} ratio=${slice_ratio}" >> "$LOG_PATH"
+      # Task 1297 — memory.events `high` is the cgroup's own count of times
+      # this slice crossed MemoryHigh (a throttle event). The concern this
+      # answers: a MemoryHigh throttle could itself slow the brand server
+      # enough to miss its systemd watchdog heartbeat — this makes that
+      # correlation checkable from logs instead of guessed.
+      high_events=0
+      if [[ -n "$slice_cgroup" && -r "/sys/fs/cgroup${slice_cgroup}/memory.events" ]]; then
+        high_events=$(sed -n 's/^high //p' "/sys/fs/cgroup${slice_cgroup}/memory.events" 2>/dev/null || echo 0)
+        [[ "$high_events" =~ ^[0-9]+$ ]] || high_events=0
+      fi
+      echo "[rss] op=slice-pressure slice=claude-ptys current=${slice_current_mb} high=${slice_high_mb} ratio=${slice_ratio} highEvents=${high_events}" >> "$LOG_PATH"
+      # Task 1297 — the exact standing-sampler line the task names: real
+      # cgroup-accounted cohort total (not the claude.exe-only pgrep sum used
+      # by the plain per-cycle line above) against the real ceiling, so
+      # sizing can be tuned from evidence instead of guessed.
+      echo "[realagent-mem-census] rss_total=${slice_current} ceiling=${slice_high} sessions_live=${claude_count}" >> "$LOG_PATH"
     fi
   fi
 

package/payload/platform/services/claude-session-manager/dist/http-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../src/http-server.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAe3B,OAAO,EAkBL,KAAK,SAAS,EAEf,MAAM,kBAAkB,CAAA;AAyBzB,OAAO,KAAK,EAAE,SAAS,EAAyB,MAAM,iBAAiB,CAAA;AAEvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAgFlE,eAAO,MAAM,kBAAkB,QAA2B,CAAA;AAS1D,eAAO,MAAM,4BAA4B,QAAS,CAAA;AAIlD,MAAM,WAAW,QAAS,SAAQ,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC7E;;qEAEiE;IACjE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,SAAS,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,iBAAiB,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,WAAW,CAAA;IAC/B,eAAe,EAAE,aAAa,CAAA;IAC9B;kFAC8E;IAC9E,cAAc,EAAE,cAAc,CAAA;IAC9B;;gFAE4E;IAC5E,cAAc,EAAE,cAAc,CAAA;IAC9B;;;6BAGyB;IACzB,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC;;;sCAGkC;IAClC,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;IAC3C;;gFAE4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B;AAsFD;;;;;;mEAMmE;AACnE,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAiC9D;AAMD;;;;;;iBAMiB;AACjB,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAmCvF;AAID;;;;;;yBAMyB;AACzB,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAiCzD;AAkCD,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAEpG;AAgBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAUD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAMvE;AAMD,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,GACtB,MAAM,CAER;AAkCD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAe5F;AAwJD;;;kEAGkE;AAClE,MAAM,MAAM,OAAO,GAAG,IAAI,GAAG;IAC3B,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACpD;;;+CAG2C;IAC3C,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAChD,CAAA;AA8CD,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAynFpD"}
+{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../src/http-server.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAe3B,OAAO,EAkBL,KAAK,SAAS,EAEf,MAAM,kBAAkB,CAAA;AA4BzB,OAAO,KAAK,EAAE,SAAS,EAAyB,MAAM,iBAAiB,CAAA;AAEvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAgFlE,eAAO,MAAM,kBAAkB,QAA2B,CAAA;AAS1D,eAAO,MAAM,4BAA4B,QAAS,CAAA;AAIlD,MAAM,WAAW,QAAS,SAAQ,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC7E;;qEAEiE;IACjE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,SAAS,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,iBAAiB,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,WAAW,CAAA;IAC/B,eAAe,EAAE,aAAa,CAAA;IAC9B;kFAC8E;IAC9E,cAAc,EAAE,cAAc,CAAA;IAC9B;;gFAE4E;IAC5E,cAAc,EAAE,cAAc,CAAA;IAC9B;;;6BAGyB;IACzB,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC;;;sCAGkC;IAClC,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;IAC3C;;gFAE4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B;AAsFD;;;;;;mEAMmE;AACnE,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAiC9D;AAMD;;;;;;iBAMiB;AACjB,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAmCvF;AAID;;;;;;yBAMyB;AACzB,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAiCzD;AAkCD,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAEpG;AAgBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAUD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAMvE;AAMD,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,GACtB,MAAM,CAER;AAkCD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAe5F;AAwJD;;;kEAGkE;AAClE,MAAM,MAAM,OAAO,GAAG,IAAI,GAAG;IAC3B,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACpD;;;+CAG2C;IAC3C,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAChD,CAAA;AA8CD,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAgoFpD"}

package/payload/platform/services/claude-session-manager/dist/http-server.js

@@ -44,7 +44,7 @@ import { createRcChildLog } from './rc-child-log.js';
 // --append-system-prompt for channel-bound admin sessions.
 import { extractVoiceSection } from './system-prompt.js';
 import { readJsonlSession } from './jsonl-enumerator.js';
-import { claudeStateRoot, projectSlugForCwd, jsonlPathForSessionId, sidecarPathForSessionId, permissionModeLogPathForSessionId, findExistingJsonlForSessionId, detectRemoteControlSlug, classifyBindBlocker, } from './jsonl-path.js';
+import { claudeStateRoot, projectSlugForCwd, jsonlPathForSessionId, sidecarPathForSessionId, permissionModeLogPathForSessionId, findExistingJsonlForSessionId, slugForExistingJsonl, jsonlPathForSlug, sidecarPathForSlug, detectRemoteControlSlug, classifyBindBlocker, } from './jsonl-path.js';
 import { basename, dirname, join } from 'node:path';
 import { validateUserTitle } from './user-title-store.js';
 import { credentialsPathForConfigDir, snapshotAuthForFailureReason } from './auth-snapshot.js';
@@ -1669,17 +1669,24 @@ export function buildHttpApp(deps) {
         }
         // Task 260 — purge from BOTH locations: a row may have its JSONL
         // at the top level (live or just-ended) or under archive/ (archived).
-        const topJsonl = jsonlPathForSessionId(deps.spawnCwd, sessionId);
-        const archivedJsonl = jsonlPathForSessionId(deps.spawnCwd, sessionId, { archived: true });
-        const topSidecar = sidecarPathForSessionId(deps.spawnCwd, sessionId);
-        const archivedSidecar = sidecarPathForSessionId(deps.spawnCwd, sessionId, { archived: true });
+        // Task 1298 — resolve the slug that actually holds the JSONL first;
+        // the list (sidebar-sessions.ts) walks every slug, so delete must too.
+        // Fall back to spawnCwd's slug only when nothing is found anywhere —
+        // hasTop/hasArchived will both be false regardless, so the fallback
+        // only affects which (nonexistent) paths appear in the 404 case.
+        const resolvedSlug = slugForExistingJsonl(deps.claudeConfigDir, sessionId) ?? projectSlugForCwd(deps.spawnCwd);
+        const topJsonl = jsonlPathForSlug(deps.claudeConfigDir, resolvedSlug, sessionId);
+        const archivedJsonl = jsonlPathForSlug(deps.claudeConfigDir, resolvedSlug, sessionId, { archived: true });
+        const topSidecar = sidecarPathForSlug(deps.claudeConfigDir, resolvedSlug, sessionId);
+        const archivedSidecar = sidecarPathForSlug(deps.claudeConfigDir, resolvedSlug, sessionId, { archived: true });
         const hasTop = existsSync(topJsonl);
         const hasArchived = existsSync(archivedJsonl);
         if (!row || (!hasTop && !hasArchived)) {
+            deps.logger(`delete-not-found sessionId=${sessionId.slice(0, 8)} reason=not-found-anywhere`);
             timed(deps.logger, 'DELETE', `/${id}`, 404, Date.now() - start);
             return c.json({ error: 'session-not-found' }, 404);
         }
-        const subdir = join(claudeStateRoot(), 'projects', projectSlugForCwd(deps.spawnCwd), sessionId);
+        const subdir = join(claudeStateRoot(), 'projects', resolvedSlug, sessionId);
         let bytes = 0;
         try {
             bytes = hasTop ? statSync(topJsonl).size : hasArchived ? statSync(archivedJsonl).size : 0;