@locusai/cli 0.9.10 → 0.9.11

package/bin/agent/worker.js

@@ -30921,12 +30921,34 @@ class WorktreeManager {
     const status = this.git("status --porcelain", worktreePath).trim();
     return status.length > 0;
   }
-  commitChanges(worktreePath, message) {
-    if (!this.hasChanges(worktreePath)) {
+  hasCommitsAhead(worktreePath, baseBranch) {
+    try {
+      const count = this.git(`rev-list --count "${baseBranch}..HEAD"`, worktreePath).trim();
+      return Number.parseInt(count, 10) > 0;
+    } catch {
+      return false;
+    }
+  }
+  commitChanges(worktreePath, message, baseBranch) {
+    const hasUncommittedChanges = this.hasChanges(worktreePath);
+    if (!hasUncommittedChanges) {
+      if (baseBranch && this.hasCommitsAhead(worktreePath, baseBranch)) {
+        const hash3 = this.git("rev-parse HEAD", worktreePath).trim();
+        this.log(`Agent already committed changes (${hash3.slice(0, 8)}); skipping additional commit`, "info");
+        return hash3;
+      }
       this.log("No changes to commit", "info");
       return null;
     }
     this.git("add -A", worktreePath);
+    try {
+      this.git("reset HEAD -- .locus/project/progress.md", worktreePath);
+    } catch {}
+    const staged = this.git("diff --cached --name-only", worktreePath).trim();
+    if (!staged) {
+      this.log("No changes to commit (only progress.md was modified)", "info");
+      return null;
+    }
     this.gitExec(["commit", "-m", message], worktreePath);
     const hash2 = this.git("rev-parse HEAD", worktreePath).trim();
     this.log(`Committed: ${hash2.slice(0, 8)}`, "success");
@@ -31175,7 +31197,9 @@ ${comment.text}
     prompt += `## Instructions
 1. Complete this task.
 2. **Artifact Management**: If you create any high-level documentation (PRDs, technical drafts, architecture docs), you MUST save them in \`.locus/artifacts/\`. Do NOT create them in the root directory.
-3. **Paths**: Use relative paths from the project root at all times. Do NOT use absolute local paths (e.g., /Users/...).`;
+3. **Paths**: Use relative paths from the project root at all times. Do NOT use absolute local paths (e.g., /Users/...).
+4. **Git**: Do NOT run \`git add\`, \`git commit\`, \`git push\`, or create branches. The Locus system handles all git operations automatically after your execution completes.
+5. **Progress**: Do NOT modify \`.locus/project/progress.md\`. The system updates it automatically.`;
     return prompt;
   }
   async buildGenericPrompt(query) {
@@ -31242,7 +31266,9 @@ There is an index file in the .locus/codebase-index.json and if you need you can
     }
     prompt += `## Instructions
 1. Execute the prompt based on the provided project context.
-2. **Paths**: Use relative paths from the project root at all times. Do NOT use absolute local paths (e.g., /Users/...).`;
+2. **Paths**: Use relative paths from the project root at all times. Do NOT use absolute local paths (e.g., /Users/...).
+3. **Git**: Do NOT run \`git add\`, \`git commit\`, \`git push\`, or create branches. The Locus system handles all git operations automatically after your execution completes.
+4. **Progress**: Do NOT modify \`.locus/project/progress.md\`. The system updates it automatically.`;
     return prompt;
   }
   getProjectConfig() {
@@ -31505,7 +31531,7 @@ class AgentWorker {
       executor: taskExecutor
     };
   }
-  commitAndPushWorktree(worktreePath, task2) {
+  commitAndPushWorktree(worktreePath, task2, baseBranch) {
     if (!this.worktreeManager) {
       return { branch: null, pushed: false, pushFailed: false };
     }
@@ -31522,7 +31548,7 @@ class AgentWorker {
 
 ${trailers.join(`
 `)}`;
-      const hash2 = this.worktreeManager.commitChanges(worktreePath, commitMessage);
+      const hash2 = this.worktreeManager.commitChanges(worktreePath, commitMessage, baseBranch);
       if (!hash2) {
         this.log("No changes to commit for this task", "info");
         return {
@@ -31612,7 +31638,7 @@ ${trailers.join(`
       let prError = null;
       let noChanges = false;
       if (result.success && worktreePath) {
-        const commitResult = this.commitAndPushWorktree(worktreePath, fullTask);
+        const commitResult = this.commitAndPushWorktree(worktreePath, fullTask, baseBranch ?? undefined);
         taskBranch = commitResult.branch;
         branchPushed = commitResult.pushed;
         keepBranch = taskBranch !== null;

package/bin/locus.js

@@ -38251,7 +38251,9 @@ ${comment.text}
     prompt += `## Instructions
 1. Complete this task.
 2. **Artifact Management**: If you create any high-level documentation (PRDs, technical drafts, architecture docs), you MUST save them in \`.locus/artifacts/\`. Do NOT create them in the root directory.
-3. **Paths**: Use relative paths from the project root at all times. Do NOT use absolute local paths (e.g., /Users/...).`;
+3. **Paths**: Use relative paths from the project root at all times. Do NOT use absolute local paths (e.g., /Users/...).
+4. **Git**: Do NOT run \`git add\`, \`git commit\`, \`git push\`, or create branches. The Locus system handles all git operations automatically after your execution completes.
+5. **Progress**: Do NOT modify \`.locus/project/progress.md\`. The system updates it automatically.`;
     return prompt;
   }
   async buildGenericPrompt(query) {
@@ -38318,7 +38320,9 @@ There is an index file in the .locus/codebase-index.json and if you need you can
     }
     prompt += `## Instructions
 1. Execute the prompt based on the provided project context.
-2. **Paths**: Use relative paths from the project root at all times. Do NOT use absolute local paths (e.g., /Users/...).`;
+2. **Paths**: Use relative paths from the project root at all times. Do NOT use absolute local paths (e.g., /Users/...).
+3. **Git**: Do NOT run \`git add\`, \`git commit\`, \`git push\`, or create branches. The Locus system handles all git operations automatically after your execution completes.
+4. **Progress**: Do NOT modify \`.locus/project/progress.md\`. The system updates it automatically.`;
     return prompt;
   }
   getProjectConfig() {
@@ -38607,12 +38611,34 @@ class WorktreeManager {
     const status = this.git("status --porcelain", worktreePath).trim();
     return status.length > 0;
   }
-  commitChanges(worktreePath, message) {
-    if (!this.hasChanges(worktreePath)) {
+  hasCommitsAhead(worktreePath, baseBranch) {
+    try {
+      const count = this.git(`rev-list --count "${baseBranch}..HEAD"`, worktreePath).trim();
+      return Number.parseInt(count, 10) > 0;
+    } catch {
+      return false;
+    }
+  }
+  commitChanges(worktreePath, message, baseBranch) {
+    const hasUncommittedChanges = this.hasChanges(worktreePath);
+    if (!hasUncommittedChanges) {
+      if (baseBranch && this.hasCommitsAhead(worktreePath, baseBranch)) {
+        const hash3 = this.git("rev-parse HEAD", worktreePath).trim();
+        this.log(`Agent already committed changes (${hash3.slice(0, 8)}); skipping additional commit`, "info");
+        return hash3;
+      }
       this.log("No changes to commit", "info");
       return null;
     }
     this.git("add -A", worktreePath);
+    try {
+      this.git("reset HEAD -- .locus/project/progress.md", worktreePath);
+    } catch {}
+    const staged = this.git("diff --cached --name-only", worktreePath).trim();
+    if (!staged) {
+      this.log("No changes to commit (only progress.md was modified)", "info");
+      return null;
+    }
     this.gitExec(["commit", "-m", message], worktreePath);
     const hash2 = this.git("rev-parse HEAD", worktreePath).trim();
     this.log(`Committed: ${hash2.slice(0, 8)}`, "success");
@@ -38875,7 +38901,7 @@ class AgentWorker {
       executor: taskExecutor
     };
   }
-  commitAndPushWorktree(worktreePath, task2) {
+  commitAndPushWorktree(worktreePath, task2, baseBranch) {
     if (!this.worktreeManager) {
       return { branch: null, pushed: false, pushFailed: false };
     }
@@ -38892,7 +38918,7 @@ class AgentWorker {
 
 ${trailers.join(`
 `)}`;
-      const hash2 = this.worktreeManager.commitChanges(worktreePath, commitMessage);
+      const hash2 = this.worktreeManager.commitChanges(worktreePath, commitMessage, baseBranch);
       if (!hash2) {
         this.log("No changes to commit for this task", "info");
         return {
@@ -38982,7 +39008,7 @@ ${trailers.join(`
       let prError = null;
       let noChanges = false;
       if (result.success && worktreePath) {
-        const commitResult = this.commitAndPushWorktree(worktreePath, fullTask);
+        const commitResult = this.commitAndPushWorktree(worktreePath, fullTask, baseBranch ?? undefined);
         taskBranch = commitResult.branch;
         branchPushed = commitResult.pushed;
         keepBranch = taskBranch !== null;
@@ -42665,6 +42691,13 @@ Complex tasks must be planned before writing code. Create \`.locus/plans/<task-n
 - No new dependencies without explicit approval.
 - Never put raw secrets or credentials in the codebase.
 
+## Git
+
+- Do NOT run \`git add\`, \`git commit\`, \`git push\`, or create branches.
+- The Locus system handles all git operations (commit, push, PR creation) automatically after your execution completes.
+- Focus only on making file changes — the orchestrator takes care of version control.
+- Do NOT modify \`.locus/project/progress.md\`. The system updates it automatically. Changes to this file are excluded from commits to prevent merge conflicts across concurrent agents.
+
 ## Avoiding Hallucinated / Slop Code
 
 - Ask before assuming. If requirements are ambiguous, incomplete, or could be interpreted multiple ways, stop and ask clarifying questions rather than guessing.
@@ -42808,8 +42841,9 @@ class ConfigManager {
         writeFileSync7(settingsPath, JSON.stringify(ordered, null, 2), "utf-8");
       }
     }
-    if (!existsSync15(locusMdPath)) {
-      writeFileSync7(locusMdPath, LOCUS_MD_TEMPLATE);
+    const locusMdExisted = existsSync15(locusMdPath);
+    writeFileSync7(locusMdPath, LOCUS_MD_TEMPLATE);
+    if (!locusMdExisted) {
       result.directoriesCreated.push(".locus/LOCUS.md");
     }
     const locusSubdirs = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@locusai/cli",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "description": "CLI for Locus - AI-native project management platform",
   "type": "module",
   "bin": {
@@ -32,7 +32,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@locusai/sdk": "^0.9.10"
+    "@locusai/sdk": "^0.9.11"
   },
   "devDependencies": {}
 }