mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-01-30 06:12:03 +00:00
feat(graph-view): implement task deletion and dependency management enhancements
- Added onDeleteTask functionality to allow task deletion from both board and graph views. - Integrated delete options for dependencies in the graph view, enhancing user interaction. - Updated ancestor context section to clarify the role of parent tasks in task descriptions. - Improved layout handling in graph view to preserve node positions during updates. This update enhances task management capabilities and improves user experience in the graph view.
This commit is contained in:
@@ -212,7 +212,8 @@ export function getBlockingDependencies(feature: Feature, allFeatures: Feature[]
|
||||
|
||||
/**
|
||||
* Checks if adding a dependency from sourceId to targetId would create a circular dependency.
|
||||
* Uses DFS to detect if targetId can reach sourceId through existing dependencies.
|
||||
* When we say "targetId depends on sourceId", we add sourceId to targetId.dependencies.
|
||||
* A cycle would occur if sourceId already depends on targetId (directly or transitively).
|
||||
*
|
||||
* @param features - All features in the system
|
||||
* @param sourceId - The feature that would become a dependency (the prerequisite)
|
||||
@@ -227,22 +228,24 @@ export function wouldCreateCircularDependency(
|
||||
const featureMap = new Map(features.map((f) => [f.id, f]));
|
||||
const visited = new Set<string>();
|
||||
|
||||
function canReach(currentId: string, target: string): boolean {
|
||||
if (currentId === target) return true;
|
||||
if (visited.has(currentId)) return false;
|
||||
// Check if 'from' can reach 'to' by following dependencies
|
||||
function canReach(fromId: string, toId: string): boolean {
|
||||
if (fromId === toId) return true;
|
||||
if (visited.has(fromId)) return false;
|
||||
|
||||
visited.add(currentId);
|
||||
const feature = featureMap.get(currentId);
|
||||
visited.add(fromId);
|
||||
const feature = featureMap.get(fromId);
|
||||
if (!feature?.dependencies) return false;
|
||||
|
||||
for (const depId of feature.dependencies) {
|
||||
if (canReach(depId, target)) return true;
|
||||
if (canReach(depId, toId)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check if source can reach target through existing dependencies
|
||||
// If so, adding target -> source would create a cycle
|
||||
// We want to add: targetId depends on sourceId (sourceId -> targetId in dependency graph)
|
||||
// This would create a cycle if sourceId already depends on targetId (transitively)
|
||||
// i.e., if we can reach targetId starting from sourceId by following dependencies
|
||||
return canReach(sourceId, targetId);
|
||||
}
|
||||
|
||||
@@ -321,8 +324,10 @@ export function getAncestors(
|
||||
|
||||
/**
|
||||
* Formats ancestor context for inclusion in a task description.
|
||||
* The parent task (depth=-1) is formatted with special emphasis indicating
|
||||
* it was already completed and is provided for context only.
|
||||
*
|
||||
* @param ancestors - Array of ancestor contexts (including parent)
|
||||
* @param ancestors - Array of ancestor contexts (including parent with depth=-1)
|
||||
* @param selectedIds - Set of selected ancestor IDs to include
|
||||
* @returns Formatted markdown string with ancestor context
|
||||
*/
|
||||
@@ -333,24 +338,59 @@ export function formatAncestorContextForPrompt(
|
||||
const selectedAncestors = ancestors.filter((a) => selectedIds.has(a.id));
|
||||
if (selectedAncestors.length === 0) return '';
|
||||
|
||||
const sections = selectedAncestors.map((ancestor) => {
|
||||
const parts: string[] = [];
|
||||
const title = ancestor.title || `Task (${ancestor.id.slice(0, 8)})`;
|
||||
// Separate parent (depth=-1) from other ancestors
|
||||
const parent = selectedAncestors.find((a) => a.depth === -1);
|
||||
const otherAncestors = selectedAncestors.filter((a) => a.depth !== -1);
|
||||
|
||||
parts.push(`### ${title}`);
|
||||
const sections: string[] = [];
|
||||
|
||||
if (ancestor.description) {
|
||||
parts.push(`**Description:** ${ancestor.description}`);
|
||||
// Format parent with special emphasis
|
||||
if (parent) {
|
||||
const parentTitle = parent.title || `Task (${parent.id.slice(0, 8)})`;
|
||||
const parentParts: string[] = [];
|
||||
|
||||
parentParts.push(`## Parent Task Context (Already Completed)`);
|
||||
parentParts.push(
|
||||
`> **Note:** The following parent task has already been completed. This context is provided to help you understand the background and requirements for this sub-task. Do not re-implement the parent task - focus only on the new sub-task described below.`
|
||||
);
|
||||
parentParts.push(`### ${parentTitle}`);
|
||||
|
||||
if (parent.description) {
|
||||
parentParts.push(`**Description:** ${parent.description}`);
|
||||
}
|
||||
if (ancestor.spec) {
|
||||
parts.push(`**Specification:**\n${ancestor.spec}`);
|
||||
if (parent.spec) {
|
||||
parentParts.push(`**Specification:**\n${parent.spec}`);
|
||||
}
|
||||
if (ancestor.summary) {
|
||||
parts.push(`**Summary:** ${ancestor.summary}`);
|
||||
if (parent.summary) {
|
||||
parentParts.push(`**Summary:** ${parent.summary}`);
|
||||
}
|
||||
|
||||
return parts.join('\n\n');
|
||||
});
|
||||
sections.push(parentParts.join('\n\n'));
|
||||
}
|
||||
|
||||
return `## Ancestor Context\n\n${sections.join('\n\n---\n\n')}`;
|
||||
// Format other ancestors if any
|
||||
if (otherAncestors.length > 0) {
|
||||
const ancestorSections = otherAncestors.map((ancestor) => {
|
||||
const parts: string[] = [];
|
||||
const title = ancestor.title || `Task (${ancestor.id.slice(0, 8)})`;
|
||||
|
||||
parts.push(`### ${title}`);
|
||||
|
||||
if (ancestor.description) {
|
||||
parts.push(`**Description:** ${ancestor.description}`);
|
||||
}
|
||||
if (ancestor.spec) {
|
||||
parts.push(`**Specification:**\n${ancestor.spec}`);
|
||||
}
|
||||
if (ancestor.summary) {
|
||||
parts.push(`**Summary:** ${ancestor.summary}`);
|
||||
}
|
||||
|
||||
return parts.join('\n\n');
|
||||
});
|
||||
|
||||
sections.push(`## Additional Ancestor Context\n\n${ancestorSections.join('\n\n---\n\n')}`);
|
||||
}
|
||||
|
||||
return sections.join('\n\n---\n\n');
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@ import {
|
||||
resolveDependencies,
|
||||
areDependenciesSatisfied,
|
||||
getBlockingDependencies,
|
||||
wouldCreateCircularDependency,
|
||||
dependencyExists,
|
||||
} from '../src/resolver';
|
||||
import type { Feature } from '@automaker/types';
|
||||
|
||||
@@ -348,4 +350,204 @@ describe('resolver.ts', () => {
|
||||
expect(blocking).not.toContain('Dep2');
|
||||
});
|
||||
});
|
||||
|
||||
describe('wouldCreateCircularDependency', () => {
|
||||
it('should return false for features with no existing dependencies', () => {
|
||||
const features = [createFeature('A'), createFeature('B')];
|
||||
|
||||
// Making B depend on A should not create a cycle
|
||||
expect(wouldCreateCircularDependency(features, 'A', 'B')).toBe(false);
|
||||
});
|
||||
|
||||
it('should return false for valid linear dependency chain', () => {
|
||||
// A <- B <- C (C depends on B, B depends on A)
|
||||
const features = [
|
||||
createFeature('A'),
|
||||
createFeature('B', { dependencies: ['A'] }),
|
||||
createFeature('C', { dependencies: ['B'] }),
|
||||
];
|
||||
|
||||
// Making D depend on C should not create a cycle
|
||||
const featuresWithD = [...features, createFeature('D')];
|
||||
expect(wouldCreateCircularDependency(featuresWithD, 'C', 'D')).toBe(false);
|
||||
});
|
||||
|
||||
it('should detect direct circular dependency (A -> B -> A)', () => {
|
||||
// B depends on A
|
||||
const features = [createFeature('A'), createFeature('B', { dependencies: ['A'] })];
|
||||
|
||||
// Making A depend on B would create: A -> B -> A (cycle!)
|
||||
// sourceId = B (prerequisite), targetId = A (will depend on B)
|
||||
// This creates a cycle because B already depends on A
|
||||
expect(wouldCreateCircularDependency(features, 'B', 'A')).toBe(true);
|
||||
});
|
||||
|
||||
it('should detect transitive circular dependency (A -> B -> C -> A)', () => {
|
||||
// C depends on B, B depends on A
|
||||
const features = [
|
||||
createFeature('A'),
|
||||
createFeature('B', { dependencies: ['A'] }),
|
||||
createFeature('C', { dependencies: ['B'] }),
|
||||
];
|
||||
|
||||
// Making A depend on C would create: A -> C -> B -> A (cycle!)
|
||||
// sourceId = C (prerequisite), targetId = A (will depend on C)
|
||||
expect(wouldCreateCircularDependency(features, 'C', 'A')).toBe(true);
|
||||
});
|
||||
|
||||
it('should detect cycle in complex graph', () => {
|
||||
// Graph: A <- B, A <- C, B <- C (C depends on both A and B, B depends on A)
|
||||
const features = [
|
||||
createFeature('A'),
|
||||
createFeature('B', { dependencies: ['A'] }),
|
||||
createFeature('C', { dependencies: ['A', 'B'] }),
|
||||
];
|
||||
|
||||
// Making A depend on C would create a cycle
|
||||
expect(wouldCreateCircularDependency(features, 'C', 'A')).toBe(true);
|
||||
|
||||
// Making B depend on C would also create a cycle
|
||||
expect(wouldCreateCircularDependency(features, 'C', 'B')).toBe(true);
|
||||
});
|
||||
|
||||
it('should return false for parallel branches', () => {
|
||||
// A <- B, A <- C (B and C both depend on A, but not on each other)
|
||||
const features = [
|
||||
createFeature('A'),
|
||||
createFeature('B', { dependencies: ['A'] }),
|
||||
createFeature('C', { dependencies: ['A'] }),
|
||||
];
|
||||
|
||||
// Making B depend on C should be fine (no cycle)
|
||||
expect(wouldCreateCircularDependency(features, 'C', 'B')).toBe(false);
|
||||
|
||||
// Making C depend on B should also be fine
|
||||
expect(wouldCreateCircularDependency(features, 'B', 'C')).toBe(false);
|
||||
});
|
||||
|
||||
it('should handle self-dependency check', () => {
|
||||
const features = [createFeature('A')];
|
||||
|
||||
// A depending on itself would be a trivial cycle
|
||||
expect(wouldCreateCircularDependency(features, 'A', 'A')).toBe(true);
|
||||
});
|
||||
|
||||
it('should handle feature not in list', () => {
|
||||
const features = [createFeature('A')];
|
||||
|
||||
// Non-existent source - should return false (no path exists)
|
||||
expect(wouldCreateCircularDependency(features, 'NonExistent', 'A')).toBe(false);
|
||||
|
||||
// Non-existent target - should return false
|
||||
expect(wouldCreateCircularDependency(features, 'A', 'NonExistent')).toBe(false);
|
||||
});
|
||||
|
||||
it('should handle empty features list', () => {
|
||||
const features: Feature[] = [];
|
||||
|
||||
expect(wouldCreateCircularDependency(features, 'A', 'B')).toBe(false);
|
||||
});
|
||||
|
||||
it('should handle longer transitive chains', () => {
|
||||
// A <- B <- C <- D <- E
|
||||
const features = [
|
||||
createFeature('A'),
|
||||
createFeature('B', { dependencies: ['A'] }),
|
||||
createFeature('C', { dependencies: ['B'] }),
|
||||
createFeature('D', { dependencies: ['C'] }),
|
||||
createFeature('E', { dependencies: ['D'] }),
|
||||
];
|
||||
|
||||
// Making A depend on E would create a 5-node cycle
|
||||
expect(wouldCreateCircularDependency(features, 'E', 'A')).toBe(true);
|
||||
|
||||
// Making B depend on E would create a 4-node cycle
|
||||
expect(wouldCreateCircularDependency(features, 'E', 'B')).toBe(true);
|
||||
|
||||
// Making E depend on A is fine (already exists transitively, but adding explicit is ok)
|
||||
// Wait, E already depends on A transitively. Let's add F instead
|
||||
const featuresWithF = [...features, createFeature('F')];
|
||||
expect(wouldCreateCircularDependency(featuresWithF, 'E', 'F')).toBe(false);
|
||||
});
|
||||
|
||||
it('should handle diamond dependency pattern', () => {
|
||||
// A
|
||||
// / \
|
||||
// B C
|
||||
// \ /
|
||||
// D
|
||||
const features = [
|
||||
createFeature('A'),
|
||||
createFeature('B', { dependencies: ['A'] }),
|
||||
createFeature('C', { dependencies: ['A'] }),
|
||||
createFeature('D', { dependencies: ['B', 'C'] }),
|
||||
];
|
||||
|
||||
// Making A depend on D would create a cycle through both paths
|
||||
expect(wouldCreateCircularDependency(features, 'D', 'A')).toBe(true);
|
||||
|
||||
// Making B depend on D would create a cycle
|
||||
expect(wouldCreateCircularDependency(features, 'D', 'B')).toBe(true);
|
||||
|
||||
// Adding E that depends on D should be fine
|
||||
const featuresWithE = [...features, createFeature('E')];
|
||||
expect(wouldCreateCircularDependency(featuresWithE, 'D', 'E')).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('dependencyExists', () => {
|
||||
it('should return false when target has no dependencies', () => {
|
||||
const features = [createFeature('A'), createFeature('B')];
|
||||
|
||||
expect(dependencyExists(features, 'A', 'B')).toBe(false);
|
||||
});
|
||||
|
||||
it('should return true when direct dependency exists', () => {
|
||||
const features = [createFeature('A'), createFeature('B', { dependencies: ['A'] })];
|
||||
|
||||
expect(dependencyExists(features, 'A', 'B')).toBe(true);
|
||||
});
|
||||
|
||||
it('should return false for reverse direction', () => {
|
||||
const features = [createFeature('A'), createFeature('B', { dependencies: ['A'] })];
|
||||
|
||||
// B depends on A, but A does not depend on B
|
||||
expect(dependencyExists(features, 'B', 'A')).toBe(false);
|
||||
});
|
||||
|
||||
it('should return false for transitive dependencies', () => {
|
||||
// This function only checks direct dependencies, not transitive
|
||||
const features = [
|
||||
createFeature('A'),
|
||||
createFeature('B', { dependencies: ['A'] }),
|
||||
createFeature('C', { dependencies: ['B'] }),
|
||||
];
|
||||
|
||||
// C depends on B which depends on A, but C doesn't directly depend on A
|
||||
expect(dependencyExists(features, 'A', 'C')).toBe(false);
|
||||
});
|
||||
|
||||
it('should return true for one of multiple dependencies', () => {
|
||||
const features = [
|
||||
createFeature('A'),
|
||||
createFeature('B'),
|
||||
createFeature('C', { dependencies: ['A', 'B'] }),
|
||||
];
|
||||
|
||||
expect(dependencyExists(features, 'A', 'C')).toBe(true);
|
||||
expect(dependencyExists(features, 'B', 'C')).toBe(true);
|
||||
});
|
||||
|
||||
it('should return false when target feature does not exist', () => {
|
||||
const features = [createFeature('A')];
|
||||
|
||||
expect(dependencyExists(features, 'A', 'NonExistent')).toBe(false);
|
||||
});
|
||||
|
||||
it('should return false for empty dependencies array', () => {
|
||||
const features = [createFeature('A'), createFeature('B', { dependencies: [] })];
|
||||
|
||||
expect(dependencyExists(features, 'A', 'B')).toBe(false);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user