@aitne/daemon 0.1.8 → 0.1.10

package/dist/api/routes/context/permissions.js

@@ -1,69 +1,121 @@
 import { classifyContextWriteStaleness } from "../../../core/context-staleness.js";
 import { createLogger } from "../../../logging.js";
 const logger = createLogger("context-api");
-// B-007 §5.1 — write-permission whitelist for the new layout.
+/**
+ * Write-permission whitelist (CONTEXT_VAULT_REDESIGN_PLAN.md §7.1).
+ *
+ * After the six-class restructure the table collapses from 26 explicit
+ * patterns to one per class prefix plus a small number of exceptions
+ * (`CREATE_ONLY_PUT`, `git/{slug}` placeholders, lifecycle DELETEs).
+ * Legacy URLs (`PUT /api/context/today.md` etc.) are normalised by the
+ * API alias resolver before this table is consulted, so canonical paths
+ * are the only inputs we have to enumerate.
+ */
 export const CONTEXT_WRITE_PERMISSIONS = {
     // Top-level survivors.
-    today: ["PUT", "PATCH"],
-    yesterday: ["PUT", "PATCH"],
-    roadmap: ["PUT", "PATCH"],
     _index: ["PUT", "PATCH"],
-    "context-index": ["PUT", "PATCH"],
-    // user/* covers fixed area files AND the §5.5 growth pattern
-    // (e.g. `user/health/sleep-log.md` after an area promotion).
-    "user/*": ["PUT", "PATCH"],
-    // Natural-language rulebooks — §5.8.
-    "rules/_index": ["PUT", "PATCH"],
-    // DELETE intentionally omitted. Policy files under `rules/policies/`
-    // use `status: removed` in lieu of physical deletion so the captured
-    // history (origin DM, why, linked routine) survives. See
-    // MANAGEMENT-POLICY-CAPTURE-PLAN.md §4.6 / §5.1.
-    "rules/*": ["PUT", "PATCH"],
-    "routines/_index": ["PUT", "PATCH"],
-    "routines/*": ["PUT", "PATCH"],
-    // B-007 §5.8 Q3 — custom routines support DELETE so the agent can
-    // retire a routine when the user asks via DM. The scheduler re-reads
-    // the directory via `onCustomRoutinesChanged` and unregisters the
-    // cron job on the next reload pass.
-    "routines/custom/*": ["PUT", "PATCH", "DELETE"],
-    // Projects (`.base` permitted via CONTEXT_FILE_EXTENSIONS).
-    "projects/_index": ["PUT", "PATCH"],
-    "projects/_active": ["PUT"],
-    "projects/*": ["PUT", "PATCH"],
-    // Lightweight registry for watched git repos that are not promoted to a
-    // full project page.
-    // @deprecated Pre-cutover layout (see docs/design/appendices/unified-repositories.md);
-    // retained for transitional reads of legacy files. New writes route to
-    // `git/<slug>/{overview,journal/<YYYY-MM-DD>}`.
-    "git-repos/*": ["PUT", "PATCH"],
-    // Unified repositories — per-repo project overview + per-day journal.
-    // The two specific patterns below carry write permission; arbitrary
-    // paths under `git/` are NOT writable to keep the layout disciplined.
-    // See docs/design/appendices/unified-repositories.md §4.5.
-    "git/{slug}/overview": ["PUT", "PATCH"],
-    "git/{slug}/journal/{date}": ["PUT", "PATCH"],
-    // Journal & reviews.
-    "daily/*": ["PUT", "PATCH"],
-    "weekly/*": ["PUT", "PATCH"],
-    "monthly/*": ["PUT", "PATCH"],
-    // Dossiers + inbox + agent self-areas.
-    "dossiers/_index": ["PUT", "PATCH"],
-    "dossiers/*": ["PUT", "PATCH"],
-    // B-007 §5.9 Step 4 / §5.3 — morning routine triages each inbox file and
-    // moves the original to `agent/scratch/inbox-YYYY-MM-DD-*.md`. Both sides
-    // of the move need DELETE: inbox for the post-triage cleanup, scratch for
-    // the eventual 48h TTL retention sweep (§6.5).
-    "inbox/*": ["PUT", "PATCH", "DELETE"],
-    "agent/journal": ["PUT", "PATCH"],
-    "agent/scratch/*": ["PUT", "PATCH", "DELETE"],
+    // state/
+    "state/today": ["PUT", "PATCH"],
+    "state/yesterday": ["PUT", "PATCH"],
+    "state/profile-questions": ["PUT", "PATCH"],
+    "state/inbox/*": ["PUT", "PATCH", "DELETE"],
+    "state/scratch/*": ["PUT", "PATCH", "DELETE"],
+    "state/activity/*": ["PUT", "PATCH"],
+    // identity/
+    "identity/_index": ["PUT", "PATCH"],
+    "identity/*": ["PUT", "PATCH"],
+    // plans/
+    "plans/roadmap": ["PUT", "PATCH"],
+    "plans/projects/_index": ["PUT", "PATCH"],
+    "plans/projects/_active": ["PUT"],
+    "plans/projects/*": ["PUT", "PATCH"],
+    // policies/ — DELETE intentionally omitted for management-captures:
+    // policy files use `status: removed` in lieu of physical deletion so
+    // the captured history (origin DM, why, linked routine) survives.
+    "policies/_index": ["PUT", "PATCH"],
+    "policies/management": ["PUT", "PATCH"],
+    // Feedback Learning Loop (FEEDBACK_LEARNING_LOOP_DESIGN.md §4 Phase 2).
+    // Global agent-scope lessons folded nightly by routine.evening_review.
+    // Without this row the consolidation PATCH/PUT 403s — the per-agent
+    // scope already rides the `policies/agents/{slug}/{file}` wildcard, but
+    // the global file matches no rule (no blanket `policies/*`). Like every
+    // other `policies/` write it trips `shouldRefreshPromptContext`, so a
+    // nightly lesson write invalidates the owner-session prompt cache —
+    // desirable (new lessons take effect next turn) and it fires at night.
+    "policies/agent-lessons": ["PUT", "PATCH"],
+    "policies/mcp": ["PUT", "PATCH"],
+    "policies/redaction": ["PUT", "PATCH"],
+    "policies/journal-format": ["PUT", "PATCH"],
+    "policies/journal-export": ["PUT", "PATCH"],
+    "policies/integrations": ["PUT", "PATCH"],
+    "policies/management-captures/_index": ["PUT", "PATCH"],
+    "policies/management-captures/*": ["PUT", "PATCH"],
+    "policies/routines/_index": ["PUT", "PATCH"],
+    "policies/routines/*": ["PUT", "PATCH"],
+    // Custom routines support DELETE so the agent can retire a routine
+    // when the user asks via DM.
+    "policies/routines/custom/*": ["PUT", "PATCH", "DELETE"],
+    // User Agent definitions (AGENT_DEFINITIONS_DESIGN.md §9.5 / §3.3). The
+    // dashboard's "+ New Agent" scaffold and the YAML editor write user Agents
+    // to `policies/agents/<slug>/agent.md` through the context-vault chokepoint;
+    // DELETE retires one. Built-in Agents never live here — they ship under
+    // `agent-assets/agents/` and their overrides live in the DB, so this path
+    // only ever owns user-authored definitions. `{slug}/{file}` matches the
+    // two-segment `policies/agents/<slug>/agent` form `normalizeContextPath`
+    // produces (the `.md` extension is stripped before the whitelist check).
+    "policies/agents/{slug}/{file}": ["PUT", "PATCH", "DELETE"],
+    // journal/ — append-only narrative. `journal/agent.md` is
+    // `CREATE_ONLY_PUT` and only accepts append-style PATCH.
+    "journal/daily/*": ["PUT", "PATCH"],
+    "journal/weekly/*": ["PUT", "PATCH"],
+    "journal/monthly/*": ["PUT", "PATCH"],
+    "journal/agent": ["PUT", "PATCH"],
+    "journal/repos/{slug}/{date}": ["PUT", "PATCH"],
+    // knowledge/ — dossiers + per-repo overviews + entity files.
+    "knowledge/dossiers/_index": ["PUT", "PATCH"],
+    "knowledge/dossiers/*": ["PUT", "PATCH"],
+    "knowledge/repos/{slug}/overview": ["PUT", "PATCH"],
+    // Legacy git-repos registry preserved read-only under
+    // knowledge/repos/legacy-registry/ — left writable so the user can
+    // clean up dangling entries; no new writes target this path.
+    "knowledge/repos/legacy-registry/*": ["PUT", "PATCH"],
+    "knowledge/entities/{domain}/_index": ["PUT", "PATCH"],
+    "knowledge/entities/{domain}/{typePlural}/{slug}": ["PUT", "PATCH"],
+    // research/ — browser-history research-cluster journals
+    // (BROWSER_HISTORY_INTEGRATION_PLAN). The routine.research_dispatch /
+    // research_wiki_summary / research_cluster_update task-flows persist the
+    // per-cluster journal via PUT/PATCH /api/context/research/<slug>.md (plus
+    // `<slug>-assistance-<date>.md` and `<slug>-wiki.md`). These are flat,
+    // single-segment files under research/. DELETE is intentionally omitted —
+    // concluding a cluster *preserves* its journal (commands-research.ts), so
+    // there is no agent-driven delete path. Without this entry every research
+    // write returned 403 context.write_forbidden, silently breaking the flow.
+    "research/*": ["PUT", "PATCH"],
 };
 /**
  * Paths where PUT is only allowed when the file does not yet exist.
  * Subsequent writes must go through PATCH (append). This enforces the
  * append-only contract at the API level rather than relying on prompt
  * compliance alone.
+ *
+ * The contract has two sides — PUT-after-creation is denied here; the
+ * PATCH handler additionally restricts these paths to {@link APPEND_ONLY_PATCH_MODES},
+ * so `mode:"replace"` / `"clear"` / `"clear_before"` cannot erase existing
+ * sections behind the agent's back.
+ */
+export const CREATE_ONLY_PUT = new Set(["journal/agent"]);
+/**
+ * PATCH modes that count as "append-style" for paths in {@link CREATE_ONLY_PUT}.
+ * Every other mode (`"replace"`, `"clear"`, `"clear_before"`) MUST be
+ * rejected on append-only paths — otherwise a prompt-injected agent (or
+ * any caller with a valid bearer token) could PATCH `agent/journal` with
+ * `mode:"replace"` against a section and destroy historical entries the
+ * "create-only PUT" gate was meant to protect.
  */
-export const CREATE_ONLY_PUT = new Set(["agent/journal"]);
+export const APPEND_ONLY_PATCH_MODES = new Set([
+    "append",
+    "append_to_file",
+]);
 /**
  * Slug regex shared by `{slug}` and `{date}` placeholders. Matches the
  * sanitized output of `deriveSlug` (a-z, 0-9, dot, underscore, dash) and
@@ -142,21 +194,21 @@ export function isWriteAllowed(path, method) {
  * skips `markActiveDmSessionsStale` while `currentSetupMode` is active.
  */
 export function shouldRefreshPromptContext(path, method) {
-    if (path === "today" ||
-        path === "roadmap" ||
-        path === "context-index") {
+    if (path === "state/today" ||
+        path === "plans/roadmap" ||
+        path === "_index") {
         return true;
     }
-    // B-007 — any rules/*.md file feeds the policy-files injection hub, so
-    // edits to any of them should invalidate the owner-session prompt cache.
-    // Routine rulebooks (`routines/*.md`) similarly drive task-flow prompts.
-    if (path.startsWith("rules/") || path.startsWith("routines/")) {
+    // Any policies/*.md edit feeds the policy-files injection hub, so
+    // changes should invalidate the owner-session prompt cache.
+    // policies/routines/* drives task-flow prompts.
+    if (path.startsWith("policies/")) {
         return true;
     }
-    if (path.startsWith("dossiers/")) {
+    if (path.startsWith("knowledge/dossiers/")) {
         return true;
     }
-    if (path === "user/profile" && method === "PUT") {
+    if (path === "identity/profile" && method === "PUT") {
         return true;
     }
     return false;
@@ -189,4 +241,3 @@ export function notifyPromptContextChanged(deps, path, reason, input) {
         logger.warn({ err, path, method: input.method }, "Failed to record context_write agent_actions row (Stage C metrics)");
     }
 }
-//# sourceMappingURL=permissions.js.map

package/dist/api/routes/context/read.d.ts

@@ -1,4 +1,3 @@
 import type { Hono } from "hono";
 import type { ContextRouteContext } from "./index.js";
 export declare function registerReadRoutes(app: Hono, ctx: ContextRouteContext): void;
-//# sourceMappingURL=read.d.ts.map

package/dist/api/routes/context/read.js

@@ -13,28 +13,56 @@ const logger = createLogger("context-api");
 export function registerReadRoutes(app, ctx) {
     const { deps, getCurrentContextDir } = ctx;
     const { db, config } = deps;
-    // GET /context/list/:dir — List files in directory
-    app.get("/context/list/:dir", (c) => {
-        const dir = c.req.param("dir");
-        // B-007 §5.1 — canonical listable directories.
+    // GET /context/list/:dir — List files in directory.
+    //
+    // Accepts both the new canonical names ("identity", "policies",
+    // "policies/routines", "plans/projects", "journal/daily", ...) and
+    // the legacy aliases ("user", "rules", "routines", "projects",
+    // "daily", ...) — the latter are translated to the new dir before
+    // listing. Legacy aliases are removed in the same minor-release
+    // window as the §14.4 agent-asset prose sweep (PR-6).
+    // `:dir{.+}` (not bare `:dir`) so the param captures slashes — after the
+    // context-vault restructure the canonical dir names are nested
+    // ("journal/daily", "knowledge/repos", "policies/routines", ...). A bare
+    // single-segment `:dir` matches `[^/]+`, so those requests fell through to
+    // Hono's default 404 and the dashboard file tree showed only the
+    // single-segment dirs (identity, policies). The handler's `allowedDirs`
+    // whitelist + `legacyDirAlias` map already expect the nested names.
+    app.get("/context/list/:dir{.+}", (c) => {
+        const rawDir = c.req.param("dir");
+        const legacyDirAlias = {
+            user: "identity",
+            rules: "policies",
+            routines: "policies/routines",
+            projects: "plans/projects",
+            daily: "journal/daily",
+            weekly: "journal/weekly",
+            monthly: "journal/monthly",
+            dossiers: "knowledge/dossiers",
+            inbox: "state/inbox",
+            git: "knowledge/repos",
+            "git-repos": "knowledge/repos/legacy-registry",
+        };
+        const dir = legacyDirAlias[rawDir] ?? rawDir;
         const allowedDirs = [
-            "projects",
-            "weekly",
-            "monthly",
-            "daily",
-            "user",
-            "rules",
-            "routines",
-            "dossiers",
-            "git",
-            "git-repos",
-            "inbox",
+            "identity",
+            "policies",
+            "policies/routines",
+            "policies/management-captures",
+            "plans/projects",
+            "journal/daily",
+            "journal/weekly",
+            "journal/monthly",
+            "knowledge/dossiers",
+            "knowledge/repos",
+            "knowledge/repos/legacy-registry",
+            "state/inbox",
         ];
         if (!allowedDirs.includes(dir)) {
             return respondWithAgentError(c, 400, [
                 composeIssue("context.directory_invalid", {
                     field: "dir",
-                    received: { dir, allowed: allowedDirs },
+                    received: { dir: rawDir, allowed: allowedDirs },
                 }),
             ]);
         }
@@ -49,11 +77,11 @@ export function registerReadRoutes(app, ctx) {
             const stat = statSync(join(dirPath, f));
             return { name: f, lastModified: stat.mtime.toISOString() };
         });
-        // B-007 §5.8 Q3 — surface custom routines so the dashboard routines
-        // editor sees them alongside the built-ins. `routines/custom/` is the
-        // only nested directory we need to flatten; other listable dirs are
-        // flat by design (§5.1).
-        if (dir === "routines") {
+        // Surface custom routines so the dashboard routines editor sees
+        // them alongside the built-ins. After the restructure the parent
+        // dir is `policies/routines` and the custom sub-dir is
+        // `policies/routines/custom/`.
+        if (dir === "policies/routines") {
             const customDir = join(dirPath, "custom");
             if (existsSync(customDir)) {
                 for (const f of readdirSync(customDir)) {
@@ -67,13 +95,12 @@ export function registerReadRoutes(app, ctx) {
                 }
             }
         }
-        // Unified repositories layout (`git/<slug>/overview.md` +
-        // `git/<slug>/journal/<YYYY-MM-DD>.md`) — surface every per-repo file
-        // under the `git` listing so the Knowledge page tree shows them.
-        // Without this the listing only contains files directly under `git/`,
-        // and the per-slug subdirectories silently drop off the dashboard.
-        // Mirrors the `routines/custom/` flatten above.
-        if (dir === "git") {
+        // Unified repositories layout — surface every per-repo file under
+        // the `knowledge/repos` listing so the Knowledge page tree shows
+        // them. Overview lives under `knowledge/repos/<slug>/overview.md`;
+        // per-day journals live under `journal/repos/<slug>/` and are
+        // surfaced as part of the journal/daily listing.
+        if (dir === "knowledge/repos") {
             for (const entry of readdirSync(dirPath, { withFileTypes: true })) {
                 if (!entry.isDirectory())
                     continue;
@@ -88,34 +115,19 @@ export function registerReadRoutes(app, ctx) {
                         lastModified: stat.mtime.toISOString(),
                     });
                 }
-                const journalDir = join(slugDir, "journal");
-                if (existsSync(journalDir)) {
-                    for (const f of readdirSync(journalDir)) {
-                        if (!CONTEXT_FILE_EXTENSIONS.some((ext) => f.endsWith(ext)))
-                            continue;
-                        const stat = statSync(join(journalDir, f));
-                        files.push({
-                            name: `${slug}/journal/${f}`,
-                            lastModified: stat.mtime.toISOString(),
-                        });
-                    }
-                }
             }
         }
-        // MANAGEMENT-POLICY-CAPTURE-PLAN §4.4.1 step 1 — surface policy files
-        // under `rules/policies/` flattened into the `rules` listing so the
-        // `management-policy` skill can use the directory listing as its
-        // source-of-truth (the agent-maintained `_index.md` is only the
-        // convenience snapshot). Mirrors the `routines/custom/` flatten above.
-        if (dir === "rules") {
-            const policiesDir = join(dirPath, "policies");
+        // Surface policy capture files under `policies/management-captures/`
+        // flattened into the `policies` listing for skill consumers.
+        if (dir === "policies") {
+            const policiesDir = join(dirPath, "management-captures");
             if (existsSync(policiesDir)) {
                 for (const f of readdirSync(policiesDir)) {
                     if (!CONTEXT_FILE_EXTENSIONS.some((ext) => f.endsWith(ext)))
                         continue;
                     const stat = statSync(join(policiesDir, f));
                     files.push({
-                        name: `policies/${f}`,
+                        name: `management-captures/${f}`,
                         lastModified: stat.mtime.toISOString(),
                     });
                 }
@@ -271,7 +283,7 @@ export function registerReadRoutes(app, ctx) {
         // Task 3 directive on a resumed turn. Bounded to `today` reads only
         // so the agent_actions volume stays small. Best-effort: any logging
         // failure must not break the read.
-        if (path === "today") {
+        if (path === "state/today") {
             try {
                 deps.db
                     .prepare(`INSERT INTO agent_actions (action_type, trigger, result, detail, started_at, completed_at)
@@ -292,4 +304,3 @@ export function registerReadRoutes(app, ctx) {
         });
     });
 }
-//# sourceMappingURL=read.js.map

package/dist/api/routes/context/repair.d.ts

@@ -1,4 +1,3 @@
 import type { Hono } from "hono";
 import type { ContextRouteContext } from "./index.js";
 export declare function registerRepairRoutes(app: Hono, ctx: ContextRouteContext): void;
-//# sourceMappingURL=repair.d.ts.map

package/dist/api/routes/context/repair.js

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { writeFileAtomically } from "../../../core/atomic-write.js";
+import { serializeContextFileWrite } from "../../../core/context-file-serializer.js";
 import { REPAIRABLE_STUB_TARGETS, normalizeRepairStubPath, } from "../../../core/context-health.js";
 import { resolveTemplatesRoot } from "../../../core/skeleton.js";
 import { createLogger } from "../../../logging.js";
@@ -9,7 +10,7 @@ import { notifyPromptContextChanged, shouldRefreshPromptContext, } from "./permi
 import { normalizeContextPath, safePath } from "./path-resolve.js";
 const logger = createLogger("context-api");
 export function registerRepairRoutes(app, ctx) {
-    const { deps, getCurrentContextDir, withWriteLock, readOptionalJsonBody, } = ctx;
+    const { deps, getCurrentContextDir, readOptionalJsonBody, } = ctx;
     const { config, writeTracker } = deps;
     // POST /context/repair/stub — create a known missing stub from the
     // templates tree. This is intentionally guarded to a small allow-list;
@@ -72,7 +73,7 @@ export function registerRepairRoutes(app, ctx) {
                 }),
             ]);
         }
-        return withWriteLock(() => {
+        return serializeContextFileWrite(fullPath, () => {
             if (existsSync(fullPath)) {
                 const existingStat = statSync(fullPath);
                 return c.json({
@@ -111,4 +112,3 @@ export function registerRepairRoutes(app, ctx) {
         });
     });
 }
-//# sourceMappingURL=repair.js.map

package/dist/api/routes/context/snapshots.d.ts

@@ -1,4 +1,3 @@
 import type { Hono } from "hono";
 import type { ContextRouteContext } from "./index.js";
 export declare function registerSnapshotsRoutes(app: Hono, ctx: ContextRouteContext): void;
-//# sourceMappingURL=snapshots.d.ts.map

package/dist/api/routes/context/snapshots.js

@@ -2,6 +2,7 @@ import { existsSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { localDateStr } from "@aitne/shared";
 import { writeFileAtomically } from "../../../core/atomic-write.js";
+import { serializeContextFileWrite } from "../../../core/context-file-serializer.js";
 import { validateContextContent } from "../../../core/context-validation/index.js";
 import { createLogger } from "../../../logging.js";
 import { composeIssue, respondWithAgentError, } from "../../helpers/agent-errors.js";
@@ -9,7 +10,7 @@ import { isWriteAllowed, notifyPromptContextChanged, shouldRefreshPromptContext,
 import { resolveContextTarget, safePath } from "./path-resolve.js";
 const logger = createLogger("context-api");
 export function registerSnapshotsRoutes(app, ctx) {
-    const { deps, getCurrentContextDir, morningRoutineLock, roadmapWriteLock, saveSnapshot, withWriteLock, } = ctx;
+    const { deps, getCurrentContextDir, morningRoutineLock, roadmapWriteLock, saveSnapshot, } = ctx;
     const { db, writeTracker } = deps;
     // POST /context/archive-today — B-007 §5.9 day rotation.
     // Before Phase 1 this copied today.md to `schedule/YYYY-MM-DD.md`; that
@@ -19,9 +20,41 @@ export function registerSnapshotsRoutes(app, ctx) {
     // returns the previous date so the agent can write the new `today.md`
     // in the same flow.
     app.post("/context/archive-today", (c) => {
-        return withWriteLock(() => {
-            const contextDir = getCurrentContextDir();
-            const todayPath = join(contextDir, "today.md");
+        const contextDir = getCurrentContextDir();
+        const todayPath = join(contextDir, "state", "today.md");
+        const yesterdayPath = join(contextDir, "state", "yesterday.md");
+        // The rotation source is fixed to state/today.md, so the same
+        // morning-routine-lock guard that PUT/PATCH/restore-snapshot apply
+        // to state/today must hold here too. The per-path serializer below
+        // only prevents byte-level interleaving — it does NOT stop a
+        // concurrent non-morning session from logically rotating
+        // today.md → yesterday.md while the morning routine holds the
+        // exclusive lock mid-build, which would defeat the lock's
+        // exclusivity invariant. Mirror restore-snapshot's guard.
+        if (morningRoutineLock.getHolder()) {
+            const lockId = c.req.header("X-Lock-Id");
+            if (!morningRoutineLock.isHeldBy(lockId)) {
+                logger.info({ path: "state/today" }, "Archive-today rejected — morning routine lock held");
+                return respondWithAgentError(c, 409, [
+                    composeIssue("context.morning_routine_lock_held", {
+                        field: "X-Lock-Id",
+                        received: lockId ?? "<missing>",
+                    }),
+                ]);
+            }
+        }
+        // Acquire today.md FIRST, then yesterday.md inside. The fixed
+        // lock order (alphabetical by absolute path is the convention)
+        // prevents deadlock against any other caller that needs both.
+        // Both gates are required: the SOURCE (today.md) read must not
+        // race with a concurrent today.md writer (else we'd snapshot
+        // a half-written state), and the DESTINATION (yesterday.md)
+        // write must not race with a concurrent yesterday.md PATCH
+        // (else the rotation could be clobbered by — or could clobber —
+        // an in-flight user edit). The legacy in-router `withWriteLock`
+        // serialized ALL writes so this race was masked; the new
+        // per-path serializer requires explicit composition.
+        return serializeContextFileWrite(todayPath, () => serializeContextFileWrite(yesterdayPath, () => {
             if (!existsSync(todayPath)) {
                 return respondWithAgentError(c, 404, [
                     composeIssue("context.path_not_found", {
@@ -33,19 +66,18 @@ export function registerSnapshotsRoutes(app, ctx) {
             const content = readFileSync(todayPath, "utf-8");
             const dateStr = content.match(/^#.*(\d{4}-\d{2}-\d{2})/)?.[1] ??
                 localDateStr(new Date());
-            const yesterdayPath = join(contextDir, "yesterday.md");
             // Atomic write through O_NOFOLLOW + rename so a symlink swap at
             // `yesterday.md` between request validation and the write cannot
             // redirect the rotation into an attacker-controlled path. The
             // legacy `copyFileSync` would silently follow such a symlink.
             writeFileAtomically(yesterdayPath, content);
-            saveSnapshot("today", content, "rotate-to-yesterday", true);
+            saveSnapshot("state/today", content, "rotate-to-yesterday", true);
             return c.json({
                 status: "archived",
-                archivePath: "yesterday.md",
+                archivePath: "state/yesterday.md",
                 rotatedFrom: dateStr,
             });
-        });
+        }));
     });
     // POST /context/restore-snapshot/:id — restore a prior md_file_snapshots
     // row back onto disk. The current on-disk file (if any) is snapshotted
@@ -93,7 +125,7 @@ export function registerSnapshotsRoutes(app, ctx) {
                 }),
             ]);
         }
-        if (morningRoutineLock.getHolder() && path === "today") {
+        if (morningRoutineLock.getHolder() && path === "state/today") {
             const lockId = c.req.header("X-Lock-Id");
             if (!morningRoutineLock.isHeldBy(lockId)) {
                 logger.info({ path }, "Snapshot restore rejected — morning routine lock held");
@@ -105,7 +137,7 @@ export function registerSnapshotsRoutes(app, ctx) {
                 ]);
             }
         }
-        if (roadmapWriteLock.getHolder() && path === "roadmap") {
+        if (roadmapWriteLock.getHolder() && path === "plans/roadmap") {
             const lockId = c.req.header("X-Lock-Id");
             if (!roadmapWriteLock.isHeldBy(lockId)) {
                 logger.info({ path }, "Snapshot restore rejected — roadmap write lock held");
@@ -133,7 +165,7 @@ export function registerSnapshotsRoutes(app, ctx) {
                 },
             });
         }
-        return withWriteLock(() => {
+        return serializeContextFileWrite(fullPath, () => {
             let backupSnapshotId = null;
             if (existsSync(fullPath)) {
                 const current = readFileSync(fullPath, "utf-8");
@@ -154,7 +186,7 @@ export function registerSnapshotsRoutes(app, ctx) {
             if (shouldRefreshPromptContext(path, "PUT")) {
                 notifyPromptContextChanged(deps, path, `context_restore_snapshot:${path}`, { path, method: "RESTORE" });
             }
-            if (path.startsWith("routines/custom/")) {
+            if (path.startsWith("policies/routines/custom/")) {
                 deps.onCustomRoutinesChanged?.();
             }
             const writtenStat = statSync(fullPath);
@@ -174,4 +206,3 @@ export function registerSnapshotsRoutes(app, ctx) {
         });
     });
 }
-//# sourceMappingURL=snapshots.js.map