gitxelectron 1.2.1 → 1.2.3

package/out/main/index.js

@@ -576,7 +576,14 @@ function initGit(sessionId, baseDir) {
     baseDir,
     binary: "git",
     maxConcurrentProcesses: 6,
-    unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true }
+    unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true },
+    progress: ({ method, stage, progress }) => {
+      try {
+        const wc = electron.webContents.fromId(sessionId);
+        if (wc) wc.send("git-progress", { method, stage, progress });
+      } catch (e) {
+      }
+    }
   };
   const git = simpleGit.simpleGit(options).env({
     ...process.env,
@@ -586,11 +593,19 @@ function initGit(sessionId, baseDir) {
   });
   gitSessions.set(sessionId, { git, repoPath: baseDir });
 }
-function createSafeGit(baseDir) {
+function createSafeGit(baseDir, sessionId) {
   const options = {
     binary: "git",
     maxConcurrentProcesses: 6,
-    unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true }
+    unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true },
+    progress: ({ method, stage, progress }) => {
+      if (!sessionId) return;
+      try {
+        const wc = electron.webContents.fromId(sessionId);
+        if (wc) wc.send("git-progress", { method, stage, progress });
+      } catch (e) {
+      }
+    }
   };
   if (baseDir) {
     options.baseDir = baseDir;
@@ -728,6 +743,19 @@ async function unstageFiles(sessionId, files) {
 }
 async function commitChanges(sessionId, message) {
   const { git } = getGitSession(sessionId);
+  try {
+    const nameConfig = await git.getConfig("user.name");
+    const emailConfig = await git.getConfig("user.email");
+    if (!nameConfig.value || !emailConfig.value) {
+      const account = getActiveAccount(sessionId);
+      const name = account?.username || "GitQuickPush User";
+      const email = account ? `${account.username}@users.noreply.github.com` : "noreply@gitquickpush.local";
+      if (!nameConfig.value) await git.addConfig("user.name", name);
+      if (!emailConfig.value) await git.addConfig("user.email", email);
+    }
+  } catch (e) {
+    console.warn("Failed to check or set git author identity", e);
+  }
   return await git.commit(message);
 }
 function injectAuthToken(sessionId, remoteUrl) {
@@ -1156,7 +1184,7 @@ async function cloneRepository(sessionId, remoteUrl, destPath) {
   }
   try {
     if (destExists && destHasGit) {
-      const existingGit = createSafeGit(destPath);
+      const existingGit = createSafeGit(destPath, sessionId);
       try {
         await existingGit.raw(["config", "--global", "--add", "safe.directory", destPath]);
         const remotes = await existingGit.getRemotes();
@@ -1178,10 +1206,10 @@ async function cloneRepository(sessionId, remoteUrl, destPath) {
       }
     }
     if (destExists && destIsEmpty) {
-      const emptyDirGit = createSafeGit(destPath);
+      const emptyDirGit = createSafeGit(destPath, sessionId);
       await emptyDirGit.raw(["-c", "credential.helper=", "clone", authUrl, "."]);
       try {
-        await createSafeGit().raw(["config", "--global", "--add", "safe.directory", destPath]);
+        await createSafeGit(void 0, sessionId).raw(["config", "--global", "--add", "safe.directory", destPath]);
       } catch (e) {
       }
       return destPath;
@@ -1193,10 +1221,10 @@ async function cloneRepository(sessionId, remoteUrl, destPath) {
     }
     const baseDir = path__namespace.dirname(destPath);
     const targetDirName = path__namespace.basename(destPath);
-    const parentGit = createSafeGit(baseDir);
+    const parentGit = createSafeGit(baseDir, sessionId);
     await parentGit.raw(["-c", "credential.helper=", "clone", authUrl, targetDirName]);
     try {
-      await createSafeGit().raw(["config", "--global", "--add", "safe.directory", destPath]);
+      await createSafeGit(void 0, sessionId).raw(["config", "--global", "--add", "safe.directory", destPath]);
     } catch (e) {
     }
     return destPath;
@@ -1320,6 +1348,55 @@ ${errorMsg}
     `AI Analysis failed after trying all provided keys. Last error: ${lastError?.message}`
   );
 }
+async function generateCommitMessage(provider, apiKeyInput, diffStr, githubToken) {
+  const systemPrompt = `You are an expert developer. Generate a concise, clear Git commit message based on the provided git diff.
+Format your response exactly like a standard Git commit message:
+<type>: <short summary>
+
+<detailed description>
+
+Do not wrap it in JSON or code blocks. Return just the plain text of the commit message.
+If the diff is empty or invalid, return "Auto-sync: update files".`;
+  const truncatedDiff = diffStr.length > 1e4 ? diffStr.substring(0, 1e4) + "\n...[diff truncated]" : diffStr;
+  const prompt = `GIT DIFF:
+${truncatedDiff}`;
+  let keys = "".split(",").map((k) => k.trim()).filter((k) => k);
+  if (!keys.length && provider === "gemini") {
+    keys = ["AQ.Ab8RN6LFu9vxQBWCSzE72V4CG2ILxnreqAP4AZQzSmXZ_1vphw"];
+  }
+  if (githubToken) {
+    try {
+      const openai = new OpenAI({
+        apiKey: githubToken,
+        baseURL: "https://models.inference.ai.azure.com"
+      });
+      const response = await openai.chat.completions.create({
+        model: "gpt-4o-mini",
+        messages: [
+          { role: "system", content: systemPrompt },
+          { role: "user", content: prompt }
+        ]
+      });
+      const content = response.choices[0].message.content?.trim();
+      if (content) return content;
+    } catch (e) {
+      console.warn(`[AI Service] GitHub Copilot fallback for commit gen failed: ${e.message}`);
+    }
+  }
+  for (const apiKey of keys) {
+    try {
+      if (provider === "gemini") {
+        const genAI = new generativeAi.GoogleGenerativeAI(apiKey);
+        const model = genAI.getGenerativeModel({ model: "gemini-2.5-flash" });
+        const result = await model.generateContent([{ text: systemPrompt }, { text: prompt }]);
+        return result.response.text().trim();
+      }
+    } catch (e) {
+      console.warn(`[AI Service] Provider ${provider} commit gen failed: ${e.message}`);
+    }
+  }
+  return "Auto-sync: update files";
+}
 const getConfigPath = () => path__namespace.join(electron.app.getPath("userData"), "gitx-config.json");
 const saveLastWorkspace = async (workspacePath) => {
   try {
@@ -1406,8 +1483,21 @@ async function triggerSyncSequence(sessionId, _repoPath, onLog) {
     await stageFiles(sessionId, existingFiles);
     const status = await getStatus(sessionId);
     const branch = status.current || "main";
-    const commitMsg = `Auto-sync: update ${filesToSync.length > 1 ? filesToSync.length + " files" : filesToSync[0]}`;
-    onLog(`Committing: "${commitMsg}"...`);
+    onLog("Generating AI commit message...");
+    let commitMsg = `Auto-sync: update ${filesToSync.length > 1 ? filesToSync.length + " files" : filesToSync[0]}`;
+    try {
+      const diffStr = await getFileDiff(sessionId, "", true);
+      if (diffStr && diffStr.trim() !== "") {
+        const githubToken = getToken(sessionId) || void 0;
+        const aiMsg = await generateCommitMessage("gemini", "", diffStr, githubToken);
+        if (aiMsg) {
+          commitMsg = aiMsg;
+        }
+      }
+    } catch (aiErr) {
+      console.warn("AI commit generation failed, falling back to default", aiErr);
+    }
+    onLog(`Committing: "${commitMsg.split("\n")[0]}"...`);
     await commitChanges(sessionId, commitMsg);
     onLog(`Pushing to ${branch}...`);
     await pushToRemote(sessionId, "origin", branch);

package/out/preload/index.js

@@ -6,6 +6,10 @@ const api = {
   onSetCliRepo: (callback) => {
     electron.ipcRenderer.on("set-cli-repo", (_event, repoPath) => callback(repoPath));
   },
+  onGitProgress: (callback) => {
+    electron.ipcRenderer.removeAllListeners("git-progress");
+    electron.ipcRenderer.on("git-progress", (_event, data) => callback(data));
+  },
   selectDirectory: () => electron.ipcRenderer.invoke("select-directory"),
   setRepoPath: (path) => electron.ipcRenderer.invoke("set-repo-path", path),
   initRepo: (path) => electron.ipcRenderer.invoke("init-repo", path),