From e00be74c8b575c725829677aadeb755ee81454d0 Mon Sep 17 00:00:00 2001 From: soryu Date: Fri, 8 May 2026 11:29:56 +0100 Subject: feat(directives): unified contracts surface — backbone (#128) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the backbone PR for the unified directive workflow. A directive holds a sequence of contracts; each contract is a spec body whose execution drives tasks in the directive's shared worktree. Lifecycle (Lock & Start, queue scheduler, drag-reorder) lands in follow-ups. What's in this PR: - Migration adds `position` (queue order) and `merge_mode` (shared|own_pr) columns to directive_documents. The actual table rename is deferred — the legacy `contracts` table from the old contracts system still exists, and the rename collision waits for Phase 5 to drop legacy contracts. - Repository: list orders by position; create assigns next-position; update accepts merge_mode; new reorder_directive_document_position shifts siblings inside a transaction. - HTTP: endpoints aliased under /api/v1/directives/{id}/contracts and /api/v1/contracts/{id}/... with a new /contracts/{id}/reorder. - Frontend: api types renamed `DirectiveContract*` (avoiding the legacy `Contract` type collision); document-directives.tsx imports via aliases so the rest of the file is untouched. Internal struct + table names stay `DirectiveDocument` / `directive_documents` until the legacy contracts cleanup. Co-authored-by: Claude Opus 4.7 (1M context) --- makima/src/server/openapi.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'makima/src/server/openapi.rs') diff --git a/makima/src/server/openapi.rs b/makima/src/server/openapi.rs index ad7837a..7ddaf1b 100644 --- a/makima/src/server/openapi.rs +++ b/makima/src/server/openapi.rs @@ -116,13 +116,14 @@ use crate::server::messages::{ApiError, AudioEncoding, StartMessage, StopMessage directives::list_directive_tasks, directives::cleanup_directive, directives::create_pr, - // Directive document endpoints + // Contract (directive document) endpoints directive_documents::list_documents, directive_documents::create_document, directive_documents::get_document, directive_documents::update_document, directive_documents::ship_document, directive_documents::archive_document, + directive_documents::reorder_contract, directive_documents::list_document_tasks, // Order endpoints orders::list_orders, @@ -226,11 +227,12 @@ use crate::server::messages::{ApiError, AudioEncoding, StartMessage, StopMessage CreateDirectiveStepRequest, UpdateDirectiveStepRequest, CleanupResponse, - // Directive document schemas + // Contract (directive document) schemas DirectiveDocument, directive_documents::CreateDirectiveDocumentRequest, directive_documents::UpdateDirectiveDocumentRequest, directive_documents::ShipDirectiveDocumentRequest, + directive_documents::ReorderDirectiveDocumentRequest, directive_documents::DocumentTasksResponse, // Order schemas Order, -- cgit v1.2.3