@tickernelz/paperclip-pro-adapter-utils 2026.1005.10 → 2026.1006.1

package/dist/workspace-restore-merge.d.ts

@@ -1,3 +1,5 @@
+import { WorkspaceManifestMap, type PathManifest, type WorkspacePaths } from "./workspace-manifest.js";
+import type { WorkspaceRestoreDiagnostic } from "./workspace-restore-diagnostics.js";
 export type SnapshotEntry = {
     kind: "dir";
 } | {
@@ -10,16 +12,29 @@ export type SnapshotEntry = {
 };
 export interface DirectorySnapshot {
     exclude: string[];
-    entries: Map<string, SnapshotEntry>;
+    entries: Map<string, SnapshotEntry> | WorkspaceManifestMap<SnapshotEntry>;
+    ignoredPaths?: WorkspacePaths;
 }
-export interface SerializedDirectorySnapshot {
+export interface LegacySerializedDirectorySnapshot {
     version: 1;
     exclude: string[];
     entries: Array<[string, SnapshotEntry]>;
 }
+export type SerializedDirectorySnapshot = LegacySerializedDirectorySnapshot | {
+    version: 2;
+    exclude: string[];
+    entries: PathManifest;
+    ignoredPaths?: WorkspacePaths;
+};
+export declare function disposeDirectorySnapshot(snapshot: DirectorySnapshot | null): Promise<void>;
+/** Call only after the controller validates a persisted manifest's path and digest. */
+export declare function openDirectorySnapshot(value: Extract<SerializedDirectorySnapshot, {
+    version: 2;
+}>): DirectorySnapshot;
 export declare function serializeDirectorySnapshot(snapshot: DirectorySnapshot): SerializedDirectorySnapshot;
 export declare function parseDirectorySnapshot(value: unknown): DirectorySnapshot | null;
 export declare function directorySnapshotSha256(snapshot: DirectorySnapshot): string;
+export type DirectoryMergeLockOperation = "agent_directory_prepare" | "agent_directory_release" | "agent_directory_collect" | "agent_directory_checkpoint" | "agent_directory_handoff";
 /**
  * The stable `code` a lock-timeout error carries, so a caller can identify it
  * without matching on the error message text (the message embeds the lock
@@ -32,7 +47,7 @@ export declare const WORKSPACE_RESTORE_LOCK_TIMEOUT_CODE = "ERR_WORKSPACE_RESTOR
  * same-company actor: none embeds a filesystem path, a raw error message, or
  * a process id.
  */
-export type WorkspaceRestoreFailureCode = "restore_permission_denied" | "restore_lock_timeout" | "restore_failed";
+export type WorkspaceRestoreFailureCode = "restore_permission_denied" | "restore_lock_timeout" | "restore_unsafe_archive" | "restore_failed";
 /**
  * The outcome of one workspace restore. `ok: true` on a clean restore. `ok:
  * false` carries one allowlisted {@link WorkspaceRestoreFailureCode} — never a
@@ -43,14 +58,16 @@ export type WorkspaceRestoreOutcome = {
 } | {
     readonly ok: false;
     readonly code: WorkspaceRestoreFailureCode;
+    readonly diagnostic?: WorkspaceRestoreDiagnostic;
 };
 /**
  * Classifies a caught workspace-restore error into one allowlisted code. Maps
  * `EACCES` and `EPERM` to a permission failure, the merge-lock timeout
  * (matched by {@link WORKSPACE_RESTORE_LOCK_TIMEOUT_CODE}, never by the error
  * message text) to a lock-timeout failure, and every other error to a generic
- * failure. Never reads or returns `Error.message`, a filesystem path, or a
- * process id.
+ * failure. The known Daytona confinement diagnostic also identifies unsafe
+ * archives across plugin transports that retain only a message. Never returns
+ * raw messages, paths or process IDs.
  */
 export declare function classifyWorkspaceRestoreFailure(error: unknown): WorkspaceRestoreFailureCode;
 /**
@@ -62,16 +79,40 @@ export declare function classifyWorkspaceRestoreFailure(error: unknown): Workspa
  * `Error.message` to this text.
  */
 export declare function describeWorkspaceRestoreFailure(code: WorkspaceRestoreFailureCode): string;
-export declare function withDirectoryMergeLock<T>(targetDir: string, fn: (canonicalTargetDir: string) => Promise<T>, env?: NodeJS.ProcessEnv): Promise<T>;
+export declare function withDirectoryMergeLock<T>(targetDir: string, fn: (canonicalTargetDir: string) => Promise<T>, env?: NodeJS.ProcessEnv, diagnosticOperation?: DirectoryMergeLockOperation, waitMs?: number): Promise<T>;
 export declare function captureDirectorySnapshot(rootDir: string, options?: {
     exclude?: string[];
+    ignoredPaths?: WorkspacePaths;
+    diskBacked?: boolean;
 }): Promise<DirectorySnapshot>;
+/** A disk-backed subset for independent nested-repository merges. */
+export declare function selectDirectorySnapshot(snapshot: DirectorySnapshot, options: {
+    prefix?: string;
+    omit?: string[];
+    exclude: string[];
+    ignoredPaths?: WorkspacePaths;
+}): Promise<DirectorySnapshot>;
+export declare class DirectoryMergeConflict extends Error {
+    readonly paths: string[];
+    readonly code = "DIRECTORY_MERGE_CONFLICT";
+    constructor(paths: string[]);
+}
+/** Preflight the entire delta before writing. Identical replays are safe after
+ * an interrupted apply; unrelated edits are left alone. No history is retained. */
+export declare function directoryMergeConflicts(baseline: DirectorySnapshot, source: DirectorySnapshot, current: DirectorySnapshot): string[];
 export declare function mergeDirectoryWithBaseline(input: {
     baseline: DirectorySnapshot;
     sourceDir: string;
     targetDir: string;
+    conflictPolicy?: "reject";
     beforeApply?: () => Promise<void>;
     afterApply?: () => Promise<void>;
+    /** Caller holds the target's writer lock and validated an immutable sparse
+     * source. Unchanged entries need no payload and are never copied. */
+    snapshots?: {
+        source: DirectorySnapshot;
+        current: DirectorySnapshot;
+    };
 }): Promise<void>;
 export declare function directoryEntryMatchesBaseline(rootDir: string, relative: string, baselineEntry: SnapshotEntry): Promise<boolean>;
 //# sourceMappingURL=workspace-restore-merge.d.ts.map

package/dist/workspace-restore-merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-restore-merge.d.ts","sourceRoot":"","sources":["../src/workspace-restore-merge.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GACf;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;CACzC;AA6BD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,iBAAiB,GAC1B,2BAA2B,CAQ7B;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,GACb,iBAAiB,GAAG,IAAI,CA0B1B;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CAI3E;AAgGD;;;;GAIG;AACH,eAAO,MAAM,mCAAmC,uCAAuC,CAAC;AAExF;;;;;GAKG;AACH,MAAM,MAAM,2BAA2B,GACnC,2BAA2B,GAC3B,sBAAsB,GACtB,gBAAgB,CAAC;AAErB;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAC/B;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAA;CAAE,GACrB;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,2BAA2B,CAAA;CAAE,CAAC;AAEvE;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,2BAA2B,CAK3F;AAED;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,2BAA2B,GAAG,MAAM,CASzF;AAoID,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EAC9C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,CAAC,CAAC,CAYZ;AA+BD,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GACnC,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,0BAA0B,CAAC,KAAK,EAAE;IACtD,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB;AAED,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,OAAO,CAAC,CAElB"}
+{"version":3,"file":"workspace-restore-merge.d.ts","sourceRoot":"","sources":["../src/workspace-restore-merge.ts"],"names":[],"mappings":"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"}