feat: commit on web diff panel

test

test

test2

implement done

bug fix

src/server/core/git/services/GitService.ts

@@ -1,5 +1,5 @@
 import { Command, FileSystem, Path } from "@effect/platform";
-import { Context, Data, Effect, Either, Layer } from "effect";
+import { Context, Data, Duration, Effect, Either, Layer } from "effect";
 import type { InferEffect } from "../../../lib/effect/types";
 import { EnvService } from "../../platform/services/EnvService";
 import { parseGitBranchesOutput } from "../functions/parseGitBranchesOutput";
@@ -39,22 +39,20 @@ const LayerImpl = Effect.gen(function* () {
         );
       }
 
-      const command = Command.string(
-        Command.make("cd", absoluteCwd, "&&", "git", ...args).pipe(
-          Command.env({
-            PATH: yield* envService.getEnv("PATH"),
-          }),
-          Command.runInShell(true),
-        ),
+      const command = Command.make("git", ...args).pipe(
+        Command.workingDirectory(absoluteCwd),
+        Command.env({
+          PATH: yield* envService.getEnv("PATH"),
+        }),
       );
 
-      const result = yield* Effect.either(command);
+      const result = yield* Effect.either(Command.string(command));
 
       if (Either.isLeft(result)) {
         return yield* Effect.fail(
           new GitCommandError({
             cwd: absoluteCwd,
-            command: command.toString(),
+            command: `git ${args.join(" ")}`,
           }),
         );
       }
@@ -111,11 +109,137 @@ const LayerImpl = Effect.gen(function* () {
       return parseGitCommitsOutput(result);
     });
 
+  const stageFiles = (cwd: string, files: string[]) =>
+    Effect.gen(function* () {
+      if (files.length === 0) {
+        return yield* Effect.fail(
+          new GitCommandError({
+            cwd,
+            command: "git add (no files)",
+          }),
+        );
+      }
+
+      console.log("[GitService.stageFiles] Staging files:", files, "in", cwd);
+      const result = yield* execGitCommand(["add", ...files], cwd);
+      console.log("[GitService.stageFiles] Stage result:", result);
+      return result;
+    });
+
+  const commit = (cwd: string, message: string) =>
+    Effect.gen(function* () {
+      const trimmedMessage = message.trim();
+      if (trimmedMessage.length === 0) {
+        return yield* Effect.fail(
+          new GitCommandError({
+            cwd,
+            command: "git commit (empty message)",
+          }),
+        );
+      }
+
+      console.log(
+        "[GitService.commit] Committing with message:",
+        trimmedMessage,
+        "in",
+        cwd,
+      );
+      const result = yield* execGitCommand(
+        ["commit", "-m", trimmedMessage],
+        cwd,
+      );
+      console.log("[GitService.commit] Commit result:", result);
+
+      // Parse commit SHA from output
+      // Git commit output format: "[branch SHA] commit message"
+      const shaMatch = result.match(/\[.+\s+([a-f0-9]+)\]/);
+      console.log("[GitService.commit] SHA match:", shaMatch);
+      if (shaMatch?.[1]) {
+        console.log(
+          "[GitService.commit] Returning SHA from match:",
+          shaMatch[1],
+        );
+        return shaMatch[1];
+      }
+
+      // Fallback: Get SHA from git log
+      console.log(
+        "[GitService.commit] No SHA match, falling back to rev-parse HEAD",
+      );
+      const sha = yield* execGitCommand(["rev-parse", "HEAD"], cwd);
+      console.log(
+        "[GitService.commit] Returning SHA from rev-parse:",
+        sha.trim(),
+      );
+      return sha.trim();
+    });
+
+  const push = (cwd: string) =>
+    Effect.gen(function* () {
+      const branch = yield* getCurrentBranch(cwd);
+
+      const absoluteCwd = path.resolve(cwd);
+
+      // Use Command.exitCode to check success, as git push writes to stderr even on success
+      const command = Command.make("git", "push", "origin", "HEAD").pipe(
+        Command.workingDirectory(absoluteCwd),
+        Command.env({
+          PATH: yield* envService.getEnv("PATH"),
+        }),
+      );
+
+      const exitCodeResult = yield* Effect.either(
+        Command.exitCode(command).pipe(Effect.timeout(Duration.seconds(60))),
+      );
+
+      if (Either.isLeft(exitCodeResult)) {
+        console.log("[GitService.push] Command failed or timeout");
+        return yield* Effect.fail(
+          new GitCommandError({
+            cwd: absoluteCwd,
+            command: "git push origin HEAD (timeout after 60s)",
+          }),
+        );
+      }
+
+      const exitCode = exitCodeResult.right;
+      console.log("[GitService.push] Exit code:", exitCode);
+
+      if (exitCode !== 0) {
+        // Get stderr for error details
+        const stderrLines = yield* Command.lines(
+          Command.make("git", "push", "origin", "HEAD").pipe(
+            Command.workingDirectory(absoluteCwd),
+            Command.env({
+              PATH: yield* envService.getEnv("PATH"),
+            }),
+            Command.stderr("inherit"),
+          ),
+        ).pipe(Effect.orElse(() => Effect.succeed([])));
+
+        const stderr = Array.from(stderrLines).join("\n");
+        console.log("[GitService.push] Failed with stderr:", stderr);
+
+        return yield* Effect.fail(
+          new GitCommandError({
+            cwd: absoluteCwd,
+            command: `git push origin HEAD - ${stderr}`,
+          }),
+        );
+      }
+
+      console.log("[GitService.push] Push succeeded");
+      return { branch, output: "success" };
+    });
+
   return {
     getBranches,
     getCurrentBranch,
     branchExists,
     getCommits,
+    stageFiles,
+    commit,
+    push,
   };
 });