@unbrained/pm-cli 2026.3.12 → 2026.5.1-2

package/dist/cli/commands/reindex.js

@@ -1,19 +1,35 @@
-import fs from "node:fs/promises";
 import path from "node:path";
-import { runActiveOnIndexHooks, runActiveOnReadHooks, runActiveOnWriteHooks } from "../../core/extensions/index.js";
+import { getActiveExtensionRegistrations, runActiveOnIndexHooks, runActiveOnWriteHooks } from "../../core/extensions/index.js";
+import { resolveRegisteredSearchProvider, resolveRegisteredVectorStoreAdapter, } from "../../core/extensions/runtime-registrations.js";
 import { pathExists, writeFileAtomic } from "../../core/fs/fs-utils.js";
-import { parseItemDocument } from "../../core/item/item-format.js";
+import { resolveItemTypeRegistry } from "../../core/item/type-registry.js";
 import { executeEmbeddingBatchesWithRetry } from "../../core/search/embedding-batches.js";
+import { writeVectorizationStatusLedger } from "../../core/search/cache.js";
 import { resolveEmbeddingProviders } from "../../core/search/providers.js";
+import { resolveSettingsWithSemanticRuntimeDefaults } from "../../core/search/semantic-defaults.js";
 import { executeVectorUpsert, resolveVectorStores } from "../../core/search/vector-stores.js";
-import { EXIT_CODE, TYPE_TO_FOLDER } from "../../core/shared/constants.js";
+import { EXIT_CODE } from "../../core/shared/constants.js";
 import { PmCliError } from "../../core/shared/errors.js";
 import { nowIso } from "../../core/shared/time.js";
-import { listAllFrontMatter } from "../../core/store/item-store.js";
+import { listAllFrontMatterWithBody } from "../../core/store/item-store.js";
 import { getSettingsPath, resolvePmRoot } from "../../core/store/paths.js";
 import { readSettings } from "../../core/store/settings.js";
 const MANIFEST_PATH = "index/manifest.json";
 const EMBEDDINGS_PATH = "search/embeddings.jsonl";
+function shouldEmitReindexProgress(options) {
+    return options.progress === true || process.stderr.isTTY === true;
+}
+function emitReindexProgress(enabled, message) {
+    if (!enabled) {
+        return;
+    }
+    try {
+        process.stderr.write(`[pm reindex] ${message}\n`);
+    }
+    catch {
+        // Ignore transient stderr write failures.
+    }
+}
 function parseMode(raw) {
     const normalized = (raw ?? "keyword").trim().toLowerCase();
     if (normalized === "keyword") {
@@ -24,20 +40,15 @@ function parseMode(raw) {
     }
     throw new PmCliError("Reindex mode must be one of keyword|semantic|hybrid", EXIT_CODE.USAGE);
 }
-async function loadDocuments(pmRoot) {
-    const items = await listAllFrontMatter(pmRoot);
-    const sortedItems = [...items].sort((a, b) => a.id.localeCompare(b.id));
-    const documents = [];
-    for (const item of sortedItems) {
-        const itemPath = path.join(pmRoot, TYPE_TO_FOLDER[item.type], `${item.id}.md`);
-        const raw = await fs.readFile(itemPath, "utf8");
-        await runActiveOnReadHooks({
-            path: itemPath,
-            scope: "project",
-        });
-        documents.push(parseItemDocument(raw));
-    }
-    return documents;
+async function loadDocuments(pmRoot, itemFormat, typeToFolder, schema) {
+    const items = await listAllFrontMatterWithBody(pmRoot, itemFormat, typeToFolder, undefined, schema);
+    return items.map((item) => {
+        const { body, ...frontMatter } = item;
+        return {
+            front_matter: frontMatter,
+            body,
+        };
+    });
 }
 function buildKeywordRecord(document, mode) {
     const item = document.front_matter;
@@ -64,29 +75,128 @@ function buildKeywordRecord(document, mode) {
 function buildSemanticCorpusInput(document) {
     return JSON.stringify(buildKeywordRecord(document, "semantic").corpus);
 }
+function toOptionalNonEmptyString(value) {
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const normalized = value.trim();
+    return normalized.length > 0 ? normalized : undefined;
+}
+function resolveExtensionSearchEmbedding(settings) {
+    const registrations = getActiveExtensionRegistrations();
+    const providerName = toOptionalNonEmptyString(settings.search?.provider);
+    const registration = resolveRegisteredSearchProvider(registrations, providerName);
+    if (!registration) {
+        return null;
+    }
+    const runtimeDefinition = registration.runtime_definition ?? registration.definition;
+    const name = toOptionalNonEmptyString(runtimeDefinition.name) ??
+        toOptionalNonEmptyString(registration.definition.name) ??
+        providerName;
+    if (!name) {
+        return null;
+    }
+    const embedBatch = runtimeDefinition.embedBatch;
+    const embedBatchSnake = runtimeDefinition.embed_batch;
+    const embed = runtimeDefinition.embed;
+    const resolvedEmbedBatch = typeof embedBatch === "function"
+        ? embedBatch
+        : typeof embedBatchSnake === "function"
+            ? embedBatchSnake
+            : undefined;
+    const resolvedEmbed = typeof embed === "function" ? embed : undefined;
+    if (!resolvedEmbedBatch && !resolvedEmbed) {
+        return null;
+    }
+    return {
+        name,
+        embedBatch: resolvedEmbedBatch,
+        embed: resolvedEmbed,
+    };
+}
+function resolveExtensionVectorUpsert(settings) {
+    const registrations = getActiveExtensionRegistrations();
+    const adapterName = toOptionalNonEmptyString(settings.vector_store?.adapter);
+    const registration = resolveRegisteredVectorStoreAdapter(registrations, adapterName);
+    if (!registration) {
+        return null;
+    }
+    const runtimeDefinition = registration.runtime_definition ?? registration.definition;
+    const name = toOptionalNonEmptyString(runtimeDefinition.name) ??
+        toOptionalNonEmptyString(registration.definition.name) ??
+        adapterName;
+    const upsert = runtimeDefinition.upsert;
+    if (!name || typeof upsert !== "function") {
+        return null;
+    }
+    return {
+        name,
+        upsert: upsert,
+    };
+}
+function assertVector(value, context) {
+    if (!Array.isArray(value) || value.some((entry) => typeof entry !== "number" || !Number.isFinite(entry))) {
+        throw new PmCliError(`Invalid vector returned by ${context}`, EXIT_CODE.GENERIC_FAILURE);
+    }
+    return value;
+}
+async function executeExtensionEmbedding(extensionEmbedding, settings, corpusInputs) {
+    const model = settings.search?.embedding_model?.trim() || "text-embedding-3-small";
+    if (extensionEmbedding.embedBatch) {
+        const vectors = await Promise.resolve(extensionEmbedding.embedBatch({
+            inputs: corpusInputs,
+            settings,
+            model,
+        }));
+        if (!Array.isArray(vectors)) {
+            throw new PmCliError(`Extension search provider "${extensionEmbedding.name}" embedBatch must return an array of vectors`, EXIT_CODE.GENERIC_FAILURE);
+        }
+        return vectors.map((vector, index) => assertVector(vector, `extension search provider "${extensionEmbedding.name}" embedBatch output at index ${index}`));
+    }
+    if (!extensionEmbedding.embed) {
+        throw new PmCliError(`Extension search provider "${extensionEmbedding.name}" does not implement embed/embedBatch`, EXIT_CODE.GENERIC_FAILURE);
+    }
+    const vectors = [];
+    for (const [index, input] of corpusInputs.entries()) {
+        const vector = await Promise.resolve(extensionEmbedding.embed({
+            input,
+            settings,
+            model,
+        }));
+        vectors.push(assertVector(vector, `extension search provider "${extensionEmbedding.name}" embed output at index ${index}`));
+    }
+    return vectors;
+}
 export async function runReindex(options, global) {
     const requestedMode = parseMode(options.mode);
+    const progressEnabled = shouldEmitReindexProgress(options);
+    emitReindexProgress(progressEnabled, `start mode=${requestedMode}`);
     const pmRoot = resolvePmRoot(process.cwd(), global.path);
     if (!(await pathExists(getSettingsPath(pmRoot)))) {
         throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);
     }
-    const settings = await readSettings(pmRoot);
+    const settings = resolveSettingsWithSemanticRuntimeDefaults(await readSettings(pmRoot)).settings;
+    const typeRegistry = resolveItemTypeRegistry(settings, getActiveExtensionRegistrations());
+    const extensionEmbedding = resolveExtensionSearchEmbedding(settings);
+    const extensionVectorUpsert = resolveExtensionVectorUpsert(settings);
     let activeEmbeddingProvider = null;
     let activeVectorStore = null;
     if (requestedMode !== "keyword") {
         const providerResolution = resolveEmbeddingProviders(settings);
-        if (!providerResolution.active) {
-            throw new PmCliError(`Reindex mode '${requestedMode}' requires a configured embedding provider in settings.providers.openai or settings.providers.ollama`, EXIT_CODE.USAGE);
+        if (!providerResolution.active && !extensionEmbedding) {
+            throw new PmCliError(`Reindex mode '${requestedMode}' requires a configured embedding provider in settings.providers.openai/settings.providers.ollama or an extension provider selected by settings.search.provider`, EXIT_CODE.USAGE);
         }
         const vectorResolution = resolveVectorStores(settings);
-        if (!vectorResolution.active) {
-            throw new PmCliError(`Reindex mode '${requestedMode}' requires a configured vector store in settings.vector_store.qdrant or settings.vector_store.lancedb`, EXIT_CODE.USAGE);
+        if (!vectorResolution.active && !extensionVectorUpsert) {
+            throw new PmCliError(`Reindex mode '${requestedMode}' requires a configured vector store in settings.vector_store.qdrant/settings.vector_store.lancedb or an extension adapter selected by settings.vector_store.adapter`, EXIT_CODE.USAGE);
         }
         activeEmbeddingProvider = providerResolution.active;
         activeVectorStore = vectorResolution.active;
     }
     const mode = requestedMode;
-    const documents = await loadDocuments(pmRoot);
+    emitReindexProgress(progressEnabled, "loading item corpus");
+    const documents = await loadDocuments(pmRoot, settings.item_format, typeRegistry.type_to_folder, settings.schema);
+    emitReindexProgress(progressEnabled, `loaded_items=${documents.length}`);
     const generatedAt = nowIso();
     const manifest = {
         version: 1,
@@ -105,13 +215,37 @@ export async function runReindex(options, global) {
     const embeddingsPath = path.join(pmRoot, EMBEDDINGS_PATH);
     const embeddingsLines = documents.map((document) => JSON.stringify(buildKeywordRecord(document, mode))).join("\n");
     const semanticWarnings = [];
-    if (mode !== "keyword" && documents.length > 0 && activeEmbeddingProvider && activeVectorStore) {
+    const vectorizationLedgerEntries = {};
+    if (mode !== "keyword" && documents.length > 0) {
+        emitReindexProgress(progressEnabled, `embedding_start items=${documents.length}`);
         const corpusInputs = documents.map((document) => buildSemanticCorpusInput(document));
-        const embeddingResult = await executeEmbeddingBatchesWithRetry(activeEmbeddingProvider, settings, corpusInputs);
-        semanticWarnings.push(...embeddingResult.warnings);
-        await executeVectorUpsert(activeVectorStore, documents.map((document, index) => ({
+        let vectors = [];
+        if (extensionEmbedding) {
+            try {
+                vectors = await executeExtensionEmbedding(extensionEmbedding, settings, corpusInputs);
+            }
+            catch (error) {
+                if (!activeEmbeddingProvider) {
+                    throw new PmCliError(`Extension search provider "${extensionEmbedding.name}" failed to generate embeddings: ${error instanceof Error ? error.message : String(error)}`, EXIT_CODE.GENERIC_FAILURE);
+                }
+                semanticWarnings.push(`Extension search provider "${extensionEmbedding.name}" failed; falling back to built-in provider (${error instanceof Error ? error.message : String(error)})`);
+            }
+        }
+        if (vectors.length === 0) {
+            if (!activeEmbeddingProvider) {
+                throw new PmCliError(`No embedding executor available for reindex mode '${requestedMode}'`, EXIT_CODE.USAGE);
+            }
+            const embeddingResult = await executeEmbeddingBatchesWithRetry(activeEmbeddingProvider, settings, corpusInputs);
+            semanticWarnings.push(...embeddingResult.warnings);
+            vectors = embeddingResult.vectors;
+        }
+        emitReindexProgress(progressEnabled, `embedding_complete vectors=${vectors.length}`);
+        if (vectors.length !== documents.length) {
+            throw new PmCliError(`Embedding output size mismatch (expected ${documents.length}, received ${vectors.length})`, EXIT_CODE.GENERIC_FAILURE);
+        }
+        const points = documents.map((document, index) => ({
             id: document.front_matter.id,
-            vector: embeddingResult.vectors[index],
+            vector: assertVector(vectors[index], `reindex embeddings output at index ${index}`),
             payload: {
                 id: document.front_matter.id,
                 type: document.front_matter.type,
@@ -119,10 +253,51 @@ export async function runReindex(options, global) {
                 priority: document.front_matter.priority,
                 updated_at: document.front_matter.updated_at,
             },
-        })));
+        }));
+        if (extensionVectorUpsert) {
+            try {
+                emitReindexProgress(progressEnabled, `vector_upsert_start adapter=${extensionVectorUpsert.name} points=${points.length}`);
+                await Promise.resolve(extensionVectorUpsert.upsert({
+                    points,
+                    settings,
+                }));
+                emitReindexProgress(progressEnabled, `vector_upsert_complete adapter=${extensionVectorUpsert.name}`);
+            }
+            catch (error) {
+                if (!activeVectorStore) {
+                    throw new PmCliError(`Extension vector adapter "${extensionVectorUpsert.name}" failed to upsert vectors: ${error instanceof Error ? error.message : String(error)}`, EXIT_CODE.GENERIC_FAILURE);
+                }
+                semanticWarnings.push(`Extension vector adapter "${extensionVectorUpsert.name}" failed; falling back to built-in vector store (${error instanceof Error ? error.message : String(error)})`);
+                emitReindexProgress(progressEnabled, "vector_upsert_fallback built_in_store");
+                await executeVectorUpsert(activeVectorStore, points);
+                emitReindexProgress(progressEnabled, `vector_upsert_complete adapter=${activeVectorStore.name}`);
+            }
+        }
+        else if (activeVectorStore) {
+            emitReindexProgress(progressEnabled, `vector_upsert_start adapter=${activeVectorStore.name} points=${points.length}`);
+            await executeVectorUpsert(activeVectorStore, points);
+            emitReindexProgress(progressEnabled, `vector_upsert_complete adapter=${activeVectorStore.name}`);
+        }
+        else {
+            throw new PmCliError(`No vector upsert executor available for reindex mode '${requestedMode}'`, EXIT_CODE.USAGE);
+        }
+        for (const document of documents) {
+            vectorizationLedgerEntries[document.front_matter.id] = document.front_matter.updated_at;
+        }
     }
+    emitReindexProgress(progressEnabled, "writing keyword artifacts");
     await writeFileAtomic(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
     await writeFileAtomic(embeddingsPath, `${embeddingsLines}\n`);
+    const vectorizationWarnings = [];
+    if (mode !== "keyword") {
+        try {
+            emitReindexProgress(progressEnabled, "writing vectorization status ledger");
+            await writeVectorizationStatusLedger(pmRoot, vectorizationLedgerEntries);
+        }
+        catch (error) {
+            vectorizationWarnings.push(`search_vectorization_status_ledger_write_failed:${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     const hookWarnings = [
         ...(await runActiveOnWriteHooks({
             path: manifestPath,
@@ -139,6 +314,7 @@ export async function runReindex(options, global) {
             total_items: documents.length,
         })),
     ];
+    emitReindexProgress(progressEnabled, "done");
     return {
         ok: true,
         mode,
@@ -147,7 +323,7 @@ export async function runReindex(options, global) {
             manifest: MANIFEST_PATH,
             embeddings: EMBEDDINGS_PATH,
         },
-        warnings: [...semanticWarnings, ...hookWarnings],
+        warnings: [...semanticWarnings, ...vectorizationWarnings, ...hookWarnings],
         generated_at: generatedAt,
     };
 }

package/dist/cli/commands/reindex.js.map

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

package/dist/cli/commands/restore.js

@@ -1,15 +1,19 @@
 import jsonPatch from "fast-json-patch";
+import fs from "node:fs/promises";
 import { pathExists, writeFileAtomic } from "../../core/fs/fs-utils.js";
 import { appendHistoryEntry, createHistoryEntry } from "../../core/history/history.js";
+import { enforceHistoryStreamPolicyForItem } from "../../core/history/history-stream-policy.js";
+import { normalizeItemId, normalizeRawItemId } from "../../core/item/id.js";
 import { canonicalDocument, serializeItemDocument } from "../../core/item/item-format.js";
+import { resolveItemTypeRegistry } from "../../core/item/type-registry.js";
 import { acquireLock } from "../../core/lock/lock.js";
 import { EXIT_CODE, FRONT_MATTER_KEY_ORDER } from "../../core/shared/constants.js";
 import { PmCliError } from "../../core/shared/errors.js";
 import { nowIso } from "../../core/shared/time.js";
 import { orderObject, sha256Hex, stableStringify } from "../../core/shared/serialization.js";
-import { runActiveOnWriteHooks } from "../../core/extensions/index.js";
+import { getActiveExtensionRegistrations, runActiveOnWriteHooks } from "../../core/extensions/index.js";
 import { locateItem, readLocatedItem } from "../../core/store/item-store.js";
-import { getHistoryPath, getSettingsPath, resolvePmRoot } from "../../core/store/paths.js";
+import { getHistoryPath, getItemPath, getSettingsPath, resolvePmRoot } from "../../core/store/paths.js";
 import { readSettings } from "../../core/store/settings.js";
 import { readHistoryEntries } from "./history.js";
 const EMPTY_REPLAY_DOCUMENT = {
@@ -22,6 +26,12 @@ function toAuthor(candidate, defaultAuthor) {
     return trimmed || "unknown";
 }
 function toReplayDocument(document) {
+    if (!document.front_matter || Object.keys(document.front_matter).length === 0) {
+        return {
+            front_matter: {},
+            body: document.body ?? "",
+        };
+    }
     const canonical = canonicalDocument(document);
     return {
         front_matter: orderObject(canonical.front_matter, FRONT_MATTER_KEY_ORDER),
@@ -70,7 +80,41 @@ function ensureReplayTarget(target, history) {
         historyIndex: index,
     };
 }
-function applyHistoryPatch(current, patch, entryNumber) {
+function extractPatchFailureContext(patch, error) {
+    const context = {};
+    if (error instanceof Error && error.message.trim().length > 0) {
+        context.reason = error.message.trim();
+    }
+    if (typeof error !== "object" || error === null) {
+        return context;
+    }
+    const candidate = error;
+    if (typeof candidate.index === "number" && Number.isInteger(candidate.index) && candidate.index >= 0) {
+        context.patchIndex = candidate.index;
+    }
+    const operationRecord = typeof candidate.operation === "object" && candidate.operation !== null
+        ? candidate.operation
+        : null;
+    if (operationRecord && typeof operationRecord.op === "string") {
+        context.op = operationRecord.op;
+    }
+    if (operationRecord && typeof operationRecord.path === "string") {
+        context.path = operationRecord.path;
+    }
+    if (operationRecord && typeof operationRecord.from === "string") {
+        context.from = operationRecord.from;
+    }
+    if ((context.op === undefined || context.path === undefined) && context.patchIndex !== undefined) {
+        const fallback = patch[context.patchIndex];
+        if (fallback) {
+            context.op = context.op ?? fallback.op;
+            context.path = context.path ?? fallback.path;
+            context.from = context.from ?? fallback.from;
+        }
+    }
+    return context;
+}
+function applyHistoryPatch(current, patch, entryNumber, entryOp) {
     try {
         const applied = jsonPatch.applyPatch(structuredClone(current), patch, true, false).newDocument;
         if (typeof applied !== "object" ||
@@ -92,7 +136,16 @@ function applyHistoryPatch(current, patch, entryNumber) {
         if (error instanceof PmCliError) {
             throw error;
         }
-        throw new PmCliError(`Failed to apply history patch at entry ${entryNumber}.`, EXIT_CODE.GENERIC_FAILURE);
+        const failureContext = extractPatchFailureContext(patch, error);
+        const contextTokens = [
+            `history_op=${entryOp}`,
+            failureContext.patchIndex !== undefined ? `patch_index=${failureContext.patchIndex}` : null,
+            failureContext.op ? `op=${failureContext.op}` : null,
+            failureContext.path ? `path=${failureContext.path}` : null,
+            failureContext.from ? `from=${failureContext.from}` : null,
+        ].filter((token) => token !== null);
+        const reasonSuffix = failureContext.reason ? ` ${failureContext.reason}` : "";
+        throw new PmCliError(`Failed to apply history patch at entry ${entryNumber} (${contextTokens.join(", ")}).${reasonSuffix}`, EXIT_CODE.GENERIC_FAILURE);
     }
 }
 function replayToTarget(history, targetIndex) {
@@ -103,7 +156,7 @@ function replayToTarget(history, targetIndex) {
         if (beforeHash !== entry.before_hash) {
             throw new PmCliError(`History hash mismatch before replay at entry ${i + 1}.`, EXIT_CODE.GENERIC_FAILURE);
         }
-        document = applyHistoryPatch(document, entry.patch, i + 1);
+        document = applyHistoryPatch(document, entry.patch, i + 1, entry.op);
         const afterHash = replayHash(document);
         if (afterHash !== entry.after_hash) {
             throw new PmCliError(`History hash mismatch after replay at entry ${i + 1}.`, EXIT_CODE.GENERIC_FAILURE);
@@ -111,6 +164,58 @@ function replayToTarget(history, targetIndex) {
     }
     return document;
 }
+function ensureMaterializedRestoreTarget(replayDocument, target) {
+    if (Object.keys(replayDocument.front_matter).length > 0) {
+        return replayDocument;
+    }
+    throw new PmCliError(`Restore target ${target.raw} resolves to a deleted state; choose a version or timestamp where the item exists.`, EXIT_CODE.USAGE);
+}
+function replayCurrentDocument(history) {
+    const currentReplay = replayToTarget(history, history.length - 1);
+    if (Object.keys(currentReplay.front_matter).length === 0) {
+        return {
+            front_matter: {},
+            body: currentReplay.body,
+        };
+    }
+    return canonicalDocument({
+        front_matter: currentReplay.front_matter,
+        body: currentReplay.body,
+    });
+}
+async function resolveRestoreSubject(pmRoot, id, settings, typeToFolder) {
+    const located = await locateItem(pmRoot, id, settings.id_prefix, settings.item_format, typeToFolder);
+    if (located) {
+        const historyPath = getHistoryPath(pmRoot, located.id);
+        const historyPolicy = await enforceHistoryStreamPolicyForItem({
+            pmRoot,
+            settings,
+            itemId: located.id,
+            commandLabel: "restore",
+        });
+        return {
+            id: located.id,
+            historyPath,
+            located,
+            historyPolicyWarnings: historyPolicy.warnings,
+        };
+    }
+    const normalizedId = normalizeItemId(id, settings.id_prefix);
+    const rawNormalizedId = normalizeRawItemId(id);
+    const candidateIds = normalizedId === rawNormalizedId ? [normalizedId] : [normalizedId, rawNormalizedId];
+    for (const candidateId of candidateIds) {
+        const historyPath = getHistoryPath(pmRoot, candidateId);
+        if (await pathExists(historyPath)) {
+            return {
+                id: candidateId,
+                historyPath,
+                located: null,
+                historyPolicyWarnings: [],
+            };
+        }
+    }
+    throw new PmCliError(`Item ${id} not found`, EXIT_CODE.NOT_FOUND);
+}
 function changedFields(beforeDocument, afterDocument) {
     const beforeReplay = toReplayDocument(beforeDocument);
     const afterReplay = toReplayDocument(afterDocument);
@@ -132,57 +237,86 @@ export async function runRestore(id, target, options, global) {
         throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);
     }
     const settings = await readSettings(pmRoot);
-    const located = await locateItem(pmRoot, id, settings.id_prefix);
-    if (!located) {
-        throw new PmCliError(`Item ${id} not found`, EXIT_CODE.NOT_FOUND);
-    }
-    const historyPath = getHistoryPath(pmRoot, located.id);
-    const history = await readHistoryEntries(historyPath, located.id);
+    const typeRegistry = resolveItemTypeRegistry(settings, getActiveExtensionRegistrations());
+    const subject = await resolveRestoreSubject(pmRoot, id, settings, typeRegistry.type_to_folder);
+    const resolvedId = subject.id;
+    const history = await readHistoryEntries(subject.historyPath, resolvedId);
     if (history.length === 0) {
-        throw new PmCliError(`No history exists for ${located.id}; restore is unavailable.`, EXIT_CODE.NOT_FOUND);
+        throw new PmCliError(`No history exists for ${resolvedId}; restore is unavailable.`, EXIT_CODE.NOT_FOUND);
     }
     const resolvedTarget = ensureReplayTarget(target, history);
-    const replayDocument = replayToTarget(history, resolvedTarget.historyIndex);
+    const replayDocument = ensureMaterializedRestoreTarget(replayToTarget(history, resolvedTarget.historyIndex), resolvedTarget);
     const restoredDocument = canonicalDocument({
         front_matter: replayDocument.front_matter,
         body: replayDocument.body,
-    });
-    if (restoredDocument.front_matter.id !== located.id) {
-        throw new PmCliError(`Restore target resolved to item ${restoredDocument.front_matter.id}, expected ${located.id}.`, EXIT_CODE.GENERIC_FAILURE);
+    }, { schema: settings.schema });
+    if (restoredDocument.front_matter.id !== resolvedId) {
+        throw new PmCliError(`Restore target resolved to item ${restoredDocument.front_matter.id}, expected ${resolvedId}.`, EXIT_CODE.GENERIC_FAILURE);
     }
     const author = toAuthor(options.author, settings.author_default);
-    const releaseLock = await acquireLock(pmRoot, located.id, settings.locks.ttl_seconds, author, Boolean(options.force));
+    const releaseLock = await acquireLock(pmRoot, resolvedId, settings.locks.ttl_seconds, author, Boolean(options.force), settings.governance.force_required_for_stale_lock);
     try {
-        const { raw: originalRaw, document: currentDocument } = await readLocatedItem(located);
-        const assigned = currentDocument.front_matter.assignee?.trim();
-        if (assigned && assigned !== author && !options.force) {
-            throw new PmCliError(`Item ${located.id} is assigned to ${assigned}. Use --force to override.`, EXIT_CODE.CONFLICT);
+        const existingItemPath = subject.located?.itemPath ?? null;
+        const itemFormat = subject.located?.item_format ?? settings.item_format;
+        let resolvedCurrentDocument;
+        let resolvedOriginalRaw = null;
+        if (subject.located) {
+            const loaded = await readLocatedItem(subject.located, { schema: settings.schema });
+            resolvedCurrentDocument = loaded.document;
+            resolvedOriginalRaw = loaded.raw;
+        }
+        else {
+            resolvedCurrentDocument = replayCurrentDocument(history);
+        }
+        const assigned = resolvedCurrentDocument.front_matter.assignee?.trim();
+        const ownershipWarnings = [];
+        const hasOwnershipConflict = assigned && assigned !== author && !options.force;
+        if (hasOwnershipConflict) {
+            if (settings.governance.ownership_enforcement === "strict") {
+                throw new PmCliError(`Item ${resolvedId} is assigned to ${assigned}. Use --force to override.`, EXIT_CODE.CONFLICT);
+            }
+            if (settings.governance.ownership_enforcement === "warn") {
+                ownershipWarnings.push(`ownership_warning:assignee_conflict:${resolvedId}:${assigned}`);
+            }
+        }
+        const serializedRestore = serializeItemDocument(restoredDocument, { format: itemFormat, schema: settings.schema });
+        const restoredItemPath = getItemPath(pmRoot, restoredDocument.front_matter.type, resolvedId, itemFormat, typeRegistry.type_to_folder);
+        await writeFileAtomic(restoredItemPath, serializedRestore);
+        if (existingItemPath && restoredItemPath !== existingItemPath) {
+            await fs.rm(existingItemPath);
         }
-        const serializedRestore = serializeItemDocument(restoredDocument);
-        await writeFileAtomic(located.itemPath, serializedRestore);
         const historyEntry = createHistoryEntry({
             nowIso: nowIso(),
             author,
             op: "restore",
-            before: currentDocument,
+            before: resolvedCurrentDocument,
             after: restoredDocument,
             message: options.message,
         });
         try {
-            await appendHistoryEntry(historyPath, historyEntry);
+            await appendHistoryEntry(subject.historyPath, historyEntry);
         }
         catch (error) {
-            await writeFileAtomic(located.itemPath, originalRaw);
+            if (existingItemPath && resolvedOriginalRaw !== null && restoredItemPath !== existingItemPath) {
+                await writeFileAtomic(existingItemPath, resolvedOriginalRaw);
+                await fs.rm(restoredItemPath, { force: true });
+            }
+            else if (existingItemPath && resolvedOriginalRaw !== null) {
+                await writeFileAtomic(existingItemPath, resolvedOriginalRaw);
+            }
+            else {
+                await fs.rm(restoredItemPath, { force: true });
+            }
             throw error;
         }
         const hookWarnings = [
             ...(await runActiveOnWriteHooks({
-                path: located.itemPath,
+                path: restoredItemPath,
                 scope: "project",
                 op: "restore",
             })),
             ...(await runActiveOnWriteHooks({
-                path: historyPath,
+                path: subject.historyPath,
                 scope: "project",
                 op: "restore:history",
             })),
@@ -197,8 +331,8 @@ export async function runRestore(id, target, options, global) {
                 entry_ts: targetEntry.ts,
                 entry_op: targetEntry.op,
             },
-            changed_fields: changedFields(currentDocument, restoredDocument),
-            warnings: hookWarnings,
+            changed_fields: changedFields(resolvedCurrentDocument, restoredDocument),
+            warnings: [...subject.historyPolicyWarnings, ...ownershipWarnings, ...hookWarnings],
         };
     }
     finally {