bce9fd266a
* feat(backend): multi-question support for ask_user_question_kandev
Reshape the MCP tool from a single prompt+options pair to a questions[]
array (1-4 entries, single-choice each, custom text fallback). The
clarification HTTP handler gates the response until every question has an
answer, fans out one chat message per question (sharing pending_id, with
question_index/question_total in metadata), and returns a JSON map keyed
by question id back to the agent. The orchestrator resume prompt now
formats multi-line Q1/A1, Q2/A2 summaries when the bundle has more than
one question. Mock-agent gets a clarification-multi scenario and
ask_user_question_test.go covers the new schema + map response. No
back-compat shim — local-first tool, single-PR breaking change.
* feat(web): refresh clarification overlay with multi-question + modern UI
Each per-question chat message gets its own card with a "Question N of M"
progress chip, a ✓ Answered badge once committed, and shadcn-aligned
option buttons with kbd hints. A new useClarificationGroup hook coordinates
the per-question commits (decision A) and posts every answer in a single
batch once the user finishes the bundle; X rejects the whole group. The
single-question case keeps the 1-9 / Esc keyboard shortcuts. Playwright
e2e adds 6 multi-question scenarios (rendering, full happy path, partial
state, mixed option/custom, skip-rejects-bundle, sibling-state) on top of
the existing single-question regression suite.
* fix(web): clarification carousel UX with stepper navigation + race fix
Replaces the vertically stacked card layout with a horizontal stepper:
numbered circle dots up top show step state (active/answered/pending),
the single active question card sits in the middle, and Back / Next /
Submit buttons sit at the bottom. Picking an option auto-advances to the
next step (single-question case auto-submits, no explicit Submit button).
The stepper steps are clickable so users can revise prior answers.
Keyboard shortcuts: 1-9 for option pick, ArrowLeft/Right for navigation,
Esc for skip.
Also fixes a race that surfaced as a 400 BadRequest on the
/api/v1/clarification/:id/respond endpoint when the user clicked an
option before all N messages of a multi-question bundle had streamed in:
findPendingClarificationGroup now gates on metadata.question_total and
returns an empty array until the full bundle has arrived.
Playwright suite expanded from 6 to 12 multi-question scenarios:
stepper rendering, auto-advance, Back, stepper jump, Submit gating,
happy path, mixed custom-text, revise-via-jump, skip-from-mid-step,
number-key shortcuts, Esc skip, first-step Back disabled.
* fix(clarification): address CodeRabbit/Greptile/Claude review comments
Backend:
- Single source of truth for question validation: rename/export
NormalizeAndValidateQuestions and call it from both the HTTP and the
WebSocket-side MCP handlers, so duplicate question ids and bad option
counts can't slip through either path.
- httpRespond now validates that every answer references a real question
id from the bundle and that no id is answered twice (regression tests
added).
- questionsFromMessages reorders by metadata.question_index so the
reconstructed bundle preserves the original question order.
- adapters.CreateClarificationRequestMessages rolls back already-created
messages when a later write in the bundle fails.
- extractQuestionAnswers always returns a JSON map (even on rejection,
with an envelope { rejected, reject_reason }) and simplifyAnswer
preserves both selected_option and custom_text when both are present.
- MCP tool description: rewrite the response example to match the actual
output shape; add minItems / maxItems to the questions and options
arrays in the JSON Schema.
- Test helper: drop the local contains() shim, use strings.Contains.
Frontend:
- useMemo([props]) was a no-op (props is always a fresh ref); split into
[message, messages] so it actually memoizes.
- Drop the dead "expired" SubmitState branch — the backend never returns
410 from this endpoint.
- Remove the asymmetric option-list dimming: the agent now receives both
selected_option and custom_text together, so a half-grey state was
misleading.
- New tests: pending-clarification.test.ts covers
findPendingClarificationGroup including the question_total gate, and
use-clarification-group.test.ts covers the hook's record/submit/skip
flows and the override-merge path used by the single-question case.
* fix(web): treat clarification 409 as success so duplicate submit doesn't stick the overlay
* fix(clarification): unblock agent on persistence failure + nil-guard rejected branch
- Add Store.CancelRequest(pendingID) and call it from both the WebSocket
MCP handler and the HTTP create-request handler when message creation
fails. Without it, the agent's WaitForResponse parked for the full
2-hour MCP timeout while no clarification cards ever reached the user.
Both handlers now return an explicit error response on failure.
- applyAnswersToMessages now guards h.repo == nil in the rejected branch
(parity with sibling expectedQuestionIDs).
- extractQuestionAnswers stubs for unanswered questions in a rejected
bundle now carry { answered: false, rejected: true } so agents reading
per-question payloads see the rejection without inspecting the
envelope.
- Hook test: added 409-as-ok regression coverage for both submit and
skip paths so the previous fix can't drift.
- Store test: covers CancelRequest unblocking a parked WaitForResponse.
* fix: drop unused e2e helper + use channel sync in CancelRequest test
* refactor(web): drop dead 'message' prop from clarification overlay
Both call sites pass 'messages' (the bundle group), so the legacy
single-message prop was unused. Tightening the prop type also lets the
useMemo depend on a single value.
* fix(web): ignore modifier-keyed events in clarification carousel shortcuts
Bare 1..9 / ArrowLeft / ArrowRight / Esc still drive the carousel, but
Cmd/Ctrl+1..9 (browser tab switch) and Alt+ArrowLeft (browser back) now
pass through as the user expects.
236 lines
15 KiB
Go
236 lines
15 KiB
Go
package repository
|
|
|
|
import (
|
|
"context"
|
|
|
|
agentdto "github.com/kandev/kandev/internal/agent/dto"
|
|
"github.com/kandev/kandev/internal/task/models"
|
|
v1 "github.com/kandev/kandev/pkg/api/v1"
|
|
)
|
|
|
|
// WorkspaceRepository handles workspace CRUD.
|
|
type WorkspaceRepository interface {
|
|
CreateWorkspace(ctx context.Context, workspace *models.Workspace) error
|
|
GetWorkspace(ctx context.Context, id string) (*models.Workspace, error)
|
|
UpdateWorkspace(ctx context.Context, workspace *models.Workspace) error
|
|
DeleteWorkspace(ctx context.Context, id string) error
|
|
ListWorkspaces(ctx context.Context) ([]*models.Workspace, error)
|
|
}
|
|
|
|
// TaskRepository handles task CRUD and workflow placement.
|
|
// Note: models.TaskRepository is a struct in internal/task/models; no Go conflict exists.
|
|
type TaskRepository interface {
|
|
CreateTask(ctx context.Context, task *models.Task) error
|
|
GetTask(ctx context.Context, id string) (*models.Task, error)
|
|
UpdateTask(ctx context.Context, task *models.Task) error
|
|
DeleteTask(ctx context.Context, id string) error
|
|
ListTasks(ctx context.Context, workflowID string) ([]*models.Task, error)
|
|
ListTasksByWorkspace(ctx context.Context, workspaceID, workflowID, repositoryID, query string, page, pageSize int, includeArchived, includeEphemeral, onlyEphemeral, excludeConfig bool) ([]*models.Task, int, error)
|
|
ListTasksByWorkflowStep(ctx context.Context, workflowStepID string) ([]*models.Task, error)
|
|
ArchiveTask(ctx context.Context, id string) error
|
|
ListTasksForAutoArchive(ctx context.Context) ([]*models.Task, error)
|
|
UpdateTaskState(ctx context.Context, id string, state v1.TaskState) error
|
|
CountTasksByWorkflow(ctx context.Context, workflowID string) (int, error)
|
|
CountTasksByWorkflowStep(ctx context.Context, stepID string) (int, error)
|
|
AddTaskToWorkflow(ctx context.Context, taskID, workflowID, workflowStepID string, position int) error
|
|
RemoveTaskFromWorkflow(ctx context.Context, taskID, workflowID string) error
|
|
}
|
|
|
|
// TaskRepoRepository handles the task↔repository junction table (models.TaskRepository rows).
|
|
// Named TaskRepoRepository to reduce reader confusion with the TaskRepository sub-interface above.
|
|
type TaskRepoRepository interface {
|
|
CreateTaskRepository(ctx context.Context, taskRepo *models.TaskRepository) error
|
|
GetTaskRepository(ctx context.Context, id string) (*models.TaskRepository, error)
|
|
ListTaskRepositories(ctx context.Context, taskID string) ([]*models.TaskRepository, error)
|
|
ListTaskRepositoriesByTaskIDs(ctx context.Context, taskIDs []string) (map[string][]*models.TaskRepository, error)
|
|
UpdateTaskRepository(ctx context.Context, taskRepo *models.TaskRepository) error
|
|
DeleteTaskRepository(ctx context.Context, id string) error
|
|
DeleteTaskRepositoriesByTask(ctx context.Context, taskID string) error
|
|
GetPrimaryTaskRepository(ctx context.Context, taskID string) (*models.TaskRepository, error)
|
|
}
|
|
|
|
// WorkflowRepository handles workflow CRUD.
|
|
type WorkflowRepository interface {
|
|
CreateWorkflow(ctx context.Context, workflow *models.Workflow) error
|
|
GetWorkflow(ctx context.Context, id string) (*models.Workflow, error)
|
|
UpdateWorkflow(ctx context.Context, workflow *models.Workflow) error
|
|
DeleteWorkflow(ctx context.Context, id string) error
|
|
ListWorkflows(ctx context.Context, workspaceID string, includeHidden bool) ([]*models.Workflow, error)
|
|
ReorderWorkflows(ctx context.Context, workspaceID string, workflowIDs []string) error
|
|
}
|
|
|
|
// MessageRepository handles message persistence and lookups.
|
|
type MessageRepository interface {
|
|
CreateMessage(ctx context.Context, message *models.Message) error
|
|
GetMessage(ctx context.Context, id string) (*models.Message, error)
|
|
GetMessageByToolCallID(ctx context.Context, sessionID, toolCallID string) (*models.Message, error)
|
|
GetMessageByPendingID(ctx context.Context, sessionID, pendingID string) (*models.Message, error)
|
|
FindMessageByPendingID(ctx context.Context, pendingID string) (*models.Message, error)
|
|
FindMessagesByPendingID(ctx context.Context, pendingID string) ([]*models.Message, error)
|
|
FindMessageByPendingIDAndQuestion(ctx context.Context, sessionID, pendingID, questionID string) (*models.Message, error)
|
|
UpdateMessage(ctx context.Context, message *models.Message) error
|
|
ListMessages(ctx context.Context, sessionID string) ([]*models.Message, error)
|
|
ListMessagesPaginated(ctx context.Context, sessionID string, opts models.ListMessagesOptions) ([]*models.Message, bool, error)
|
|
SearchMessages(ctx context.Context, sessionID string, opts models.SearchMessagesOptions) ([]*models.Message, error)
|
|
DeleteMessage(ctx context.Context, id string) error
|
|
}
|
|
|
|
// TurnRepository handles conversation turn persistence.
|
|
type TurnRepository interface {
|
|
CreateTurn(ctx context.Context, turn *models.Turn) error
|
|
GetTurn(ctx context.Context, id string) (*models.Turn, error)
|
|
GetActiveTurnBySessionID(ctx context.Context, sessionID string) (*models.Turn, error)
|
|
UpdateTurn(ctx context.Context, turn *models.Turn) error
|
|
CompleteTurn(ctx context.Context, id string) error
|
|
CompletePendingToolCallsForTurn(ctx context.Context, turnID string) (int64, error)
|
|
ListTurnsBySession(ctx context.Context, sessionID string) ([]*models.Turn, error)
|
|
}
|
|
|
|
// SessionRepository handles task session lifecycle and workflow-session relationships.
|
|
type SessionRepository interface {
|
|
CreateTaskSession(ctx context.Context, session *models.TaskSession) error
|
|
GetTaskSession(ctx context.Context, id string) (*models.TaskSession, error)
|
|
GetTaskSessionByTaskID(ctx context.Context, taskID string) (*models.TaskSession, error)
|
|
GetActiveTaskSessionByTaskID(ctx context.Context, taskID string) (*models.TaskSession, error)
|
|
UpdateTaskSession(ctx context.Context, session *models.TaskSession) error
|
|
UpdateTaskSessionState(ctx context.Context, id string, state models.TaskSessionState, errorMessage string) error
|
|
ListTaskSessions(ctx context.Context, taskID string) ([]*models.TaskSession, error)
|
|
ListActiveTaskSessions(ctx context.Context) ([]*models.TaskSession, error)
|
|
ListActiveTaskSessionsByTaskID(ctx context.Context, taskID string) ([]*models.TaskSession, error)
|
|
HasActiveTaskSessionsByAgentProfile(ctx context.Context, agentProfileID string) (bool, error)
|
|
GetActiveTaskInfoByAgentProfile(ctx context.Context, agentProfileID string) ([]agentdto.ActiveTaskInfo, error)
|
|
HasActiveTaskSessionsByExecutor(ctx context.Context, executorID string) (bool, error)
|
|
HasActiveTaskSessionsByEnvironment(ctx context.Context, environmentID string) (bool, error)
|
|
HasActiveTaskSessionsByRepository(ctx context.Context, repositoryID string) (bool, error)
|
|
DeleteEphemeralTasksByAgentProfile(ctx context.Context, agentProfileID string) (int64, error)
|
|
DeleteTaskSession(ctx context.Context, id string) error
|
|
GetPrimarySessionByTaskID(ctx context.Context, taskID string) (*models.TaskSession, error)
|
|
GetPrimarySessionIDsByTaskIDs(ctx context.Context, taskIDs []string) (map[string]string, error)
|
|
GetSessionCountsByTaskIDs(ctx context.Context, taskIDs []string) (map[string]int, error)
|
|
GetPrimarySessionInfoByTaskIDs(ctx context.Context, taskIDs []string) (map[string]*models.TaskSession, error)
|
|
SetSessionPrimary(ctx context.Context, sessionID string) error
|
|
UpdateSessionReviewStatus(ctx context.Context, sessionID string, status string) error
|
|
UpdateSessionMetadata(ctx context.Context, sessionID string, metadata map[string]interface{}) error
|
|
SetSessionMetadataKey(ctx context.Context, sessionID, key string, value interface{}) error
|
|
}
|
|
|
|
// SessionWorktreeRepository handles the task session↔worktree association.
|
|
type SessionWorktreeRepository interface {
|
|
CreateTaskSessionWorktree(ctx context.Context, sessionWorktree *models.TaskSessionWorktree) error
|
|
UpdateTaskSessionWorktreeBranch(ctx context.Context, sessionID, branch string) error
|
|
ListTaskSessionWorktrees(ctx context.Context, sessionID string) ([]*models.TaskSessionWorktree, error)
|
|
ListWorktreesBySessionIDs(ctx context.Context, sessionIDs []string) (map[string][]*models.TaskSessionWorktree, error)
|
|
DeleteTaskSessionWorktree(ctx context.Context, id string) error
|
|
DeleteTaskSessionWorktreesBySession(ctx context.Context, sessionID string) error
|
|
}
|
|
|
|
// GitSnapshotRepository handles git snapshots and session commit records.
|
|
type GitSnapshotRepository interface {
|
|
CreateGitSnapshot(ctx context.Context, snapshot *models.GitSnapshot) error
|
|
GetLatestGitSnapshot(ctx context.Context, sessionID string) (*models.GitSnapshot, error)
|
|
GetFirstGitSnapshot(ctx context.Context, sessionID string) (*models.GitSnapshot, error)
|
|
GetGitSnapshotsBySession(ctx context.Context, sessionID string, limit int) ([]*models.GitSnapshot, error)
|
|
CreateSessionCommit(ctx context.Context, commit *models.SessionCommit) error
|
|
GetSessionCommits(ctx context.Context, sessionID string) ([]*models.SessionCommit, error)
|
|
GetLatestSessionCommit(ctx context.Context, sessionID string) (*models.SessionCommit, error)
|
|
DeleteSessionCommit(ctx context.Context, id string) error
|
|
}
|
|
|
|
// RepositoryEntityRepository handles git repository entity CRUD and repository scripts.
|
|
// Named RepositoryEntityRepository to avoid conflation with the Repository interface itself;
|
|
// mirrors the sqlite/repository_entity.go implementation file.
|
|
type RepositoryEntityRepository interface {
|
|
CreateRepository(ctx context.Context, repository *models.Repository) error
|
|
GetRepository(ctx context.Context, id string) (*models.Repository, error)
|
|
UpdateRepository(ctx context.Context, repository *models.Repository) error
|
|
DeleteRepository(ctx context.Context, id string) error
|
|
ListRepositories(ctx context.Context, workspaceID string) ([]*models.Repository, error)
|
|
CreateRepositoryScript(ctx context.Context, script *models.RepositoryScript) error
|
|
GetRepositoryScript(ctx context.Context, id string) (*models.RepositoryScript, error)
|
|
UpdateRepositoryScript(ctx context.Context, script *models.RepositoryScript) error
|
|
DeleteRepositoryScript(ctx context.Context, id string) error
|
|
ListRepositoryScripts(ctx context.Context, repositoryID string) ([]*models.RepositoryScript, error)
|
|
ListScriptsByRepositoryIDs(ctx context.Context, repoIDs []string) (map[string][]*models.RepositoryScript, error)
|
|
GetRepositoryByProviderInfo(ctx context.Context, workspaceID, provider, owner, name string) (*models.Repository, error)
|
|
}
|
|
|
|
// ExecutorRepository handles executor CRUD, executor profiles, and running state.
|
|
type ExecutorRepository interface {
|
|
CreateExecutor(ctx context.Context, executor *models.Executor) error
|
|
GetExecutor(ctx context.Context, id string) (*models.Executor, error)
|
|
UpdateExecutor(ctx context.Context, executor *models.Executor) error
|
|
DeleteExecutor(ctx context.Context, id string) error
|
|
ListExecutors(ctx context.Context) ([]*models.Executor, error)
|
|
CreateExecutorProfile(ctx context.Context, profile *models.ExecutorProfile) error
|
|
GetExecutorProfile(ctx context.Context, id string) (*models.ExecutorProfile, error)
|
|
UpdateExecutorProfile(ctx context.Context, profile *models.ExecutorProfile) error
|
|
DeleteExecutorProfile(ctx context.Context, id string) error
|
|
ListExecutorProfiles(ctx context.Context, executorID string) ([]*models.ExecutorProfile, error)
|
|
ListAllExecutorProfiles(ctx context.Context) ([]*models.ExecutorProfile, error)
|
|
ListExecutorsRunning(ctx context.Context) ([]*models.ExecutorRunning, error)
|
|
UpsertExecutorRunning(ctx context.Context, running *models.ExecutorRunning) error
|
|
GetExecutorRunningBySessionID(ctx context.Context, sessionID string) (*models.ExecutorRunning, error)
|
|
DeleteExecutorRunningBySessionID(ctx context.Context, sessionID string) error
|
|
// HasExecutorRunningRow returns true if a row exists for the session.
|
|
// Used to decide "session has been launched at least once" without loading the full row.
|
|
HasExecutorRunningRow(ctx context.Context, sessionID string) (bool, error)
|
|
// UpdateResumeToken performs a CAS-style narrow update of resume_token + last_message_uuid
|
|
// scoped to the row's current agent_execution_id. If the row's agent_execution_id no longer
|
|
// matches expectedExecID (i.e. a new execution has taken over), returns models.ErrExecutionRotated
|
|
// and writes nothing. Use when persisting state from a specific execution that may have been
|
|
// replaced concurrently — typically resume tokens emitted by ACP session events.
|
|
UpdateResumeToken(ctx context.Context, sessionID, expectedExecID, resumeToken, lastMessageUUID string) error
|
|
}
|
|
|
|
// EnvironmentRepository handles environment CRUD.
|
|
type EnvironmentRepository interface {
|
|
CreateEnvironment(ctx context.Context, environment *models.Environment) error
|
|
GetEnvironment(ctx context.Context, id string) (*models.Environment, error)
|
|
UpdateEnvironment(ctx context.Context, environment *models.Environment) error
|
|
DeleteEnvironment(ctx context.Context, id string) error
|
|
ListEnvironments(ctx context.Context) ([]*models.Environment, error)
|
|
}
|
|
|
|
// TaskEnvironmentRepository handles per-task execution environment instances
|
|
// and their per-repository child rows.
|
|
type TaskEnvironmentRepository interface {
|
|
CreateTaskEnvironment(ctx context.Context, env *models.TaskEnvironment) error
|
|
GetTaskEnvironment(ctx context.Context, id string) (*models.TaskEnvironment, error)
|
|
GetTaskEnvironmentByTaskID(ctx context.Context, taskID string) (*models.TaskEnvironment, error)
|
|
UpdateTaskEnvironment(ctx context.Context, env *models.TaskEnvironment) error
|
|
DeleteTaskEnvironment(ctx context.Context, id string) error
|
|
DeleteTaskEnvironmentsByTask(ctx context.Context, taskID string) error
|
|
CreateTaskEnvironmentRepo(ctx context.Context, repo *models.TaskEnvironmentRepo) error
|
|
ListTaskEnvironmentRepos(ctx context.Context, envID string) ([]*models.TaskEnvironmentRepo, error)
|
|
UpdateTaskEnvironmentRepo(ctx context.Context, repo *models.TaskEnvironmentRepo) error
|
|
DeleteTaskEnvironmentRepo(ctx context.Context, id string) error
|
|
DeleteTaskEnvironmentReposByEnv(ctx context.Context, envID string) error
|
|
}
|
|
|
|
// ReviewRepository handles session file review records.
|
|
type ReviewRepository interface {
|
|
UpsertSessionFileReview(ctx context.Context, review *models.SessionFileReview) error
|
|
GetSessionFileReviews(ctx context.Context, sessionID string) ([]*models.SessionFileReview, error)
|
|
DeleteSessionFileReviews(ctx context.Context, sessionID string) error
|
|
}
|
|
|
|
// PlanRepository handles task plan CRUD and its revision history.
|
|
type PlanRepository interface {
|
|
CreateTaskPlan(ctx context.Context, plan *models.TaskPlan) error
|
|
GetTaskPlan(ctx context.Context, taskID string) (*models.TaskPlan, error)
|
|
UpdateTaskPlan(ctx context.Context, plan *models.TaskPlan) error
|
|
DeleteTaskPlan(ctx context.Context, taskID string) error
|
|
|
|
// Revision history
|
|
InsertTaskPlanRevision(ctx context.Context, rev *models.TaskPlanRevision) error
|
|
UpdateTaskPlanRevision(ctx context.Context, rev *models.TaskPlanRevision) error
|
|
GetTaskPlanRevision(ctx context.Context, id string) (*models.TaskPlanRevision, error)
|
|
GetLatestTaskPlanRevision(ctx context.Context, taskID string) (*models.TaskPlanRevision, error)
|
|
ListTaskPlanRevisions(ctx context.Context, taskID string, limit int) ([]*models.TaskPlanRevision, error)
|
|
NextTaskPlanRevisionNumber(ctx context.Context, taskID string) (int, error)
|
|
// WritePlanRevision atomically upserts the HEAD plan and writes/merges a revision in a
|
|
// single transaction. Pass a non-nil coalesceLatestID to merge into an existing revision;
|
|
// otherwise a new revision is appended with revision_number computed inside the tx.
|
|
WritePlanRevision(ctx context.Context, head *models.TaskPlan, rev *models.TaskPlanRevision, coalesceLatestID *string) error
|
|
}
|