all-hands-cli 0.1.10 → 0.1.11

package/bin/sync-cli.js

@@ -7245,6 +7245,16 @@ function collectFilesToPush(cwd, finalIncludes, finalExcludes) {
   const upstreamFiles = manifest.getDistributableFiles();
   const filesToPush = [];
   const localGitFiles = new Set(getGitFiles(cwd));
+  const deletedFiles = /* @__PURE__ */ new Set();
+  for (const args of [
+    ["diff", "--name-only", "--diff-filter=D"],
+    ["diff", "--cached", "--name-only", "--diff-filter=D"]
+  ]) {
+    const result = git(args, cwd);
+    if (result.success && result.stdout) {
+      result.stdout.split("\n").filter(Boolean).forEach((f) => deletedFiles.add(f));
+    }
+  }
   for (const relPath of upstreamFiles) {
     if (manifest.isInitOnly(relPath)) {
       continue;
@@ -7255,15 +7265,19 @@ function collectFilesToPush(cwd, finalIncludes, finalExcludes) {
     if (finalExcludes.some((pattern) => minimatch(relPath, pattern, { dot: true }))) {
       continue;
     }
-    if (!localGitFiles.has(relPath)) {
+    if (!localGitFiles.has(relPath) && !deletedFiles.has(relPath)) {
       continue;
     }
     const localFile = join9(cwd, relPath);
     const upstreamFile = join9(allhandsRoot, relPath);
-    if (existsSync11(localFile) && filesAreDifferent(localFile, upstreamFile)) {
-      if (wasModifiedByTargetRepo(cwd, relPath, allhandsRoot)) {
-        filesToPush.push({ path: relPath, type: "M" });
+    if (existsSync11(localFile)) {
+      if (filesAreDifferent(localFile, upstreamFile)) {
+        if (wasModifiedByTargetRepo(cwd, relPath, allhandsRoot)) {
+          filesToPush.push({ path: relPath, type: "M" });
+        }
       }
+    } else if (deletedFiles.has(relPath)) {
+      filesToPush.push({ path: relPath, type: "D" });
     }
   }
   for (const pattern of finalIncludes) {
@@ -7335,12 +7349,16 @@ async function createPullRequest(cwd, ghUser, filesToPush, title, body) {
       console.error("Error creating branch:", checkoutResult.stderr);
       return 1;
     }
-    console.log("Copying files...");
+    console.log("Applying changes...");
     for (const file of filesToPush) {
-      const src = join9(cwd, file.path);
-      const dest = join9(tempDir, file.path);
-      mkdirSync2(dirname8(dest), { recursive: true });
-      copyFileSync2(src, dest);
+      if (file.type === "D") {
+        git(["rm", "--ignore-unmatch", file.path], tempDir);
+      } else {
+        const src = join9(cwd, file.path);
+        const dest = join9(tempDir, file.path);
+        mkdirSync2(dirname8(dest), { recursive: true });
+        copyFileSync2(src, dest);
+      }
     }
     const addResult = git(["add", "."], tempDir);
     if (!addResult.success) {
@@ -7409,8 +7427,8 @@ async function cmdPush(include, exclude, dryRun, titleArg, bodyArg) {
   }
   console.log("\nFiles to be included in PR:");
   for (const file of filesToPush.sort((a, b) => a.path.localeCompare(b.path))) {
-    const marker = file.type === "M" ? "M" : "A";
-    const label = file.type === "M" ? "modified" : "included";
+    const marker = file.type;
+    const label = { D: "deleted", M: "modified", A: "included" }[file.type];
     console.log(`  ${marker} ${file.path} (${label})`);
   }
   console.log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "all-hands-cli",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Agentic harness for model-first software development",
   "type": "module",
   "bin": {

package/src/commands/push.ts

@@ -17,7 +17,7 @@ interface SyncConfig {
 
 interface FileEntry {
   path: string;
-  type: 'M' | 'A';
+  type: 'M' | 'A' | 'D';
 }
 
 interface PrerequisiteResult {
@@ -124,6 +124,18 @@ function collectFilesToPush(
   // Get non-ignored files in user's repo (respects .gitignore)
   const localGitFiles = new Set(getGitFiles(cwd));
 
+  // Get files deleted locally (both staged and unstaged deletions)
+  const deletedFiles = new Set<string>();
+  for (const args of [
+    ['diff', '--name-only', '--diff-filter=D'],
+    ['diff', '--cached', '--name-only', '--diff-filter=D'],
+  ]) {
+    const result = git(args, cwd);
+    if (result.success && result.stdout) {
+      result.stdout.split('\n').filter(Boolean).forEach((f) => deletedFiles.add(f));
+    }
+  }
+
   for (const relPath of upstreamFiles) {
     if (manifest.isInitOnly(relPath)) {
       continue;
@@ -134,18 +146,22 @@ function collectFilesToPush(
     if (finalExcludes.some((pattern) => minimatch(relPath, pattern, { dot: true }))) {
       continue;
     }
-    // Skip files that are gitignored in user's repo
-    if (!localGitFiles.has(relPath)) {
+    // Skip files that are gitignored in user's repo (but allow deleted files through)
+    if (!localGitFiles.has(relPath) && !deletedFiles.has(relPath)) {
       continue;
     }
 
     const localFile = join(cwd, relPath);
     const upstreamFile = join(allhandsRoot, relPath);
 
-    if (existsSync(localFile) && filesAreDifferent(localFile, upstreamFile)) {
-      if (wasModifiedByTargetRepo(cwd, relPath, allhandsRoot)) {
-        filesToPush.push({ path: relPath, type: 'M' });
+    if (existsSync(localFile)) {
+      if (filesAreDifferent(localFile, upstreamFile)) {
+        if (wasModifiedByTargetRepo(cwd, relPath, allhandsRoot)) {
+          filesToPush.push({ path: relPath, type: 'M' });
+        }
       }
+    } else if (deletedFiles.has(relPath)) {
+      filesToPush.push({ path: relPath, type: 'D' });
     }
   }
 
@@ -239,12 +255,16 @@ async function createPullRequest(
       return 1;
     }
 
-    console.log('Copying files...');
+    console.log('Applying changes...');
     for (const file of filesToPush) {
-      const src = join(cwd, file.path);
-      const dest = join(tempDir, file.path);
-      mkdirSync(dirname(dest), { recursive: true });
-      copyFileSync(src, dest);
+      if (file.type === 'D') {
+        git(['rm', '--ignore-unmatch', file.path], tempDir);
+      } else {
+        const src = join(cwd, file.path);
+        const dest = join(tempDir, file.path);
+        mkdirSync(dirname(dest), { recursive: true });
+        copyFileSync(src, dest);
+      }
     }
 
     const addResult = git(['add', '.'], tempDir);
@@ -328,8 +348,8 @@ export async function cmdPush(
 
   console.log('\nFiles to be included in PR:');
   for (const file of filesToPush.sort((a, b) => a.path.localeCompare(b.path))) {
-    const marker = file.type === 'M' ? 'M' : 'A';
-    const label = file.type === 'M' ? 'modified' : 'included';
+    const marker = file.type;
+    const label = { D: 'deleted', M: 'modified', A: 'included' }[file.type];
     console.log(`  ${marker} ${file.path} (${label})`);
   }
   console.log();