@namzu/sdk 42.0.2 → 44.0.0

package/dist/session/paths.js

@@ -0,0 +1,338 @@
+import { createHash } from 'node:crypto';
+import { lstatSync, mkdirSync } from 'node:fs';
+import { link, mkdir, open, readFile, realpath, unlink } from 'node:fs/promises';
+import { tmpdir, userInfo } from 'node:os';
+import { basename, dirname, join } from 'node:path';
+import { ProjectDocumentSchema } from '../types/session/records.js';
+import { asSessionId, generateProjectId, isEntityId } from '../utils/id.js';
+import { uuidv7 } from '../utils/uuidv7.js';
+/**
+ * The locator a session log's own path spells out: `<session-id>.jsonl` at the
+ * top of a project is a root session, and each `<ancestor-id>/subagents/`
+ * above it names an ancestor, nearest last. `undefined` when the file is not
+ * named `<sessionId>.jsonl`.
+ *
+ * The path alone does not say which project the file is in: a
+ * `<sessionId>.jsonl` kept outside any layout still reads as a root session
+ * here. `resolveSessionStorage` trusts this locator only when the layout it
+ * was given puts that locator's log at this very file.
+ *
+ * A log opened from the index's `logPath` knows only its file; this is how it
+ * finds the same `checkpoints/` (and the rest of its session directory) that
+ * {@link SessionPaths} placed for it.
+ */
+export function sessionLocatorFromLogFile(file, sessionId) {
+    if (basename(file) !== `${sessionId}.jsonl`)
+        return undefined;
+    const ancestors = [];
+    let directory = dirname(file);
+    while (basename(directory) === 'subagents') {
+        const owner = basename(dirname(directory));
+        if (!isEntityId(owner, 'session'))
+            break;
+        ancestors.unshift(asSessionId(owner));
+        directory = dirname(dirname(directory));
+    }
+    return ancestors.length === 0 ? { sessionId } : { sessionId, ancestors };
+}
+/** A path segment that is not an id of the expected kind, or not a safe name. */
+export class SessionPathError extends Error {
+    name = 'SessionPathError';
+}
+const SLUG = /^[A-Za-z0-9-]+$/;
+/** Worktree labels and resident agent keys: one plain segment, never `.` or `..`. */
+const NAME = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
+/** Longest slug before a hash suffix replaces the tail; well under the 255-byte segment limit. */
+const MAX_SLUG = 200;
+function sha256Hex(value) {
+    return createHash('sha256').update(value).digest('hex');
+}
+function checkId(value, kind) {
+    if (!isEntityId(value, kind)) {
+        throw new SessionPathError(`Invalid ${kind} id for a path: ${JSON.stringify(value)}`);
+    }
+    return value;
+}
+function checkName(value, what) {
+    if (!NAME.test(value) || value.includes('..')) {
+        throw new SessionPathError(`Invalid ${what} for a path: ${JSON.stringify(value)}`);
+    }
+    return value;
+}
+/**
+ * The slug a working directory is filed under: every character outside
+ * `[A-Za-z0-9]` becomes `-`.
+ *
+ * Pass the canonical path (`realpath`); `ensureProject` does. A POSIX
+ * absolute path starts with `/`, so its slug starts with `-`; a Windows path
+ * `C:\…` gives `C-…`; a UNC path gives `--…`. None of these can look like a
+ * UUID, which is how a layout reader tells a slug from a legacy
+ * `projects/<uuid>/` directory. A slug longer than 200 characters keeps its
+ * first 191 and ends in `-` plus 8 hex digits of the path's SHA-256.
+ */
+export function slugForCwd(cwd) {
+    const slug = cwd.replace(/[^A-Za-z0-9]/g, '-');
+    if (slug.length <= MAX_SLUG)
+        return slug;
+    return `${slug.slice(0, MAX_SLUG - 9)}-${sha256Hex(cwd).slice(0, 8)}`;
+}
+/** The slug used when `project.json` under the plain slug belongs to a different directory. */
+export function hashedSlugForCwd(cwd) {
+    return `${slugForCwd(cwd)}-${sha256Hex(cwd).slice(0, 8)}`;
+}
+/** `project.json` exists and cannot be read as a project document. */
+export class ProjectDocumentError extends Error {
+    name = 'ProjectDocumentError';
+}
+async function readProjectDocument(file) {
+    let raw;
+    try {
+        raw = await readFile(file, 'utf8');
+    }
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return null;
+        throw error;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (error) {
+        throw new ProjectDocumentError(`${file} is not JSON: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    const result = ProjectDocumentSchema.safeParse(parsed);
+    if (!result.success) {
+        throw new ProjectDocumentError(`${file} is not a project document: ${result.error.message}`);
+    }
+    return result.data;
+}
+/**
+ * Find or create the project a working directory stands for.
+ *
+ * The directory is canonicalised, slugged, and `projects/<slug>/project.json`
+ * is created exclusively: the document is written complete to a private
+ * temporary file and then hard-linked into place, which fails with `EEXIST`
+ * if another process got there first. So a reader never sees a half-written
+ * document, and of two processes racing, exactly one mints the project id and
+ * the other adopts it. If the existing document names a different directory
+ * (two paths that slug alike), the project moves to the hashed slug.
+ */
+export async function ensureProject(options) {
+    const cwd = await realpath(options.cwd);
+    const now = options.now ?? (() => new Date());
+    const candidates = [slugForCwd(cwd), hashedSlugForCwd(cwd)];
+    for (const slug of candidates) {
+        const projectDir = join(options.home, 'projects', slug);
+        await mkdir(projectDir, { recursive: true });
+        const file = join(projectDir, 'project.json');
+        let existing = await readProjectDocument(file);
+        if (existing === null) {
+            const document = {
+                v: 1,
+                kind: 'project',
+                projectId: generateProjectId(),
+                cwd,
+                slug,
+                createdAt: now().toISOString(),
+            };
+            const temporary = join(projectDir, `.project.json.${process.pid}.${uuidv7()}.tmp`);
+            const handle = await open(temporary, 'wx', 0o600);
+            try {
+                await handle.writeFile(`${JSON.stringify(document)}\n`, 'utf8');
+                await handle.sync();
+            }
+            finally {
+                await handle.close();
+            }
+            let won = false;
+            try {
+                await link(temporary, file);
+                won = true;
+            }
+            catch (error) {
+                if (error.code !== 'EEXIST')
+                    throw error;
+            }
+            finally {
+                await unlink(temporary).catch(() => undefined);
+            }
+            if (won)
+                return { slug, projectId: document.projectId, cwd, projectDir, created: true };
+            existing = await readProjectDocument(file);
+            if (existing === null) {
+                throw new ProjectDocumentError(`${file} vanished while it was being created.`);
+            }
+        }
+        if (existing.cwd === cwd) {
+            return { slug, projectId: existing.projectId, cwd, projectDir, created: false };
+        }
+    }
+    throw new ProjectDocumentError(`No project slug is free for ${JSON.stringify(cwd)}: both ${candidates.join(' and ')} belong to other directories.`);
+}
+/**
+ * The per-user temporary root, `$TMPDIR/namzu-<user>`, created if missing.
+ *
+ * `<user>` is the numeric uid where the platform has one; otherwise the first
+ * 12 hex digits of the SHA-256 of the user name; otherwise `user`. On POSIX
+ * the directory is created with mode 0700 and refused if it is a symlink, not
+ * a directory, owned by another uid, or open to group or others. On win32
+ * `%TEMP%` is already per user: a symlink or junction is refused and the
+ * owner check is skipped.
+ */
+export function tempRoot(options = {}) {
+    const platform = options.platform ?? process.platform;
+    const getuid = 'getuid' in options ? options.getuid : process.getuid?.bind(process);
+    let user = 'user';
+    if (typeof getuid === 'function') {
+        user = String(getuid());
+    }
+    else {
+        try {
+            const name = (options.username ?? (() => userInfo().username))();
+            if (name.length > 0)
+                user = sha256Hex(name).slice(0, 12);
+        }
+        catch {
+            // No user database entry: fall back to the fixed segment.
+        }
+    }
+    const root = join(options.tmpdir ?? tmpdir(), `namzu-${user}`);
+    try {
+        mkdirSync(root, { mode: 0o700 });
+    }
+    catch (error) {
+        if (error.code !== 'EEXIST')
+            throw error;
+    }
+    const entry = lstatSync(root);
+    if (entry.isSymbolicLink()) {
+        throw new SessionPathError(`Refusing temporary root ${root}: it is a symbolic link.`);
+    }
+    if (!entry.isDirectory()) {
+        throw new SessionPathError(`Refusing temporary root ${root}: it is not a directory.`);
+    }
+    if (platform !== 'win32' && typeof getuid === 'function') {
+        if (entry.uid !== getuid()) {
+            throw new SessionPathError(`Refusing temporary root ${root}: it belongs to uid ${entry.uid}.`);
+        }
+        if ((entry.mode & 0o077) !== 0) {
+            throw new SessionPathError(`Refusing temporary root ${root}: mode ${(entry.mode & 0o777).toString(8)} lets other users in; it must be 700.`);
+        }
+    }
+    return root;
+}
+/** Every path of one project's layout. Pure: nothing is created or read. */
+export class SessionPaths {
+    home;
+    slug;
+    #tempRoot;
+    constructor(options) {
+        if (!SLUG.test(options.slug)) {
+            throw new SessionPathError(`Invalid project slug: ${JSON.stringify(options.slug)}`);
+        }
+        this.home = options.home;
+        this.slug = options.slug;
+        this.#tempRoot = options.tempRoot;
+    }
+    /** `$NAMZU_HOME/index.sqlite`. */
+    indexFile() {
+        return join(this.home, 'index.sqlite');
+    }
+    projectDir() {
+        return join(this.home, 'projects', this.slug);
+    }
+    projectFile() {
+        return join(this.projectDir(), 'project.json');
+    }
+    memoryDir() {
+        return join(this.projectDir(), 'memory');
+    }
+    residentDir(agentKey) {
+        return join(this.projectDir(), 'residents', checkName(agentKey, 'resident agent key'));
+    }
+    /** The `GitWorktreeManager` default root, or one labelled worktree inside it. */
+    worktrees(label) {
+        const root = join(this.projectDir(), 'worktrees');
+        return label === undefined ? root : join(root, checkName(label, 'worktree label'));
+    }
+    /** The directory that holds `<session-id>.jsonl`: the project for a root session, `subagents/` of its parent otherwise. */
+    #logParent(locator) {
+        let parent = this.projectDir();
+        for (const ancestor of locator.ancestors ?? []) {
+            parent = join(parent, checkId(ancestor, 'session'), 'subagents');
+        }
+        return parent;
+    }
+    /** `<session-id>.jsonl`, or `…/subagents/<child-id>.jsonl` for a child session. */
+    sessionLog(locator) {
+        return join(this.#logParent(locator), `${checkId(locator.sessionId, 'session')}.jsonl`);
+    }
+    /** The session's own directory, beside its log. */
+    sessionDir(locator) {
+        return join(this.#logParent(locator), checkId(locator.sessionId, 'session'));
+    }
+    #child(parent, childId) {
+        return { sessionId: childId, ancestors: [...(parent.ancestors ?? []), parent.sessionId] };
+    }
+    subagentLog(parent, childId) {
+        return this.sessionLog(this.#child(parent, childId));
+    }
+    /** `<parent-dir>/subagents/<child-id>.meta.json`. */
+    subagentMeta(parent, childId) {
+        return join(this.sessionDir(parent), 'subagents', `${checkId(childId, 'session')}.meta.json`);
+    }
+    toolResults(locator) {
+        return join(this.sessionDir(locator), 'tool-results');
+    }
+    /** A spilled tool result, named by the SHA-256 of its provider tool-use id; the manifest is `<file>.manifest.json`. */
+    toolResultFile(locator, toolUseId) {
+        if (toolUseId.length === 0)
+            throw new SessionPathError('A tool-use id is required.');
+        return join(this.toolResults(locator), `${sha256Hex(toolUseId)}.txt`);
+    }
+    checkpoints(locator) {
+        return join(this.sessionDir(locator), 'checkpoints');
+    }
+    checkpointFile(locator, checkpointId) {
+        return join(this.checkpoints(locator), `${checkId(checkpointId, 'checkpoint')}.json`);
+    }
+    /** Token ledgers; written for root sessions only. */
+    budgets(locator) {
+        return join(this.sessionDir(locator), 'budgets');
+    }
+    budgetFile(locator, rootTurnId) {
+        return join(this.budgets(locator), `${checkId(rootTurnId, 'turn')}.json`);
+    }
+    tasks(locator) {
+        return join(this.sessionDir(locator), 'tasks');
+    }
+    taskFile(locator, taskId) {
+        return join(this.tasks(locator), `${checkId(taskId, 'task')}.json`);
+    }
+    feedback(locator) {
+        return join(this.sessionDir(locator), 'feedback');
+    }
+    feedbackFile(locator, messageId) {
+        return join(this.feedback(locator), `${checkId(messageId, 'message')}.json`);
+    }
+    goals(locator) {
+        return join(this.sessionDir(locator), 'goals');
+    }
+    goalFile(locator, goalId) {
+        return join(this.goals(locator), `${checkId(goalId, 'goal')}.json`);
+    }
+    /** File snapshots a CLI `/restore` rolls back to. */
+    fileHistory(locator) {
+        return join(this.sessionDir(locator), 'file-history');
+    }
+    lease(locator) {
+        return join(this.sessionDir(locator), 'lease.json');
+    }
+    /** `$TMPDIR/namzu-<user>/<slug>/<session-id>/scratchpad`. Not created; the per-user root is. */
+    tempDir(sessionId) {
+        this.#tempRoot ??= tempRoot();
+        return join(this.#tempRoot, this.slug, checkId(sessionId, 'session'), 'scratchpad');
+    }
+}
+//# sourceMappingURL=paths.js.map

package/dist/session/paths.js.map

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

package/dist/session/retention/archive.d.ts

@@ -24,8 +24,9 @@
  * tombstone: `SessionStore.drill` still finds it through the normal linkage
  * path, so the archive is navigable without a parallel index.
  */
-import type { SubSessionId, TenantId } from '../../types/ids/index.js';
+import type { SessionId, SubSessionId, TenantId } from '../../types/ids/index.js';
 import type { WorkspaceId } from '../../types/session/ids.js';
+import type { SessionMessage } from '../../types/session/messages.js';
 import type { SessionStore } from '../../types/session/store.js';
 import type { WorkspaceRef } from '../../types/workspace/ref.js';
 import type { WorkspaceBackendRegistry } from '../workspace/registry.js';
@@ -81,6 +82,12 @@ export declare class SubSessionNotArchivedError extends Error {
 export type WorkspaceResolver = (workspaceId: WorkspaceId, tenantId: TenantId) => Promise<WorkspaceRef | null>;
 export interface ArchivalManagerDeps {
     readonly sessionStore: SessionStore;
+    /**
+     * The child session's conversation, read from its session log (the fold
+     * of its records). The session log is the only store of messages; a
+     * `SessionStore` holds none.
+     */
+    readonly readSessionMessages: (sessionId: SessionId, tenantId: TenantId) => Promise<readonly SessionMessage[]>;
     readonly workspaceRegistry: WorkspaceBackendRegistry;
     /**
      * Archive backend. Absent = archival disabled for this manager

package/dist/session/retention/archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../../src/session/retention/archive.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,EAAa,YAAY,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAMhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvE;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;;CAKnD;AAED;;;;GAIG;AACH,qBAAa,4BAA6B,SAAQ,KAAK;IACtD,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;QACnC,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,kBAAkB,GAAG,SAAS,CAAA;KAC5D,CAAA;gBAEW,OAAO,EAAE;QACpB,YAAY,EAAE,YAAY,CAAA;QAC1B,MAAM,EAAE,UAAU,GAAG,kBAAkB,GAAG,SAAS,CAAA;KACnD;CAKD;AAED;;;;;GAKG;AACH,qBAAa,0BAA2B,SAAQ,KAAK;IACpD,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;QACnC,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,qBAAqB,CAAA;KACnE,CAAA;gBAEW,OAAO,EAAE;QACpB,YAAY,EAAE,YAAY,CAAA;QAC1B,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,qBAAqB,CAAA;KAC1D;CAKD;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAC/B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,KACd,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAA;AAkBjC,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;IACnC,QAAQ,CAAC,iBAAiB,EAAE,wBAAwB,CAAA;IACpD;;;OAGG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAA;IACxC;;;;;OAKG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IAC9C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAC9D,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAA;CAC9E;AAED,qBAAa,eAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;gBAE9B,IAAI,EAAE,mBAAmB;IAIrC;;;;;;OAMG;IACG,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA+E3F;;;;;;;;;OASG;IACG,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B5E,OAAO,CAAC,cAAc;CAKtB"}
+{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../../src/session/retention/archive.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAMhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvE;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;;CAKnD;AAED;;;;GAIG;AACH,qBAAa,4BAA6B,SAAQ,KAAK;IACtD,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;QACnC,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,kBAAkB,GAAG,SAAS,CAAA;KAC5D,CAAA;gBAEW,OAAO,EAAE;QACpB,YAAY,EAAE,YAAY,CAAA;QAC1B,MAAM,EAAE,UAAU,GAAG,kBAAkB,GAAG,SAAS,CAAA;KACnD;CAKD;AAED;;;;;GAKG;AACH,qBAAa,0BAA2B,SAAQ,KAAK;IACpD,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;QACnC,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,qBAAqB,CAAA;KACnE,CAAA;gBAEW,OAAO,EAAE;QACpB,YAAY,EAAE,YAAY,CAAA;QAC1B,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,qBAAqB,CAAA;KAC1D;CAKD;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAC/B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,KACd,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAA;AAkBjC,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;IACnC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,EAAE,CAC7B,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,KACd,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CAAA;IACvC,QAAQ,CAAC,iBAAiB,EAAE,wBAAwB,CAAA;IACpD;;;OAGG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAA;IACxC;;;;;OAKG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IAC9C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAC9D,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAA;CAC9E;AAED,qBAAa,eAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;gBAE9B,IAAI,EAAE,mBAAmB;IAIrC;;;;;;OAMG;IACG,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA6E3F;;;;;;;;;OASG;IACG,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B5E,OAAO,CAAC,cAAc;CAKtB"}

package/dist/session/retention/archive.js

@@ -103,12 +103,10 @@ export class ArchivalManager {
             throw new SubSessionNotArchivableError({ subSessionId, reason: 'not_idle' });
         }
         // 2. Load owning child session bundle (messages + optional summary).
-        // Phase 9 Known Delta #7: uses `loadSessionMessages` for full-fidelity
-        // round-trip (original MessageId + timestamp preserved). Previously
-        // the Phase 8 archivalmanager synthesized `msg_restored_N` IDs from the
-        // payload-only `loadMessages` return — that lossy reshape is gone.
+        // The messages come from the child session's log, with the record ids
+        // and times the log gave them.
         const childSessionId = sub.childSessionId;
-        const messages = await this.deps.sessionStore.loadSessionMessages(childSessionId, tenantId);
+        const messages = await this.deps.readSessionMessages(childSessionId, tenantId);
         const summaryRefOrNull = await this.deps.sessionStore.getSummary(childSessionId, tenantId);
         const summaryRef = summaryRefOrNull ?? undefined;
         // 3. Resolve optional live workspace ref.

package/dist/session/retention/archive.js.map

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

package/dist/session/status/derive.d.ts

@@ -1,5 +1,5 @@
 /**
- * Pure Run→Session fan-in helper per session-hierarchy.md §5.1.
+ * Pure Turn→Session fan-in helper per session-hierarchy.md §5.1.
  *
  * Extracted from `session/hierarchy/session.ts` on 2026-04-21 (ses_010 commit
  * 4) so the shape definition can live under `types/session/` while the
@@ -7,27 +7,27 @@
  * (`types/` = pure shapes, feature folders = runtime).
  *
  * The precedence (highest first) matches the pattern-doc table:
- *   1. Session-level states that do not fan in from Run status:
+ *   1. Session-level states that do not fan in from Turn status:
  *      - `locked` (handoff CAS window) — preserved verbatim
  *      - `awaiting_merge` (broadcast source post-fan-out, §5.4) — preserved
  *      - `archived` (retention tombstone, §12.3) — preserved
- *   2. Any Run `running` or `awaiting_subsession` → Session `active`.
+ *   2. Any turn `running` or `awaiting_subsession` → Session `active`.
  *      Delegation-in-flight is an active state of the parent — the parent
- *      Run is suspended waiting on the child's SessionSummaryMaterializer,
+ *      turn is suspended waiting on the child's SessionSummaryMaterializer,
  *      and the session is NOT idle while that is pending.
- *   3. Any Run `awaiting_hitl` or `awaiting_hitl_resolution` → Session
+ *   3. Any turn `awaiting_hitl` or `awaiting_hitl_resolution` → Session
  *      `awaiting_hitl`.
- *   4. All Runs `failed` and at least one Run present → Session `failed`.
- *   5. Otherwise (all runs terminal — succeeded/cancelled/failed mix, or no
- *      runs at all) → Session `idle`.
+ *   4. All turns `failed` and at least one turn present → Session `failed`.
+ *   5. Otherwise (all turns terminal — succeeded/cancelled/failed mix, or no
+ *      turns at all) → Session `idle`.
  *
  * `cancelled` does NOT surface a `failed` Session (§5.1 — "Cancellation is
- * not a terminal Session state"). Only `failed` runs drive the Session to
- * `failed` when every Run ended that way.
+ * not a terminal Session state"). Only `failed` turns drive the Session to
+ * `failed` when every Turn ended that way.
  */
-import type { RunStatus } from '../../types/run/status.js';
 import type { Session, SessionStatus } from '../../types/session/entity.js';
-export declare function deriveStatus(session: Session, runs: readonly {
-    status: RunStatus;
+import type { TurnStatus } from '../../types/session/turn.js';
+export declare function deriveStatus(session: Session, turns: readonly {
+    status: TurnStatus;
 }[]): SessionStatus;
 //# sourceMappingURL=derive.d.ts.map

package/dist/session/status/derive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive.d.ts","sourceRoot":"","sources":["../../../src/session/status/derive.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAE3E,wBAAgB,YAAY,CAC3B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,EAAE,GACpC,aAAa,CA4Bf"}
+{"version":3,"file":"derive.d.ts","sourceRoot":"","sources":["../../../src/session/status/derive.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAE7D,wBAAgB,YAAY,CAC3B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,EAAE,GACtC,aAAa,CA4Bf"}

package/dist/session/status/derive.js

@@ -1,5 +1,5 @@
 /**
- * Pure Run→Session fan-in helper per session-hierarchy.md §5.1.
+ * Pure Turn→Session fan-in helper per session-hierarchy.md §5.1.
  *
  * Extracted from `session/hierarchy/session.ts` on 2026-04-21 (ses_010 commit
  * 4) so the shape definition can live under `types/session/` while the
@@ -7,49 +7,49 @@
  * (`types/` = pure shapes, feature folders = runtime).
  *
  * The precedence (highest first) matches the pattern-doc table:
- *   1. Session-level states that do not fan in from Run status:
+ *   1. Session-level states that do not fan in from Turn status:
  *      - `locked` (handoff CAS window) — preserved verbatim
  *      - `awaiting_merge` (broadcast source post-fan-out, §5.4) — preserved
  *      - `archived` (retention tombstone, §12.3) — preserved
- *   2. Any Run `running` or `awaiting_subsession` → Session `active`.
+ *   2. Any turn `running` or `awaiting_subsession` → Session `active`.
  *      Delegation-in-flight is an active state of the parent — the parent
- *      Run is suspended waiting on the child's SessionSummaryMaterializer,
+ *      turn is suspended waiting on the child's SessionSummaryMaterializer,
  *      and the session is NOT idle while that is pending.
- *   3. Any Run `awaiting_hitl` or `awaiting_hitl_resolution` → Session
+ *   3. Any turn `awaiting_hitl` or `awaiting_hitl_resolution` → Session
  *      `awaiting_hitl`.
- *   4. All Runs `failed` and at least one Run present → Session `failed`.
- *   5. Otherwise (all runs terminal — succeeded/cancelled/failed mix, or no
- *      runs at all) → Session `idle`.
+ *   4. All turns `failed` and at least one turn present → Session `failed`.
+ *   5. Otherwise (all turns terminal — succeeded/cancelled/failed mix, or no
+ *      turns at all) → Session `idle`.
  *
  * `cancelled` does NOT surface a `failed` Session (§5.1 — "Cancellation is
- * not a terminal Session state"). Only `failed` runs drive the Session to
- * `failed` when every Run ended that way.
+ * not a terminal Session state"). Only `failed` turns drive the Session to
+ * `failed` when every Turn ended that way.
  */
-export function deriveStatus(session, runs) {
-    // Session-level overrides — these states do not fan in from Run status.
+export function deriveStatus(session, turns) {
+    // Session-level overrides — these states do not fan in from Turn status.
     if (session.status === 'locked')
         return 'locked';
     if (session.status === 'awaiting_merge')
         return 'awaiting_merge';
     if (session.status === 'archived')
         return 'archived';
-    // Any active Run (in-flight iteration or awaiting a child sub-session) →
-    // `active`. Delegation is an active state: the parent Run is suspended
+    // Any active turn (in-flight iteration or awaiting a child sub-session) →
+    // `active`. Delegation is an active state: the parent turn is suspended
     // waiting on the child's Materializer, not idle.
-    const hasActive = runs.some((r) => r.status === 'running' || r.status === 'awaiting_subsession');
+    const hasActive = turns.some((r) => r.status === 'running' || r.status === 'awaiting_subsession');
     if (hasActive)
         return 'active';
     // Any HITL block (synchronous or persisted) → `awaiting_hitl`.
-    const hasHitl = runs.some((r) => r.status === 'awaiting_hitl' || r.status === 'awaiting_hitl_resolution');
+    const hasHitl = turns.some((r) => r.status === 'awaiting_hitl' || r.status === 'awaiting_hitl_resolution');
     if (hasHitl)
         return 'awaiting_hitl';
-    // All failed (with at least one Run) → `failed`. Note that a `cancelled`
-    // Run does NOT drive the Session to `failed`; §5.1 is explicit that
+    // All failed (with at least one turn) → `failed`. Note that a `cancelled`
+    // turn does NOT drive the Session to `failed`; §5.1 is explicit that
     // cancellation leaves the Session `idle`.
-    if (runs.length > 0 && runs.every((r) => r.status === 'failed')) {
+    if (turns.length > 0 && turns.every((r) => r.status === 'failed')) {
         return 'failed';
     }
-    // Otherwise — empty run set, or all runs terminated (succeeded / cancelled
+    // Otherwise — empty turn set, or all turns terminated (succeeded / cancelled
     // / mixed with failed) — the Session is `idle`.
     return 'idle';
 }

package/dist/session/status/derive.js.map

@@ -1 +1 @@
-{"version":3,"file":"derive.js","sourceRoot":"","sources":["../../../src/session/status/derive.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAKH,MAAM,UAAU,YAAY,CAC3B,OAAgB,EAChB,IAAsC;IAEtC,wEAAwE;IACxE,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAChD,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAgB;QAAE,OAAO,gBAAgB,CAAA;IAChE,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU;QAAE,OAAO,UAAU,CAAA;IAEpD,yEAAyE;IACzE,uEAAuE;IACvE,iDAAiD;IACjD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,qBAAqB,CAAC,CAAA;IAChG,IAAI,SAAS;QAAE,OAAO,QAAQ,CAAA;IAE9B,+DAA+D;IAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,eAAe,IAAI,CAAC,CAAC,MAAM,KAAK,0BAA0B,CAC9E,CAAA;IACD,IAAI,OAAO;QAAE,OAAO,eAAe,CAAA;IAEnC,yEAAyE;IACzE,oEAAoE;IACpE,0CAA0C;IAC1C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjE,OAAO,QAAQ,CAAA;IAChB,CAAC;IAED,2EAA2E;IAC3E,gDAAgD;IAChD,OAAO,MAAM,CAAA;AACd,CAAC"}
+{"version":3,"file":"derive.js","sourceRoot":"","sources":["../../../src/session/status/derive.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAKH,MAAM,UAAU,YAAY,CAC3B,OAAgB,EAChB,KAAwC;IAExC,yEAAyE;IACzE,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAChD,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAgB;QAAE,OAAO,gBAAgB,CAAA;IAChE,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU;QAAE,OAAO,UAAU,CAAA;IAEpD,0EAA0E;IAC1E,wEAAwE;IACxE,iDAAiD;IACjD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,qBAAqB,CAAC,CAAA;IACjG,IAAI,SAAS;QAAE,OAAO,QAAQ,CAAA;IAE9B,+DAA+D;IAC/D,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CACzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,eAAe,IAAI,CAAC,CAAC,MAAM,KAAK,0BAA0B,CAC9E,CAAA;IACD,IAAI,OAAO;QAAE,OAAO,eAAe,CAAA;IAEnC,0EAA0E;IAC1E,qEAAqE;IACrE,0CAA0C;IAC1C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE,CAAC;QACnE,OAAO,QAAQ,CAAA;IAChB,CAAC;IAED,6EAA6E;IAC7E,gDAAgD;IAChD,OAAO,MAAM,CAAA;AACd,CAAC"}

package/dist/session/workspace/git-worktree.d.ts

@@ -35,7 +35,8 @@ export interface GitWorktreeDriverConfig {
     repoRoot: string;
     /**
      * Directory (absolute) where worktree checkouts live. Defaults to
-     * `{repoRoot}/.namzu/worktrees` per session-hierarchy.md §7.2.
+     * `<NAMZU_HOME>/projects/<slug>/worktrees/` for the repo root's project:
+     * namzu never writes under the working directory.
      */
     worktreesDir?: string;
     logger: Logger;
@@ -91,4 +92,10 @@ export declare function parseWorktreeList(stdout: string, worktreePath: string):
     head?: string;
     branch?: string;
 } | null;
+/**
+ * `<NAMZU_HOME>/projects/<slug>/worktrees/` for a repository: the project's
+ * slug, or its hashed form when `project.json` under the plain slug belongs
+ * to a different directory (the rule `ensureProject` applies).
+ */
+export declare function defaultWorktreesDir(repoRoot: string): string;
 //# sourceMappingURL=git-worktree.d.ts.map

package/dist/session/workspace/git-worktree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-worktree.d.ts","sourceRoot":"","sources":["../../../src/session/workspace/git-worktree.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAOH,OAAO,KAAK,EAA0B,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAGxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAEnD,OAAO,KAAK,EACX,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,MAAM,aAAa,CAAA;AAIpB;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACd;AAED;;;;GAIG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,cAAc,CAAC,CAAA;AAIzF;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACvC,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAA;IAChB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACnB;AAED,qBAAa,iBAAkB,YAAW,sBAAsB;IAC/D,QAAQ,CAAC,IAAI,EAAG,cAAc,CAAS;IAEvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;gBAEnB,MAAM,EAAE,uBAAuB;IAOrC,MAAM,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;IAmF5D,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;IAOlF,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C/C;;;;;;;;;;;;;OAaG;YACW,cAAc;IAmBtB,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAoC9D;;;;;;;;;;OAUG;YACW,eAAe;YAmCf,eAAe;CAqB7B;AA4BD;;;GAGG;AACH,wBAAgB,iBAAiB,CAChC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAqBzD"}
+{"version":3,"file":"git-worktree.d.ts","sourceRoot":"","sources":["../../../src/session/workspace/git-worktree.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAQH,OAAO,KAAK,EAA0B,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAGxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAInD,OAAO,KAAK,EACX,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,MAAM,aAAa,CAAA;AAIpB;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACd;AAED;;;;GAIG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,cAAc,CAAC,CAAA;AAIzF;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACvC,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAA;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACnB;AAED,qBAAa,iBAAkB,YAAW,sBAAsB;IAC/D,QAAQ,CAAC,IAAI,EAAG,cAAc,CAAS;IAEvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;gBAEnB,MAAM,EAAE,uBAAuB;IAOrC,MAAM,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;IAmF5D,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;IAOlF,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C/C;;;;;;;;;;;;;OAaG;YACW,cAAc;IAmBtB,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAoC9D;;;;;;;;;;OAUG;YACW,eAAe;YAmCf,eAAe;CAqB7B;AA4BD;;;GAGG;AACH,wBAAgB,iBAAiB,CAChC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAqBzD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAkB5D"}