@codebolt/narrative 1.11.0 → 1.12.4

package/dist/api/snapshot.api.d.ts

@@ -1,5 +1,5 @@
 import { NarrativeTransport } from '../transport';
-import { CreateSnapshotParams, CreateSnapshotResult, SnapshotIdParam, CreateArchiveResult, ImportArchiveParams, ImportArchiveResult, ExportBundleParams, ExportBundleResult, AddBundleParams, AddBundleResult, BrowseSnapshotParams, BrowseResult, MergeSnapshotParams, MergeSnapshotResult, AddCommitParams, AddCommitResult, CheckRecoveryParams, RecoveryCheck, CheckoutSnapshotParams, CheckoutResult, DeleteResult, PruneSnapshotsParams, PruneResult } from '../types/snapshot';
+import { CreateSnapshotParams, CreateSnapshotResult, SnapshotIdParam, CreateArchiveResult, ImportArchiveParams, ImportArchiveResult, ExportBundleParams, ExportBundleResult, AddBundleParams, AddBundleResult, BrowseSnapshotParams, BrowseResult, MergeSnapshotParams, MergeSnapshotResult, CheckSnapshotConflictsParams, CheckConflictsResult, AddCommitParams, AddCommitResult, CheckRecoveryParams, RecoveryCheck, CheckoutSnapshotParams, CheckoutResult, DeleteResult, PruneSnapshotsParams, PruneResult } from '../types/snapshot';
 export declare class SnapshotApi {
     private readonly transport;
     constructor(transport: NarrativeTransport);
@@ -10,6 +10,7 @@ export declare class SnapshotApi {
     addSnapshotBundle(params: AddBundleParams): Promise<AddBundleResult>;
     browseSnapshot(params: BrowseSnapshotParams): Promise<BrowseResult>;
     mergeSnapshot(params: MergeSnapshotParams): Promise<MergeSnapshotResult>;
+    checkSnapshotConflicts(params: CheckSnapshotConflictsParams): Promise<CheckConflictsResult>;
     addCommit(params: AddCommitParams): Promise<AddCommitResult>;
     checkSnapshotRecovery(params: CheckRecoveryParams): Promise<RecoveryCheck>;
     checkoutSnapshot(params: CheckoutSnapshotParams): Promise<CheckoutResult>;

package/dist/api/snapshot.api.js

@@ -26,6 +26,9 @@ class SnapshotApi {
     async mergeSnapshot(params) {
         return this.transport.request('mergeSnapshot', params);
     }
+    async checkSnapshotConflicts(params) {
+        return this.transport.request('checkSnapshotConflicts', params);
+    }
     async addCommit(params) {
         return this.transport.request('addCommit', params);
     }

package/dist/types/snapshot.d.ts

@@ -79,6 +79,22 @@ export interface MergeSnapshotResult {
     conflicts: string[];
     applied_to_workspace: boolean;
 }
+export interface CheckSnapshotConflictsParams {
+    snapshot_id: string;
+    strategy: MergeStrategy;
+}
+export interface ConflictDetail {
+    path: string;
+    conflict_type: string;
+    ancestor_content: string | null;
+    ours_content: string | null;
+    theirs_content: string | null;
+}
+export interface CheckConflictsResult {
+    has_conflicts: boolean;
+    conflicts: ConflictDetail[];
+    merged_tree_hash: string;
+}
 export interface AddCommitParams {
     thread_id: string;
     message: string;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@codebolt/narrative",
-  "version": "1.11.0",
+  "version": "1.12.4",
   "description": "TypeScript client for the Codebolt Narrative Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "build:native": "node ../codeboltNarrative/scripts/build-platform-pkg.js",
+    "build:all": "tsc && npm run build:native",
+    "build:native": "node ../codeboltNarrative/scripts/build.js",
     "clean": "rm -rf dist"
   },
   "engines": {
@@ -16,11 +17,11 @@
     "dist/**/*"
   ],
   "optionalDependencies": {
-    "@codebolt/narrative-darwin-arm64": "1.11.0",
-    "@codebolt/narrative-darwin-x64": "1.11.0",
-    "@codebolt/narrative-linux-x64": "1.11.0",
-    "@codebolt/narrative-linux-arm64": "1.11.0",
-    "@codebolt/narrative-win32-x64": "1.11.0"
+    "@codebolt/narrative-darwin-arm64": "1.12.4",
+    "@codebolt/narrative-darwin-x64": "1.12.4",
+    "@codebolt/narrative-linux-x64": "1.12.4",
+    "@codebolt/narrative-linux-arm64": "1.12.4",
+    "@codebolt/narrative-win32-x64": "1.12.4"
   },
   "license": "MIT"
 }