kunthawat/moreminimore-vibe
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto-commit extra files (#197)

Browse Source 
Whenever Dyad does a commit from a proposal, it will automatically amend
the commit with outside changes (e.g. made outside of Dyad).

This helps avoid a lot of user confusion, e.g.
https://github.com/dyad-sh/dyad/issues/187

https://www.reddit.com/r/dyadbuilders/comments/1kjysc0/error_pushing_images/

Edge cases:
If a user adds a file outside of Dyad, and then they hit retry, it will
revert these outside changes, but it's still technically in the version
history, so I think it's OK. This should also be a pretty unusual
situation.

Fixes #164 
Fixes #187
This commit is contained in:
Will Chen
2025-05-19 13:42:27 -07:00
committed by GitHub
parent 648724b4e9
commit b5671c0a59
8 changed files with 95 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/ipc/processors/response_processor.ts
View File

@@ -178,7 +178,8 @@ export async function processFullResponseActions(
): Promise<{
updatedFiles?: boolean;
error?: string;
uncommittedFiles?: string[];
extraFiles?: string[];
extraFilesError?: string;
}> {
logger.log("processFullResponseActions for chatId", chatId);
// Get the app associated with the chat
@@ -413,6 +414,10 @@ export async function processFullResponseActions(
deletedFiles.length > 0 ||
dyadAddDependencyPackages.length > 0 ||
dyadExecuteSqlQueries.length > 0;
let uncommittedFiles: string[] = [];
let extraFilesError: string | undefined;
if (hasChanges) {
// Stage all written files
for (const file of writtenFiles) {
@@ -438,17 +443,54 @@ export async function processFullResponseActions(
if (dyadExecuteSqlQueries.length > 0)
changes.push(`executed ${dyadExecuteSqlQueries.length} SQL queries`);
let message = chatSummary
? `[dyad] ${chatSummary} - ${changes.join(", ")}`
: `[dyad] ${changes.join(", ")}`;
// Use chat summary, if provided, or default for commit message
const commitHash = await git.commit({
let commitHash = await git.commit({
fs,
dir: appPath,
message: chatSummary
? `[dyad] ${chatSummary} - ${changes.join(", ")}`
: `[dyad] ${changes.join(", ")}`,
message,
author: await getGitAuthor(),
});
logger.log(`Successfully committed changes: ${changes.join(", ")}`);
// Check for any uncommitted changes after the commit
const statusMatrix = await git.statusMatrix({ fs, dir: appPath });
uncommittedFiles = statusMatrix
.filter((row) => row[1] !== 1 || row[2] !== 1 || row[3] !== 1)
.map((row) => row[0]); // Get just the file paths
if (uncommittedFiles.length > 0) {
// Stage all changes
await git.add({
fs,
dir: appPath,
filepath: ".",
});
try {
commitHash = await git.commit({
fs,
dir: appPath,
message: message + " + extra files edited outside of Dyad",
author: await getGitAuthor(),
amend: true,
});
logger.log(
`Amend commit with changes outside of dyad: ${uncommittedFiles.join(", ")}`,
);
} catch (error) {
// Just log, but don't throw an error because the user can still
// commit these changes outside of Dyad if needed.
logger.error(
`Failed to commit changes outside of dyad: ${uncommittedFiles.join(
", ",
)}`,
);
extraFilesError = (error as any).toString();
}
}
// Save the commit hash to the message
await db
.update(messages)
@@ -457,13 +499,6 @@ export async function processFullResponseActions(
})
.where(eq(messages.id, messageId));
}
// Check for any uncommitted changes after the commit
const statusMatrix = await git.statusMatrix({ fs, dir: appPath });
const uncommittedFiles = statusMatrix
.filter((row) => row[1] !== 1 || row[2] !== 1 || row[3] !== 1)
.map((row) => row[0]); // Get just the file paths
logger.log("mark as approved: hasChanges", hasChanges);
// Update the message to approved
await db
@@ -475,8 +510,8 @@ export async function processFullResponseActions(
return {
updatedFiles: hasChanges,
uncommittedFiles:
uncommittedFiles.length > 0 ? uncommittedFiles : undefined,
extraFiles: uncommittedFiles.length > 0 ? uncommittedFiles : undefined,
extraFilesError,
};
} catch (error: unknown) {
logger.error("Error processing files:", error);