@openvcs/sdk 0.4.1-edge.20260603.112 → 0.4.1-edge.20260604.115

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/types/vcs.d.ts +6 -0
  2. package/package.json +1 -1
  3. package/src/lib/types/vcs.ts +7 -0
package/lib/types/vcs.d.ts CHANGED
@@ -13,6 +13,8 @@ export interface VcsCapabilities {
13
13
  push_pull: boolean;
14
14
  /** Indicates whether fast-forward helpers are supported. */
15
15
  fast_forward: boolean;
16
+ /** Merge strategies the backend supports (values like "merge", "squash", "rebase"). */
17
+ merge_strategies?: string[];
16
18
  }
17
19
  /** Describes params that carry a repository session id. */
18
20
  export interface VcsSessionParams extends RequestParams {
@@ -315,12 +317,16 @@ export interface VcsRenameBranchParams extends VcsSessionParams {
315
317
  /** Stores the next branch name. */
316
318
  new: string;
317
319
  }
320
+ /** Describes the supported merge strategies. */
321
+ export type VcsMergeStrategy = 'merge' | 'squash' | 'rebase';
318
322
  /** Describes params for merging another branch into the current branch. */
319
323
  export interface VcsMergeIntoCurrentParams extends VcsSessionParams {
320
324
  /** Stores the branch name to merge. */
321
325
  name: string;
322
326
  /** Stores an optional merge commit message. */
323
327
  message?: string;
328
+ /** Stores the merge strategy. Defaults to 'merge' when absent. */
329
+ strategy?: VcsMergeStrategy;
324
330
  }
325
331
  /** Describes params for setting a branch upstream. */
326
332
  export interface VcsSetBranchUpstreamParams extends VcsSessionParams {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openvcs/sdk",
3
- "version": "0.4.1-edge.20260603.112",
3
+ "version": "0.4.1-edge.20260604.115",
4
4
  "description": "OpenVCS SDK CLI for plugin scaffolding and runtime asset builds",
5
5
  "license": "GPL-3.0-or-later",
6
6
  "homepage": "https://openvcs.app/",
package/src/lib/types/vcs.ts CHANGED
@@ -17,6 +17,8 @@ export interface VcsCapabilities {
17
17
  push_pull: boolean;
18
18
  /** Indicates whether fast-forward helpers are supported. */
19
19
  fast_forward: boolean;
20
+ /** Merge strategies the backend supports (values like "merge", "squash", "rebase"). */
21
+ merge_strategies?: string[];
20
22
  }
21
23
 
22
24
  /** Describes params that carry a repository session id. */
@@ -361,12 +363,17 @@ export interface VcsRenameBranchParams extends VcsSessionParams {
361
363
  new: string;
362
364
  }
363
365
 
366
+ /** Describes the supported merge strategies. */
367
+ export type VcsMergeStrategy = 'merge' | 'squash' | 'rebase';
368
+
364
369
  /** Describes params for merging another branch into the current branch. */
365
370
  export interface VcsMergeIntoCurrentParams extends VcsSessionParams {
366
371
  /** Stores the branch name to merge. */
367
372
  name: string;
368
373
  /** Stores an optional merge commit message. */
369
374
  message?: string;
375
+ /** Stores the merge strategy. Defaults to 'merge' when absent. */
376
+ strategy?: VcsMergeStrategy;
370
377
  }
371
378
 
372
379
  /** Describes params for setting a branch upstream. */