@lovelybunch/api 1.0.51 → 1.0.52

package/dist/lib/git-settings.d.ts

@@ -0,0 +1,7 @@
+export interface GitSettings {
+    defaultWorktreePath: string;
+}
+export declare function normalizeWorktreePath(input: string): string;
+export declare function loadGitSettings(): Promise<GitSettings>;
+export declare function saveGitSettings(settings: GitSettings): Promise<void>;
+export declare function setDefaultWorktreePath(relativePath: string): Promise<GitSettings>;

package/dist/lib/git-settings.js

@@ -0,0 +1,84 @@
+import { promises as fs } from 'fs';
+import path from 'path';
+import { findNutDirectory } from './gait-path.js';
+const DEFAULT_SETTINGS = {
+    defaultWorktreePath: '../worktrees',
+};
+async function ensureNutDirectory() {
+    const nutDir = await findNutDirectory();
+    if (nutDir)
+        return nutDir;
+    const fallback = path.join(process.cwd(), '.nut');
+    await fs.mkdir(fallback, { recursive: true });
+    return fallback;
+}
+async function getConfigPath() {
+    const nutDir = await ensureNutDirectory();
+    return path.join(nutDir, 'config.json');
+}
+async function loadProjectConfig() {
+    const configPath = await getConfigPath();
+    try {
+        const raw = await fs.readFile(configPath, 'utf-8');
+        return JSON.parse(raw);
+    }
+    catch (error) {
+        if (error?.code === 'ENOENT') {
+            return {};
+        }
+        console.warn('[git-settings] Failed to read config.json, using empty config:', error);
+        return {};
+    }
+}
+async function saveProjectConfig(config) {
+    const configPath = await getConfigPath();
+    const dir = path.dirname(configPath);
+    await fs.mkdir(dir, { recursive: true });
+    await fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf-8');
+}
+export function normalizeWorktreePath(input) {
+    const trimmed = input?.trim();
+    if (!trimmed) {
+        return DEFAULT_SETTINGS.defaultWorktreePath;
+    }
+    if (path.isAbsolute(trimmed)) {
+        throw new Error('Worktree path must be relative to the project root');
+    }
+    const normalized = path.normalize(trimmed);
+    if (!normalized || normalized === '.' || normalized === '') {
+        return DEFAULT_SETTINGS.defaultWorktreePath;
+    }
+    return normalized;
+}
+export async function loadGitSettings() {
+    const config = await loadProjectConfig();
+    const configuredPath = config.git?.defaultWorktreePath;
+    if (!configuredPath) {
+        return { ...DEFAULT_SETTINGS };
+    }
+    try {
+        const normalized = normalizeWorktreePath(configuredPath);
+        return { defaultWorktreePath: normalized };
+    }
+    catch (error) {
+        console.warn('[git-settings] Invalid default worktree path in config.json, using default:', error);
+        return { ...DEFAULT_SETTINGS };
+    }
+}
+export async function saveGitSettings(settings) {
+    const config = await loadProjectConfig();
+    const normalized = normalizeWorktreePath(settings.defaultWorktreePath);
+    const next = {
+        ...config,
+        git: {
+            ...config.git,
+            defaultWorktreePath: normalized,
+        },
+    };
+    await saveProjectConfig(next);
+}
+export async function setDefaultWorktreePath(relativePath) {
+    const normalized = normalizeWorktreePath(relativePath);
+    await saveGitSettings({ defaultWorktreePath: normalized });
+    return { defaultWorktreePath: normalized };
+}

package/dist/lib/git.js

@@ -2,6 +2,7 @@ import { promisify } from 'util';
 import { execFile as _execFile } from 'child_process';
 import path from 'path';
 import { findGaitDirectory } from './gait-path.js';
+import { loadGitSettings } from './git-settings.js';
 import { promises as fs } from 'fs';
 const execFile = promisify(_execFile);
 // Base directory for worktrees under the repository root
@@ -16,7 +17,9 @@ export async function getRepoRoot() {
 }
 export async function getWorktreesBase() {
     const repoRoot = await getRepoRoot();
-    return path.join(repoRoot, 'worktrees');
+    const settings = await loadGitSettings();
+    const relativeBase = settings.defaultWorktreePath || 'worktrees';
+    return path.resolve(repoRoot, relativeBase);
 }
 export function sanitizeBranchName(name) {
     if (name.length > 120) {
@@ -31,7 +34,8 @@ export async function resolveSafeWorktreePath(name) {
     const base = await getWorktreesBase();
     const safeName = sanitizeBranchName(name);
     const resolved = path.resolve(base, safeName);
-    if (!resolved.startsWith(base)) {
+    const relative = path.relative(base, resolved);
+    if (relative.startsWith('..') || path.isAbsolute(relative)) {
         throw new Error('Invalid worktree path');
     }
     return resolved;

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

@@ -1,6 +1,33 @@
 import { Hono } from 'hono';
 import { getRepoStatus, listBranches, createBranch, deleteBranch, pushCurrent, pullCurrent, listWorktrees, addWorktree, removeWorktree, commitInWorktree, pushWorktree, pullWorktree, } from '../../../../lib/git.js';
+import { loadGitSettings, setDefaultWorktreePath } from '../../../../lib/git-settings.js';
 const app = new Hono();
+// Settings
+app.get('/settings', async (c) => {
+    try {
+        const settings = await loadGitSettings();
+        return c.json({ success: true, data: settings });
+    }
+    catch (e) {
+        return c.json({ success: false, error: { message: e.message || 'Failed to load git settings' } }, 500);
+    }
+});
+app.put('/settings', async (c) => {
+    try {
+        const body = await c.req.json();
+        const path = body?.defaultWorktreePath;
+        if (typeof path !== 'string' || !path.trim()) {
+            return c.json({ success: false, error: { message: 'defaultWorktreePath is required' } }, 400);
+        }
+        const settings = await setDefaultWorktreePath(path);
+        return c.json({ success: true, data: settings });
+    }
+    catch (e) {
+        const message = e?.message || 'Failed to update git settings';
+        const status = /relative to the project root/i.test(message) ? 400 : 500;
+        return c.json({ success: false, error: { message } }, status);
+    }
+});
 // Status
 app.get('/status', async (c) => {
     try {

package/package.json

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