all-hands-cli 0.1.7 → 0.1.8

package/bin/sync-cli.js

@@ -4905,6 +4905,15 @@ function getGitFiles(repoPath) {
   }
   return files;
 }
+function getFileBlobHash(filePath, repoPath) {
+  const result = git(["hash-object", filePath], repoPath);
+  return result.success ? result.stdout.trim() : null;
+}
+function fileExistsInHistory(relPath, blobHash, repoPath) {
+  const result = git(["rev-list", "HEAD", "--objects", "--", relPath], repoPath);
+  if (!result.success || !result.stdout) return false;
+  return result.stdout.split("\n").some((line) => line.startsWith(blobHash + " "));
+}
 
 // src/lib/manifest.ts
 import { readFileSync as readFileSync5, existsSync as existsSync3, statSync as statSync3 } from "fs";
@@ -7224,6 +7233,12 @@ function checkPrerequisites(cwd) {
   }
   return { success: true, ghUser };
 }
+function wasModifiedByTargetRepo(cwd, relPath, allhandsRoot) {
+  const localFile = join9(cwd, relPath);
+  const localBlobHash = getFileBlobHash(localFile, allhandsRoot);
+  if (!localBlobHash) return true;
+  return !fileExistsInHistory(relPath, localBlobHash, allhandsRoot);
+}
 function collectFilesToPush(cwd, finalIncludes, finalExcludes) {
   const allhandsRoot = getAllhandsRoot();
   const manifest = new Manifest(allhandsRoot);
@@ -7246,7 +7261,9 @@ function collectFilesToPush(cwd, finalIncludes, finalExcludes) {
     const localFile = join9(cwd, relPath);
     const upstreamFile = join9(allhandsRoot, relPath);
     if (existsSync11(localFile) && filesAreDifferent(localFile, upstreamFile)) {
-      filesToPush.push({ path: relPath, type: "M" });
+      if (wasModifiedByTargetRepo(cwd, relPath, allhandsRoot)) {
+        filesToPush.push({ path: relPath, type: "M" });
+      }
     }
   }
   for (const pattern of finalIncludes) {

package/package.json

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

package/src/commands/push.ts

@@ -3,7 +3,7 @@ import { tmpdir } from 'os';
 import { dirname, join } from 'path';
 import { minimatch } from 'minimatch';
 import * as readline from 'readline';
-import { git, isGitRepo, getGitFiles } from '../lib/git.js';
+import { git, isGitRepo, getGitFiles, getFileBlobHash, fileExistsInHistory } from '../lib/git.js';
 import { checkGhAuth, checkGhInstalled, getGhUser, gh } from '../lib/gh.js';
 import { Manifest, filesAreDifferent } from '../lib/manifest.js';
 import { getAllhandsRoot, UPSTREAM_REPO } from '../lib/paths.js';
@@ -94,6 +94,23 @@ function checkPrerequisites(cwd: string): PrerequisiteResult {
   return { success: true, ghUser };
 }
 
+/**
+ * Determine if a file was actually modified by the target repo,
+ * vs simply being out of date because upstream moved forward.
+ *
+ * Compares the target file's content against all historical versions
+ * in the upstream repo. If it matches any previous version, the target
+ * repo hasn't modified it.
+ */
+function wasModifiedByTargetRepo(cwd: string, relPath: string, allhandsRoot: string): boolean {
+  const localFile = join(cwd, relPath);
+  const localBlobHash = getFileBlobHash(localFile, allhandsRoot);
+
+  if (!localBlobHash) return true; // safe default: assume modified on error
+
+  return !fileExistsInHistory(relPath, localBlobHash, allhandsRoot);
+}
+
 function collectFilesToPush(
   cwd: string,
   finalIncludes: string[],
@@ -126,7 +143,9 @@ function collectFilesToPush(
     const upstreamFile = join(allhandsRoot, relPath);
 
     if (existsSync(localFile) && filesAreDifferent(localFile, upstreamFile)) {
-      filesToPush.push({ path: relPath, type: 'M' });
+      if (wasModifiedByTargetRepo(cwd, relPath, allhandsRoot)) {
+        filesToPush.push({ path: relPath, type: 'M' });
+      }
     }
   }
 

package/src/lib/git.ts

@@ -61,3 +61,22 @@ export function getGitFiles(repoPath: string): string[] {
   }
   return files;
 }
+
+/**
+ * Compute the git blob hash of a file (works on files outside the repo).
+ */
+export function getFileBlobHash(filePath: string, repoPath: string): string | null {
+  const result = git(['hash-object', filePath], repoPath);
+  return result.success ? result.stdout.trim() : null;
+}
+
+/**
+ * Check if a specific blob hash appears in the git history of a file path.
+ * Uses a single `rev-list --objects` call instead of per-commit lookups.
+ */
+export function fileExistsInHistory(relPath: string, blobHash: string, repoPath: string): boolean {
+  const result = git(['rev-list', 'HEAD', '--objects', '--', relPath], repoPath);
+  if (!result.success || !result.stdout) return false;
+
+  return result.stdout.split('\n').some(line => line.startsWith(blobHash + ' '));
+}