openclaw-node-harness 2.0.4 → 2.1.1

package/mission-control/src/app/api/tasks/route.ts

@@ -7,7 +7,9 @@ import { statusToKanban } from "@/lib/parsers/task-markdown";
 import { syncTasksFromMarkdownIfChanged, syncTasksToMarkdown } from "@/lib/sync/tasks";
 import { logActivity } from "@/lib/activity";
 import { schedulerTick } from "@/lib/scheduler";
-import { WORKSPACE_ROOT } from "@/lib/config";
+import { generateTaskId } from "@/lib/task-id";
+import { getNats, sc } from "@/lib/nats";
+import { WORKSPACE_ROOT, AGENT_NAME } from "@/lib/config";
 import path from "path";
 
 /**
@@ -67,7 +69,7 @@ export async function GET(request: NextRequest) {
           title: liveWork.title,
           status: "running",
           kanbanColumn: "in_progress",
-          owner: "daedalus",
+          owner: AGENT_NAME.toLowerCase(),
           nextAction: liveWork.nextAction || null,
           updatedAt: new Date().toISOString(),
           createdAt: new Date().toISOString(),
@@ -186,6 +188,15 @@ export async function POST(request: NextRequest) {
         isRecurring: body.is_recurring ? 1 : 0,
         capacityClass: body.capacity_class || "normal",
         autoPriority: body.auto_priority || 0,
+        // Execution fields
+        execution: body.execution || null,
+        collaboration: body.collaboration ? JSON.stringify(body.collaboration) : null,
+        preferredNodes: body.preferred_nodes?.length ? JSON.stringify(body.preferred_nodes) : null,
+        excludeNodes: body.exclude_nodes?.length ? JSON.stringify(body.exclude_nodes) : null,
+        clusterId: body.cluster_id || null,
+        metric: body.metric || null,
+        budgetMinutes: body.budget_minutes || 30,
+        scope: body.scope?.length ? JSON.stringify(body.scope) : null,
         updatedAt: now.toISOString(),
         createdAt: now.toISOString(),
       })
@@ -200,6 +211,13 @@ export async function POST(request: NextRequest) {
     // Immediately run scheduler tick so auto-start tasks dispatch without waiting for poll
     schedulerTick();
 
+    // Wake bridge for mesh tasks
+    if (body.execution === "mesh") {
+      getNats().then((nc) => {
+        if (nc) nc.publish("mesh.bridge.wake", sc.encode(""));
+      }).catch(() => {});
+    }
+
     const created = db
       .select()
       .from(tasks)
@@ -223,31 +241,4 @@ export async function POST(request: NextRequest) {
       { status: 500 }
     );
   }
-}
-
-/**
- * Generate a task ID in the format T-YYYYMMDD-NNN.
- * NNN is a zero-padded sequence number based on existing tasks for that date.
- */
-function generateTaskId(db: ReturnType<typeof getDb>, date: Date): string {
-  const dateStr =
-    date.getFullYear().toString() +
-    (date.getMonth() + 1).toString().padStart(2, "0") +
-    date.getDate().toString().padStart(2, "0");
-
-  const prefix = `T-${dateStr}-`;
-
-  // Find highest existing sequence number for this date prefix
-  const existing = db
-    .select({ id: tasks.id })
-    .from(tasks)
-    .all()
-    .filter((t) => t.id.startsWith(prefix))
-    .map((t) => {
-      const seq = parseInt(t.id.slice(prefix.length), 10);
-      return isNaN(seq) ? 0 : seq;
-    });
-
-  const nextSeq = existing.length > 0 ? Math.max(...existing) + 1 : 1;
-  return `${prefix}${nextSeq.toString().padStart(3, "0")}`;
-}
+}

package/mission-control/src/app/api/workspace/read/route.ts

@@ -25,6 +25,17 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ error: "File not found" }, { status: 404 });
     }
 
+    // Defeat symlink traversal: resolve the real path and re-check prefix
+    const realPath = fs.realpathSync(absPath);
+    const realRoot = fs.realpathSync(WORKSPACE_ROOT);
+    if (!realPath.startsWith(realRoot + path.sep) && realPath !== realRoot) {
+      return NextResponse.json({ error: "Path traversal denied" }, { status: 403 });
+    }
+
+    if (!fs.existsSync(realPath)) {
+      return NextResponse.json({ error: "File not found" }, { status: 404 });
+    }
+
     const stat = fs.statSync(absPath);
     if (stat.isDirectory()) {
       return NextResponse.json({ error: "Path is a directory" }, { status: 400 });

package/mission-control/src/app/cowork/page.tsx

@@ -0,0 +1,261 @@
+"use client";
+
+import { useState, useMemo } from "react";
+import { AlertTriangle, Plus, Users2 } from "lucide-react";
+import {
+  useCollabSessions,
+  useClusters,
+  useTasks,
+  addClusterMember,
+} from "@/lib/hooks";
+import { SessionCard } from "@/components/cowork/session-card";
+import { ClusterCard } from "@/components/cowork/cluster-card";
+import { CreateClusterDialog } from "@/components/cowork/create-cluster-dialog";
+import { DispatchForm } from "@/components/cowork/dispatch-form";
+import useSWR from "swr";
+import { RolePicker } from "@/components/cowork/role-picker";
+
+const fetcher = (url: string) => fetch(url).then((r) => r.json());
+
+type Tab = "sessions" | "clusters" | "dispatch";
+
+export default function CoworkPage() {
+  const [tab, setTab] = useState<Tab>("sessions");
+  const [createOpen, setCreateOpen] = useState(false);
+  const [addNodeTarget, setAddNodeTarget] = useState<string | null>(null);
+
+  const { sessions: activeSessions, natsAvailable } = useCollabSessions(
+    "recruiting,active",
+    5000
+  );
+  const { sessions: recentSessions } = useCollabSessions(
+    "converged,completed,aborted",
+    30000
+  );
+  const { clusters } = useClusters();
+  const { tasks } = useTasks();
+
+  // Build a map from task_id to Task for cross-referencing sessions
+  const taskMap = useMemo(() => {
+    const map = new Map<string, typeof tasks[0]>();
+    for (const t of tasks) map.set(t.id, t);
+    return map;
+  }, [tasks]);
+
+  const handleDispatchFromCluster = (clusterId: string) => {
+    setTab("dispatch");
+  };
+
+  return (
+    <div className="flex flex-col h-full">
+      {/* Header */}
+      <header className="flex items-center justify-between border-b border-border px-6 py-4">
+        <div className="flex items-center gap-4">
+          <h1 className="text-lg font-semibold">Cowork</h1>
+          {activeSessions.length > 0 && (
+            <span className="flex items-center gap-1.5 rounded-full bg-green-500/10 px-2.5 py-0.5 text-xs text-green-400">
+              <span className="h-1.5 w-1.5 rounded-full bg-green-400 animate-pulse" />
+              {activeSessions.length} active
+            </span>
+          )}
+          <span className="rounded-full bg-accent px-2.5 py-0.5 text-xs text-muted-foreground">
+            {clusters.length} clusters
+          </span>
+        </div>
+
+        {/* Tab bar */}
+        <div className="flex rounded-lg bg-accent/50 p-0.5">
+          {(["sessions", "clusters", "dispatch"] as Tab[]).map((t) => (
+            <button
+              key={t}
+              onClick={() => setTab(t)}
+              className={`rounded-md px-3 py-1.5 text-xs font-medium transition-colors ${
+                tab === t
+                  ? "bg-card text-foreground shadow-sm"
+                  : "text-muted-foreground hover:text-foreground"
+              }`}
+            >
+              {t.charAt(0).toUpperCase() + t.slice(1)}
+            </button>
+          ))}
+        </div>
+      </header>
+
+      {/* Content */}
+      <main className="flex-1 overflow-y-auto p-6 space-y-6">
+        {/* Sessions tab */}
+        {tab === "sessions" && (
+          <>
+            {!natsAvailable && (
+              <div className="flex items-center gap-2 rounded-lg border border-yellow-500/20 bg-yellow-500/5 px-4 py-3 text-xs text-yellow-400">
+                <AlertTriangle className="h-4 w-4" />
+                NATS unavailable — session data may be stale
+              </div>
+            )}
+
+            {activeSessions.length > 0 && (
+              <section>
+                <h2 className="text-sm font-medium text-muted-foreground mb-3">
+                  Active Sessions
+                </h2>
+                <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
+                  {activeSessions.map((s) => (
+                    <SessionCard key={s.session_id} session={s} linkedTask={taskMap.get(s.task_id)} />
+                  ))}
+                </div>
+              </section>
+            )}
+
+            {recentSessions.length > 0 && (
+              <section>
+                <h2 className="text-sm font-medium text-muted-foreground mb-3">
+                  Recent Sessions
+                </h2>
+                <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
+                  {recentSessions.slice(0, 8).map((s) => (
+                    <SessionCard key={s.session_id} session={s} linkedTask={taskMap.get(s.task_id)} />
+                  ))}
+                </div>
+              </section>
+            )}
+
+            {activeSessions.length === 0 && recentSessions.length === 0 && (
+              <div className="flex flex-col items-center justify-center py-16 text-muted-foreground">
+                <Users2 className="h-8 w-8 mb-3 opacity-30" />
+                <p className="text-sm">No collab sessions yet</p>
+                <p className="text-xs mt-1">
+                  Dispatch a task from the Dispatch tab to start one
+                </p>
+              </div>
+            )}
+          </>
+        )}
+
+        {/* Clusters tab */}
+        {tab === "clusters" && (
+          <>
+            <div className="flex items-center justify-between">
+              <h2 className="text-sm font-medium text-muted-foreground">
+                Clusters
+              </h2>
+              <button
+                onClick={() => setCreateOpen(true)}
+                className="flex items-center gap-1 rounded px-3 py-1.5 text-xs bg-accent-foreground text-accent transition-colors hover:opacity-90"
+              >
+                <Plus className="h-3.5 w-3.5" />
+                New Cluster
+              </button>
+            </div>
+
+            {clusters.length > 0 ? (
+              <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-3">
+                {clusters.map((c) => (
+                  <ClusterCard
+                    key={c.id}
+                    cluster={c}
+                    onDispatch={handleDispatchFromCluster}
+                    onAddNode={(id) => setAddNodeTarget(id)}
+                  />
+                ))}
+              </div>
+            ) : (
+              <div className="flex flex-col items-center justify-center py-16 text-muted-foreground">
+                <Users2 className="h-8 w-8 mb-3 opacity-30" />
+                <p className="text-sm">No clusters yet</p>
+                <p className="text-xs mt-1">
+                  Create one to organize your mesh nodes into teams
+                </p>
+              </div>
+            )}
+
+            <CreateClusterDialog
+              open={createOpen}
+              onClose={() => setCreateOpen(false)}
+            />
+
+            {/* Add node mini-dialog */}
+            {addNodeTarget && (
+              <AddNodeDialog
+                clusterId={addNodeTarget}
+                existingNodeIds={
+                  clusters
+                    .find((c) => c.id === addNodeTarget)
+                    ?.members.map((m) => m.nodeId) ?? []
+                }
+                onClose={() => setAddNodeTarget(null)}
+              />
+            )}
+          </>
+        )}
+
+        {/* Dispatch tab */}
+        {tab === "dispatch" && <DispatchForm />}
+      </main>
+    </div>
+  );
+}
+
+function AddNodeDialog({
+  clusterId,
+  existingNodeIds,
+  onClose,
+}: {
+  clusterId: string;
+  existingNodeIds: string[];
+  onClose: () => void;
+}) {
+  const { data } = useSWR<{
+    nodes: Array<{ nodeId: string; status: string }>;
+  }>("/api/mesh/nodes", fetcher);
+  const meshNodes = (data?.nodes ?? []).filter(
+    (n) => !existingNodeIds.includes(n.nodeId)
+  );
+
+  const [selectedRole, setSelectedRole] = useState("worker");
+
+  const handleAdd = async (nodeId: string) => {
+    await addClusterMember(clusterId, nodeId, selectedRole);
+    onClose();
+  };
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60">
+      <div className="w-full max-w-sm rounded-lg border border-border bg-card shadow-xl">
+        <div className="flex items-center justify-between border-b border-border px-4 py-3">
+          <span className="text-sm font-semibold">Add Node</span>
+          <button
+            onClick={onClose}
+            className="text-muted-foreground hover:text-foreground text-xs"
+          >
+            close
+          </button>
+        </div>
+        <div className="px-4 py-3 space-y-2">
+          <div className="flex items-center gap-2 mb-3">
+            <span className="text-xs text-muted-foreground">Role:</span>
+            <RolePicker value={selectedRole} onChange={setSelectedRole} />
+          </div>
+          {meshNodes.map((node) => (
+            <button
+              key={node.nodeId}
+              onClick={() => handleAdd(node.nodeId)}
+              className="flex w-full items-center gap-2 rounded px-3 py-2 text-xs hover:bg-accent/50 transition-colors"
+            >
+              <span
+                className={`h-2 w-2 rounded-full ${
+                  node.status === "online" ? "bg-green-400" : "bg-zinc-600"
+                }`}
+              />
+              <span className="font-mono">{node.nodeId}</span>
+            </button>
+          ))}
+          {meshNodes.length === 0 && (
+            <p className="text-xs text-muted-foreground py-2">
+              All nodes already in this cluster
+            </p>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}