summaryrefslogtreecommitdiff
path: root/makima/src/daemon/cli/mod.rs
diff options
context:
space:
mode:
authorsoryu <soryu@soryu.co>2026-05-01 23:56:51 +0100
committerGitHub <noreply@github.com>2026-05-01 23:56:51 +0100
commite11759447b1ac00becfb1e979e488f7f9c9cf478 (patch)
treef8a58368de3f6dda3f2f5c1af34e869a0e714205 /makima/src/daemon/cli/mod.rs
parent80085c7cfa9d679ed3e3fd54a7d55fa8ab1addef (diff)
downloadsoryu-e11759447b1ac00becfb1e979e488f7f9c9cf478.tar.gz
soryu-e11759447b1ac00becfb1e979e488f7f9c9cf478.zip
chore(cleanup): Phase 5 contracts removal + tmp directive + 30-day expiry + scroll fix (#118)
Sweeping cleanup across the surface and the wire. Net: -14k LOC of legacy contracts code, plus the tmp/scroll/UX fixes the user asked for. ## Sidebar/editor independent scroll Replace `height: calc(100vh - 80px)` (which assumed an 80px masthead and quietly clipped or pushed the whole page below the fold when the masthead was taller) with `h-screen + overflow-hidden` on the page root and proper `flex-1 min-h-0` sizing on `<main>`. Sidebar and editor pane now manage their own scroll independently; the page itself never scrolls. Same fix in /tmp/:taskId. ## tmp directive — real backing for orphans/ephemerals New migration `20260501100000_tmp_directive_and_clear_orphans.sql`: * Adds `directives.is_tmp` BOOLEAN NOT NULL DEFAULT false. * Partial unique index `(owner_id) WHERE is_tmp` — at most ONE tmp directive per owner. * Hard-deletes every existing orphan task (`directive_id IS NULL`). Per the user spec: "ALSO there are TOO MANY old tasks in tmp, we need to remove all of them as well." New repository helpers: * `get_or_create_tmp_directive(pool, owner_id) -> Directive` INSERT ON CONFLICT DO NOTHING + fallback SELECT, race-safe. * `list_all_tmp_directives` — drives the expiry sweep. * `delete_expired_tmp_tasks(tmp_directive_id) -> u64`. * `list_tmp_tasks_for_owner` (replaces `list_orphan_tasks_for_owner`). `mesh::create_task`: every top-level task must have a directive. If a caller doesn't supply `directive_id` and isn't a subtask, attach to the caller's tmp directive (auto-creating it on first use). `list_directives_for_owner` filters out `is_tmp=true` so the scratchpad directive doesn't pollute the contract list — surfaced via the sidebar's `tmp/` folder instead. ## 30-day expiry on tmp tasks New `phase_tmp_expiry` in the directive reconciler. Throttled to once per hour: enumerates every tmp directive, calls `delete_expired_tmp_tasks`, logs the count. The actual delete is `WHERE created_at < NOW() - INTERVAL '30 days'` and is fast on the existing index. Subtasks die via FK cascade. ## Phase 5 — contracts removed ### Frontend Deleted entire `/contracts` surface: * routes: `contracts.tsx`, `contract-file.tsx` * components/contracts: ContractList, ContractDetail, ContractCliInput, ContractContextMenu, CommandModePanel, PhaseBadge, PhaseHint, PhaseDeliverablesPanel, PhaseProgressBar, QuickActionButtons, RepositoryPanel, TaskDerivationPreview * (Kept `PhaseConfirmationModal` — used outside the contracts surface by `TaskOutput` and `PhaseConfirmationNotification`.) * Routes deregistered from `main.tsx`; nav entry removed from `NavStrip`. ### Backend handlers Deleted: `contracts.rs` (2.4k LOC), `contract_chat.rs` (3.2k LOC), `contract_daemon.rs` (~940 LOC), `contract_discuss.rs` (~590 LOC), `transcript_analysis.rs` (~690 LOC). All `/api/v1/contracts/*` routes deregistered. OpenAPI entries dropped. Module declarations removed from `server/handlers/mod.rs`. ### CLI Removed `makima contract` and `makima supervisor` subcommands. Deleted `daemon/cli/contract.rs` and `daemon/cli/supervisor.rs`. Bin dispatch trimmed (~377 LOC). ### Orchestrator Removed the contract-spawn path from `phase_execution` (`spawn_step_contract` and its caller). `directive_steps.contract_type` now logs a warning and falls through to standalone-task spawn. Column itself stays — old data still reads, just no longer triggers a contract+supervisor spawn. ### TUI `Action::PerformCreateContract` is now a no-op that surfaces a status message: "Contracts have been removed. Use directives instead." The TUI form is dead code pending a wider refresh. ## Out of scope (deliberately left) * Contracts DB tables (`contracts`, `contract_repositories`, `contract_chat_history`, `contract_events`, `contract_templates`) are retained for historical data + because some peripheral code still joins to them in TaskSummary queries. * `mesh_supervisor` handlers are retained — they aren't only used by contracts (some mesh-level supervisor behaviour persists), and the cross-cutting cleanup is bigger than this PR. * `directive_steps.contract_type` column itself isn't dropped; just no longer functional. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'makima/src/daemon/cli/mod.rs')
-rw-r--r--makima/src/daemon/cli/mod.rs140
1 files changed, 3 insertions, 137 deletions
diff --git a/makima/src/daemon/cli/mod.rs b/makima/src/daemon/cli/mod.rs
index 7affc55..b01c161 100644
--- a/makima/src/daemon/cli/mod.rs
+++ b/makima/src/daemon/cli/mod.rs
@@ -1,21 +1,17 @@
//! Command-line interface for the makima CLI.
pub mod config;
-pub mod contract;
pub mod daemon;
pub mod directive;
pub mod server;
-pub mod supervisor;
pub mod view;
use clap::{Parser, Subcommand};
pub use config::CliConfig;
-pub use contract::ContractArgs;
pub use daemon::DaemonArgs;
pub use directive::DirectiveArgs;
pub use server::ServerArgs;
-pub use supervisor::SupervisorArgs;
pub use view::ViewArgs;
/// Makima - unified CLI for server, daemon, and task management.
@@ -35,28 +31,11 @@ pub enum Commands {
/// Run the daemon (connect to server, manage tasks)
Daemon(DaemonArgs),
- /// Supervisor commands for contract orchestration
- #[command(subcommand)]
- Supervisor(SupervisorCommand),
-
- /// Contract commands for task-contract interaction
- #[command(subcommand)]
- Contract(ContractCommand),
-
/// Directive commands for DAG-based project management
#[command(subcommand)]
Directive(DirectiveCommand),
- /// Interactive TUI browser for contracts and tasks
- ///
- /// Provides a drill-down interface for browsing contracts, viewing their
- /// tasks, and streaming real-time task output.
- ///
- /// Keyboard shortcuts:
- /// ↑/k: Move up ↓/j: Move down Enter/l: Drill in
- /// Esc/h: Go back /: Search q: Quit
- /// e: Edit d: Delete c: cd to worktree
- /// n: New contract
+ /// Interactive TUI browser for directives and tasks
View(ViewArgs),
/// Configure CLI settings (API key, server URL)
@@ -86,121 +65,8 @@ pub enum ConfigCommand {
Path,
}
-/// Supervisor subcommands for contract orchestration.
-#[derive(Subcommand, Debug)]
-pub enum SupervisorCommand {
- /// List all tasks in the contract
- Tasks(SupervisorArgs),
-
- /// Get the task tree structure
- Tree(SupervisorArgs),
-
- /// Create and start a new task
- Spawn(supervisor::SpawnArgs),
-
- /// Wait for a task to complete
- Wait(supervisor::WaitArgs),
-
- /// Read a file from a task's worktree
- ReadFile(supervisor::ReadFileArgs),
-
- /// Create a git branch
- Branch(supervisor::BranchArgs),
-
- /// Merge a task's changes to a branch
- Merge(supervisor::MergeArgs),
-
- /// Create a pull request
- Pr(supervisor::PrArgs),
-
- /// View task diff
- Diff(supervisor::DiffArgs),
-
- /// Create a checkpoint
- Checkpoint(supervisor::CheckpointArgs),
-
- /// List checkpoints
- Checkpoints(SupervisorArgs),
-
- /// Get contract status
- Status(SupervisorArgs),
-
- /// Advance the contract to the next phase
- AdvancePhase(supervisor::AdvancePhaseArgs),
-
- /// Ask a question and wait for user feedback
- Ask(supervisor::AskArgs),
-
- /// Get individual task details
- Task(supervisor::GetTaskArgs),
-
- /// Get task output/claude log
- Output(supervisor::GetTaskOutputArgs),
-
- /// View task conversation history
- TaskHistory(supervisor::TaskHistoryArgs),
-
- /// List task checkpoints (with optional diff)
- TaskCheckpoints(supervisor::TaskCheckpointsArgs),
-
- /// Resume supervisor after interruption
- Resume(supervisor::ResumeArgs),
-
- /// Resume task from checkpoint
- TaskResumeFrom(supervisor::TaskResumeFromArgs),
-
- /// Rewind task code to checkpoint
- TaskRewind(supervisor::TaskRewindArgs),
-
- /// Fork task from historical point
- TaskFork(supervisor::TaskForkArgs),
-
- /// Rewind supervisor conversation
- RewindConversation(supervisor::ConversationRewindArgs),
-
- /// Mark the contract as complete and stop the supervisor
- Complete(supervisor::CompleteArgs),
-
- /// Resume a completed contract (reactivate it)
- ResumeContract(supervisor::ResumeContractArgs),
-
- /// Mark a deliverable as complete
- MarkDeliverable(supervisor::MarkDeliverableArgs),
-}
-
-/// Contract subcommands for task-contract interaction.
-#[derive(Subcommand, Debug)]
-pub enum ContractCommand {
- /// Get contract status
- Status(ContractArgs),
-
- /// Get the phase checklist
- Checklist(ContractArgs),
-
- /// Get contract goals
- Goals(ContractArgs),
-
- /// List contract files
- Files(ContractArgs),
-
- /// Get a specific file's content
- File(contract::FileArgs),
-
- /// Report progress on the contract
- Report(contract::ReportArgs),
-
- /// Get suggested next action
- SuggestAction(ContractArgs),
-
- /// Get completion recommendation
- CompletionAction(contract::CompletionActionArgs),
-
- /// Update a file (reads content from stdin)
- UpdateFile(contract::UpdateFileArgs),
-
- /// Create a new file (reads content from stdin)
- CreateFile(contract::CreateFileArgs),
-}
+// SupervisorCommand and ContractCommand removed in Phase 5 — contracts
+// subsystem is gone. See cli/contract.rs and cli/supervisor.rs deletion.
/// Directive subcommands for DAG-based project management.
#[derive(Subcommand, Debug)]