bugfix

internal/project/queries/artifacts.sql

@@ -1,19 +1,28 @@
 -- name: CreateRequirementArtifact :one
 INSERT INTO requirement_artifacts (id, requirement_id, phase, version, content, note, source_message_id, created_by)
 VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-RETURNING id, requirement_id, phase, version, content, note, source_message_id, created_by, created_at;
+RETURNING id, requirement_id, phase, version, content, note, source_message_id, created_by, created_at, verdict;
 
 -- name: ListRequirementArtifactsByRequirement :many
-SELECT id, requirement_id, phase, version, content, note, source_message_id, created_by, created_at
+SELECT id, requirement_id, phase, version, content, note, source_message_id, created_by, created_at, verdict
 FROM requirement_artifacts
 WHERE requirement_id = $1 AND ($2::text = '' OR phase = $2)
 ORDER BY phase ASC, version ASC;
 
 -- name: GetRequirementArtifactByVersion :one
-SELECT id, requirement_id, phase, version, content, note, source_message_id, created_by, created_at
+SELECT id, requirement_id, phase, version, content, note, source_message_id, created_by, created_at, verdict
 FROM requirement_artifacts
 WHERE requirement_id = $1 AND phase = $2 AND version = $3;
 
+-- name: GetRequirementArtifactByID :one
+SELECT id, requirement_id, phase, version, content, note, source_message_id, created_by, created_at, verdict
+FROM requirement_artifacts
+WHERE id = $1;
+
 -- name: GetMaxRequirementArtifactVersion :one
 SELECT COALESCE(MAX(version), 0)::int FROM requirement_artifacts
 WHERE requirement_id = $1 AND phase = $2;
+
+-- name: ApproveRequirementArtifact :one
+UPDATE requirement_artifacts SET verdict = $2 WHERE id = $1
+RETURNING id, requirement_id, phase, version, content, note, source_message_id, created_by, created_at, verdict;

internal/project/queries/dependencies.sql

@@ -0,0 +1,92 @@
+-- name: CreateDependency :one
+INSERT INTO issue_dependencies (id, project_id, blocked_id, blocker_id, created_by)
+VALUES ($1, $2, $3, $4, $5)
+RETURNING id, project_id, blocked_id, blocker_id, created_by, created_at;
+
+-- name: DeleteDependency :execrows
+DELETE FROM issue_dependencies
+WHERE project_id = $1 AND blocked_id = $2 AND blocker_id = $3;
+
+-- name: ListBlockers :many
+-- Issues that block $1 (the dependencies of blocked issue $1).
+SELECT i.id, i.project_id, i.requirement_id, i.number, i.title, i.description, i.status,
+       i.assignee_id, i.created_by, i.closed_at, i.created_at, i.updated_at, i.workspace_id, i.parent_id, i.priority
+FROM issue_dependencies d
+JOIN issues i ON i.id = d.blocker_id
+WHERE d.blocked_id = $1
+ORDER BY i.number ASC;
+
+-- name: ListBlocked :many
+-- Issues blocked by $1 (issues that depend on blocker $1).
+SELECT i.id, i.project_id, i.requirement_id, i.number, i.title, i.description, i.status,
+       i.assignee_id, i.created_by, i.closed_at, i.created_at, i.updated_at, i.workspace_id, i.parent_id, i.priority
+FROM issue_dependencies d
+JOIN issues i ON i.id = d.blocked_id
+WHERE d.blocker_id = $1
+ORDER BY i.number ASC;
+
+-- name: ListSubtasks :many
+SELECT id, project_id, requirement_id, number, title, description, status,
+       assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority
+FROM issues
+WHERE parent_id = $1
+ORDER BY priority DESC, number ASC;
+
+-- name: ListBlockerIDs :many
+-- Direct blocker issue ids of $1 (one hop along blocked-by edges). Used by the
+-- service-layer iterative reachability cycle check in AddDependency.
+SELECT blocker_id FROM issue_dependencies WHERE blocked_id = $1;
+
+-- name: ListReadyLeafSubtasks :many
+-- Ready leaf subtasks for a project: open subtasks (parent_id NOT NULL) whose
+-- every blocker is closed, with no active (starting/running) acp_session, and
+-- no open child issue (leaf). Ordered by priority DESC, number ASC. LIMIT $2.
+SELECT i.id, i.project_id, i.requirement_id, i.number, i.title, i.description, i.status,
+       i.assignee_id, i.created_by, i.closed_at, i.created_at, i.updated_at, i.workspace_id, i.parent_id, i.priority
+FROM issues i
+WHERE i.project_id = $1
+  AND i.status = 'open'
+  AND i.parent_id IS NOT NULL
+  AND NOT EXISTS (
+    SELECT 1 FROM issue_dependencies d
+    JOIN issues b ON b.id = d.blocker_id
+    WHERE d.blocked_id = i.id AND b.status <> 'closed'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM acp_sessions s
+    WHERE s.issue_id = i.id AND s.status IN ('starting', 'running')
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM issues c
+    WHERE c.parent_id = i.id AND c.status = 'open'
+  )
+ORDER BY i.priority DESC, i.number ASC
+LIMIT $2;
+
+-- name: ListSchedulableProjects :many
+-- Distinct project ids that currently have at least one ready leaf subtask
+-- (open subtask whose blockers are all closed and no active session). Cheap
+-- pre-filter so the scheduler only iterates projects with pending work.
+SELECT DISTINCT i.project_id
+FROM issues i
+WHERE i.status = 'open'
+  AND i.parent_id IS NOT NULL
+  AND NOT EXISTS (
+    SELECT 1 FROM issue_dependencies d
+    JOIN issues b ON b.id = d.blocker_id
+    WHERE d.blocked_id = i.id AND b.status <> 'closed'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM acp_sessions s
+    WHERE s.issue_id = i.id AND s.status IN ('starting', 'running')
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM issues c
+    WHERE c.parent_id = i.id AND c.status = 'open'
+  );
+
+-- name: CountActiveSessionsForProject :one
+-- Active (starting/running) acp_sessions in a project. Used by the scheduler's
+-- soft per-project concurrency pre-check.
+SELECT COUNT(*) FROM acp_sessions
+WHERE project_id = $1 AND status IN ('starting', 'running');

internal/project/queries/issues.sql

@@ -1,22 +1,28 @@
 -- name: CreateIssue :one
-INSERT INTO issues (id, project_id, requirement_id, number, title, description, assignee_id, created_by, workspace_id)
+INSERT INTO issues (id, project_id, requirement_id, number, title, description, assignee_id, created_by, workspace_id, parent_id, priority)
 VALUES (
   $1, $2, $3,
   (SELECT COALESCE(MAX(number), 0) + 1 FROM issues WHERE project_id = $2),
-  $4, $5, $6, $7, $8
+  $4, $5, $6, $7, $8, $9, $10
 )
 RETURNING id, project_id, requirement_id, number, title, description, status,
-          assignee_id, created_by, closed_at, created_at, updated_at, workspace_id;
+          assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority;
 
 -- name: GetIssueByNumber :one
 SELECT id, project_id, requirement_id, number, title, description, status,
-       assignee_id, created_by, closed_at, created_at, updated_at, workspace_id
+       assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority
 FROM issues
 WHERE project_id = $1 AND number = $2;
 
+-- name: GetIssueByID :one
+SELECT id, project_id, requirement_id, number, title, description, status,
+       assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority
+FROM issues
+WHERE id = $1;
+
 -- name: ListIssues :many
 SELECT id, project_id, requirement_id, number, title, description, status,
-       assignee_id, created_by, closed_at, created_at, updated_at, workspace_id
+       assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority
 FROM issues
 WHERE project_id = $1
   AND (sqlc.narg('status')::text  IS NULL OR status = sqlc.narg('status'))
@@ -30,7 +36,7 @@ ORDER BY number DESC;
 
 -- name: ListIssuesByRequirement :many
 SELECT id, project_id, requirement_id, number, title, description, status,
-       assignee_id, created_by, closed_at, created_at, updated_at, workspace_id
+       assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority
 FROM issues
 WHERE requirement_id = $1
 ORDER BY number DESC;
@@ -44,14 +50,21 @@ SET title          = $2,
     updated_at     = now()
 WHERE id = $1
 RETURNING id, project_id, requirement_id, number, title, description, status,
-          assignee_id, created_by, closed_at, created_at, updated_at, workspace_id;
+          assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority;
 
 -- name: UpdateIssueAssignee :one
 UPDATE issues
 SET assignee_id = $2, updated_at = now()
 WHERE id = $1
 RETURNING id, project_id, requirement_id, number, title, description, status,
-          assignee_id, created_by, closed_at, created_at, updated_at, workspace_id;
+          assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority;
+
+-- name: UpdateIssuePriority :one
+UPDATE issues
+SET priority = $2, updated_at = now()
+WHERE id = $1
+RETURNING id, project_id, requirement_id, number, title, description, status,
+          assignee_id, created_by, closed_at, created_at, updated_at, workspace_id, parent_id, priority;
 
 -- name: CloseIssue :exec
 UPDATE issues SET status = 'closed', closed_at = now(), updated_at = now()

internal/project/queries/members.sql

@@ -0,0 +1,21 @@
+-- name: UpsertProjectMember :one
+INSERT INTO project_members (project_id, user_id, role, added_by)
+VALUES ($1, $2, $3, $4)
+ON CONFLICT (project_id, user_id)
+DO UPDATE SET role = EXCLUDED.role
+RETURNING project_id, user_id, role, created_at, added_by;
+
+-- name: DeleteProjectMember :execrows
+DELETE FROM project_members
+WHERE project_id = $1 AND user_id = $2;
+
+-- name: GetProjectMember :one
+SELECT project_id, user_id, role, created_at, added_by
+FROM project_members
+WHERE project_id = $1 AND user_id = $2;
+
+-- name: ListProjectMembers :many
+SELECT project_id, user_id, role, created_at, added_by
+FROM project_members
+WHERE project_id = $1
+ORDER BY created_at ASC;

internal/project/queries/phase_pointers.sql

@@ -0,0 +1,20 @@
+-- name: UpsertRequirementPhasePointer :one
+INSERT INTO requirement_phase_pointers (requirement_id, phase, approved_artifact_id, approved_by, approved_at, updated_at)
+VALUES ($1, $2, $3, $4, now(), now())
+ON CONFLICT (requirement_id, phase) DO UPDATE
+  SET approved_artifact_id = EXCLUDED.approved_artifact_id,
+      approved_by = EXCLUDED.approved_by,
+      approved_at = EXCLUDED.approved_at,
+      updated_at = now()
+RETURNING requirement_id, phase, approved_artifact_id, approved_by, approved_at, updated_at;
+
+-- name: GetRequirementPhasePointer :one
+SELECT requirement_id, phase, approved_artifact_id, approved_by, approved_at, updated_at
+FROM requirement_phase_pointers
+WHERE requirement_id = $1 AND phase = $2;
+
+-- name: ListRequirementPhasePointers :many
+SELECT requirement_id, phase, approved_artifact_id, approved_by, approved_at, updated_at
+FROM requirement_phase_pointers
+WHERE requirement_id = $1
+ORDER BY phase ASC;