@saeed42/worktree-worker 1.6.2 → 1.7.0

package/dist/main.js

@@ -1828,6 +1828,139 @@ git.get("/commits", async (c) => {
     );
   }
 });
+var pushSchema2 = z3.object({
+  cwd: z3.string().min(1, "Working directory is required"),
+  branch: z3.string().min(1, "Branch is required"),
+  githubToken: z3.string().min(1, "GitHub token is required"),
+  upToCommit: z3.string().optional()
+});
+git.post("/push", async (c) => {
+  const log = logger.child({ route: "git/push" });
+  try {
+    const body = await c.req.json().catch(() => ({}));
+    const parsed = pushSchema2.safeParse(body);
+    if (!parsed.success) {
+      return c.json(
+        { success: false, error: { code: "VALIDATION_ERROR", message: parsed.error.message } },
+        400
+      );
+    }
+    const { cwd, branch, githubToken, upToCommit } = parsed.data;
+    log.info("Pushing to remote", { branch, hasUpToCommit: !!upToCommit });
+    await gitService.exec([
+      "config",
+      "--global",
+      "credential.helper",
+      "store --file=/tmp/.git-credentials"
+    ]);
+    await gitService.exec(["config", "--global", "core.askPass", ""]);
+    const credLine = `https://x-access-token:${githubToken}@github.com
+`;
+    await fs.writeFile("/tmp/.git-credentials", credLine, { mode: 384 });
+    try {
+      let pushArgs;
+      if (upToCommit) {
+        pushArgs = ["push", "origin", `${upToCommit}:${branch}`];
+      } else {
+        pushArgs = ["push", "origin", branch];
+      }
+      log.debug("Executing git push", { args: pushArgs });
+      const result = await gitService.exec(pushArgs, cwd);
+      if (result.code !== 0) {
+        const output = result.stderr || result.stdout || "";
+        log.error("Git push failed", { stderr: output, code: result.code });
+        if (output.includes("rejected") || output.includes("non-fast-forward")) {
+          return c.json(
+            { success: false, error: { code: "REJECTED", message: "Push rejected: Remote has changes. Please pull first." } },
+            409
+          );
+        }
+        if (output.includes("Permission denied") || output.includes("authentication") || output.includes("fatal: Authentication")) {
+          return c.json(
+            { success: false, error: { code: "AUTH_FAILED", message: "GitHub authentication failed." } },
+            403
+          );
+        }
+        return c.json(
+          { success: false, error: { code: "PUSH_FAILED", message: output || "Git push failed" } },
+          500
+        );
+      }
+      log.info("Git push successful", { branch });
+      return c.json({
+        success: true,
+        data: {
+          branch,
+          message: "Push successful"
+        }
+      });
+    } finally {
+      try {
+        await fs.unlink("/tmp/.git-credentials");
+      } catch {
+      }
+    }
+  } catch (err) {
+    const error = err;
+    log.error("Failed to push", { error: error.message });
+    return c.json(
+      { success: false, error: { code: "INTERNAL_ERROR", message: error.message } },
+      500
+    );
+  }
+});
+var discardSchema = z3.object({
+  cwd: z3.string().min(1, "Working directory is required"),
+  baseBranch: z3.string().min(1, "Base branch is required"),
+  commitSha: z3.string().optional()
+  // If provided, reset to before this commit
+});
+git.post("/discard", async (c) => {
+  const log = logger.child({ route: "git/discard" });
+  try {
+    const body = await c.req.json().catch(() => ({}));
+    const parsed = discardSchema.safeParse(body);
+    if (!parsed.success) {
+      return c.json(
+        { success: false, error: { code: "VALIDATION_ERROR", message: parsed.error.message } },
+        400
+      );
+    }
+    const { cwd, baseBranch, commitSha } = parsed.data;
+    let resetTarget;
+    if (commitSha) {
+      resetTarget = `${commitSha}^`;
+      log.info("Reverting commit", { commitSha });
+    } else {
+      resetTarget = `origin/${baseBranch}`;
+      log.info("Discarding all local commits", { baseBranch });
+      await gitService.exec(["fetch", "origin", baseBranch], cwd);
+    }
+    const result = await gitService.exec(["reset", "--hard", resetTarget], cwd);
+    if (result.code !== 0) {
+      log.error("Git reset failed", { stderr: result.stderr });
+      return c.json(
+        { success: false, error: { code: "RESET_FAILED", message: result.stderr || "Failed to reset" } },
+        500
+      );
+    }
+    log.info("Discard successful", { resetTarget });
+    return c.json({
+      success: true,
+      data: {
+        resetTarget,
+        message: commitSha ? "Commit reverted" : "All local commits discarded"
+      }
+    });
+  } catch (err) {
+    const error = err;
+    log.error("Failed to discard", { error: error.message });
+    return c.json(
+      { success: false, error: { code: "INTERNAL_ERROR", message: error.message } },
+      500
+    );
+  }
+});
 
 // src/main.ts
 var app = new Hono5();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saeed42/worktree-worker",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Git worktree management service for AI agent trials",
   "type": "module",
   "main": "dist/main.js",