@unbrained/pm-cli 2026.10.13 → 2026.10.15

package/dist/sdk/merge/install.d.ts

@@ -12,67 +12,67 @@ export declare const PM_GITATTRIBUTES_V2_END = "# pm-cli:merge-drivers:v2:end";
 /** Control whether merge installation writes the fence and clone-local drivers or only previews the same configuration. */
 export interface MergeInstallOptions {
 /** Preview the `.gitattributes` and `git config` changes without writing anything. */
-dryRun?: boolean;
+dryRun?:boolean;
 }
 /** Installation or preview evidence identifying the selected workspace, fence coverage, and exact Git driver commands. */
 export interface MergeInstallResult {
 /** Whether the installation completed (or, for dry runs, would complete) without errors. */
-ok: boolean;
+ok:boolean;
 /** Whether this run was a preview only. */
-dry_run: boolean;
+dry_run:boolean;
 /** Canonical filesystem identity of the repository root the merge configuration was installed into. */
-workspace_root: string;
+workspace_root:string;
 /** Canonical filesystem identity of the tracker root covered by the merge configuration. */
-pm_root?: string;
+pm_root?:string;
 /** `.gitattributes` reconciliation outcome. */
-gitattributes: {
-path: string;
-changed: boolean;
-patterns: string[];
+gitattributes:{
+path:string;
+changed:boolean;
+patterns:string[];
 /** Stable schema source used to derive committed item-folder mappings. */
-schema_scope: "project";
+schema_scope:"project";
 };
 /** Local `git config` merge-driver definitions applied (or previewed). */
-git_config: Array<{
-key: string;
-value: string;
+git_config:Array<{
+key:string;
+value:string;
 }>;
 /** Guidance for completing the multi-branch workflow setup. */
-guidance: string[];
+guidance:string[];
 /** ISO 8601 timestamp recording when generated occurred. */
-generated_at: string;
+generated_at:string;
 }
 /** Resolved tracker and workspace selection for one merge-install invocation. */
 export interface MergeInstallContextResolution {
 /** Tracker root selected without performing filesystem writes. */
-pm_root: string;
+pm_root:string;
 /** Starting path used to discover the enclosing Git workspace. */
-workspace_start: string;
+workspace_start:string;
 /** Whether complete inherited source coordinates were present. */
-source_coordinates_available: boolean;
+source_coordinates_available:boolean;
 /** Whether inherited source coordinates were selected. */
-source_context_selected: boolean;
+source_context_selected:boolean;
 /** Source-coordinate write policy active for the invocation. */
-source_policy: ReturnType<typeof resolveSourceContextWritePolicy>;
+source_policy:ReturnType<typeof resolveSourceContextWritePolicy>;
 }
 /** Resolve explicit, inherited-source, and current-workspace precedence without I/O. */
-export declare function resolveMergeInstallContext(options: {
-cwd: string;
-explicitPath?: string;
-dryRun: boolean;
-environment: Readonly<Record<string, string | undefined>>;
-}): MergeInstallContextResolution;
+export declare function resolveMergeInstallContext(options:{
+cwd:string;
+explicitPath?:string;
+dryRun:boolean;
+environment:Readonly<Record<string,string | undefined>>;
+}):MergeInstallContextResolution;
 /** Result of auditing clone-local driver definitions behind a committed fence. */
 export interface MergeDriverConfigurationAuditResult {
 /** Whether every required driver definition exactly matches this installation. */
-status: "ok" | "missing" | "drift";
+status:"ok" | "missing" | "drift";
 /** Required Git configuration keys that are absent. */
-missing_keys: string[];
+missing_keys:string[];
 /** Driver keys whose configured commands do not match the installed CLI. */
-drifted_keys: string[];
+drifted_keys:string[];
 }
 /** Resolve the enclosing Git worktree root or return null outside Git. */
-export declare function findGitWorkspaceRoot(cwd: string): Promise<string | null>;
+export declare function findGitWorkspaceRoot(cwd:string):Promise<string | null>;
 /**
  * Build the complete fenced `.gitattributes` pattern list for a tracker rooted
  * at `trackerRelativeRoot` (git-root-relative POSIX path, empty when the
@@ -82,22 +82,22 @@ export declare function findGitWorkspaceRoot(cwd: string): Promise<string | null
  * active schema's type folders), so schema-added custom types can never
  * silently diverge from the installed fence without a warning.
  */
-export declare function buildMergeAttributePatterns(trackerRelativeRoot: string, typeFolders: string[]): string[];
+export declare function buildMergeAttributePatterns(trackerRelativeRoot:string,typeFolders:string[]):string[];
 /** Result of comparing the committed merge-fence block against the coverage the active schema requires. */
 export interface MergeFenceAuditResult {
 /** Audit outcome: no fence installed (nothing to audit), fence matches, or fence drifted from the active schema/type folders. */
-status: "not_installed" | "ok" | "drift";
+status:"not_installed" | "ok" | "drift";
 /** `.gitattributes` file containing the fence, when one was found. */
-path?: string;
+path?:string;
 /** Expected attribute lines absent from the committed fence (for example a schema-added type folder). */
-missing_patterns: string[];
+missing_patterns:string[];
 /** Committed fence lines no longer produced by the coverage contract (for example a removed type folder). */
-stale_patterns: string[];
+stale_patterns:string[];
 /** Stable schema source used to derive the expected committed fence. */
-schema_scope: "project";
+schema_scope:"project";
 }
 /** Resolve merge-fence folders from built-ins plus persisted project schema only. */
-export declare function resolveProjectMergeTypeFolders(settings: Awaited<ReturnType<typeof readSettings>>): string[];
+export declare function resolveProjectMergeTypeFolders(settings:Awaited<ReturnType<typeof readSettings>>):string[];
 /**
  * Audit the committed `.gitattributes` merge fence against the coverage the
  * active schema requires, without touching git configuration. The fence file
@@ -106,15 +106,15 @@ export declare function resolveProjectMergeTypeFolders(settings: Awaited<ReturnT
  * result means items of some type folder (or a tracker JSONL store) would
  * merge under git's default text driver despite the fence being installed.
  */
-export declare function auditMergeAttributeFence(pmRoot: string, typeFolders: string[]): Promise<MergeFenceAuditResult>;
+export declare function auditMergeAttributeFence(pmRoot:string,typeFolders:string[]):Promise<MergeFenceAuditResult>;
 /** Audit the clone-local Git driver commands without executing a merge. */
-export declare function auditMergeDriverConfiguration(workspaceRoot: string): Promise<MergeDriverConfigurationAuditResult>;
+export declare function auditMergeDriverConfiguration(workspaceRoot:string):Promise<MergeDriverConfigurationAuditResult>;
 /** Outcome of an automatic merge-fence refresh attempted after a schema type mutation. */
 export interface MergeFenceRefreshOutcome {
 /** What happened: the fence was rewritten, already matched, was never installed (actionable hint), or there is no git repository to configure. */
-status: "refreshed" | "unchanged" | "not_installed" | "no_git";
+status:"refreshed" | "unchanged" | "not_installed" | "no_git";
 /** `.gitattributes` path examined, when a git repository was found. */
-path?: string;
+path?:string;
 }
 /**
  * Refresh the fenced `.gitattributes` merge-driver block after a schema type
@@ -126,7 +126,7 @@ path?: string;
  * surface an actionable hint instead of mutating git configuration nobody
  * asked for.
  */
-export declare function refreshMergeAttributeFenceIfInstalled(pmRoot: string): Promise<MergeFenceRefreshOutcome>;
+export declare function refreshMergeAttributeFenceIfInstalled(pmRoot:string):Promise<MergeFenceRefreshOutcome>;
 /**
  * Install (or preview) the repository merge configuration for tracker data:
  * writes the fenced merge-driver block into `.gitattributes` (committed and
@@ -134,14 +134,14 @@ export declare function refreshMergeAttributeFenceIfInstalled(pmRoot: string): P
  * repository-local git config (per-clone, so every collaborator runs this once
  * per checkout). Requires an initialized tracker and a git repository.
  */
-export declare function runMergeInstall(options: MergeInstallOptions, global: GlobalOptions): Promise<MergeInstallResult>;
+export declare function runMergeInstall(options:MergeInstallOptions,global:GlobalOptions):Promise<MergeInstallResult>;
 /**
  * Install merge safety for an initialized tracker without depending on the
  * caller's cwd or global CLI path resolution. This is the SDK primitive used
  * by fresh init and by the `pm merge install` adapter.
  */
-export declare function installMergeFence(options: {
-pmRoot: string;
-workspaceRoot: string;
-dryRun?: boolean;
-}): Promise<MergeInstallResult>;
+export declare function installMergeFence(options:{
+pmRoot:string;
+workspaceRoot:string;
+dryRun?:boolean;
+}):Promise<MergeInstallResult>;

package/dist/sdk/merge/install.js

@@ -1,4 +1,4 @@
-(function(){try{var e=typeof window<"u"?window:typeof global<"u"?global:typeof globalThis<"u"?globalThis:typeof self<"u"?self:{},n=new e.Error().stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="36ccb98d-6645-52fe-aac2-be11f3a63c25")}catch{}})();import{assertInitializedTracker}from"../environment/tracker-preflight.js";import{isFileMissingError,readFileIfExists,writeFileAtomic}from"../../core/fs/fs-utils.js";import{access,readFile,realpath}from"node:fs/promises";import{constants}from"node:fs";import{execFile}from"node:child_process";import path from"node:path";import{promisify}from"node:util";import{pathExists}from"../../core/fs/fs-utils.js";import{resolveItemTypeRegistry}from"../../core/item/type-registry.js";import{acquireLock}from"../../core/lock/lock.js";import{resolvePmPackageRootFromModule}from"../../core/packages/root.js";import{EXIT_CODE}from"../../core/shared/constants.js";import{PmCliError}from"../../core/shared/errors.js";import{resolveAuthor}from"../../core/shared/author.js";import{nowIso}from"../../core/shared/time.js";import{resolvePmRoot}from"../../core/store/paths.js";import{readSettings,resolveGovernanceKnobs}from"../../core/store/settings.js";import{isPathOutsideRoot}from"../workspace.js";import{resolveSourceContextWritePolicy}from"../environment/source-context.js";import{gitWorkspaceEnvironment,resolveMergeDriverConfigScope,writeMergeDriverGitConfig}from"./worktree-config.js";import{discoverProjectRuntimeVersionPins}from"../environment/project-runtime-compatibility.js";const execFileAsync=promisify(execFile),PM_GITATTRIBUTES_START="# pm-cli:merge-drivers:start",PM_GITATTRIBUTES_END="# pm-cli:merge-drivers:end",PM_GITATTRIBUTES_V2_START="# pm-cli:merge-drivers:v2:start",PM_GITATTRIBUTES_V2_END="# pm-cli:merge-drivers:v2:end",MERGE_FENCE_LOCK_ID="merge-fence",MERGE_ATTRIBUTES_LOCK_ID="merge-attributes";function quoteMergeDriverArgument(value){return`'${value.replaceAll("'",`'"'"'`)}'`}async function resolveMatchingBunLauncher(candidate,version){const resolvedCandidate=await realpath(candidate);if(/(?:^|[\\/])bun-node-[^\\/]+[\\/]bun(?:\.exe)?$/iu.test(resolvedCandidate))return;const{stdout}=await execFileAsync(candidate,["--version"],{encoding:"utf8",windowsHide:!0,timeout:1e4});return stdout.trim()===version?resolvedCandidate:void 0}async function resolveMergeDriverCliCommand(){const packageRoot=resolvePmPackageRootFromModule(import.meta.url,["../../.."]);let executable=process.execPath,bunLauncherFound=!1;const runtimeIdentity=await realpath(process.execPath),bunVersion=process.versions.bun,pathCandidates=(process.env.PATH??"").split(path.delimiter).filter(directory=>path.isAbsolute(directory)).map(directory=>path.join(directory,bunVersion===void 0?path.basename(process.execPath):process.platform==="win32"?"bun.exe":"bun")),candidates=bunVersion===void 0?pathCandidates:[process.env.npm_execpath??"",...pathCandidates,runtimeIdentity].filter(candidate=>path.isAbsolute(candidate)&&/^(?:bun|bun\.exe)$/iu.test(path.basename(candidate)));for(const candidate of candidates)try{if(await access(candidate,constants.X_OK),bunVersion!==void 0){const launcher=await resolveMatchingBunLauncher(candidate,bunVersion);if(launcher!==void 0){executable=launcher,bunLauncherFound=!0;break}continue}if(candidate!==runtimeIdentity&&await realpath(candidate)===runtimeIdentity){executable=candidate;break}}catch{}if(bunVersion!==void 0&&!bunLauncherFound)throw new PmCliError("Cannot install Bun merge drivers without a durable executable matching the current Bun version.",EXIT_CODE.DEPENDENCY_FAILED,{code:"merge_bun_launcher_unavailable",why:"The current Bun process may be a temporary bunx launcher that Git cannot reuse after this command exits.",nextSteps:["Run with a durable version-matched Bun executable, expose one on an absolute PATH entry, or invoke pm through a Bun runner that publishes an absolute npm_execpath.","Retry pm merge install, then check pm health --strict-exit before merging branches."]});return`${quoteMergeDriverArgument(executable)} ${quoteMergeDriverArgument(path.join(packageRoot,"dist","cli.js"))}`}const MERGE_DRIVER_DEFINITIONS=[{key:"pm-item-toon",name:"pm field-aware TOON item document merge",artifact:"item",itemPath:"%P"},{key:"pm-item-markdown",name:"pm field-aware JSON-markdown item document merge",artifact:"item",itemPath:"%P"},{key:"pm-history",name:"pm append-only history stream merge",artifact:"history",itemPath:void 0},{key:"pm-relationship",name:"pm append-only relationship event store merge",artifact:"relationship",itemPath:void 0},{key:"pm-json",name:"pm key-level JSON config merge",artifact:"json",itemPath:void 0}];function resolveMergeInstallContext(options){const explicitPath=options.explicitPath?.trim(),sourceWorkspaceRoot=options.environment.PM_SOURCE_WORKSPACE_ROOT?.trim(),sourcePmRoot=options.environment.PM_SOURCE_PM_PATH?.trim(),sourcePolicy=resolveSourceContextWritePolicy(options.environment),sourceCoordinatesAvailable=!!(sourceWorkspaceRoot&&sourcePmRoot),sourceContextSelected=explicitPath===void 0&&sourceCoordinatesAvailable&&(options.dryRun||sourcePolicy.source_writes_allowed);if(explicitPath!==void 0){const pmRoot=resolvePmRoot(options.cwd,explicitPath);return{pm_root:pmRoot,workspace_start:pmRoot,source_coordinates_available:sourceCoordinatesAvailable,source_context_selected:!1,source_policy:sourcePolicy}}return sourceContextSelected?{pm_root:path.resolve(sourcePmRoot),workspace_start:path.resolve(sourceWorkspaceRoot),source_coordinates_available:!0,source_context_selected:!0,source_policy:sourcePolicy}:{pm_root:sourceCoordinatesAvailable?resolvePmRoot(options.cwd,".agents/pm"):resolvePmRoot(options.cwd),workspace_start:options.cwd,source_coordinates_available:sourceCoordinatesAvailable,source_context_selected:!1,source_policy:sourcePolicy}}async function findGitWorkspaceRoot(cwd){try{const{stdout}=await execFileAsync("git",["rev-parse","--show-toplevel"],{cwd,env:gitWorkspaceEnvironment(),encoding:"utf8",windowsHide:!0,timeout:1e4});return await realpath(stdout.trim())}catch{return null}}async function resolveGitWorkspaceRoot(cwd){const workspaceRoot=await findGitWorkspaceRoot(cwd);if(workspaceRoot===null)throw new PmCliError("pm merge install requires a git repository (merge drivers are git configuration).",EXIT_CODE.USAGE);return workspaceRoot}function toPosixRelative(fromPath,toPath){return path.relative(fromPath,toPath).replaceAll("\\","/")}function quoteGitAttributePattern(value){return`"${value.replaceAll("\\","\\\\").replaceAll('"','\\"')}"`}function readSingleQuotedArgument(command,offset){if(command[offset]!=="'")return null;let value="";for(let index=offset+1;index<command.length;index+=1){if(command.startsWith(`'"'"'`,index)){value+="'",index+=4;continue}if(command[index]==="'")return{value,nextOffset:index+1};value+=command[index]}return null}async function isMergeDriverWorkspaceCompatible(packageRoot,workspaceRoot,version){if(discoverProjectRuntimeVersionPins(workspaceRoot).filter(pin=>pin.constraint==="exact").some(pin=>pin.version!==version))return!1;const driverWorkspace=await findGitWorkspaceRoot(packageRoot);if(driverWorkspace!==null&&driverWorkspace!==await realpath(workspaceRoot)){const commonDirectories=await Promise.all([driverWorkspace,workspaceRoot].map(async cwd=>{const result=await execFileAsync("git",["rev-parse","--path-format=absolute","--git-common-dir"],{cwd,env:gitWorkspaceEnvironment(),timeout:1e4});return realpath(result.stdout.trim())}));if(commonDirectories[0]===commonDirectories[1])return!1}return!0}async function isPortableMergeDriverCommand(configured,expectedSuffix,workspaceRoot){const nodeArgument=readSingleQuotedArgument(configured,0);if(nodeArgument===null||configured[nodeArgument.nextOffset]!==" ")return!1;const cliArgument=readSingleQuotedArgument(configured,nodeArgument.nextOffset+1);if(cliArgument===null||configured.slice(cliArgument.nextOffset)!==expectedSuffix||!/^(?:node|bun)(?:\.exe)?$/iu.test(path.basename(nodeArgument.value))||path.basename(cliArgument.value)!=="cli.js"||path.basename(path.dirname(cliArgument.value))!=="dist"||!await pathExists(nodeArgument.value)||!await pathExists(cliArgument.value))return!1;try{const packageRoot=path.dirname(path.dirname(cliArgument.value)),manifest=JSON.parse(await readFile(path.join(packageRoot,"package.json"),"utf8")),pmBin=typeof manifest.bin=="string"?manifest.bin:manifest.bin?.pm;return await isMergeDriverWorkspaceCompatible(packageRoot,workspaceRoot,manifest.version)?manifest.name==="@unbrained/pm-cli"&&pmBin==="dist/cli.js":!1}catch{return!1}}function buildMergeAttributePatterns(trackerRelativeRoot,typeFolders){const prefix=trackerRelativeRoot.length>0?`${trackerRelativeRoot}/`:"",patterns=[`${quoteGitAttributePattern(`${prefix}**/*.toon`)} merge=pm-item-toon`,`${quoteGitAttributePattern(`${prefix}**/*.md`)} merge=pm-item-markdown`];for(const folder of typeFolders)patterns.push(`${quoteGitAttributePattern(`${prefix}${folder}/*.toon`)} merge=pm-item-toon`),patterns.push(`${quoteGitAttributePattern(`${prefix}${folder}/*.md`)} merge=pm-item-markdown`);return patterns.push(`${quoteGitAttributePattern(`${prefix}**/*.jsonl`)} merge=pm-relationship`),patterns.push(`${quoteGitAttributePattern(`${prefix}history/*.jsonl`)} merge=pm-history`),patterns.push(`${quoteGitAttributePattern(`${prefix}settings.json`)} merge=pm-json`),patterns.push(`${quoteGitAttributePattern(`${prefix}**/*.json`)} merge=pm-json`),patterns.push(`${quoteGitAttributePattern(`${prefix}extensions/**`)} -merge`),patterns.push(`${quoteGitAttributePattern(`${prefix}extensions/.managed-extensions.json`)} merge=pm-json`),patterns}function managedMergeBlocks(content){const blocks=[];let cursor=0;for(;cursor<content.length;){const legacyStart=content.indexOf(PM_GITATTRIBUTES_START,cursor),versionedStart=content.indexOf(PM_GITATTRIBUTES_V2_START,cursor),start=legacyStart===-1?versionedStart:versionedStart===-1?legacyStart:Math.min(legacyStart,versionedStart);if(start===-1)break;const versioned=start===versionedStart,startMarker=versioned?PM_GITATTRIBUTES_V2_START:PM_GITATTRIBUTES_START,endMarker=versioned?PM_GITATTRIBUTES_V2_END:PM_GITATTRIBUTES_END,closing=content.indexOf(endMarker,start+startMarker.length),end=closing===-1?content.length:closing+endMarker.length;blocks.push({start,end,closed:closing!==-1,lines:content.slice(start+startMarker.length,closing===-1?end:closing).split(`
+(function(){try{var e=typeof window<"u"?window:typeof global<"u"?global:typeof globalThis<"u"?globalThis:typeof self<"u"?self:{},n=new e.Error().stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="98a35fdb-bff9-5556-9c1d-1c345cb39171")}catch{}})();import{assertInitializedTracker}from"../environment/tracker-preflight.js";import{isFileMissingError,readFileIfExists,writeFileAtomic}from"../../core/fs/fs-utils.js";import{access,readFile,realpath}from"node:fs/promises";import{constants}from"node:fs";import{execFile}from"node:child_process";import path from"node:path";import{promisify}from"node:util";import{pathExists}from"../../core/fs/fs-utils.js";import{resolveItemTypeRegistry}from"../../core/item/type-registry.js";import{acquireLock}from"../../core/lock/lock.js";import{resolvePmPackageRootFromModule}from"../../core/packages/root.js";import{EXIT_CODE}from"../../core/shared/constants.js";import{PmCliError}from"../../core/shared/errors.js";import{resolveAuthor}from"../../core/shared/author.js";import{nowIso}from"../../core/shared/time.js";import{resolvePmRoot}from"../../core/store/paths.js";import{readSettings,resolveGovernanceKnobs}from"../../core/store/settings.js";import{isPathOutsideRoot}from"../workspace.js";import{resolveSourceContextWritePolicy}from"../environment/source-context.js";import{gitWorkspaceEnvironment,resolveMergeDriverConfigScope,writeMergeDriverGitConfig}from"./worktree-config.js";import{discoverProjectRuntimeVersionPins}from"../environment/project-runtime-compatibility.js";const execFileAsync=promisify(execFile),PM_GITATTRIBUTES_START="# pm-cli:merge-drivers:start",PM_GITATTRIBUTES_END="# pm-cli:merge-drivers:end",PM_GITATTRIBUTES_V2_START="# pm-cli:merge-drivers:v2:start",PM_GITATTRIBUTES_V2_END="# pm-cli:merge-drivers:v2:end",MERGE_FENCE_LOCK_ID="merge-fence",MERGE_ATTRIBUTES_LOCK_ID="merge-attributes";function quoteMergeDriverArgument(value){return`'${value.replaceAll("'",`'"'"'`)}'`}async function resolveMatchingBunLauncher(candidate,version){const resolvedCandidate=await realpath(candidate);if(/(?:^|[\\/])bun-node-[^\\/]+[\\/]bun(?:\.exe)?$/iu.test(resolvedCandidate))return;const{stdout}=await execFileAsync(candidate,["--version"],{encoding:"utf8",windowsHide:!0,timeout:1e4});return stdout.trim()===version?resolvedCandidate:void 0}async function resolveMergeDriverCliCommand(){const packageRoot=resolvePmPackageRootFromModule(import.meta.url,["../../.."]);let executable=process.execPath,bunLauncherFound=!1;const runtimeIdentity=await realpath(process.execPath),bunVersion=process.versions.bun,pathCandidates=(process.env.PATH??"").split(path.delimiter).filter(directory=>path.isAbsolute(directory)).map(directory=>path.join(directory,bunVersion===void 0?path.basename(process.execPath):process.platform==="win32"?"bun.exe":"bun")),candidates=bunVersion===void 0?pathCandidates:[process.env.npm_execpath??"",...pathCandidates,runtimeIdentity].filter(candidate=>path.isAbsolute(candidate)&&/^(?:bun|bun\.exe)$/iu.test(path.basename(candidate)));for(const candidate of candidates)try{if(await access(candidate,constants.X_OK),bunVersion!==void 0){const launcher=await resolveMatchingBunLauncher(candidate,bunVersion);if(launcher!==void 0){executable=launcher,bunLauncherFound=!0;break}continue}if(candidate!==runtimeIdentity&&await realpath(candidate)===runtimeIdentity){executable=candidate;break}}catch{}if(bunVersion!==void 0&&!bunLauncherFound)throw new PmCliError("Cannot install Bun merge drivers without a durable executable matching the current Bun version.",EXIT_CODE.DEPENDENCY_FAILED,{code:"merge_bun_launcher_unavailable",why:"The current Bun process may be a temporary bunx launcher that Git cannot reuse after this command exits.",nextSteps:["Run with a durable version-matched Bun executable, expose one on an absolute PATH entry, or invoke pm through a Bun runner that publishes an absolute npm_execpath.","Retry pm merge install, then check pm health --strict-exit before merging branches."]});return`${quoteMergeDriverArgument(executable)} ${quoteMergeDriverArgument(path.join(packageRoot,"dist","cli.js"))}`}const MERGE_DRIVER_DEFINITIONS=[{key:"pm-item-toon",name:"pm field-aware TOON item document merge",artifact:"item",itemPath:"%P"},{key:"pm-item-markdown",name:"pm field-aware JSON-markdown item document merge",artifact:"item",itemPath:"%P"},{key:"pm-history",name:"pm append-only history stream merge",artifact:"history",itemPath:void 0},{key:"pm-relationship",name:"pm append-only relationship event store merge",artifact:"relationship",itemPath:void 0},{key:"pm-json",name:"pm key-level JSON config merge",artifact:"json",itemPath:void 0}];function resolveMergeInstallContext(options){const explicitPath=options.explicitPath?.trim(),sourceWorkspaceRoot=options.environment.PM_SOURCE_WORKSPACE_ROOT?.trim(),sourcePmRoot=options.environment.PM_SOURCE_PM_PATH?.trim(),sourcePolicy=resolveSourceContextWritePolicy(options.environment),sourceCoordinatesAvailable=!!(sourceWorkspaceRoot&&sourcePmRoot),sourceContextSelected=explicitPath===void 0&&sourceCoordinatesAvailable&&(options.dryRun||sourcePolicy.source_writes_allowed);if(explicitPath!==void 0){const pmRoot=resolvePmRoot(options.cwd,explicitPath);return{pm_root:pmRoot,workspace_start:pmRoot,source_coordinates_available:sourceCoordinatesAvailable,source_context_selected:!1,source_policy:sourcePolicy}}return sourceContextSelected?{pm_root:path.resolve(sourcePmRoot),workspace_start:path.resolve(sourceWorkspaceRoot),source_coordinates_available:!0,source_context_selected:!0,source_policy:sourcePolicy}:{pm_root:sourceCoordinatesAvailable?resolvePmRoot(options.cwd,".agents/pm"):resolvePmRoot(options.cwd),workspace_start:options.cwd,source_coordinates_available:sourceCoordinatesAvailable,source_context_selected:!1,source_policy:sourcePolicy}}async function findGitWorkspaceRoot(cwd){try{const{stdout}=await execFileAsync("git",["rev-parse","--show-toplevel"],{cwd,env:gitWorkspaceEnvironment(),encoding:"utf8",windowsHide:!0,timeout:1e4});return await realpath(stdout.trim())}catch{return null}}async function resolveGitWorkspaceRoot(cwd){const workspaceRoot=await findGitWorkspaceRoot(cwd);if(workspaceRoot===null)throw new PmCliError("pm merge install requires a git repository (merge drivers are git configuration).",EXIT_CODE.USAGE);return workspaceRoot}function toPosixRelative(fromPath,toPath){return path.relative(fromPath,toPath).replaceAll("\\","/")}function quoteGitAttributePattern(value){return`"${value.replaceAll("\\","\\\\").replaceAll('"','\\"')}"`}function readSingleQuotedArgument(command,offset){if(command[offset]!=="'")return null;let value="";for(let index=offset+1;index<command.length;index+=1){if(command.startsWith(`'"'"'`,index)){value+="'",index+=4;continue}if(command[index]==="'")return{value,nextOffset:index+1};value+=command[index]}return null}async function isMergeDriverWorkspaceCompatible(packageRoot,workspaceRoot,version){if(discoverProjectRuntimeVersionPins(workspaceRoot).filter(pin=>pin.constraint==="exact").some(pin=>pin.version!==version))return!1;const driverWorkspace=await findGitWorkspaceRoot(packageRoot);if(driverWorkspace!==null&&driverWorkspace!==await realpath(workspaceRoot)){const commonDirectories=await Promise.all([driverWorkspace,workspaceRoot].map(async cwd=>{const result=await execFileAsync("git",["rev-parse","--path-format=absolute","--git-common-dir"],{cwd,env:gitWorkspaceEnvironment(),timeout:1e4});return realpath(result.stdout.trim())}));if(commonDirectories[0]===commonDirectories[1])return!1}return!0}async function isPortableMergeDriverCommand(configured,expectedSuffix,workspaceRoot){const nodeArgument=readSingleQuotedArgument(configured,0);if(nodeArgument===null||configured[nodeArgument.nextOffset]!==" ")return!1;const cliArgument=readSingleQuotedArgument(configured,nodeArgument.nextOffset+1);if(cliArgument===null||configured.slice(cliArgument.nextOffset)!==expectedSuffix||!/^(?:node|bun)(?:\.exe)?$/iu.test(path.basename(nodeArgument.value))||path.basename(cliArgument.value)!=="cli.js"||path.basename(path.dirname(cliArgument.value))!=="dist"||!await pathExists(nodeArgument.value)||!await pathExists(cliArgument.value))return!1;try{const packageRoot=path.dirname(path.dirname(cliArgument.value)),manifest=JSON.parse(await readFile(path.join(packageRoot,"package.json"),"utf8")),pmBin=typeof manifest.bin=="string"?manifest.bin:manifest.bin?.pm;return await isMergeDriverWorkspaceCompatible(packageRoot,workspaceRoot,manifest.version)?manifest.name==="@unbrained/pm-cli"&&pmBin==="dist/cli.js":!1}catch{return!1}}function buildMergeAttributePatterns(trackerRelativeRoot,typeFolders){const prefix=trackerRelativeRoot.length>0?`${trackerRelativeRoot}/`:"",patterns=[`${quoteGitAttributePattern(`${prefix}**/*.toon`)} merge=pm-item-toon`,`${quoteGitAttributePattern(`${prefix}**/*.md`)} merge=pm-item-markdown`];for(const folder of typeFolders)patterns.push(`${quoteGitAttributePattern(`${prefix}${folder}/*.toon`)} merge=pm-item-toon`),patterns.push(`${quoteGitAttributePattern(`${prefix}${folder}/*.md`)} merge=pm-item-markdown`);return patterns.push(`${quoteGitAttributePattern(`${prefix}**/*.jsonl`)} merge=pm-relationship`),patterns.push(`${quoteGitAttributePattern(`${prefix}history/*.jsonl`)} merge=pm-history`),patterns.push(`${quoteGitAttributePattern(`${prefix}settings.json`)} merge=pm-json`),patterns.push(`${quoteGitAttributePattern(`${prefix}**/*.json`)} merge=pm-json`),patterns.push(`${quoteGitAttributePattern(`${prefix}extensions/**`)} merge=text`),patterns.push(`${quoteGitAttributePattern(`${prefix}extensions/.managed-extensions.json`)} merge=pm-json`),patterns}function managedMergeBlocks(content){const blocks=[];let cursor=0;for(;cursor<content.length;){const legacyStart=content.indexOf(PM_GITATTRIBUTES_START,cursor),versionedStart=content.indexOf(PM_GITATTRIBUTES_V2_START,cursor),start=legacyStart===-1?versionedStart:versionedStart===-1?legacyStart:Math.min(legacyStart,versionedStart);if(start===-1)break;const versioned=start===versionedStart,startMarker=versioned?PM_GITATTRIBUTES_V2_START:PM_GITATTRIBUTES_START,endMarker=versioned?PM_GITATTRIBUTES_V2_END:PM_GITATTRIBUTES_END,closing=content.indexOf(endMarker,start+startMarker.length),end=closing===-1?content.length:closing+endMarker.length;blocks.push({start,end,closed:closing!==-1,lines:content.slice(start+startMarker.length,closing===-1?end:closing).split(`
 `).map(line=>line.trim()).filter(Boolean)}),cursor=end}return blocks}function blockBelongsToTracker(lines,patterns,trackerRelativeRoot){const ownedPatterns=new Set(patterns),prefix=quoteGitAttributePattern(trackerRelativeRoot.length>0?`${trackerRelativeRoot}/`:"").slice(0,-1);return lines.some(line=>ownedPatterns.has(line)||line.startsWith(prefix)&&/^[^/]+\/\*\.(?:toon|md)" merge=pm-item-(?:toon|markdown)$/u.test(line.slice(prefix.length)))}async function reconcileGitattributesBlock(workspaceRoot,trackerRelativeRoot,patterns,dryRun){const gitattributesPath=path.join(workspaceRoot,".gitattributes"),gitDirectory=dryRun?null:(await execFileAsync("git",["rev-parse","--absolute-git-dir"],{cwd:workspaceRoot,env:gitWorkspaceEnvironment(),encoding:"utf8",windowsHide:!0,timeout:1e4})).stdout.trim(),releaseLock=gitDirectory===null?null:await acquireLock(gitDirectory,MERGE_ATTRIBUTES_LOCK_ID,120,"merge-fence",!1,!0,5e3);try{const current=await readFileIfExists(gitattributesPath)??"",block=[PM_GITATTRIBUTES_V2_START,...patterns,PM_GITATTRIBUTES_V2_END].join(`
 `),blocks=managedMergeBlocks(current),owned=blocks.filter(candidate=>blockBelongsToTracker(candidate.lines,patterns,trackerRelativeRoot));owned.length===0&&trackerRelativeRoot===".agents/pm"&&blocks.length===1&&blocks[0].lines.every(line=>!line.includes(".agents/pm/"))&&owned.push(blocks[0]);let next;if(owned.length>0){const first=owned[0];next=current;for(const duplicate of owned.slice(1).reverse())next=`${next.slice(0,duplicate.start)}${next.slice(duplicate.end)}`;next=`${next.slice(0,first.start)}${block}${next.slice(first.end)}`}else{const prefix=current.trimEnd();next=`${prefix.length>0?`${prefix}
 

package/dist/sdk/merge/receipt-file-boundary.d.ts

@@ -9,13 +9,13 @@ import { type FileHandle } from "node:fs/promises";
 /** Minimal filesystem operations required by the receipt reader. */
 export interface ReceiptFileBoundary {
 /** Inspect the path without following its final symbolic link. */
-lstat(receiptPath: string): Promise<Stats>;
+lstat(receiptPath:string):Promise<Stats>;
 /** Open the candidate and return the handle used for verified reads. */
-open(receiptPath: string, flags: number): Promise<FileHandle>;
+open(receiptPath:string,flags:number):Promise<FileHandle>;
 }
 /** Resolve the platform no-follow flag, falling back only where Node omits it. */
-export declare function resolveReceiptNoFollowFlag(constants: {
-O_NOFOLLOW?: number;
-}): number;
+export declare function resolveReceiptNoFollowFlag(constants:{
+O_NOFOLLOW?:number;
+}):number;
 /** Read one regular file only when its opened identity remains bounded and stable. */
-export declare function readBoundedRegularFile(receiptPath: string, maximumBytes: number, boundary?: ReceiptFileBoundary): Promise<string | null>;
+export declare function readBoundedRegularFile(receiptPath:string,maximumBytes:number,boundary?:ReceiptFileBoundary):Promise<string | null>;

package/dist/sdk/merge/receipt-operation.d.ts

@@ -1,15 +1,15 @@
 /** Immutable pre-operation coordinates, without branch names or item contents. */
 export interface MergeReceiptOperation {
 /** Git operation whose original state can be checked after it ends. */
-kind: "rebase" | "merge";
+kind:"rebase" | "merge";
 /** Commit from which the operation began. */
-original_head: string;
+original_head:string;
 /** Original item blob at that commit. */
-original_blob: string;
+original_blob:string;
 }
 /** Capture original Git coordinates; plain merges require Git's incoming-head signal and the exact ours blob. */
-export declare function captureMergeReceiptOperation(cwd: string, itemPath: string, originalItemRaw?: string): Promise<MergeReceiptOperation | undefined>;
+export declare function captureMergeReceiptOperation(cwd:string,itemPath:string,originalItemRaw?:string):Promise<MergeReceiptOperation | undefined>;
 /** Validate only the bounded, privacy-safe operation schema accepted by receipt readers. */
-export declare function isMergeReceiptOperation(value: unknown): value is MergeReceiptOperation;
+export declare function isMergeReceiptOperation(value:unknown):value is MergeReceiptOperation;
 /** Prove HEAD, index, and working item all match the captured origin after Git leaves the operation. */
-export declare function isOriginalGitStateRestored(cwd: string, itemPath: string, operation: MergeReceiptOperation, expectedItemRaw?: string): Promise<boolean>;
+export declare function isOriginalGitStateRestored(cwd:string,itemPath:string,operation:MergeReceiptOperation,expectedItemRaw?:string):Promise<boolean>;

package/dist/sdk/merge/receipt-schema.d.ts

@@ -1,20 +1,20 @@
-import type { MergeDecisionReceipt, MergeReceiptInvalidEvidence } from "./receipts.js";
+import type { MergeDecisionReceipt,MergeReceiptInvalidEvidence } from "./receipts.js";
 /** Return whether a receipt id is safe to expose in cleartext diagnostics. */
-export declare function isSafeReceiptId(value: string): boolean;
+export declare function isSafeReceiptId(value:string):boolean;
 /** Versioned allowlist controlling which scalar evidence may enter tracked receipt sidecars. */
-export declare const DURABLE_VALUE_POLICY: "bounded_non_sensitive_scalars_v1";
+export declare const DURABLE_VALUE_POLICY:"bounded_non_sensitive_scalars_v1";
 /** Return the narrowest validation class for untrusted receipt evidence. */
-export declare function receiptValidationError(value: unknown, evidenceSource: "clone_local" | "durable"): MergeReceiptInvalidEvidence["validation_error"] | null;
+export declare function receiptValidationError(value:unknown,evidenceSource:"clone_local" | "durable"):MergeReceiptInvalidEvidence["validation_error"] | null;
 /** Restore omitted non-selected slots from identified v1 clone-local writer contracts; never infer a missing retained or discarded value. */
-export declare function normalizeLegacyReceipt(value: unknown): unknown;
+export declare function normalizeLegacyReceipt(value:unknown):unknown;
 /** Identify the rejected collection without exposing its values. */
-export declare function receiptCollectionValidationPath(value: unknown): string | undefined;
+export declare function receiptCollectionValidationPath(value:unknown):string | undefined;
 /** Validate a complete receipt against its clone-local or durable evidence policy. */
-export declare function isMergeDecisionReceipt(value: unknown, evidenceSource: "clone_local" | "durable"): value is MergeDecisionReceipt;
+export declare function isMergeDecisionReceipt(value:unknown,evidenceSource:"clone_local" | "durable"):value is MergeDecisionReceipt;
 /** Extract a structurally valid precomputed SHA-256 decision hash. */
-export declare function isPrehashedValue(value: unknown): string | undefined;
+export declare function isPrehashedValue(value:unknown):string | undefined;
 /** Convert a raw scalar into hashed evidence with an allowlisted preview. */
-export declare function durableValueEvidence(field: string, value: unknown): {
-pm_value_hash: string;
-pm_value?: unknown;
+export declare function durableValueEvidence(field:string,value:unknown):{
+pm_value_hash:string;
+pm_value?:unknown;
 };