From e11759447b1ac00becfb1e979e488f7f9c9cf478 Mon Sep 17 00:00:00 2001
From: soryu <soryu@soryu.co>
Date: Fri, 1 May 2026 23:56:51 +0100
Subject: chore(cleanup): Phase 5 contracts removal + tmp directive + 30-day
 expiry + scroll fix (#118)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../src/components/contracts/RepositoryPanel.tsx   | 325 ---------------------
 1 file changed, 325 deletions(-)
 delete mode 100644 makima/frontend/src/components/contracts/RepositoryPanel.tsx

(limited to 'makima/frontend/src/components/contracts/RepositoryPanel.tsx')

diff --git a/makima/frontend/src/components/contracts/RepositoryPanel.tsx b/makima/frontend/src/components/contracts/RepositoryPanel.tsx
deleted file mode 100644
index 15741a8..0000000
--- a/makima/frontend/src/components/contracts/RepositoryPanel.tsx
+++ /dev/null
@@ -1,325 +0,0 @@
-import { useState, useEffect } from "react";
-import type {
-  ContractRepository,
-  RepositorySourceType,
-  RepositoryStatus,
-  DaemonDirectory,
-  RepositoryHistoryEntry,
-} from "../../lib/api";
-import { getDaemonDirectories, getRepositorySuggestions } from "../../lib/api";
-import { DirectoryInput } from "../mesh/DirectoryInput";
-
-interface RepositoryPanelProps {
-  repositories: ContractRepository[];
-  onAddRemote: (name: string, url: string, isPrimary: boolean) => void;
-  onAddLocal: (name: string, path: string, isPrimary: boolean) => void;
-  onCreateManaged: (name: string, isPrimary: boolean) => void;
-  onDelete: (repoId: string) => void;
-  onSetPrimary: (repoId: string) => void;
-}
-
-type AddMode = "remote" | "local" | "managed" | null;
-
-const sourceTypeLabels: Record<RepositorySourceType, string> = {
-  remote: "Remote",
-  local: "Local",
-  managed: "Managed",
-};
-
-const sourceTypeIcons: Record<RepositorySourceType, string> = {
-  remote: "GH",
-  local: "FS",
-  managed: "MK",
-};
-
-const statusColors: Record<RepositoryStatus, string> = {
-  ready: "text-green-400",
-  pending: "text-yellow-400",
-  creating: "text-cyan-400",
-  failed: "text-red-400",
-};
-
-export function RepositoryPanel({
-  repositories,
-  onAddRemote,
-  onAddLocal,
-  onCreateManaged,
-  onDelete,
-  onSetPrimary,
-}: RepositoryPanelProps) {
-  const [addMode, setAddMode] = useState<AddMode>(null);
-  const [name, setName] = useState("");
-  const [url, setUrl] = useState("");
-  const [path, setPath] = useState("");
-  const [isPrimary, setIsPrimary] = useState(false);
-  // Daemon directory suggestions for local repositories
-  const [suggestedDirectories, setSuggestedDirectories] = useState<DaemonDirectory[]>([]);
-  // Repository history suggestions
-  const [repoSuggestions, setRepoSuggestions] = useState<RepositoryHistoryEntry[]>([]);
-  const [showSuggestions, setShowSuggestions] = useState(false);
-
-  // Fetch daemon directories when "local" mode is selected
-  useEffect(() => {
-    if (addMode === "local") {
-      getDaemonDirectories()
-        .then((res) => setSuggestedDirectories(res.directories))
-        .catch(() => setSuggestedDirectories([]));
-    }
-  }, [addMode]);
-
-  // Fetch repository suggestions when mode changes to remote or local
-  useEffect(() => {
-    if (addMode === "remote" || addMode === "local") {
-      getRepositorySuggestions(addMode, undefined, 10)
-        .then((res) => {
-          setRepoSuggestions(res.entries);
-          setShowSuggestions(res.entries.length > 0);
-        })
-        .catch(() => {
-          setRepoSuggestions([]);
-          setShowSuggestions(false);
-        });
-    } else {
-      setRepoSuggestions([]);
-      setShowSuggestions(false);
-    }
-  }, [addMode]);
-
-  // Apply a suggestion to the form
-  const applySuggestion = (suggestion: RepositoryHistoryEntry) => {
-    setName(suggestion.name);
-    if (suggestion.repositoryUrl) {
-      setUrl(suggestion.repositoryUrl);
-    }
-    if (suggestion.localPath) {
-      setPath(suggestion.localPath);
-    }
-    setShowSuggestions(false);
-  };
-
-  const handleAdd = () => {
-    if (!name.trim()) return;
-
-    if (addMode === "remote" && url.trim()) {
-      onAddRemote(name.trim(), url.trim(), isPrimary);
-    } else if (addMode === "local" && path.trim()) {
-      onAddLocal(name.trim(), path.trim(), isPrimary);
-    } else if (addMode === "managed") {
-      onCreateManaged(name.trim(), isPrimary);
-    }
-
-    // Reset form
-    setAddMode(null);
-    setName("");
-    setUrl("");
-    setPath("");
-    setIsPrimary(false);
-  };
-
-  const handleCancel = () => {
-    setAddMode(null);
-    setName("");
-    setUrl("");
-    setPath("");
-    setIsPrimary(false);
-  };
-
-  return (
-    <div className="space-y-4">
-      {/* Repository list */}
-      {repositories.length === 0 ? (
-        <p className="font-mono text-xs text-[#555]">
-          No repositories configured
-        </p>
-      ) : (
-        <div className="space-y-2">
-          {repositories.map((repo) => (
-            <div
-              key={repo.id}
-              className="flex items-center gap-3 p-3 border border-[rgba(117,170,252,0.2)]"
-            >
-              {/* Type icon */}
-              <span className="font-mono text-[10px] text-[#555] uppercase w-6">
-                {sourceTypeIcons[repo.sourceType]}
-              </span>
-
-              {/* Name and details */}
-              <div className="flex-1 min-w-0">
-                <div className="flex items-center gap-2">
-                  <span className="font-mono text-sm text-[#dbe7ff] truncate">
-                    {repo.name}
-                  </span>
-                  {repo.isPrimary && (
-                    <span className="px-1 py-0.5 text-[8px] font-mono uppercase bg-[rgba(117,170,252,0.1)] text-[#75aafc] border border-[rgba(117,170,252,0.3)]">
-                      Primary
-                    </span>
-                  )}
-                </div>
-                <div className="font-mono text-[10px] text-[#555] truncate">
-                  {repo.repositoryUrl || repo.localPath || "(pending creation)"}
-                </div>
-              </div>
-
-              {/* Status */}
-              <span
-                className={`font-mono text-[10px] uppercase ${
-                  statusColors[repo.status]
-                }`}
-              >
-                {repo.status}
-              </span>
-
-              {/* Actions */}
-              <div className="flex items-center gap-1">
-                {!repo.isPrimary && repo.status === "ready" && (
-                  <button
-                    onClick={() => onSetPrimary(repo.id)}
-                    className="p-1 font-mono text-[10px] text-[#555] hover:text-[#75aafc] transition-colors"
-                    title="Set as primary"
-                  >
-                    *
-                  </button>
-                )}
-                <button
-                  onClick={() => onDelete(repo.id)}
-                  className="p-1 font-mono text-[10px] text-[#555] hover:text-red-400 transition-colors"
-                  title="Remove"
-                >
-                  x
-                </button>
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-
-      {/* Add repository form */}
-      {addMode ? (
-        <div className="p-3 border border-[rgba(117,170,252,0.3)] space-y-3">
-          <div className="flex items-center justify-between mb-2">
-            <span className="font-mono text-xs text-[#75aafc] uppercase">
-              Add {sourceTypeLabels[addMode]} Repository
-            </span>
-            {repoSuggestions.length > 0 && (
-              <button
-                onClick={() => setShowSuggestions(!showSuggestions)}
-                className="font-mono text-[10px] text-[#555] hover:text-[#9bc3ff] transition-colors"
-              >
-                {showSuggestions ? "Hide suggestions" : `${repoSuggestions.length} suggestions`}
-              </button>
-            )}
-          </div>
-
-          {/* Suggestions dropdown */}
-          {showSuggestions && repoSuggestions.length > 0 && (
-            <div className="border border-[rgba(117,170,252,0.2)] bg-[#0a1525] max-h-32 overflow-y-auto">
-              {repoSuggestions.map((suggestion) => (
-                <button
-                  key={suggestion.id}
-                  onClick={() => applySuggestion(suggestion)}
-                  className="w-full text-left px-3 py-2 font-mono text-xs hover:bg-[rgba(117,170,252,0.1)] transition-colors border-b border-[rgba(117,170,252,0.1)] last:border-b-0"
-                >
-                  <div className="flex items-center justify-between">
-                    <span className="text-[#9bc3ff] truncate">{suggestion.name}</span>
-                    <span className="text-[10px] text-[#556677]">
-                      {suggestion.useCount}×
-                    </span>
-                  </div>
-                  <div className="text-[10px] text-[#556677] truncate">
-                    {addMode === "local" ? suggestion.localPath : suggestion.repositoryUrl}
-                  </div>
-                </button>
-              ))}
-            </div>
-          )}
-
-          <input
-            type="text"
-            value={name}
-            onChange={(e) => setName(e.target.value)}
-            placeholder="Repository name"
-            className="w-full px-3 py-2 bg-[#0d1b2d] border border-[#3f6fb3] text-[#dbe7ff] font-mono text-xs focus:outline-none focus:border-[#75aafc]"
-          />
-
-          {addMode === "remote" && (
-            <input
-              type="text"
-              value={url}
-              onChange={(e) => setUrl(e.target.value)}
-              placeholder="https://github.com/owner/repo"
-              className="w-full px-3 py-2 bg-[#0d1b2d] border border-[#3f6fb3] text-[#dbe7ff] font-mono text-xs focus:outline-none focus:border-[#75aafc]"
-            />
-          )}
-
-          {addMode === "local" && (
-            <DirectoryInput
-              value={path}
-              onChange={setPath}
-              suggestions={suggestedDirectories}
-              placeholder="/path/to/repository"
-            />
-          )}
-
-          {addMode === "managed" && (
-            <p className="font-mono text-xs text-[#555]">
-              Makima will create this repository via the daemon.
-            </p>
-          )}
-
-          <label className="flex items-center gap-2 cursor-pointer">
-            <input
-              type="checkbox"
-              checked={isPrimary}
-              onChange={(e) => setIsPrimary(e.target.checked)}
-              className="w-3 h-3"
-            />
-            <span className="font-mono text-xs text-[#9bc3ff]">
-              Set as primary repository
-            </span>
-          </label>
-
-          <div className="flex gap-2">
-            <button
-              onClick={handleCancel}
-              className="px-3 py-1.5 font-mono text-xs text-[#555] hover:text-[#9bc3ff] transition-colors"
-            >
-              Cancel
-            </button>
-            <button
-              onClick={handleAdd}
-              disabled={
-                !name.trim() ||
-                (addMode === "remote" && !url.trim()) ||
-                (addMode === "local" && !path.trim())
-              }
-              className="px-3 py-1.5 font-mono text-xs text-[#dbe7ff] bg-[#0f3c78] border border-[#3f6fb3] hover:bg-[#153667] transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
-            >
-              Add Repository
-            </button>
-          </div>
-        </div>
-      ) : (
-        <div className="flex gap-2">
-          <button
-            onClick={() => setAddMode("remote")}
-            className="px-3 py-1.5 font-mono text-xs text-[#9bc3ff] border border-[rgba(117,170,252,0.25)] hover:border-[#3f6fb3] transition-colors"
-          >
-            + Remote
-          </button>
-          <button
-            onClick={() => setAddMode("local")}
-            className="px-3 py-1.5 font-mono text-xs text-[#9bc3ff] border border-[rgba(117,170,252,0.25)] hover:border-[#3f6fb3] transition-colors"
-          >
-            + Local
-          </button>
-          <button
-            onClick={() => setAddMode("managed")}
-            className="px-3 py-1.5 font-mono text-xs text-[#9bc3ff] border border-[rgba(117,170,252,0.25)] hover:border-[#3f6fb3] transition-colors"
-          >
-            + Managed
-          </button>
-        </div>
-      )}
-    </div>
-  );
-}
-- 
cgit v1.2.3

