@lovelybunch/api 1.0.28 → 1.0.29

package/dist/lib/git.d.ts

@@ -26,7 +26,8 @@ export declare function listBranches(): Promise<{
 export declare function createBranch(name: string, from?: string): Promise<void>;
 export declare function deleteBranch(name: string): Promise<void>;
 export declare function pushCurrent(): Promise<string>;
-export declare function pullCurrent(): Promise<string>;
+export type PullStrategy = 'merge' | 'rebase' | 'ff-only';
+export declare function pullCurrent(strategy?: PullStrategy): Promise<string>;
 export interface WorktreeInfo {
     name: string;
     path: string;
@@ -45,4 +46,4 @@ export declare function commitInWorktree(name: string, message: string, files?:
     commitHash?: string;
 }>;
 export declare function pushWorktree(name: string): Promise<string>;
-export declare function pullWorktree(name: string): Promise<string>;
+export declare function pullWorktree(name: string, strategy?: PullStrategy): Promise<string>;

package/dist/lib/git.js

@@ -107,8 +107,9 @@ export async function pushCurrent() {
     const { stdout } = await runGit(['push']);
     return stdout;
 }
-export async function pullCurrent() {
-    const { stdout } = await runGit(['pull']);
+export async function pullCurrent(strategy = 'rebase') {
+    const args = strategy === 'rebase' ? ['pull', '--rebase'] : strategy === 'ff-only' ? ['pull', '--ff-only'] : ['pull', '--no-rebase'];
+    const { stdout } = await runGit(args);
     return stdout;
 }
 export async function listWorktrees() {
@@ -193,9 +194,10 @@ export async function pushWorktree(name) {
     const { stdout } = await runGit(['-C', wtPath, 'push']);
     return stdout;
 }
-export async function pullWorktree(name) {
+export async function pullWorktree(name, strategy = 'rebase') {
     const found = await getWorktreeByName(name);
     const wtPath = found ? found.path : await resolveSafeWorktreePath(name);
-    const { stdout } = await runGit(['-C', wtPath, 'pull']);
+    const args = strategy === 'rebase' ? ['-C', wtPath, 'pull', '--rebase'] : strategy === 'ff-only' ? ['-C', wtPath, 'pull', '--ff-only'] : ['-C', wtPath, 'pull', '--no-rebase'];
+    const { stdout } = await runGit(args);
     return stdout;
 }

package/dist/routes/api/v1/git/index.js

@@ -83,8 +83,14 @@ app.post('/push', async (c) => {
 });
 app.post('/pull', async (c) => {
     try {
-        const result = await pullCurrent();
-        return c.json({ success: true, data: { result } });
+        let mode;
+        try {
+            mode = await c.req.json();
+        }
+        catch { }
+        const strategy = mode?.strategy === 'ff-only' || mode?.strategy === 'merge' ? mode.strategy : 'rebase';
+        const result = await pullCurrent(strategy);
+        return c.json({ success: true, data: { strategy, result } });
     }
     catch (e) {
         return c.json({ success: false, error: { message: e.message } }, 500);
@@ -165,8 +171,14 @@ app.post('/worktrees/:name/push', async (c) => {
 app.post('/worktrees/:name/pull', async (c) => {
     try {
         const name = c.req.param('name');
-        const result = await pullWorktree(name);
-        return c.json({ success: true, data: { worktree: name, result } });
+        let mode;
+        try {
+            mode = await c.req.json();
+        }
+        catch { }
+        const strategy = mode?.strategy === 'ff-only' || mode?.strategy === 'merge' ? mode.strategy : 'rebase';
+        const result = await pullWorktree(name, strategy);
+        return c.json({ success: true, data: { worktree: name, strategy, result } });
     }
     catch (e) {
         return c.json({ success: false, error: { message: e.message } }, 500);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lovelybunch/api",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "type": "module",
   "main": "dist/server-with-static.js",
   "exports": {
@@ -32,8 +32,8 @@
   "dependencies": {
     "@hono/node-server": "^1.13.7",
     "@hono/node-ws": "^1.0.6",
-    "@lovelybunch/core": "^1.0.28",
-    "@lovelybunch/types": "^1.0.28",
+    "@lovelybunch/core": "^1.0.29",
+    "@lovelybunch/types": "^1.0.29",
     "dotenv": "^17.2.1",
     "fuse.js": "^7.0.0",
     "gray-matter": "^4.0.3",