opencode-studio-server 1.20.0 → 1.22.0

package/index.js

@@ -1095,82 +1095,95 @@ async function getGitHubUser(token) {
     return await response.json();
 }
 
-async function ensureGitHubRepo(token, repoName) {
-    const owner = repoName.split('/')[0];
-    const repo = repoName.split('/')[1];
-    
-    const response = await fetch(`https://api.github.com/repos/${owner}/${repo}`, {
-        headers: { 'Authorization': `Bearer ${token}` }
-    });
-    
-    if (response.ok) {
-        const data = await response.json();
-        return data;
-    }
-    
-    if (response.status === 404) {
-        const createRes = await fetch(`https://api.github.com/user/repos`, {
-            method: 'POST',
-            headers: {
-                'Authorization': `Bearer ${token}`,
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({
-                name: repo,
-                private: true,
-                description: 'OpenCode Studio backup'
-            })
-        });
-        
-        if (createRes.ok) {
-            return await createRes.json();
-        }
-        
-        if (createRes.ok) {
-            return await createRes.json();
-        }
-        const err = await createRes.text();
-        throw new Error(`Failed to create repo: ${err}`);
-    }
-    
-    const err = await response.text();
-    throw new Error(`Failed to check repo: ${err}`);
-}
-
-function buildCommitTree(opencodeDir, studioDir, files = {}, basePath = '') {
-    const tree = [];
-    
-    for (const name of fs.readdirSync(basePath || opencodeDir)) {
-        const fullPath = path.join(basePath || opencodeDir, name);
-        const stat = fs.statSync(fullPath);
-        
-        if (stat.isDirectory()) {
-            if (name === 'node_modules' || name === '.git' || name === '.next') continue;
-            const subtree = buildCommitTree(opencodeDir, studioDir, files, fullPath);
-            tree.push({
-                path: path.relative(opencodeDir, fullPath),
-                mode: '040000',
-                type: 'tree',
-                sha: subtree.sha,
-                size: subtree.size
-            });
-            if (subtree.size) tree[tree.length - 1].size = subtree.size;
-        } else {
-            if (name.endsWith('.log') || name.endsWith('.tmp')) continue;
-            const content = fs.readFileSync(fullPath, 'utf8');
-            const size = Buffer.byteLength(content);
-            const blob = { path: path.relative(opencodeDir, fullPath), mode: '100644', type: 'blob', size, content };
-            const blobKey = `${basePath || opencodeDir}/${name}`;
-            files[blobKey] = blob;
-            tree.push(blob);
-        }
-    }
-    
-    return { sha: null, tree };
-}
+async function ensureGitHubRepo(token, repoName) {
+    const [owner, repo] = repoName.split('/');
+    
+    const response = await fetch(`https://api.github.com/repos/${owner}/${repo}`, {
+        headers: { 'Authorization': `Bearer ${token}` }
+    });
+    
+    if (response.ok) {
+        const data = await response.json();
+        if (!data.default_branch) {
+            await bootstrapEmptyRepo(token, owner, repo);
+        }
+        return data;
+    }
+    
+    if (response.status === 404) {
+        const createRes = await fetch(`https://api.github.com/user/repos`, {
+            method: 'POST',
+            headers: {
+                'Authorization': `Bearer ${token}`,
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                name: repo,
+                private: true,
+                description: 'OpenCode Studio backup',
+                auto_init: true
+            })
+        });
+        
+        if (createRes.ok) {
+            return await createRes.json();
+        }
+        
+        const err = await createRes.text();
+        throw new Error(`Failed to create repo: ${err}`);
+    }
+    
+    const err = await response.text();
+    throw new Error(`Failed to check repo: ${err}`);
+}
+
+async function bootstrapEmptyRepo(token, owner, repo) {
+    const res = await fetch(`https://api.github.com/repos/${owner}/${repo}/contents/README.md`, {
+        method: 'PUT',
+        headers: {
+            'Authorization': `Bearer ${token}`,
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+            message: 'Initial commit',
+            content: Buffer.from('# OpenCode Studio Backup\n').toString('base64')
+        })
+    });
+    
+    if (!res.ok) {
+        const err = await res.text();
+        throw new Error(`Failed to bootstrap repo: ${err}`);
+    }
+}
+
+function collectBlobs(rootDir, basePath = '', blobs = []) {
+    const dir = basePath || rootDir;
+    if (!fs.existsSync(dir)) return blobs;
+    
+    for (const name of fs.readdirSync(dir)) {
+        const fullPath = path.join(dir, name);
+        const stat = fs.statSync(fullPath);
+        
+        if (stat.isDirectory()) {
+            if (name === 'node_modules' || name === '.git' || name === '.next') continue;
+            collectBlobs(rootDir, fullPath, blobs);
+        } else {
+            if (name.endsWith('.log') || name.endsWith('.tmp')) continue;
+            const content = fs.readFileSync(fullPath, 'utf8');
+            blobs.push({
+                path: path.relative(rootDir, fullPath).replace(/\\/g, '/'),
+                mode: '100644',
+                type: 'blob',
+                content
+            });
+        }
+    }
+    return blobs;
+}
 
-async function createGitHubBlob(token, blob) {
-    const response = await fetch('https://api.github.com/git/blobs', {
+async function createGitHubBlob(token, repoName, blob) {
+    const [owner, repo] = repoName.split('/');
+    const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/git/blobs`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token}`,
@@ -1191,32 +1204,35 @@ async function createGitHubBlob(token, blob) {
     return data.sha;
 }
 
-async function createGitHubTree(token, repoName, treeItems) {
-    const [owner, repo] = repoName.split('/');
-    const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/git/trees`, {
-        method: 'POST',
-        headers: {
-            'Authorization': `Bearer ${token}`,
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({
-            tree: treeItems.map(item => ({
-                path: item.path,
-                mode: item.mode,
-                type: item.type,
-                sha: item.sha
-            }))
-        })
-    });
-    
-    if (!response.ok) {
-        const err = await response.text();
-        throw new Error(`Failed to create tree: ${err}`);
-    }
-    
-    const data = await response.json();
-    return data.sha;
-}
+async function createGitHubTree(token, repoName, treeItems, baseSha = null) {
+    const [owner, repo] = repoName.split('/');
+    const body = {
+        tree: treeItems.map(item => ({
+            path: item.path,
+            mode: item.mode,
+            type: item.type,
+            sha: item.sha
+        }))
+    };
+    if (baseSha) body.base_tree = baseSha;
+    
+    const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/git/trees`, {
+        method: 'POST',
+        headers: {
+            'Authorization': `Bearer ${token}`,
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(body)
+    });
+    
+    if (!response.ok) {
+        const err = await response.text();
+        throw new Error(`Failed to create tree: ${err}`);
+    }
+    
+    const data = await response.json();
+    return data.sha;
+}
 
 async function createGitHubCommit(token, repoName, treeSha, message) {
     const [owner, repo] = repoName.split('/');
@@ -1253,25 +1269,49 @@ async function createGitHubCommit(token, repoName, treeSha, message) {
     return data.sha;
 }
 
-async function updateGitHubRef(token, repoName, commitSha, branch = 'main') {
-    const [owner, repo] = repoName.split('/');
-    
-    const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/git/refs/heads/${branch}`, {
-        method: 'PATCH',
-        headers: {
-            'Authorization': `Bearer ${token}`,
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({
-            sha: commitSha
-        })
-    });
-    
-    if (!response.status === 200 && response.status !== 201) {
-        const err = await response.text();
-        throw new Error(`Failed to update ref: ${err}`);
-    }
-}
+async function updateGitHubRef(token, repoName, commitSha, branch = 'main') {
+    const [owner, repo] = repoName.split('/');
+    
+    const checkRes = await fetch(`https://api.github.com/repos/${owner}/${repo}/git/refs/heads/${branch}`, {
+        headers: { 'Authorization': `Bearer ${token}` }
+    });
+    
+    if (checkRes.status === 404) {
+        const createRes = await fetch(`https://api.github.com/repos/${owner}/${repo}/git/refs`, {
+            method: 'POST',
+            headers: {
+                'Authorization': `Bearer ${token}`,
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                ref: `refs/heads/${branch}`,
+                sha: commitSha
+            })
+        });
+        
+        if (!createRes.ok) {
+            const err = await createRes.text();
+            throw new Error(`Failed to create ref: ${err}`);
+        }
+        return;
+    }
+    
+    const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/git/refs/heads/${branch}`, {
+        method: 'PATCH',
+        headers: {
+            'Authorization': `Bearer ${token}`,
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+            sha: commitSha
+        })
+    });
+    
+    if (!response.ok) {
+        const err = await response.text();
+        throw new Error(`Failed to update ref: ${err}`);
+    }
+}
 
 app.get('/api/github/backup/status', async (req, res) => {
     try {
@@ -1328,22 +1368,26 @@ app.post('/api/github/backup', async (req, res) => {
         const opencodeConfig = getConfigPath();
         if (!opencodeConfig) return res.status(400).json({ error: 'No opencode config path found' });
         
-        const opencodeDir = path.dirname(opencodeConfig);
-        const studioDir = path.join(HOME_DIR, '.config', 'opencode-studio');
-        
-        const blobs = {};
-        const opencodeTree = buildCommitTree(opencodeDir, studioDir, blobs);
-        const studioTree = buildCommitTree(studioDir, studioDir, {}, studioDir);
-        
-        const opencodeTreeSha = await createGitHubTree(token, repoName, opencodeTree.tree);
-        const studioTreeSha = await createGitHubTree(token, repoName, studioTree.tree);
-        
-        const rootTreeItems = [
-            { path: 'opencode', mode: '040000', type: 'tree', sha: opencodeTreeSha },
-            { path: 'opencode-studio', mode: '040000', type: 'tree', sha: studioTreeSha }
-        ];
-        
-        const rootTreeSha = await createGitHubTree(token, repoName, rootTreeItems);
+        const opencodeDir = path.dirname(opencodeConfig);
+        const studioDir = path.join(HOME_DIR, '.config', 'opencode-studio');
+        
+        const opencodeBlobs = collectBlobs(opencodeDir);
+        const studioBlobs = collectBlobs(studioDir);
+        
+        for (const blob of opencodeBlobs) {
+            blob.sha = await createGitHubBlob(token, repoName, blob);
+            blob.path = `opencode/${blob.path}`;
+            delete blob.content;
+        }
+        
+        for (const blob of studioBlobs) {
+            blob.sha = await createGitHubBlob(token, repoName, blob);
+            blob.path = `opencode-studio/${blob.path}`;
+            delete blob.content;
+        }
+        
+        const allBlobs = [...opencodeBlobs, ...studioBlobs];
+        const rootTreeSha = await createGitHubTree(token, repoName, allBlobs);
         
         const timestamp = new Date().toISOString();
         const commitMessage = `OpenCode Studio backup ${timestamp}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-studio-server",
-  "version": "1.20.0",
+  "version": "1.22.0",
   "description": "Backend server for OpenCode Studio - manages opencode configurations",
   "main": "index.js",
   "bin": {