groove-dev 0.27.41 → 0.27.44

package/packages/daemon/src/lockmanager.js

@@ -18,7 +18,7 @@ const DEFAULT_OPERATION_TTL_MS = 10 * 60 * 1000; // 10 minutes
 export class LockManager {
   constructor(grooveDir) {
     this.path = resolve(grooveDir, 'locks.json');
-    this.locks = new Map(); // agentId -> glob patterns[]
+    this.locks = new Map(); // agentId -> { patterns, workingDir }
     this._compiledPatterns = new Map(); // agentId -> RegExp[]
     this.operations = new Map(); // agentId -> { name, resources, acquiredAt, expiresAt }
     this.load();
@@ -28,9 +28,11 @@ export class LockManager {
     if (existsSync(this.path)) {
       try {
         const data = JSON.parse(readFileSync(this.path, 'utf8'));
-        for (const [id, patterns] of Object.entries(data)) {
-          this.locks.set(id, patterns);
-          this._compilePatterns(id, patterns);
+        for (const [id, val] of Object.entries(data)) {
+          // Backward compat: old format stored just patterns array
+          const entry = Array.isArray(val) ? { patterns: val, workingDir: null } : val;
+          this.locks.set(id, entry);
+          this._compilePatterns(id, entry.patterns);
         }
       } catch {
         // Start fresh
@@ -51,8 +53,8 @@ export class LockManager {
     this._compiledPatterns.set(agentId, compiled);
   }
 
-  register(agentId, patterns) {
-    this.locks.set(agentId, patterns);
+  register(agentId, patterns, workingDir = null) {
+    this.locks.set(agentId, { patterns, workingDir: workingDir || null });
     this._compilePatterns(agentId, patterns);
     this.save();
   }
@@ -64,9 +66,13 @@ export class LockManager {
     this.save();
   }
 
-  check(agentId, filePath) {
+  // Scopes are per-team — only conflict with owners in the same workingDir.
+  // Pass workingDir=null to skip the filter (legacy behavior).
+  check(agentId, filePath, workingDir = null) {
     for (const [ownerId, compiled] of this._compiledPatterns) {
       if (ownerId === agentId) continue;
+      const ownerEntry = this.locks.get(ownerId);
+      if (workingDir && ownerEntry?.workingDir && ownerEntry.workingDir !== workingDir) continue;
       for (const { pattern, re } of compiled) {
         if (re && re.test(filePath)) {
           return { conflict: true, owner: ownerId, pattern };
@@ -111,11 +117,13 @@ export class LockManager {
   /**
    * Find any currently-locked agent whose scope overlaps with candidateScope.
    * Returns { overlap: true, owner, ... } for the first conflict, else {overlap:false}.
+   * Pass workingDir to limit the search to the same team folder (scopes are per-team).
    */
-  findOverlappingOwner(candidateScope) {
-    for (const [ownerId, patterns] of this.locks) {
-      const res = LockManager.scopesOverlap(candidateScope, patterns);
-      if (res.overlap) return { overlap: true, owner: ownerId, ownerScope: patterns, ...res };
+  findOverlappingOwner(candidateScope, workingDir = null) {
+    for (const [ownerId, entry] of this.locks) {
+      if (workingDir && entry.workingDir && entry.workingDir !== workingDir) continue;
+      const res = LockManager.scopesOverlap(candidateScope, entry.patterns);
+      if (res.overlap) return { overlap: true, owner: ownerId, ownerScope: entry.patterns, ...res };
     }
     return { overlap: false };
   }
@@ -140,7 +148,9 @@ export class LockManager {
   }
 
   getAll() {
-    return Object.fromEntries(this.locks);
+    const obj = {};
+    for (const [id, entry] of this.locks) obj[id] = entry.patterns;
+    return obj;
   }
 
   // --- Operation locks (coordination protocol) ---

package/packages/daemon/src/process.js

@@ -385,7 +385,7 @@ export class ProcessManager {
     // bypass entirely since their job requires broad access.
     const SCOPE_BYPASS_ROLES = new Set(['planner', 'fullstack', 'qc', 'pm', 'supervisor', 'security', 'ambassador']);
     if (config.scope && config.scope.length > 0 && !SCOPE_BYPASS_ROLES.has(config.role) && !config.allowScopeOverlap) {
-      const conflict = locks.findOverlappingOwner(config.scope);
+      const conflict = locks.findOverlappingOwner(config.scope, config.workingDir);
       if (conflict.overlap) {
         const owner = registry.get(conflict.owner);
         if (owner && owner.status === 'running' && owner.workingDir === config.workingDir) {
@@ -463,7 +463,7 @@ export class ProcessManager {
 
     // Register file locks for the agent's scope
     if (agent.scope && agent.scope.length > 0) {
-      locks.register(agent.id, agent.scope);
+      locks.register(agent.id, agent.scope, agent.workingDir);
     }
 
     // Register ambassador with federation system
@@ -1523,7 +1523,7 @@ For normal file edits within your scope, proceed without review.
 
     // Re-register locks
     if (newAgent.scope && newAgent.scope.length > 0) {
-      locks.register(newAgent.id, newAgent.scope);
+      locks.register(newAgent.id, newAgent.scope, newAgent.workingDir);
     }
 
     // Spawn the resumed process

package/packages/daemon/src/teams.js

@@ -34,14 +34,30 @@ export class Teams {
   }
 
   _ensureDefault() {
-    const hasDefault = [...this.teams.values()].some((t) => t.isDefault);
-    if (!hasDefault) {
+    const defaultDir = resolve(this.daemon.projectDir, 'default');
+    const existing = [...this.teams.values()].find((t) => t.isDefault);
+
+    if (!existing) {
+      try { mkdirSync(defaultDir, { recursive: true }); } catch { /* may exist */ }
       const id = randomUUID().slice(0, 8);
-      const team = { id, name: 'Default', isDefault: true, createdAt: new Date().toISOString() };
-      // Default team uses the project directory (no subdirectory)
-      team.workingDir = this.daemon.projectDir;
+      const team = {
+        id,
+        name: 'Default',
+        isDefault: true,
+        workingDir: defaultDir,
+        createdAt: new Date().toISOString(),
+      };
       this.teams.set(id, team);
       this._save();
+      return;
+    }
+
+    // Migrate legacy default teams that pointed at the project root — give them
+    // their own folder so generated files don't pile up alongside source code.
+    if (!existing.workingDir || existing.workingDir === this.daemon.projectDir) {
+      try { mkdirSync(defaultDir, { recursive: true }); } catch { /* may exist */ }
+      existing.workingDir = defaultDir;
+      this._save();
     }
   }
 
@@ -125,12 +141,13 @@ export class Teams {
   }
 
   /**
-   * Delete a team — removes directory and all contents, moves agents to default.
+   * Delete a team — kills its agents, removes its directory, drops it from the
+   * registry. Deleting the default team regenerates a fresh empty one so users
+   * can wipe accumulated state and keep working without restarting the daemon.
    */
   delete(id) {
     const team = this.teams.get(id);
     if (!team) throw new Error('Team not found');
-    if (team.isDefault) throw new Error('Cannot delete the default team');
 
     // Kill any running agents in this team
     const agents = this.daemon.registry.getAll().filter((a) => a.teamId === id);
@@ -145,8 +162,13 @@ export class Teams {
       this.daemon.registry.remove(agent.id);
     }
 
-    // Remove the working directory
-    if (team.workingDir && !team.isDefault && existsSync(team.workingDir)) {
+    // Remove the team's working directory — refuse to nuke the project root
+    // (legacy default teams that were never migrated point there).
+    if (
+      team.workingDir &&
+      team.workingDir !== this.daemon.projectDir &&
+      existsSync(team.workingDir)
+    ) {
       try {
         rmSync(team.workingDir, { recursive: true, force: true });
       } catch (err) {
@@ -158,6 +180,13 @@ export class Teams {
     this._save();
     this.daemon.broadcast({ type: 'team:deleted', teamId: id });
 
+    // Always keep a default team available — regenerate one with a clean folder
+    if (team.isDefault) {
+      this._ensureDefault();
+      const fresh = this.getDefault();
+      if (fresh) this.daemon.broadcast({ type: 'team:created', team: fresh });
+    }
+
     // Clean up orphaned logs immediately — don't wait for the 24h GC cycle
     try { this.daemon._gc(); } catch { /* gc should never block deletion */ }
 

package/packages/daemon/src/tool-executor.js

@@ -158,7 +158,7 @@ export class ToolExecutor {
   _checkWriteScope(resolvedPath) {
     if (!this.daemon?.locks) return;
     const rel = relative(this.workingDir, resolvedPath);
-    const result = this.daemon.locks.check(this.agentId, rel);
+    const result = this.daemon.locks.check(this.agentId, rel, this.workingDir);
     if (result.conflict) {
       // Record conflict for supervisor + token savings
       if (this.daemon.supervisor) {