Drop usage of execSync, switch to $ util
This commit is contained in:
+10
-5
@@ -1,5 +1,5 @@
|
||||
import { execSync } from "node:child_process";
|
||||
import { type } from "arktype";
|
||||
import { $ } from "../utils/shell.ts";
|
||||
import { contextualize, tool } from "./shared.ts";
|
||||
|
||||
export const ListFiles = type({
|
||||
@@ -17,14 +17,19 @@ export const ListFilesTool = tool({
|
||||
try {
|
||||
// Use git ls-files to list tracked files
|
||||
// This respects .gitignore and gives a clean list of source files
|
||||
const command = path === "." ? "git ls-files" : `git ls-files ${path}`;
|
||||
const output = execSync(command, { encoding: "utf-8" });
|
||||
const pathStr = path ?? ".";
|
||||
const output = $("git", pathStr === "." ? ["ls-files"] : ["ls-files", pathStr], {
|
||||
log: false,
|
||||
});
|
||||
const files = output.split("\n").filter((f) => f.trim() !== "");
|
||||
|
||||
if (files.length === 0) {
|
||||
// Fallback for non-git environments or untracked files
|
||||
const findCmd = `find ${path} -maxdepth 3 -not -path '*/.*' -type f`;
|
||||
const findOutput = execSync(findCmd, { encoding: "utf-8" });
|
||||
const findOutput = $(
|
||||
"find",
|
||||
[pathStr, "-maxdepth", "3", "-not", "-path", "*/.*", "-type", "f"],
|
||||
{ log: false }
|
||||
);
|
||||
return {
|
||||
files: findOutput.split("\n").filter((f) => f.trim() !== ""),
|
||||
method: "find",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { execSync } from "node:child_process";
|
||||
import { type } from "arktype";
|
||||
import { log } from "../utils/cli.ts";
|
||||
import { $ } from "../utils/shell.ts";
|
||||
import { contextualize, tool } from "./shared.ts";
|
||||
|
||||
export const PullRequest = type({
|
||||
@@ -15,9 +15,7 @@ export const PullRequestTool = tool({
|
||||
parameters: PullRequest,
|
||||
execute: contextualize(async ({ title, body, base }, ctx) => {
|
||||
// Get the current branch name
|
||||
const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
|
||||
encoding: "utf8",
|
||||
}).trim();
|
||||
const currentBranch = $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
|
||||
|
||||
log.info(`Current branch: ${currentBranch}`);
|
||||
|
||||
|
||||
+4
-4
@@ -1,6 +1,6 @@
|
||||
import { execSync } from "node:child_process";
|
||||
import { type } from "arktype";
|
||||
import { log } from "../utils/cli.ts";
|
||||
import { $ } from "../utils/shell.ts";
|
||||
import { contextualize, tool } from "./shared.ts";
|
||||
|
||||
export const PullRequestInfo = type({
|
||||
@@ -30,14 +30,14 @@ export const PullRequestInfoTool = tool({
|
||||
|
||||
// Automatically fetch and checkout branches for review
|
||||
log.info(`Fetching base branch: origin/${baseBranch}`);
|
||||
execSync(`git fetch origin ${baseBranch} --depth=20`, { stdio: "inherit" });
|
||||
$("git", ["fetch", "origin", baseBranch, "--depth=20"]);
|
||||
|
||||
log.info(`Fetching PR branch: origin/${headBranch}`);
|
||||
execSync(`git fetch origin ${headBranch}`, { stdio: "inherit" });
|
||||
$("git", ["fetch", "origin", headBranch]);
|
||||
|
||||
log.info(`Checking out PR branch: origin/${headBranch}`);
|
||||
// check out a local branch tracking the remote branch so we can push changes
|
||||
execSync(`git checkout -B ${headBranch} origin/${headBranch}`, { stdio: "inherit" });
|
||||
$("git", ["checkout", "-B", headBranch, `origin/${headBranch}`]);
|
||||
|
||||
return {
|
||||
number: data.number,
|
||||
|
||||
Reference in New Issue
Block a user