diff options
| author | soryu <soryu@soryu.co> | 2026-05-16 19:55:34 +0100 |
|---|---|---|
| committer | soryu <soryu@soryu.co> | 2026-05-16 19:55:34 +0100 |
| commit | 8cd7b40ace4e5e2b22ad89aafec74c7655def19b (patch) | |
| tree | 73e9ba4b91086cf8043eb71a295f75589e9bbe90 /makima/frontend/src/routes/tmp.tsx | |
| parent | 8e2bbcab1a7b3b9005803d7ce3bfce7fa483a4d7 (diff) | |
| download | soryu-strict-orchestration.tar.gz soryu-strict-orchestration.zip | |
feat(directives): strict orchestration flow + sidebar overhaul + task page rewritestrict-orchestration
End-to-end rewrite addressing the issues from the user's UX review.
The system now feels like a daemon-orchestration tool: lock a contract
and the orchestrator just goes; PR raised → auto-ship → reopen for
amendments. The sidebar tree shows real entities only (no duplicates,
no inline action buttons polluting the file list), and every entity
gets a right-click context menu. Task page matches the old /exec
layout (diff on the left, feed + composer on the right).
## Backend — strict lifecycle (the orchestrator-never-spawned bug)
Root cause: `phase_planning()` gates on `directive.status='active'`, but
`start_contract()` only flipped the contract row — the parent directive
stayed in whatever state it was. So locking a contract did nothing
visible.
Fix: contract lifecycle now drives directive status in the same
transaction.
start_contract → if contract becomes active, flip directive
draft|paused|idle|inactive → active
pause_contract → after promote, if no active contract left,
directive → paused
complete_contract→ after promote, if no active left, directive →
inactive (also fires on auto-ship from PR detect)
unlock_contract → if was active and no active left, directive →
paused
reopen_contract → NEW. shipped → active. Directive → active,
orchestrator_task_id/pr_url/pr_branch cleared so
the reconciler spawns a fresh planner. The
planner reads get_latest_merged_revision and
frames the new plan as an amendment.
handlers::directive_documents lifts state.kick_directive_reconciler()
into run_contract_transition so every successful transition wakes the
reconciler immediately (no 15s wait).
handlers::directives `update_directive` (PR-detection branch) calls
`complete_contract(active_contract_id, pr_url, pr_branch)` instead of
`set_directive_inactive`. The contract auto-ships; the directive
follows via the sync above. No more manual "Mark complete" click.
POST /api/v1/contracts/{id}/reopen added + wired through openapi.
Spawn task names dropped the directive-title prefix that looked
redundant in the sidebar:
"Plan: <title>" → "orchestrator"
"Re-plan: <title>" → "orchestrator (re-plan)"
"PR: <title>" → "completion"
"Update PR: <title>" → "completion (update)"
## Frontend — sidebar
* De-dupe: DocumentTasksFolder filters tasks[] to exclude any task
whose id already appears in steps[].taskId. Single row per task,
single highlight on click.
* Generic SidebarContextMenu (new) replaces the directive-only
DirectiveContextMenu (deleted). Per-entity item arrays built at the
page level — directive, contract, step, task each have their own
contextual actions.
* Right-click works on every sidebar entity now (was directive-only).
* `+ New document` / `+ New ephemeral task` inline buttons removed.
Reachable via the directive folder right-click OR the hover-only
`+` button on the directive folder row.
* ContractHeader: dropped "Mark complete" button (auto-fires on PR).
Added "Reopen for amendment" button when contract is shipped.
## Frontend — task page rewrite
TaskPage.tsx replaces DocumentTaskStream.tsx (deleted). Two-column
layout matches the old /exec page that the user preferred:
┌────────────────────────┬──────────────────────────────────┐
│ Changed files (~30%) │ Transcript feed (scrollable) │
│ ────────────────── │ ────────────────────── │
│ src/foo.rs │ [user] do thing │
│ src/bar.rs │ [tool] Read foo.rs │
│ │ │
│ Diff (selected file) │ │
│ ├──────────────────────────────────┤
│ │ Composer (sticky bottom) │
└────────────────────────┴──────────────────────────────────┘
Diff comes from getTaskDiff(); parseDiff + DiffFileView exported from
OverlayDiffViewer for reuse (no duplication). Diff auto-refreshes
when the task transitions to a terminal state. Transcript styling +
sticky composer keep the parts the user liked. "Open in task page"
button removed — the right pane IS the task page.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'makima/frontend/src/routes/tmp.tsx')
| -rw-r--r-- | makima/frontend/src/routes/tmp.tsx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/makima/frontend/src/routes/tmp.tsx b/makima/frontend/src/routes/tmp.tsx index c0c7365..5ac7233 100644 --- a/makima/frontend/src/routes/tmp.tsx +++ b/makima/frontend/src/routes/tmp.tsx @@ -1,14 +1,14 @@ /** * Standalone task page for orphan tasks (`/tmp/:taskId`). These are tasks * with no directive attachment — the document-mode sidebar surfaces them - * under the `tmp/` pseudo-folder. We render `DocumentTaskStream` directly - * without the directive sidebar selection, framed by the masthead so users - * still have global navigation. + * under the `tmp/` pseudo-folder. We render `TaskPage` directly without + * the directive sidebar selection, framed by the masthead so users still + * have global navigation. */ import { useEffect, useState } from "react"; import { useNavigate, useParams } from "react-router"; import { Masthead } from "../components/Masthead"; -import { DocumentTaskStream } from "../components/directives/DocumentTaskStream"; +import { TaskPage } from "../components/directives/TaskPage"; import { useAuth } from "../contexts/AuthContext"; import { getTask, type Task } from "../lib/api"; @@ -82,7 +82,7 @@ export default function TmpTaskPage() { <p className="text-red-400 font-mono text-xs">{error}</p> </div> ) : taskId ? ( - <DocumentTaskStream taskId={taskId} label={task?.name ?? taskId.slice(0, 8)} /> + <TaskPage taskId={taskId} label={task?.name ?? taskId.slice(0, 8)} /> ) : null} </main> </div> |
