adam/open-swe
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/open-swe.git synced 2026-10-03 13:53:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: If session id exists, pull latest changes on branch (#57)

Browse source
This commit is contained in:
Brace Sproul 2025-05-29 17:52:32 -07:00 • committed by GitHub
parent 525dc1156b
commit b0eff07d22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/open-swe/src/nodes/initialize.ts
View file

@ -12,6 +12,7 @@ import {
configureGitUserInRepo, configureGitUserInRepo,
getBranchName, getBranchName,
getRepoAbsolutePath, getRepoAbsolutePath,
pullLatestChanges,
} from "../utils/git/index.js"; } from "../utils/git/index.js";
import { getSandboxErrorFields } from "../utils/sandbox-error-fields.js"; import { getSandboxErrorFields } from "../utils/sandbox-error-fields.js";
@ -63,6 +64,13 @@ export async function initialize(
throw new Error("Configuration object not found."); throw new Error("Configuration object not found.");
} }
const { sandboxSessionId } = state; const { sandboxSessionId } = state;
const { targetRepository } = state;
if (!targetRepository) {
throw new Error(
"Missing required target repository. Please provide a git repository in state or configuration.",
);
}
const absoluteRepoDir = getRepoAbsolutePath(targetRepository);
if (sandboxSessionId) { if (sandboxSessionId) {
try { try {
@ -74,6 +82,7 @@ export async function initialize(
sandboxSessionId, sandboxSessionId,
TIMEOUT_EXTENSION_OPT, TIMEOUT_EXTENSION_OPT,
); );
await pullLatestChanges(absoluteRepoDir, newSandbox);
return { return {
sandboxSessionId: newSandbox.sandboxId, sandboxSessionId: newSandbox.sandboxId,
}; };
@ -83,13 +92,6 @@ export async function initialize(
} }
} }
const { targetRepository } = state;
if (!targetRepository) {
throw new Error(
"Missing required target repository. Please provide a git repository in state or configuration.",
);
}
logger.info("Creating sandbox..."); logger.info("Creating sandbox...");
const sandbox = await Sandbox.create( const sandbox = await Sandbox.create(
SANDBOX_TEMPLATE_ID, SANDBOX_TEMPLATE_ID,
@ -104,8 +106,6 @@ export async function initialize(
} }
logger.info("Repository cloned successfully."); logger.info("Repository cloned successfully.");
const absoluteRepoDir = getRepoAbsolutePath(targetRepository);
logger.info(`Configuring git user for repository at "${absoluteRepoDir}"...`); logger.info(`Configuring git user for repository at "${absoluteRepoDir}"...`);
await configureGitUserInRepo(absoluteRepoDir, sandbox); await configureGitUserInRepo(absoluteRepoDir, sandbox);
logger.info("Git user configured successfully."); logger.info("Git user configured successfully.");

24
apps/open-swe/src/utils/git/index.ts
View file

@ -449,3 +449,27 @@ export async function createPullRequest({
return null; return null;
} }
} }
export async function pullLatestChanges(
absoluteRepoDir: string,
sandbox: Sandbox,
): Promise<CommandResult | false> {
try {
const gitPullOutput = await sandbox.commands.run("git pull", {
cwd: absoluteRepoDir,
});
await sandbox.setTimeout(TIMEOUT_MS);
return gitPullOutput;
} catch (e) {
const errorFields = getSandboxErrorFields(e);
logger.error(`Failed to pull latest changes`, {
...(errorFields && { errorFields }),
...(e instanceof Error && {
name: e.name,
message: e.message,
stack: e.stack,
}),
});
return false;
}
}