@rallycry/conveyor-agent 4.1.0 → 4.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -693,48 +693,6 @@ function runStartCommand(cmd, cwd, onOutput) {
693
693
 
694
694
  // src/setup/codespace.ts
695
695
  import { execSync } from "child_process";
696
- var DEVCONTAINER_PATH2 = ".devcontainer/conveyor/devcontainer.json";
697
- function cleanDevcontainerFromGit(workspaceDir, taskBranch, baseBranch) {
698
- const git = (cmd) => execSync(cmd, { cwd: workspaceDir, encoding: "utf-8", timeout: 3e4 }).trim();
699
- try {
700
- git(`git fetch origin ${baseBranch}`);
701
- } catch {
702
- return { cleaned: false, message: `Failed to fetch origin/${baseBranch}` };
703
- }
704
- try {
705
- git(`git diff --quiet origin/${baseBranch} -- ${DEVCONTAINER_PATH2}`);
706
- return { cleaned: false, message: "devcontainer.json already matches base" };
707
- } catch {
708
- }
709
- try {
710
- const ahead = parseInt(git(`git rev-list --count origin/${baseBranch}..HEAD`), 10);
711
- if (ahead <= 1) {
712
- git(`git reset --hard origin/${baseBranch}`);
713
- } else {
714
- git(`git checkout origin/${baseBranch} -- ${DEVCONTAINER_PATH2}`);
715
- git(`git add ${DEVCONTAINER_PATH2}`);
716
- try {
717
- git(`git diff --cached --quiet -- ${DEVCONTAINER_PATH2}`);
718
- return { cleaned: false, message: "devcontainer.json already clean in working tree" };
719
- } catch {
720
- git(`git commit -m "chore: reset devcontainer config"`);
721
- }
722
- }
723
- try {
724
- git(`git push --force-with-lease origin ${taskBranch}`);
725
- } catch {
726
- git(`git push --force origin ${taskBranch}`);
727
- }
728
- return { cleaned: true, message: "devcontainer.json cleaned from git history" };
729
- } catch (err) {
730
- try {
731
- git(`git checkout ${taskBranch}`);
732
- } catch {
733
- }
734
- const msg = err instanceof Error ? err.message : "Unknown error";
735
- return { cleaned: false, message: `Git cleanup failed: ${msg}` };
736
- }
737
- }
738
696
  function initRtk() {
739
697
  try {
740
698
  execSync("rtk --version", { stdio: "ignore" });
@@ -2804,16 +2762,6 @@ var AgentRunner = class _AgentRunner {
2804
2762
  if (process.env.CODESPACES === "true") {
2805
2763
  unshallowRepo(this.config.workspaceDir);
2806
2764
  }
2807
- if (process.env.CODESPACES === "true" && this.taskContext.baseBranch) {
2808
- const result = cleanDevcontainerFromGit(
2809
- this.config.workspaceDir,
2810
- this.taskContext.githubBranch,
2811
- this.taskContext.baseBranch
2812
- );
2813
- if (result.cleaned) {
2814
- this.setupLog.push(`[conveyor] ${result.message}`);
2815
- }
2816
- }
2817
2765
  if (process.env.CODESPACES !== "true" && !this.worktreeActive && this.taskContext.useWorktree) {
2818
2766
  try {
2819
2767
  const worktreePath = ensureWorktree(this.config.workspaceDir, this.config.taskId);
@@ -3667,4 +3615,4 @@ export {
3667
3615
  ProjectRunner,
3668
3616
  FileCache
3669
3617
  };
3670
- //# sourceMappingURL=chunk-BBGSX2AX.js.map
3618
+ //# sourceMappingURL=chunk-WSXJ4F37.js.map